From ca7e64b3bed43afd6afd124999f1cd1500eea19c Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:25:44 +0000
Subject: [PATCH 01/23] Remove unused variable

---
 src/Tokenizer.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index 6a116f3..33a0796 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -63,7 +63,6 @@ public function tokenizeLine(int $line, string $lineText): void
         $this->checkWhileConditions($line, $lineText);
 
         while ($this->state->getLinePosition() < strlen($lineText)) {
-            $remainingText = substr($lineText, $this->state->getLinePosition());
             $root = $this->state->getPattern();
             $matched = $this->match($lineText);
             $endIsMatched = false;

From f9ffcd98a99fc87cabef708d1ddfee4620383191 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:26:06 +0000
Subject: [PATCH 02/23] Remove a FIXME

---
 src/Tokenizer.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index 33a0796..8db4b5c 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -67,9 +67,6 @@ public function tokenizeLine(int $line, string $lineText): void
             $matched = $this->match($lineText);
             $endIsMatched = false;
 
-            // FIXME: Move all of this end pattern checking into the `match` method!
-            // Some patterns will include `$self`. Since we're not fixing all patterns to match at the end of the previous match
-            // we need to check if we're looking for an `end` pattern that is closer than the matched subpattern.
             if ($matched !== false && $root instanceof EndPattern && $endMatched = $root->tryMatch($this, $lineText, $this->state->getLinePosition())) {
                 if ($endMatched->offset() <= $matched->offset()) {
                     $matched = $endMatched;

From 76221d6dbb39e3cbbddc865f4d558fe2b43ab703 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:28:48 +0000
Subject: [PATCH 03/23] Remove commented out code

---
 src/Tokenizer.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index 8db4b5c..2a2dadd 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -367,24 +367,6 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             }
 
             $this->state->pushPattern($endPattern);
-
-            // $endMatched = $endPattern->tryMatch($this, $lineText, $this->state->getLinePosition());
-
-            // // If we can't see the `end` pattern, we should just return.
-            // if ($endMatched === false) {
-            //     $this->state->pushPattern($endPattern);
-
-            //     return;
-            // }
-
-            // // If we can see the `end` pattern, we should process it.
-            // $this->process($endMatched, $line, $lineText);
-
-            // if ($matched->pattern->scope()) {
-            //     foreach ($matched->pattern->scope() as $_) {
-            //         $this->state->popScope();
-            //     }
-            // }
         }
 
         if ($matched->pattern instanceof BeginWhilePattern) {

From 50a6917263fdad8f84965b196a9062d95b66481b Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:30:58 +0000
Subject: [PATCH 04/23] Pull repeated property access out into a variable

---
 src/Tokenizer.php | 60 ++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index 2a2dadd..909af35 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -278,9 +278,11 @@ public function resolve(IncludePattern $pattern): ?Pattern
 
     protected function process(MatchedPattern $matched, int $line, string $lineText): void
     {
+        $pattern = $matched->pattern;
+
         if ($matched->offset() > $this->state->getLinePosition()) {
             $this->tokens[$line][] = new Token(
-                $matched->pattern instanceof EndPattern && $matched->pattern->contentName !== null ? [...$this->state->getScopes(), $matched->pattern->contentName] : $this->state->getScopes(),
+                $pattern instanceof EndPattern && $pattern->contentName !== null ? [...$this->state->getScopes(), $pattern->contentName] : $this->state->getScopes(),
                 substr($lineText, $this->state->getLinePosition(), $matched->offset() - $this->state->getLinePosition()),
                 $this->state->getLinePosition(),
                 $matched->offset(),
@@ -289,9 +291,9 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             $this->state->setLinePosition($matched->offset());
         }
 
-        if ($matched->pattern instanceof MatchPattern && $matched->pattern->hasCaptures()) {
-            if ($matched->pattern->scope()) {
-                $this->state->pushScopes($this->processScope($matched->pattern->scope(), $matched));
+        if ($pattern instanceof MatchPattern && $pattern->hasCaptures()) {
+            if ($pattern->scope()) {
+                $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
             }
 
             $this->captures($matched, $line, $lineText);
@@ -307,15 +309,15 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
                 $this->state->setLinePosition($matched->end());
             }
 
-            if ($matched->pattern->scope()) {
-                foreach ($matched->pattern->scope() as $_) {
+            if ($pattern->scope()) {
+                foreach ($pattern->scope() as $_) {
                     $this->state->popScope();
                 }
             }
-        } elseif ($matched->pattern instanceof MatchPattern) {
+        } elseif ($pattern instanceof MatchPattern) {
             if ($matched->text() !== '') {
                 $this->tokens[$line][] = new Token(
-                    $matched->pattern->produceScopes($this->state->getScopes()),
+                    $pattern->produceScopes($this->state->getScopes()),
                     $matched->text(),
                     $matched->offset(),
                     $matched->end(),
@@ -325,14 +327,14 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             $this->state->setLinePosition($matched->end());
         }
 
-        if ($matched->pattern instanceof BeginEndPattern) {
-            if ($matched->pattern->scope()) {
-                $this->state->pushScopes($this->processScope($matched->pattern->scope(), $matched));
+        if ($pattern instanceof BeginEndPattern) {
+            if ($pattern->scope()) {
+                $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
             }
 
             $this->state->pushAnchorPosition($this->state->getAnchorPosition());
 
-            if ($matched->pattern->hasCaptures()) {
+            if ($pattern->hasCaptures()) {
                 $this->captures($matched, $line, $lineText);
             } else {
                 if ($matched->text() !== '') {
@@ -350,10 +352,10 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             $this->state->setAnchorPosition($matched->end());
 
             /** @phpstan-ignore-next-line method.notFound */
-            $endPattern = $matched->pattern->createEndPattern($matched);
+            $endPattern = $pattern->createEndPattern($matched);
 
-            if ($matched->pattern instanceof ProvidesContentName && $matched->pattern->getContentName() !== null) {
-                $this->state->pushScope($matched->pattern->getContentName());
+            if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
+                $this->state->pushScope($pattern->getContentName());
             }
 
             if ($endPattern->hasPatterns()) {
@@ -362,21 +364,21 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
                 return;
             }
 
-            if ($matched->pattern instanceof ProvidesContentName && $matched->pattern->getContentName() !== null) {
+            if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
                 $this->state->popScope();
             }
 
             $this->state->pushPattern($endPattern);
         }
 
-        if ($matched->pattern instanceof BeginWhilePattern) {
-            if ($matched->pattern->scope()) {
-                $this->state->pushScopes($this->processScope($matched->pattern->scope(), $matched));
+        if ($pattern instanceof BeginWhilePattern) {
+            if ($pattern->scope()) {
+                $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
             }
 
             $this->state->pushAnchorPosition($this->state->getAnchorPosition());
 
-            if ($matched->pattern->hasCaptures()) {
+            if ($pattern->hasCaptures()) {
                 $this->captures($matched, $line, $lineText);
             } else {
                 if ($matched->text() !== '') {
@@ -394,10 +396,10 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             $this->state->setAnchorPosition($matched->end());
 
             /** @phpstan-ignore-next-line method.notFound */
-            $whilePattern = $matched->pattern->createWhilePattern($matched);
+            $whilePattern = $pattern->createWhilePattern($matched);
 
-            if ($matched->pattern instanceof ProvidesContentName && $matched->pattern->getContentName() !== null) {
-                $this->state->pushScope($matched->pattern->getContentName());
+            if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
+                $this->state->pushScope($pattern->getContentName());
             }
 
             $this->state->pushPattern($whilePattern);
@@ -405,11 +407,11 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             return;
         }
 
-        if ($matched->pattern instanceof EndPattern) {
+        if ($pattern instanceof EndPattern) {
             // FIXME: This is a bit of hack. There's a bug somewhere that is incorrectly popping the end scope off
             // of the stack before we're done with that specific scope. This will prevent this from happening.
-            if ($matched->pattern->scope()) {
-                $potentialMatchedPatternScopes = $this->processScope($matched->pattern->scope(), $matched->pattern->begin);
+            if ($pattern->scope()) {
+                $potentialMatchedPatternScopes = $this->processScope($pattern->scope(), $pattern->begin);
 
                 foreach ($potentialMatchedPatternScopes as $potentialScope) {
                     if (! in_array($potentialScope, $this->state->getScopes())) {
@@ -418,7 +420,7 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
                 }
             }
 
-            if ($matched->pattern->hasCaptures()) {
+            if ($pattern->hasCaptures()) {
                 $this->captures($matched, $line, $lineText);
             } else {
                 if ($matched->text() !== '') {
@@ -434,8 +436,8 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             $this->state->setLinePosition($matched->end());
         }
 
-        if ($matched->pattern instanceof WhilePattern) {
-            if ($matched->pattern->hasCaptures()) {
+        if ($pattern instanceof WhilePattern) {
+            if ($pattern->hasCaptures()) {
                 $this->captures($matched, $line, $lineText);
             } else {
                 if ($matched->text() !== '') {

From 87fbc6cf795889159de48bf5d05d161e31ba83b7 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:37:44 +0000
Subject: [PATCH 05/23] Pull processors out into separate methods

---
 src/Tokenizer.php | 270 +++++++++++++++++++++++++++-------------------
 1 file changed, 158 insertions(+), 112 deletions(-)

diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index 909af35..60e138c 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -291,30 +291,25 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             $this->state->setLinePosition($matched->offset());
         }
 
-        if ($pattern instanceof MatchPattern && $pattern->hasCaptures()) {
-            if ($pattern->scope()) {
-                $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
-            }
-
-            $this->captures($matched, $line, $lineText);
+        match (true) {
+            $pattern instanceof MatchPattern => $this->processMatch($matched, $line, $lineText),
+            $pattern instanceof BeginEndPattern => $this->processBeginEnd($matched, $line, $lineText),
+            $pattern instanceof BeginWhilePattern => $this->processBeginWhile($matched, $line, $lineText),
+            $pattern instanceof EndPattern => $this->processEnd($matched, $line, $lineText),
+            $pattern instanceof WhilePattern => $this->processWhile($matched, $line, $lineText),
+            default => throw new UnreachableException(),
+        };
+    }
 
-            if ($this->state->getLinePosition() < $matched->end()) {
-                $this->tokens[$line][] = new Token(
-                    $this->state->getScopes(),
-                    substr($lineText, $this->state->getLinePosition(), $matched->end() - $this->state->getLinePosition()),
-                    $this->state->getLinePosition(),
-                    $matched->end(),
-                );
+    protected function processMatch(MatchedPattern $matched, int $line, string $lineText): void
+    {
+        if (! $matched->pattern instanceof MatchPattern) {
+            throw new UnreachableException();
+        }
 
-                $this->state->setLinePosition($matched->end());
-            }
+        $pattern = $matched->pattern;
 
-            if ($pattern->scope()) {
-                foreach ($pattern->scope() as $_) {
-                    $this->state->popScope();
-                }
-            }
-        } elseif ($pattern instanceof MatchPattern) {
+        if (! $pattern->hasCaptures()) {
             if ($matched->text() !== '') {
                 $this->tokens[$line][] = new Token(
                     $pattern->produceScopes($this->state->getScopes()),
@@ -325,135 +320,186 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             }
 
             $this->state->setLinePosition($matched->end());
+
+            return;
         }
 
-        if ($pattern instanceof BeginEndPattern) {
-            if ($pattern->scope()) {
-                $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
-            }
+        if ($pattern->scope()) {
+            $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
+        }
 
-            $this->state->pushAnchorPosition($this->state->getAnchorPosition());
-
-            if ($pattern->hasCaptures()) {
-                $this->captures($matched, $line, $lineText);
-            } else {
-                if ($matched->text() !== '') {
-                    $this->tokens[$line][] = new Token(
-                        $this->state->getScopes(),
-                        $matched->text(),
-                        $matched->offset(),
-                        $matched->end(),
-                    );
-                }
+        $this->captures($matched, $line, $lineText);
+
+        if ($this->state->getLinePosition() < $matched->end()) {
+            $this->tokens[$line][] = new Token(
+                $this->state->getScopes(),
+                substr($lineText, $this->state->getLinePosition(), $matched->end() - $this->state->getLinePosition()),
+                $this->state->getLinePosition(),
+                $matched->end(),
+            );
+
+            $this->state->setLinePosition($matched->end());
+        }
 
-                $this->state->setLinePosition($matched->end());
+        if ($pattern->scope()) {
+            foreach ($pattern->scope() as $_) {
+                $this->state->popScope();
             }
+        }
+    }
 
-            $this->state->setAnchorPosition($matched->end());
+    protected function processBeginEnd(MatchedPattern $matched, int $line, string $lineText): void
+    {
+        if (! $matched->pattern instanceof BeginEndPattern) {
+            throw new UnreachableException();
+        }
 
-            /** @phpstan-ignore-next-line method.notFound */
-            $endPattern = $pattern->createEndPattern($matched);
+        $pattern = $matched->pattern;
 
-            if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
-                $this->state->pushScope($pattern->getContentName());
-            }
+        if ($pattern->scope()) {
+            $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
+        }
 
-            if ($endPattern->hasPatterns()) {
-                $this->state->pushPattern($endPattern);
+        $this->state->pushAnchorPosition($this->state->getAnchorPosition());
 
-                return;
+        if ($pattern->hasCaptures()) {
+            $this->captures($matched, $line, $lineText);
+        } else {
+            if ($matched->text() !== '') {
+                $this->tokens[$line][] = new Token(
+                    $this->state->getScopes(),
+                    $matched->text(),
+                    $matched->offset(),
+                    $matched->end(),
+                );
             }
 
-            if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
-                $this->state->popScope();
-            }
+            $this->state->setLinePosition($matched->end());
+        }
 
+        $this->state->setAnchorPosition($matched->end());
+
+        /** @phpstan-ignore-next-line method.notFound */
+        $endPattern = $pattern->createEndPattern($matched);
+
+        if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
+            $this->state->pushScope($pattern->getContentName());
+        }
+
+        if ($endPattern->hasPatterns()) {
             $this->state->pushPattern($endPattern);
+
+            return;
         }
 
-        if ($pattern instanceof BeginWhilePattern) {
-            if ($pattern->scope()) {
-                $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
-            }
+        if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
+            $this->state->popScope();
+        }
 
-            $this->state->pushAnchorPosition($this->state->getAnchorPosition());
-
-            if ($pattern->hasCaptures()) {
-                $this->captures($matched, $line, $lineText);
-            } else {
-                if ($matched->text() !== '') {
-                    $this->tokens[$line][] = new Token(
-                        $this->state->getScopes(),
-                        $matched->text(),
-                        $matched->offset(),
-                        $matched->end(),
-                    );
-                }
+        $this->state->pushPattern($endPattern);
+    }
 
-                $this->state->setLinePosition($matched->end());
-            }
+    protected function processBeginWhile(MatchedPattern $matched, int $line, string $lineText): void
+    {
+        if (! $matched->pattern instanceof BeginWhilePattern) {
+            throw new UnreachableException();
+        }
 
-            $this->state->setAnchorPosition($matched->end());
+        $pattern = $matched->pattern;
 
-            /** @phpstan-ignore-next-line method.notFound */
-            $whilePattern = $pattern->createWhilePattern($matched);
+        if ($pattern->scope()) {
+            $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
+        }
 
-            if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
-                $this->state->pushScope($pattern->getContentName());
+        $this->state->pushAnchorPosition($this->state->getAnchorPosition());
+
+        if ($pattern->hasCaptures()) {
+            $this->captures($matched, $line, $lineText);
+        } else {
+            if ($matched->text() !== '') {
+                $this->tokens[$line][] = new Token(
+                    $this->state->getScopes(),
+                    $matched->text(),
+                    $matched->offset(),
+                    $matched->end(),
+                );
             }
 
-            $this->state->pushPattern($whilePattern);
+            $this->state->setLinePosition($matched->end());
+        }
 
-            return;
+        $this->state->setAnchorPosition($matched->end());
+
+        /** @phpstan-ignore-next-line method.notFound */
+        $whilePattern = $pattern->createWhilePattern($matched);
+
+        if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
+            $this->state->pushScope($pattern->getContentName());
         }
 
-        if ($pattern instanceof EndPattern) {
-            // FIXME: This is a bit of hack. There's a bug somewhere that is incorrectly popping the end scope off
-            // of the stack before we're done with that specific scope. This will prevent this from happening.
-            if ($pattern->scope()) {
-                $potentialMatchedPatternScopes = $this->processScope($pattern->scope(), $pattern->begin);
+        $this->state->pushPattern($whilePattern);
+    }
 
-                foreach ($potentialMatchedPatternScopes as $potentialScope) {
-                    if (! in_array($potentialScope, $this->state->getScopes())) {
-                        $this->state->pushScope($potentialScope);
-                    }
+    protected function processEnd(MatchedPattern $matched, int $line, string $lineText): void
+    {
+        if (! $matched->pattern instanceof EndPattern) {
+            throw new UnreachableException();
+        }
+
+        $pattern = $matched->pattern;
+
+        // FIXME: This is a bit of hack. There's a bug somewhere that is incorrectly popping the end scope off
+        // of the stack before we're done with that specific scope. This will prevent this from happening.
+        if ($pattern->scope()) {
+            $potentialMatchedPatternScopes = $this->processScope($pattern->scope(), $pattern->begin);
+
+            foreach ($potentialMatchedPatternScopes as $potentialScope) {
+                if (! in_array($potentialScope, $this->state->getScopes())) {
+                    $this->state->pushScope($potentialScope);
                 }
             }
+        }
 
-            if ($pattern->hasCaptures()) {
-                $this->captures($matched, $line, $lineText);
-            } else {
-                if ($matched->text() !== '') {
-                    $this->tokens[$line][] = new Token(
-                        $this->state->getScopes(),
-                        $matched->text(),
-                        $matched->offset(),
-                        $matched->end(),
-                    );
-                }
+        if ($pattern->hasCaptures()) {
+            $this->captures($matched, $line, $lineText);
+        } else {
+            if ($matched->text() !== '') {
+                $this->tokens[$line][] = new Token(
+                    $this->state->getScopes(),
+                    $matched->text(),
+                    $matched->offset(),
+                    $matched->end(),
+                );
             }
+        }
 
-            $this->state->setLinePosition($matched->end());
+        $this->state->setLinePosition($matched->end());
+    }
+
+    protected function processWhile(MatchedPattern $matched, int $line, string $lineText): void
+    {
+        if (! $matched->pattern instanceof WhilePattern) {
+            throw new UnreachableException();
         }
 
-        if ($pattern instanceof WhilePattern) {
-            if ($pattern->hasCaptures()) {
-                $this->captures($matched, $line, $lineText);
-            } else {
-                if ($matched->text() !== '') {
-                    $this->tokens[$line][] = new Token(
-                        $this->state->getScopes(),
-                        $matched->text(),
-                        $matched->offset(),
-                        $matched->end(),
-                    );
-                }
+        $pattern = $matched->pattern;
 
-                $this->state->setLinePosition($matched->end());
+        if ($pattern->hasCaptures()) {
+            $this->captures($matched, $line, $lineText);
+        } else {
+            if ($matched->text() !== '') {
+                $this->tokens[$line][] = new Token(
+                    $this->state->getScopes(),
+                    $matched->text(),
+                    $matched->offset(),
+                    $matched->end(),
+                );
             }
 
-            $this->state->setAnchorPosition($matched->end());
+            $this->state->setLinePosition($matched->end());
         }
+
+        $this->state->setAnchorPosition($matched->end());
     }
 
     protected function captures(MatchedPattern $pattern, int $line, string $lineText): void

From 7992e53dbfa49a2717aa1add53818bbc015d11dd Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:41:17 +0000
Subject: [PATCH 06/23] Add missing internal tags to classes

---
 src/Grammar/BeginEndPattern.php       | 1 +
 src/Grammar/BeginWhilePattern.php     | 1 +
 src/Grammar/Capture.php               | 1 +
 src/Grammar/CollectionPattern.php     | 1 +
 src/Grammar/DefaultGrammars.php       | 1 +
 src/Grammar/EndPattern.php            | 1 +
 src/Grammar/IncludePattern.php        | 1 +
 src/Grammar/Injections/Composite.php  | 1 +
 src/Grammar/Injections/Expression.php | 1 +
 src/Grammar/Injections/Filter.php     | 1 +
 src/Grammar/Injections/Group.php      | 1 +
 src/Grammar/Injections/Injection.php  | 1 +
 src/Grammar/Injections/Operator.php   | 1 +
 src/Grammar/Injections/Path.php       | 1 +
 src/Grammar/Injections/Prefix.php     | 1 +
 src/Grammar/Injections/Scope.php      | 1 +
 src/Grammar/Injections/Selector.php   | 1 +
 src/Grammar/MatchPattern.php          | 1 +
 src/Grammar/MatchedInjection.php      | 1 +
 src/Grammar/MatchedPattern.php        | 1 +
 src/Grammar/ParsedGrammar.php         | 1 +
 src/Grammar/Parser.php                | 1 +
 src/Grammar/Pattern.php               | 1 +
 src/Grammar/WhilePattern.php          | 1 +
 24 files changed, 24 insertions(+)

diff --git a/src/Grammar/BeginEndPattern.php b/src/Grammar/BeginEndPattern.php
index 0bcbf77..4939bde 100644
--- a/src/Grammar/BeginEndPattern.php
+++ b/src/Grammar/BeginEndPattern.php
@@ -9,6 +9,7 @@
 use Phiki\Support\Regex;
 use Phiki\Tokenizer;
 
+/** @internal */
 class BeginEndPattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface, ProvidesContentName
 {
     public function __construct(
diff --git a/src/Grammar/BeginWhilePattern.php b/src/Grammar/BeginWhilePattern.php
index 74e0737..3058c18 100644
--- a/src/Grammar/BeginWhilePattern.php
+++ b/src/Grammar/BeginWhilePattern.php
@@ -9,6 +9,7 @@
 use Phiki\Support\Regex;
 use Phiki\Tokenizer;
 
+/** @internal */
 class BeginWhilePattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface, ProvidesContentName
 {
     public function __construct(
diff --git a/src/Grammar/Capture.php b/src/Grammar/Capture.php
index a3d183e..1e71dc3 100644
--- a/src/Grammar/Capture.php
+++ b/src/Grammar/Capture.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\PatternCollectionInterface;
 
+/** @internal */
 class Capture implements PatternCollectionInterface
 {
     public function __construct(
diff --git a/src/Grammar/CollectionPattern.php b/src/Grammar/CollectionPattern.php
index 9b9baf2..2b05283 100644
--- a/src/Grammar/CollectionPattern.php
+++ b/src/Grammar/CollectionPattern.php
@@ -5,6 +5,7 @@
 use Phiki\Contracts\PatternCollectionInterface;
 use Phiki\Tokenizer;
 
+/** @internal */
 class CollectionPattern extends Pattern implements PatternCollectionInterface
 {
     /**
diff --git a/src/Grammar/DefaultGrammars.php b/src/Grammar/DefaultGrammars.php
index 504c940..686797f 100644
--- a/src/Grammar/DefaultGrammars.php
+++ b/src/Grammar/DefaultGrammars.php
@@ -2,6 +2,7 @@
 
 namespace Phiki\Grammar;
 
+/** @internal */
 abstract class DefaultGrammars
 {
     final const NAMES_TO_PATHS = [
diff --git a/src/Grammar/EndPattern.php b/src/Grammar/EndPattern.php
index 4c2ee34..6892d38 100644
--- a/src/Grammar/EndPattern.php
+++ b/src/Grammar/EndPattern.php
@@ -9,6 +9,7 @@
 use Phiki\Support\Regex;
 use Phiki\Tokenizer;
 
+/** @internal */
 class EndPattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface, ProvidesContentName
 {
     public function __construct(
diff --git a/src/Grammar/IncludePattern.php b/src/Grammar/IncludePattern.php
index e730c9c..98ec286 100644
--- a/src/Grammar/IncludePattern.php
+++ b/src/Grammar/IncludePattern.php
@@ -4,6 +4,7 @@
 
 use Phiki\Tokenizer;
 
+/** @internal */
 class IncludePattern extends Pattern
 {
     public function __construct(
diff --git a/src/Grammar/Injections/Composite.php b/src/Grammar/Injections/Composite.php
index 91b55c4..329457c 100644
--- a/src/Grammar/Injections/Composite.php
+++ b/src/Grammar/Injections/Composite.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\InjectionMatcherInterface;
 
+/** @internal */
 class Composite implements InjectionMatcherInterface
 {
     /**
diff --git a/src/Grammar/Injections/Expression.php b/src/Grammar/Injections/Expression.php
index 244adf5..fad644c 100644
--- a/src/Grammar/Injections/Expression.php
+++ b/src/Grammar/Injections/Expression.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\InjectionMatcherInterface;
 
+/** @internal */
 class Expression implements InjectionMatcherInterface
 {
     public function __construct(
diff --git a/src/Grammar/Injections/Filter.php b/src/Grammar/Injections/Filter.php
index e3e1e46..94a0e52 100644
--- a/src/Grammar/Injections/Filter.php
+++ b/src/Grammar/Injections/Filter.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\InjectionMatcherInterface;
 
+/** @internal */
 class Filter implements InjectionMatcherInterface
 {
     public function __construct(
diff --git a/src/Grammar/Injections/Group.php b/src/Grammar/Injections/Group.php
index d8181bb..4ea8fce 100644
--- a/src/Grammar/Injections/Group.php
+++ b/src/Grammar/Injections/Group.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\InjectionMatcherInterface;
 
+/** @internal */
 class Group implements InjectionMatcherInterface
 {
     public function __construct(
diff --git a/src/Grammar/Injections/Injection.php b/src/Grammar/Injections/Injection.php
index fde4b1f..b959eb5 100644
--- a/src/Grammar/Injections/Injection.php
+++ b/src/Grammar/Injections/Injection.php
@@ -5,6 +5,7 @@
 use Phiki\Contracts\InjectionMatcherInterface;
 use Phiki\Contracts\PatternInterface;
 
+/** @internal */
 class Injection implements InjectionMatcherInterface
 {
     public function __construct(
diff --git a/src/Grammar/Injections/Operator.php b/src/Grammar/Injections/Operator.php
index f442dfe..c9f868b 100644
--- a/src/Grammar/Injections/Operator.php
+++ b/src/Grammar/Injections/Operator.php
@@ -2,6 +2,7 @@
 
 namespace Phiki\Grammar\Injections;
 
+/** @internal */
 enum Operator
 {
     case Or;
diff --git a/src/Grammar/Injections/Path.php b/src/Grammar/Injections/Path.php
index aa1440f..7f7030c 100644
--- a/src/Grammar/Injections/Path.php
+++ b/src/Grammar/Injections/Path.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\InjectionMatcherInterface;
 
+/** @internal */
 class Path implements InjectionMatcherInterface
 {
     public function __construct(
diff --git a/src/Grammar/Injections/Prefix.php b/src/Grammar/Injections/Prefix.php
index ccb4668..4f2202e 100644
--- a/src/Grammar/Injections/Prefix.php
+++ b/src/Grammar/Injections/Prefix.php
@@ -2,6 +2,7 @@
 
 namespace Phiki\Grammar\Injections;
 
+/** @internal */
 enum Prefix
 {
     case Left;
diff --git a/src/Grammar/Injections/Scope.php b/src/Grammar/Injections/Scope.php
index 26594a9..aa35d2f 100644
--- a/src/Grammar/Injections/Scope.php
+++ b/src/Grammar/Injections/Scope.php
@@ -4,6 +4,7 @@
 
 use Stringable;
 
+/** @internal */
 class Scope implements Stringable
 {
     public function __construct(
diff --git a/src/Grammar/Injections/Selector.php b/src/Grammar/Injections/Selector.php
index 000ecf6..a99f7ed 100644
--- a/src/Grammar/Injections/Selector.php
+++ b/src/Grammar/Injections/Selector.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\InjectionMatcherInterface;
 
+/** @internal */
 class Selector implements InjectionMatcherInterface
 {
     /**
diff --git a/src/Grammar/MatchPattern.php b/src/Grammar/MatchPattern.php
index 78023f6..c637ab5 100644
--- a/src/Grammar/MatchPattern.php
+++ b/src/Grammar/MatchPattern.php
@@ -7,6 +7,7 @@
 use Phiki\Support\Regex;
 use Phiki\Tokenizer;
 
+/** @internal */
 class MatchPattern extends Pattern implements ContainsCapturesInterface
 {
     /**
diff --git a/src/Grammar/MatchedInjection.php b/src/Grammar/MatchedInjection.php
index 8ba331c..3e88131 100644
--- a/src/Grammar/MatchedInjection.php
+++ b/src/Grammar/MatchedInjection.php
@@ -4,6 +4,7 @@
 
 use Phiki\Grammar\Injections\Injection;
 
+/** @internal */
 class MatchedInjection
 {
     public function __construct(
diff --git a/src/Grammar/MatchedPattern.php b/src/Grammar/MatchedPattern.php
index 2c2d01e..4d9079a 100644
--- a/src/Grammar/MatchedPattern.php
+++ b/src/Grammar/MatchedPattern.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\PatternInterface;
 
+/** @internal */
 class MatchedPattern
 {
     public function __construct(
diff --git a/src/Grammar/ParsedGrammar.php b/src/Grammar/ParsedGrammar.php
index 48bb32c..61bedd1 100644
--- a/src/Grammar/ParsedGrammar.php
+++ b/src/Grammar/ParsedGrammar.php
@@ -5,6 +5,7 @@
 use Phiki\Contracts\PatternCollectionInterface;
 use Phiki\Tokenizer;
 
+/** @internal */
 final class ParsedGrammar extends Pattern implements PatternCollectionInterface
 {
     /**
diff --git a/src/Grammar/Parser.php b/src/Grammar/Parser.php
index b907d0a..ff63782 100644
--- a/src/Grammar/Parser.php
+++ b/src/Grammar/Parser.php
@@ -17,6 +17,7 @@
 use Phiki\Grammar\Injections\Selector;
 use Phiki\Support\Regex;
 
+/** @internal */
 class Parser
 {
     protected string $scopeName;
diff --git a/src/Grammar/Pattern.php b/src/Grammar/Pattern.php
index 5cf0f4c..0425ba5 100644
--- a/src/Grammar/Pattern.php
+++ b/src/Grammar/Pattern.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\PatternInterface;
 
+/** @internal */
 abstract class Pattern implements PatternInterface
 {
     public function produceScopes(array $scopes): array
diff --git a/src/Grammar/WhilePattern.php b/src/Grammar/WhilePattern.php
index f320947..f131571 100644
--- a/src/Grammar/WhilePattern.php
+++ b/src/Grammar/WhilePattern.php
@@ -9,6 +9,7 @@
 use Phiki\Support\Regex;
 use Phiki\Tokenizer;
 
+/** @internal */
 class WhilePattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface, ProvidesContentName
 {
     public function __construct(

From 95feb9139bd68677b65dbaeeb9173a7fa7fcbc44 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:46:37 +0000
Subject: [PATCH 07/23] Mark Tokenizer as internal

---
 src/Tokenizer.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index 60e138c..efa1372 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -23,6 +23,9 @@
 use Phiki\Grammar\WhilePattern;
 use Phiki\Token\Token;
 
+/**
+ * @internal To directly interact with a set of tokens, use the `Phiki::codeToTokens()` method instead.
+ */
 class Tokenizer
 {
     protected State $state;

From 02a29e0ee37465a131c95b781289c090fccaed5e Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:48:01 +0000
Subject: [PATCH 08/23] Pass the pattern through to the processor directly

---
 src/Tokenizer.php | 50 ++++++++++-------------------------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index efa1372..8979467 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -295,23 +295,17 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
         }
 
         match (true) {
-            $pattern instanceof MatchPattern => $this->processMatch($matched, $line, $lineText),
-            $pattern instanceof BeginEndPattern => $this->processBeginEnd($matched, $line, $lineText),
-            $pattern instanceof BeginWhilePattern => $this->processBeginWhile($matched, $line, $lineText),
-            $pattern instanceof EndPattern => $this->processEnd($matched, $line, $lineText),
-            $pattern instanceof WhilePattern => $this->processWhile($matched, $line, $lineText),
+            $pattern instanceof MatchPattern => $this->processMatch($matched, $pattern, $line, $lineText),
+            $pattern instanceof BeginEndPattern => $this->processBeginEnd($matched, $pattern, $line, $lineText),
+            $pattern instanceof BeginWhilePattern => $this->processBeginWhile($matched, $pattern, $line, $lineText),
+            $pattern instanceof EndPattern => $this->processEnd($matched, $pattern, $line, $lineText),
+            $pattern instanceof WhilePattern => $this->processWhile($matched, $pattern, $line, $lineText),
             default => throw new UnreachableException(),
         };
     }
 
-    protected function processMatch(MatchedPattern $matched, int $line, string $lineText): void
+    protected function processMatch(MatchedPattern $matched, MatchPattern $pattern, int $line, string $lineText): void
     {
-        if (! $matched->pattern instanceof MatchPattern) {
-            throw new UnreachableException();
-        }
-
-        $pattern = $matched->pattern;
-
         if (! $pattern->hasCaptures()) {
             if ($matched->text() !== '') {
                 $this->tokens[$line][] = new Token(
@@ -351,14 +345,8 @@ protected function processMatch(MatchedPattern $matched, int $line, string $line
         }
     }
 
-    protected function processBeginEnd(MatchedPattern $matched, int $line, string $lineText): void
+    protected function processBeginEnd(MatchedPattern $matched, BeginEndPattern $pattern, int $line, string $lineText): void
     {
-        if (! $matched->pattern instanceof BeginEndPattern) {
-            throw new UnreachableException();
-        }
-
-        $pattern = $matched->pattern;
-
         if ($pattern->scope()) {
             $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
         }
@@ -402,14 +390,8 @@ protected function processBeginEnd(MatchedPattern $matched, int $line, string $l
         $this->state->pushPattern($endPattern);
     }
 
-    protected function processBeginWhile(MatchedPattern $matched, int $line, string $lineText): void
+    protected function processBeginWhile(MatchedPattern $matched, BeginWhilePattern $pattern, int $line, string $lineText): void
     {
-        if (! $matched->pattern instanceof BeginWhilePattern) {
-            throw new UnreachableException();
-        }
-
-        $pattern = $matched->pattern;
-
         if ($pattern->scope()) {
             $this->state->pushScopes($this->processScope($pattern->scope(), $matched));
         }
@@ -443,14 +425,8 @@ protected function processBeginWhile(MatchedPattern $matched, int $line, string
         $this->state->pushPattern($whilePattern);
     }
 
-    protected function processEnd(MatchedPattern $matched, int $line, string $lineText): void
+    protected function processEnd(MatchedPattern $matched, EndPattern $pattern, int $line, string $lineText): void
     {
-        if (! $matched->pattern instanceof EndPattern) {
-            throw new UnreachableException();
-        }
-
-        $pattern = $matched->pattern;
-
         // FIXME: This is a bit of hack. There's a bug somewhere that is incorrectly popping the end scope off
         // of the stack before we're done with that specific scope. This will prevent this from happening.
         if ($pattern->scope()) {
@@ -479,14 +455,8 @@ protected function processEnd(MatchedPattern $matched, int $line, string $lineTe
         $this->state->setLinePosition($matched->end());
     }
 
-    protected function processWhile(MatchedPattern $matched, int $line, string $lineText): void
+    protected function processWhile(MatchedPattern $matched, WhilePattern $pattern, int $line, string $lineText): void
     {
-        if (! $matched->pattern instanceof WhilePattern) {
-            throw new UnreachableException();
-        }
-
-        $pattern = $matched->pattern;
-
         if ($pattern->hasCaptures()) {
             $this->captures($matched, $line, $lineText);
         } else {

From 8412c1ac7489a5041e70eeee955d01b2c130758b Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:49:08 +0000
Subject: [PATCH 09/23] Make PHPStan happy

---
 composer.json     | 2 +-
 src/Tokenizer.php | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 653748b..2b1d840 100644
--- a/composer.json
+++ b/composer.json
@@ -55,6 +55,6 @@
             "@php ./meta/update-sources.php"
         ],
         "test": "@php -dmemory_limit=-1 vendor/bin/pest --enforce-time-limit --default-time-limit=1",
-        "lint": "vendor/bin/phpstan"
+        "lint": "vendor/bin/phpstan --memory-limit=-1"
     }
 }
diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index 8979467..53dd021 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -370,10 +370,9 @@ protected function processBeginEnd(MatchedPattern $matched, BeginEndPattern $pat
 
         $this->state->setAnchorPosition($matched->end());
 
-        /** @phpstan-ignore-next-line method.notFound */
         $endPattern = $pattern->createEndPattern($matched);
 
-        if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
+        if ($pattern->getContentName() !== null) {
             $this->state->pushScope($pattern->getContentName());
         }
 
@@ -383,7 +382,7 @@ protected function processBeginEnd(MatchedPattern $matched, BeginEndPattern $pat
             return;
         }
 
-        if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
+        if ($pattern->getContentName() !== null) {
             $this->state->popScope();
         }
 
@@ -415,10 +414,9 @@ protected function processBeginWhile(MatchedPattern $matched, BeginWhilePattern
 
         $this->state->setAnchorPosition($matched->end());
 
-        /** @phpstan-ignore-next-line method.notFound */
         $whilePattern = $pattern->createWhilePattern($matched);
 
-        if ($pattern instanceof ProvidesContentName && $pattern->getContentName() !== null) {
+        if ($pattern->getContentName() !== null) {
             $this->state->pushScope($pattern->getContentName());
         }
 

From 22290e3ca3362274da77097a3f6dc77b8c3fa919 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:53:11 +0000
Subject: [PATCH 10/23] Remove unused property

---
 src/Contracts/EngineInterface.php | 8 ++++++++
 src/Support/Regex.php             | 6 ++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 src/Contracts/EngineInterface.php

diff --git a/src/Contracts/EngineInterface.php b/src/Contracts/EngineInterface.php
new file mode 100644
index 0000000..addbcd7
--- /dev/null
+++ b/src/Contracts/EngineInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Phiki\Contracts;
+
+interface EngineInterface
+{
+    
+}
diff --git a/src/Support/Regex.php b/src/Support/Regex.php
index 1ac41c3..5adf82e 100644
--- a/src/Support/Regex.php
+++ b/src/Support/Regex.php
@@ -26,10 +26,8 @@ class Regex implements Stringable
 
     protected string $pattern;
 
-    public function __construct(
-        string $pattern,
-        protected ?string $lowered = null,
-    ) {
+    public function __construct(string $pattern)
+    {
         $length = strlen($pattern);
         $lastPushedPos = 0;
         $output = [];

From 72aaaba3762fb359312ca46dcf3c2d1a53180343 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 00:53:36 +0000
Subject: [PATCH 11/23] Format code

---
 composer.json                     | 3 ++-
 src/Contracts/EngineInterface.php | 5 +----
 src/Tokenizer.php                 | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 2b1d840..fdd9563 100644
--- a/composer.json
+++ b/composer.json
@@ -55,6 +55,7 @@
             "@php ./meta/update-sources.php"
         ],
         "test": "@php -dmemory_limit=-1 vendor/bin/pest --enforce-time-limit --default-time-limit=1",
-        "lint": "vendor/bin/phpstan --memory-limit=-1"
+        "lint": "vendor/bin/phpstan --memory-limit=-1",
+        "fmt": "vendor/bin/pint"
     }
 }
diff --git a/src/Contracts/EngineInterface.php b/src/Contracts/EngineInterface.php
index addbcd7..af37a73 100644
--- a/src/Contracts/EngineInterface.php
+++ b/src/Contracts/EngineInterface.php
@@ -2,7 +2,4 @@
 
 namespace Phiki\Contracts;
 
-interface EngineInterface
-{
-    
-}
+interface EngineInterface {}
diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index 53dd021..4b90ca9 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -300,7 +300,7 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
             $pattern instanceof BeginWhilePattern => $this->processBeginWhile($matched, $pattern, $line, $lineText),
             $pattern instanceof EndPattern => $this->processEnd($matched, $pattern, $line, $lineText),
             $pattern instanceof WhilePattern => $this->processWhile($matched, $pattern, $line, $lineText),
-            default => throw new UnreachableException(),
+            default => throw new UnreachableException,
         };
     }
 
@@ -628,7 +628,7 @@ protected function captures(MatchedPattern $pattern, int $line, string $lineText
                                     }
                                 }
 
-                                // If we haven't found a subpattern, we need to break out of this loop 
+                                // If we haven't found a subpattern, we need to break out of this loop
                                 // since we should now be able to match the end pattern.
                                 //
                                 // If we can't find the end pattern after this, then the grammar is incorrect :D

From 9589cd4df6b99d23abd32149d175432533315813 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Thu, 27 Mar 2025 01:12:46 +0000
Subject: [PATCH 12/23] Remove EngineInterface

---
 src/Contracts/EngineInterface.php | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 src/Contracts/EngineInterface.php

diff --git a/src/Contracts/EngineInterface.php b/src/Contracts/EngineInterface.php
deleted file mode 100644
index af37a73..0000000
--- a/src/Contracts/EngineInterface.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-namespace Phiki\Contracts;
-
-interface EngineInterface {}

From 52f5e26d185db8cddd74451086c64a33cfb81460 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:13:17 +0100
Subject: [PATCH 13/23] Implement CLI using symfony/console

---
 bin/phiki                        | 104 ++-----------------------------
 composer.json                    |   3 +-
 src/Console/HighlightCommand.php |  36 +++++++++++
 3 files changed, 44 insertions(+), 99 deletions(-)
 create mode 100644 src/Console/HighlightCommand.php

diff --git a/bin/phiki b/bin/phiki
index b8b8ca8..cb5c27f 100755
--- a/bin/phiki
+++ b/bin/phiki
@@ -3,105 +3,13 @@
 
 namespace Phiki\Console;
 
-use Phiki\Phiki;
+use Symfony\Component\Console\Application;
 
-$vendorPath = dirname(__DIR__, 4) . '/vendor/autoload.php';
-$localPath = dirname(__DIR__) . '/vendor/autoload.php';
+require_once file_exists(__DIR__ . '/../vendor/autoload.php') ? __DIR__ . '/../vendor/autoload.php' : __DIR__ . '/../../autoload.php';
 
-if (file_exists($vendorPath)) {
-    require_once $vendorPath;
-} else {
-    require_once $localPath;
-}
+$application = new Application('Phiki');
 
-function main(int $argc, array $argv): void {
-    if ($argc === 0) {
-        help();
-        exit(1);
-    }
+$application->add(new HighlightCommand());
+$application->setDefaultCommand('highlight', true);
+$application->run();
 
-    $args = parse_args($argv);
-    
-    if (! file_exists($args['file'])) {
-        echo "File not found: {$args['file']}\n";
-        exit(1);
-    }
-
-    $phiki = new Phiki();
-    
-    echo $phiki->codeToTerminal(
-        file_get_contents($args['file']),
-        $args['grammar'],
-        $args['theme']
-    );
-}
-
-function parse_args(array $argv): array {
-    $args = [];
-    $processed = [];
-
-    foreach ($argv as $i => $arg) {
-        if (in_array($arg, ['-h', '--help'])) {
-            help();
-            exit(0);
-        }
-
-        if (in_array($arg, ['-g', '--grammar'])) {
-            $processed[] = $i;
-
-            if (! isset($argv[$i + 1]) || str_starts_with($argv[$i + 1], '-')) {
-                echo "Please specify a grammar using the -g or --grammar option.\n";
-                exit(1);
-            }
-
-            $args['grammar'] = $argv[$i + 1];
-            $processed[] = $i + 1;
-        }
-
-        if (in_array($arg, ['-t', '--theme'])) {
-            $processed[] = $i;
-
-            if (! isset($argv[$i + 1]) || str_starts_with($argv[$i + 1], '-')) {
-                echo "Please specify a theme using the -t or --theme option.\n";
-                exit(1);
-            }
-
-            $args['theme'] = $argv[$i + 1];
-            $processed[] = $i + 1;
-        }
-
-        if (isset($args['grammar']) && isset($args['theme'])) {
-            break;
-        }
-    }
-
-    $remaining = array_values(array_filter($argv, fn (int $index) => ! in_array($index, $processed), ARRAY_FILTER_USE_KEY));
-
-    if ($remaining === []) {
-        echo "Please specify a file to highlight.\n";
-        exit(1);
-    }
-
-    if (count($remaining) > 1) {
-        echo "Please specify only one file to highlight.\n";
-        exit(1);
-    }
-
-    $args['file'] = $remaining[0];
-
-    return $args;
-}
-
-function help(): void {
-    echo <<<'TXT'
-    Usage: phiki [options] <file>
-
-    Options:
-        -h, --help      Show this help message
-        -g, --grammar   Specify which grammar to use (e.g. php, javascript, ...)
-        -t, --theme     Specify which theme to use (e.g. github-dark, ayu-dark, ...)
-
-    TXT;
-}
-
-main($argc - 1, array_slice($argv, 1));
diff --git a/composer.json b/composer.json
index fdd9563..e36b6d8 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,8 @@
     "bin": "bin/phiki",
     "require": {
         "php": "^8.2",
-        "league/commonmark": "^2.5.3"
+        "league/commonmark": "^2.5.3",
+        "symfony/console": "^7.2"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Console/HighlightCommand.php b/src/Console/HighlightCommand.php
new file mode 100644
index 0000000..5f356f2
--- /dev/null
+++ b/src/Console/HighlightCommand.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Phiki\Console;
+
+use Phiki\Phiki;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+#[AsCommand('highlight', 'Highlight the given file using the chosen theme and grammar.')]
+class HighlightCommand extends Command
+{
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $phiki = new Phiki();
+        
+        echo $phiki->codeToTerminal(
+            file_get_contents($input->getArgument('file')),
+            $input->getOption('grammar'),
+            $input->getOption('theme'),
+        );
+
+        return 1;
+    }
+
+    protected function configure()
+    {
+        $this
+            ->addArgument('file', InputArgument::REQUIRED, 'The file to highlight.')
+            ->addOption('theme', 't', InputOption::VALUE_REQUIRED, 'The theme to use.')
+            ->addOption('grammar', 'g', InputOption::VALUE_REQUIRED, 'The grammar to use.');
+    }
+}

From 22fa686f4b225041d28cabf9828db31b9d2d7c54 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:13:32 +0100
Subject: [PATCH 14/23] Format code

---
 meta/patches/cpp.php             |   2 +-
 src/Console/HighlightCommand.php |   4 +-
 src/Grammar/DefaultGrammars.php  | 880 +++++++++++++++----------------
 src/Grammar/Grammar.php          | 440 ++++++++--------
 src/Theme/DefaultThemes.php      | 110 ++--
 src/Theme/Theme.php              | 110 ++--
 6 files changed, 773 insertions(+), 773 deletions(-)

diff --git a/meta/patches/cpp.php b/meta/patches/cpp.php
index 531f05e..912416e 100644
--- a/meta/patches/cpp.php
+++ b/meta/patches/cpp.php
@@ -3,5 +3,5 @@
 return [
 
     '(?=.)' => '(?=\\\\.)',
-    
+
 ];
diff --git a/src/Console/HighlightCommand.php b/src/Console/HighlightCommand.php
index 5f356f2..6953828 100644
--- a/src/Console/HighlightCommand.php
+++ b/src/Console/HighlightCommand.php
@@ -15,8 +15,8 @@ class HighlightCommand extends Command
 {
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $phiki = new Phiki();
-        
+        $phiki = new Phiki;
+
         echo $phiki->codeToTerminal(
             file_get_contents($input->getArgument('file')),
             $input->getOption('grammar'),
diff --git a/src/Grammar/DefaultGrammars.php b/src/Grammar/DefaultGrammars.php
index 686797f..15ba87e 100644
--- a/src/Grammar/DefaultGrammars.php
+++ b/src/Grammar/DefaultGrammars.php
@@ -6,448 +6,448 @@
 abstract class DefaultGrammars
 {
     final const NAMES_TO_PATHS = [
-        'txt' => __DIR__ . '/../../resources/languages/txt.json',
-        "astro" => __DIR__ . "/../../resources/languages/astro.json",
-"hy" => __DIR__ . "/../../resources/languages/hy.json",
-"nim" => __DIR__ . "/../../resources/languages/nim.json",
-"cpp" => __DIR__ . "/../../resources/languages/cpp.json",
-"jinja" => __DIR__ . "/../../resources/languages/jinja.json",
-"coq" => __DIR__ . "/../../resources/languages/coq.json",
-"templ" => __DIR__ . "/../../resources/languages/templ.json",
-"glimmer-ts" => __DIR__ . "/../../resources/languages/glimmer-ts.json",
-"angular-html" => __DIR__ . "/../../resources/languages/angular-html.json",
-"cmake" => __DIR__ . "/../../resources/languages/cmake.json",
-"mdx" => __DIR__ . "/../../resources/languages/mdx.json",
-"nix" => __DIR__ . "/../../resources/languages/nix.json",
-"gdresource" => __DIR__ . "/../../resources/languages/gdresource.json",
-"haxe" => __DIR__ . "/../../resources/languages/haxe.json",
-"ada" => __DIR__ . "/../../resources/languages/ada.json",
-"powerquery" => __DIR__ . "/../../resources/languages/powerquery.json",
-"fluent" => __DIR__ . "/../../resources/languages/fluent.json",
-"objective-c" => __DIR__ . "/../../resources/languages/objective-c.json",
-"elixir" => __DIR__ . "/../../resources/languages/elixir.json",
-"diff" => __DIR__ . "/../../resources/languages/diff.json",
-"java" => __DIR__ . "/../../resources/languages/java.json",
-"glsl" => __DIR__ . "/../../resources/languages/glsl.json",
-"mojo" => __DIR__ . "/../../resources/languages/mojo.json",
-"sparql" => __DIR__ . "/../../resources/languages/sparql.json",
-"bicep" => __DIR__ . "/../../resources/languages/bicep.json",
-"csv" => __DIR__ . "/../../resources/languages/csv.json",
-"swift" => __DIR__ . "/../../resources/languages/swift.json",
-"ssh-config" => __DIR__ . "/../../resources/languages/ssh-config.json",
-"edge" => __DIR__ . "/../../resources/languages/edge.json",
-"narrat" => __DIR__ . "/../../resources/languages/narrat.json",
-"tasl" => __DIR__ . "/../../resources/languages/tasl.json",
-"nushell" => __DIR__ . "/../../resources/languages/nushell.json",
-"erb" => __DIR__ . "/../../resources/languages/erb.json",
-"move" => __DIR__ . "/../../resources/languages/move.json",
-"scheme" => __DIR__ . "/../../resources/languages/scheme.json",
-"mipsasm" => __DIR__ . "/../../resources/languages/mipsasm.json",
-"rst" => __DIR__ . "/../../resources/languages/rst.json",
-"shellscript" => __DIR__ . "/../../resources/languages/shellscript.json",
-"apache" => __DIR__ . "/../../resources/languages/apache.json",
-"wgsl" => __DIR__ . "/../../resources/languages/wgsl.json",
-"fortran-free-form" => __DIR__ . "/../../resources/languages/fortran-free-form.json",
-"ini" => __DIR__ . "/../../resources/languages/ini.json",
-"make" => __DIR__ . "/../../resources/languages/make.json",
-"ts-tags" => __DIR__ . "/../../resources/languages/ts-tags.json",
-"stylus" => __DIR__ . "/../../resources/languages/stylus.json",
-"jsx" => __DIR__ . "/../../resources/languages/jsx.json",
-"jsonl" => __DIR__ . "/../../resources/languages/jsonl.json",
-"twig" => __DIR__ . "/../../resources/languages/twig.json",
-"clojure" => __DIR__ . "/../../resources/languages/clojure.json",
-"svelte" => __DIR__ . "/../../resources/languages/svelte.json",
-"xml" => __DIR__ . "/../../resources/languages/xml.json",
-"jssm" => __DIR__ . "/../../resources/languages/jssm.json",
-"erlang" => __DIR__ . "/../../resources/languages/erlang.json",
-"applescript" => __DIR__ . "/../../resources/languages/applescript.json",
-"viml" => __DIR__ . "/../../resources/languages/viml.json",
-"razor" => __DIR__ . "/../../resources/languages/razor.json",
-"apex" => __DIR__ . "/../../resources/languages/apex.json",
-"berry" => __DIR__ . "/../../resources/languages/berry.json",
-"dream-maker" => __DIR__ . "/../../resources/languages/dream-maker.json",
-"wolfram" => __DIR__ . "/../../resources/languages/wolfram.json",
-"cobol" => __DIR__ . "/../../resources/languages/cobol.json",
-"proto" => __DIR__ . "/../../resources/languages/proto.json",
-"genie" => __DIR__ . "/../../resources/languages/genie.json",
-"wasm" => __DIR__ . "/../../resources/languages/wasm.json",
-"handlebars" => __DIR__ . "/../../resources/languages/handlebars.json",
-"zig" => __DIR__ . "/../../resources/languages/zig.json",
-"vhdl" => __DIR__ . "/../../resources/languages/vhdl.json",
-"go" => __DIR__ . "/../../resources/languages/go.json",
-"fish" => __DIR__ . "/../../resources/languages/fish.json",
-"solidity" => __DIR__ . "/../../resources/languages/solidity.json",
-"sas" => __DIR__ . "/../../resources/languages/sas.json",
-"fortran-fixed-form" => __DIR__ . "/../../resources/languages/fortran-fixed-form.json",
-"r" => __DIR__ . "/../../resources/languages/r.json",
-"fennel" => __DIR__ . "/../../resources/languages/fennel.json",
-"ruby" => __DIR__ . "/../../resources/languages/ruby.json",
-"log" => __DIR__ . "/../../resources/languages/log.json",
-"vala" => __DIR__ . "/../../resources/languages/vala.json",
-"splunk" => __DIR__ . "/../../resources/languages/splunk.json",
-"lua" => __DIR__ . "/../../resources/languages/lua.json",
-"gnuplot" => __DIR__ . "/../../resources/languages/gnuplot.json",
-"regexp" => __DIR__ . "/../../resources/languages/regexp.json",
-"markdown" => __DIR__ . "/../../resources/languages/markdown.json",
-"ballerina" => __DIR__ . "/../../resources/languages/ballerina.json",
-"xsl" => __DIR__ . "/../../resources/languages/xsl.json",
-"systemd" => __DIR__ . "/../../resources/languages/systemd.json",
-"coffee" => __DIR__ . "/../../resources/languages/coffee.json",
-"haml" => __DIR__ . "/../../resources/languages/haml.json",
-"wikitext" => __DIR__ . "/../../resources/languages/wikitext.json",
-"kusto" => __DIR__ . "/../../resources/languages/kusto.json",
-"ocaml" => __DIR__ . "/../../resources/languages/ocaml.json",
-"cue" => __DIR__ . "/../../resources/languages/cue.json",
-"nextflow" => __DIR__ . "/../../resources/languages/nextflow.json",
-"git-rebase" => __DIR__ . "/../../resources/languages/git-rebase.json",
-"cypher" => __DIR__ . "/../../resources/languages/cypher.json",
-"tsx" => __DIR__ . "/../../resources/languages/tsx.json",
-"bibtex" => __DIR__ . "/../../resources/languages/bibtex.json",
-"pug" => __DIR__ . "/../../resources/languages/pug.json",
-"glimmer-js" => __DIR__ . "/../../resources/languages/glimmer-js.json",
-"julia" => __DIR__ . "/../../resources/languages/julia.json",
-"beancount" => __DIR__ . "/../../resources/languages/beancount.json",
-"puppet" => __DIR__ . "/../../resources/languages/puppet.json",
-"bsl" => __DIR__ . "/../../resources/languages/bsl.json",
-"http" => __DIR__ . "/../../resources/languages/http.json",
-"csharp" => __DIR__ . "/../../resources/languages/csharp.json",
-"jison" => __DIR__ . "/../../resources/languages/jison.json",
-"purescript" => __DIR__ . "/../../resources/languages/purescript.json",
-"actionscript-3" => __DIR__ . "/../../resources/languages/actionscript-3.json",
-"shellsession" => __DIR__ . "/../../resources/languages/shellsession.json",
-"system-verilog" => __DIR__ . "/../../resources/languages/system-verilog.json",
-"gdscript" => __DIR__ . "/../../resources/languages/gdscript.json",
-"luau" => __DIR__ . "/../../resources/languages/luau.json",
-"toml" => __DIR__ . "/../../resources/languages/toml.json",
-"php" => __DIR__ . "/../../resources/languages/php.json",
-"typst" => __DIR__ . "/../../resources/languages/typst.json",
-"postcss" => __DIR__ . "/../../resources/languages/postcss.json",
-"prisma" => __DIR__ . "/../../resources/languages/prisma.json",
-"fsharp" => __DIR__ . "/../../resources/languages/fsharp.json",
-"apl" => __DIR__ . "/../../resources/languages/apl.json",
-"sql" => __DIR__ . "/../../resources/languages/sql.json",
-"objective-cpp" => __DIR__ . "/../../resources/languages/objective-cpp.json",
-"logo" => __DIR__ . "/../../resources/languages/logo.json",
-"blade" => __DIR__ . "/../../resources/languages/blade.json",
-"yaml" => __DIR__ . "/../../resources/languages/yaml.json",
-"scala" => __DIR__ . "/../../resources/languages/scala.json",
-"codeql" => __DIR__ . "/../../resources/languages/codeql.json",
-"crystal" => __DIR__ . "/../../resources/languages/crystal.json",
-"sdbl" => __DIR__ . "/../../resources/languages/sdbl.json",
-"hjson" => __DIR__ . "/../../resources/languages/hjson.json",
-"awk" => __DIR__ . "/../../resources/languages/awk.json",
-"docker" => __DIR__ . "/../../resources/languages/docker.json",
-"dax" => __DIR__ . "/../../resources/languages/dax.json",
-"angular-ts" => __DIR__ . "/../../resources/languages/angular-ts.json",
-"terraform" => __DIR__ . "/../../resources/languages/terraform.json",
-"typespec" => __DIR__ . "/../../resources/languages/typespec.json",
-"codeowners" => __DIR__ . "/../../resources/languages/codeowners.json",
-"rel" => __DIR__ . "/../../resources/languages/rel.json",
-"vue-html" => __DIR__ . "/../../resources/languages/vue-html.json",
-"abap" => __DIR__ . "/../../resources/languages/abap.json",
-"git-commit" => __DIR__ . "/../../resources/languages/git-commit.json",
-"rust" => __DIR__ . "/../../resources/languages/rust.json",
-"polar" => __DIR__ . "/../../resources/languages/polar.json",
-"javascript" => __DIR__ . "/../../resources/languages/javascript.json",
-"prolog" => __DIR__ . "/../../resources/languages/prolog.json",
-"dart" => __DIR__ . "/../../resources/languages/dart.json",
-"marko" => __DIR__ . "/../../resources/languages/marko.json",
-"asciidoc" => __DIR__ . "/../../resources/languages/asciidoc.json",
-"wenyan" => __DIR__ . "/../../resources/languages/wenyan.json",
-"elm" => __DIR__ . "/../../resources/languages/elm.json",
-"d" => __DIR__ . "/../../resources/languages/d.json",
-"hlsl" => __DIR__ . "/../../resources/languages/hlsl.json",
-"po" => __DIR__ . "/../../resources/languages/po.json",
-"shaderlab" => __DIR__ . "/../../resources/languages/shaderlab.json",
-"stata" => __DIR__ . "/../../resources/languages/stata.json",
-"nginx" => __DIR__ . "/../../resources/languages/nginx.json",
-"ara" => __DIR__ . "/../../resources/languages/ara.json",
-"json" => __DIR__ . "/../../resources/languages/json.json",
-"css" => __DIR__ . "/../../resources/languages/css.json",
-"tsv" => __DIR__ . "/../../resources/languages/tsv.json",
-"vb" => __DIR__ . "/../../resources/languages/vb.json",
-"hcl" => __DIR__ . "/../../resources/languages/hcl.json",
-"plsql" => __DIR__ . "/../../resources/languages/plsql.json",
-"pascal" => __DIR__ . "/../../resources/languages/pascal.json",
-"c" => __DIR__ . "/../../resources/languages/c.json",
-"turtle" => __DIR__ . "/../../resources/languages/turtle.json",
-"qmldir" => __DIR__ . "/../../resources/languages/qmldir.json",
-"jinja-html" => __DIR__ . "/../../resources/languages/jinja-html.json",
-"racket" => __DIR__ . "/../../resources/languages/racket.json",
-"scss" => __DIR__ . "/../../resources/languages/scss.json",
-"hxml" => __DIR__ . "/../../resources/languages/hxml.json",
-"qml" => __DIR__ . "/../../resources/languages/qml.json",
-"common-lisp" => __DIR__ . "/../../resources/languages/common-lisp.json",
-"lean" => __DIR__ . "/../../resources/languages/lean.json",
-"tex" => __DIR__ . "/../../resources/languages/tex.json",
-"jsonnet" => __DIR__ . "/../../resources/languages/jsonnet.json",
-"vyper" => __DIR__ . "/../../resources/languages/vyper.json",
-"html" => __DIR__ . "/../../resources/languages/html.json",
-"liquid" => __DIR__ . "/../../resources/languages/liquid.json",
-"emacs-lisp" => __DIR__ . "/../../resources/languages/emacs-lisp.json",
-"v" => __DIR__ . "/../../resources/languages/v.json",
-"hack" => __DIR__ . "/../../resources/languages/hack.json",
-"latex" => __DIR__ . "/../../resources/languages/latex.json",
-"perl" => __DIR__ . "/../../resources/languages/perl.json",
-"gleam" => __DIR__ . "/../../resources/languages/gleam.json",
-"cairo" => __DIR__ . "/../../resources/languages/cairo.json",
-"matlab" => __DIR__ . "/../../resources/languages/matlab.json",
-"jsonc" => __DIR__ . "/../../resources/languages/jsonc.json",
-"dotenv" => __DIR__ . "/../../resources/languages/dotenv.json",
-"raku" => __DIR__ . "/../../resources/languages/raku.json",
-"less" => __DIR__ . "/../../resources/languages/less.json",
-"bat" => __DIR__ . "/../../resources/languages/bat.json",
-"clarity" => __DIR__ . "/../../resources/languages/clarity.json",
-"reg" => __DIR__ . "/../../resources/languages/reg.json",
-"cpp-macro" => __DIR__ . "/../../resources/languages/cpp-macro.json",
-"tcl" => __DIR__ . "/../../resources/languages/tcl.json",
-"html-derivative" => __DIR__ . "/../../resources/languages/html-derivative.json",
-"powershell" => __DIR__ . "/../../resources/languages/powershell.json",
-"graphql" => __DIR__ . "/../../resources/languages/graphql.json",
-"haskell" => __DIR__ . "/../../resources/languages/haskell.json",
-"gdshader" => __DIR__ . "/../../resources/languages/gdshader.json",
-"groovy" => __DIR__ . "/../../resources/languages/groovy.json",
-"qss" => __DIR__ . "/../../resources/languages/qss.json",
-"verilog" => __DIR__ . "/../../resources/languages/verilog.json",
-"typescript" => __DIR__ . "/../../resources/languages/typescript.json",
-"kotlin" => __DIR__ . "/../../resources/languages/kotlin.json",
-"gherkin" => __DIR__ . "/../../resources/languages/gherkin.json",
-"soy" => __DIR__ . "/../../resources/languages/soy.json",
-"python" => __DIR__ . "/../../resources/languages/python.json",
-"sass" => __DIR__ . "/../../resources/languages/sass.json",
-"talonscript" => __DIR__ . "/../../resources/languages/talonscript.json",
-"vue" => __DIR__ . "/../../resources/languages/vue.json",
-"zenscript" => __DIR__ . "/../../resources/languages/zenscript.json",
-"imba" => __DIR__ . "/../../resources/languages/imba.json",
-"riscv" => __DIR__ . "/../../resources/languages/riscv.json",
-"smalltalk" => __DIR__ . "/../../resources/languages/smalltalk.json",
-"json5" => __DIR__ . "/../../resources/languages/json5.json",
-"cadence" => __DIR__ . "/../../resources/languages/cadence.json",
-"desktop" => __DIR__ . "/../../resources/languages/desktop.json",
-"asm" => __DIR__ . "/../../resources/languages/asm.json",
-"antlers" => __DIR__ . "/../../resources/languages/antlers.json"
+        'txt' => __DIR__.'/../../resources/languages/txt.json',
+        'astro' => __DIR__.'/../../resources/languages/astro.json',
+        'hy' => __DIR__.'/../../resources/languages/hy.json',
+        'nim' => __DIR__.'/../../resources/languages/nim.json',
+        'cpp' => __DIR__.'/../../resources/languages/cpp.json',
+        'jinja' => __DIR__.'/../../resources/languages/jinja.json',
+        'coq' => __DIR__.'/../../resources/languages/coq.json',
+        'templ' => __DIR__.'/../../resources/languages/templ.json',
+        'glimmer-ts' => __DIR__.'/../../resources/languages/glimmer-ts.json',
+        'angular-html' => __DIR__.'/../../resources/languages/angular-html.json',
+        'cmake' => __DIR__.'/../../resources/languages/cmake.json',
+        'mdx' => __DIR__.'/../../resources/languages/mdx.json',
+        'nix' => __DIR__.'/../../resources/languages/nix.json',
+        'gdresource' => __DIR__.'/../../resources/languages/gdresource.json',
+        'haxe' => __DIR__.'/../../resources/languages/haxe.json',
+        'ada' => __DIR__.'/../../resources/languages/ada.json',
+        'powerquery' => __DIR__.'/../../resources/languages/powerquery.json',
+        'fluent' => __DIR__.'/../../resources/languages/fluent.json',
+        'objective-c' => __DIR__.'/../../resources/languages/objective-c.json',
+        'elixir' => __DIR__.'/../../resources/languages/elixir.json',
+        'diff' => __DIR__.'/../../resources/languages/diff.json',
+        'java' => __DIR__.'/../../resources/languages/java.json',
+        'glsl' => __DIR__.'/../../resources/languages/glsl.json',
+        'mojo' => __DIR__.'/../../resources/languages/mojo.json',
+        'sparql' => __DIR__.'/../../resources/languages/sparql.json',
+        'bicep' => __DIR__.'/../../resources/languages/bicep.json',
+        'csv' => __DIR__.'/../../resources/languages/csv.json',
+        'swift' => __DIR__.'/../../resources/languages/swift.json',
+        'ssh-config' => __DIR__.'/../../resources/languages/ssh-config.json',
+        'edge' => __DIR__.'/../../resources/languages/edge.json',
+        'narrat' => __DIR__.'/../../resources/languages/narrat.json',
+        'tasl' => __DIR__.'/../../resources/languages/tasl.json',
+        'nushell' => __DIR__.'/../../resources/languages/nushell.json',
+        'erb' => __DIR__.'/../../resources/languages/erb.json',
+        'move' => __DIR__.'/../../resources/languages/move.json',
+        'scheme' => __DIR__.'/../../resources/languages/scheme.json',
+        'mipsasm' => __DIR__.'/../../resources/languages/mipsasm.json',
+        'rst' => __DIR__.'/../../resources/languages/rst.json',
+        'shellscript' => __DIR__.'/../../resources/languages/shellscript.json',
+        'apache' => __DIR__.'/../../resources/languages/apache.json',
+        'wgsl' => __DIR__.'/../../resources/languages/wgsl.json',
+        'fortran-free-form' => __DIR__.'/../../resources/languages/fortran-free-form.json',
+        'ini' => __DIR__.'/../../resources/languages/ini.json',
+        'make' => __DIR__.'/../../resources/languages/make.json',
+        'ts-tags' => __DIR__.'/../../resources/languages/ts-tags.json',
+        'stylus' => __DIR__.'/../../resources/languages/stylus.json',
+        'jsx' => __DIR__.'/../../resources/languages/jsx.json',
+        'jsonl' => __DIR__.'/../../resources/languages/jsonl.json',
+        'twig' => __DIR__.'/../../resources/languages/twig.json',
+        'clojure' => __DIR__.'/../../resources/languages/clojure.json',
+        'svelte' => __DIR__.'/../../resources/languages/svelte.json',
+        'xml' => __DIR__.'/../../resources/languages/xml.json',
+        'jssm' => __DIR__.'/../../resources/languages/jssm.json',
+        'erlang' => __DIR__.'/../../resources/languages/erlang.json',
+        'applescript' => __DIR__.'/../../resources/languages/applescript.json',
+        'viml' => __DIR__.'/../../resources/languages/viml.json',
+        'razor' => __DIR__.'/../../resources/languages/razor.json',
+        'apex' => __DIR__.'/../../resources/languages/apex.json',
+        'berry' => __DIR__.'/../../resources/languages/berry.json',
+        'dream-maker' => __DIR__.'/../../resources/languages/dream-maker.json',
+        'wolfram' => __DIR__.'/../../resources/languages/wolfram.json',
+        'cobol' => __DIR__.'/../../resources/languages/cobol.json',
+        'proto' => __DIR__.'/../../resources/languages/proto.json',
+        'genie' => __DIR__.'/../../resources/languages/genie.json',
+        'wasm' => __DIR__.'/../../resources/languages/wasm.json',
+        'handlebars' => __DIR__.'/../../resources/languages/handlebars.json',
+        'zig' => __DIR__.'/../../resources/languages/zig.json',
+        'vhdl' => __DIR__.'/../../resources/languages/vhdl.json',
+        'go' => __DIR__.'/../../resources/languages/go.json',
+        'fish' => __DIR__.'/../../resources/languages/fish.json',
+        'solidity' => __DIR__.'/../../resources/languages/solidity.json',
+        'sas' => __DIR__.'/../../resources/languages/sas.json',
+        'fortran-fixed-form' => __DIR__.'/../../resources/languages/fortran-fixed-form.json',
+        'r' => __DIR__.'/../../resources/languages/r.json',
+        'fennel' => __DIR__.'/../../resources/languages/fennel.json',
+        'ruby' => __DIR__.'/../../resources/languages/ruby.json',
+        'log' => __DIR__.'/../../resources/languages/log.json',
+        'vala' => __DIR__.'/../../resources/languages/vala.json',
+        'splunk' => __DIR__.'/../../resources/languages/splunk.json',
+        'lua' => __DIR__.'/../../resources/languages/lua.json',
+        'gnuplot' => __DIR__.'/../../resources/languages/gnuplot.json',
+        'regexp' => __DIR__.'/../../resources/languages/regexp.json',
+        'markdown' => __DIR__.'/../../resources/languages/markdown.json',
+        'ballerina' => __DIR__.'/../../resources/languages/ballerina.json',
+        'xsl' => __DIR__.'/../../resources/languages/xsl.json',
+        'systemd' => __DIR__.'/../../resources/languages/systemd.json',
+        'coffee' => __DIR__.'/../../resources/languages/coffee.json',
+        'haml' => __DIR__.'/../../resources/languages/haml.json',
+        'wikitext' => __DIR__.'/../../resources/languages/wikitext.json',
+        'kusto' => __DIR__.'/../../resources/languages/kusto.json',
+        'ocaml' => __DIR__.'/../../resources/languages/ocaml.json',
+        'cue' => __DIR__.'/../../resources/languages/cue.json',
+        'nextflow' => __DIR__.'/../../resources/languages/nextflow.json',
+        'git-rebase' => __DIR__.'/../../resources/languages/git-rebase.json',
+        'cypher' => __DIR__.'/../../resources/languages/cypher.json',
+        'tsx' => __DIR__.'/../../resources/languages/tsx.json',
+        'bibtex' => __DIR__.'/../../resources/languages/bibtex.json',
+        'pug' => __DIR__.'/../../resources/languages/pug.json',
+        'glimmer-js' => __DIR__.'/../../resources/languages/glimmer-js.json',
+        'julia' => __DIR__.'/../../resources/languages/julia.json',
+        'beancount' => __DIR__.'/../../resources/languages/beancount.json',
+        'puppet' => __DIR__.'/../../resources/languages/puppet.json',
+        'bsl' => __DIR__.'/../../resources/languages/bsl.json',
+        'http' => __DIR__.'/../../resources/languages/http.json',
+        'csharp' => __DIR__.'/../../resources/languages/csharp.json',
+        'jison' => __DIR__.'/../../resources/languages/jison.json',
+        'purescript' => __DIR__.'/../../resources/languages/purescript.json',
+        'actionscript-3' => __DIR__.'/../../resources/languages/actionscript-3.json',
+        'shellsession' => __DIR__.'/../../resources/languages/shellsession.json',
+        'system-verilog' => __DIR__.'/../../resources/languages/system-verilog.json',
+        'gdscript' => __DIR__.'/../../resources/languages/gdscript.json',
+        'luau' => __DIR__.'/../../resources/languages/luau.json',
+        'toml' => __DIR__.'/../../resources/languages/toml.json',
+        'php' => __DIR__.'/../../resources/languages/php.json',
+        'typst' => __DIR__.'/../../resources/languages/typst.json',
+        'postcss' => __DIR__.'/../../resources/languages/postcss.json',
+        'prisma' => __DIR__.'/../../resources/languages/prisma.json',
+        'fsharp' => __DIR__.'/../../resources/languages/fsharp.json',
+        'apl' => __DIR__.'/../../resources/languages/apl.json',
+        'sql' => __DIR__.'/../../resources/languages/sql.json',
+        'objective-cpp' => __DIR__.'/../../resources/languages/objective-cpp.json',
+        'logo' => __DIR__.'/../../resources/languages/logo.json',
+        'blade' => __DIR__.'/../../resources/languages/blade.json',
+        'yaml' => __DIR__.'/../../resources/languages/yaml.json',
+        'scala' => __DIR__.'/../../resources/languages/scala.json',
+        'codeql' => __DIR__.'/../../resources/languages/codeql.json',
+        'crystal' => __DIR__.'/../../resources/languages/crystal.json',
+        'sdbl' => __DIR__.'/../../resources/languages/sdbl.json',
+        'hjson' => __DIR__.'/../../resources/languages/hjson.json',
+        'awk' => __DIR__.'/../../resources/languages/awk.json',
+        'docker' => __DIR__.'/../../resources/languages/docker.json',
+        'dax' => __DIR__.'/../../resources/languages/dax.json',
+        'angular-ts' => __DIR__.'/../../resources/languages/angular-ts.json',
+        'terraform' => __DIR__.'/../../resources/languages/terraform.json',
+        'typespec' => __DIR__.'/../../resources/languages/typespec.json',
+        'codeowners' => __DIR__.'/../../resources/languages/codeowners.json',
+        'rel' => __DIR__.'/../../resources/languages/rel.json',
+        'vue-html' => __DIR__.'/../../resources/languages/vue-html.json',
+        'abap' => __DIR__.'/../../resources/languages/abap.json',
+        'git-commit' => __DIR__.'/../../resources/languages/git-commit.json',
+        'rust' => __DIR__.'/../../resources/languages/rust.json',
+        'polar' => __DIR__.'/../../resources/languages/polar.json',
+        'javascript' => __DIR__.'/../../resources/languages/javascript.json',
+        'prolog' => __DIR__.'/../../resources/languages/prolog.json',
+        'dart' => __DIR__.'/../../resources/languages/dart.json',
+        'marko' => __DIR__.'/../../resources/languages/marko.json',
+        'asciidoc' => __DIR__.'/../../resources/languages/asciidoc.json',
+        'wenyan' => __DIR__.'/../../resources/languages/wenyan.json',
+        'elm' => __DIR__.'/../../resources/languages/elm.json',
+        'd' => __DIR__.'/../../resources/languages/d.json',
+        'hlsl' => __DIR__.'/../../resources/languages/hlsl.json',
+        'po' => __DIR__.'/../../resources/languages/po.json',
+        'shaderlab' => __DIR__.'/../../resources/languages/shaderlab.json',
+        'stata' => __DIR__.'/../../resources/languages/stata.json',
+        'nginx' => __DIR__.'/../../resources/languages/nginx.json',
+        'ara' => __DIR__.'/../../resources/languages/ara.json',
+        'json' => __DIR__.'/../../resources/languages/json.json',
+        'css' => __DIR__.'/../../resources/languages/css.json',
+        'tsv' => __DIR__.'/../../resources/languages/tsv.json',
+        'vb' => __DIR__.'/../../resources/languages/vb.json',
+        'hcl' => __DIR__.'/../../resources/languages/hcl.json',
+        'plsql' => __DIR__.'/../../resources/languages/plsql.json',
+        'pascal' => __DIR__.'/../../resources/languages/pascal.json',
+        'c' => __DIR__.'/../../resources/languages/c.json',
+        'turtle' => __DIR__.'/../../resources/languages/turtle.json',
+        'qmldir' => __DIR__.'/../../resources/languages/qmldir.json',
+        'jinja-html' => __DIR__.'/../../resources/languages/jinja-html.json',
+        'racket' => __DIR__.'/../../resources/languages/racket.json',
+        'scss' => __DIR__.'/../../resources/languages/scss.json',
+        'hxml' => __DIR__.'/../../resources/languages/hxml.json',
+        'qml' => __DIR__.'/../../resources/languages/qml.json',
+        'common-lisp' => __DIR__.'/../../resources/languages/common-lisp.json',
+        'lean' => __DIR__.'/../../resources/languages/lean.json',
+        'tex' => __DIR__.'/../../resources/languages/tex.json',
+        'jsonnet' => __DIR__.'/../../resources/languages/jsonnet.json',
+        'vyper' => __DIR__.'/../../resources/languages/vyper.json',
+        'html' => __DIR__.'/../../resources/languages/html.json',
+        'liquid' => __DIR__.'/../../resources/languages/liquid.json',
+        'emacs-lisp' => __DIR__.'/../../resources/languages/emacs-lisp.json',
+        'v' => __DIR__.'/../../resources/languages/v.json',
+        'hack' => __DIR__.'/../../resources/languages/hack.json',
+        'latex' => __DIR__.'/../../resources/languages/latex.json',
+        'perl' => __DIR__.'/../../resources/languages/perl.json',
+        'gleam' => __DIR__.'/../../resources/languages/gleam.json',
+        'cairo' => __DIR__.'/../../resources/languages/cairo.json',
+        'matlab' => __DIR__.'/../../resources/languages/matlab.json',
+        'jsonc' => __DIR__.'/../../resources/languages/jsonc.json',
+        'dotenv' => __DIR__.'/../../resources/languages/dotenv.json',
+        'raku' => __DIR__.'/../../resources/languages/raku.json',
+        'less' => __DIR__.'/../../resources/languages/less.json',
+        'bat' => __DIR__.'/../../resources/languages/bat.json',
+        'clarity' => __DIR__.'/../../resources/languages/clarity.json',
+        'reg' => __DIR__.'/../../resources/languages/reg.json',
+        'cpp-macro' => __DIR__.'/../../resources/languages/cpp-macro.json',
+        'tcl' => __DIR__.'/../../resources/languages/tcl.json',
+        'html-derivative' => __DIR__.'/../../resources/languages/html-derivative.json',
+        'powershell' => __DIR__.'/../../resources/languages/powershell.json',
+        'graphql' => __DIR__.'/../../resources/languages/graphql.json',
+        'haskell' => __DIR__.'/../../resources/languages/haskell.json',
+        'gdshader' => __DIR__.'/../../resources/languages/gdshader.json',
+        'groovy' => __DIR__.'/../../resources/languages/groovy.json',
+        'qss' => __DIR__.'/../../resources/languages/qss.json',
+        'verilog' => __DIR__.'/../../resources/languages/verilog.json',
+        'typescript' => __DIR__.'/../../resources/languages/typescript.json',
+        'kotlin' => __DIR__.'/../../resources/languages/kotlin.json',
+        'gherkin' => __DIR__.'/../../resources/languages/gherkin.json',
+        'soy' => __DIR__.'/../../resources/languages/soy.json',
+        'python' => __DIR__.'/../../resources/languages/python.json',
+        'sass' => __DIR__.'/../../resources/languages/sass.json',
+        'talonscript' => __DIR__.'/../../resources/languages/talonscript.json',
+        'vue' => __DIR__.'/../../resources/languages/vue.json',
+        'zenscript' => __DIR__.'/../../resources/languages/zenscript.json',
+        'imba' => __DIR__.'/../../resources/languages/imba.json',
+        'riscv' => __DIR__.'/../../resources/languages/riscv.json',
+        'smalltalk' => __DIR__.'/../../resources/languages/smalltalk.json',
+        'json5' => __DIR__.'/../../resources/languages/json5.json',
+        'cadence' => __DIR__.'/../../resources/languages/cadence.json',
+        'desktop' => __DIR__.'/../../resources/languages/desktop.json',
+        'asm' => __DIR__.'/../../resources/languages/asm.json',
+        'antlers' => __DIR__.'/../../resources/languages/antlers.json',
     ];
 
     final const SCOPES_TO_NAMES = [
         'text.txt' => 'txt',
-        "source.astro" => "astro",
-"source.hy" => "hy",
-"source.nim" => "nim",
-"source.cpp" => "cpp",
-"source.jinja" => "jinja",
-"source.coq" => "coq",
-"source.templ" => "templ",
-"source.gts" => "glimmer-ts",
-"text.html.derivative.ng" => "angular-html",
-"source.cmake" => "cmake",
-"source.mdx" => "mdx",
-"source.nix" => "nix",
-"source.gdresource" => "gdresource",
-"source.hx" => "haxe",
-"source.ada" => "ada",
-"source.powerquery" => "powerquery",
-"source.ftl" => "fluent",
-"source.objc" => "objective-c",
-"source.elixir" => "elixir",
-"source.diff" => "diff",
-"source.java" => "java",
-"source.glsl" => "glsl",
-"source.mojo" => "mojo",
-"source.sparql" => "sparql",
-"source.bicep" => "bicep",
-"text.csv" => "csv",
-"source.swift" => "swift",
-"source.ssh-config" => "ssh-config",
-"text.html.edge" => "edge",
-"source.narrat" => "narrat",
-"source.tasl" => "tasl",
-"source.nushell" => "nushell",
-"text.html.erb" => "erb",
-"source.move" => "move",
-"source.scheme" => "scheme",
-"source.mips" => "mipsasm",
-"source.rst" => "rst",
-"source.shell" => "shellscript",
-"source.apacheconf" => "apache",
-"source.wgsl" => "wgsl",
-"source.fortran.free" => "fortran-free-form",
-"source.ini" => "ini",
-"source.makefile" => "make",
-"source.ts.tags" => "ts-tags",
-"source.stylus" => "stylus",
-"source.js.jsx" => "jsx",
-"source.json.lines" => "jsonl",
-"text.html.twig" => "twig",
-"source.clojure" => "clojure",
-"source.svelte" => "svelte",
-"text.xml" => "xml",
-"source.jssm" => "jssm",
-"source.erlang" => "erlang",
-"source.applescript" => "applescript",
-"source.viml" => "viml",
-"text.aspnetcorerazor" => "razor",
-"source.apex" => "apex",
-"source.berry" => "berry",
-"source.dm" => "dream-maker",
-"source.wolfram" => "wolfram",
-"source.cobol" => "cobol",
-"source.proto" => "proto",
-"source.genie" => "genie",
-"source.wat" => "wasm",
-"text.html.handlebars" => "handlebars",
-"source.zig" => "zig",
-"source.vhdl" => "vhdl",
-"source.go" => "go",
-"source.fish" => "fish",
-"source.solidity" => "solidity",
-"source.sas" => "sas",
-"source.fortran.fixed" => "fortran-fixed-form",
-"source.r" => "r",
-"source.fnl" => "fennel",
-"source.ruby" => "ruby",
-"text.log" => "log",
-"source.vala" => "vala",
-"source.splunk_search" => "splunk",
-"source.lua" => "lua",
-"source.gnuplot" => "gnuplot",
-"source.regexp.python" => "regexp",
-"text.html.markdown" => "markdown",
-"source.ballerina" => "ballerina",
-"text.xml.xsl" => "xsl",
-"source.systemd" => "systemd",
-"source.coffee" => "coffee",
-"text.haml" => "haml",
-"source.wikitext" => "wikitext",
-"source.kusto" => "kusto",
-"source.ocaml" => "ocaml",
-"source.cue" => "cue",
-"source.nextflow" => "nextflow",
-"text.git-rebase" => "git-rebase",
-"source.cypher" => "cypher",
-"source.tsx" => "tsx",
-"text.bibtex" => "bibtex",
-"text.pug" => "pug",
-"source.gjs" => "glimmer-js",
-"source.julia" => "julia",
-"text.beancount" => "beancount",
-"source.puppet" => "puppet",
-"source.bsl" => "bsl",
-"source.http" => "http",
-"source.cs" => "csharp",
-"source.jison" => "jison",
-"source.purescript" => "purescript",
-"source.actionscript.3" => "actionscript-3",
-"text.shell-session" => "shellsession",
-"source.systemverilog" => "system-verilog",
-"source.gdscript" => "gdscript",
-"source.luau" => "luau",
-"source.toml" => "toml",
-"source.php" => "php",
-"source.typst" => "typst",
-"source.css.postcss" => "postcss",
-"source.prisma" => "prisma",
-"source.fsharp" => "fsharp",
-"source.apl" => "apl",
-"source.sql" => "sql",
-"source.objcpp" => "objective-cpp",
-"source.logo" => "logo",
-"text.html.php.blade" => "blade",
-"source.yaml" => "yaml",
-"source.scala" => "scala",
-"source.ql" => "codeql",
-"source.crystal" => "crystal",
-"source.sdbl" => "sdbl",
-"source.hjson" => "hjson",
-"source.awk" => "awk",
-"source.dockerfile" => "docker",
-"source.dax" => "dax",
-"source.ts.ng" => "angular-ts",
-"source.hcl.terraform" => "terraform",
-"source.tsp" => "typespec",
-"text.codeowners" => "codeowners",
-"source.rel" => "rel",
-"text.html.vue-html" => "vue-html",
-"source.abap" => "abap",
-"text.git-commit" => "git-commit",
-"source.rust" => "rust",
-"source.polar" => "polar",
-"source.js" => "javascript",
-"source.prolog" => "prolog",
-"source.dart" => "dart",
-"text.marko" => "marko",
-"text.asciidoc" => "asciidoc",
-"source.wenyan" => "wenyan",
-"source.elm" => "elm",
-"source.d" => "d",
-"source.hlsl" => "hlsl",
-"source.po" => "po",
-"source.shaderlab" => "shaderlab",
-"source.stata" => "stata",
-"source.nginx" => "nginx",
-"source.ara" => "ara",
-"source.json" => "json",
-"source.css" => "css",
-"text.tsv" => "tsv",
-"source.asp.vb.net" => "vb",
-"source.hcl" => "hcl",
-"source.plsql.oracle" => "plsql",
-"source.pascal" => "pascal",
-"source.c" => "c",
-"source.turtle" => "turtle",
-"source.qmldir" => "qmldir",
-"text.html.jinja" => "jinja-html",
-"source.racket" => "racket",
-"source.css.scss" => "scss",
-"source.hxml" => "hxml",
-"source.qml" => "qml",
-"source.commonlisp" => "common-lisp",
-"source.lean4" => "lean",
-"text.tex" => "tex",
-"source.jsonnet" => "jsonnet",
-"source.vyper" => "vyper",
-"text.html.basic" => "html",
-"text.html.liquid" => "liquid",
-"source.emacs.lisp" => "emacs-lisp",
-"source.v" => "v",
-"source.hack" => "hack",
-"text.tex.latex" => "latex",
-"source.perl" => "perl",
-"source.gleam" => "gleam",
-"source.cairo0" => "cairo",
-"source.matlab" => "matlab",
-"source.json.comments" => "jsonc",
-"source.dotenv" => "dotenv",
-"source.perl.6" => "raku",
-"source.css.less" => "less",
-"source.batchfile" => "bat",
-"source.clar" => "clarity",
-"source.reg" => "reg",
-"source.cpp.embedded.macro" => "cpp-macro",
-"source.tcl" => "tcl",
-"text.html.derivative" => "html-derivative",
-"source.powershell" => "powershell",
-"source.graphql" => "graphql",
-"source.haskell" => "haskell",
-"source.gdshader" => "gdshader",
-"source.groovy" => "groovy",
-"source.qss" => "qss",
-"source.verilog" => "verilog",
-"source.ts" => "typescript",
-"source.kotlin" => "kotlin",
-"text.gherkin.feature" => "gherkin",
-"text.html.soy" => "soy",
-"source.python" => "python",
-"source.sass" => "sass",
-"source.talon" => "talonscript",
-"source.vue" => "vue",
-"source.zenscript" => "zenscript",
-"source.imba" => "imba",
-"source.riscv" => "riscv",
-"source.smalltalk" => "smalltalk",
-"source.json5" => "json5",
-"source.cadence" => "cadence",
-"source.desktop" => "desktop",
-"source.asm.x86_64" => "asm",
-"text.html.statamic" => "antlers"
+        'source.astro' => 'astro',
+        'source.hy' => 'hy',
+        'source.nim' => 'nim',
+        'source.cpp' => 'cpp',
+        'source.jinja' => 'jinja',
+        'source.coq' => 'coq',
+        'source.templ' => 'templ',
+        'source.gts' => 'glimmer-ts',
+        'text.html.derivative.ng' => 'angular-html',
+        'source.cmake' => 'cmake',
+        'source.mdx' => 'mdx',
+        'source.nix' => 'nix',
+        'source.gdresource' => 'gdresource',
+        'source.hx' => 'haxe',
+        'source.ada' => 'ada',
+        'source.powerquery' => 'powerquery',
+        'source.ftl' => 'fluent',
+        'source.objc' => 'objective-c',
+        'source.elixir' => 'elixir',
+        'source.diff' => 'diff',
+        'source.java' => 'java',
+        'source.glsl' => 'glsl',
+        'source.mojo' => 'mojo',
+        'source.sparql' => 'sparql',
+        'source.bicep' => 'bicep',
+        'text.csv' => 'csv',
+        'source.swift' => 'swift',
+        'source.ssh-config' => 'ssh-config',
+        'text.html.edge' => 'edge',
+        'source.narrat' => 'narrat',
+        'source.tasl' => 'tasl',
+        'source.nushell' => 'nushell',
+        'text.html.erb' => 'erb',
+        'source.move' => 'move',
+        'source.scheme' => 'scheme',
+        'source.mips' => 'mipsasm',
+        'source.rst' => 'rst',
+        'source.shell' => 'shellscript',
+        'source.apacheconf' => 'apache',
+        'source.wgsl' => 'wgsl',
+        'source.fortran.free' => 'fortran-free-form',
+        'source.ini' => 'ini',
+        'source.makefile' => 'make',
+        'source.ts.tags' => 'ts-tags',
+        'source.stylus' => 'stylus',
+        'source.js.jsx' => 'jsx',
+        'source.json.lines' => 'jsonl',
+        'text.html.twig' => 'twig',
+        'source.clojure' => 'clojure',
+        'source.svelte' => 'svelte',
+        'text.xml' => 'xml',
+        'source.jssm' => 'jssm',
+        'source.erlang' => 'erlang',
+        'source.applescript' => 'applescript',
+        'source.viml' => 'viml',
+        'text.aspnetcorerazor' => 'razor',
+        'source.apex' => 'apex',
+        'source.berry' => 'berry',
+        'source.dm' => 'dream-maker',
+        'source.wolfram' => 'wolfram',
+        'source.cobol' => 'cobol',
+        'source.proto' => 'proto',
+        'source.genie' => 'genie',
+        'source.wat' => 'wasm',
+        'text.html.handlebars' => 'handlebars',
+        'source.zig' => 'zig',
+        'source.vhdl' => 'vhdl',
+        'source.go' => 'go',
+        'source.fish' => 'fish',
+        'source.solidity' => 'solidity',
+        'source.sas' => 'sas',
+        'source.fortran.fixed' => 'fortran-fixed-form',
+        'source.r' => 'r',
+        'source.fnl' => 'fennel',
+        'source.ruby' => 'ruby',
+        'text.log' => 'log',
+        'source.vala' => 'vala',
+        'source.splunk_search' => 'splunk',
+        'source.lua' => 'lua',
+        'source.gnuplot' => 'gnuplot',
+        'source.regexp.python' => 'regexp',
+        'text.html.markdown' => 'markdown',
+        'source.ballerina' => 'ballerina',
+        'text.xml.xsl' => 'xsl',
+        'source.systemd' => 'systemd',
+        'source.coffee' => 'coffee',
+        'text.haml' => 'haml',
+        'source.wikitext' => 'wikitext',
+        'source.kusto' => 'kusto',
+        'source.ocaml' => 'ocaml',
+        'source.cue' => 'cue',
+        'source.nextflow' => 'nextflow',
+        'text.git-rebase' => 'git-rebase',
+        'source.cypher' => 'cypher',
+        'source.tsx' => 'tsx',
+        'text.bibtex' => 'bibtex',
+        'text.pug' => 'pug',
+        'source.gjs' => 'glimmer-js',
+        'source.julia' => 'julia',
+        'text.beancount' => 'beancount',
+        'source.puppet' => 'puppet',
+        'source.bsl' => 'bsl',
+        'source.http' => 'http',
+        'source.cs' => 'csharp',
+        'source.jison' => 'jison',
+        'source.purescript' => 'purescript',
+        'source.actionscript.3' => 'actionscript-3',
+        'text.shell-session' => 'shellsession',
+        'source.systemverilog' => 'system-verilog',
+        'source.gdscript' => 'gdscript',
+        'source.luau' => 'luau',
+        'source.toml' => 'toml',
+        'source.php' => 'php',
+        'source.typst' => 'typst',
+        'source.css.postcss' => 'postcss',
+        'source.prisma' => 'prisma',
+        'source.fsharp' => 'fsharp',
+        'source.apl' => 'apl',
+        'source.sql' => 'sql',
+        'source.objcpp' => 'objective-cpp',
+        'source.logo' => 'logo',
+        'text.html.php.blade' => 'blade',
+        'source.yaml' => 'yaml',
+        'source.scala' => 'scala',
+        'source.ql' => 'codeql',
+        'source.crystal' => 'crystal',
+        'source.sdbl' => 'sdbl',
+        'source.hjson' => 'hjson',
+        'source.awk' => 'awk',
+        'source.dockerfile' => 'docker',
+        'source.dax' => 'dax',
+        'source.ts.ng' => 'angular-ts',
+        'source.hcl.terraform' => 'terraform',
+        'source.tsp' => 'typespec',
+        'text.codeowners' => 'codeowners',
+        'source.rel' => 'rel',
+        'text.html.vue-html' => 'vue-html',
+        'source.abap' => 'abap',
+        'text.git-commit' => 'git-commit',
+        'source.rust' => 'rust',
+        'source.polar' => 'polar',
+        'source.js' => 'javascript',
+        'source.prolog' => 'prolog',
+        'source.dart' => 'dart',
+        'text.marko' => 'marko',
+        'text.asciidoc' => 'asciidoc',
+        'source.wenyan' => 'wenyan',
+        'source.elm' => 'elm',
+        'source.d' => 'd',
+        'source.hlsl' => 'hlsl',
+        'source.po' => 'po',
+        'source.shaderlab' => 'shaderlab',
+        'source.stata' => 'stata',
+        'source.nginx' => 'nginx',
+        'source.ara' => 'ara',
+        'source.json' => 'json',
+        'source.css' => 'css',
+        'text.tsv' => 'tsv',
+        'source.asp.vb.net' => 'vb',
+        'source.hcl' => 'hcl',
+        'source.plsql.oracle' => 'plsql',
+        'source.pascal' => 'pascal',
+        'source.c' => 'c',
+        'source.turtle' => 'turtle',
+        'source.qmldir' => 'qmldir',
+        'text.html.jinja' => 'jinja-html',
+        'source.racket' => 'racket',
+        'source.css.scss' => 'scss',
+        'source.hxml' => 'hxml',
+        'source.qml' => 'qml',
+        'source.commonlisp' => 'common-lisp',
+        'source.lean4' => 'lean',
+        'text.tex' => 'tex',
+        'source.jsonnet' => 'jsonnet',
+        'source.vyper' => 'vyper',
+        'text.html.basic' => 'html',
+        'text.html.liquid' => 'liquid',
+        'source.emacs.lisp' => 'emacs-lisp',
+        'source.v' => 'v',
+        'source.hack' => 'hack',
+        'text.tex.latex' => 'latex',
+        'source.perl' => 'perl',
+        'source.gleam' => 'gleam',
+        'source.cairo0' => 'cairo',
+        'source.matlab' => 'matlab',
+        'source.json.comments' => 'jsonc',
+        'source.dotenv' => 'dotenv',
+        'source.perl.6' => 'raku',
+        'source.css.less' => 'less',
+        'source.batchfile' => 'bat',
+        'source.clar' => 'clarity',
+        'source.reg' => 'reg',
+        'source.cpp.embedded.macro' => 'cpp-macro',
+        'source.tcl' => 'tcl',
+        'text.html.derivative' => 'html-derivative',
+        'source.powershell' => 'powershell',
+        'source.graphql' => 'graphql',
+        'source.haskell' => 'haskell',
+        'source.gdshader' => 'gdshader',
+        'source.groovy' => 'groovy',
+        'source.qss' => 'qss',
+        'source.verilog' => 'verilog',
+        'source.ts' => 'typescript',
+        'source.kotlin' => 'kotlin',
+        'text.gherkin.feature' => 'gherkin',
+        'text.html.soy' => 'soy',
+        'source.python' => 'python',
+        'source.sass' => 'sass',
+        'source.talon' => 'talonscript',
+        'source.vue' => 'vue',
+        'source.zenscript' => 'zenscript',
+        'source.imba' => 'imba',
+        'source.riscv' => 'riscv',
+        'source.smalltalk' => 'smalltalk',
+        'source.json5' => 'json5',
+        'source.cadence' => 'cadence',
+        'source.desktop' => 'desktop',
+        'source.asm.x86_64' => 'asm',
+        'text.html.statamic' => 'antlers',
     ];
-}
\ No newline at end of file
+}
diff --git a/src/Grammar/Grammar.php b/src/Grammar/Grammar.php
index f4d855c..b330ac3 100644
--- a/src/Grammar/Grammar.php
+++ b/src/Grammar/Grammar.php
@@ -7,228 +7,228 @@
 enum Grammar: string
 {
     case Txt = 'txt';
-    case Astro = "astro";
-case Hy = "hy";
-case Nim = "nim";
-case Cpp = "cpp";
-case Jinja = "jinja";
-case Coq = "coq";
-case Templ = "templ";
-case GlimmerTs = "glimmer-ts";
-case AngularHtml = "angular-html";
-case Cmake = "cmake";
-case Mdx = "mdx";
-case Nix = "nix";
-case Gdresource = "gdresource";
-case Haxe = "haxe";
-case Ada = "ada";
-case Powerquery = "powerquery";
-case Fluent = "fluent";
-case ObjectiveC = "objective-c";
-case Elixir = "elixir";
-case Diff = "diff";
-case Java = "java";
-case Glsl = "glsl";
-case Mojo = "mojo";
-case Sparql = "sparql";
-case Bicep = "bicep";
-case Csv = "csv";
-case Swift = "swift";
-case SshConfig = "ssh-config";
-case Edge = "edge";
-case Narrat = "narrat";
-case Tasl = "tasl";
-case Nushell = "nushell";
-case Erb = "erb";
-case Move = "move";
-case Scheme = "scheme";
-case Mipsasm = "mipsasm";
-case Rst = "rst";
-case Shellscript = "shellscript";
-case Apache = "apache";
-case Wgsl = "wgsl";
-case FortranFreeForm = "fortran-free-form";
-case Ini = "ini";
-case Make = "make";
-case TsTags = "ts-tags";
-case Stylus = "stylus";
-case Jsx = "jsx";
-case Jsonl = "jsonl";
-case Twig = "twig";
-case Clojure = "clojure";
-case Svelte = "svelte";
-case Xml = "xml";
-case Jssm = "jssm";
-case Erlang = "erlang";
-case Applescript = "applescript";
-case Viml = "viml";
-case Razor = "razor";
-case Apex = "apex";
-case Berry = "berry";
-case DreamMaker = "dream-maker";
-case Wolfram = "wolfram";
-case Cobol = "cobol";
-case Proto = "proto";
-case Genie = "genie";
-case Wasm = "wasm";
-case Handlebars = "handlebars";
-case Zig = "zig";
-case Vhdl = "vhdl";
-case Go = "go";
-case Fish = "fish";
-case Solidity = "solidity";
-case Sas = "sas";
-case FortranFixedForm = "fortran-fixed-form";
-case R = "r";
-case Fennel = "fennel";
-case Ruby = "ruby";
-case Log = "log";
-case Vala = "vala";
-case Splunk = "splunk";
-case Lua = "lua";
-case Gnuplot = "gnuplot";
-case Regexp = "regexp";
-case Markdown = "markdown";
-case Ballerina = "ballerina";
-case Xsl = "xsl";
-case Systemd = "systemd";
-case Coffee = "coffee";
-case Haml = "haml";
-case Wikitext = "wikitext";
-case Kusto = "kusto";
-case Ocaml = "ocaml";
-case Cue = "cue";
-case Nextflow = "nextflow";
-case GitRebase = "git-rebase";
-case Cypher = "cypher";
-case Tsx = "tsx";
-case Bibtex = "bibtex";
-case Pug = "pug";
-case GlimmerJs = "glimmer-js";
-case Julia = "julia";
-case Beancount = "beancount";
-case Puppet = "puppet";
-case Bsl = "bsl";
-case Http = "http";
-case Csharp = "csharp";
-case Jison = "jison";
-case Purescript = "purescript";
-case Actionscript3 = "actionscript-3";
-case Shellsession = "shellsession";
-case SystemVerilog = "system-verilog";
-case Gdscript = "gdscript";
-case Luau = "luau";
-case Toml = "toml";
-case Php = "php";
-case Typst = "typst";
-case Postcss = "postcss";
-case Prisma = "prisma";
-case Fsharp = "fsharp";
-case Apl = "apl";
-case Sql = "sql";
-case ObjectiveCpp = "objective-cpp";
-case Logo = "logo";
-case Blade = "blade";
-case Yaml = "yaml";
-case Scala = "scala";
-case Codeql = "codeql";
-case Crystal = "crystal";
-case Sdbl = "sdbl";
-case Hjson = "hjson";
-case Awk = "awk";
-case Docker = "docker";
-case Dax = "dax";
-case AngularTs = "angular-ts";
-case Terraform = "terraform";
-case Typespec = "typespec";
-case Codeowners = "codeowners";
-case Rel = "rel";
-case VueHtml = "vue-html";
-case Abap = "abap";
-case GitCommit = "git-commit";
-case Rust = "rust";
-case Polar = "polar";
-case Javascript = "javascript";
-case Prolog = "prolog";
-case Dart = "dart";
-case Marko = "marko";
-case Asciidoc = "asciidoc";
-case Wenyan = "wenyan";
-case Elm = "elm";
-case D = "d";
-case Hlsl = "hlsl";
-case Po = "po";
-case Shaderlab = "shaderlab";
-case Stata = "stata";
-case Nginx = "nginx";
-case Ara = "ara";
-case Json = "json";
-case Css = "css";
-case Tsv = "tsv";
-case Vb = "vb";
-case Hcl = "hcl";
-case Plsql = "plsql";
-case Pascal = "pascal";
-case C = "c";
-case Turtle = "turtle";
-case Qmldir = "qmldir";
-case JinjaHtml = "jinja-html";
-case Racket = "racket";
-case Scss = "scss";
-case Hxml = "hxml";
-case Qml = "qml";
-case CommonLisp = "common-lisp";
-case Lean = "lean";
-case Tex = "tex";
-case Jsonnet = "jsonnet";
-case Vyper = "vyper";
-case Html = "html";
-case Liquid = "liquid";
-case EmacsLisp = "emacs-lisp";
-case V = "v";
-case Hack = "hack";
-case Latex = "latex";
-case Perl = "perl";
-case Gleam = "gleam";
-case Cairo = "cairo";
-case Matlab = "matlab";
-case Jsonc = "jsonc";
-case Dotenv = "dotenv";
-case Raku = "raku";
-case Less = "less";
-case Bat = "bat";
-case Clarity = "clarity";
-case Reg = "reg";
-case CppMacro = "cpp-macro";
-case Tcl = "tcl";
-case HtmlDerivative = "html-derivative";
-case Powershell = "powershell";
-case Graphql = "graphql";
-case Haskell = "haskell";
-case Gdshader = "gdshader";
-case Groovy = "groovy";
-case Qss = "qss";
-case Verilog = "verilog";
-case Typescript = "typescript";
-case Kotlin = "kotlin";
-case Gherkin = "gherkin";
-case Soy = "soy";
-case Python = "python";
-case Sass = "sass";
-case Talonscript = "talonscript";
-case Vue = "vue";
-case Zenscript = "zenscript";
-case Imba = "imba";
-case Riscv = "riscv";
-case Smalltalk = "smalltalk";
-case Json5 = "json5";
-case Cadence = "cadence";
-case Desktop = "desktop";
-case Asm = "asm";
-case Antlers = "antlers";
+    case Astro = 'astro';
+    case Hy = 'hy';
+    case Nim = 'nim';
+    case Cpp = 'cpp';
+    case Jinja = 'jinja';
+    case Coq = 'coq';
+    case Templ = 'templ';
+    case GlimmerTs = 'glimmer-ts';
+    case AngularHtml = 'angular-html';
+    case Cmake = 'cmake';
+    case Mdx = 'mdx';
+    case Nix = 'nix';
+    case Gdresource = 'gdresource';
+    case Haxe = 'haxe';
+    case Ada = 'ada';
+    case Powerquery = 'powerquery';
+    case Fluent = 'fluent';
+    case ObjectiveC = 'objective-c';
+    case Elixir = 'elixir';
+    case Diff = 'diff';
+    case Java = 'java';
+    case Glsl = 'glsl';
+    case Mojo = 'mojo';
+    case Sparql = 'sparql';
+    case Bicep = 'bicep';
+    case Csv = 'csv';
+    case Swift = 'swift';
+    case SshConfig = 'ssh-config';
+    case Edge = 'edge';
+    case Narrat = 'narrat';
+    case Tasl = 'tasl';
+    case Nushell = 'nushell';
+    case Erb = 'erb';
+    case Move = 'move';
+    case Scheme = 'scheme';
+    case Mipsasm = 'mipsasm';
+    case Rst = 'rst';
+    case Shellscript = 'shellscript';
+    case Apache = 'apache';
+    case Wgsl = 'wgsl';
+    case FortranFreeForm = 'fortran-free-form';
+    case Ini = 'ini';
+    case Make = 'make';
+    case TsTags = 'ts-tags';
+    case Stylus = 'stylus';
+    case Jsx = 'jsx';
+    case Jsonl = 'jsonl';
+    case Twig = 'twig';
+    case Clojure = 'clojure';
+    case Svelte = 'svelte';
+    case Xml = 'xml';
+    case Jssm = 'jssm';
+    case Erlang = 'erlang';
+    case Applescript = 'applescript';
+    case Viml = 'viml';
+    case Razor = 'razor';
+    case Apex = 'apex';
+    case Berry = 'berry';
+    case DreamMaker = 'dream-maker';
+    case Wolfram = 'wolfram';
+    case Cobol = 'cobol';
+    case Proto = 'proto';
+    case Genie = 'genie';
+    case Wasm = 'wasm';
+    case Handlebars = 'handlebars';
+    case Zig = 'zig';
+    case Vhdl = 'vhdl';
+    case Go = 'go';
+    case Fish = 'fish';
+    case Solidity = 'solidity';
+    case Sas = 'sas';
+    case FortranFixedForm = 'fortran-fixed-form';
+    case R = 'r';
+    case Fennel = 'fennel';
+    case Ruby = 'ruby';
+    case Log = 'log';
+    case Vala = 'vala';
+    case Splunk = 'splunk';
+    case Lua = 'lua';
+    case Gnuplot = 'gnuplot';
+    case Regexp = 'regexp';
+    case Markdown = 'markdown';
+    case Ballerina = 'ballerina';
+    case Xsl = 'xsl';
+    case Systemd = 'systemd';
+    case Coffee = 'coffee';
+    case Haml = 'haml';
+    case Wikitext = 'wikitext';
+    case Kusto = 'kusto';
+    case Ocaml = 'ocaml';
+    case Cue = 'cue';
+    case Nextflow = 'nextflow';
+    case GitRebase = 'git-rebase';
+    case Cypher = 'cypher';
+    case Tsx = 'tsx';
+    case Bibtex = 'bibtex';
+    case Pug = 'pug';
+    case GlimmerJs = 'glimmer-js';
+    case Julia = 'julia';
+    case Beancount = 'beancount';
+    case Puppet = 'puppet';
+    case Bsl = 'bsl';
+    case Http = 'http';
+    case Csharp = 'csharp';
+    case Jison = 'jison';
+    case Purescript = 'purescript';
+    case Actionscript3 = 'actionscript-3';
+    case Shellsession = 'shellsession';
+    case SystemVerilog = 'system-verilog';
+    case Gdscript = 'gdscript';
+    case Luau = 'luau';
+    case Toml = 'toml';
+    case Php = 'php';
+    case Typst = 'typst';
+    case Postcss = 'postcss';
+    case Prisma = 'prisma';
+    case Fsharp = 'fsharp';
+    case Apl = 'apl';
+    case Sql = 'sql';
+    case ObjectiveCpp = 'objective-cpp';
+    case Logo = 'logo';
+    case Blade = 'blade';
+    case Yaml = 'yaml';
+    case Scala = 'scala';
+    case Codeql = 'codeql';
+    case Crystal = 'crystal';
+    case Sdbl = 'sdbl';
+    case Hjson = 'hjson';
+    case Awk = 'awk';
+    case Docker = 'docker';
+    case Dax = 'dax';
+    case AngularTs = 'angular-ts';
+    case Terraform = 'terraform';
+    case Typespec = 'typespec';
+    case Codeowners = 'codeowners';
+    case Rel = 'rel';
+    case VueHtml = 'vue-html';
+    case Abap = 'abap';
+    case GitCommit = 'git-commit';
+    case Rust = 'rust';
+    case Polar = 'polar';
+    case Javascript = 'javascript';
+    case Prolog = 'prolog';
+    case Dart = 'dart';
+    case Marko = 'marko';
+    case Asciidoc = 'asciidoc';
+    case Wenyan = 'wenyan';
+    case Elm = 'elm';
+    case D = 'd';
+    case Hlsl = 'hlsl';
+    case Po = 'po';
+    case Shaderlab = 'shaderlab';
+    case Stata = 'stata';
+    case Nginx = 'nginx';
+    case Ara = 'ara';
+    case Json = 'json';
+    case Css = 'css';
+    case Tsv = 'tsv';
+    case Vb = 'vb';
+    case Hcl = 'hcl';
+    case Plsql = 'plsql';
+    case Pascal = 'pascal';
+    case C = 'c';
+    case Turtle = 'turtle';
+    case Qmldir = 'qmldir';
+    case JinjaHtml = 'jinja-html';
+    case Racket = 'racket';
+    case Scss = 'scss';
+    case Hxml = 'hxml';
+    case Qml = 'qml';
+    case CommonLisp = 'common-lisp';
+    case Lean = 'lean';
+    case Tex = 'tex';
+    case Jsonnet = 'jsonnet';
+    case Vyper = 'vyper';
+    case Html = 'html';
+    case Liquid = 'liquid';
+    case EmacsLisp = 'emacs-lisp';
+    case V = 'v';
+    case Hack = 'hack';
+    case Latex = 'latex';
+    case Perl = 'perl';
+    case Gleam = 'gleam';
+    case Cairo = 'cairo';
+    case Matlab = 'matlab';
+    case Jsonc = 'jsonc';
+    case Dotenv = 'dotenv';
+    case Raku = 'raku';
+    case Less = 'less';
+    case Bat = 'bat';
+    case Clarity = 'clarity';
+    case Reg = 'reg';
+    case CppMacro = 'cpp-macro';
+    case Tcl = 'tcl';
+    case HtmlDerivative = 'html-derivative';
+    case Powershell = 'powershell';
+    case Graphql = 'graphql';
+    case Haskell = 'haskell';
+    case Gdshader = 'gdshader';
+    case Groovy = 'groovy';
+    case Qss = 'qss';
+    case Verilog = 'verilog';
+    case Typescript = 'typescript';
+    case Kotlin = 'kotlin';
+    case Gherkin = 'gherkin';
+    case Soy = 'soy';
+    case Python = 'python';
+    case Sass = 'sass';
+    case Talonscript = 'talonscript';
+    case Vue = 'vue';
+    case Zenscript = 'zenscript';
+    case Imba = 'imba';
+    case Riscv = 'riscv';
+    case Smalltalk = 'smalltalk';
+    case Json5 = 'json5';
+    case Cadence = 'cadence';
+    case Desktop = 'desktop';
+    case Asm = 'asm';
+    case Antlers = 'antlers';
 
     public function toParsedGrammar(GrammarRepositoryInterface $repository): ParsedGrammar
     {
         return $repository->get($this->value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Theme/DefaultThemes.php b/src/Theme/DefaultThemes.php
index 61d16fb..f0abdd3 100644
--- a/src/Theme/DefaultThemes.php
+++ b/src/Theme/DefaultThemes.php
@@ -4,58 +4,58 @@
 
 abstract class DefaultThemes
 {
-    final const NAMES_TO_PATHS = ["one-dark-pro" => __DIR__ . "/../../resources/themes/one-dark-pro.json",
-"solarized-light" => __DIR__ . "/../../resources/themes/solarized-light.json",
-"vitesse-black" => __DIR__ . "/../../resources/themes/vitesse-black.json",
-"github-light-default" => __DIR__ . "/../../resources/themes/github-light-default.json",
-"slack-dark" => __DIR__ . "/../../resources/themes/slack-dark.json",
-"everforest-dark" => __DIR__ . "/../../resources/themes/everforest-dark.json",
-"rose-pine-moon" => __DIR__ . "/../../resources/themes/rose-pine-moon.json",
-"everforest-light" => __DIR__ . "/../../resources/themes/everforest-light.json",
-"laserwave" => __DIR__ . "/../../resources/themes/laserwave.json",
-"github-light-high-contrast" => __DIR__ . "/../../resources/themes/github-light-high-contrast.json",
-"catppuccin-mocha" => __DIR__ . "/../../resources/themes/catppuccin-mocha.json",
-"red" => __DIR__ . "/../../resources/themes/red.json",
-"material-theme-lighter" => __DIR__ . "/../../resources/themes/material-theme-lighter.json",
-"one-light" => __DIR__ . "/../../resources/themes/one-light.json",
-"aurora-x" => __DIR__ . "/../../resources/themes/aurora-x.json",
-"tokyo-night" => __DIR__ . "/../../resources/themes/tokyo-night.json",
-"catppuccin-macchiato" => __DIR__ . "/../../resources/themes/catppuccin-macchiato.json",
-"github-dark" => __DIR__ . "/../../resources/themes/github-dark.json",
-"rose-pine-dawn" => __DIR__ . "/../../resources/themes/rose-pine-dawn.json",
-"poimandres" => __DIR__ . "/../../resources/themes/poimandres.json",
-"github-dark-high-contrast" => __DIR__ . "/../../resources/themes/github-dark-high-contrast.json",
-"material-theme" => __DIR__ . "/../../resources/themes/material-theme.json",
-"dracula" => __DIR__ . "/../../resources/themes/dracula.json",
-"github-dark-default" => __DIR__ . "/../../resources/themes/github-dark-default.json",
-"github-dark-dimmed" => __DIR__ . "/../../resources/themes/github-dark-dimmed.json",
-"rose-pine" => __DIR__ . "/../../resources/themes/rose-pine.json",
-"kanagawa-lotus" => __DIR__ . "/../../resources/themes/kanagawa-lotus.json",
-"kanagawa-dragon" => __DIR__ . "/../../resources/themes/kanagawa-dragon.json",
-"dark-plus" => __DIR__ . "/../../resources/themes/dark-plus.json",
-"ayu-dark" => __DIR__ . "/../../resources/themes/ayu-dark.json",
-"min-dark" => __DIR__ . "/../../resources/themes/min-dark.json",
-"monokai" => __DIR__ . "/../../resources/themes/monokai.json",
-"nord" => __DIR__ . "/../../resources/themes/nord.json",
-"catppuccin-frappe" => __DIR__ . "/../../resources/themes/catppuccin-frappe.json",
-"github-light" => __DIR__ . "/../../resources/themes/github-light.json",
-"dracula-soft" => __DIR__ . "/../../resources/themes/dracula-soft.json",
-"synthwave-84" => __DIR__ . "/../../resources/themes/synthwave-84.json",
-"vitesse-dark" => __DIR__ . "/../../resources/themes/vitesse-dark.json",
-"andromeeda" => __DIR__ . "/../../resources/themes/andromeeda.json",
-"light-plus" => __DIR__ . "/../../resources/themes/light-plus.json",
-"slack-ochin" => __DIR__ . "/../../resources/themes/slack-ochin.json",
-"solarized-dark" => __DIR__ . "/../../resources/themes/solarized-dark.json",
-"material-theme-ocean" => __DIR__ . "/../../resources/themes/material-theme-ocean.json",
-"vitesse-light" => __DIR__ . "/../../resources/themes/vitesse-light.json",
-"vesper" => __DIR__ . "/../../resources/themes/vesper.json",
-"kanagawa-wave" => __DIR__ . "/../../resources/themes/kanagawa-wave.json",
-"plastic" => __DIR__ . "/../../resources/themes/plastic.json",
-"material-theme-darker" => __DIR__ . "/../../resources/themes/material-theme-darker.json",
-"night-owl" => __DIR__ . "/../../resources/themes/night-owl.json",
-"catppuccin-latte" => __DIR__ . "/../../resources/themes/catppuccin-latte.json",
-"min-light" => __DIR__ . "/../../resources/themes/min-light.json",
-"snazzy-light" => __DIR__ . "/../../resources/themes/snazzy-light.json",
-"houston" => __DIR__ . "/../../resources/themes/houston.json",
-"material-theme-palenight" => __DIR__ . "/../../resources/themes/material-theme-palenight.json"];
-}
\ No newline at end of file
+    final const NAMES_TO_PATHS = ['one-dark-pro' => __DIR__.'/../../resources/themes/one-dark-pro.json',
+        'solarized-light' => __DIR__.'/../../resources/themes/solarized-light.json',
+        'vitesse-black' => __DIR__.'/../../resources/themes/vitesse-black.json',
+        'github-light-default' => __DIR__.'/../../resources/themes/github-light-default.json',
+        'slack-dark' => __DIR__.'/../../resources/themes/slack-dark.json',
+        'everforest-dark' => __DIR__.'/../../resources/themes/everforest-dark.json',
+        'rose-pine-moon' => __DIR__.'/../../resources/themes/rose-pine-moon.json',
+        'everforest-light' => __DIR__.'/../../resources/themes/everforest-light.json',
+        'laserwave' => __DIR__.'/../../resources/themes/laserwave.json',
+        'github-light-high-contrast' => __DIR__.'/../../resources/themes/github-light-high-contrast.json',
+        'catppuccin-mocha' => __DIR__.'/../../resources/themes/catppuccin-mocha.json',
+        'red' => __DIR__.'/../../resources/themes/red.json',
+        'material-theme-lighter' => __DIR__.'/../../resources/themes/material-theme-lighter.json',
+        'one-light' => __DIR__.'/../../resources/themes/one-light.json',
+        'aurora-x' => __DIR__.'/../../resources/themes/aurora-x.json',
+        'tokyo-night' => __DIR__.'/../../resources/themes/tokyo-night.json',
+        'catppuccin-macchiato' => __DIR__.'/../../resources/themes/catppuccin-macchiato.json',
+        'github-dark' => __DIR__.'/../../resources/themes/github-dark.json',
+        'rose-pine-dawn' => __DIR__.'/../../resources/themes/rose-pine-dawn.json',
+        'poimandres' => __DIR__.'/../../resources/themes/poimandres.json',
+        'github-dark-high-contrast' => __DIR__.'/../../resources/themes/github-dark-high-contrast.json',
+        'material-theme' => __DIR__.'/../../resources/themes/material-theme.json',
+        'dracula' => __DIR__.'/../../resources/themes/dracula.json',
+        'github-dark-default' => __DIR__.'/../../resources/themes/github-dark-default.json',
+        'github-dark-dimmed' => __DIR__.'/../../resources/themes/github-dark-dimmed.json',
+        'rose-pine' => __DIR__.'/../../resources/themes/rose-pine.json',
+        'kanagawa-lotus' => __DIR__.'/../../resources/themes/kanagawa-lotus.json',
+        'kanagawa-dragon' => __DIR__.'/../../resources/themes/kanagawa-dragon.json',
+        'dark-plus' => __DIR__.'/../../resources/themes/dark-plus.json',
+        'ayu-dark' => __DIR__.'/../../resources/themes/ayu-dark.json',
+        'min-dark' => __DIR__.'/../../resources/themes/min-dark.json',
+        'monokai' => __DIR__.'/../../resources/themes/monokai.json',
+        'nord' => __DIR__.'/../../resources/themes/nord.json',
+        'catppuccin-frappe' => __DIR__.'/../../resources/themes/catppuccin-frappe.json',
+        'github-light' => __DIR__.'/../../resources/themes/github-light.json',
+        'dracula-soft' => __DIR__.'/../../resources/themes/dracula-soft.json',
+        'synthwave-84' => __DIR__.'/../../resources/themes/synthwave-84.json',
+        'vitesse-dark' => __DIR__.'/../../resources/themes/vitesse-dark.json',
+        'andromeeda' => __DIR__.'/../../resources/themes/andromeeda.json',
+        'light-plus' => __DIR__.'/../../resources/themes/light-plus.json',
+        'slack-ochin' => __DIR__.'/../../resources/themes/slack-ochin.json',
+        'solarized-dark' => __DIR__.'/../../resources/themes/solarized-dark.json',
+        'material-theme-ocean' => __DIR__.'/../../resources/themes/material-theme-ocean.json',
+        'vitesse-light' => __DIR__.'/../../resources/themes/vitesse-light.json',
+        'vesper' => __DIR__.'/../../resources/themes/vesper.json',
+        'kanagawa-wave' => __DIR__.'/../../resources/themes/kanagawa-wave.json',
+        'plastic' => __DIR__.'/../../resources/themes/plastic.json',
+        'material-theme-darker' => __DIR__.'/../../resources/themes/material-theme-darker.json',
+        'night-owl' => __DIR__.'/../../resources/themes/night-owl.json',
+        'catppuccin-latte' => __DIR__.'/../../resources/themes/catppuccin-latte.json',
+        'min-light' => __DIR__.'/../../resources/themes/min-light.json',
+        'snazzy-light' => __DIR__.'/../../resources/themes/snazzy-light.json',
+        'houston' => __DIR__.'/../../resources/themes/houston.json',
+        'material-theme-palenight' => __DIR__.'/../../resources/themes/material-theme-palenight.json'];
+}
diff --git a/src/Theme/Theme.php b/src/Theme/Theme.php
index 748c50d..dfb5850 100644
--- a/src/Theme/Theme.php
+++ b/src/Theme/Theme.php
@@ -6,63 +6,63 @@
 
 enum Theme: string
 {
-    case OneDarkPro = "one-dark-pro";
-case SolarizedLight = "solarized-light";
-case VitesseBlack = "vitesse-black";
-case GithubLightDefault = "github-light-default";
-case SlackDark = "slack-dark";
-case EverforestDark = "everforest-dark";
-case RosePineMoon = "rose-pine-moon";
-case EverforestLight = "everforest-light";
-case Laserwave = "laserwave";
-case GithubLightHighContrast = "github-light-high-contrast";
-case CatppuccinMocha = "catppuccin-mocha";
-case Red = "red";
-case MaterialThemeLighter = "material-theme-lighter";
-case OneLight = "one-light";
-case AuroraX = "aurora-x";
-case TokyoNight = "tokyo-night";
-case CatppuccinMacchiato = "catppuccin-macchiato";
-case GithubDark = "github-dark";
-case RosePineDawn = "rose-pine-dawn";
-case Poimandres = "poimandres";
-case GithubDarkHighContrast = "github-dark-high-contrast";
-case MaterialTheme = "material-theme";
-case Dracula = "dracula";
-case GithubDarkDefault = "github-dark-default";
-case GithubDarkDimmed = "github-dark-dimmed";
-case RosePine = "rose-pine";
-case KanagawaLotus = "kanagawa-lotus";
-case KanagawaDragon = "kanagawa-dragon";
-case DarkPlus = "dark-plus";
-case AyuDark = "ayu-dark";
-case MinDark = "min-dark";
-case Monokai = "monokai";
-case Nord = "nord";
-case CatppuccinFrappe = "catppuccin-frappe";
-case GithubLight = "github-light";
-case DraculaSoft = "dracula-soft";
-case Synthwave84 = "synthwave-84";
-case VitesseDark = "vitesse-dark";
-case Andromeeda = "andromeeda";
-case LightPlus = "light-plus";
-case SlackOchin = "slack-ochin";
-case SolarizedDark = "solarized-dark";
-case MaterialThemeOcean = "material-theme-ocean";
-case VitesseLight = "vitesse-light";
-case Vesper = "vesper";
-case KanagawaWave = "kanagawa-wave";
-case Plastic = "plastic";
-case MaterialThemeDarker = "material-theme-darker";
-case NightOwl = "night-owl";
-case CatppuccinLatte = "catppuccin-latte";
-case MinLight = "min-light";
-case SnazzyLight = "snazzy-light";
-case Houston = "houston";
-case MaterialThemePalenight = "material-theme-palenight";
+    case OneDarkPro = 'one-dark-pro';
+    case SolarizedLight = 'solarized-light';
+    case VitesseBlack = 'vitesse-black';
+    case GithubLightDefault = 'github-light-default';
+    case SlackDark = 'slack-dark';
+    case EverforestDark = 'everforest-dark';
+    case RosePineMoon = 'rose-pine-moon';
+    case EverforestLight = 'everforest-light';
+    case Laserwave = 'laserwave';
+    case GithubLightHighContrast = 'github-light-high-contrast';
+    case CatppuccinMocha = 'catppuccin-mocha';
+    case Red = 'red';
+    case MaterialThemeLighter = 'material-theme-lighter';
+    case OneLight = 'one-light';
+    case AuroraX = 'aurora-x';
+    case TokyoNight = 'tokyo-night';
+    case CatppuccinMacchiato = 'catppuccin-macchiato';
+    case GithubDark = 'github-dark';
+    case RosePineDawn = 'rose-pine-dawn';
+    case Poimandres = 'poimandres';
+    case GithubDarkHighContrast = 'github-dark-high-contrast';
+    case MaterialTheme = 'material-theme';
+    case Dracula = 'dracula';
+    case GithubDarkDefault = 'github-dark-default';
+    case GithubDarkDimmed = 'github-dark-dimmed';
+    case RosePine = 'rose-pine';
+    case KanagawaLotus = 'kanagawa-lotus';
+    case KanagawaDragon = 'kanagawa-dragon';
+    case DarkPlus = 'dark-plus';
+    case AyuDark = 'ayu-dark';
+    case MinDark = 'min-dark';
+    case Monokai = 'monokai';
+    case Nord = 'nord';
+    case CatppuccinFrappe = 'catppuccin-frappe';
+    case GithubLight = 'github-light';
+    case DraculaSoft = 'dracula-soft';
+    case Synthwave84 = 'synthwave-84';
+    case VitesseDark = 'vitesse-dark';
+    case Andromeeda = 'andromeeda';
+    case LightPlus = 'light-plus';
+    case SlackOchin = 'slack-ochin';
+    case SolarizedDark = 'solarized-dark';
+    case MaterialThemeOcean = 'material-theme-ocean';
+    case VitesseLight = 'vitesse-light';
+    case Vesper = 'vesper';
+    case KanagawaWave = 'kanagawa-wave';
+    case Plastic = 'plastic';
+    case MaterialThemeDarker = 'material-theme-darker';
+    case NightOwl = 'night-owl';
+    case CatppuccinLatte = 'catppuccin-latte';
+    case MinLight = 'min-light';
+    case SnazzyLight = 'snazzy-light';
+    case Houston = 'houston';
+    case MaterialThemePalenight = 'material-theme-palenight';
 
     public function toParsedTheme(ThemeRepositoryInterface $repository): ParsedTheme
     {
         return $repository->get($this->value);
     }
-}
\ No newline at end of file
+}

From db7be49e8c0a866c438746242172eba45df2071e Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:30:20 +0100
Subject: [PATCH 15/23] Update sources

---
 composer.json                                 |    7 +-
 package-lock.json                             |   12 +-
 resources/languages/abap.json                 |   72 +-
 resources/languages/actionscript-3.json       |   60 +-
 resources/languages/ada.json                  |  156 +-
 resources/languages/angular-html.json         |    1 -
 resources/languages/angular-ts.json           |  500 +++---
 resources/languages/apache.json               |   62 +-
 resources/languages/apex.json                 |  212 +--
 resources/languages/apl.json                  |   34 +-
 resources/languages/applescript.json          |   37 +-
 resources/languages/ara.json                  |   41 +-
 resources/languages/asciidoc.json             |  637 +++-----
 resources/languages/asm.json                  |  180 +--
 resources/languages/astro.json                |   44 +-
 resources/languages/awk.json                  |    8 +-
 resources/languages/ballerina.json            |  298 ++--
 resources/languages/bat.json                  |   50 +-
 resources/languages/beancount.json            |   96 +-
 resources/languages/berry.json                |   22 +-
 resources/languages/bibtex.json               |  369 +++--
 resources/languages/bicep.json                |   27 +-
 resources/languages/blade.json                |  391 ++---
 resources/languages/bsl.json                  |  157 +-
 resources/languages/c.json                    |  324 ++--
 resources/languages/cadence.json              |   49 +-
 resources/languages/cairo.json                |   18 +-
 resources/languages/clarity.json              |   49 +-
 resources/languages/clojure.json              |   42 +-
 resources/languages/cmake.json                |   28 +-
 resources/languages/cobol.json                |  163 +-
 resources/languages/codeql.json               |  308 ++--
 resources/languages/coffee.json               |   82 +-
 resources/languages/common-lisp.json          |  100 +-
 resources/languages/coq.json                  |   42 +-
 resources/languages/cpp-macro.json            |  822 +++++-----
 resources/languages/cpp.json                  | 1284 +++++++--------
 resources/languages/crystal.json              |  201 +--
 resources/languages/csharp.json               |  390 ++---
 resources/languages/css.json                  |  112 +-
 resources/languages/csv.json                  |    2 +-
 resources/languages/cue.json                  |  110 +-
 resources/languages/cypher.json               |   27 +-
 resources/languages/d.json                    |  159 +-
 resources/languages/dart.json                 |   36 +-
 resources/languages/dax.json                  |   17 +-
 resources/languages/desktop.json              |   18 +-
 resources/languages/diff.json                 |    7 +-
 resources/languages/docker.json               |    1 -
 resources/languages/dotenv.json               |   15 +-
 resources/languages/dream-maker.json          |   41 +-
 resources/languages/edge.json                 |   16 +-
 resources/languages/elixir.json               |  116 +-
 resources/languages/elm.json                  |   52 +-
 resources/languages/emacs-lisp.json           |  144 +-
 resources/languages/erlang.json               |   68 +-
 resources/languages/fennel.json               |   14 +-
 resources/languages/fish.json                 |   37 +-
 resources/languages/fluent.json               |   10 +-
 resources/languages/fortran-fixed-form.json   |    2 +-
 resources/languages/fortran-free-form.json    |  411 ++---
 resources/languages/fsharp.json               |   89 +-
 resources/languages/gdresource.json           |   35 +-
 resources/languages/gdscript.json             |  110 +-
 resources/languages/gdshader.json             |   36 +-
 resources/languages/genie.json                |   12 +-
 resources/languages/git-commit.json           |    7 +-
 resources/languages/git-rebase.json           |    2 +-
 resources/languages/gleam.json                |   28 +-
 resources/languages/glimmer-js.json           |   58 +-
 resources/languages/glimmer-ts.json           |   58 +-
 resources/languages/glsl.json                 |    8 +-
 resources/languages/gnuplot.json              |   82 +-
 resources/languages/go.json                   |  444 +++---
 resources/languages/graphql.json              |   43 +-
 resources/languages/groovy.json               |   91 +-
 resources/languages/hack.json                 |  168 +-
 resources/languages/haml.json                 |   45 +-
 resources/languages/handlebars.json           |   42 +-
 resources/languages/haskell.json              |  214 ++-
 resources/languages/haxe.json                 |  102 +-
 resources/languages/hcl.json                  |  116 +-
 resources/languages/hjson.json                |   58 +-
 resources/languages/hlsl.json                 |   30 +-
 resources/languages/html-derivative.json      |    3 +-
 resources/languages/html.json                 |   57 +-
 resources/languages/http.json                 |   34 +-
 resources/languages/hxml.json                 |    6 +-
 resources/languages/hy.json                   |   20 +-
 resources/languages/imba.json                 |  313 ++--
 resources/languages/ini.json                  |    2 +-
 resources/languages/java.json                 |  102 +-
 resources/languages/javascript.json           |  522 +++---
 resources/languages/jinja-html.json           |    6 +-
 resources/languages/jinja.json                |   30 +-
 resources/languages/jison.json                |   16 +-
 resources/languages/json.json                 |   12 +-
 resources/languages/json5.json                |   26 +-
 resources/languages/jsonc.json                |   12 +-
 resources/languages/jsonl.json                |   12 +-
 resources/languages/jsonnet.json              |   28 +-
 resources/languages/jssm.json                 |   35 +-
 resources/languages/jsx.json                  |  522 +++---
 resources/languages/julia.json                |  101 +-
 resources/languages/kotlin.json               |   26 +-
 resources/languages/kusto.json                |   72 +-
 resources/languages/latex.json                |  672 ++++----
 resources/languages/lean.json                 |   24 +-
 resources/languages/less.json                 |  192 +--
 resources/languages/liquid.json               |  158 +-
 resources/languages/llvm.json                 |  122 ++
 resources/languages/log.json                  |   42 +-
 resources/languages/logo.json                 |    2 +-
 resources/languages/lua.json                  |   72 +-
 resources/languages/luau.json                 |   44 +-
 resources/languages/make.json                 |   44 +-
 resources/languages/markdown.json             |  171 +-
 resources/languages/marko.json                |   90 +-
 resources/languages/matlab.json               |   88 +-
 resources/languages/mdx.json                  |  554 +++----
 resources/languages/mipsasm.json              |    5 +-
 resources/languages/mojo.json                 |  265 ++--
 resources/languages/move.json                 |  171 +-
 resources/languages/narrat.json               |   20 +-
 resources/languages/nextflow.json             |   22 +-
 resources/languages/nginx.json                |   90 +-
 resources/languages/nim.json                  |  112 +-
 resources/languages/nix.json                  |  138 +-
 resources/languages/nushell.json              |  119 +-
 resources/languages/objective-c.json          |  259 ++-
 resources/languages/objective-cpp.json        |  492 +++---
 resources/languages/ocaml.json                |  458 +++---
 resources/languages/pascal.json               |   13 +-
 resources/languages/perl.json                 |  141 +-
 resources/languages/php.json                  |  497 +++---
 resources/languages/plsql.json                |   16 +-
 resources/languages/po.json                   |   10 +-
 resources/languages/polar.json                |   56 +-
 resources/languages/postcss.json              |   46 +-
 resources/languages/powerquery.json           |   20 +-
 resources/languages/powershell.json           |  124 +-
 resources/languages/prisma.json               |   26 +-
 resources/languages/prolog.json               |    6 +-
 resources/languages/proto.json                |   22 +-
 resources/languages/pug.json                  |   72 +-
 resources/languages/puppet.json               |   73 +-
 resources/languages/purescript.json           | 1310 +++++++++------
 resources/languages/python.json               |  274 ++--
 resources/languages/qml.json                  |   36 +-
 resources/languages/qss.json                  |   12 +-
 resources/languages/r.json                    |   42 +-
 resources/languages/racket.json               |  116 +-
 resources/languages/raku.json                 |   30 +-
 resources/languages/razor.json                |   60 +-
 resources/languages/reg.json                  |    6 +-
 resources/languages/regexp.json               |   31 +-
 resources/languages/rel.json                  |    8 +-
 resources/languages/riscv.json                |   37 +-
 resources/languages/rst.json                  |   74 +-
 resources/languages/ruby.json                 |  223 +--
 resources/languages/rust.json                 |  111 +-
 resources/languages/sas.json                  |   28 +-
 resources/languages/sass.json                 |   50 +-
 resources/languages/scala.json                |  148 +-
 resources/languages/scheme.json               |   41 +-
 resources/languages/scss.json                 |   98 +-
 resources/languages/sdbl.json                 |   42 +-
 resources/languages/shaderlab.json            |   16 +-
 resources/languages/shellscript.json          |  233 ++-
 resources/languages/shellsession.json         |    2 +-
 resources/languages/smalltalk.json            |   17 +-
 resources/languages/solidity.json             |   45 +-
 resources/languages/soy.json                  |   60 +-
 resources/languages/sparql.json               |    2 +-
 resources/languages/splunk.json               |   23 +-
 resources/languages/sql.json                  |   21 +-
 resources/languages/ssh-config.json           |    4 +-
 resources/languages/stata.json                |  221 ++-
 resources/languages/stylus.json               |   78 +-
 resources/languages/svelte.json               |   54 +-
 resources/languages/swift.json                |  214 +--
 resources/languages/system-verilog.json       |   48 +-
 resources/languages/systemd.json              |   32 +-
 resources/languages/talonscript.json          |   50 +-
 resources/languages/tasl.json                 |   20 +-
 resources/languages/tcl.json                  |   31 +-
 resources/languages/templ.json                |   70 +-
 resources/languages/terraform.json            |  115 +-
 resources/languages/tex.json                  |  267 ++--
 resources/languages/toml.json                 |   19 +-
 resources/languages/tsx.json                  |  522 +++---
 resources/languages/turtle.json               |    2 +-
 resources/languages/twig.json                 |   77 +-
 resources/languages/typescript.json           |  500 +++---
 resources/languages/typespec.json             |  327 +---
 resources/languages/typst.json                |   47 +-
 resources/languages/v.json                    |   62 +-
 resources/languages/vala.json                 |   12 +-
 resources/languages/vb.json                   |   14 +-
 resources/languages/verilog.json              |    8 +-
 resources/languages/vhdl.json                 |   75 +-
 resources/languages/viml.json                 |   44 +-
 resources/languages/vue-html.json             |   10 +-
 resources/languages/vue.json                  |   83 +-
 resources/languages/vyper.json                |  274 ++--
 resources/languages/wasm.json                 |  143 +-
 resources/languages/wenyan.json               |   14 +-
 resources/languages/wgsl.json                 |   56 +-
 resources/languages/wikitext.json             |  134 +-
 resources/languages/wit.json                  | 1409 +++++++++++++++++
 resources/languages/wolfram.json              |  892 +++++------
 resources/languages/xml.json                  |    6 +-
 resources/languages/yaml.json                 |   46 +-
 resources/languages/zenscript.json            |   33 +-
 resources/languages/zig.json                  |   19 +-
 resources/themes/catppuccin-frappe.json       |   53 +-
 resources/themes/catppuccin-latte.json        |   53 +-
 resources/themes/catppuccin-macchiato.json    |   53 +-
 resources/themes/catppuccin-mocha.json        |   53 +-
 resources/themes/gruvbox-dark-hard.json       | 1132 +++++++++++++
 resources/themes/gruvbox-dark-medium.json     | 1132 +++++++++++++
 resources/themes/gruvbox-dark-soft.json       | 1132 +++++++++++++
 resources/themes/gruvbox-light-hard.json      | 1132 +++++++++++++
 resources/themes/gruvbox-light-medium.json    | 1132 +++++++++++++
 resources/themes/gruvbox-light-soft.json      | 1132 +++++++++++++
 resources/themes/one-dark-pro.json            |    1 +
 resources/themes/rose-pine-dawn.json          |    1 +
 resources/themes/rose-pine-moon.json          |    1 +
 resources/themes/rose-pine.json               |    1 +
 resources/themes/tokyo-night.json             |   45 +-
 resources/themes/vesper.json                  |    1 +
 {resources => samples}/samples/abap.sample    |    0
 .../samples/actionscript-3.sample             |    0
 {resources => samples}/samples/ada.sample     |    0
 .../samples/angular-html.sample               |    0
 .../samples/angular-ts.sample                 |    0
 {resources => samples}/samples/antlers.sample |    0
 {resources => samples}/samples/apache.sample  |    0
 {resources => samples}/samples/apex.sample    |    0
 {resources => samples}/samples/apl.sample     |    0
 .../samples/applescript.sample                |    0
 {resources => samples}/samples/ara.sample     |    0
 .../samples/asciidoc.sample                   |    0
 {resources => samples}/samples/asm.sample     |    0
 {resources => samples}/samples/astro.sample   |    0
 {resources => samples}/samples/awk.sample     |    0
 .../samples/ballerina.sample                  |    0
 {resources => samples}/samples/bash.sample    |    0
 {resources => samples}/samples/bat.sample     |    0
 .../samples/beancount.sample                  |    0
 {resources => samples}/samples/berry.sample   |    0
 {resources => samples}/samples/bibtex.sample  |    0
 {resources => samples}/samples/bicep.sample   |    0
 {resources => samples}/samples/blade.sample   |    0
 {resources => samples}/samples/bsl.sample     |    0
 {resources => samples}/samples/c.sample       |    0
 {resources => samples}/samples/cadence.sample |    0
 {resources => samples}/samples/cairo.sample   |    0
 {resources => samples}/samples/clarity.sample |    0
 {resources => samples}/samples/clj.sample     |    0
 {resources => samples}/samples/clojure.sample |    0
 {resources => samples}/samples/cmake.sample   |    0
 {resources => samples}/samples/cobol.sample   |    0
 .../samples/codeowners.sample                 |    0
 {resources => samples}/samples/codeql.sample  |    0
 {resources => samples}/samples/coffee.sample  |    0
 .../samples/common-lisp.sample                |    0
 {resources => samples}/samples/coq.sample     |    0
 {resources => samples}/samples/cpp.sample     |    0
 {resources => samples}/samples/crystal.sample |    0
 {resources => samples}/samples/csharp.sample  |    0
 {resources => samples}/samples/css.sample     |    0
 {resources => samples}/samples/csv.sample     |    0
 {resources => samples}/samples/cue.sample     |    0
 {resources => samples}/samples/cypher.sample  |    0
 {resources => samples}/samples/d.sample       |    0
 {resources => samples}/samples/dart.sample    |    0
 {resources => samples}/samples/dax.sample     |    0
 {resources => samples}/samples/desktop.sample |    0
 {resources => samples}/samples/diff.sample    |    0
 {resources => samples}/samples/docker.sample  |    0
 {resources => samples}/samples/dotenv.sample  |    0
 .../samples/dream-maker.sample                |    0
 {resources => samples}/samples/edge.sample    |    0
 {resources => samples}/samples/elixir.sample  |    0
 {resources => samples}/samples/elm.sample     |    0
 .../samples/emacs-lisp.sample                 |    0
 {resources => samples}/samples/erb.sample     |    0
 {resources => samples}/samples/erlang.sample  |    0
 {resources => samples}/samples/fennel.sample  |    0
 {resources => samples}/samples/fish.sample    |    0
 {resources => samples}/samples/fluent.sample  |    0
 .../samples/fortran-fixed-form.sample         |    0
 .../samples/fortran-free-form.sample          |    0
 {resources => samples}/samples/fsharp.sample  |    0
 {resources => samples}/samples/fsl.sample     |    0
 .../samples/gdresource.sample                 |    0
 .../samples/gdscript.sample                   |    0
 .../samples/gdshader.sample                   |    0
 {resources => samples}/samples/genie.sample   |    0
 {resources => samples}/samples/gherkin.sample |    0
 {resources => samples}/samples/gleam.sample   |    0
 .../samples/glimmer-js.sample                 |    0
 .../samples/glimmer-ts.sample                 |    0
 {resources => samples}/samples/glsl.sample    |    0
 {resources => samples}/samples/gnuplot.sample |    0
 {resources => samples}/samples/go.sample      |    0
 {resources => samples}/samples/graphql.sample |    0
 {resources => samples}/samples/groovy.sample  |    0
 {resources => samples}/samples/hack.sample    |    0
 {resources => samples}/samples/haml.sample    |    0
 .../samples/handlebars.sample                 |    0
 {resources => samples}/samples/haskell.sample |    0
 {resources => samples}/samples/haxe.sample    |    0
 {resources => samples}/samples/hcl.sample     |    0
 {resources => samples}/samples/hjson.sample   |    0
 {resources => samples}/samples/hlsl.sample    |    0
 {resources => samples}/samples/html.sample    |    0
 {resources => samples}/samples/http.sample    |    0
 {resources => samples}/samples/hxml.sample    |    0
 {resources => samples}/samples/hy.sample      |    0
 {resources => samples}/samples/imba.sample    |    0
 {resources => samples}/samples/ini.sample     |    0
 {resources => samples}/samples/java.sample    |    0
 .../samples/javascript.sample                 |    0
 {resources => samples}/samples/jinja.sample   |    0
 {resources => samples}/samples/jison.sample   |    0
 {resources => samples}/samples/json.sample    |    0
 {resources => samples}/samples/json5.sample   |    0
 {resources => samples}/samples/jsonc.sample   |    0
 {resources => samples}/samples/jsonl.sample   |    0
 {resources => samples}/samples/jsonnet.sample |    0
 {resources => samples}/samples/jssm.sample    |    0
 {resources => samples}/samples/jsx.sample     |    0
 {resources => samples}/samples/julia.sample   |    0
 {resources => samples}/samples/kotlin.sample  |    0
 {resources => samples}/samples/kusto.sample   |    0
 {resources => samples}/samples/latex.sample   |    0
 {resources => samples}/samples/lean.sample    |    0
 {resources => samples}/samples/less.sample    |    0
 {resources => samples}/samples/liquid.sample  |    0
 {resources => samples}/samples/log.sample     |    0
 {resources => samples}/samples/logo.sample    |    0
 {resources => samples}/samples/lua.sample     |    0
 {resources => samples}/samples/luau.sample    |    0
 {resources => samples}/samples/make.sample    |    0
 .../samples/markdown.sample                   |    0
 {resources => samples}/samples/marko.sample   |    0
 {resources => samples}/samples/matlab.sample  |    0
 {resources => samples}/samples/mdc.sample     |    0
 {resources => samples}/samples/mdx.sample     |    0
 {resources => samples}/samples/mermaid.sample |    0
 {resources => samples}/samples/mipsasm.sample |    0
 {resources => samples}/samples/mojo.sample    |    0
 {resources => samples}/samples/move.sample    |    0
 {resources => samples}/samples/narrat.sample  |    0
 .../samples/nextflow.sample                   |    0
 {resources => samples}/samples/nginx.sample   |    0
 {resources => samples}/samples/nim.sample     |    0
 {resources => samples}/samples/nix.sample     |    0
 {resources => samples}/samples/nushell.sample |    0
 .../samples/objective-c.sample                |    0
 .../samples/objective-cpp.sample              |    0
 {resources => samples}/samples/ocaml.sample   |    0
 {resources => samples}/samples/pascal.sample  |    0
 {resources => samples}/samples/perl.sample    |    0
 {resources => samples}/samples/php.sample     |    0
 {resources => samples}/samples/plsql.sample   |    0
 {resources => samples}/samples/po.sample      |    0
 {resources => samples}/samples/polar.sample   |    0
 {resources => samples}/samples/postcss.sample |    0
 .../samples/powerquery.sample                 |    0
 .../samples/powershell.sample                 |    0
 {resources => samples}/samples/prisma.sample  |    0
 {resources => samples}/samples/prolog.sample  |    0
 {resources => samples}/samples/proto.sample   |    0
 {resources => samples}/samples/pug.sample     |    0
 {resources => samples}/samples/puppet.sample  |    0
 .../samples/purescript.sample                 |    0
 {resources => samples}/samples/python.sample  |    0
 {resources => samples}/samples/qml.sample     |    0
 {resources => samples}/samples/qmldir.sample  |    0
 {resources => samples}/samples/qss.sample     |    0
 {resources => samples}/samples/r.sample       |    0
 {resources => samples}/samples/racket.sample  |    0
 {resources => samples}/samples/raku.sample    |    0
 {resources => samples}/samples/razor.sample   |    0
 {resources => samples}/samples/reg.sample     |    0
 {resources => samples}/samples/regexp.sample  |    0
 {resources => samples}/samples/rel.sample     |    0
 {resources => samples}/samples/riscv.sample   |    0
 {resources => samples}/samples/rst.sample     |    0
 {resources => samples}/samples/ruby.sample    |    0
 {resources => samples}/samples/rust.sample    |    0
 {resources => samples}/samples/sas.sample     |    0
 {resources => samples}/samples/sass.sample    |    0
 {resources => samples}/samples/scala.sample   |    0
 {resources => samples}/samples/scheme.sample  |    0
 {resources => samples}/samples/scss.sample    |    0
 {resources => samples}/samples/sdbl.sample    |    0
 .../samples/shaderlab.sample                  |    0
 .../samples/shellscript.sample                |    0
 .../samples/shellsession.sample               |    0
 .../samples/smalltalk.sample                  |    0
 .../samples/solidity.sample                   |    0
 {resources => samples}/samples/soy.sample     |    0
 {resources => samples}/samples/sparql.sample  |    0
 {resources => samples}/samples/splunk.sample  |    0
 {resources => samples}/samples/sql.sample     |    0
 .../samples/ssh-config.sample                 |    0
 {resources => samples}/samples/stata.sample   |    0
 {resources => samples}/samples/stylus.sample  |    0
 {resources => samples}/samples/svelte.sample  |    0
 {resources => samples}/samples/swift.sample   |    0
 .../samples/system-verilog.sample             |    0
 {resources => samples}/samples/systemd.sample |    0
 .../samples/talonscript.sample                |    0
 {resources => samples}/samples/tasl.sample    |    0
 {resources => samples}/samples/tcl.sample     |    0
 {resources => samples}/samples/templ.sample   |    0
 .../samples/terraform.sample                  |    0
 {resources => samples}/samples/tex.sample     |    0
 {resources => samples}/samples/toml.sample    |    0
 {resources => samples}/samples/ts-tags.sample |    0
 {resources => samples}/samples/tsv.sample     |    0
 {resources => samples}/samples/tsx.sample     |    0
 {resources => samples}/samples/turtle.sample  |    0
 {resources => samples}/samples/twig.sample    |    0
 .../samples/typescript.sample                 |    0
 .../samples/typespec.sample                   |    0
 {resources => samples}/samples/typst.sample   |    0
 {resources => samples}/samples/v.sample       |    0
 {resources => samples}/samples/vala.sample    |    0
 {resources => samples}/samples/vb.sample      |    0
 {resources => samples}/samples/verilog.sample |    0
 {resources => samples}/samples/vhdl.sample    |    0
 {resources => samples}/samples/viml.sample    |    0
 .../samples/vue-html.sample                   |    0
 {resources => samples}/samples/vue.sample     |    0
 {resources => samples}/samples/vyper.sample   |    0
 {resources => samples}/samples/wasm.sample    |    0
 {resources => samples}/samples/wenyan.sample  |    0
 {resources => samples}/samples/wgsl.sample    |    0
 .../samples/wikitext.sample                   |    0
 {resources => samples}/samples/wolfram.sample |    0
 {resources => samples}/samples/xml.sample     |    0
 {resources => samples}/samples/xsl.sample     |    0
 {resources => samples}/samples/yaml.sample    |    0
 .../samples/zenscript.sample                  |    0
 {resources => samples}/samples/zig.sample     |    0
 {resources => samples}/samples/zsh.sample     |    0
 samples/serve.php                             |  109 ++
 src/Grammar/DefaultGrammars.php               |  885 +++++------
 src/Grammar/Grammar.php                       |  442 +++---
 src/Grammar/GrammarRepository.php             |    6 +-
 src/Theme/DefaultThemes.php                   |  116 +-
 src/Theme/Theme.php                           |  116 +-
 457 files changed, 21805 insertions(+), 14324 deletions(-)
 create mode 100644 resources/languages/llvm.json
 create mode 100644 resources/languages/wit.json
 create mode 100644 resources/themes/gruvbox-dark-hard.json
 create mode 100644 resources/themes/gruvbox-dark-medium.json
 create mode 100644 resources/themes/gruvbox-dark-soft.json
 create mode 100644 resources/themes/gruvbox-light-hard.json
 create mode 100644 resources/themes/gruvbox-light-medium.json
 create mode 100644 resources/themes/gruvbox-light-soft.json
 rename {resources => samples}/samples/abap.sample (100%)
 rename {resources => samples}/samples/actionscript-3.sample (100%)
 rename {resources => samples}/samples/ada.sample (100%)
 rename {resources => samples}/samples/angular-html.sample (100%)
 rename {resources => samples}/samples/angular-ts.sample (100%)
 rename {resources => samples}/samples/antlers.sample (100%)
 rename {resources => samples}/samples/apache.sample (100%)
 rename {resources => samples}/samples/apex.sample (100%)
 rename {resources => samples}/samples/apl.sample (100%)
 rename {resources => samples}/samples/applescript.sample (100%)
 rename {resources => samples}/samples/ara.sample (100%)
 rename {resources => samples}/samples/asciidoc.sample (100%)
 rename {resources => samples}/samples/asm.sample (100%)
 rename {resources => samples}/samples/astro.sample (100%)
 rename {resources => samples}/samples/awk.sample (100%)
 rename {resources => samples}/samples/ballerina.sample (100%)
 rename {resources => samples}/samples/bash.sample (100%)
 rename {resources => samples}/samples/bat.sample (100%)
 rename {resources => samples}/samples/beancount.sample (100%)
 rename {resources => samples}/samples/berry.sample (100%)
 rename {resources => samples}/samples/bibtex.sample (100%)
 rename {resources => samples}/samples/bicep.sample (100%)
 rename {resources => samples}/samples/blade.sample (100%)
 rename {resources => samples}/samples/bsl.sample (100%)
 rename {resources => samples}/samples/c.sample (100%)
 rename {resources => samples}/samples/cadence.sample (100%)
 rename {resources => samples}/samples/cairo.sample (100%)
 rename {resources => samples}/samples/clarity.sample (100%)
 rename {resources => samples}/samples/clj.sample (100%)
 rename {resources => samples}/samples/clojure.sample (100%)
 rename {resources => samples}/samples/cmake.sample (100%)
 rename {resources => samples}/samples/cobol.sample (100%)
 rename {resources => samples}/samples/codeowners.sample (100%)
 rename {resources => samples}/samples/codeql.sample (100%)
 rename {resources => samples}/samples/coffee.sample (100%)
 rename {resources => samples}/samples/common-lisp.sample (100%)
 rename {resources => samples}/samples/coq.sample (100%)
 rename {resources => samples}/samples/cpp.sample (100%)
 rename {resources => samples}/samples/crystal.sample (100%)
 rename {resources => samples}/samples/csharp.sample (100%)
 rename {resources => samples}/samples/css.sample (100%)
 rename {resources => samples}/samples/csv.sample (100%)
 rename {resources => samples}/samples/cue.sample (100%)
 rename {resources => samples}/samples/cypher.sample (100%)
 rename {resources => samples}/samples/d.sample (100%)
 rename {resources => samples}/samples/dart.sample (100%)
 rename {resources => samples}/samples/dax.sample (100%)
 rename {resources => samples}/samples/desktop.sample (100%)
 rename {resources => samples}/samples/diff.sample (100%)
 rename {resources => samples}/samples/docker.sample (100%)
 rename {resources => samples}/samples/dotenv.sample (100%)
 rename {resources => samples}/samples/dream-maker.sample (100%)
 rename {resources => samples}/samples/edge.sample (100%)
 rename {resources => samples}/samples/elixir.sample (100%)
 rename {resources => samples}/samples/elm.sample (100%)
 rename {resources => samples}/samples/emacs-lisp.sample (100%)
 rename {resources => samples}/samples/erb.sample (100%)
 rename {resources => samples}/samples/erlang.sample (100%)
 rename {resources => samples}/samples/fennel.sample (100%)
 rename {resources => samples}/samples/fish.sample (100%)
 rename {resources => samples}/samples/fluent.sample (100%)
 rename {resources => samples}/samples/fortran-fixed-form.sample (100%)
 rename {resources => samples}/samples/fortran-free-form.sample (100%)
 rename {resources => samples}/samples/fsharp.sample (100%)
 rename {resources => samples}/samples/fsl.sample (100%)
 rename {resources => samples}/samples/gdresource.sample (100%)
 rename {resources => samples}/samples/gdscript.sample (100%)
 rename {resources => samples}/samples/gdshader.sample (100%)
 rename {resources => samples}/samples/genie.sample (100%)
 rename {resources => samples}/samples/gherkin.sample (100%)
 rename {resources => samples}/samples/gleam.sample (100%)
 rename {resources => samples}/samples/glimmer-js.sample (100%)
 rename {resources => samples}/samples/glimmer-ts.sample (100%)
 rename {resources => samples}/samples/glsl.sample (100%)
 rename {resources => samples}/samples/gnuplot.sample (100%)
 rename {resources => samples}/samples/go.sample (100%)
 rename {resources => samples}/samples/graphql.sample (100%)
 rename {resources => samples}/samples/groovy.sample (100%)
 rename {resources => samples}/samples/hack.sample (100%)
 rename {resources => samples}/samples/haml.sample (100%)
 rename {resources => samples}/samples/handlebars.sample (100%)
 rename {resources => samples}/samples/haskell.sample (100%)
 rename {resources => samples}/samples/haxe.sample (100%)
 rename {resources => samples}/samples/hcl.sample (100%)
 rename {resources => samples}/samples/hjson.sample (100%)
 rename {resources => samples}/samples/hlsl.sample (100%)
 rename {resources => samples}/samples/html.sample (100%)
 rename {resources => samples}/samples/http.sample (100%)
 rename {resources => samples}/samples/hxml.sample (100%)
 rename {resources => samples}/samples/hy.sample (100%)
 rename {resources => samples}/samples/imba.sample (100%)
 rename {resources => samples}/samples/ini.sample (100%)
 rename {resources => samples}/samples/java.sample (100%)
 rename {resources => samples}/samples/javascript.sample (100%)
 rename {resources => samples}/samples/jinja.sample (100%)
 rename {resources => samples}/samples/jison.sample (100%)
 rename {resources => samples}/samples/json.sample (100%)
 rename {resources => samples}/samples/json5.sample (100%)
 rename {resources => samples}/samples/jsonc.sample (100%)
 rename {resources => samples}/samples/jsonl.sample (100%)
 rename {resources => samples}/samples/jsonnet.sample (100%)
 rename {resources => samples}/samples/jssm.sample (100%)
 rename {resources => samples}/samples/jsx.sample (100%)
 rename {resources => samples}/samples/julia.sample (100%)
 rename {resources => samples}/samples/kotlin.sample (100%)
 rename {resources => samples}/samples/kusto.sample (100%)
 rename {resources => samples}/samples/latex.sample (100%)
 rename {resources => samples}/samples/lean.sample (100%)
 rename {resources => samples}/samples/less.sample (100%)
 rename {resources => samples}/samples/liquid.sample (100%)
 rename {resources => samples}/samples/log.sample (100%)
 rename {resources => samples}/samples/logo.sample (100%)
 rename {resources => samples}/samples/lua.sample (100%)
 rename {resources => samples}/samples/luau.sample (100%)
 rename {resources => samples}/samples/make.sample (100%)
 rename {resources => samples}/samples/markdown.sample (100%)
 rename {resources => samples}/samples/marko.sample (100%)
 rename {resources => samples}/samples/matlab.sample (100%)
 rename {resources => samples}/samples/mdc.sample (100%)
 rename {resources => samples}/samples/mdx.sample (100%)
 rename {resources => samples}/samples/mermaid.sample (100%)
 rename {resources => samples}/samples/mipsasm.sample (100%)
 rename {resources => samples}/samples/mojo.sample (100%)
 rename {resources => samples}/samples/move.sample (100%)
 rename {resources => samples}/samples/narrat.sample (100%)
 rename {resources => samples}/samples/nextflow.sample (100%)
 rename {resources => samples}/samples/nginx.sample (100%)
 rename {resources => samples}/samples/nim.sample (100%)
 rename {resources => samples}/samples/nix.sample (100%)
 rename {resources => samples}/samples/nushell.sample (100%)
 rename {resources => samples}/samples/objective-c.sample (100%)
 rename {resources => samples}/samples/objective-cpp.sample (100%)
 rename {resources => samples}/samples/ocaml.sample (100%)
 rename {resources => samples}/samples/pascal.sample (100%)
 rename {resources => samples}/samples/perl.sample (100%)
 rename {resources => samples}/samples/php.sample (100%)
 rename {resources => samples}/samples/plsql.sample (100%)
 rename {resources => samples}/samples/po.sample (100%)
 rename {resources => samples}/samples/polar.sample (100%)
 rename {resources => samples}/samples/postcss.sample (100%)
 rename {resources => samples}/samples/powerquery.sample (100%)
 rename {resources => samples}/samples/powershell.sample (100%)
 rename {resources => samples}/samples/prisma.sample (100%)
 rename {resources => samples}/samples/prolog.sample (100%)
 rename {resources => samples}/samples/proto.sample (100%)
 rename {resources => samples}/samples/pug.sample (100%)
 rename {resources => samples}/samples/puppet.sample (100%)
 rename {resources => samples}/samples/purescript.sample (100%)
 rename {resources => samples}/samples/python.sample (100%)
 rename {resources => samples}/samples/qml.sample (100%)
 rename {resources => samples}/samples/qmldir.sample (100%)
 rename {resources => samples}/samples/qss.sample (100%)
 rename {resources => samples}/samples/r.sample (100%)
 rename {resources => samples}/samples/racket.sample (100%)
 rename {resources => samples}/samples/raku.sample (100%)
 rename {resources => samples}/samples/razor.sample (100%)
 rename {resources => samples}/samples/reg.sample (100%)
 rename {resources => samples}/samples/regexp.sample (100%)
 rename {resources => samples}/samples/rel.sample (100%)
 rename {resources => samples}/samples/riscv.sample (100%)
 rename {resources => samples}/samples/rst.sample (100%)
 rename {resources => samples}/samples/ruby.sample (100%)
 rename {resources => samples}/samples/rust.sample (100%)
 rename {resources => samples}/samples/sas.sample (100%)
 rename {resources => samples}/samples/sass.sample (100%)
 rename {resources => samples}/samples/scala.sample (100%)
 rename {resources => samples}/samples/scheme.sample (100%)
 rename {resources => samples}/samples/scss.sample (100%)
 rename {resources => samples}/samples/sdbl.sample (100%)
 rename {resources => samples}/samples/shaderlab.sample (100%)
 rename {resources => samples}/samples/shellscript.sample (100%)
 rename {resources => samples}/samples/shellsession.sample (100%)
 rename {resources => samples}/samples/smalltalk.sample (100%)
 rename {resources => samples}/samples/solidity.sample (100%)
 rename {resources => samples}/samples/soy.sample (100%)
 rename {resources => samples}/samples/sparql.sample (100%)
 rename {resources => samples}/samples/splunk.sample (100%)
 rename {resources => samples}/samples/sql.sample (100%)
 rename {resources => samples}/samples/ssh-config.sample (100%)
 rename {resources => samples}/samples/stata.sample (100%)
 rename {resources => samples}/samples/stylus.sample (100%)
 rename {resources => samples}/samples/svelte.sample (100%)
 rename {resources => samples}/samples/swift.sample (100%)
 rename {resources => samples}/samples/system-verilog.sample (100%)
 rename {resources => samples}/samples/systemd.sample (100%)
 rename {resources => samples}/samples/talonscript.sample (100%)
 rename {resources => samples}/samples/tasl.sample (100%)
 rename {resources => samples}/samples/tcl.sample (100%)
 rename {resources => samples}/samples/templ.sample (100%)
 rename {resources => samples}/samples/terraform.sample (100%)
 rename {resources => samples}/samples/tex.sample (100%)
 rename {resources => samples}/samples/toml.sample (100%)
 rename {resources => samples}/samples/ts-tags.sample (100%)
 rename {resources => samples}/samples/tsv.sample (100%)
 rename {resources => samples}/samples/tsx.sample (100%)
 rename {resources => samples}/samples/turtle.sample (100%)
 rename {resources => samples}/samples/twig.sample (100%)
 rename {resources => samples}/samples/typescript.sample (100%)
 rename {resources => samples}/samples/typespec.sample (100%)
 rename {resources => samples}/samples/typst.sample (100%)
 rename {resources => samples}/samples/v.sample (100%)
 rename {resources => samples}/samples/vala.sample (100%)
 rename {resources => samples}/samples/vb.sample (100%)
 rename {resources => samples}/samples/verilog.sample (100%)
 rename {resources => samples}/samples/vhdl.sample (100%)
 rename {resources => samples}/samples/viml.sample (100%)
 rename {resources => samples}/samples/vue-html.sample (100%)
 rename {resources => samples}/samples/vue.sample (100%)
 rename {resources => samples}/samples/vyper.sample (100%)
 rename {resources => samples}/samples/wasm.sample (100%)
 rename {resources => samples}/samples/wenyan.sample (100%)
 rename {resources => samples}/samples/wgsl.sample (100%)
 rename {resources => samples}/samples/wikitext.sample (100%)
 rename {resources => samples}/samples/wolfram.sample (100%)
 rename {resources => samples}/samples/xml.sample (100%)
 rename {resources => samples}/samples/xsl.sample (100%)
 rename {resources => samples}/samples/yaml.sample (100%)
 rename {resources => samples}/samples/zenscript.sample (100%)
 rename {resources => samples}/samples/zig.sample (100%)
 rename {resources => samples}/samples/zsh.sample (100%)
 create mode 100644 samples/serve.php

diff --git a/composer.json b/composer.json
index e36b6d8..843d120 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,8 @@
         "laravel/pint": "^1.18.1",
         "phpstan/phpstan": "^2.0",
         "phpstan/extension-installer": "^1.4.3",
-        "illuminate/support": "^11.30"
+        "illuminate/support": "^11.30",
+        "symfony/var-exporter": "^7.2"
     },
     "config": {
         "allow-plugins": {
@@ -45,11 +46,11 @@
     "scripts": {
         "sample": [
             "Composer\\Config::disableProcessTimeout",
-            "@php -S 127.0.0.1:8080 ./meta/sample.php"
+            "@php -S 127.0.0.1:8080 ./samples/serve.php"
         ],
         "sample:debug": [
             "Composer\\Config::disableProcessTimeout",
-            "herd debug -S 127.0.0.1:8080 ./meta/sample.php"
+            "herd debug -S 127.0.0.1:8080 ./samples/serve.php"
         ],
         "update-sources": [
             "Composer\\Config::disableProcessTimeout",
diff --git a/package-lock.json b/package-lock.json
index 6753c97..2c0718a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,9 +12,9 @@
             }
         },
         "node_modules/tm-grammars": {
-            "version": "1.22.10",
-            "resolved": "https://registry.npmjs.org/tm-grammars/-/tm-grammars-1.22.10.tgz",
-            "integrity": "sha512-NCCAb30TjezKvh3Aw3faAJ2DlvFCdu7+NAa5yUl5trn8MaD6XX5MfiLCx7Po2Ccu/UgzxximAiaPDBX2dLpo/Q==",
+            "version": "1.23.10",
+            "resolved": "https://registry.npmjs.org/tm-grammars/-/tm-grammars-1.23.10.tgz",
+            "integrity": "sha512-hbasHeYuOPrA+quanJYjTanMkwrU2NyCRbFpQJZmLVUw9zJSzZkA1HGrsuAPjQ/KoXwdNuYkT9IyaeoG4vp6gA==",
             "dev": true,
             "license": "MIT",
             "funding": {
@@ -22,9 +22,9 @@
             }
         },
         "node_modules/tm-themes": {
-            "version": "1.9.8",
-            "resolved": "https://registry.npmjs.org/tm-themes/-/tm-themes-1.9.8.tgz",
-            "integrity": "sha512-XbsuHkBCRBAt/MYXYFDHLfBH70SHa55TwJ50Qsw5UE6w9s12RDNNFyA3wkljkJw/LTG1F672QaO3BOMcIGBfJQ==",
+            "version": "1.10.3",
+            "resolved": "https://registry.npmjs.org/tm-themes/-/tm-themes-1.10.3.tgz",
+            "integrity": "sha512-R19bF/9nxmCtw7upTkl5hq37YJFZkLgO/i+jgwMCTeAE6HVdnwjG3CgeAwXloB/5VhFhOwvuO81qkCdd1s4f0A==",
             "dev": true,
             "license": "MIT",
             "funding": {
diff --git a/resources/languages/abap.json b/resources/languages/abap.json
index 8181db4..90e3623 100644
--- a/resources/languages/abap.json
+++ b/resources/languages/abap.json
@@ -5,7 +5,7 @@
     "ABAP"
   ],
   "foldingStartMarker": "/\\*\\*|\\{\\s*$",
-  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
+  "foldingStopMarker": "\\*\\*/|^\\s*}",
   "name": "abap",
   "patterns": [
     {
@@ -27,19 +27,19 @@
       "name": "comment.line.partial.abap"
     },
     {
-      "match": "(?<![^\\s])##.*?(?=([\\.:,\\s]))",
+      "match": "(?<!\\S)##.*?(?=([.:,\\s]))",
       "name": "comment.line.pragma.abap"
     },
     {
-      "match": "(?i)(?<=(?:\\s|~|-))(?<=(?:->|=>))([a-z_\\/][a-z_0-9\\/]*)(?=\\s+(?:=|\\+=|-=|\\*=|\\/=|&&=|&=)\\s+)",
+      "match": "(?i)(?<=[\\s~-])(?<=(?:->|=>))([a-z_/][a-z_0-9/]*)(?=\\s+(?:=|\\+=|-=|\\*=|/=|&&=|&=)\\s+)",
       "name": "variable.other.abap"
     },
     {
-      "match": "\\b[0-9]+(\\b|\\.|,)",
+      "match": "\\b[0-9]+(\\b|[.,])",
       "name": "constant.numeric.abap"
     },
     {
-      "match": "(?ix)(^|\\s+)((PUBLIC|PRIVATE|PROTECTED)\\sSECTION)(?=\\s+|:|\\.)",
+      "match": "(?i)(^|\\s+)((P(?:UBLIC|RIVATE|ROTECTED))\\sSECTION)(?=\\s+|[:.])",
       "name": "storage.modifier.class.abap"
     },
     {
@@ -58,7 +58,7 @@
       "name": "string.interpolated.abap",
       "patterns": [
         {
-          "match": "({ )|( })",
+          "match": "(\\{ )|( })",
           "name": "constant.character.escape"
         },
         {
@@ -66,11 +66,11 @@
           "name": "constant.character.escape.abap"
         },
         {
-          "match": "(?ix)(?<=\\s)(align|alpha|case|country|currency|date|decimals|exponent|number|pad|sign|style|time|timestamp|timezone|width|xsd|zero)(?=\\s\\=)",
+          "match": "(?i)(?<=\\s)(align|alpha|case|country|currency|date|decimals|exponent|number|pad|sign|style|time|timestamp|timezone|width|xsd|zero)(?=\\s=)",
           "name": "entity.name.property.stringtemplate.abap"
         },
         {
-          "match": "(?ix)(?<=\\=\\s)(center|engineering|environment|in|iso|left|leftplus|leftspace|lower|no|out|raw|right|rightplus|rightspace|scale_preserving|scale_preserving_scientific|scientific|scientific_with_leading_zero|sign_as_postfix|simple|space|upper|user|yes)(?=\\s)",
+          "match": "(?i)(?<==\\s)(center|engineering|environment|in|iso|left|leftplus|leftspace|lower|no|out|raw|right|rightplus|rightspace|scale_preserving|scale_preserving_scientific|scientific|scientific_with_leading_zero|sign_as_postfix|simple|space|upper|user|yes)(?=\\s)",
           "name": "entity.value.property.stringtemplate.abap"
         }
       ]
@@ -98,7 +98,7 @@
       ]
     },
     {
-      "begin": "(?i)^\\s*(class)\\s([a-z_\\/][a-z_0-9\\/]*)",
+      "begin": "(?i)^\\s*(class)\\s([a-z_/][a-z_0-9/]*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.block.abap"
@@ -111,7 +111,7 @@
       "name": "meta.block.begin.implementation.abap",
       "patterns": [
         {
-          "match": "(?ix)(^|\\s+)(definition|implementation|public|inheriting\\s+from|final|deferred|abstract|shared\\s+memory\\s+enabled|(global|local)*\\s*friends|(create\\s+(public|protected|private))|for\\s+behavior\\s+of|for\\s+testing|risk\\s+level\\s+(critical|dangerous|harmless))|duration\\s(short|medium|long)(?=\\s+|\\.)",
+          "match": "(?i)(^|\\s+)(definition|implementation|public|inheriting\\s+from|final|deferred|abstract|shared\\s+memory\\s+enabled|(global|local)*\\s*friends|(create\\s+(p(?:ublic|rotected|rivate)))|for\\s+behavior\\s+of|for\\s+testing|risk\\s+level\\s+(critical|dangerous|harmless))|duration\\s(short|medium|long)(?=\\s+|\\.)",
           "name": "storage.modifier.class.abap"
         },
         {
@@ -127,7 +127,7 @@
       ]
     },
     {
-      "begin": "(?ix)^\\s*(method)\\s(?:([a-z_\\/][a-z_0-9\\/]*)~)?([a-z_\\/][a-z_0-9\\/]*)",
+      "begin": "(?i)^\\s*(method)\\s(?:([a-z_/][a-z_0-9/]*)~)?([a-z_/][a-z_0-9/]*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.block.abap"
@@ -142,19 +142,19 @@
       "end": "\\s*\\.\\s*\\n?",
       "patterns": [
         {
-          "match": "(?ix)(?<=^|\\s)(BY\\s+DATABASE(\\s+PROCEDURE|\\s+FUNCTION|\\s+GRAPH\\s+WORKSPACE)|BY\\s+KERNEL\\s+MODULE)(?=\\s+|\\.)",
+          "match": "(?i)(?<=^|\\s)(BY(?:\\s+DATABASE(\\s+PROCEDURE|\\s+FUNCTION|\\s+GRAPH\\s+WORKSPACE)|\\s+KERNEL\\s+MODULE))(?=\\s+|\\.)",
           "name": "storage.modifier.method.abap"
         },
         {
-          "match": "(?ix)(?<=^|\\s)(FOR\\s+(HDB|LLANG))(?=\\s+|\\.)",
+          "match": "(?i)(?<=^|\\s)(FOR\\s+(HDB|LLANG))(?=\\s+|\\.)",
           "name": "storage.modifier.method.abap"
         },
         {
-          "match": "(?ix)(?<=\\s)(OPTIONS\\s+(READ-ONLY|DETERMINISTIC|SUPPRESS\\s+SYNTAX\\s+ERRORS))(?=\\s+|\\.)",
+          "match": "(?i)(?<=\\s)(OPTIONS\\s+(READ-ONLY|DETERMINISTIC|SUPPRESS\\s+SYNTAX\\s+ERRORS))(?=\\s+|\\.)",
           "name": "storage.modifier.method.abap"
         },
         {
-          "match": "(?ix)(?<=^|\\s)(LANGUAGE\\s+(SQLSCRIPT|SQL|GRAPH))(?=\\s+|\\.)",
+          "match": "(?i)(?<=^|\\s)(LANGUAGE\\s+(SQLSCRIPT|SQL|GRAPH))(?=\\s+|\\.)",
           "name": "storage.modifier.method.abap"
         },
         {
@@ -163,7 +163,7 @@
               "name": "storage.modifier.method.abap"
             }
           },
-          "match": "(?ix)(?<=\\s)(USING)\\s+([a-z_\\/][a-z_0-9\\/=\\>]*)+(?=\\s+|\\.)"
+          "match": "(?i)(?<=\\s)(USING)\\s+([a-z_/][a-z_0-9/=>]*)+(?=\\s+|\\.)"
         },
         {
           "begin": "(?=[A-Za-z_][A-Za-z0-9_]*)",
@@ -177,7 +177,7 @@
       ]
     },
     {
-      "begin": "(?ix)^\\s*(INTERFACE)\\s([a-z_\\/][a-z_0-9\\/]*)",
+      "begin": "(?i)^\\s*(INTERFACE)\\s([a-z_/][a-z_0-9/]*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.block.abap"
@@ -189,13 +189,13 @@
       "end": "\\s*\\.\\s*\\n?",
       "patterns": [
         {
-          "match": "(?ix)(?<=^|\\s)(DEFERRED|PUBLIC)(?=\\s+|\\.)",
+          "match": "(?i)(?<=^|\\s)(DEFERRED|PUBLIC)(?=\\s+|\\.)",
           "name": "storage.modifier.method.abap"
         }
       ]
     },
     {
-      "begin": "(?ix)^\\s*(FORM)\\s([a-z_\\/][a-z_0-9\\/\\-\\?]*)",
+      "begin": "(?i)^\\s*(FORM)\\s([a-z_/][a-z_0-9/\\-?]*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.block.abap"
@@ -207,7 +207,7 @@
       "end": "\\s*\\.\\s*\\n?",
       "patterns": [
         {
-          "match": "(?ix)(?<=^|\\s)(USING|TABLES|CHANGING|RAISING|IMPLEMENTATION|DEFINITION)(?=\\s+|\\.)",
+          "match": "(?i)(?<=^|\\s)(USING|TABLES|CHANGING|RAISING|IMPLEMENTATION|DEFINITION)(?=\\s+|\\.)",
           "name": "storage.modifier.form.abap"
         },
         {
@@ -219,7 +219,7 @@
       ]
     },
     {
-      "match": "(?i)(endclass|endmethod|endform|endinterface)",
+      "match": "(?i)(end(?:class|method|form|interface))",
       "name": "storage.type.block.end.abap"
     },
     {
@@ -256,35 +256,35 @@
   ],
   "repository": {
     "abap_constants": {
-      "match": "(?ix)(?<=\\s)(initial|null|@?space|@?abap_true|@?abap_false|@?abap_undefined|table_line|\n                                %_final|%_hints|%_predefined|col_background|col_group|col_heading|col_key|col_negative|col_normal|col_positive|col_total|\n\t\t\t\tadabas|as400|db2|db6|hdb|oracle|sybase|mssqlnt|pos_low|pos_high)(?=\\s|\\.|,)",
+      "match": "(?i)(?<=\\s)(initial|null|@?space|@?abap_true|@?abap_false|@?abap_undefined|table_line|%_final|%_hints|%_predefined|col_background|col_group|col_heading|col_key|col_negative|col_normal|col_positive|col_total|adabas|as400|db2|db6|hdb|oracle|sybase|mssqlnt|pos_low|pos_high)(?=[\\s.,])",
       "name": "constant.language.abap"
     },
     "abaptypes": {
       "patterns": [
         {
-          "match": "(?ix)\\s(abap_bool|string|xstring|any|clike|csequence|numeric|xsequence|decfloat|decfloat16|decfloat34|utclong|simple|int8|c|n|i|p|f|d|t|x)(?=\\s|\\.|,)",
+          "match": "(?i)\\s(abap_bool|string|xstring|any|clike|csequence|numeric|xsequence|decfloat|decfloat16|decfloat34|utclong|simple|int8|[cnipfdtx])(?=[\\s.,])",
           "name": "support.type.abap"
         },
         {
-          "match": "(?ix)\\s(TYPE|REF|TO|LIKE|LINE|OF|STRUCTURE|STANDARD|SORTED|HASHED|INDEX|TABLE|WITH|UNIQUE|NON-UNIQUE|SECONDARY|DEFAULT|KEY)(?=\\s|\\.|,)",
+          "match": "(?i)\\s(TYPE|REF|TO|LIKE|LINE|OF|STRUCTURE|STANDARD|SORTED|HASHED|INDEX|TABLE|WITH|UNIQUE|NON-UNIQUE|SECONDARY|DEFAULT|KEY)(?=[\\s.,])",
           "name": "keyword.control.simple.abap"
         }
       ]
     },
     "arithmetic_operator": {
-      "match": "(?i)(?<=\\s)(\\+|\\-|\\*|\\*\\*|\\/|%|DIV|MOD|BIT-AND|BIT-OR|BIT-XOR|BIT-NOT)(?=\\s)",
+      "match": "(?i)(?<=\\s)([+\\-*]|\\*\\*|[/%]|DIV|MOD|BIT-AND|BIT-OR|BIT-XOR|BIT-NOT)(?=\\s)",
       "name": "keyword.control.simple.abap"
     },
     "builtin_functions": {
-      "match": "(?ix)(?<=\\s)(abs|sign|ceil|floor|trunc|frac|acos|asin|atan|cos|sin|tan|cosh|sinh|tanh|exp|log|log10|sqrt|strlen|xstrlen|charlen|lines|numofchar|dbmaxlen|round|rescale|nmax|nmin|cmax|cmin|boolc|boolx|xsdbool|contains|contains_any_of|contains_any_not_of|matches|line_exists|ipow|char_off|count|count_any_of|count_any_not_of|distance|condense|concat_lines_of|escape|find|find_end|find_any_of|find_any_not_of|insert|match|repeat|replace|reverse|segment|shift_left|shift_right|substring|substring_after|substring_from|substring_before|substring_to|to_upper|to_lower|to_mixed|from_mixed|translate|bit-set|line_index)(?=\\()",
+      "match": "(?i)(?<=\\s)(abs|sign|ceil|floor|trunc|frac|acos|asin|atan|cos|sin|tan|cosh|sinh|tanh|exp|log|log10|sqrt|strlen|xstrlen|charlen|lines|numofchar|dbmaxlen|round|rescale|nmax|nmin|cmax|cmin|boolc|boolx|xsdbool|contains|contains_any_of|contains_any_not_of|matches|line_exists|ipow|char_off|count|count_any_of|count_any_not_of|distance|condense|concat_lines_of|escape|find|find_end|find_any_of|find_any_not_of|insert|match|repeat|replace|reverse|segment|shift_left|shift_right|substring|substring_after|substring_from|substring_before|substring_to|to_upper|to_lower|to_mixed|from_mixed|translate|bit-set|line_index)(?=\\()",
       "name": "entity.name.function.builtin.abap"
     },
     "comparison_operator": {
-      "match": "(?i)(?<=\\s)(<|>|<\\=|>\\=|\\=|<>|eq|ne|lt|le|gt|ge|cs|cp|co|cn|ca|na|ns|np|byte-co|byte-cn|byte-ca|byte-na|byte-cs|byte-ns|o|z|m)(?=\\s)",
+      "match": "(?i)(?<=\\s)([<>]|<=|>=|=|<>|eq|ne|lt|le|gt|ge|cs|cp|co|cn|ca|na|ns|np|byte-co|byte-cn|byte-ca|byte-na|byte-cs|byte-ns|[ozm])(?=\\s)",
       "name": "keyword.control.simple.abap"
     },
     "control_keywords": {
-      "match": "(?ix)(^|\\s)(\n\t        at|case|catch|continue|do|elseif|else|endat|endcase|endcatch|enddo|endif|\n\t        endloop|endon|endtry|endwhile|if|loop|on|raise|try|while)(?=\\s|\\.|:)",
+      "match": "(?i)(^|\\s)(at|case|catch|continue|do|elseif|else|endat|endcase|endcatch|enddo|endif|endloop|endon|endtry|endwhile|if|loop|on|raise|try|while)(?=[\\s.:])",
       "name": "keyword.control.flow.abap"
     },
     "generic_names": {
@@ -315,14 +315,14 @@
           "name": "variable.other.abap"
         }
       },
-      "match": "(?ix)\\b(data|value|field-symbol|final|reference|resumable)\\((<?[a-z_\\/][a-z_0-9\\/]*>?)\\)"
+      "match": "(?i)\\b(data|value|field-symbol|final|reference|resumable)\\((<?[a-z_/][a-z_0-9/]*>?)\\)"
     },
     "logical_operator": {
       "match": "(?i)(?<=\\s)(not|or|and)(?=\\s)",
       "name": "keyword.control.simple.abap"
     },
     "main_keywords": {
-      "match": "(?ix)(?<=^|\\s)(\nabap-source|\nabstract|\naccept|\naccepting|\naccess|\naccording|\naction|\nactivation|\nactual|\nadd|\nadd-corresponding|\nadjacent|\nafter|\nalias|\naliases|\nall|\nallocate|\namdp|\nanalysis|\nanalyzer|\nappend|\nappending|\napplication|\narchive|\narea|\narithmetic|\nas|\nascending|\nassert|\nassign|\nassigned|\nassigning|\nassociation|\nasynchronous|\nat|\nattributes|\nauthority|\nauthority-check|\nauthorization|\nauto|\nback|\nbackground|\nbackward|\nbadi|\nbase|\nbefore|\nbegin|\nbehavior|\nbetween|\nbinary|\nbit|\nblank|\nblanks|\nblock|\nblocks|\nbound|\nboundaries|\nbounds|\nboxed|\nbreak|\nbreak-point|\nbuffer|\nby|\nbypassing|\nbyte|\nbyte-order|\ncall|\ncalling|\ncast|\ncasting|\ncds|\ncentered|\nchange|\nchanging|\nchannels|\nchar-to-hex|\ncharacter|\ncheck|\ncheckbox|\ncid|\ncircular|\nclass|\nclass-data|\nclass-events|\nclass-method|\nclass-methods|\nclass-pool|\ncleanup|\nclear|\nclient|\nclients|\nclock|\nclone|\nclose|\ncnt|\ncode|\ncollect|\ncolor|\ncolumn|\ncomment|\ncomments|\ncommit|\ncommon|\ncommunication|\ncomparing|\ncomponent|\ncomponents|\ncompression|\ncompute|\nconcatenate|\ncond|\ncondense|\ncondition|\nconnection|\nconstant|\nconstants|\ncontext|\ncontexts|\ncontrol|\ncontrols|\nconv|\nconversion|\nconvert|\ncopy|\ncorresponding|\ncount|\ncountry|\ncover|\ncreate|\ncurrency|\ncurrent|\ncursor|\ncustomer-function|\ndata|\ndatabase|\ndatainfo|\ndataset|\ndate|\ndaylight|\nddl|\ndeallocate|\ndecimals|\ndeclarations|\ndeep|\ndefault|\ndeferred|\ndefine|\ndelete|\ndeleting|\ndemand|\ndescending|\ndescribe|\ndestination|\ndetail|\ndetermine|\ndialog|\ndid|\ndirectory|\ndiscarding|\ndisplay|\ndisplay-mode|\ndistance|\ndistinct|\ndivide|\ndivide-corresponding|\ndummy|\nduplicate|\nduplicates|\nduration|\nduring|\ndynpro|\nedit|\neditor-call|\nempty|\nenabled|\nenabling|\nencoding|\nend|\nend-enhancement-section|\nend-of-definition|\nend-of-page|\nend-of-selection|\nend-test-injection|\nend-test-seam|\nendenhancement|\nendexec|\nendfunction|\nendian|\nending|\nendmodule|\nendprovide|\nendselect|\nendwith|\nenhancement|\nenhancement-point|\nenhancement-section|\nenhancements|\nentities|\nentity|\nentries|\nentry|\nenum|\nequiv|\nerrors|\nescape|\nescaping|\nevent|\nevents|\nexact|\nexcept|\nexception|\nexception-table|\nexceptions|\nexcluding|\nexec|\nexecute|\nexists|\nexit|\nexit-command|\nexpanding|\nexplicit|\nexponent|\nexport|\nexporting|\nextended|\nextension|\nextract|\nfail|\nfailed|\nfeatures|\nfetch|\nfield|\nfield-groups|\nfield-symbols|\nfields|\nfile|\nfill|\nfilter|\nfilters|\nfinal|\nfind|\nfirst|\nfirst-line|\nfixed-point|\nflush|\nfollowing|\nfor|\nformat|\nforward|\nfound|\nframe|\nframes|\nfree|\nfrom|\nfull|\nfunction|\nfunction-pool|\ngenerate|\nget|\ngiving|\ngraph|\ngroup|\ngroups|\nhandle|\nhandler|\nhashed|\nhaving|\nheader|\nheaders|\nheading|\nhelp-id|\nhelp-request|\nhide|\nhint|\nhold|\nhotspot|\nicon|\nid|\nidentification|\nidentifier|\nignore|\nignoring|\nimmediately|\nimplemented|\nimplicit|\nimport|\nimporting|\nin|\ninactive|\nincl|\ninclude|\nincludes|\nincluding|\nincrement|\nindex|\nindex-line|\nindicators|\ninfotypes|\ninheriting|\ninit|\ninitial|\ninitialization|\ninner|\ninput|\ninsert|\ninstance|\ninstances|\nintensified|\ninterface|\ninterface-pool|\ninterfaces|\ninternal|\nintervals|\ninto|\ninverse|\ninverted-date|\nis|\njob|\njoin|\nkeep|\nkeeping|\nkernel|\nkey|\nkeys|\nkeywords|\nkind|\nlanguage|\nlast|\nlate|\nlayout|\nleading|\nleave|\nleft|\nleft-justified|\nlegacy|\nlength|\nlet|\nlevel|\nlevels|\nlike|\nline|\nline-count|\nline-selection|\nline-size|\nlinefeed|\nlines|\nlink|\nlist|\nlist-processing|\nlistbox|\nload|\nload-of-program|\nlocal|\nlocale|\nlock|\nlocks|\nlog-point|\nlogical|\nlower|\nmapped|\nmapping|\nmargin|\nmark|\nmask|\nmatch|\nmatchcode|\nmaximum|\nmembers|\nmemory|\nmesh|\nmessage|\nmessage-id|\nmessages|\nmessaging|\nmethod|\nmethods|\nmode|\nmodif|\nmodifier|\nmodify|\nmodule|\nmove|\nmove-corresponding|\nmultiply|\nmultiply-corresponding|\nname|\nnametab|\nnative|\nnested|\nnesting|\nnew|\nnew-line|\nnew-page|\nnew-section|\nnext|\nno-display|\nno-extension|\nno-gap|\nno-gaps|\nno-grouping|\nno-heading|\nno-scrolling|\nno-sign|\nno-title|\nno-zero|\nnodes|\nnon-unicode|\nnon-unique|\nnumber|\nobject|\nobjects|\nobjmgr|\nobligatory|\noccurence|\noccurences|\noccurrence|\noccurrences|\noccurs|\nof|\noffset|\non|\nonly|\nopen|\noptional|\noption|\noptions|\norder|\nothers|\nout|\nouter|\noutput|\noutput-length|\noverflow|\noverlay|\npack|\npackage|\npadding|\npage|\nparameter|\nparameter-table|\nparameters|\npart|\npartially|\npcre|\nperform|\nperforming|\npermissions|\npf-status|\nplaces|\npool|\nposition|\npragmas|\npreceding|\nprecompiled|\npreferred|\npreserving|\nprimary|\nprint|\nprint-control|\nprivate|\nprivileged|\nprocedure|\nprocess|\nprogram|\nproperty|\nprotected|\nprovide|\npush|\npushbutton|\nput|\nquery|\nqueue-only|\nqueueonly|\nquickinfo|\nradiobutton|\nraising|\nrange|\nranges|\nread|\nread-only|\nreceive|\nreceived|\nreceiving|\nredefinition|\nreduce|\nref|\nreference|\nrefresh|\nregex|\nreject|\nrenaming|\nreplace|\nreplacement|\nreplacing|\nreport|\nreported|\nrequest|\nrequested|\nrequired|\nreserve|\nreset|\nresolution|\nrespecting|\nresponse|\nrestore|\nresult|\nresults|\nresumable|\nresume|\nretry|\nreturn|\nreturning|\nright|\nright-justified|\nrollback|\nrows|\nrp-provide-from-last|\nrun|\nsap|\nsap-spool|\nsave|\nsaving|\nscan|\nscreen|\nscroll|\nscroll-boundary|\nscrolling|\nsearch|\nseconds|\nsection|\nselect|\nselect-options|\nselection|\nselection-screen|\nselection-set|\nselection-sets|\nselection-table|\nselections|\nsend|\nseparate|\nseparated|\nsession|\nset|\nshared|\nshift|\nshortdump|\nshortdump-id|\nsign|\nsimple|\nsimulation|\nsingle|\nsize|\nskip|\nskipping|\nsmart|\nsome|\nsort|\nsortable|\nsorted|\nsource|\nspecified|\nsplit|\nspool|\nspots|\nsql|\nstable|\nstamp|\nstandard|\nstart-of-selection|\nstarting|\nstate|\nstatement|\nstatements|\nstatic|\nstatics|\nstatusinfo|\nstep|\nstep-loop|\nstop|\nstructure|\nstructures|\nstyle|\nsubkey|\nsubmatches|\nsubmit|\nsubroutine|\nsubscreen|\nsubstring|\nsubtract|\nsubtract-corresponding|\nsuffix|\nsum|\nsummary|\nsupplied|\nsupply|\nsuppress|\nswitch|\nsymbol|\nsyntax-check|\nsyntax-trace|\nsystem-call|\nsystem-exceptions|\ntab|\ntabbed|\ntable|\ntables|\ntableview|\ntabstrip|\ntarget|\ntask|\ntasks|\ntest|\ntest-injection|\ntest-seam|\ntesting|\ntext|\ntextpool|\nthen|\nthrow|\ntime|\ntimes|\ntitle|\ntitlebar|\nto|\ntokens|\ntop-lines|\ntop-of-page|\ntrace-file|\ntrace-table|\ntrailing|\ntransaction|\ntransfer|\ntransformation|\ntranslate|\ntransporting|\ntrmac|\ntruncate|\ntruncation|\ntype|\ntype-pool|\ntype-pools|\ntypes|\nuline|\nunassign|\nunbounded|\nunder|\nunicode|\nunion|\nunique|\nunit|\nunix|\nunpack|\nuntil|\nunwind|\nup|\nupdate|\nupper|\nuser|\nuser-command|\nusing|\nutf-8|\nuuid|\nvalid|\nvalidate|\nvalue|\nvalue-request|\nvalues|\nvary|\nvarying|\nversion|\nvia|\nvisible|\nwait|\nwhen|\nwhere|\nwindow|\nwindows|\nwith|\nwith-heading|\nwith-title|\nwithout|\nword|\nwork|\nworkspace|\nwrite|\nxml|\nzone\n\t\t        \t)(?=\\s|\\.|:|,)",
+      "match": "(?i)(?<=^|\\s)(abap-source|abstract|accept|accepting|access|according|action|activation|actual|add|add-corresponding|adjacent|after|alias|aliases|all|allocate|amdp|analysis|analyzer|append|appending|application|archive|area|arithmetic|as|ascending|assert|assign|assigned|assigning|association|asynchronous|at|attributes|authority|authority-check|authorization|auto|back|background|backward|badi|base|before|begin|behavior|between|binary|bit|blank|blanks|block|blocks|bound|boundaries|bounds|boxed|break|break-point|buffer|by|bypassing|byte|byte-order|call|calling|cast|casting|cds|centered|change|changing|channels|char-to-hex|character|check|checkbox|cid|circular|class|class-data|class-events|class-method|class-methods|class-pool|cleanup|clear|client|clients|clock|clone|close|cnt|code|collect|color|column|comment|comments|commit|common|communication|comparing|component|components|compression|compute|concatenate|cond|condense|condition|connection|constant|constants|context|contexts|control|controls|conv|conversion|convert|copy|corresponding|count|country|cover|create|currency|current|cursor|customer-function|data|database|datainfo|dataset|date|daylight|ddl|deallocate|decimals|declarations|deep|default|deferred|define|delete|deleting|demand|descending|describe|destination|detail|determine|dialog|did|directory|discarding|display|display-mode|distance|distinct|divide|divide-corresponding|dummy|duplicate|duplicates|duration|during|dynpro|edit|editor-call|empty|enabled|enabling|encoding|end|end-enhancement-section|end-of-definition|end-of-page|end-of-selection|end-test-injection|end-test-seam|endenhancement|endexec|endfunction|endian|ending|endmodule|endprovide|endselect|endwith|enhancement|enhancement-point|enhancement-section|enhancements|entities|entity|entries|entry|enum|equiv|errors|escape|escaping|event|events|exact|except|exception|exception-table|exceptions|excluding|exec|execute|exists|exit|exit-command|expanding|explicit|exponent|export|exporting|extended|extension|extract|fail|failed|features|fetch|field|field-groups|field-symbols|fields|file|fill|filter|filters|final|find|first|first-line|fixed-point|flush|following|for|format|forward|found|frame|frames|free|from|full|function|function-pool|generate|get|giving|graph|group|groups|handle|handler|hashed|having|header|headers|heading|help-id|help-request|hide|hint|hold|hotspot|icon|id|identification|identifier|ignore|ignoring|immediately|implemented|implicit|import|importing|in|inactive|incl|include|includes|including|increment|index|index-line|indicators|infotypes|inheriting|init|initial|initialization|inner|input|insert|instance|instances|intensified|interface|interface-pool|interfaces|internal|intervals|into|inverse|inverted-date|is|job|join|keep|keeping|kernel|key|keys|keywords|kind|language|last|late|layout|leading|leave|left|left-justified|legacy|length|let|level|levels|like|line|line-count|line-selection|line-size|linefeed|lines|link|list|list-processing|listbox|load|load-of-program|local|locale|lock|locks|log-point|logical|lower|mapped|mapping|margin|mark|mask|match|matchcode|maximum|members|memory|mesh|message|message-id|messages|messaging|method|methods|mode|modif|modifier|modify|module|move|move-corresponding|multiply|multiply-corresponding|name|nametab|native|nested|nesting|new|new-line|new-page|new-section|next|no-display|no-extension|no-gap|no-gaps|no-grouping|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unicode|non-unique|number|object|objects|objmgr|obligatory|occurence|occurences|occurrence|occurrences|occurs|of|offset|on|only|open|optional|option|options|order|others|out|outer|output|output-length|overflow|overlay|pack|package|padding|page|parameter|parameter-table|parameters|part|partially|pcre|perform|performing|permissions|pf-status|places|pool|position|pragmas|preceding|precompiled|preferred|preserving|primary|print|print-control|private|privileged|procedure|process|program|property|protected|provide|push|pushbutton|put|query|queue-only|queueonly|quickinfo|radiobutton|raising|range|ranges|read|read-only|receive|received|receiving|redefinition|reduce|ref|reference|refresh|regex|reject|renaming|replace|replacement|replacing|report|reported|request|requested|required|reserve|reset|resolution|respecting|response|restore|result|results|resumable|resume|retry|return|returning|right|right-justified|rollback|rows|rp-provide-from-last|run|sap|sap-spool|save|saving|scan|screen|scroll|scroll-boundary|scrolling|search|seconds|section|select|select-options|selection|selection-screen|selection-set|selection-sets|selection-table|selections|send|separate|separated|session|set|shared|shift|shortdump|shortdump-id|sign|simple|simulation|single|size|skip|skipping|smart|some|sort|sortable|sorted|source|specified|split|spool|spots|sql|stable|stamp|standard|start-of-selection|starting|state|statement|statements|static|statics|statusinfo|step|step-loop|stop|structure|structures|style|subkey|submatches|submit|subroutine|subscreen|substring|subtract|subtract-corresponding|suffix|sum|summary|supplied|supply|suppress|switch|symbol|syntax-check|syntax-trace|system-call|system-exceptions|tab|tabbed|table|tables|tableview|tabstrip|target|task|tasks|test|test-injection|test-seam|testing|text|textpool|then|throw|time|times|title|titlebar|to|tokens|top-lines|top-of-page|trace-file|trace-table|trailing|transaction|transfer|transformation|translate|transporting|trmac|truncate|truncation|type|type-pool|type-pools|types|uline|unassign|unbounded|under|unicode|union|unique|unit|unix|unpack|until|unwind|up|update|upper|user|user-command|using|utf-8|uuid|valid|validate|value|value-request|values|vary|varying|version|via|visible|wait|when|where|window|windows|with|with-heading|with-title|without|word|work|workspace|write|xml|zone)(?=[\\s.:,])",
       "name": "keyword.control.simple.abap"
     },
     "operators": {
@@ -342,19 +342,19 @@
       ]
     },
     "other_operator": {
-      "match": "(?<=\\s)(&&|&|\\?=|\\+=|-=|\\/=|\\*=|&&=|&=)(?=\\s)",
+      "match": "(?<=\\s)(&&|&|\\?=|\\+=|-=|/=|\\*=|&&=|&=)(?=\\s)",
       "name": "keyword.control.simple.abap"
     },
     "reserved_names": {
-      "match": "(?ix)(?<=\\s)(me|super)(?=\\s|\\.|,|->)",
+      "match": "(?i)(?<=\\s)(me|super)(?=[\\s.,]|->)",
       "name": "constant.language.abap"
     },
     "sql_functions": {
-      "match": "(?ix)(?<=\\s)(\nabap_system_timezone|\nabap_user_timezone|\nabs|\nadd_days|\nadd_months|\nallow_precision_loss|\nas_geo_json|\navg|\nbintohex|\ncast|\nceil|\ncoalesce|\nconcat_with_space|\nconcat|\ncorr_spearman|\ncorr|\ncount|\ncurrency_conversion|\ndatn_add_days|\ndatn_add_months|\ndatn_days_between|\ndats_add_days|\ndats_add_months|\ndats_days_between|\ndats_from_datn|\ndats_is_valid|\ndats_tims_to_tstmp|\ndats_to_datn|\ndayname|\ndays_between|\ndense_rank|\ndivision|\ndiv|\nextract_day|\nextract_hour|\nextract_minute|\nextract_month|\nextract_second|\nextract_year|\nfirst_value|\nfloor|\ngrouping|\nhextobin|\ninitcap|\ninstr|\nis_valid|\nlag|\nlast_value|\nlead|\nleft|\nlength|\nlike_regexpr|\nlocate_regexpr_after|\nlocate_regexpr|\nlocate|\nlower|\nlpad|\nltrim|\nmax|\nmedian|\nmin|\nmod|\nmonthname|\nntile|\noccurrences_regexpr|\nover|\nproduct|\nrank|\nreplace_regexpr|\nreplace|\nrigth|\nround|\nrow_number|\nrpad|\nrtrim|\nstddev|\nstring_agg|\nsubstring_regexpr|\nsubstring|\nsum|\ntims_from_timn|\ntims_is_valid|\ntims_to_timn|\nto_blob|\nto_clob|\ntstmp_add_seconds|\ntstmp_current_utctimestamp|\ntstmp_is_valid|\ntstmp_seconds_between|\ntstmp_to_dats|\ntstmp_to_dst|\ntstmp_to_tims|\ntstmpl_from_utcl|\ntstmpl_to_utcl|\nunit_conversion|\nupper|\nutcl_add_seconds|\nutcl_current|\nutcl_seconds_between|\nuuid|\nvar|\nweekday\n                                )(?=\\()",
+      "match": "(?i)(?<=\\s)(abap_system_timezone|abap_user_timezone|abs|add_days|add_months|allow_precision_loss|as_geo_json|avg|bintohex|cast|ceil|coalesce|concat_with_space|concat|corr_spearman|corr|count|currency_conversion|datn_add_days|datn_add_months|datn_days_between|dats_add_days|dats_add_months|dats_days_between|dats_from_datn|dats_is_valid|dats_tims_to_tstmp|dats_to_datn|dayname|days_between|dense_rank|division|div|extract_day|extract_hour|extract_minute|extract_month|extract_second|extract_year|first_value|floor|grouping|hextobin|initcap|instr|is_valid|lag|last_value|lead|left|length|like_regexpr|locate_regexpr_after|locate_regexpr|locate|lower|lpad|ltrim|max|median|min|mod|monthname|ntile|occurrences_regexpr|over|product|rank|replace_regexpr|replace|rigth|round|row_number|rpad|rtrim|stddev|string_agg|substring_regexpr|substring|sum|tims_from_timn|tims_is_valid|tims_to_timn|to_blob|to_clob|tstmp_add_seconds|tstmp_current_utctimestamp|tstmp_is_valid|tstmp_seconds_between|tstmp_to_dats|tstmp_to_dst|tstmp_to_tims|tstmpl_from_utcl|tstmpl_to_utcl|unit_conversion|upper|utcl_add_seconds|utcl_current|utcl_seconds_between|uuid|var|weekday)(?=\\()",
       "name": "entity.name.function.sql.abap"
     },
     "sql_types": {
-      "match": "(?ix)(?<=\\s)(char|clnt|cuky|curr|datn|dats|dec|decfloat16|decfloat34|fltp|int1|int2|int4|int8|lang|numc|quan|raw|sstring|timn|tims|unit|utclong)(?=\\s|\\(|\\))",
+      "match": "(?i)(?<=\\s)(char|clnt|cuky|curr|datn|dats|dec|decfloat16|decfloat34|fltp|int1|int2|int4|int8|lang|numc|quan|raw|sstring|timn|tims|unit|utclong)(?=[\\s()])",
       "name": "entity.name.type.sql.abap"
     },
     "system_fields": {
@@ -366,7 +366,7 @@
           "name": "variable.language.abap"
         }
       },
-      "match": "(?ix)\\b(sy)-(abcde|batch|binpt|calld|callr|colno|cpage|cprog|cucol|curow|datar|datlo|datum|dayst|dbcnt|dbnam|dbsysc|dyngr|dynnr|fdayw|fdpos|host|index|langu|ldbpg|lilli|linct|linno|linsz|lisel|listi|loopc|lsind|macol|mandt|marow|modno|msgid|msgli|msgno|msgty|msgv[1-4]|opsysc|pagno|pfkey|repid|saprl|scols|slset|spono|srows|staco|staro|stepl|subrc|sysid|tabix|tcode|tfill|timlo|title|tleng|tvar[0-9]|tzone|ucomm|uline|uname|uzeit|vline|wtitl|zonlo)(?=\\.|\\s)"
+      "match": "(?i)\\b(sy)-(abcde|batch|binpt|calld|callr|colno|cpage|cprog|cucol|curow|datar|datlo|datum|dayst|dbcnt|dbnam|dbsysc|dyngr|dynnr|fdayw|fdpos|host|index|langu|ldbpg|lilli|linct|linno|linsz|lisel|listi|loopc|lsind|macol|mandt|marow|modno|msgid|msgli|msgno|msgty|msgv[1-4]|opsysc|pagno|pfkey|repid|saprl|scols|slset|spono|srows|staco|staro|stepl|subrc|sysid|tabix|tcode|tfill|timlo|title|tleng|tvar[0-9]|tzone|ucomm|uline|uname|uzeit|vline|wtitl|zonlo)(?=[.\\s])"
     },
     "text_symbols": {
       "captures": {
@@ -377,7 +377,7 @@
           "name": "constant.numeric.abap"
         }
       },
-      "match": "(?ix)(?<=^|\\s)(text)-([A-Z0-9]{1,3})(?=\\s|\\.|:|,)"
+      "match": "(?i)(?<=^|\\s)(text)-([A-Z0-9]{1,3})(?=[\\s.:,])"
     }
   },
   "scopeName": "source.abap"
diff --git a/resources/languages/actionscript-3.json b/resources/languages/actionscript-3.json
index 71eee96..870e1ab 100644
--- a/resources/languages/actionscript-3.json
+++ b/resources/languages/actionscript-3.json
@@ -92,11 +92,11 @@
   ],
   "repository": {
     "arithmetic_operators": {
-      "match": "(\\+|\\-|/|%|(?<!:)\\*)",
+      "match": "([+\\-/%]|(?<!:)\\*)",
       "name": "keyword.operator.actionscript.3"
     },
     "array_access_operators": {
-      "match": "(\\[|\\])",
+      "match": "([\\[\\]])",
       "name": "keyword.operator.actionscript.3"
     },
     "class": {
@@ -112,7 +112,7 @@
           "name": "storage.modifier.actionscript.3"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.class.actionscript.3",
       "patterns": [
         {
@@ -187,7 +187,7 @@
       ]
     },
     "class_declaration": {
-      "begin": "\\b(class)\\b\\s+([\\.\\w]+|\\*)",
+      "begin": "\\b(class)\\b\\s+([A-Za-z0-9_$.]+|\\*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.actionscript.3"
@@ -212,7 +212,7 @@
     },
     "code_block": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "name": "meta.code_block.actionscript.3",
       "patterns": [
         {
@@ -326,7 +326,7 @@
       "match": "(?<=:)\\s*(\\*)"
     },
     "escapes": {
-      "match": "\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)",
+      "match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)",
       "name": "constant.character.escape.actionscript.3"
     },
     "extends": {
@@ -341,7 +341,7 @@
           "name": "entity.other.inherited-class.actionscript.3"
         }
       },
-      "match": "\\b(extends)\\b\\s+([\\.\\w]+)\\s*(?:,\\s*([\\.\\w]+))*\\s*",
+      "match": "\\b(extends)\\b\\s+([A-Za-z0-9_$.]+)\\s*(?:,\\s*([A-Za-z0-9_$.]+))*\\s*",
       "name": "meta.extends.actionscript.3"
     },
     "function_arguments": {
@@ -358,7 +358,7 @@
       ]
     },
     "functions": {
-      "begin": "\\b(function)\\b(?:\\s+\\b(get|set)\\b\\s+)?\\s*([a-zA-Z0-9_\\$]+\\b)?",
+      "begin": "\\b(function)\\b(?:\\s+\\b(get|set)\\b\\s+)?\\s*([a-zA-Z0-9_$]+\\b)?",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.actionscript.3"
@@ -390,8 +390,7 @@
           "name": "constant.other.actionscript.3"
         }
       },
-      "comment": "Following convention, let's guess that anything in all caps/digits (possible underscores) is a constant.",
-      "match": "\\b([A-Z\\$][A-Z0-9_]+)\\b"
+      "match": "\\b([A-Z$][A-Z0-9_]+)\\b"
     },
     "guess_type": {
       "captures": {
@@ -399,8 +398,7 @@
           "name": "support.type.actionscript.3"
         }
       },
-      "comment": "Following convention, let's guess that any word starting with one or more capital letters (that contains at least some lower-case letters so that constants aren't detected) refers to a class/type. May be fully-qualified.",
-      "match": "\\b((?:[A-Za-z0-9_\\$]+\\.)*[A-Z][A-Z0-9]*[a-z]+[A-Za-z0-9_\\$]*)\\b"
+      "match": "\\b((?:[A-Za-z0-9_$]+\\.)*[A-Z][A-Z0-9]*[a-z]+[A-Za-z0-9_$]*)\\b"
     },
     "implements": {
       "captures": {
@@ -414,7 +412,7 @@
           "name": "entity.other.inherited-class.actionscript.3"
         }
       },
-      "match": "\\b(implements)\\b\\s+([\\.\\w]+)\\s*(?:,\\s*([\\.\\w]+))*\\s*",
+      "match": "\\b(implements)\\b\\s+([A-Za-z0-9_$.]+)\\s*(?:,\\s*([A-Za-z0-9_$.]+))*\\s*",
       "name": "meta.implements.actionscript.3"
     },
     "import": {
@@ -426,7 +424,7 @@
           "name": "support.type.actionscript.3"
         }
       },
-      "match": "(^|\\s+|;)\\b(import)\\b\\s+([A-Za-z0-9\\$_\\.]+(?:\\.\\*)?)\\s*(?=;|$)",
+      "match": "(^|\\s+|;)\\b(import)\\b\\s+([A-Za-z0-9$_.]+(?:\\.\\*)?)\\s*(?=;|$)",
       "name": "meta.import.actionscript.3"
     },
     "interface": {
@@ -436,7 +434,7 @@
           "name": "storage.modifier.actionscript.3"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.interface.actionscript.3",
       "patterns": [
         {
@@ -454,7 +452,7 @@
       ]
     },
     "interface_declaration": {
-      "begin": "\\b(interface)\\b\\s+([\\.\\w]+)",
+      "begin": "\\b(interface)\\b\\s+([A-Za-z0-9_$.]+)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.interface.actionscript.3"
@@ -483,7 +481,7 @@
       "name": "variable.language.actionscript.3"
     },
     "logical_operators": {
-      "match": "(&|<|~|\\||>|\\^|!|\\?)",
+      "match": "([\\&<~|>^!?])",
       "name": "keyword.operator.actionscript.3"
     },
     "metadata": {
@@ -493,7 +491,7 @@
           "name": "keyword.other.actionscript.3"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "name": "meta.metadata_info.actionscript.3",
       "patterns": [
         {
@@ -537,7 +535,7 @@
           "name": "storage.modifier.actionscript.3"
         }
       },
-      "end": "(?<=(;|\\}))",
+      "end": "(?<=([;}]))",
       "name": "meta.method.actionscript.3",
       "patterns": [
         {
@@ -550,7 +548,7 @@
     },
     "mxml": {
       "begin": "<!\\[CDATA\\[",
-      "end": "\\]\\]>",
+      "end": "]]>",
       "name": "meta.cdata.actionscript.3",
       "patterns": [
         {
@@ -642,16 +640,16 @@
           "name": "storage.modifier.actionscript.3"
         }
       },
-      "match": "((\\w+)\\s+)?(namespace)\\s+(?:[A-Za-z0-9_\\$]+)",
+      "match": "((\\w+)\\s+)?(namespace)\\s+[A-Za-z0-9_$]+",
       "name": "meta.namespace_declaration.actionscript.3"
     },
     "numbers": {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?\\b",
+      "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([Ll]|UL|ul|[uUFf])?\\b",
       "name": "constant.numeric.actionscript.3"
     },
     "object_literal": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "name": "meta.object_literal.actionscript.3",
       "patterns": [
         {
@@ -709,7 +707,7 @@
       "name": "keyword.other.actionscript.3"
     },
     "other_operators": {
-      "match": "(\\.|=)",
+      "match": "([.=])",
       "name": "keyword.operator.actionscript.3"
     },
     "package": {
@@ -719,7 +717,7 @@
           "name": "keyword.other.actionscript.3"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.package.actionscript.3",
       "patterns": [
         {
@@ -767,12 +765,12 @@
       ]
     },
     "package_name": {
-      "begin": "(?<=package)\\s+([\\w\\._]*)\\b",
+      "begin": "(?<=package)\\s+([\\w._]*)\\b",
       "end": "\\{",
       "name": "meta.package_name.actionscript.3"
     },
     "parameters": {
-      "begin": "(\\.\\.\\.)?\\s*([A-Za-z\\_\\$][A-Za-z0-9_\\$]*)(?:\\s*(\\:)\\s*(?:(?:([A-Za-z\\$][A-Za-z0-9_\\$]+(?:\\.[A-Za-z\\$][A-Za-z0-9_\\$]+)*)(?:\\.<([A-Za-z\\$][A-Za-z0-9_\\$]+(?:\\.[A-Za-z\\$][A-Za-z0-9_\\$]+)*)>)?)|(\\*)))?(?:\\s*(=))?",
+      "begin": "(\\.\\.\\.)?\\s*([A-Za-z_$][A-Za-z0-9_$]*)(?:\\s*(:)\\s*(?:([A-Za-z$][A-Za-z0-9_$]+(?:\\.[A-Za-z$][A-Za-z0-9_$]+)*)(?:\\.<([A-Za-z$][A-Za-z0-9_$]+(?:\\.[A-Za-z$][A-Za-z0-9_$]+)*)>)?|(\\*)))?(?:\\s*(=))?",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.actionscript.3"
@@ -861,7 +859,7 @@
           "name": "constant.character.escape.actionscript.3"
         },
         {
-          "match": "\\[(\\\\\\]|[^\\]])*\\]",
+          "match": "\\[(\\\\]|[^\\]])*]",
           "name": "constant.character.class.actionscript.3"
         }
       ]
@@ -881,7 +879,7 @@
           "name": "support.type.actionscript.3"
         }
       },
-      "match": "(\\:)\\s*(?:([A-Za-z\\$][A-Za-z0-9_\\$]+(?:\\.[A-Za-z\\$][A-Za-z0-9_\\$]+)*)(?:\\.<([A-Za-z\\$][A-Za-z0-9_\\$]+(?:\\.[A-Za-z\\$][A-Za-z0-9_\\$]+)*)>)?)|(\\*)"
+      "match": "(:)\\s*([A-Za-z$][A-Za-z0-9_$]+(?:\\.[A-Za-z$][A-Za-z0-9_$]+)*)(?:\\.<([A-Za-z$][A-Za-z0-9_$]+(?:\\.[A-Za-z$][A-Za-z0-9_$]+)*)>)?|(\\*)"
     },
     "strings": {
       "patterns": [
@@ -944,11 +942,11 @@
           "name": "keyword.operator.actionscript.3"
         }
       },
-      "match": "((static)\\s+)?((\\w+)\\s+)?((static)\\s+)?(const|var)\\s+(?:[A-Za-z0-9_\\$]+)(?:\\s*(:))?",
+      "match": "((static)\\s+)?((\\w+)\\s+)?((static)\\s+)?(const|var)\\s+[A-Za-z0-9_$]+(?:\\s*(:))?",
       "name": "meta.variable_declaration.actionscript.3"
     },
     "vector_creation_operators": {
-      "match": "(<|>)",
+      "match": "([<>])",
       "name": "keyword.operator.actionscript.3"
     }
   },
diff --git a/resources/languages/ada.json b/resources/languages/ada.json
index 78b879f..dff2799 100644
--- a/resources/languages/ada.json
+++ b/resources/languages/ada.json
@@ -42,13 +42,13 @@
           "name": "punctuation.ada"
         },
         {
-          "match": "\\b(\\w|\\d|\\.|_)+\\b",
+          "match": "\\b([\\w\\d._])+\\b",
           "name": "entity.name.task.ada"
         }
       ]
     },
     "accept_statement": {
-      "begin": "(?i)\\b(accept)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(accept)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.ada"
@@ -105,7 +105,7 @@
           "name": "entity.name.type.ada"
         }
       },
-      "match": "(?i)(not\\s+null\\s+)?(access)\\s+(constant\\s+)?((?:\\w|\\d|\\.|_)+)\\b",
+      "match": "(?i)(not\\s+null\\s+)?(access)\\s+(constant\\s+)?([\\w\\d._]+)\\b",
       "name": "meta.declaration.access.definition.ada"
     },
     "access_type_definition": {
@@ -153,7 +153,7 @@
       ]
     },
     "adding_operator": {
-      "match": "(\\+|-|\\&)",
+      "match": "([+\\-\\&])",
       "name": "keyword.operator.adding.ada"
     },
     "array_aggregate": {
@@ -198,7 +198,7 @@
           ]
         }
       },
-      "match": "(?i)\\b([^(=>)]*)\\s*(=>)\\s*([^,\\)]+)",
+      "match": "(?i)\\b([^(=>)]*)\\s*(=>)\\s*([^,)]+)",
       "name": "meta.definition.array.aggregate.component.ada"
     },
     "array_dimensions": {
@@ -347,7 +347,7 @@
                   ]
                 }
               },
-              "match": "((?:\\w|\\d|_)+)('((?:\\w|\\d|_)+))?"
+              "match": "([\\w\\d_]+)('([\\w\\d_]+))?"
             }
           ]
         }
@@ -360,7 +360,7 @@
           "name": "keyword.other.ada"
         }
       },
-      "end": "(?i)(?=(,|;|\\bis\\b))",
+      "end": "(?i)(?=([,;]|\\bis\\b))",
       "name": "meta.aspect.definition.ada",
       "patterns": [
         {
@@ -380,7 +380,7 @@
           "name": "entity.other.attribute-name.ada"
         }
       },
-      "match": "(?i)\\b((?:\\w|\\d|\\.|_)+)(?:(')(class))?\\b",
+      "match": "(?i)\\b([\\w\\d._]+)(?:(')(class))?\\b",
       "name": "meta.aspect.mark.ada"
     },
     "aspect_specification": {
@@ -450,12 +450,12 @@
       ]
     },
     "assignment_statement": {
-      "begin": "\\b((?:\\w|\\d|\\.|_|\\(|\\)|\"|'|\\s)+)\\s*(:=)",
+      "begin": "\\b([\\w\\d._()\"'\\s]+)\\s*(:=)",
       "beginCaptures": {
         "1": {
           "patterns": [
             {
-              "match": "((?:\\w|\\d|\\.|_)+)",
+              "match": "([\\w\\d._]+)",
               "name": "variable.name.ada"
             },
             {
@@ -503,7 +503,7 @@
           "name": "entity.other.attribute-name.ada"
         }
       },
-      "match": "(')((?:\\w|\\d|_)+)\\b",
+      "match": "(')([\\w\\d_]+)\\b",
       "name": "meta.attribute.ada"
     },
     "based_literal": {
@@ -534,7 +534,7 @@
           ]
         }
       },
-      "match": "(?i)(\\d(?:(_)?\\d)*#)[0-9a-f](?:(_)?[0-9a-f])*(?:(\\.)[0-9a-f](?:(_)?[0-9a-f])*)?(#)([eE](?:\\+|\\-)?\\d(?:_?\\d)*)?",
+      "match": "(?i)(\\d(?:(_)?\\d)*#)[0-9a-f](?:(_)?[0-9a-f])*(?:(\\.)[0-9a-f](?:(_)?[0-9a-f])*)?(#)([eE][+-]?\\d(?:_?\\d)*)?",
       "name": "constant.numeric.ada"
     },
     "basic_declaration": {
@@ -594,7 +594,7 @@
           "name": "keyword.ada"
         }
       },
-      "end": "(?i)\\b(end)(\\s+(?:\\w|\\d|_)+)?\\s*(;)",
+      "end": "(?i)\\b(end)(\\s+[\\w\\d_]+)?\\s*(;)",
       "endCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -782,7 +782,7 @@
       "name": "comment.line.double-dash.ada"
     },
     "component_clause": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b([\\w\\d_]+)\\b",
       "beginCaptures": {
         "0": {
           "name": "variable.name.ada"
@@ -816,7 +816,7 @@
       ]
     },
     "component_declaration": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+(?:\\s*,\\s*(?:\\w|\\d|_)+)?)\\s*(:)",
+      "begin": "(?i)\\b([\\w\\d_]+(?:\\s*,\\s*[\\w\\d_]+)?)\\s*(:)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -825,7 +825,7 @@
               "name": "punctuation.ada"
             },
             {
-              "match": "\\b(\\w|\\d|_)+\\b",
+              "match": "\\b([\\w\\d_])+\\b",
               "name": "variable.name.ada"
             }
           ]
@@ -941,7 +941,7 @@
               ]
             }
           },
-          "match": "(?i)\\b((?:\\w|\\d|_)+)\\s*(=>)\\s*([^,\\)])+\\b"
+          "match": "(?i)\\b([\\w\\d_]+)\\s*(=>)\\s*([^,)])+\\b"
         },
         {
           "include": "#expression"
@@ -967,7 +967,7 @@
           ]
         }
       },
-      "match": "\\d(?:(_)?\\d)*(?:(\\.)\\d(?:(_)?\\d)*)?([eE](?:\\+|\\-)?\\d(?:_?\\d)*)?",
+      "match": "\\d(?:(_)?\\d)*(?:(\\.)\\d(?:(_)?\\d)*)?([eE][+-]?\\d(?:_?\\d)*)?",
       "name": "constant.numeric.ada"
     },
     "declarative_item": {
@@ -1067,7 +1067,7 @@
       ]
     },
     "discriminant_specification": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+(?:\\s*,\\s*(?:\\w|\\d|_)+)?)\\s*(:)",
+      "begin": "(?i)\\b([\\w\\d_]+(?:\\s*,\\s*[\\w\\d_]+)?)\\s*(:)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1076,7 +1076,7 @@
               "name": "punctuation.ada"
             },
             {
-              "match": "\\b(\\w|\\d|_)+\\b",
+              "match": "\\b([\\w\\d_])+\\b",
               "name": "variable.name.ada"
             }
           ]
@@ -1085,7 +1085,7 @@
           "name": "punctuation.ada"
         }
       },
-      "end": "(?=(;|\\)))",
+      "end": "(?=([;)]))",
       "patterns": [
         {
           "begin": ":=",
@@ -1094,7 +1094,7 @@
               "name": "keyword.operator.new.ada"
             }
           },
-          "end": "(?=(;|\\)))",
+          "end": "(?=([;)]))",
           "patterns": [
             {
               "include": "#expression"
@@ -1114,7 +1114,7 @@
               ]
             }
           },
-          "match": "(?i)(not\\s+null\\s+)?((?:\\w|\\d|\\.|_)+)\\b"
+          "match": "(?i)(not\\s+null\\s+)?([\\w\\d._]+)\\b"
         },
         {
           "include": "#access_definition"
@@ -1122,7 +1122,7 @@
       ]
     },
     "entry_body": {
-      "begin": "(?i)\\b(entry)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(entry)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -1192,7 +1192,7 @@
       ]
     },
     "entry_declaration": {
-      "begin": "(?i)\\b(?:(not)?\\s+(overriding)\\s+)?(entry)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(?:(not)?\\s+(overriding)\\s+)?(entry)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ada"
@@ -1239,7 +1239,7 @@
           "name": "punctuation.ada"
         },
         {
-          "match": "\\b(\\w|\\d|_)+\\b",
+          "match": "\\b([\\w\\d_])+\\b",
           "name": "variable.name.ada"
         },
         {
@@ -1248,7 +1248,7 @@
       ]
     },
     "exception_declaration": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+(?:\\s*,\\s*(?:\\w|\\d|_)+)?)\\s*(:)\\s*(exception)",
+      "begin": "(?i)\\b([\\w\\d_]+(?:\\s*,\\s*[\\w\\d_]+)?)\\s*(:)\\s*(exception)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1257,7 +1257,7 @@
               "name": "punctuation.ada"
             },
             {
-              "match": "\\b(\\w|\\d|_)+\\b",
+              "match": "\\b([\\w\\d_])+\\b",
               "name": "entity.name.exception.ada"
             }
           ]
@@ -1278,7 +1278,7 @@
       "name": "meta.declaration.exception.ada",
       "patterns": [
         {
-          "match": "(?i)\\b(renames)\\s+((\\w|\\d|_|\\.)+)",
+          "match": "(?i)\\b(renames)\\s+(([\\w\\d_.])+)",
           "name": "entity.name.exception.ada"
         }
       ]
@@ -1313,7 +1313,7 @@
           ]
         },
         {
-          "match": "(?:\\w|\\d|_)+",
+          "match": "[\\w\\d_]+",
           "name": "entity.name.label.ada"
         }
       ]
@@ -1330,7 +1330,7 @@
           "name": "punctuation.ada"
         }
       },
-      "match": "([eE])(\\+|\\-)?\\d(?:(_)?\\d)*"
+      "match": "([eE])([+-])?\\d(?:(_)?\\d)*"
     },
     "expression": {
       "name": "meta.expression.ada",
@@ -1394,7 +1394,7 @@
           "name": "keyword.control.ada"
         }
       },
-      "end": "(?i)\\b(end)\\s+(loop)(\\s+(?:\\w|\\d|_)+)?\\s*(;)",
+      "end": "(?i)\\b(end)\\s+(loop)(\\s+[\\w\\d_]+)?\\s*(;)",
       "endCaptures": {
         "1": {
           "name": "keyword.control.ada"
@@ -1432,7 +1432,7 @@
                   "name": "keyword.control.ada"
                 }
               },
-              "match": "(?i)\\b((?:\\w|\\d|_)+)\\s+(in)(\\s+reverse)?\\b"
+              "match": "(?i)\\b([\\w\\d_]+)\\s+(in)(\\s+reverse)?\\b"
             },
             {
               "captures": {
@@ -1456,7 +1456,7 @@
                   "name": "keyword.control.ada"
                 }
               },
-              "match": "(?i)\\b((?:\\w|\\d|_)+)(?:\\s*(:)\\s*((?:\\w|\\d|\\.|_)+))?\\s+(of)(\\s+reverse)?\\b"
+              "match": "(?i)\\b([\\w\\d_]+)(?:\\s*(:)\\s*([\\w\\d._]+))?\\s+(of)(\\s+reverse)?\\b"
             },
             {
               "include": "#expression"
@@ -1479,7 +1479,7 @@
       ]
     },
     "function_body": {
-      "begin": "(?i)\\b(overriding\\s+)?(function)\\s+(?:((?:\\w|\\d|\\.|_)+\\b)|(\".+\"))",
+      "begin": "(?i)\\b(overriding\\s+)?(function)\\s+(?:([\\w\\d._]+\\b)|(\".+\"))",
       "beginCaptures": {
         "1": {
           "name": "storage.visibility.ada"
@@ -1559,7 +1559,7 @@
               "name": "meta.declaration.package.generic.ada",
               "patterns": [
                 {
-                  "match": "((?:\\w|\\d|\\.|_)+)",
+                  "match": "([\\w\\d._]+)",
                   "name": "entity.name.function.ada"
                 },
                 {
@@ -1669,7 +1669,7 @@
                       "name": "punctuation.ada"
                     }
                   },
-                  "match": "\\b((?:\\w|\\d|\\.|_)+)\\s*(:)"
+                  "match": "\\b([\\w\\d._]+)\\s*(:)"
                 },
                 {
                   "match": "\\|",
@@ -1680,7 +1680,7 @@
                   "name": "keyword.ada"
                 },
                 {
-                  "match": "(?:\\w|\\d|\\.|_)+",
+                  "match": "[\\w\\d._]+",
                   "name": "entity.name.exception.ada"
                 }
               ]
@@ -1727,7 +1727,7 @@
               "name": "keyword.control.ada"
             }
           },
-          "end": "(?i)(?:(?<!\\sand)\\s+(?=then))",
+          "end": "(?i)(?<!\\sand)\\s+(?=then)",
           "patterns": [
             {
               "include": "#expression"
@@ -1750,7 +1750,7 @@
         },
         {
           "begin": "(?i)(?<=if)\\b",
-          "end": "(?i)(?:(?<!\\sand)\\s+(?=then))",
+          "end": "(?i)(?<!\\sand)\\s+(?=then)",
           "endCaptures": {
             "0": {
               "name": "keyword.control.ada"
@@ -1769,7 +1769,7 @@
               "name": "keyword.control.ada"
             }
           },
-          "end": "(?i)(?=(elsif|else|end))",
+          "end": "(?i)(?=(e(?:lsif|lse|nd)))",
           "patterns": [
             {
               "include": "#statement"
@@ -1834,7 +1834,7 @@
           "name": "keyword.modifier.unknown.ada"
         },
         {
-          "match": "(\\+|-|\\*|/)",
+          "match": "([+\\-*/])",
           "name": "keyword.operator.arithmetic.ada"
         },
         {
@@ -1842,11 +1842,11 @@
           "name": "keyword.operator.assignment.ada"
         },
         {
-          "match": "(=|/=|<|>|<=|>=)",
+          "match": "(=|/=|[<>]|<=|>=)",
           "name": "keyword.operator.logic.ada"
         },
         {
-          "match": "\\&",
+          "match": "&",
           "name": "keyword.operator.concatenation.ada"
         }
       ]
@@ -1882,7 +1882,7 @@
           "name": "punctuation.label.ada"
         }
       },
-      "match": "(<<)?((?:\\w|\\d|_)+)\\s*(:[^=]|>>)",
+      "match": "(<<)?([\\w\\d_]+)\\s*(:[^=]|>>)",
       "name": "meta.label.ada"
     },
     "library_unit": {
@@ -1931,7 +1931,7 @@
       ]
     },
     "multiplying_operator": {
-      "match": "(?i)(\\*|/|\\bmod\\b|\\brem\\b)",
+      "match": "(?i)([*/]|\\bmod\\b|\\brem\\b)",
       "name": "keyword.operator.multiplying.ada"
     },
     "null_statement": {
@@ -1947,7 +1947,7 @@
       "name": "meta.statement.null.ada"
     },
     "object_declaration": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+(?:\\s*,\\s*(?:\\w|\\d|_)+)*)\\s*(:)",
+      "begin": "(?i)\\b([\\w\\d_]+(?:\\s*,\\s*[\\w\\d_]+)*)\\s*(:)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1956,7 +1956,7 @@
               "name": "punctuation.ada"
             },
             {
-              "match": "\\b(\\w|\\d|_)+\\b",
+              "match": "\\b([\\w\\d_])+\\b",
               "name": "variable.name.ada"
             }
           ]
@@ -2044,7 +2044,7 @@
       ]
     },
     "package_body": {
-      "begin": "(?i)\\b(package)\\s+(body)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(package)\\s+(body)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -2099,7 +2099,7 @@
               "name": "keyword.ada"
             }
           },
-          "end": "(?i)(?=(\\bbegin\\b|\\bend\\b))",
+          "end": "(?i)(?=(\\b(?:begin\\b|end\\b)))",
           "patterns": [
             {
               "match": "(?i)\\bprivate\\b",
@@ -2126,11 +2126,11 @@
       ]
     },
     "package_mark": {
-      "match": "\\b(\\w|\\d|\\.|_)+\\b",
+      "match": "\\b([\\w\\d._])+\\b",
       "name": "entity.name.package.ada"
     },
     "package_specification": {
-      "begin": "(?i)\\b(package)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(package)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -2216,7 +2216,7 @@
               "name": "keyword.other.ada"
             }
           },
-          "match": "((?:\\w|\\d|_)+)\\s*(=>)"
+          "match": "([\\w\\d_]+)\\s*(=>)"
         },
         {
           "include": "#expression"
@@ -2281,7 +2281,7 @@
           "name": "punctuation.ada"
         },
         {
-          "match": "\\b(?:\\w|\\d|\\.|_)+\\b",
+          "match": "\\b[\\w\\d._]+\\b",
           "name": "variable.parameter.ada"
         },
         {
@@ -2312,7 +2312,7 @@
               ]
             }
           },
-          "match": "(?i)\\b(others)\\s*(=>)\\s*([^,\\)]+)"
+          "match": "(?i)\\b(others)\\s*(=>)\\s*([^,)]+)"
         },
         {
           "include": "#expression"
@@ -2320,7 +2320,7 @@
       ]
     },
     "pragma": {
-      "begin": "(?i)\\b(pragma)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(pragma)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -2391,7 +2391,7 @@
       ]
     },
     "procedure_body": {
-      "begin": "(?i)\\b(overriding\\s+)?(procedure)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(overriding\\s+)?(procedure)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.visibility.ada"
@@ -2437,7 +2437,7 @@
               "name": "meta.declaration.package.generic.ada",
               "patterns": [
                 {
-                  "match": "((?:\\w|\\d|\\.|_)+)",
+                  "match": "([\\w\\d._]+)",
                   "name": "entity.name.function.ada"
                 },
                 {
@@ -2483,7 +2483,7 @@
       ]
     },
     "procedure_call_statement": {
-      "begin": "(?i)\\b((?:\\w|\\d|_|\\.)+)\\b",
+      "begin": "(?i)\\b([\\w\\d_.]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.ada"
@@ -2516,7 +2516,7 @@
       ]
     },
     "protected_body": {
-      "begin": "(?i)\\b(protected)\\s+(body)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(protected)\\s+(body)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ada"
@@ -2528,7 +2528,7 @@
           "name": "entity.name.body.ada"
         }
       },
-      "end": "(?i)(?:\\b(end)\\s*(\\s\\3)\\s*)(;)",
+      "end": "(?i)\\b(end)\\s*(\\s\\3)\\s*(;)",
       "endCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -2610,7 +2610,7 @@
               "name": "keyword.ada"
             }
           },
-          "end": "(?=(;|\\)))",
+          "end": "(?=([;)]))",
           "patterns": [
             {
               "include": "#expression"
@@ -2618,7 +2618,7 @@
           ]
         },
         {
-          "match": "\\b(\\w|\\d|_)+\\b",
+          "match": "\\b([\\w\\d_])+\\b",
           "name": "entity.name.exception.ada"
         }
       ]
@@ -2653,7 +2653,7 @@
           ]
         },
         {
-          "match": "\\b(\\w|\\d|\\.|_)+\\b",
+          "match": "\\b([\\w\\d._])+\\b",
           "name": "entity.name.exception.ada"
         }
       ]
@@ -2846,7 +2846,7 @@
           "name": "keyword.control.ada"
         },
         {
-          "match": "\\b(\\w|\\d|\\.|_)+\\b",
+          "match": "\\b([\\w\\d._])+\\b",
           "name": "entity.name.function.ada"
         }
       ]
@@ -2917,7 +2917,7 @@
               "name": "entity.name.type.ada"
             }
           },
-          "match": "\\b((?:\\w|\\d|_)+)\\s*(:)\\s*((?:\\w|\\d|\\.|_)+)\\b"
+          "match": "\\b([\\w\\d_]+)\\s*(:)\\s*([\\w\\d._]+)\\b"
         },
         {
           "match": ":=",
@@ -2932,7 +2932,7 @@
       "name": "meta.declaration.constraint.scalar.ada",
       "patterns": [
         {
-          "begin": "(?i)\\b(digits|delta)\\b",
+          "begin": "(?i)\\b(d(?:igits|elta))\\b",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.ada"
@@ -3039,7 +3039,7 @@
           "name": "keyword.control.ada"
         }
       },
-      "end": "(?i)\\b(end)\\s+(loop)(\\s+(?:\\w|\\d|_)+)?\\s*(;)",
+      "end": "(?i)\\b(end)\\s+(loop)(\\s+[\\w\\d_]+)?\\s*(;)",
       "endCaptures": {
         "1": {
           "name": "keyword.control.ada"
@@ -3062,7 +3062,7 @@
       ]
     },
     "single_protected_declaration": {
-      "begin": "(?i)\\b(protected)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(protected)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -3133,7 +3133,7 @@
       ]
     },
     "single_task_declaration": {
-      "begin": "(?i)\\b(task)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(task)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -3318,7 +3318,7 @@
       "end": "(?=(with|;))",
       "patterns": [
         {
-          "match": "(?:\\w|\\d|_|\\.)+",
+          "match": "[\\w\\d_.]+",
           "name": "entity.name.function.ada"
         }
       ]
@@ -3414,7 +3414,7 @@
               "name": "keyword.ada"
             }
           },
-          "end": "(?=(;|\\)))",
+          "end": "(?=([;)]))",
           "patterns": [
             {
               "include": "#parameter_profile"
@@ -3426,7 +3426,7 @@
                   "name": "keyword.ada"
                 }
               },
-              "end": "(?=(;|\\)))",
+              "end": "(?=([;)]))",
               "patterns": [
                 {
                   "include": "#subtype_mark"
@@ -3446,7 +3446,7 @@
               ]
             }
           },
-          "match": "\\b(?:\\w|\\d|\\.|_)+\\b",
+          "match": "\\b[\\w\\d._]+\\b",
           "name": "entity.name.type.ada"
         },
         {
@@ -3455,7 +3455,7 @@
       ]
     },
     "task_body": {
-      "begin": "(?i)\\b(task)\\s+(body)\\s+((\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(task)\\s+(body)\\s+(([\\w\\d._])+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -3525,7 +3525,7 @@
       ]
     },
     "task_type_declaration": {
-      "begin": "(?i)\\b(task)\\s+(type)\\s+((\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(task)\\s+(type)\\s+(([\\w\\d._])+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ada"
@@ -3750,7 +3750,7 @@
           },
           "patterns": [
             {
-              "match": "(?:\\w|\\d|_)+",
+              "match": "[\\w\\d_]+",
               "name": "variable.name.ada"
             },
             {
@@ -3803,7 +3803,7 @@
           "name": "keyword.control.ada"
         }
       },
-      "end": "(?i)\\b(end)\\s+(loop)(\\s+(?:\\w|\\d|_)+)?\\s*(;)",
+      "end": "(?i)\\b(end)\\s+(loop)(\\s+[\\w\\d_]+)?\\s*(;)",
       "endCaptures": {
         "1": {
           "name": "keyword.control.ada"
diff --git a/resources/languages/angular-html.json b/resources/languages/angular-html.json
index 1519f5a..7e7d435 100644
--- a/resources/languages/angular-html.json
+++ b/resources/languages/angular-html.json
@@ -2,7 +2,6 @@
   "displayName": "Angular HTML",
   "injections": {
     "R:text.html - (comment.block, text.html meta.embedded, meta.tag.*.*.html, meta.tag.*.*.*.html, meta.tag.*.*.*.*.html)": {
-      "comment": "Uses R: to ensure this matches after any other injections.",
       "patterns": [
         {
           "match": "<",
diff --git a/resources/languages/angular-ts.json b/resources/languages/angular-ts.json
index 690d071..645bc50 100644
--- a/resources/languages/angular-ts.json
+++ b/resources/languages/angular-ts.json
@@ -18,13 +18,13 @@
       "name": "storage.modifier.ts"
     },
     "after-operator-block-as-object-literal": {
-      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^yield|[^._$[:alnum:]]yield|^throw|[^._$[:alnum:]]throw|^in|[^._$[:alnum:]]in|^of|[^._$[:alnum:]]of|^typeof|[^._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -47,7 +47,7 @@
           "name": "punctuation.definition.binding-pattern.array.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.ts"
@@ -72,7 +72,7 @@
           "name": "punctuation.definition.binding-pattern.array.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.ts"
@@ -94,7 +94,7 @@
           "name": "meta.brace.square.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.ts"
@@ -125,13 +125,13 @@
           "name": "meta.arrow.ts"
         },
         {
-          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))",
+          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.ts"
             }
           },
-          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
           "name": "meta.arrow.ts",
           "patterns": [
             {
@@ -158,7 +158,7 @@
               "name": "storage.type.function.arrow.ts"
             }
           },
-          "end": "((?<=\\}|\\S)(?<!=>)|((?!\\{)(?=\\S)))(?!\\/[\\/\\*])",
+          "end": "((?<=[}\\S])(?<!=>)|((?!\\{)(?=\\S)))(?!/[/*])",
           "name": "meta.arrow.ts",
           "patterns": [
             {
@@ -181,7 +181,7 @@
           "name": "keyword.operator.type.annotation.ts"
         }
       },
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "name": "meta.return.type.arrow.ts",
       "patterns": [
         {
@@ -192,8 +192,8 @@
     "arrow-return-type-body": {
       "patterns": [
         {
-          "begin": "(?<=[:])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=:)(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -283,7 +283,7 @@
     "brackets": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}|(?=\\*/)",
           "patterns": [
             {
@@ -293,7 +293,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]|(?=\\*/)",
+          "end": "]|(?=\\*/)",
           "patterns": [
             {
               "include": "#brackets"
@@ -320,13 +320,13 @@
           "name": "cast.expr.ts"
         },
         {
-          "begin": "(?:(?<!\\+\\+|--)(?<=^return|[^\\._$[:alnum:]]return|^throw|[^\\._$[:alnum:]]throw|^yield|[^\\._$[:alnum:]]yield|^await|[^\\._$[:alnum:]]await|^default|[^\\._$[:alnum:]]default|[=(,:>*?\\&\\|\\^]|[^_$[:alnum:]](?:\\+\\+|\\-\\-)|[^\\+]\\+|[^\\-]\\-))\\s*(<)(?!<?\\=)(?!\\s*$)",
+          "begin": "(?<!\\+\\+|--)(?<=^return|[^._$[:alnum:]]return|^throw|[^._$[:alnum:]]throw|^yield|[^._$[:alnum:]]yield|^await|[^._$[:alnum:]]await|^default|[^._$[:alnum:]]default|[=(,:>*?\\&|^]|[^_$[:alnum:]](?:\\+\\+|--)|[^+]\\+|[^-]-)\\s*(<)(?!<?=)(?!\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "meta.brace.angle.ts"
             }
           },
-          "end": "(\\>)",
+          "end": "(>)",
           "endCaptures": {
             "1": {
               "name": "meta.brace.angle.ts"
@@ -340,13 +340,13 @@
           ]
         },
         {
-          "begin": "(?:(?<=^))\\s*(<)(?=[_$[:alpha:]][_$[:alnum:]]*\\s*>)",
+          "begin": "(?<=^)\\s*(<)(?=[_$[:alpha:]][_$[:alnum:]]*\\s*>)",
           "beginCaptures": {
             "1": {
               "name": "meta.brace.angle.ts"
             }
           },
-          "end": "(\\>)",
+          "end": "(>)",
           "endCaptures": {
             "1": {
               "name": "meta.brace.angle.ts"
@@ -377,7 +377,7 @@
           "name": "storage.type.class.ts"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.ts",
       "patterns": [
         {
@@ -410,7 +410,7 @@
       ]
     },
     "class-expression": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|\\/[\\/*])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|/[/*])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ts"
@@ -419,7 +419,7 @@
           "name": "storage.type.class.ts"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.ts",
       "patterns": [
         {
@@ -434,7 +434,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -449,7 +449,7 @@
         },
         {
           "begin": "(?<=:)\\s*",
-          "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[\\s;),}\\]:\\-+]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -501,7 +501,7 @@
       ]
     },
     "class-or-interface-heritage": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(extends|implements)\\b)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\b(extends|implements)\\b(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ts"
@@ -533,7 +533,7 @@
               "name": "punctuation.accessor.optional.ts"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
         },
         {
           "captures": {
@@ -649,7 +649,7 @@
               "name": "keyword.control.flow.ts"
             }
           },
-          "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[;}]|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -688,7 +688,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -743,7 +743,7 @@
       ]
     },
     "decorator": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\@",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))@",
       "beginCaptures": {
         "0": {
           "name": "punctuation.decorator.ts"
@@ -760,7 +760,7 @@
     "destructuring-const": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.ts",
           "patterns": [
@@ -776,7 +776,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.ts",
           "patterns": [
@@ -796,7 +796,7 @@
     "destructuring-parameter": {
       "patterns": [
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.ts"
@@ -805,7 +805,7 @@
               "name": "punctuation.definition.binding-pattern.object.ts"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.object.ts"
@@ -819,7 +819,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.ts"
@@ -828,7 +828,7 @@
               "name": "punctuation.definition.binding-pattern.array.ts"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.array.ts"
@@ -860,7 +860,7 @@
     "destructuring-variable": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.ts",
           "patterns": [
@@ -876,7 +876,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.ts",
           "patterns": [
@@ -916,7 +916,7 @@
       "match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)"
     },
     "directives": {
-      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)",
+      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))+\\s*/>\\s*$)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.ts"
@@ -972,7 +972,7 @@
               "name": "constant.language.access-type.jsdoc"
             }
           },
-          "match": "((@)(?:access|api))\\s+(private|protected|public)\\b"
+          "match": "((@)a(?:ccess|pi))\\s+(p(?:rivate|rotected|ublic))\\b"
         },
         {
           "captures": {
@@ -1099,7 +1099,7 @@
               "name": "entity.name.type.instance.jsdoc"
             }
           },
-          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*\\])?{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
+          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*])?\\{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
         },
         {
           "captures": {
@@ -1116,7 +1116,7 @@
           "match": "((@)template)\\s+([A-Za-z_$][\\w$.\\[\\]]*(?:\\s*,\\s*[A-Za-z_$][\\w$.\\[\\]]*)*)"
         },
         {
-          "begin": "((@)template)\\s+(?={)",
+          "begin": "((@)template)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1151,7 +1151,7 @@
           "match": "((@)(?:arg|argument|const|constant|member|namespace|param|var))\\s+([A-Za-z_$][\\w$.\\[\\]]*)"
         },
         {
-          "begin": "((@)typedef)\\s+(?={)",
+          "begin": "((@)typedef)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1172,7 +1172,7 @@
           ]
         },
         {
-          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?={)",
+          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1208,13 +1208,13 @@
                   "name": "invalid.illegal.syntax.jsdoc"
                 }
               },
-              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[\\])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:(?:\\*(?!/))|(?:\\\\(?!\"))|[^*\\\\])*?\"|'(?:(?:\\*(?!/))|(?:\\\\(?!'))|[^*\\\\])*?'|\\[(?:(?:\\*(?!/))|[^*])*?\\]|(?:(?:\\*(?!/))|\\s(?!\\s*\\])|\\[.*?(?:\\]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(\\])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
+              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:\\*(?!/)|\\\\(?!\")|[^*\\\\])*?\"|'(?:\\*(?!/)|\\\\(?!')|[^*\\\\])*?'|\\[(?:\\*(?!/)|[^*])*?]|(?:\\*(?!/)|\\s(?!\\s*])|\\[.*?(?:]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
               "name": "variable.other.jsdoc"
             }
           ]
         },
         {
-          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?={)",
+          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1245,7 +1245,7 @@
           "match": "((@)(?:alias|augments|callback|constructs|emits|event|fires|exports?|extends|external|function|func|host|lends|listens|interface|memberof!?|method|module|mixes|mixin|name|requires|see|this|typedef|uses))\\s+((?:[^{}@\\s*]|\\*[^/])+)"
         },
         {
-          "begin": "((@)(?:default(?:value)?|license|version))\\s+(([''\"]))",
+          "begin": "((@)(?:default(?:value)?|license|version))\\s+((['\"]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1306,7 +1306,7 @@
               "name": "punctuation.definition.block.tag.jsdoc"
             }
           },
-          "match": "((@)(?:[_$[:alpha:]][_$[:alnum:]]*))(?=\\s+)"
+          "match": "((@)[_$[:alpha:]][_$[:alnum:]]*)(?=\\s+)"
         }
       ]
     },
@@ -1329,7 +1329,7 @@
           "name": "entity.name.type.enum.ts"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.enum.declaration.ts",
       "patterns": [
         {
@@ -1342,7 +1342,7 @@
               "name": "punctuation.definition.block.ts"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ts"
@@ -1359,7 +1359,7 @@
                   "name": "variable.other.enummember.ts"
                 }
               },
-              "end": "(?=,|\\}|$)",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#comment"
@@ -1370,8 +1370,8 @@
               ]
             },
             {
-              "begin": "(?=((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\])))",
-              "end": "(?=,|\\}|$)",
+              "begin": "(?=(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+])))",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#string"
@@ -1414,7 +1414,7 @@
           "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)\\s+(as)\\s+(namespace)\\s+([_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:(?:\\s*(=))|(?:\\s+(default)(?=\\s+)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:\\s*(=)|\\s+(default)(?=\\s+))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.ts"
@@ -1429,7 +1429,7 @@
               "name": "keyword.control.default.ts"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.default.ts",
           "patterns": [
             {
@@ -1441,7 +1441,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*([\\s,]))(?!\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.ts"
@@ -1450,7 +1450,7 @@
               "name": "keyword.control.type.ts"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.ts",
           "patterns": [
             {
@@ -1516,7 +1516,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -1536,7 +1536,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
         },
         {
           "include": "#type-annotation"
@@ -1563,7 +1563,7 @@
           "name": "keyword.control.flow.ts"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*\\*)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*\\*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.flow.ts"
@@ -1640,7 +1640,7 @@
               "name": "keyword.control.satisfies.ts"
             }
           },
-          "end": "(?=^|[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+\\<))",
+          "end": "(?=^|[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+<))",
           "patterns": [
             {
               "include": "#type"
@@ -1652,11 +1652,11 @@
           "name": "keyword.operator.spread.ts"
         },
         {
-          "match": "\\*=|(?<!\\()/=|%=|\\+=|\\-=",
+          "match": "\\*=|(?<!\\()/=|%=|\\+=|-=",
           "name": "keyword.operator.assignment.compound.ts"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>=|>>>=|\\|=",
+          "match": "&=|\\^=|<<=|>>=|>>>=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.ts"
         },
         {
@@ -1664,11 +1664,11 @@
           "name": "keyword.operator.bitwise.shift.ts"
         },
         {
-          "match": "===|!==|==|!=",
+          "match": "(?:==|!=)(?:=|)",
           "name": "keyword.operator.comparison.ts"
         },
         {
-          "match": "<=|>=|<>|<|>",
+          "match": "<=|>=|<>|[<>]",
           "name": "keyword.operator.relational.ts"
         },
         {
@@ -1683,18 +1683,18 @@
               "name": "keyword.operator.arithmetic.ts"
             }
           },
-          "match": "(?<=[_$[:alnum:]])(\\!)\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:]])(!)\\s*(?:(/=)|(/)(?![/*]))"
         },
         {
-          "match": "\\!|&&|\\|\\||\\?\\?",
+          "match": "!|&&|\\|\\||\\?\\?",
           "name": "keyword.operator.logical.ts"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.ts"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.ts"
         },
         {
@@ -1706,12 +1706,12 @@
           "name": "keyword.operator.increment.ts"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.ts"
         },
         {
-          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(?:(/=)|(?:(/)(?![/*]))))",
-          "end": "(?:(/=)|(?:(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)))",
+          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)+(?:(/=)|(/)(?![/*])))",
+          "end": "(?:(/=)|(/)(?!\\*([^*]|(\\*[^/]))*\\*/))",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.assignment.compound.ts"
@@ -1735,7 +1735,7 @@
               "name": "keyword.operator.arithmetic.ts"
             }
           },
-          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(/)(?![/*]))"
         }
       ]
     },
@@ -1805,13 +1805,13 @@
       ]
     },
     "field-declaration": {
-      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|\\}|$))",
+      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,}]|$))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ts"
         }
       },
-      "end": "(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|$))))|(?<=\\})",
+      "end": "(?=[};,]|$|(^(?!\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,]|$))))|(?<=})",
       "name": "meta.field.declaration.ts",
       "patterns": [
         {
@@ -1844,10 +1844,10 @@
               "name": "keyword.operator.definiteassignment.ts"
             }
           },
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
-          "match": "\\#?[_$[:alpha:]][_$[:alnum:]]*",
+          "match": "#?[_$[:alpha:]][_$[:alnum:]]*",
           "name": "meta.definition.property.ts variable.object.property.ts"
         },
         {
@@ -1855,13 +1855,13 @@
           "name": "keyword.operator.optional.ts"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "keyword.operator.definiteassignment.ts"
         }
       ]
     },
     "for-loop": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*))await)?\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)?(\\())",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*))await)?\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)?(\\())",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.loop.ts"
@@ -1932,12 +1932,12 @@
     "function-call": {
       "patterns": [
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
-          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
+          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
               "name": "meta.function-call.ts",
               "patterns": [
                 {
@@ -1960,12 +1960,12 @@
           ]
         },
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
-          "end": "(?<=\\>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
+          "end": "(?<=>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*[\\{\\[\\(]\\s*$))",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=(<\\s*[{\\[(]\\s*$))",
               "name": "meta.function-call.ts",
               "patterns": [
                 {
@@ -1993,7 +1993,7 @@
           "name": "meta.function-call.ts punctuation.accessor.optional.ts"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "meta.function-call.ts keyword.operator.definiteassignment.ts"
         }
       ]
@@ -2004,7 +2004,7 @@
           "include": "#support-function-call-identifiers"
         },
         {
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)",
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)",
           "name": "entity.name.function.ts"
         }
       ]
@@ -2031,7 +2031,7 @@
           "name": "meta.definition.function.ts entity.name.function.ts"
         }
       },
-      "end": "(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|(?<=\\})",
+      "end": "(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|(?<=})",
       "name": "meta.function.ts",
       "patterns": [
         {
@@ -2058,7 +2058,7 @@
           "name": "meta.definition.function.ts entity.name.function.ts"
         }
       },
-      "end": "(?=;)|(?<=\\})",
+      "end": "(?=;)|(?<=})",
       "name": "meta.function.expression.ts",
       "patterns": [
         {
@@ -2142,7 +2142,7 @@
               "name": "entity.name.function.ts"
             }
           },
-          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))"
+          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))"
         },
         {
           "captures": {
@@ -2156,7 +2156,7 @@
               "name": "variable.other.constant.property.ts"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])"
         },
         {
           "captures": {
@@ -2170,10 +2170,10 @@
               "name": "variable.other.property.ts"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+          "match": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])",
           "name": "variable.other.constant.ts"
         },
         {
@@ -2185,8 +2185,8 @@
     "if-statement": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
-          "end": "(?=;|$|\\})",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))\\s*(?!\\{))",
+          "end": "(?=;|$|})",
           "patterns": [
             {
               "include": "#comment"
@@ -2214,7 +2214,7 @@
               ]
             },
             {
-              "begin": "(?<=\\))\\s*\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+              "begin": "(?<=\\))\\s*/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.ts"
@@ -2244,7 +2244,7 @@
       ]
     },
     "import-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.ts"
@@ -2259,7 +2259,7 @@
           "name": "keyword.control.type.ts"
         }
       },
-      "end": "(?<!^import|[^\\._$[:alnum:]]import)(?=;|$|^)",
+      "end": "(?<!^import|[^._$[:alnum:]]import)(?=;|$|^)",
       "name": "meta.import.ts",
       "patterns": [
         {
@@ -2272,7 +2272,7 @@
           "include": "#string"
         },
         {
-          "begin": "(?<=^import|[^\\._$[:alnum:]]import)(?!\\s*[\"'])",
+          "begin": "(?<=^import|[^._$[:alnum:]]import)(?!\\s*[\"'])",
           "end": "\\bfrom\\b",
           "endCaptures": {
             "0": {
@@ -2379,7 +2379,7 @@
                   "name": "punctuation.accessor.optional.ts"
                 }
               },
-              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
             },
             {
               "match": "([_$[:alpha:]][_$[:alnum:]]*)",
@@ -2402,7 +2402,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -2416,7 +2416,7 @@
           "include": "#string"
         },
         {
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object-literal.key.ts"
         },
         {
@@ -2432,7 +2432,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -2480,7 +2480,7 @@
               "name": "string.quoted.alias.ts"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         },
         {
           "include": "#punctuation-comma"
@@ -2505,7 +2505,7 @@
               "name": "string.quoted.alias.ts"
             }
           },
-          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         }
       ]
     },
@@ -2545,7 +2545,7 @@
           "name": "variable.parameter.ts"
         }
       },
-      "end": "(\\])\\s*(\\?\\s*)?|$",
+      "end": "(])\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.ts"
@@ -2580,7 +2580,7 @@
           "name": "keyword.operator.expression.in.ts"
         }
       },
-      "end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
+      "end": "(])([+-])?\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.ts"
@@ -2618,11 +2618,11 @@
               "name": "punctuation.definition.bracket.square.end.jsdoc"
             }
           },
-          "match": "(\\[)[^\\]]+(\\])(?={@(?:link|linkcode|linkplain|tutorial))",
+          "match": "(\\[)[^\\]]+(])(?=\\{@(?:link|linkcode|linkplain|tutorial))",
           "name": "constant.other.description.jsdoc"
         },
         {
-          "begin": "({)((@)(?:link(?:code|plain)?|tutorial))\\s*",
+          "begin": "(\\{)((@)(?:link(?:code|plain)?|tutorial))\\s*",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.bracket.curly.begin.jsdoc"
@@ -2651,7 +2651,7 @@
                   "name": "punctuation.separator.pipe.jsdoc"
                 }
               },
-              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*[/])+)(\\|)?"
+              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*/)+)(\\|)?"
             },
             {
               "captures": {
@@ -2675,7 +2675,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"
@@ -2698,7 +2698,7 @@
           "name": "storage.type.interface.ts"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.interface.ts",
       "patterns": [
         {
@@ -2726,7 +2726,7 @@
     "jsdoctype": {
       "patterns": [
         {
-          "begin": "\\G({)",
+          "begin": "\\G(\\{)",
           "beginCaptures": {
             "0": {
               "name": "entity.name.type.instance.jsdoc"
@@ -2765,7 +2765,7 @@
               "name": "punctuation.separator.label.ts"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#decl-block"
@@ -2816,7 +2816,7 @@
     "method-declaration": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.ts"
@@ -2834,7 +2834,7 @@
               "name": "storage.type.ts"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.ts",
           "patterns": [
             {
@@ -2846,7 +2846,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.ts"
@@ -2867,7 +2867,7 @@
               "name": "keyword.generator.asterisk.ts"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.ts",
           "patterns": [
             {
@@ -2879,7 +2879,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.ts"
@@ -2900,7 +2900,7 @@
               "name": "keyword.generator.asterisk.ts"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.ts",
           "patterns": [
             {
@@ -2914,8 +2914,8 @@
       ]
     },
     "method-declaration-name": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??)\\s*[\\(\\<])",
-      "end": "(?=\\(|\\<)",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??)\\s*[(<])",
+      "end": "(?=[(<])",
       "patterns": [
         {
           "include": "#string"
@@ -2937,7 +2937,7 @@
       ]
     },
     "namespace-declaration": {
-      "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.ts"
@@ -2949,7 +2949,7 @@
           "name": "storage.type.namespace.ts"
         }
       },
-      "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?<=})|(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.namespace.declaration.ts",
       "patterns": [
         {
@@ -2977,7 +2977,7 @@
           "name": "keyword.operator.new.ts"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*\\())))",
       "name": "new.expr.ts",
       "patterns": [
         {
@@ -2997,7 +2997,7 @@
               "name": "storage.type.numeric.bigint.ts"
             }
           },
-          "match": "\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.hex.ts"
         },
         {
@@ -3006,7 +3006,7 @@
               "name": "storage.type.numeric.bigint.ts"
             }
           },
-          "match": "\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.binary.ts"
         },
         {
@@ -3015,7 +3015,7 @@
               "name": "storage.type.numeric.bigint.ts"
             }
           },
-          "match": "\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.octal.ts"
         },
         {
@@ -3066,7 +3066,7 @@
               "name": "storage.type.numeric.bigint.ts"
             }
           },
-          "match": "(?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)"
+          "match": "(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)"
         }
       ]
     },
@@ -3088,8 +3088,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3119,8 +3119,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3145,7 +3145,7 @@
       ]
     },
     "object-binding-element-propertyName": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
       "end": "(:)",
       "endCaptures": {
         "0": {
@@ -3178,7 +3178,7 @@
           "name": "punctuation.definition.binding-pattern.object.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.ts"
@@ -3200,7 +3200,7 @@
           "name": "punctuation.definition.binding-pattern.object.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.ts"
@@ -3233,7 +3233,7 @@
               "name": "variable.other.object.property.ts"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(\\#?[[:upper:]][_$[:digit:][:upper:]]*)|(\\#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(#?\\p{upper}[_$\\d[:upper:]]*)|(#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
           "captures": {
@@ -3244,7 +3244,7 @@
               "name": "variable.other.object.ts"
             }
           },
-          "match": "(?:([[:upper:]][_$[:digit:][:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\p{upper}[_$\\d[:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         }
       ]
     },
@@ -3255,7 +3255,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -3269,7 +3269,7 @@
       ]
     },
     "object-literal-method-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.async.ts"
@@ -3281,7 +3281,7 @@
           "name": "keyword.generator.asterisk.ts"
         }
       },
-      "end": "(?=\\}|;|,)|(?<=\\})",
+      "end": "(?=[};,])|(?<=})",
       "name": "meta.method.declaration.ts",
       "patterns": [
         {
@@ -3291,7 +3291,7 @@
           "include": "#function-body"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.ts"
@@ -3303,7 +3303,7 @@
               "name": "keyword.generator.asterisk.ts"
             }
           },
-          "end": "(?=\\(|\\<)",
+          "end": "(?=[(<])",
           "patterns": [
             {
               "include": "#method-declaration-name"
@@ -3322,7 +3322,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?=:)|((?<=[\\]])(?=\\s*[\\(\\<]))",
+          "end": "(?=:)|((?<=])(?=\\s*[(<]))",
           "name": "meta.object.member.ts meta.object-literal.key.ts",
           "patterns": [
             {
@@ -3334,8 +3334,8 @@
           ]
         },
         {
-          "begin": "(?=[\\'\\\"\\`])",
-          "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as|satisifies)\\s+))))",
+          "begin": "(?=['\"`])",
+          "end": "(?=:)|((?<=['\"`])(?=((\\s*[(<,}])|(\\s+(as|satisifies)\\s+))))",
           "name": "meta.object.member.ts meta.object-literal.key.ts",
           "patterns": [
             {
@@ -3347,8 +3347,8 @@
           ]
         },
         {
-          "begin": "(?=(\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)))",
-          "end": "(?=:)|(?=\\s*([\\(\\<,}])|(\\s+as|satisifies\\s+))",
+          "begin": "(?=(\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)))",
+          "end": "(?=:)|(?=\\s*([(<,}])|(\\s+as|satisifies\\s+))",
           "name": "meta.object.member.ts meta.object-literal.key.ts",
           "patterns": [
             {
@@ -3360,8 +3360,8 @@
           ]
         },
         {
-          "begin": "(?<=[\\]\\'\\\"\\`])(?=\\s*[\\(\\<])",
-          "end": "(?=\\}|;|,)|(?<=\\})",
+          "begin": "(?<=[\\]'\"`])(?=\\s*[(<])",
+          "end": "(?=[};,])|(?<=})",
           "name": "meta.method.declaration.ts",
           "patterns": [
             {
@@ -3378,7 +3378,7 @@
               "name": "constant.numeric.decimal.ts"
             }
           },
-          "match": "(?![_$[:alpha:]])([[:digit:]]+)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "(?![_$[:alpha:]])(\\d+)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.ts"
         },
         {
@@ -3390,7 +3390,7 @@
               "name": "entity.name.function.ts"
             }
           },
-          "match": "(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:(\\s*/\\*([^*]|(\\*[^/]))*\\*/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))",
           "name": "meta.object.member.ts"
         },
         {
@@ -3399,7 +3399,7 @@
               "name": "meta.object-literal.key.ts"
             }
           },
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.ts"
         },
         {
@@ -3409,7 +3409,7 @@
               "name": "keyword.operator.spread.ts"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.ts",
           "patterns": [
             {
@@ -3423,7 +3423,7 @@
               "name": "variable.other.readwrite.ts"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.ts"
         },
         {
@@ -3448,7 +3448,7 @@
               "name": "keyword.control.satisfies.ts"
             }
           },
-          "end": "(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
+          "end": "(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
           "name": "meta.object.member.ts",
           "patterns": [
             {
@@ -3458,7 +3458,7 @@
         },
         {
           "begin": "(?=[_$[:alpha:]][_$[:alnum:]]*\\s*=)",
-          "end": "(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "end": "(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.ts",
           "patterns": [
             {
@@ -3473,11 +3473,11 @@
               "name": "meta.object-literal.key.ts punctuation.separator.key-value.ts"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.ts",
           "patterns": [
             {
-              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.ts"
@@ -3510,7 +3510,7 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.ts"
@@ -3532,13 +3532,13 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(?=\\<\\s*$)",
+              "begin": "(?<=:)\\s*(async)?\\s*(?=<\\s*$)",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.ts"
                 }
               },
-              "end": "(?<=\\>)",
+              "end": "(?<=>)",
               "patterns": [
                 {
                   "include": "#type-parameters"
@@ -3546,7 +3546,7 @@
               ]
             },
             {
-              "begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=>)\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "meta.brace.round.ts"
@@ -3590,7 +3590,7 @@
           "name": "punctuation.definition.binding-pattern.array.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.ts"
@@ -3661,7 +3661,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -3681,7 +3681,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
         }
       ]
     },
@@ -3691,8 +3691,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3729,7 +3729,7 @@
           "name": "punctuation.definition.binding-pattern.object.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.ts"
@@ -3782,7 +3782,7 @@
     "paren-expression-possibly-arrow": {
       "patterns": [
         {
-          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.ts"
@@ -3796,7 +3796,7 @@
           ]
         },
         {
-          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
+          "begin": "(?<=[(=,]|=>|^return|[^._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)))\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.ts"
@@ -3841,14 +3841,14 @@
       ]
     },
     "possibly-arrow-return-type": {
-      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*=>)",
       "beginCaptures": {
         "1": {
           "name": "meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts"
         }
       },
       "contentName": "meta.arrow.ts meta.return.type.arrow.ts",
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "patterns": [
         {
           "include": "#arrow-return-type-body"
@@ -3868,7 +3868,7 @@
           "name": "punctuation.accessor.optional.ts"
         }
       },
-      "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+      "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
     },
     "punctuation-comma": {
       "match": ",",
@@ -3885,7 +3885,7 @@
           "name": "punctuation.definition.string.begin.ts"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.ts"
@@ -3908,7 +3908,7 @@
           "name": "punctuation.definition.string.begin.ts"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.ts"
@@ -3927,7 +3927,7 @@
     "regex": {
       "patterns": [
         {
-          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[\\()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\]|\\(([^\\)\\\\]|\\\\.)+\\))+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case|=>|&&|\\|\\||\\*/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+]|\\(([^)\\\\]|\\\\.)+\\))+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.ts"
@@ -3950,7 +3950,7 @@
           ]
         },
         {
-          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*\\/)|((?<=^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case))\\s*)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*/)|((?<=^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case))\\s*)/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ts"
@@ -3981,7 +3981,7 @@
           "name": "constant.other.character-class.regexp"
         },
         {
-          "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})",
+          "match": "\\\\([0-7]{3}|x\\h{2}|u\\h{4})",
           "name": "constant.character.numeric.regexp"
         },
         {
@@ -3997,7 +3997,7 @@
     "regexp": {
       "patterns": [
         {
-          "match": "\\\\[bB]|\\^|\\$",
+          "match": "\\\\[bB]|[\\^$]",
           "name": "keyword.control.anchor.regexp"
         },
         {
@@ -4009,10 +4009,10 @@
               "name": "variable.other.regexp"
             }
           },
-          "match": "\\\\[1-9]\\d*|\\\\k<([a-zA-Z_$][\\w$]*)>"
+          "match": "\\\\(?:[1-9]\\d*|k<([a-zA-Z_$][\\w$]*)>)"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.regexp"
         },
         {
@@ -4055,7 +4055,7 @@
           ]
         },
         {
-          "begin": "\\((?:(\\?:)|(?:\\?<([a-zA-Z_$][\\w$]*)>))?",
+          "begin": "\\((?:(\\?:)|\\?<([a-zA-Z_$][\\w$]*)>)?",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.regexp"
@@ -4090,7 +4090,7 @@
               "name": "keyword.operator.negation.regexp"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.regexp"
@@ -4119,7 +4119,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))",
               "name": "constant.other.character-class.range.regexp"
             },
             {
@@ -4141,7 +4141,7 @@
               "name": "keyword.operator.type.annotation.ts"
             }
           },
-          "end": "(?<![:|&])(?=$|^|[{};,]|//)",
+          "end": "(?<![:|\\&])(?=$|^|[{};,]|//)",
           "name": "meta.return.type.ts",
           "patterns": [
             {
@@ -4156,7 +4156,7 @@
               "name": "keyword.operator.type.annotation.ts"
             }
           },
-          "end": "(?<![:|&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<![:|\\&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.return.type.ts",
           "patterns": [
             {
@@ -4172,8 +4172,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?<=[:|&])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=[:|\\&])(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -4264,7 +4264,7 @@
       ]
     },
     "string-character-escape": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
+      "match": "\\\\(x\\h{2}|u\\h{4}|u\\{\\h+}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
       "name": "constant.character.escape.ts"
     },
     "super-literal": {
@@ -4286,7 +4286,7 @@
           "include": "#punctuation-accessor"
         },
         {
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*[\\(]\\s*[\\\"\\'\\`]))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*\\(\\s*[\"'`])",
           "name": "keyword.operator.expression.import.ts"
         }
       ]
@@ -4316,7 +4316,7 @@
               "name": "support.variable.property.importmeta.ts"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(meta)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(meta)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4333,7 +4333,7 @@
               "name": "support.variable.property.target.ts"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(target)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(target)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4350,7 +4350,7 @@
               "name": "support.constant.ts"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())|(?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\()|(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$))"
         },
         {
           "captures": {
@@ -4370,13 +4370,13 @@
               "name": "support.type.object.module.ts"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
         }
       ]
     },
     "switch-statement": {
       "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bswitch\\s*\\()",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -4417,7 +4417,7 @@
               "name": "punctuation.definition.block.ts"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "name": "switch-block.expr.ts",
           "patterns": [
             {
@@ -4446,7 +4446,7 @@
                 }
               },
               "contentName": "meta.block.ts",
-              "end": "\\}",
+              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "meta.block.ts punctuation.definition.block.ts"
@@ -4509,12 +4509,12 @@
     "template-call": {
       "patterns": [
         {
-          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
           "end": "(?=`)",
           "patterns": [
             {
               "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
               "patterns": [
                 {
                   "include": "#support-function-call-identifiers"
@@ -4531,7 +4531,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.ts"
@@ -4554,7 +4554,7 @@
         }
       },
       "contentName": "meta.embedded.line.ts",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.ts"
@@ -4608,7 +4608,7 @@
         }
       },
       "contentName": "meta.embedded.line.ts",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.ts"
@@ -4622,7 +4622,7 @@
       ]
     },
     "ternary-expression": {
-      "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
+      "begin": "(?!\\?\\.\\s*\\D)(\\?)(?!\\?)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.ternary.ts"
@@ -4714,7 +4714,7 @@
           "name": "entity.name.type.alias.ts"
         }
       },
-      "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.type.declaration.ts",
       "patterns": [
         {
@@ -4733,7 +4733,7 @@
               "name": "keyword.control.intrinsic.ts"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -4747,7 +4747,7 @@
               "name": "keyword.operator.assignment.ts"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -4765,7 +4765,7 @@
               "name": "keyword.operator.type.annotation.ts"
             }
           },
-          "end": "(?<![:|&])(?!\\s*[|&]\\s+)((?=^|[,);\\}\\]]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])(?!\\s*[|\\&]\\s+)((?=^|[,);}\\]]|//)|(?==[^>])|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.ts",
           "patterns": [
             {
@@ -4780,7 +4780,7 @@
               "name": "keyword.operator.type.annotation.ts"
             }
           },
-          "end": "(?<![:|&])((?=[,);\\}\\]]|\\/\\/)|(?==[^>])|(?=^\\s*$)|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])((?=[,);}\\]]|//)|(?==[^>])|(?=^\\s*$)|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.ts",
           "patterns": [
             {
@@ -4791,13 +4791,13 @@
       ]
     },
     "type-arguments": {
-      "begin": "\\<",
+      "begin": "<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.begin.ts"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.end.ts"
@@ -4872,7 +4872,7 @@
     "type-fn-type-parameters": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*\\<)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*<)",
           "beginCaptures": {
             "1": {
               "name": "meta.type.constructor.ts storage.modifier.ts"
@@ -4910,7 +4910,7 @@
           ]
         },
         {
-          "begin": "((?=[(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>))))))",
+          "begin": "((?=\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>))))))",
           "end": "(?<=\\))",
           "name": "meta.type.function.ts",
           "patterns": [
@@ -4930,7 +4930,7 @@
               "name": "storage.type.function.arrow.ts"
             }
           },
-          "end": "(?<!=>)(?<![|&])(?=[,\\]\\)\\{\\}=;>:\\?]|//|$)",
+          "end": "(?<!=>)(?<![|\\&])(?=[,\\]){}=;>:?]|//|$)",
           "name": "meta.type.function.return.ts",
           "patterns": [
             {
@@ -4945,7 +4945,7 @@
               "name": "storage.type.function.arrow.ts"
             }
           },
-          "end": "(?<!=>)(?<![|&])((?=[,\\]\\)\\{\\}=;:\\?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<!=>)(?<![|\\&])((?=[,\\]){}=;:?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.type.function.return.ts",
           "patterns": [
             {
@@ -4962,7 +4962,7 @@
         },
         {
           "begin": "(?<==>)(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -4999,7 +4999,7 @@
     "type-name": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(<)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(<)",
           "captures": {
             "1": {
               "name": "entity.name.type.module.ts"
@@ -5062,7 +5062,7 @@
               "name": "punctuation.accessor.optional.ts"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
         },
         {
           "match": "[_$[:alpha:]][_$[:alnum:]]*",
@@ -5077,7 +5077,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -5110,7 +5110,7 @@
               "name": "keyword.operator.spread.ts"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "patterns": [
             {
               "include": "#type"
@@ -5137,13 +5137,13 @@
           "include": "#type-infer"
         },
         {
-          "begin": "([&|])(?=\\s*\\{)",
+          "begin": "([\\&|])(?=\\s*\\{)",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.ts"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -5151,7 +5151,7 @@
           ]
         },
         {
-          "begin": "[&|]",
+          "begin": "[\\&|]",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.ts"
@@ -5164,7 +5164,7 @@
           "name": "keyword.operator.expression.keyof.ts"
         },
         {
-          "match": "(\\?|\\:)",
+          "match": "([?:])",
           "name": "keyword.operator.ternary.ts"
         },
         {
@@ -5240,7 +5240,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))))"
         },
         {
           "captures": {
@@ -5260,7 +5260,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
         },
         {
           "include": "#type-annotation"
@@ -5341,7 +5341,7 @@
           "name": "meta.brace.square.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.ts"
@@ -5382,7 +5382,7 @@
           "name": "keyword.operator.expression.typeof.ts"
         }
       },
-      "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[,);}\\]=>:\\&|{?]|(extends\\s+)|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "patterns": [
         {
           "include": "#type-arguments"
@@ -5400,7 +5400,7 @@
       "patterns": [
         {
           "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^let|[^._$[:alnum:]]let|^var|[^._$[:alnum:]]var)(?=\\s*$)))",
           "name": "meta.var.expr.ts",
           "patterns": [
             {
@@ -5431,13 +5431,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.ts"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5474,7 +5474,7 @@
               "name": "storage.type.ts"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^const|[^._$[:alnum:]]const)(?=\\s*$)))",
           "name": "meta.var.expr.ts",
           "patterns": [
             {
@@ -5505,13 +5505,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.ts"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5536,7 +5536,7 @@
           ]
         },
         {
-          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.ts"
@@ -5548,11 +5548,11 @@
               "name": "storage.type.ts"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^using|[^\\._$[:alnum:]]using|^await\\s+using|[^\\._$[:alnum:]]await\\s+using)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^using|[^._$[:alnum:]]using|^await\\s+using|[^._$[:alnum:]]await\\s+using)(?=\\s*$)))",
           "name": "meta.var.expr.ts",
           "patterns": [
             {
-              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control.export.ts"
@@ -5576,13 +5576,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+              "begin": "(,)\\s*((?!\\S)|(?=//))",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.ts"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5608,13 +5608,13 @@
     "var-single-const": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ts variable.other.constant.ts entity.name.function.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5629,7 +5629,7 @@
               "name": "meta.definition.variable.ts variable.other.constant.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5642,7 +5642,7 @@
     "var-single-variable": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ts entity.name.function.ts"
@@ -5651,7 +5651,7 @@
               "name": "keyword.operator.definiteassignment.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5660,7 +5660,7 @@
           ]
         },
         {
-          "begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])(\\!)?",
+          "begin": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ts variable.other.constant.ts"
@@ -5669,7 +5669,7 @@
               "name": "keyword.operator.definiteassignment.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5678,7 +5678,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ts variable.other.readwrite.ts"
@@ -5687,7 +5687,7 @@
               "name": "keyword.operator.definiteassignment.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5713,7 +5713,7 @@
     "variable-initializer": {
       "patterns": [
         {
-          "begin": "(?<!=|!)(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
+          "begin": "(?<![=!])(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.ts"
@@ -5727,13 +5727,13 @@
           ]
         },
         {
-          "begin": "(?<!=|!)(=)(?!=)",
+          "begin": "(?<![=!])(=)(?!=)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.ts"
             }
           },
-          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![\\|\\&\\+\\-\\*\\/])(?<=\\S)(?<!=)(?=\\s*$)",
+          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![|\\&+\\-*/])(?<=\\S)(?<!=)(?=\\s*$)",
           "patterns": [
             {
               "include": "#expression"
diff --git a/resources/languages/apache.json b/resources/languages/apache.json
index 56a5aa8..d214bd0 100644
--- a/resources/languages/apache.json
+++ b/resources/languages/apache.json
@@ -126,7 +126,7 @@
           "name": "keyword.core.apacheconf"
         }
       },
-      "match": "\\b(AcceptPathInfo|AccessFileName|AddDefaultCharset|AddOutputFilterByType|AllowEncodedSlashes|AllowOverride|AuthName|AuthType|CGIMapExtension|ContentDigest|DefaultType|Define|DocumentRoot|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|FileETag|ForceType|HostnameLookups|IdentityCheck|Include(Optional)?|KeepAlive|KeepAliveTimeout|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine|LimitXMLRequestBody|LogLevel|MaxKeepAliveRequests|Mutex|NameVirtualHost|Options|Require|RLimitCPU|RLimitMEM|RLimitNPROC|Satisfy|ScriptInterpreterSource|ServerAdmin|ServerAlias|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetHandler|SetInputFilter|SetOutputFilter|Time(O|o)ut|TraceEnable|UseCanonicalName|Use|ErrorLogFormat|GlobalLog|PHPIniDir|SSLHonorCipherOrder|SSLCompression|SSLUseStapling|SSLStapling\\w+|SSLCARevocationCheck|SSLSRPVerifierFile|SSLSessionTickets|RequestReadTimeout|ProxyHTML\\w+|MaxRanges)\\b"
+      "match": "\\b(AcceptPathInfo|AccessFileName|AddDefaultCharset|AddOutputFilterByType|AllowEncodedSlashes|AllowOverride|AuthName|AuthType|CGIMapExtension|ContentDigest|DefaultType|Define|DocumentRoot|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|FileETag|ForceType|HostnameLookups|IdentityCheck|Include(Optional)?|KeepAlive|KeepAliveTimeout|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine|LimitXMLRequestBody|LogLevel|MaxKeepAliveRequests|Mutex|NameVirtualHost|Options|Require|RLimitCPU|RLimitMEM|RLimitNPROC|Satisfy|ScriptInterpreterSource|ServerAdmin|ServerAlias|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetHandler|SetInputFilter|SetOutputFilter|Time([Oo])ut|TraceEnable|UseCanonicalName|Use|ErrorLogFormat|GlobalLog|PHPIniDir|SSLHonorCipherOrder|SSLCompression|SSLUseStapling|SSLStapling\\w+|SSLCARevocationCheck|SSLSRPVerifierFile|SSLSessionTickets|RequestReadTimeout|ProxyHTML\\w+|MaxRanges)\\b"
     },
     {
       "captures": {
@@ -166,7 +166,7 @@
           "name": "keyword.auth.apacheconf"
         }
       },
-      "match": "\\b(AuthAuthoritative|AuthGroupFile|AuthUserFile|AuthBasicProvider|AuthBasicFake|AuthBasicAuthoritative|AuthBasicUseDigestAlgorithm)\\b"
+      "match": "\\b(Auth(?:Authoritative|GroupFile|UserFile|BasicProvider|BasicFake|BasicAuthoritative|BasicUseDigestAlgorithm))\\b"
     },
     {
       "captures": {
@@ -174,7 +174,7 @@
           "name": "keyword.auth_anon.apacheconf"
         }
       },
-      "match": "\\b(Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID|Anonymous_VerifyEmail)\\b"
+      "match": "\\b(Anonymous(?:|_Authoritative|_LogEmail|_MustGiveEmail|_NoUserID|_VerifyEmail))\\b"
     },
     {
       "captures": {
@@ -182,7 +182,7 @@
           "name": "keyword.auth_dbm.apacheconf"
         }
       },
-      "match": "\\b(AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile)\\b"
+      "match": "\\b(AuthDBM(?:Authoritative|GroupFile|Type|UserFile))\\b"
     },
     {
       "captures": {
@@ -190,7 +190,7 @@
           "name": "keyword.auth_digest.apacheconf"
         }
       },
-      "match": "\\b(AuthDigestAlgorithm|AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize|AuthDigestProvider)\\b"
+      "match": "\\b(AuthDigest(?:Algorithm|Domain|File|GroupFile|NcCheck|NonceFormat|NonceLifetime|Qop|ShmemSize|Provider))\\b"
     },
     {
       "captures": {
@@ -198,7 +198,7 @@
           "name": "keyword.auth_ldap.apacheconf"
         }
       },
-      "match": "\\b(AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases|AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl)\\b"
+      "match": "\\b(AuthLDAP(?:Authoritative|BindDN|BindPassword|CharsetConfig|CompareDNOnServer|DereferenceAliases|Enabled|FrontPageHack|GroupAttribute|GroupAttributeIsDN|RemoteUserIsDN|Url))\\b"
     },
     {
       "captures": {
@@ -214,7 +214,7 @@
           "name": "keyword.filter.apacheconf"
         }
       },
-      "match": "\\b(BalancerMember|BalancerGrowth|BalancerPersist|BalancerInherit)\\b"
+      "match": "\\b(Balancer(?:Member|Growth|Persist|Inherit))\\b"
     },
     {
       "captures": {
@@ -222,7 +222,7 @@
           "name": "keyword.cache.apacheconf"
         }
       },
-      "match": "\\b(CacheDefaultExpire|CacheDisable|CacheEnable|CacheForceCompletion|CacheIgnoreCacheControl|CacheIgnoreHeaders|CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire)\\b"
+      "match": "\\b(Cache(?:DefaultExpire|Disable|Enable|ForceCompletion|IgnoreCacheControl|IgnoreHeaders|IgnoreNoLastMod|LastModifiedFactor|MaxExpire))\\b"
     },
     {
       "captures": {
@@ -230,7 +230,7 @@
           "name": "keyword.cern_meta.apacheconf"
         }
       },
-      "match": "\\b(MetaDir|MetaFiles|MetaSuffix)\\b"
+      "match": "\\b(Meta(?:Dir|Files|Suffix))\\b"
     },
     {
       "captures": {
@@ -238,7 +238,7 @@
           "name": "keyword.cgi.apacheconf"
         }
       },
-      "match": "\\b(ScriptLog|ScriptLogBuffer|ScriptLogLength)\\b"
+      "match": "\\b(ScriptLog(?:|Buffer|Length))\\b"
     },
     {
       "captures": {
@@ -246,7 +246,7 @@
           "name": "keyword.cgid.apacheconf"
         }
       },
-      "match": "\\b(ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock)\\b"
+      "match": "\\b(Script(?:Log|LogBuffer|LogLength|Sock))\\b"
     },
     {
       "captures": {
@@ -254,7 +254,7 @@
           "name": "keyword.charset_lite.apacheconf"
         }
       },
-      "match": "\\b(CharsetDefault|CharsetOptions|CharsetSourceEnc)\\b"
+      "match": "\\b(Charset(?:Default|Options|SourceEnc))\\b"
     },
     {
       "captures": {
@@ -262,7 +262,7 @@
           "name": "keyword.dav.apacheconf"
         }
       },
-      "match": "\\b(Dav|DavDepthInfinity|DavMinTimeout|DavLockDB)\\b"
+      "match": "\\b(Dav(?:|DepthInfinity|MinTimeout|LockDB))\\b"
     },
     {
       "captures": {
@@ -270,7 +270,7 @@
           "name": "keyword.deflate.apacheconf"
         }
       },
-      "match": "\\b(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize)\\b"
+      "match": "\\b(Deflate(?:BufferSize|CompressionLevel|FilterNote|MemLevel|WindowSize))\\b"
     },
     {
       "captures": {
@@ -286,7 +286,7 @@
           "name": "keyword.disk_cache.apacheconf"
         }
       },
-      "match": "\\b(CacheDirLength|CacheDirLevels|CacheExpiryCheck|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheMaxFileSize|CacheMinFileSize|CacheRoot|CacheSize|CacheTimeMargin)\\b"
+      "match": "\\b(Cache(?:DirLength|DirLevels|ExpiryCheck|GcClean|GcDaily|GcInterval|GcMemUsage|GcUnused|MaxFileSize|MinFileSize|Root|Size|TimeMargin))\\b"
     },
     {
       "captures": {
@@ -294,7 +294,7 @@
           "name": "keyword.dumpio.apacheconf"
         }
       },
-      "match": "\\b(DumpIOInput|DumpIOOutput)\\b"
+      "match": "\\b(DumpIO(?:Input|Output))\\b"
     },
     {
       "captures": {
@@ -310,7 +310,7 @@
           "name": "keyword.expires.apacheconf"
         }
       },
-      "match": "\\b(ExpiresActive|ExpiresByType|ExpiresDefault)\\b"
+      "match": "\\b(Expires(?:Active|ByType|Default))\\b"
     },
     {
       "captures": {
@@ -318,7 +318,7 @@
           "name": "keyword.ext_filter.apacheconf"
         }
       },
-      "match": "\\b(ExtFilterDefine|ExtFilterOptions)\\b"
+      "match": "\\b(ExtFilter(?:Define|Options))\\b"
     },
     {
       "captures": {
@@ -350,7 +350,7 @@
           "name": "keyword.imap.apacheconf"
         }
       },
-      "match": "\\b(ImapBase|ImapDefault|ImapMenu)\\b"
+      "match": "\\b(Imap(?:Base|Default|Menu))\\b"
     },
     {
       "captures": {
@@ -366,7 +366,7 @@
           "name": "keyword.isapi.apacheconf"
         }
       },
-      "match": "\\b(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer)\\b"
+      "match": "\\b(ISAPI(?:AppendLogToErrors|AppendLogToQuery|CacheFile|FakeAsync|LogNotSupported|ReadAheadBuffer))\\b"
     },
     {
       "captures": {
@@ -374,7 +374,7 @@
           "name": "keyword.ldap.apacheconf"
         }
       },
-      "match": "\\b(LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize|LDAPTrustedCA|LDAPTrustedCAType)\\b"
+      "match": "\\b(LDAP(?:CacheEntries|CacheTTL|ConnectionTimeout|OpCacheEntries|OpCacheTTL|SharedCacheFile|SharedCacheSize|TrustedCA|TrustedCAType))\\b"
     },
     {
       "captures": {
@@ -390,7 +390,7 @@
           "name": "keyword.mem_cache.apacheconf"
         }
       },
-      "match": "\\b(MCacheMaxObjectCount|MCacheMaxObjectSize|MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize)\\b"
+      "match": "\\b(MCache(?:MaxObjectCount|MaxObjectSize|MaxStreamingBuffer|MinObjectSize|RemovalAlgorithm|Size))\\b"
     },
     {
       "captures": {
@@ -438,7 +438,7 @@
           "name": "keyword.rewrite.apacheconf"
         }
       },
-      "match": "\\b(RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule)\\b"
+      "match": "\\b(Rewrite(?:Base|Cond|Engine|Lock|Log|LogLevel|Map|Options|Rule))\\b"
     },
     {
       "captures": {
@@ -454,7 +454,7 @@
           "name": "keyword.so.apacheconf"
         }
       },
-      "match": "\\b(LoadFile|LoadModule)\\b"
+      "match": "\\b(Load(?:File|Module))\\b"
     },
     {
       "captures": {
@@ -462,7 +462,7 @@
           "name": "keyword.ssl.apacheconf"
         }
       },
-      "match": "\\b(SSLCACertificateFile|SSLCACertificatePath|SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions|SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite|SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire|SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|SSLInsecureRenegotiation|SSLOpenSSLConfCmd)\\b"
+      "match": "\\b(SSL(?:CACertificateFile|CACertificatePath|CARevocationFile|CARevocationPath|CertificateChainFile|CertificateFile|CertificateKeyFile|CipherSuite|Engine|Mutex|Options|PassPhraseDialog|Protocol|ProxyCACertificateFile|ProxyCACertificatePath|ProxyCARevocationFile|ProxyCARevocationPath|ProxyCipherSuite|ProxyEngine|ProxyMachineCertificateFile|ProxyMachineCertificatePath|ProxyProtocol|ProxyVerify|ProxyVerifyDepth|RandomSeed|Require|RequireSSL|SessionCache|SessionCacheTimeout|UserName|VerifyClient|VerifyDepth|InsecureRenegotiation|OpenSSLConfCmd))\\b"
     },
     {
       "captures": {
@@ -470,7 +470,7 @@
           "name": "keyword.substitute.apacheconf"
         }
       },
-      "match": "\\b(Substitute|SubstituteInheritBefore|SubstituteMaxLineLength)\\b"
+      "match": "\\b(Substitute(?:|InheritBefore|MaxLineLength))\\b"
     },
     {
       "captures": {
@@ -478,7 +478,7 @@
           "name": "keyword.usertrack.apacheconf"
         }
       },
-      "match": "\\b(CookieDomain|CookieExpires|CookieName|CookieStyle|CookieTracking)\\b"
+      "match": "\\b(Cookie(?:Domain|Expires|Name|Style|Tracking))\\b"
     },
     {
       "captures": {
@@ -486,7 +486,7 @@
           "name": "keyword.vhost_alias.apacheconf"
         }
       },
-      "match": "\\b(VirtualDocumentRoot|VirtualDocumentRootIP|VirtualScriptAlias|VirtualScriptAliasIP)\\b"
+      "match": "\\b(Virtual(?:DocumentRoot|DocumentRootIP|ScriptAlias|ScriptAliasIP))\\b"
     },
     {
       "captures": {
@@ -500,7 +500,7 @@
           "name": "string.value.apacheconf"
         }
       },
-      "match": "\\b(php_value|php_flag|php_admin_value|php_admin_flag)\\b(\\s+(.+?)(\\s+(\".+?\"|.+?))?)?\\s"
+      "match": "\\b(php_(?:value|flag|admin_value|admin_flag))\\b(\\s+(.+?)(\\s+(\".+?\"|.+?))?)?\\s"
     },
     {
       "captures": {
@@ -517,7 +517,7 @@
           "name": "punctuation.variable.apacheconf"
         }
       },
-      "match": "(%\\{)((HTTP_USER_AGENT|HTTP_REFERER|HTTP_COOKIE|HTTP_FORWARDED|HTTP_HOST|HTTP_PROXY_CONNECTION|HTTP_ACCEPT|REMOTE_ADDR|REMOTE_HOST|REMOTE_PORT|REMOTE_USER|REMOTE_IDENT|REQUEST_METHOD|SCRIPT_FILENAME|PATH_INFO|QUERY_STRING|AUTH_TYPE|DOCUMENT_ROOT|SERVER_ADMIN|SERVER_NAME|SERVER_ADDR|SERVER_PORT|SERVER_PROTOCOL|SERVER_SOFTWARE|TIME_YEAR|TIME_MON|TIME_DAY|TIME_HOUR|TIME_MIN|TIME_SEC|TIME_WDAY|TIME|API_VERSION|THE_REQUEST|REQUEST_URI|REQUEST_FILENAME|IS_SUBREQ|HTTPS)|(.*?))(\\})"
+      "match": "(%\\{)((HTTP_USER_AGENT|HTTP_REFERER|HTTP_COOKIE|HTTP_FORWARDED|HTTP_HOST|HTTP_PROXY_CONNECTION|HTTP_ACCEPT|REMOTE_ADDR|REMOTE_HOST|REMOTE_PORT|REMOTE_USER|REMOTE_IDENT|REQUEST_METHOD|SCRIPT_FILENAME|PATH_INFO|QUERY_STRING|AUTH_TYPE|DOCUMENT_ROOT|SERVER_ADMIN|SERVER_NAME|SERVER_ADDR|SERVER_PORT|SERVER_PROTOCOL|SERVER_SOFTWARE|TIME_YEAR|TIME_MON|TIME_DAY|TIME_HOUR|TIME_MIN|TIME_SEC|TIME_WDAY|TIME|API_VERSION|THE_REQUEST|REQUEST_URI|REQUEST_FILENAME|IS_SUBREQ|HTTPS)|(.*?))(})"
     },
     {
       "captures": {
@@ -555,7 +555,7 @@
           "name": "punctuation.definition.flag.apacheconf"
         }
       },
-      "match": "\\s(\\[)(.*?)(\\])\\s"
+      "match": "\\s(\\[)(.*?)(])\\s"
     }
   ],
   "scopeName": "source.apacheconf"
diff --git a/resources/languages/apex.json b/resources/languages/apex.json
index 422bfc7..ae14b0c 100644
--- a/resources/languages/apex.json
+++ b/resources/languages/apex.json
@@ -25,7 +25,7 @@
   ],
   "repository": {
     "annotation-declaration": {
-      "begin": "([@][_[:alpha:]]+)\\b",
+      "begin": "(@[_[:alpha:]]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.type.annotation.apex"
@@ -83,7 +83,7 @@
       ]
     },
     "array-creation-expression": {
-      "begin": "\\b(new)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))?\\s*(?=\\[)",
+      "begin": "\\b(new)\\b\\s*(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)?\\s*(?=\\[)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.new.apex"
@@ -99,7 +99,7 @@
           ]
         }
       },
-      "end": "(?<=\\])",
+      "end": "(?<=])",
       "patterns": [
         {
           "include": "#bracketed-argument-list"
@@ -113,7 +113,7 @@
           "name": "punctuation.curlybrace.open.apex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.apex"
@@ -144,7 +144,7 @@
           "name": "punctuation.squarebracket.open.apex"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.apex"
@@ -195,7 +195,7 @@
           "name": "punctuation.parenthesis.close.apex"
         }
       },
-      "match": "(\\()\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(\\))(?=\\s*@?[_[:alnum:]\\(])"
+      "match": "(\\()\\s*(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s*(\\))(?=\\s*@?[_[:alnum:](])"
     },
     "catch-clause": {
       "begin": "(?<!\\.)\\b(catch)\\b",
@@ -204,7 +204,7 @@
           "name": "keyword.control.try.catch.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "\\(",
@@ -236,7 +236,7 @@
                   "name": "entity.name.variable.local.apex"
                 }
               },
-              "match": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(?:(\\g<identifier>)\\b)?"
+              "match": "(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s*(?:(\\g<identifier>)\\b)?"
             }
           ]
         },
@@ -250,7 +250,7 @@
     },
     "class-declaration": {
       "begin": "(?=\\bclass\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "\\b(class)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*",
@@ -288,7 +288,7 @@
               "name": "punctuation.curlybrace.open.apex"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.apex"
@@ -408,7 +408,7 @@
       ]
     },
     "conditional-operator": {
-      "begin": "(?<!\\?)\\?(?!\\?|\\.|\\[)",
+      "begin": "(?<!\\?)\\?(?![?.\\[])",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.question-mark.apex"
@@ -428,7 +428,7 @@
     },
     "constructor-declaration": {
       "begin": "(?=@?[_[:alpha:]][_[:alnum:]]*\\s*\\()",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "captures": {
@@ -467,7 +467,7 @@
       ]
     },
     "constructor-initializer": {
-      "begin": "\\b(?:(this))\\b\\s*(?=\\()",
+      "begin": "\\b(this)\\b\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.this.apex"
@@ -486,7 +486,7 @@
           "name": "keyword.operator.query.date.apex"
         }
       },
-      "match": "\\b((LAST_N_DAYS|NEXT_N_DAYS|NEXT_N_WEEKS|LAST_N_WEEKS|NEXT_N_MONTHS|LAST_N_MONTHS|NEXT_N_QUARTERS|LAST_N_QUARTERS|NEXT_N_YEARS|LAST_N_YEARS|NEXT_N_FISCAL_QUARTERS|LAST_N_FISCAL_QUARTERS|NEXT_N_FISCAL_YEARS|LAST_N_FISCAL_YEARS)\\s*\\:\\d+)\\b"
+      "match": "\\b((LAST_N_DAYS|NEXT_N_DAYS|NEXT_N_WEEKS|LAST_N_WEEKS|NEXT_N_MONTHS|LAST_N_MONTHS|NEXT_N_QUARTERS|LAST_N_QUARTERS|NEXT_N_YEARS|LAST_N_YEARS|NEXT_N_FISCAL_QUARTERS|LAST_N_FISCAL_QUARTERS|NEXT_N_FISCAL_YEARS|LAST_N_FISCAL_YEARS)\\s*:\\d+)\\b"
     },
     "date-literals": {
       "captures": {
@@ -520,7 +520,7 @@
           "name": "keyword.control.loop.do.apex"
         }
       },
-      "end": "(?=;|})",
+      "end": "(?=[;}])",
       "patterns": [
         {
           "include": "#statement"
@@ -547,7 +547,7 @@
           "name": "keyword.operator.null-conditional.apex"
         }
       },
-      "end": "(?<=\\])(?!\\s*\\[)",
+      "end": "(?<=])(?!\\s*\\[)",
       "patterns": [
         {
           "include": "#bracketed-argument-list"
@@ -561,7 +561,7 @@
           "name": "keyword.control.conditional.else.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#statement"
@@ -570,7 +570,7 @@
     },
     "enum-declaration": {
       "begin": "(?=\\benum\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "(?=enum)",
@@ -602,7 +602,7 @@
               "name": "punctuation.curlybrace.open.apex"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.apex"
@@ -625,7 +625,7 @@
                   "name": "entity.name.variable.enum-member.apex"
                 }
               },
-              "end": "(?=(,|\\}))",
+              "end": "(?=([,}]))",
               "patterns": [
                 {
                   "include": "#javadoc-comment"
@@ -716,7 +716,7 @@
           "name": "keyword.operator.arrow.apex"
         }
       },
-      "end": "(?=[,\\);}])",
+      "end": "(?=[,);}])",
       "patterns": [
         {
           "include": "#expression"
@@ -730,7 +730,7 @@
           "name": "keyword.operator.assignment.compound.apex"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>=|\\|=",
+          "match": "&=|\\^=|<<=|>>=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.apex"
         },
         {
@@ -742,19 +742,19 @@
           "name": "keyword.operator.comparison.apex"
         },
         {
-          "match": "<=|>=|<|>",
+          "match": "<=|>=|[<>]",
           "name": "keyword.operator.relational.apex"
         },
         {
-          "match": "\\!|&&|\\|\\|",
+          "match": "!|&&|\\|\\|",
           "name": "keyword.operator.logical.apex"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.apex"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.apex"
         },
         {
@@ -766,7 +766,7 @@
           "name": "keyword.operator.increment.apex"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.apex"
         }
       ]
@@ -781,10 +781,10 @@
           "name": "entity.name.type.extends.apex"
         }
       },
-      "end": "(?={|implements)"
+      "end": "(?=\\{|implements)"
     },
     "field-declaration": {
-      "begin": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+(\\g<identifier>)\\s*(?!=>|==)(?=,|;|=|$)",
+      "begin": "(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+(\\g<identifier>)\\s*(?!=[>=])(?=[,;=]|$)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -827,7 +827,7 @@
           "name": "keyword.control.try.finally.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -856,7 +856,7 @@
           "name": "keyword.operator.iterator.colon.apex"
         }
       },
-      "match": "([_.[:alpha:]][_.[:alnum:]]+)\\s+([_.[:alpha:]][_.[:alnum:]]*)\\s*(\\:)"
+      "match": "([_.[:alpha:]][_.[:alnum:]]+)\\s+([_.[:alpha:]][_.[:alnum:]]*)\\s*(:)"
     },
     "for-statement": {
       "begin": "(?<!\\.)\\b(for)\\b\\s*(?=\\()",
@@ -865,7 +865,7 @@
           "name": "keyword.control.loop.for.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "\\(",
@@ -915,7 +915,7 @@
           "name": "storage.type.apex"
         }
       },
-      "match": "(FROM)\\b\\s*([_\\.[:alnum:]]+\\b)?"
+      "match": "(FROM)\\b\\s*([_.[:alnum:]]+\\b)?"
     },
     "goto-statement": {
       "begin": "(?<!\\.)\\b(goto)\\b",
@@ -965,7 +965,7 @@
           "name": "keyword.control.conditional.if.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "\\(",
@@ -1001,10 +1001,10 @@
           "name": "entity.name.type.implements.apex"
         }
       },
-      "end": "(?={|extends)"
+      "end": "(?=\\{|extends)"
     },
     "indexer-declaration": {
-      "begin": "(?<return_type>(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
+      "begin": "(?<return_type>(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1027,7 +1027,7 @@
           "name": "keyword.other.this.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1050,7 +1050,7 @@
           "name": "punctuation.curlybrace.open.apex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.apex"
@@ -1067,7 +1067,7 @@
     },
     "interface-declaration": {
       "begin": "(?=\\binterface\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "(interface)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -1102,7 +1102,7 @@
               "name": "punctuation.curlybrace.open.apex"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.apex"
@@ -1247,7 +1247,7 @@
       ]
     },
     "local-constant-declaration": {
-      "begin": "(?<const_keyword>\\b(?:const)\\b)\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+(\\g<identifier>)\\s*(?=,|;|=)",
+      "begin": "(?<const_keyword>\\bconst\\b)\\s*(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+(\\g<identifier>)\\s*(?=[,;=])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.apex"
@@ -1291,7 +1291,7 @@
       ]
     },
     "local-variable-declaration": {
-      "begin": "(?:(?:(\\bref)\\s+)?(\\bvar\\b)|(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*)))\\s+(\\g<identifier>)\\s*(?=,|;|=|\\))",
+      "begin": "(?:(?:(\\bref)\\s+)?(\\bvar\\b)|(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*))\\s+(\\g<identifier>)\\s*(?=[,;=)])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.apex"
@@ -1313,7 +1313,7 @@
           "name": "entity.name.variable.local.apex"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "match": "@?[_[:alpha:]][_[:alnum:]]*",
@@ -1348,7 +1348,7 @@
               "name": "variable.other.object.property.apex"
             }
           },
-          "match": "(\\??\\.)\\s*(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?![_[:alnum:]]|\\(|(\\?)?\\[|<)"
+          "match": "(\\??\\.)\\s*(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?![_[:alnum:](]|(\\?)?\\[|<)"
         },
         {
           "captures": {
@@ -1392,7 +1392,7 @@
           "name": "support.function.apex"
         }
       },
-      "end": "(?<=\\;)",
+      "end": "(?<=;)",
       "patterns": [
         {
           "include": "#object-creation-expression"
@@ -1420,10 +1420,10 @@
           "name": "punctuation.terminator.statement.apex"
         }
       },
-      "match": "([_[:alpha:]]*)\\b\\s+([_[:alpha:]]*)\\b\\s*(\\;)"
+      "match": "([_[:alpha:]]*)\\b\\s+([_[:alpha:]]*)\\b\\s*(;)"
     },
     "method-declaration": {
-      "begin": "(?<return_type>(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
+      "begin": "(?<return_type>(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1463,7 +1463,7 @@
           ]
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1493,7 +1493,7 @@
           "name": "punctuation.separator.colon.apex"
         }
       },
-      "end": "(?=(,|\\)|\\]))",
+      "end": "(?=([,)\\]]))",
       "patterns": [
         {
           "include": "#expression"
@@ -1507,39 +1507,39 @@
     "numeric-literal": {
       "patterns": [
         {
-          "match": "\\b(\\d{4}\\-\\d{2}\\-\\d{2}T\\d{2}\\:\\d{2}\\:\\d{2}(\\.\\d{1,3})?(\\-|\\+)\\d{2}\\:\\d{2})\\b",
+          "match": "\\b(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{1,3})?([-+])\\d{2}:\\d{2})\\b",
           "name": "constant.numeric.datetime.apex"
         },
         {
-          "match": "\\b(\\d{4}\\-\\d{2}\\-\\d{2}T\\d{2}\\:\\d{2}\\:\\d{2}(\\.\\d{1,3})?(Z)?)\\b",
+          "match": "\\b(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{1,3})?(Z)?)\\b",
           "name": "constant.numeric.datetime.apex"
         },
         {
-          "match": "\\b(\\d{4}\\-\\d{2}\\-\\d{2})\\b",
+          "match": "\\b(\\d{4}-\\d{2}-\\d{2})\\b",
           "name": "constant.numeric.date.apex"
         },
         {
-          "match": "\\b0(x|X)[0-9a-fA-F_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
+          "match": "\\b0([xX])[_\\h]+([UuLl]|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
           "name": "constant.numeric.hex.apex"
         },
         {
-          "match": "\\b0(b|B)[01_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
+          "match": "\\b0([bB])[01_]+([UuLl]|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
           "name": "constant.numeric.binary.apex"
         },
         {
-          "match": "\\b([0-9_]+)?\\.[0-9_]+((e|E)[0-9]+)?(F|f|D|d|M|m)?\\b",
+          "match": "\\b([0-9_]+)?\\.[0-9_]+(([eE])[0-9]+)?([FfDdMm])?\\b",
           "name": "constant.numeric.decimal.apex"
         },
         {
-          "match": "\\b[0-9_]+(e|E)[0-9_]+(F|f|D|d|M|m)?\\b",
+          "match": "\\b[0-9_]+([eE])[0-9_]+([FfDdMm])?\\b",
           "name": "constant.numeric.decimal.apex"
         },
         {
-          "match": "\\b[0-9_]+(F|f|D|d|M|m)\\b",
+          "match": "\\b[0-9_]+([FfDdMm])\\b",
           "name": "constant.numeric.decimal.apex"
         },
         {
-          "match": "\\b[0-9_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
+          "match": "\\b[0-9_]+([UuLl]|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
           "name": "constant.numeric.decimal.apex"
         }
       ]
@@ -1576,10 +1576,10 @@
           ]
         }
       },
-      "match": "(delete|insert|undelete|update|upsert)?\\s*(new)\\s+(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(?=\\{|$)"
+      "match": "(delete|insert|undelete|update|upsert)?\\s*(new)\\s+(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s*(?=\\{|$)"
     },
     "object-creation-expression-with-parameters": {
-      "begin": "(delete|insert|undelete|update|upsert)?\\s*(new)\\s+(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(?=\\()",
+      "begin": "(delete|insert|undelete|update|upsert)?\\s*(new)\\s+(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "support.function.apex"
@@ -1606,7 +1606,7 @@
       ]
     },
     "operator-assignment": {
-      "match": "(?<!=|!)(=)(?!=)",
+      "match": "(?<![=!])(=)(?!=)",
       "name": "keyword.operator.assignment.apex"
     },
     "operator-safe-navigation": {
@@ -1670,7 +1670,7 @@
           "name": "entity.name.variable.parameter.apex"
         }
       },
-      "match": "(?:(?:\\b(this)\\b)\\s+)?(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+(\\g<identifier>)"
+      "match": "(?:\\b(this)\\b\\s+)?(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+(\\g<identifier>)"
     },
     "parenthesized-expression": {
       "begin": "\\(",
@@ -1726,7 +1726,7 @@
           "name": "punctuation.curlybrace.open.apex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.apex"
@@ -1734,7 +1734,7 @@
       },
       "patterns": [
         {
-          "match": "\\b(private|protected)\\b",
+          "match": "\\b(pr(?:ivate|otected))\\b",
           "name": "storage.modifier.apex"
         },
         {
@@ -1760,7 +1760,7 @@
       ]
     },
     "property-declaration": {
-      "begin": "(?!.*\\b(?:class|interface|enum)\\b)\\s*(?<return_type>(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<property_name>\\g<identifier>)\\s*(?=\\{|=>|$)",
+      "begin": "(?!.*\\b(?:class|interface|enum)\\b)\\s*(?<return_type>(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<property_name>\\g<identifier>)\\s*(?=\\{|=>|$)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1783,7 +1783,7 @@
           "name": "entity.name.variable.property.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1890,13 +1890,13 @@
       ]
     },
     "soql-colon-vars": {
-      "begin": "(\\:)\\s*",
+      "begin": "(:)\\s*",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.colon.apex"
         }
       },
-      "end": "(?![_[:alnum:]]|\\(|(\\?)?\\[|<)",
+      "end": "(?![_[:alnum:](]|(\\?)?\\[|<)",
       "patterns": [
         {
           "include": "#trigger-context-declaration"
@@ -2060,7 +2060,7 @@
           "name": "keyword.operator.query.select.apex"
         }
       },
-      "end": "(?=;)|(?=\\])|(?=\\))",
+      "end": "(?=;)|(?=])|(?=\\))",
       "patterns": [
         {
           "include": "#soql-query-body"
@@ -2092,7 +2092,7 @@
               "name": "punctuation.separator.comma.apex"
             }
           },
-          "match": "([_.[:alpha:]][_.[:alnum:]]*)\\s*(\\,)?"
+          "match": "([_.[:alpha:]][_.[:alnum:]]*)\\s*(,)?"
         }
       ]
     },
@@ -2178,7 +2178,7 @@
           "name": "punctuation.definition.string.begin.apex"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.apex"
@@ -2228,13 +2228,13 @@
       "match": "\\b(ApexPages|Database|DMLException|Exception|PageReference|Savepoint|SchedulableContext|Schema|SObject|System|Test)\\b"
     },
     "support-expression": {
-      "begin": "(ApexPages|Database|DMLException|Exception|PageReference|Savepoint|SchedulableContext|Schema|SObject|System|Test)(?=\\.|\\s)",
+      "begin": "(ApexPages|Database|DMLException|Exception|PageReference|Savepoint|SchedulableContext|Schema|SObject|System|Test)(?=[.\\s])",
       "beginCaptures": {
         "1": {
           "name": "support.class.apex"
         }
       },
-      "end": "(?<=\\)|$)|(?=\\})|(?=;)|(?=\\)|(?=\\]))|(?=\\,)",
+      "end": "(?<=\\)|$)|(?=})|(?=;)|(?=\\)|(?=]))|(?=,)",
       "patterns": [
         {
           "include": "#support-type"
@@ -2248,7 +2248,7 @@
               "name": "support.function.apex"
             }
           },
-          "match": "(?:(\\.))([[:alpha:]]*)(?=\\()"
+          "match": "(\\.)(\\p{alpha}*)(?=\\()"
         },
         {
           "captures": {
@@ -2259,7 +2259,7 @@
               "name": "support.type.apex"
             }
           },
-          "match": "(?:(\\.))([[:alpha:]]+)"
+          "match": "(\\.)(\\p{alpha}+)"
         },
         {
           "begin": "\\(",
@@ -2310,7 +2310,7 @@
               "name": "support.function.apex"
             }
           },
-          "match": "(\\.)\\s*([[:alpha:]]*)(?=\\()"
+          "match": "(\\.)\\s*(\\p{alpha}*)(?=\\()"
         },
         {
           "begin": "\\(",
@@ -2365,7 +2365,7 @@
       ]
     },
     "switch-statement": {
-      "begin": "(switch)\\b\\s+(on)\\b\\s+(?:([_.?\\'\\(\\)[:alnum:]]+)\\s*)?(\\{)",
+      "begin": "(switch)\\b\\s+(on)\\b\\s+(?:([_.?'()[:alnum:]]+)\\s*)?(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.apex"
@@ -2387,7 +2387,7 @@
           "name": "punctuation.curlybrace.open.apex"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.apex"
@@ -2426,7 +2426,7 @@
           "name": "keyword.other.this.apex"
         }
       },
-      "match": "\\b(?:(this))\\b"
+      "match": "\\b(this)\\b"
     },
     "throw-expression": {
       "captures": {
@@ -2451,7 +2451,7 @@
       ]
     },
     "trigger-context-declaration": {
-      "begin": "\\b(?:(Trigger))\\b(\\.)\\b",
+      "begin": "\\b(Trigger)\\b(\\.)\\b",
       "beginCaptures": {
         "1": {
           "name": "support.class.trigger.apex"
@@ -2460,7 +2460,7 @@
           "name": "punctuation.accessor.apex"
         }
       },
-      "end": "(?=\\})|(?=;)|(?=\\)|(?=\\]))",
+      "end": "(?=})|(?=;)|(?=\\)|(?=]))",
       "patterns": [
         {
           "match": "\\b(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size)\\b",
@@ -2482,7 +2482,7 @@
               "name": "support.function.trigger.apex"
             }
           },
-          "match": "(?:(\\??\\.))([[:alpha:]]+)(?=\\()"
+          "match": "(\\??\\.)(\\p{alpha}+)(?=\\()"
         },
         {
           "begin": "\\(",
@@ -2519,7 +2519,7 @@
     },
     "trigger-declaration": {
       "begin": "(?=\\btrigger\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "\\b(trigger)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*\\b(on)\\b\\s+([_[:alpha:]][_[:alnum:]]*)\\s*",
@@ -2585,7 +2585,7 @@
               "name": "punctuation.curlybrace.open.apex"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.apex"
@@ -2630,7 +2630,7 @@
           "name": "keyword.control.try.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -2711,7 +2711,7 @@
           "name": "punctuation.squarebracket.open.apex"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.apex"
@@ -2804,13 +2804,13 @@
       "match": "\\?"
     },
     "type-parameter-list": {
-      "begin": "\\<",
+      "begin": "<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.begin.apex"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.end.apex"
@@ -2842,13 +2842,13 @@
       "match": "((USING SCOPE)\\b\\s*(Delegated|Everything|Mine|My_Territory|My_Team_Territory|Team))\\b\\s*"
     },
     "variable-initializer": {
-      "begin": "(?<!=|!)(=)(?!=|>)",
+      "begin": "(?<![=!])(=)(?![=>])",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.assignment.apex"
         }
       },
-      "end": "(?=[,\\)\\];}])",
+      "end": "(?=[,)\\];}])",
       "patterns": [
         {
           "include": "#expression"
@@ -2865,7 +2865,7 @@
           "name": "keyword.control.switch.else.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2882,7 +2882,7 @@
           "name": "keyword.control.switch.when.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2905,7 +2905,7 @@
           "name": "entity.name.variable.local.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2916,7 +2916,7 @@
       ]
     },
     "when-statement": {
-      "begin": "(when)\\b\\s+([\\'_\\-[:alnum:]]+)\\s*",
+      "begin": "(when)\\b\\s+(['_\\-[:alnum:]]+)\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.when.apex"
@@ -2929,7 +2929,7 @@
           ]
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2940,7 +2940,7 @@
       ]
     },
     "when-string": {
-      "begin": "(when)(\\b\\s*)((\\')[_.\\,\\'\\s*[:alnum:]]+)",
+      "begin": "(when)(\\b\\s*)((')[_.,'\\s*[:alnum:]]+)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.when.apex"
@@ -2959,7 +2959,7 @@
           ]
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2972,13 +2972,13 @@
     "when-string-statement": {
       "patterns": [
         {
-          "begin": "\\'",
+          "begin": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.apex"
             }
           },
-          "end": "\\'",
+          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.apex"
@@ -3003,7 +3003,7 @@
           "name": "keyword.control.loop.while.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "\\(",
@@ -3063,7 +3063,7 @@
           "name": "punctuation.definition.string.begin.apex"
         }
       },
-      "end": "\\]\\]>",
+      "end": "]]>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.apex"
@@ -3082,7 +3082,7 @@
               "name": "punctuation.definition.constant.apex"
             }
           },
-          "match": "(&)((?:[[:alpha:]:_][[:alnum:]:_.-]*)|(?:\\#[[:digit:]]+)|(?:\\#x[[:xdigit:]]+))(;)",
+          "match": "(&)([[:alpha:]:_][[:alnum:]:_.-]*|#\\d+|#x\\h+)(;)",
           "name": "constant.character.entity.apex"
         },
         {
@@ -3125,13 +3125,13 @@
     "xml-string": {
       "patterns": [
         {
-          "begin": "\\'",
+          "begin": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.apex"
             }
           },
-          "end": "\\'",
+          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.apex"
@@ -3145,13 +3145,13 @@
           ]
         },
         {
-          "begin": "\\\"",
+          "begin": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.stringdoublequote.begin.apex"
             }
           },
-          "end": "\\\"",
+          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.stringdoublequote.end.apex"
diff --git a/resources/languages/apl.json b/resources/languages/apl.json
index d1bd89a..8af8c0f 100644
--- a/resources/languages/apl.json
+++ b/resources/languages/apl.json
@@ -12,8 +12,8 @@
     "dyapp",
     "mipage"
   ],
-  "firstLineMatch": "[⌶-⍺]|^\\#!.*(?:\\s|\\/|(?<=!)\\b)(?:gnu[-._]?apl|aplx?|dyalog)(?:$|\\s)|(?i:-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)apl(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-|(?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=apl(?=\\s|:|$))",
-  "foldingStartMarker": "{",
+  "firstLineMatch": "[⌶-⍺]|^#!.*(?:[\\s/]|(?<=!)\\b)(?:gnu[-._]?apl|aplx?|dyalog)(?:$|\\s)|(?i:-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)apl(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-|(?:(?:\\s|^)vi(?:m(?:[<=>]?\\d+|))?|\\sex)(?=:(?:(?=\\s*set?\\s[^\\n:]+:)|(?!\\s*set?\\s)))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=apl(?=[\\s:]|$))",
+  "foldingStartMarker": "\\{",
   "foldingStopMarker": "}",
   "name": "apl",
   "patterns": [
@@ -28,7 +28,7 @@
       "include": "#main"
     },
     {
-      "begin": "^\\s*((\\))OFF|(\\])NEXTFILE)\\b(.*)$",
+      "begin": "^\\s*((\\))OFF|(])NEXTFILE)\\b(.*)$",
       "beginCaptures": {
         "1": {
           "name": "entity.name.command.eof.apl"
@@ -77,7 +77,7 @@
           "name": "punctuation.square.bracket.begin.apl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.square.bracket.end.apl"
@@ -115,7 +115,7 @@
       ]
     },
     {
-      "begin": "^\\s*((\\])\\S+)",
+      "begin": "^\\s*((])\\S+)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.command.apl"
@@ -340,7 +340,7 @@
     "definition": {
       "patterns": [
         {
-          "begin": "^\\s*?(∇)(?:\\s*(?:([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)|\\s*((\\{)(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\})|(\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\))|(\\(\\s*\\{)(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\}\\s*\\))|(\\{\\s*\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\)\\s*\\}))\\s*)\\s*(←))?\\s*(?:(?:([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)\\s*((\\[)\\s*(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*(.*?)|([^\\]]*))\\s*(\\]))?\\s*?((?<=\\s|\\])[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*|(\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\)))\\s*(?=;|$))|(?:([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s+)|((\\{)(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\})|(\\(\\s*\\{)(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\}\\s*\\))|(\\{\\s*\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\)\\s*\\})))?\\s*(?:([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)\\s*((\\[)\\s*(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*(.*?)|([^\\]]*))\\s*(\\]))?|((\\()(\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)?\\s*([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)\\s*?((\\[)\\s*(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*(.*?)|([^\\]]*))\\s*(\\]))?\\s*([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)?(\\))))\\s*((?<=\\s|\\])[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*|\\s*(\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\)))?)\\s*([^;]+)?(((?>\\s*;(?:\\s*[⎕A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)+)+)|([^⍝]+))?\\s*(⍝.*)?$",
+          "begin": "^\\s*?(∇)(?:\\s*(?:([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)|\\s*((\\{)(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(})|(\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\))|(\\(\\s*\\{)(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(}\\s*\\))|(\\{\\s*\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\)\\s*}))\\s*)\\s*(←))?\\s*(?:([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)\\s*((\\[)\\s*(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*(.*?)|([^\\]]*))\\s*(]))?\\s*?((?<=[\\s\\]])[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*|(\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\)))\\s*(?=;|$)|(?:([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s+)|((\\{)(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(})|(\\(\\s*\\{)(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(}\\s*\\))|(\\{\\s*\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\)\\s*})))?\\s*(?:([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)\\s*((\\[)\\s*(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*(.*?)|([^\\]]*))\\s*(]))?|((\\()(\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)?\\s*([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*)\\s*?((\\[)\\s*(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*(.*?)|([^\\]]*))\\s*(]))?\\s*([A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)?(\\))))\\s*((?<=[\\s\\]])[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*|\\s*(\\()(?:\\s*[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)*(\\)))?)\\s*([^;]+)?(((?>\\s*;(?:\\s*[⎕A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ][A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\\s*)+)+)|([^⍝]+))?\\s*(⍝.*)?$",
           "beginCaptures": {
             "0": {
               "name": "entity.function.definition.apl"
@@ -569,7 +569,7 @@
     "embedded-apl": {
       "patterns": [
         {
-          "begin": "(?i)(<(\\?|%)(?:apl(?=\\s+)|=))",
+          "begin": "(?i)(<([?%])(?:apl(?=\\s+)|=))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.begin.apl"
@@ -601,7 +601,7 @@
     "heredocs": {
       "patterns": [
         {
-          "begin": "^.*?⎕INP\\s+('|\")((?i).*?HTML?.*?|END-OF-⎕INP)\\1.*$",
+          "begin": "^.*?⎕INP\\s+(['\"])((?i).*?HTML?.*?|END-OF-⎕INP)\\1.*$",
           "beginCaptures": {
             "0": {
               "patterns": [
@@ -629,7 +629,7 @@
           ]
         },
         {
-          "begin": "^.*?⎕INP\\s+('|\")((?i).*?(?:XML|XSLT|SVG|RSS).*?)\\1.*$",
+          "begin": "^.*?⎕INP\\s+(['\"])((?i).*?(?:XML|XSLT|SVG|RSS).*?)\\1.*$",
           "beginCaptures": {
             "0": {
               "patterns": [
@@ -657,7 +657,7 @@
           ]
         },
         {
-          "begin": "^.*?⎕INP\\s+('|\")((?i).*?(?:CSS|stylesheet).*?)\\1.*$",
+          "begin": "^.*?⎕INP\\s+(['\"])((?i).*?(?:CSS|stylesheet).*?)\\1.*$",
           "beginCaptures": {
             "0": {
               "patterns": [
@@ -685,7 +685,7 @@
           ]
         },
         {
-          "begin": "^.*?⎕INP\\s+('|\")((?i).*?(?:JS(?!ON)|(?:ECMA|J|Java).?Script).*?)\\1.*$",
+          "begin": "^.*?⎕INP\\s+(['\"])((?i).*?(?:JS(?!ON)|(?:ECMA|J|Java).?Script).*?)\\1.*$",
           "beginCaptures": {
             "0": {
               "patterns": [
@@ -713,7 +713,7 @@
           ]
         },
         {
-          "begin": "^.*?⎕INP\\s+('|\")((?i).*?(?:JSON).*?)\\1.*$",
+          "begin": "^.*?⎕INP\\s+(['\"])((?i).*?JSON.*?)\\1.*$",
           "beginCaptures": {
             "0": {
               "patterns": [
@@ -741,7 +741,7 @@
           ]
         },
         {
-          "begin": "^.*?⎕INP\\s+('|\")(?i)((?:Raw|Plain)?\\s*Te?xt)\\1.*$",
+          "begin": "^.*?⎕INP\\s+(['\"])(?i)((?:Raw|Plain)?\\s*Te?xt)\\1.*$",
           "beginCaptures": {
             "0": {
               "patterns": [
@@ -766,7 +766,7 @@
           ]
         },
         {
-          "begin": "^.*?⎕INP\\s+('|\")(.*?)\\1.*$",
+          "begin": "^.*?⎕INP\\s+(['\"])(.*?)\\1.*$",
           "beginCaptures": {
             "0": {
               "patterns": [
@@ -814,7 +814,7 @@
           "name": "punctuation.definition.lambda.begin.apl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.lambda.end.apl"
@@ -1141,7 +1141,7 @@
           "name": "keyword.operator.decode.apl"
         },
         {
-          "match": "\\/",
+          "match": "/",
           "name": "keyword.operator.slash.apl"
         },
         {
@@ -1149,7 +1149,7 @@
           "name": "keyword.operator.slash-bar.apl"
         },
         {
-          "match": "\\x5C",
+          "match": "\\\\",
           "name": "keyword.operator.backslash.apl"
         },
         {
diff --git a/resources/languages/applescript.json b/resources/languages/applescript.json
index ece3d42..da5eb2a 100644
--- a/resources/languages/applescript.json
+++ b/resources/languages/applescript.json
@@ -62,7 +62,7 @@
           ]
         },
         {
-          "begin": "^\\s*(to|on)\\s+(\\w+)(\\()((?:[\\s,:\\{\\}]*(?:\\w+)?)*)(\\))",
+          "begin": "^\\s*(to|on)\\s+(\\w+)(\\()((?:[\\s,:{}]*\\w+{0,1})*)(\\))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.function.applescript"
@@ -80,7 +80,6 @@
               "name": "punctuation.definition.parameters.end.applescript"
             }
           },
-          "comment": "\n\t\t\t\t\t\tThis is not a very well-designed rule.  For now,\n\t\t\t\t\t\twe can leave it like this though, as it sorta works.\n\t\t\t\t\t",
           "end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
@@ -110,7 +109,6 @@
               "name": "variable.parameter.handler.direct.applescript"
             }
           },
-          "comment": "TODO: match `given` parameters",
           "end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
           "endCaptures": {
             "1": {
@@ -639,7 +637,6 @@
               "name": "keyword.control.tell.applescript"
             }
           },
-          "comment": "tell Textmate",
           "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "name": "meta.block.tell.application.textmate.applescript",
           "patterns": [
@@ -661,7 +658,6 @@
               "name": "keyword.control.tell.applescript"
             }
           },
-          "comment": "tell Finder",
           "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "name": "meta.block.tell.application.finder.applescript",
           "patterns": [
@@ -683,7 +679,6 @@
               "name": "keyword.control.tell.applescript"
             }
           },
-          "comment": "tell System Events",
           "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "name": "meta.block.tell.application.system-events.applescript",
           "patterns": [
@@ -705,7 +700,6 @@
               "name": "keyword.control.tell.applescript"
             }
           },
-          "comment": "tell iTunes",
           "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "name": "meta.block.tell.application.itunes.applescript",
           "patterns": [
@@ -727,7 +721,6 @@
               "name": "keyword.control.tell.applescript"
             }
           },
-          "comment": "tell generic application process",
           "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "name": "meta.block.tell.application-process.generic.applescript",
           "patterns": [
@@ -746,7 +739,6 @@
               "name": "keyword.control.tell.applescript"
             }
           },
-          "comment": "tell generic application",
           "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "name": "meta.block.tell.application.generic.applescript",
           "patterns": [
@@ -765,7 +757,6 @@
               "name": "keyword.control.tell.applescript"
             }
           },
-          "comment": "generic tell block",
           "end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
           "name": "meta.block.tell.generic.applescript",
           "patterns": [
@@ -781,7 +772,6 @@
               "name": "keyword.control.tell.applescript"
             }
           },
-          "comment": "tell … to statement",
           "end": "(?<!¬)$",
           "name": "meta.block.tell.generic.applescript",
           "patterns": [
@@ -811,7 +801,6 @@
     "built-in.constant": {
       "patterns": [
         {
-          "comment": "yes/no can’t always be used as booleans, e.g. in an if() expression. But they work e.g. for boolean arguments.",
           "match": "\\b(?i:true|false|yes|no)\\b",
           "name": "constant.language.boolean.applescript"
         },
@@ -828,7 +817,7 @@
           "name": "constant.other.text.applescript"
         },
         {
-          "match": "\\b(?i:all\\s+(caps|lowercase)|bold|condensed|expanded|hidden|italic|outline|plain|shadow|small\\s+caps|strikethrough|(sub|super)script|underline)\\b",
+          "match": "\\b(?i:all\\s+(caps|lowercase)|bold|condensed|expanded|hidden|italic|outline|plain|shadow|small\\s+caps|strikethrough|(su(?:b|per))script|underline)\\b",
           "name": "constant.other.styles.applescript"
         },
         {
@@ -852,20 +841,19 @@
     "built-in.keyword": {
       "patterns": [
         {
-          "match": "(&|\\*|\\+|-|/|÷|\\^)",
+          "match": "([\\&*+\\-/÷^])",
           "name": "keyword.operator.arithmetic.applescript"
         },
         {
-          "match": "(=|≠|>|<|≥|>=|≤|<=)",
+          "match": "([=≠><≥]|>=|≤|<=)",
           "name": "keyword.operator.comparison.applescript"
         },
         {
-          "match": "(?ix)\\b\n\t\t\t\t\t\t(and|or|div|mod|as|not\n\t\t\t\t\t\t|(a\\s+)?(ref(\\s+to)?|reference\\s+to)\n\t\t\t\t\t\t|equal(s|\\s+to)|contains?|comes\\s+(after|before)|(start|begin|end)s?\\s+with\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b",
+          "match": "(?i)\\b(and|or|div|mod|as|not|(a\\s+)?(ref(?:(\\s+to)?|erence\\s+to))|equal(s|\\s+to)|contains?|comes\\s+(after|before)|(start|begin|end)s?\\s+with)\\b",
           "name": "keyword.operator.word.applescript"
         },
         {
-          "comment": "In double quotes so we can use a single quote in the keywords.",
-          "match": "(?ix)\\b\n\t\t\t\t\t\t(is(n't|\\s+not)?(\\s+(equal(\\s+to)?|(less|greater)\\s+than(\\s+or\\s+equal(\\s+to)?)?|in|contained\\s+by))?\n\t\t\t\t\t\t|does(n't|\\s+not)\\s+(equal|come\\s+(before|after)|contain)\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b",
+          "match": "(?i)\\b(is(n't|\\s+not)?(\\s+(equal(\\s+to)?|(less|greater)\\s+than(\\s+or\\s+equal(\\s+to)?)?|in|contained\\s+by))?|does(n't|\\s+not)\\s+(equal|come\\s+(before|after)|contain))\\b",
           "name": "keyword.operator.word.applescript"
         },
         {
@@ -889,12 +877,10 @@
           "name": "punctuation.separator.continuation.line.applescript"
         },
         {
-          "comment": "the : in property assignments",
           "match": ":",
           "name": "punctuation.separator.key-value.property.applescript"
         },
         {
-          "comment": "the parentheses in groups",
           "match": "[()]",
           "name": "punctuation.section.group.applescript"
         }
@@ -927,7 +913,7 @@
           "name": "support.class.built-in.applescript"
         },
         {
-          "match": "(?ix)\\b\n\t\t\t\t\t\t(\t(cubic\\s+(centi)?|square\\s+(kilo)?|centi|kilo)met(er|re)s\n\t\t\t\t\t\t|\tsquare\\s+(yards|feet|miles)|cubic\\s+(yards|feet|inches)|miles|inches\n\t\t\t\t\t\t|\tlit(re|er)s|gallons|quarts\n\t\t\t\t\t\t|\t(kilo)?grams|ounces|pounds\n\t\t\t\t\t\t|\tdegrees\\s+(Celsius|Fahrenheit|Kelvin)\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b",
+          "match": "(?i)\\b((cubic\\s+(centi)?|square\\s+(kilo)?|centi|kilo)met(er|re)s|square\\s+(yards|feet|miles)|cubic\\s+(yards|feet|inches)|miles|inches|lit(re|er)s|gallons|quarts|(kilo)?grams|ounces|pounds|degrees\\s+(Celsius|Fahrenheit|Kelvin))\\b",
           "name": "support.class.built-in.unit.applescript"
         },
         {
@@ -1040,8 +1026,7 @@
               "name": "punctuation.definition.array.begin.applescript"
             }
           },
-          "comment": "We cannot necessarily distinguish \"records\" from \"arrays\", and so this could be either.",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.array.end.applescript"
@@ -1150,7 +1135,7 @@
               "name": "support.class.built-in.applescript"
             }
           },
-          "match": "(«)(data) (utxt|utf8)([[:xdigit:]]*)(»)(?:\\s+(as)\\s+(?i:Unicode\\s+text))?",
+          "match": "(«)(data) (ut(?:xt|f8))(\\h*)(»)(?:\\s+(as)\\s+(?i:Unicode\\s+text))?",
           "name": "constant.other.data.utxt.applescript"
         },
         {
@@ -1352,7 +1337,7 @@
           "name": "support.function.system-events.folder-actions.applescript"
         },
         {
-          "match": "\\b(movie data|movie file)\\b",
+          "match": "\\b(movie (?:data|file))\\b",
           "name": "support.class.system-events.movie-file.applescript"
         },
         {
@@ -1360,7 +1345,7 @@
           "name": "support.function.system-events.power.applescript"
         },
         {
-          "match": "\\b(((application |desk accessory )?process|(check|combo )?box)(es)?|(action|attribute|browser|(busy|progress|relevance) indicator|color well|column|drawer|group|grow area|image|incrementor|list|menu( bar)?( item)?|(menu |pop up |radio )?button|outline|(radio|tab|splitter) group|row|scroll (area|bar)|sheet|slider|splitter|static text|table|text (area|field)|tool bar|UI element|window)s?)\\b",
+          "match": "\\b(((application |desk accessory )?process|(c(?:heck|ombo ))?box)(es)?|(action|attribute|browser|(busy|progress|relevance) indicator|color well|column|drawer|group|grow area|image|incrementor|list|menu( bar)?( item)?|(menu |pop up |radio )?button|outline|(radio|tab|splitter) group|row|scroll (area|bar)|sheet|slider|splitter|static text|table|text (area|field)|tool bar|UI element|window)s?)\\b",
           "name": "support.class.system-events.processes.applescript"
         },
         {
diff --git a/resources/languages/ara.json b/resources/languages/ara.json
index dcd2397..9b11136 100644
--- a/resources/languages/ara.json
+++ b/resources/languages/ara.json
@@ -91,7 +91,6 @@
       "patterns": [
         {
           "begin": "(?i)(?=\\\\?[a-z_0-9\\\\]+\\\\[a-z_][a-z0-9_]*\\s*(\\(|(::<)))",
-          "comment": "Functions in a user-defined namespace (overrides any built-ins)",
           "end": "(?=\\s*(\\(|(::<)))",
           "patterns": [
             {
@@ -106,7 +105,6 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "comment": "Root namespace function calls (built-in or user)",
           "end": "(?=\\s*(\\(|(::<)))",
           "patterns": [
             {
@@ -119,18 +117,15 @@
     "interpolation": {
       "patterns": [
         {
-          "comment": "Interpolating octal values e.g. \\01 or \\07.",
           "match": "\\\\[0-7]{1,3}",
           "name": "constant.numeric.octal.ara"
         },
         {
-          "comment": "Interpolating hex values e.g. \\x1 or \\xFF.",
-          "match": "\\\\x[0-9A-Fa-f]{1,2}",
+          "match": "\\\\x\\h{1,2}",
           "name": "constant.numeric.hex.ara"
         },
         {
-          "comment": "Escaped characters in double-quoted strings e.g. \\n or \\t.",
-          "match": "\\\\[nrt\\\\\\$\\\"]",
+          "match": "\\\\[nrt\\\\$\"]",
           "name": "constant.character.escape.ara"
         }
       ]
@@ -164,7 +159,7 @@
           "name": "punctuation.separator.colon.ara"
         }
       },
-      "match": "(?i)(?<=^|\\(|,)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(:)(?!:)"
+      "match": "(?i)(?<=^|[(,])\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)\\s*(:)(?!:)"
     },
     "namespace": {
       "begin": "(?i)((namespace)|[a-z0-9_]+)?(\\\\)(?=.*?[^a-z_0-9\\\\])",
@@ -196,7 +191,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "0[xX][0-9a-fA-F]+(?:_[0-9a-fA-F]+)*",
+          "match": "0[xX]\\h+(?:_\\h+)*",
           "name": "constant.numeric.hex.ara"
         },
         {
@@ -232,28 +227,23 @@
     "operators": {
       "patterns": [
         {
-          "comment": "assignment operators",
           "match": "(\\+=|-=|\\*=|/=|%=|\\^=|&&=|<=|>=|&=|\\|=|<<=|>>=|\\?\\?=)",
           "name": "keyword.assignments.ara"
         },
         {
-          "comment": "logical operators",
-          "match": "(\\^|\\||\\|\\||&&|>>|<<|&|~|<<|>>|>|<|<=>|\\?\\?|\\?|:|\\?:)(?!=)",
+          "match": "([\\^|]|\\|\\||&&|>>|<<|[\\&~]|<<|>>|[><]|<=>|\\?\\?|[?:]|\\?:)(?!=)",
           "name": "keyword.operators.ara"
         },
         {
-          "comment": "comparison operators",
-          "match": "(==|===|!==|!=|<=|>=|<|>)(?!=)",
+          "match": "(==|===|!==|!=|<=|>=|[<>])(?!=)",
           "name": "keyword.operator.comparison.ara"
         },
         {
-          "comment": "math operators",
           "match": "(([+%]|(\\*(?!\\w)))(?!=))|(-(?!>))|(/(?!/))",
           "name": "keyword.operator.math.ara"
         },
         {
-          "comment": "single equal assignment operator",
-          "match": "(?<![<>])=(?!=|>)",
+          "match": "(?<![<>])=(?![=>])",
           "name": "keyword.operator.assignment.ara"
         },
         {
@@ -280,36 +270,29 @@
               "name": "punctuation.brackets.curly.ara"
             }
           },
-          "comment": "less than, greater than (special case)",
-          "match": "(?:\\b|(?:(\\))|(\\])|(\\})))[ \\t]+([<>])[ \\t]+(?:\\b|(?:(\\()|(\\[)|(\\{)))"
+          "match": "(?:\\b|(?:(\\))|(])|(})))[ \\t]+([<>])[ \\t]+(?:\\b|(?:(\\()|(\\[)|(\\{)))"
         },
         {
-          "comment": "arrow method call, arrow property access",
           "match": "(?:->|\\?->)",
           "name": "keyword.operator.arrow.ara"
         },
         {
-          "comment": "double arrow key-value pair",
-          "match": "(?:=>)",
+          "match": "=>",
           "name": "keyword.operator.double-arrow.ara"
         },
         {
-          "comment": "static method call, static property access",
-          "match": "(?:::)",
+          "match": "::",
           "name": "keyword.operator.static.ara"
         },
         {
-          "comment": "closure creation",
-          "match": "(?:\\(\\.\\.\\.\\))",
+          "match": "\\(\\.\\.\\.\\)",
           "name": "keyword.operator.closure.ara"
         },
         {
-          "comment": "spread operator",
-          "match": "(?:\\.\\.\\.)",
+          "match": "\\.\\.\\.",
           "name": "keyword.operator.spread.ara"
         },
         {
-          "comment": "namespace operator",
           "match": "\\\\",
           "name": "keyword.operator.namespace.ara"
         }
diff --git a/resources/languages/asciidoc.json b/resources/languages/asciidoc.json
index a0bfd9e..663bd08 100644
--- a/resources/languages/asciidoc.json
+++ b/resources/languages/asciidoc.json
@@ -50,8 +50,8 @@
     "admonition-paragraph": {
       "patterns": [
         {
-          "begin": "(?=(?>(?:^\\[(NOTE|TIP|IMPORTANT|WARNING|CAUTION)((?:,|#|\\.|%)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|====)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(NOTE|TIP|IMPORTANT|WARNING|CAUTION)([,#.%][^\\]]+)*]$))",
+          "end": "((?<=--|====)$|^\\p{blank}*$)",
           "name": "markup.admonition.asciidoc",
           "patterns": [
             {
@@ -64,7 +64,7 @@
                   ]
                 }
               },
-              "match": "^\\[(NOTE|TIP|IMPORTANT|WARNING|CAUTION)((?:,|#|\\.|%)([^,\\]]+))*\\]$"
+              "match": "^\\[(NOTE|TIP|IMPORTANT|WARNING|CAUTION)([,#.%]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -74,7 +74,6 @@
             },
             {
               "begin": "^(={4,})\\s*$",
-              "comment": "example block",
               "end": "(?<=\\1)",
               "patterns": [
                 {
@@ -87,7 +86,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "end": "(?<=\\1)",
               "patterns": [
                 {
@@ -101,13 +99,13 @@
           ]
         },
         {
-          "begin": "^(NOTE|TIP|IMPORTANT|WARNING|CAUTION)\\:\\p{Blank}+",
+          "begin": "^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):\\p{blank}+",
           "captures": {
             "1": {
               "name": "entity.name.function.asciidoc"
             }
           },
-          "end": "^\\p{Blank}*$",
+          "end": "^\\p{blank}*$",
           "name": "markup.admonition.asciidoc",
           "patterns": [
             {
@@ -134,7 +132,7 @@
               "name": "support.constant.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(?:(\\[{2})([\\p{Alpha}:_][\\p{Word}:.-]*)(?:,\\p{Blank}*(\\S.*?))?(\\]{2}))",
+          "match": "(?<!\\\\)(\\[{2})([[:alpha:]:_][[:word:]:.-]*)(?:,\\p{blank}*(\\S.*?))?(]{2})",
           "name": "markup.other.anchor.asciidoc"
         },
         {
@@ -149,7 +147,7 @@
               "name": "string.unquoted.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(anchor):(\\S+)\\[(.*?[^\\\\])?\\]",
+          "match": "(?<!\\\\)(anchor):(\\S+)\\[(.*?[^\\\\])?]",
           "name": "markup.other.anchor.asciidoc"
         }
       ]
@@ -157,7 +155,7 @@
     "attribute-entry": {
       "patterns": [
         {
-          "begin": "^(:)(!?\\w.*?)(:)(\\p{Blank}+.+\\p{Blank}(?:\\+|\\\\))$",
+          "begin": "^(:)(!?\\w.*?)(:)(\\p{blank}+.+\\p{blank}[+\\\\])$",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.attribute-entry.asciidoc"
@@ -187,7 +185,7 @@
             }
           },
           "contentName": "string.unquoted.attribute-value.asciidoc",
-          "end": "^\\p{Blank}+.+$(?<!\\+|\\\\)|^\\p{Blank}*$",
+          "end": "^(?:\\p{blank}+.+$(?<![+\\\\])|\\p{blank}*$)",
           "endCaptures": {
             "0": {
               "name": "string.unquoted.attribute-value.asciidoc"
@@ -232,7 +230,7 @@
               ]
             }
           },
-          "match": "^(:)(!?\\w.*?)(:)(\\p{Blank}+(.*))?$",
+          "match": "^(:)(!?\\w.*?)(:)(\\p{blank}+(.*))?$",
           "name": "meta.definition.attribute-entry.asciidoc"
         }
       ]
@@ -257,11 +255,11 @@
               "name": "string.unquoted.attribute-value.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(\\{)(set|counter2?)(:)([\\p{Alnum}\\-_!]+)((:)(.*?))?(?<!\\\\)(\\})",
+          "match": "(?<!\\\\)(\\{)(set|counter2?)(:)([[:alnum:]\\-_!]+)((:)(.*?))?(?<!\\\\)(})",
           "name": "markup.substitution.attribute-reference.asciidoc"
         },
         {
-          "match": "(?<!\\\\)(\\{)(\\w+(?:[\\-]\\w+)*)(?<!\\\\)(\\})",
+          "match": "(?<!\\\\)(\\{)(\\w+(?:-\\w+)*)(?<!\\\\)(})",
           "name": "markup.substitution.attribute-reference.asciidoc"
         }
       ]
@@ -280,7 +278,7 @@
               "name": "support.constant.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(\\[{3})([\\p{Word}:][\\p{Word}:.-]*?)(\\]{3})",
+          "match": "(?<!\\\\)(\\[{3})([[:word:]:][[:word:]:.-]*?)(]{3})",
           "name": "bibliography-anchor.asciidoc"
         }
       ]
@@ -298,7 +296,7 @@
             }
           },
           "contentName": "string.unquoted.asciidoc",
-          "end": "\\]|^$",
+          "end": "]|^$",
           "name": "markup.macro.inline.bibtex.asciidoc"
         }
       ]
@@ -315,7 +313,7 @@
               ]
             }
           },
-          "match": "^\\[(|\\p{Blank}*[\\p{Word}\\{,.#\"'%].*)\\]$",
+          "match": "^\\[(|\\p{blank}*[[:word:]{,.#\"'%].*)]$",
           "name": "markup.heading.block-attribute.asciidoc"
         }
       ]
@@ -323,7 +321,6 @@
     "block-attribute-inner": {
       "patterns": [
         {
-          "comment": "separators",
           "match": "([,.#%])",
           "name": "punctuation.separator.asciidoc"
         },
@@ -338,7 +335,6 @@
               ]
             }
           },
-          "comment": "blockname",
           "match": "(?<=\\[)([^\\[\\],.#%=]+)"
         },
         {
@@ -351,8 +347,7 @@
               ]
             }
           },
-          "comment": "attributes",
-          "match": "(?<=\\{|,|.|#|\"|'|%)([^\\],.#%]+)",
+          "match": "(?<=[{,]|.|[#\"'%])([^\\],.#%]+)",
           "name": "markup.meta.attribute-list.asciidoc"
         }
       ]
@@ -371,7 +366,7 @@
               "name": "constant.other.symbol.asciidoc"
             }
           },
-          "match": "(?:(?:\\/\\/|#|--|;;) ?)?( )?(?<!\\\\)(<)!?(--|)(\\d+)\\3(>)(?=(?: ?<!?\\3\\d+\\3>)*$)",
+          "match": "(?:(?://|#|--|;;) ?)?( )?(?<!\\\\)(<)!?(--|)(\\d+)\\3(>)(?=(?: ?<!?\\3\\d+\\3>)*$)",
           "name": "callout.source.code.asciidoc"
         }
       ]
@@ -379,7 +374,7 @@
     "block-title": {
       "patterns": [
         {
-          "begin": "^\\.([^\\p{Blank}.].*)",
+          "begin": "^\\.([^[:blank:].].*)",
           "captures": {
             "1": {
               "name": "markup.heading.blocktitle.asciidoc"
@@ -447,7 +442,7 @@
               ]
             }
           },
-          "match": "^(<)(\\d+)(>)\\p{Blank}+(.*)$",
+          "match": "^(<)(\\d+)(>)\\p{blank}+(.*)$",
           "name": "callout.asciidoc"
         }
       ]
@@ -489,8 +484,8 @@
     "comment-paragraph": {
       "patterns": [
         {
-          "begin": "(?=(?>(?:^\\[(comment)((?:,|#|\\.|%)[^\\]]+)*\\]$)))",
-          "end": "((?<=--)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(comment)([,#.%][^\\]]+)*]$))",
+          "end": "((?<=--)$|^\\p{blank}*$)",
           "name": "comment.block.asciidoc",
           "patterns": [
             {
@@ -503,14 +498,13 @@
                   ]
                 }
               },
-              "match": "^\\[(comment)((?:,|#|\\.|%)([^,\\]]+))*\\]$"
+              "match": "^\\[(comment)([,#.%]([^,\\]]+))*]$"
             },
             {
               "include": "#block-title"
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "end": "^(\\1)$",
               "patterns": [
                 {
@@ -545,7 +539,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<!\\\\\\\\)(\\[(?:[^\\]]+?)\\])?((__)((?!_).+?)(__))",
+          "match": "(?<!\\\\\\\\)(\\[[^\\]]+?])?((__)((?!_).+?)(__))",
           "name": "markup.emphasis.unconstrained.asciidoc"
         },
         {
@@ -563,7 +557,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?!_{4,}\\s*$)(?<=^|[^\\p{Word};:])(\\[(?:[^\\]]+?)\\])?((_)(\\S|\\S.*?\\S)(_))(?!\\p{Word})",
+          "match": "(?!_{4,}\\s*$)(?<=^|[^[:word:];:])(\\[[^\\]]+?])?((_)(\\S(?:|.*?\\S))(_))(?!\\p{word})",
           "name": "markup.emphasis.constrained.asciidoc"
         }
       ]
@@ -571,8 +565,8 @@
     "example-paragraph": {
       "patterns": [
         {
-          "begin": "(?=(?>(?:^\\[(example)((?:,|#|\\.|%)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|====)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(example)([,#.%][^\\]]+)*]$))",
+          "end": "((?<=--|====)$|^\\p{blank}*$)",
           "name": "markup.block.example.asciidoc",
           "patterns": [
             {
@@ -585,14 +579,13 @@
                   ]
                 }
               },
-              "match": "^\\[(example)((?:,|#|\\.|%)([^,\\]]+))*\\]$"
+              "match": "^\\[(example)([,#.%]([^,\\]]+))*]$"
             },
             {
               "include": "#block-title"
             },
             {
               "begin": "^(={4,})$",
-              "comment": "example block",
               "end": "^(\\1)$",
               "patterns": [
                 {
@@ -602,7 +595,6 @@
             },
             {
               "begin": "^(-{2})$",
-              "comment": "open block",
               "end": "^(\\1)$",
               "patterns": [
                 {
@@ -630,7 +622,7 @@
     "footnote-macro": {
       "patterns": [
         {
-          "begin": "(?<!\\\\)footnote(?:(ref):|:([\\w-]+)?)\\[(?:|(.*?[^\\\\]))\\]",
+          "begin": "(?<!\\\\)footnote(?:(ref):|:([\\w-]+)?)\\[(?:|(.*?[^\\\\]))",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.asciidoc"
@@ -640,7 +632,7 @@
             }
           },
           "contentName": "string.unquoted.asciidoc",
-          "end": "\\]|^$",
+          "end": "]|^$",
           "name": "markup.other.footnote.asciidoc",
           "patterns": [
             {
@@ -697,7 +689,7 @@
               "name": "punctuation.separator.asciidoc"
             }
           },
-          "match": "^(\\p{Word}+)(::)(\\S*?)(\\[)((?:\\\\\\]|[^\\]])*?)(\\])$",
+          "match": "^(\\p{word}+)(::)(\\S*?)(\\[)((?:\\\\]|[^\\]])*?)(])$",
           "name": "markup.macro.block.general.asciidoc"
         }
       ]
@@ -710,14 +702,14 @@
               "name": "constant.other.symbol.hard-break.asciidoc"
             }
           },
-          "match": "(?<=\\S)\\p{Blank}+(\\+ \\\\)$"
+          "match": "(?<=\\S)\\p{blank}+(\\+ \\\\)$"
         }
       ]
     },
     "horizontal-rule": {
       "patterns": [
         {
-          "match": "^(?:'|<){3,}$|^ {0,3}([-\\*'])( *)\\1\\2\\1$",
+          "match": "^(?:['<]{3,}$| {0,3}([-*'])( *)\\1\\2\\1$)",
           "name": "constant.other.symbol.horizontal-rule.asciidoc"
         }
       ]
@@ -736,7 +728,7 @@
               "name": "string.unquoted.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(image|icon):([^:\\[][^\\[]*)\\[((?:\\\\\\]|[^\\]])*?)\\]",
+          "match": "(?<!\\\\)(i(?:mage|con)):([^:\\[][^\\[]*)\\[((?:\\\\]|[^\\]])*?)]",
           "name": "markup.macro.image.asciidoc"
         }
       ]
@@ -774,7 +766,7 @@
               "name": "punctuation.separator.asciidoc"
             }
           },
-          "match": "^(include)(::)([^\\[]+)(\\[)(.*?)(\\])$"
+          "match": "^(include)(::)([^\\[]+)(\\[)(.*?)(])$"
         }
       ]
     },
@@ -856,7 +848,7 @@
               "name": "string.unquoted.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(kbd|btn):(\\[)((?:\\\\\\]|[^\\]])+?)(\\])",
+          "match": "(?<!\\\\)(kbd|btn):(\\[)((?:\\\\]|[^\\]])+?)(])",
           "name": "markup.macro.kbd.asciidoc"
         }
       ]
@@ -864,22 +856,18 @@
     "keywords": {
       "patterns": [
         {
-          "comment": "Admonition",
           "match": "(NOTE|TIP|IMPORTANT|WARNING|CAUTION)",
           "name": "entity.name.function.asciidoc"
         },
         {
-          "comment": "Paragraph or verbatim",
           "match": "(comment|example|literal|listing|normal|pass|quote|sidebar|source|verse|abstract|partintro)",
           "name": "entity.name.function.asciidoc"
         },
         {
-          "comment": "Diagram",
-          "match": "(actdiag|blockdiag|ditaa|graphviz|meme|mermaid|nwdiag|packetdiag|pikchr|plantuml|rackdiag|seqdiag|shaape|wavedrom)",
+          "match": "(actdiag|blockdiag|ditaa|graphviz|tikz|meme|mermaid|nwdiag|packetdiag|pikchr|plantuml|rackdiag|seqdiag|shaape|wavedrom)",
           "name": "entity.name.function.asciidoc"
         },
         {
-          "comment": "Others",
           "match": "(sect[1-4]|preface|colophon|dedication|glossary|bibliography|synopsis|appendix|index|normal|partintro|music|latex|stem)",
           "name": "entity.name.function.asciidoc"
         }
@@ -893,7 +881,7 @@
               "name": "variable.line-break.asciidoc"
             }
           },
-          "match": "(?<=\\S)\\p{Blank}+(\\+)$"
+          "match": "(?<=\\S)\\p{blank}+(\\+)$"
         }
       ]
     },
@@ -905,7 +893,7 @@
               "name": "variable.line-break.asciidoc"
             }
           },
-          "match": "(?<=\\S)\\p{Blank}+(\\\\)$"
+          "match": "(?<=\\S)\\p{blank}+(\\\\)$"
         }
       ]
     },
@@ -925,7 +913,7 @@
               "name": "string.unquoted.asciidoc"
             }
           },
-          "match": "(?:^|<|[\\s>\\(\\)\\[\\];])((?<!\\\\)(?:https?|file|ftp|irc)://[^\\s\\[\\]<]*[^\\s.,\\[\\]<\\)])(?:\\[((?:\\\\\\]|[^\\]])*?)\\])?",
+          "match": "(?:^|[<\\s>()\\[\\];])((?<!\\\\)(?:https?|file|ftp|irc)://[^\\s\\[\\]<]*[^\\s.,\\[\\]<)])(?:\\[((?:\\\\]|[^\\]])*?)])?",
           "name": "markup.other.url.asciidoc"
         },
         {
@@ -937,7 +925,7 @@
               "name": "string.unquoted.asciidoc"
             }
           },
-          "match": "(?:^|<|[\\p{Blank}>\\(\\)\\[\\];])((?<!\\\\)\\{uri-\\w+(?:[\\-]\\w+)*(?<!\\\\)\\})(?:\\[((?:\\\\\\]|[^\\]])*?)\\])",
+          "match": "(?:^|[<[:blank:]>()\\[\\];])((?<!\\\\)\\{uri-\\w+(?:-\\w+)*(?<!\\\\)})\\[((?:\\\\]|[^\\]])*?)]",
           "name": "markup.other.url.asciidoc"
         },
         {
@@ -957,11 +945,11 @@
               "name": "string.unquoted.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(link|mailto):([^\\s\\[]+)(?:\\[((?:\\\\\\]|[^\\]])*?)\\])",
+          "match": "(?<!\\\\)(link|mailto):([^\\s\\[]+)\\[((?:\\\\]|[^\\]])*?)]",
           "name": "markup.other.url.asciidoc"
         },
         {
-          "match": "\\p{Word}[\\p{Word}.%+-]*(@)\\p{Alnum}[\\p{Alnum}.-]*(\\.)\\p{Alpha}{2,4}\\b",
+          "match": "\\p{word}[[:word:].%+-]*(@)\\p{alnum}[[:alnum:].-]*(\\.)\\p{alpha}{2,4}\\b",
           "name": "markup.link.email.asciidoc"
         }
       ]
@@ -977,7 +965,7 @@
               "name": "markup.todo.box.asciidoc"
             }
           },
-          "match": "^\\s*(-)\\p{Blank}(\\[[\\p{Blank}\\*x]\\])(?=\\p{Blank})",
+          "match": "^\\s*(-)\\p{blank}(\\[[[:blank:]*x]])(?=\\p{blank})",
           "name": "markup.todo.asciidoc"
         },
         {
@@ -986,7 +974,7 @@
               "name": "markup.list.bullet.asciidoc"
             }
           },
-          "match": "^\\p{Blank}*(-|\\*{1,5}|\\u2022{1,5})(?=\\p{Blank})",
+          "match": "^\\p{blank}*(-|\\*{1,5}|•{1,5})(?=\\p{blank})",
           "name": "markup.list.asciidoc"
         },
         {
@@ -995,7 +983,7 @@
               "name": "markup.list.bullet.asciidoc"
             }
           },
-          "match": "^\\p{Blank}*(\\.{1,5}|\\d+\\.|[a-zA-Z]\\.|[IVXivx]+\\))(?=\\p{Blank})",
+          "match": "^\\p{blank}*(\\.{1,5}|\\d+\\.|[a-zA-Z]\\.|[IVXivx]+\\))(?=\\p{blank})",
           "name": "markup.list.asciidoc"
         },
         {
@@ -1014,7 +1002,7 @@
               "name": "markup.list.bullet.asciidoc"
             }
           },
-          "match": "^\\p{Blank}*(.*?\\S)(:{2,4}|;;)($|\\p{Blank}+)",
+          "match": "^\\p{blank}*(.*?\\S)(:{2,4}|;;)($|\\p{blank}+)",
           "name": "markup.heading.list.asciidoc"
         }
       ]
@@ -1022,8 +1010,8 @@
     "listing-paragraph": {
       "patterns": [
         {
-          "begin": "(?=(?>(?:^\\[(listing)((?:,|#|\\.|%)[^\\]]+)*\\]$)))",
-          "end": "((?<=--)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(listing)([,#.%][^\\]]+)*]$))",
+          "end": "((?<=--)$|^\\p{blank}*$)",
           "name": "markup.block.listing.asciidoc",
           "patterns": [
             {
@@ -1036,19 +1024,17 @@
                   ]
                 }
               },
-              "match": "^\\[(listing)((?:,|#|\\.|%)([^,\\]]+))*\\]$"
+              "match": "^\\[(listing)([,#.%]([^,\\]]+))*]$"
             },
             {
               "include": "#block-title"
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "end": "^(\\1)$"
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "end": "^(\\1)$"
             },
             {
@@ -1061,8 +1047,8 @@
     "literal-paragraph": {
       "patterns": [
         {
-          "begin": "(?=(?>(?:^\\[(literal)((?:,|#|\\.|%)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(literal)([,#.%][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.block.literal.asciidoc",
           "patterns": [
             {
@@ -1075,19 +1061,17 @@
                   ]
                 }
               },
-              "match": "^\\[(literal)((?:,|#|\\.|%)([^,\\]]+))*\\]$"
+              "match": "^\\[(literal)([,#.%]([^,\\]]+))*]$"
             },
             {
               "include": "#block-title"
             },
             {
               "begin": "^(\\.{4,})$",
-              "comment": "literal block",
               "end": "^(\\1)$"
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "end": "^(\\1)$"
             },
             {
@@ -1119,7 +1103,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<!\\\\\\\\)(\\[[^\\]]+?\\])((##)(.+?)(##))",
+          "match": "(?<!\\\\\\\\)(\\[[^\\]]+?])((##)(.+?)(##))",
           "name": "markup.mark.unconstrained.asciidoc"
         },
         {
@@ -1152,7 +1136,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<![\\\\;:\\p{Word}#])(\\[[^\\]]+?\\])((#)(\\S|\\S.*?\\S)(#)(?!\\p{Word}))",
+          "match": "(?<![\\\\;:[:word:]#])(\\[[^\\]]+?])((#)(\\S(?:|.*?\\S))(#)(?!\\p{word}))",
           "name": "markup.mark.constrained.asciidoc"
         },
         {
@@ -1170,7 +1154,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<![\\\\;:\\p{Word}#])(\\[[^\\]]+?\\])?((#)(\\S|\\S.*?\\S)(#)(?!\\p{Word}))",
+          "match": "(?<![\\\\;:[:word:]#])(\\[[^\\]]+?])?((#)(\\S(?:|.*?\\S))(#)(?!\\p{word}))",
           "name": "markup.mark.constrained.asciidoc"
         }
       ]
@@ -1189,7 +1173,7 @@
               "name": "string.unquoted.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(menu):(\\p{Word}|\\p{Word}.*?\\S)\\[\\p{Blank}*(.+?)?\\]",
+          "match": "(?<!\\\\)(menu):(\\p{word}(?:|.*?\\S))\\[\\p{blank}*(.+?)?]",
           "name": "markup.other.menu.asciidoc"
         }
       ]
@@ -1211,7 +1195,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(\\[.+?\\])?((``)(.+?)(``))",
+          "match": "(?<!\\\\)(\\[.+?])?((``)(.+?)(``))",
           "name": "markup.monospace.unconstrained.asciidoc"
         },
         {
@@ -1229,7 +1213,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<![\\\\;:\\p{Word}\"'`])(\\[.+?\\])?((`)(\\S|\\S.*?\\S)(`))(?![\\p{Word}\"'`])",
+          "match": "(?<![\\\\;:[:word:]\"'`])(\\[.+?])?((`)(\\S(?:|.*?\\S))(`))(?![[:word:]\"'`])",
           "name": "markup.monospace.constrained.asciidoc"
         }
       ]
@@ -1280,7 +1264,7 @@
               "name": "support.constant.asciidoc"
             }
           },
-          "match": "(?:(?<!\\\\)(\\[([^\\]]+?)\\]))?(?:\\\\{0,2})(?<delim>\\+{2,3}|\\${2})(.*?)(\\k<delim>)",
+          "match": "(?:(?<!\\\\)(\\[([^\\]]+?)]))?\\\\{0,2}(?<delim>\\+{2,3}|\\${2})(.*?)(\\k<delim>)",
           "name": "markup.macro.inline.passthrough.asciidoc"
         },
         {
@@ -1294,7 +1278,7 @@
             }
           },
           "contentName": "string.unquoted.asciidoc",
-          "end": "\\]|^$",
+          "end": "]|^$",
           "name": "markup.macro.inline.passthrough.asciidoc",
           "patterns": [
             {
@@ -1307,8 +1291,8 @@
     "passthrough-paragraph": {
       "patterns": [
         {
-          "begin": "(?=(?>(?:^\\[(pass)((?:,|#|\\.|%)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\+\\+)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(pass)([,#.%][^\\]]+)*]$))",
+          "end": "((?<=--|\\+\\+)$|^\\p{blank}*$)",
           "name": "markup.block.passthrough.asciidoc",
           "patterns": [
             {
@@ -1322,14 +1306,13 @@
                   ]
                 }
               },
-              "match": "^\\[(pass)((?:,|#|\\.|%)([^,\\]]+))*\\]$"
+              "match": "^\\[(pass)([,#.%]([^,\\]]+))*]$"
             },
             {
               "include": "#block-title"
             },
             {
               "begin": "^(\\+{4,})\\s*$",
-              "comment": "passthrough block",
               "end": "(?<=\\1)",
               "patterns": [
                 {
@@ -1339,7 +1322,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "end": "(?<=\\1)",
               "patterns": [
                 {
@@ -1364,8 +1346,8 @@
     "quote-paragraph": {
       "patterns": [
         {
-          "begin": "(?=(?>(?:^\\[(quote|verse)((?:,|#|\\.|%)([^,\\]]+))*\\]$)))",
-          "end": "((?<=____|\"\"|--)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(quote|verse)([,#.%]([^,\\]]+))*]$))",
+          "end": "((?<=____|\"\"|--)$|^\\p{blank}*$)",
           "name": "markup.italic.quotes.asciidoc",
           "patterns": [
             {
@@ -1378,7 +1360,7 @@
                   ]
                 }
               },
-              "match": "^\\[(quote|verse)((?:,|#|\\.|%)([^,\\]]+))*\\]$"
+              "match": "^\\[(quote|verse)([,#.%]([^,\\]]+))*]$"
             },
             {
               "include": "#block-title"
@@ -1387,8 +1369,7 @@
               "include": "#inlines"
             },
             {
-              "begin": "^([_]{4,})\\s*$",
-              "comment": "quotes block",
+              "begin": "^(_{4,})\\s*$",
               "end": "(?<=\\1)",
               "patterns": [
                 {
@@ -1401,7 +1382,6 @@
             },
             {
               "begin": "^(\"{2})\\s*$",
-              "comment": "air quotes",
               "end": "(?<=\\1)",
               "patterns": [
                 {
@@ -1414,7 +1394,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "end": "(?<=\\1)$",
               "patterns": [
                 {
@@ -1441,8 +1420,8 @@
           ]
         },
         {
-          "begin": "^\\p{Blank}*(>) ",
-          "end": "^\\p{Blank}*?$",
+          "begin": "^\\p{blank}*(>) ",
+          "end": "^\\p{blank}*?$",
           "name": "markup.italic.quotes.asciidoc",
           "patterns": [
             {
@@ -1458,8 +1437,8 @@
     "sidebar-paragraph": {
       "patterns": [
         {
-          "begin": "(?=(?>(?:^\\[(sidebar)((?:,|#|\\.|%)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\*\\*\\*\\*)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(sidebar)([,#.%][^\\]]+)*]$))",
+          "end": "((?<=--|\\*\\*\\*\\*)$|^\\p{blank}*$)",
           "name": "markup.block.sidebar.asciidoc",
           "patterns": [
             {
@@ -1472,14 +1451,13 @@
                   ]
                 }
               },
-              "match": "^\\[(sidebar)((?:,|#|\\.|%)([^,\\]]+))*\\]$"
+              "match": "^\\[(sidebar)([,#.%]([^,\\]]+))*]$"
             },
             {
               "include": "#block-title"
             },
             {
               "begin": "^(\\*{4,})$",
-              "comment": "sidebar block",
               "end": "^(\\1)$",
               "patterns": [
                 {
@@ -1489,7 +1467,6 @@
             },
             {
               "begin": "^(-{2})$",
-              "comment": "open block",
               "end": "^(\\1)$",
               "patterns": [
                 {
@@ -1517,8 +1494,8 @@
     "source-asciidoctor": {
       "patterns": [
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(c))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(c))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.c.asciidoc",
           "patterns": [
             {
@@ -1532,7 +1509,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(c))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(c))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -1542,7 +1519,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.c",
               "end": "^(\\1)$",
               "patterns": [
@@ -1559,7 +1535,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.c",
               "end": "^(\\1)$",
               "patterns": [
@@ -1576,7 +1551,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.c",
               "end": "^(\\1)$",
               "patterns": [
@@ -1594,8 +1568,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(clojure))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(clojure))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.clojure.asciidoc",
           "patterns": [
             {
@@ -1609,7 +1583,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(clojure))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(clojure))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -1619,7 +1593,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.clojure",
               "end": "^(\\1)$",
               "patterns": [
@@ -1636,7 +1609,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.clojure",
               "end": "^(\\1)$",
               "patterns": [
@@ -1653,7 +1625,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.clojure",
               "end": "^(\\1)$",
               "patterns": [
@@ -1671,8 +1642,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(coffee-?(script)?))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(coffee-?(script)?))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.coffee.asciidoc",
           "patterns": [
             {
@@ -1686,7 +1657,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(coffee-?(script)?))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(coffee-?(script)?))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -1696,7 +1667,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.coffee",
               "end": "^(\\1)$",
               "patterns": [
@@ -1713,7 +1683,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.coffee",
               "end": "^(\\1)$",
               "patterns": [
@@ -1730,7 +1699,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.coffee",
               "end": "^(\\1)$",
               "patterns": [
@@ -1748,8 +1716,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(c(pp|\\+\\+)))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(c(pp|\\+\\+)))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.cpp.asciidoc",
           "patterns": [
             {
@@ -1763,7 +1731,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(c(pp|\\+\\+)))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(c(pp|\\+\\+)))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -1773,7 +1741,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.cpp",
               "end": "^(\\1)$",
               "patterns": [
@@ -1790,7 +1757,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.cpp",
               "end": "^(\\1)$",
               "patterns": [
@@ -1807,7 +1773,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.cpp",
               "end": "^(\\1)$",
               "patterns": [
@@ -1825,8 +1790,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(css))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(css))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.css.asciidoc",
           "patterns": [
             {
@@ -1840,7 +1805,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(css))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(css))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -1850,7 +1815,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.css",
               "end": "^(\\1)$",
               "patterns": [
@@ -1867,7 +1831,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.css",
               "end": "^(\\1)$",
               "patterns": [
@@ -1884,7 +1847,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.css",
               "end": "^(\\1)$",
               "patterns": [
@@ -1902,8 +1864,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(cs(harp)?))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(cs(harp)?))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.cs.asciidoc",
           "patterns": [
             {
@@ -1917,7 +1879,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(cs(harp)?))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(cs(harp)?))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -1927,7 +1889,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.cs",
               "end": "^(\\1)$",
               "patterns": [
@@ -1944,7 +1905,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.cs",
               "end": "^(\\1)$",
               "patterns": [
@@ -1961,7 +1921,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.cs",
               "end": "^(\\1)$",
               "patterns": [
@@ -1979,8 +1938,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(diff|patch|rej))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(diff|patch|rej))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.diff.asciidoc",
           "patterns": [
             {
@@ -1994,7 +1953,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(diff|patch|rej))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(diff|patch|rej))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2004,7 +1963,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.diff",
               "end": "^(\\1)$",
               "patterns": [
@@ -2021,7 +1979,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.diff",
               "end": "^(\\1)$",
               "patterns": [
@@ -2038,7 +1995,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.diff",
               "end": "^(\\1)$",
               "patterns": [
@@ -2056,8 +2012,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(docker(file)?))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(docker(file)?))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.dockerfile.asciidoc",
           "patterns": [
             {
@@ -2071,7 +2027,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(docker(file)?))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(docker(file)?))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2081,7 +2037,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.dockerfile",
               "end": "^(\\1)$",
               "patterns": [
@@ -2098,7 +2053,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.dockerfile",
               "end": "^(\\1)$",
               "patterns": [
@@ -2115,7 +2069,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.dockerfile",
               "end": "^(\\1)$",
               "patterns": [
@@ -2133,8 +2086,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(elixir))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(elixir))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.elixir.asciidoc",
           "patterns": [
             {
@@ -2148,7 +2101,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(elixir))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(elixir))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2158,7 +2111,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.elixir",
               "end": "^(\\1)$",
               "patterns": [
@@ -2175,7 +2127,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.elixir",
               "end": "^(\\1)$",
               "patterns": [
@@ -2192,7 +2143,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.elixir",
               "end": "^(\\1)$",
               "patterns": [
@@ -2210,8 +2160,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(elm))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(elm))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.elm.asciidoc",
           "patterns": [
             {
@@ -2225,7 +2175,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(elm))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(elm))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2235,7 +2185,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.elm",
               "end": "^(\\1)$",
               "patterns": [
@@ -2252,7 +2201,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.elm",
               "end": "^(\\1)$",
               "patterns": [
@@ -2269,7 +2217,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.elm",
               "end": "^(\\1)$",
               "patterns": [
@@ -2287,8 +2234,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(erlang))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(erlang))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.erlang.asciidoc",
           "patterns": [
             {
@@ -2302,7 +2249,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(erlang))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(erlang))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2312,7 +2259,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.erlang",
               "end": "^(\\1)$",
               "patterns": [
@@ -2329,7 +2275,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.erlang",
               "end": "^(\\1)$",
               "patterns": [
@@ -2346,7 +2291,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.erlang",
               "end": "^(\\1)$",
               "patterns": [
@@ -2364,8 +2308,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(go(lang)?))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(go(lang)?))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.go.asciidoc",
           "patterns": [
             {
@@ -2379,7 +2323,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(go(lang)?))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(go(lang)?))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2389,7 +2333,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.go",
               "end": "^(\\1)$",
               "patterns": [
@@ -2406,7 +2349,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.go",
               "end": "^(\\1)$",
               "patterns": [
@@ -2423,7 +2365,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.go",
               "end": "^(\\1)$",
               "patterns": [
@@ -2441,8 +2382,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(groovy))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(groovy))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.groovy.asciidoc",
           "patterns": [
             {
@@ -2456,7 +2397,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(groovy))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(groovy))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2466,7 +2407,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.groovy",
               "end": "^(\\1)$",
               "patterns": [
@@ -2483,7 +2423,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.groovy",
               "end": "^(\\1)$",
               "patterns": [
@@ -2500,7 +2439,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.groovy",
               "end": "^(\\1)$",
               "patterns": [
@@ -2518,8 +2456,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(haskell))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(haskell))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.haskell.asciidoc",
           "patterns": [
             {
@@ -2533,7 +2471,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(haskell))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(haskell))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2543,7 +2481,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.haskell",
               "end": "^(\\1)$",
               "patterns": [
@@ -2560,7 +2497,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.haskell",
               "end": "^(\\1)$",
               "patterns": [
@@ -2577,7 +2513,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.haskell",
               "end": "^(\\1)$",
               "patterns": [
@@ -2595,8 +2530,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(html))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(html))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.html.basic.asciidoc",
           "patterns": [
             {
@@ -2610,7 +2545,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(html))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(html))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2620,7 +2555,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "text.embedded.html.basic",
               "end": "^(\\1)$",
               "patterns": [
@@ -2637,7 +2571,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "text.embedded.html.basic",
               "end": "^(\\1)$",
               "patterns": [
@@ -2654,7 +2587,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "text.embedded.html.basic",
               "end": "^(\\1)$",
               "patterns": [
@@ -2672,8 +2604,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(java))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(java))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.java.asciidoc",
           "patterns": [
             {
@@ -2687,7 +2619,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(java))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(java))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2697,7 +2629,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.java",
               "end": "^(\\1)$",
               "patterns": [
@@ -2714,7 +2645,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.java",
               "end": "^(\\1)$",
               "patterns": [
@@ -2731,7 +2661,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.java",
               "end": "^(\\1)$",
               "patterns": [
@@ -2749,8 +2678,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(javascript|js))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(j(?:avascript|s)))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.js.asciidoc",
           "patterns": [
             {
@@ -2764,7 +2693,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(javascript|js))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(j(?:avascript|s)))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2774,7 +2703,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.js",
               "end": "^(\\1)$",
               "patterns": [
@@ -2791,7 +2719,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.js",
               "end": "^(\\1)$",
               "patterns": [
@@ -2808,7 +2735,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.js",
               "end": "^(\\1)$",
               "patterns": [
@@ -2826,8 +2752,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(json))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(json))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.json.asciidoc",
           "patterns": [
             {
@@ -2841,7 +2767,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(json))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(json))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2851,7 +2777,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.json",
               "end": "^(\\1)$",
               "patterns": [
@@ -2868,7 +2793,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.json",
               "end": "^(\\1)$",
               "patterns": [
@@ -2885,7 +2809,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.json",
               "end": "^(\\1)$",
               "patterns": [
@@ -2903,8 +2826,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(jsx))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(jsx))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.js.jsx.asciidoc",
           "patterns": [
             {
@@ -2918,7 +2841,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(jsx))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(jsx))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -2928,7 +2851,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.js.jsx",
               "end": "^(\\1)$",
               "patterns": [
@@ -2945,7 +2867,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.js.jsx",
               "end": "^(\\1)$",
               "patterns": [
@@ -2962,7 +2883,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.js.jsx",
               "end": "^(\\1)$",
               "patterns": [
@@ -2980,8 +2900,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(julia))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(julia))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.julia.asciidoc",
           "patterns": [
             {
@@ -2995,7 +2915,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(julia))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(julia))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3005,7 +2925,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.julia",
               "end": "^(\\1)$",
               "patterns": [
@@ -3022,7 +2941,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.julia",
               "end": "^(\\1)$",
               "patterns": [
@@ -3039,7 +2957,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.julia",
               "end": "^(\\1)$",
               "patterns": [
@@ -3057,8 +2974,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(kotlin|kts?))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(k(?:otlin|ts?)))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.kotlin.asciidoc",
           "patterns": [
             {
@@ -3072,7 +2989,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(kotlin|kts?))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(k(?:otlin|ts?)))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3082,7 +2999,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.kotlin",
               "end": "^(\\1)$",
               "patterns": [
@@ -3099,7 +3015,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.kotlin",
               "end": "^(\\1)$",
               "patterns": [
@@ -3116,7 +3031,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.kotlin",
               "end": "^(\\1)$",
               "patterns": [
@@ -3134,8 +3048,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(less))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(less))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.css.less.asciidoc",
           "patterns": [
             {
@@ -3149,7 +3063,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(less))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(less))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3159,7 +3073,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.css.less",
               "end": "^(\\1)$",
               "patterns": [
@@ -3176,7 +3089,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.css.less",
               "end": "^(\\1)$",
               "patterns": [
@@ -3193,7 +3105,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.css.less",
               "end": "^(\\1)$",
               "patterns": [
@@ -3211,8 +3122,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(make(file)?))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(make(file)?))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.makefile.asciidoc",
           "patterns": [
             {
@@ -3226,7 +3137,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(make(file)?))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(make(file)?))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3236,7 +3147,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.makefile",
               "end": "^(\\1)$",
               "patterns": [
@@ -3253,7 +3163,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.makefile",
               "end": "^(\\1)$",
               "patterns": [
@@ -3270,7 +3179,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.makefile",
               "end": "^(\\1)$",
               "patterns": [
@@ -3288,8 +3196,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(markdown|mdown|md))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(m(?:arkdown|down|d)))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.gfm.asciidoc",
           "patterns": [
             {
@@ -3303,7 +3211,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(markdown|mdown|md))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(m(?:arkdown|down|d)))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3313,7 +3221,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.gfm",
               "end": "^(\\1)$",
               "patterns": [
@@ -3330,7 +3237,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.gfm",
               "end": "^(\\1)$",
               "patterns": [
@@ -3347,7 +3253,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.gfm",
               "end": "^(\\1)$",
               "patterns": [
@@ -3365,8 +3270,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(mustache))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(mustache))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.html.mustache.asciidoc",
           "patterns": [
             {
@@ -3380,7 +3285,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(mustache))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(mustache))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3390,7 +3295,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "text.embedded.html.mustache",
               "end": "^(\\1)$",
               "patterns": [
@@ -3407,7 +3311,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "text.embedded.html.mustache",
               "end": "^(\\1)$",
               "patterns": [
@@ -3424,7 +3327,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "text.embedded.html.mustache",
               "end": "^(\\1)$",
               "patterns": [
@@ -3442,8 +3344,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(objc|objective-c))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(obj(?:c|ective-c)))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.objc.asciidoc",
           "patterns": [
             {
@@ -3457,7 +3359,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(objc|objective-c))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(obj(?:c|ective-c)))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3467,7 +3369,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.objc",
               "end": "^(\\1)$",
               "patterns": [
@@ -3484,7 +3385,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.objc",
               "end": "^(\\1)$",
               "patterns": [
@@ -3501,7 +3401,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.objc",
               "end": "^(\\1)$",
               "patterns": [
@@ -3519,8 +3418,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(ocaml))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(ocaml))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.ocaml.asciidoc",
           "patterns": [
             {
@@ -3534,7 +3433,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(ocaml))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(ocaml))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3544,7 +3443,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.ocaml",
               "end": "^(\\1)$",
               "patterns": [
@@ -3561,7 +3459,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.ocaml",
               "end": "^(\\1)$",
               "patterns": [
@@ -3578,7 +3475,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.ocaml",
               "end": "^(\\1)$",
               "patterns": [
@@ -3596,8 +3492,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(perl))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(perl))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.perl.asciidoc",
           "patterns": [
             {
@@ -3611,7 +3507,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(perl))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(perl))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3621,7 +3517,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.perl",
               "end": "^(\\1)$",
               "patterns": [
@@ -3638,7 +3533,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.perl",
               "end": "^(\\1)$",
               "patterns": [
@@ -3655,7 +3549,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.perl",
               "end": "^(\\1)$",
               "patterns": [
@@ -3673,8 +3566,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(perl6))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(perl6))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.perl6.asciidoc",
           "patterns": [
             {
@@ -3688,7 +3581,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(perl6))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(perl6))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3698,7 +3591,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.perl6",
               "end": "^(\\1)$",
               "patterns": [
@@ -3715,7 +3607,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.perl6",
               "end": "^(\\1)$",
               "patterns": [
@@ -3732,7 +3623,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.perl6",
               "end": "^(\\1)$",
               "patterns": [
@@ -3750,8 +3640,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(php))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(php))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.html.php.asciidoc",
           "patterns": [
             {
@@ -3765,7 +3655,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(php))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(php))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3775,7 +3665,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "text.embedded.html.php",
               "end": "^(\\1)$",
               "patterns": [
@@ -3792,7 +3681,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "text.embedded.html.php",
               "end": "^(\\1)$",
               "patterns": [
@@ -3809,7 +3697,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "text.embedded.html.php",
               "end": "^(\\1)$",
               "patterns": [
@@ -3827,8 +3714,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(properties))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(properties))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.asciidoc.properties.asciidoc",
           "patterns": [
             {
@@ -3842,7 +3729,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(properties))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(properties))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3852,7 +3739,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.asciidoc.properties",
               "end": "^(\\1)$",
               "patterns": [
@@ -3869,7 +3755,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.asciidoc.properties",
               "end": "^(\\1)$",
               "patterns": [
@@ -3886,7 +3771,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.asciidoc.properties",
               "end": "^(\\1)$",
               "patterns": [
@@ -3904,8 +3788,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(py(thon)?))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(py(thon)?))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.python.asciidoc",
           "patterns": [
             {
@@ -3919,7 +3803,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(py(thon)?))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(py(thon)?))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -3929,7 +3813,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.python",
               "end": "^(\\1)$",
               "patterns": [
@@ -3946,7 +3829,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.python",
               "end": "^(\\1)$",
               "patterns": [
@@ -3963,7 +3845,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.python",
               "end": "^(\\1)$",
               "patterns": [
@@ -3981,8 +3862,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(r))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(r))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.r.asciidoc",
           "patterns": [
             {
@@ -3996,7 +3877,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(r))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(r))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4006,7 +3887,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.r",
               "end": "^(\\1)$",
               "patterns": [
@@ -4023,7 +3903,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.r",
               "end": "^(\\1)$",
               "patterns": [
@@ -4040,7 +3919,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.r",
               "end": "^(\\1)$",
               "patterns": [
@@ -4058,8 +3936,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(ruby|rb))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(r(?:uby|b)))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.ruby.asciidoc",
           "patterns": [
             {
@@ -4073,7 +3951,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(ruby|rb))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(r(?:uby|b)))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4083,7 +3961,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.ruby",
               "end": "^(\\1)$",
               "patterns": [
@@ -4100,7 +3977,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.ruby",
               "end": "^(\\1)$",
               "patterns": [
@@ -4117,7 +3993,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.ruby",
               "end": "^(\\1)$",
               "patterns": [
@@ -4135,8 +4010,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(rust|rs))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(r(?:ust|s)))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.rust.asciidoc",
           "patterns": [
             {
@@ -4150,7 +4025,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(rust|rs))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(r(?:ust|s)))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4160,7 +4035,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.rust",
               "end": "^(\\1)$",
               "patterns": [
@@ -4177,7 +4051,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.rust",
               "end": "^(\\1)$",
               "patterns": [
@@ -4194,7 +4067,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.rust",
               "end": "^(\\1)$",
               "patterns": [
@@ -4212,8 +4084,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(sass))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(sass))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.sass.asciidoc",
           "patterns": [
             {
@@ -4227,7 +4099,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(sass))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(sass))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4237,7 +4109,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.sass",
               "end": "^(\\1)$",
               "patterns": [
@@ -4254,7 +4125,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.sass",
               "end": "^(\\1)$",
               "patterns": [
@@ -4271,7 +4141,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.sass",
               "end": "^(\\1)$",
               "patterns": [
@@ -4289,8 +4158,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(scala))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(scala))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.scala.asciidoc",
           "patterns": [
             {
@@ -4304,7 +4173,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(scala))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(scala))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4314,7 +4183,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.scala",
               "end": "^(\\1)$",
               "patterns": [
@@ -4331,7 +4199,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.scala",
               "end": "^(\\1)$",
               "patterns": [
@@ -4348,7 +4215,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.scala",
               "end": "^(\\1)$",
               "patterns": [
@@ -4366,8 +4232,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(scss))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(scss))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.css.scss.asciidoc",
           "patterns": [
             {
@@ -4381,7 +4247,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(scss))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(scss))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4391,7 +4257,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.css.scss",
               "end": "^(\\1)$",
               "patterns": [
@@ -4408,7 +4273,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.css.scss",
               "end": "^(\\1)$",
               "patterns": [
@@ -4425,7 +4289,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.css.scss",
               "end": "^(\\1)$",
               "patterns": [
@@ -4443,8 +4306,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(sh|bash|shell))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(sh|bash|shell))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.shell.asciidoc",
           "patterns": [
             {
@@ -4458,7 +4321,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(sh|bash|shell))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(sh|bash|shell))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4468,7 +4331,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.shell",
               "end": "^(\\1)$",
               "patterns": [
@@ -4485,7 +4347,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.shell",
               "end": "^(\\1)$",
               "patterns": [
@@ -4502,7 +4363,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.shell",
               "end": "^(\\1)$",
               "patterns": [
@@ -4520,8 +4380,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(sql))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(sql))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.sql.asciidoc",
           "patterns": [
             {
@@ -4535,7 +4395,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(sql))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(sql))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4545,7 +4405,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.sql",
               "end": "^(\\1)$",
               "patterns": [
@@ -4562,7 +4421,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.sql",
               "end": "^(\\1)$",
               "patterns": [
@@ -4579,7 +4437,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.sql",
               "end": "^(\\1)$",
               "patterns": [
@@ -4597,8 +4454,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(swift))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(swift))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.swift.asciidoc",
           "patterns": [
             {
@@ -4612,7 +4469,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(swift))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(swift))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4622,7 +4479,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.swift",
               "end": "^(\\1)$",
               "patterns": [
@@ -4639,7 +4495,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.swift",
               "end": "^(\\1)$",
               "patterns": [
@@ -4656,7 +4511,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.swift",
               "end": "^(\\1)$",
               "patterns": [
@@ -4674,8 +4528,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(toml))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(toml))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.toml.asciidoc",
           "patterns": [
             {
@@ -4689,7 +4543,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(toml))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(toml))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4699,7 +4553,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.toml",
               "end": "^(\\1)$",
               "patterns": [
@@ -4716,7 +4569,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.toml",
               "end": "^(\\1)$",
               "patterns": [
@@ -4733,7 +4585,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.toml",
               "end": "^(\\1)$",
               "patterns": [
@@ -4751,8 +4602,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(typescript|ts))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(t(?:ypescript|s)))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.ts.asciidoc",
           "patterns": [
             {
@@ -4766,7 +4617,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(typescript|ts))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(t(?:ypescript|s)))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4776,7 +4627,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.ts",
               "end": "^(\\1)$",
               "patterns": [
@@ -4793,7 +4643,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.ts",
               "end": "^(\\1)$",
               "patterns": [
@@ -4810,7 +4659,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.ts",
               "end": "^(\\1)$",
               "patterns": [
@@ -4828,8 +4676,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(xml))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(xml))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.xml.asciidoc",
           "patterns": [
             {
@@ -4843,7 +4691,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(xml))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(xml))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4853,7 +4701,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "text.embedded.xml",
               "end": "^(\\1)$",
               "patterns": [
@@ -4870,7 +4717,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "text.embedded.xml",
               "end": "^(\\1)$",
               "patterns": [
@@ -4887,7 +4733,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "text.embedded.xml",
               "end": "^(\\1)$",
               "patterns": [
@@ -4905,8 +4750,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)(?:,|#)\\p{Blank}*(?i:(ya?ml))((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)[,#]\\p{blank}*(?i:(ya?ml))([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "name": "markup.code.yaml.asciidoc",
           "patterns": [
             {
@@ -4920,7 +4765,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)(?:,|#)\\p{Blank}*(?i:(ya?ml))((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)[,#]\\p{blank}*(?i:(ya?ml))([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -4930,7 +4775,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "contentName": "source.embedded.yaml",
               "end": "^(\\1)$",
               "patterns": [
@@ -4947,7 +4791,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "contentName": "source.embedded.yaml",
               "end": "^(\\1)$",
               "patterns": [
@@ -4964,7 +4807,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "contentName": "source.embedded.yaml",
               "end": "^(\\1)$",
               "patterns": [
@@ -4982,8 +4824,8 @@
           ]
         },
         {
-          "begin": "(?=(?>(?:^\\[(source)((?:,|#)[^\\]]+)*\\]$)))",
-          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{Blank}*$)",
+          "begin": "(?=(?>^\\[(source)([,#][^\\]]+)*]$))",
+          "end": "((?<=--|\\.\\.\\.\\.)$|^\\p{blank}*$)",
           "patterns": [
             {
               "captures": {
@@ -4996,7 +4838,7 @@
                   ]
                 }
               },
-              "match": "^\\[(source)((?:,|#)([^,\\]]+))*\\]$"
+              "match": "^\\[(source)([,#]([^,\\]]+))*]$"
             },
             {
               "include": "#inlines"
@@ -5006,7 +4848,6 @@
             },
             {
               "begin": "^(-{4,})\\s*$",
-              "comment": "listing block",
               "end": "^(\\1)$",
               "name": "markup.raw.asciidoc",
               "patterns": [
@@ -5020,7 +4861,6 @@
             },
             {
               "begin": "^(-{2})\\s*$",
-              "comment": "open block",
               "end": "^(\\1)$",
               "name": "markup.raw.asciidoc",
               "patterns": [
@@ -5034,7 +4874,6 @@
             },
             {
               "begin": "^(\\.{4})\\s*$",
-              "comment": "literal block",
               "end": "^(\\1)$",
               "name": "markup.raw.asciidoc",
               "patterns": [
@@ -5460,7 +5299,7 @@
           ]
         },
         {
-          "begin": "^\\s*(`{3,})\\s*(?i:(javascript|js))\\s*$",
+          "begin": "^\\s*(`{3,})\\s*(?i:(j(?:avascript|s)))\\s*$",
           "beginCaptures": {
             "0": {
               "name": "support.asciidoc"
@@ -5556,7 +5395,7 @@
           ]
         },
         {
-          "begin": "^\\s*(`{3,})\\s*(?i:(kotlin|kts?))\\s*$",
+          "begin": "^\\s*(`{3,})\\s*(?i:(k(?:otlin|ts?)))\\s*$",
           "beginCaptures": {
             "0": {
               "name": "support.asciidoc"
@@ -5628,7 +5467,7 @@
           ]
         },
         {
-          "begin": "^\\s*(`{3,})\\s*(?i:(markdown|mdown|md))\\s*$",
+          "begin": "^\\s*(`{3,})\\s*(?i:(m(?:arkdown|down|d)))\\s*$",
           "beginCaptures": {
             "0": {
               "name": "support.asciidoc"
@@ -5676,7 +5515,7 @@
           ]
         },
         {
-          "begin": "^\\s*(`{3,})\\s*(?i:(objc|objective-c))\\s*$",
+          "begin": "^\\s*(`{3,})\\s*(?i:(obj(?:c|ective-c)))\\s*$",
           "beginCaptures": {
             "0": {
               "name": "support.asciidoc"
@@ -5868,7 +5707,7 @@
           ]
         },
         {
-          "begin": "^\\s*(`{3,})\\s*(?i:(ruby|rb))\\s*$",
+          "begin": "^\\s*(`{3,})\\s*(?i:(r(?:uby|b)))\\s*$",
           "beginCaptures": {
             "0": {
               "name": "support.asciidoc"
@@ -5892,7 +5731,7 @@
           ]
         },
         {
-          "begin": "^\\s*(`{3,})\\s*(?i:(rust|rs))\\s*$",
+          "begin": "^\\s*(`{3,})\\s*(?i:(r(?:ust|s)))\\s*$",
           "beginCaptures": {
             "0": {
               "name": "support.asciidoc"
@@ -6084,7 +5923,7 @@
           ]
         },
         {
-          "begin": "^\\s*(`{3,})\\s*(?i:(typescript|ts))\\s*$",
+          "begin": "^\\s*(`{3,})\\s*(?i:(t(?:ypescript|s)))\\s*$",
           "beginCaptures": {
             "0": {
               "name": "support.asciidoc"
@@ -6200,7 +6039,7 @@
             }
           },
           "contentName": "string.unquoted.asciidoc",
-          "end": "\\]|^$",
+          "end": "]|^$",
           "name": "markup.macro.inline.stem.asciidoc"
         }
       ]
@@ -6222,7 +6061,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<!\\\\\\\\)(\\[.+?\\])?((\\*\\*)(.+?)(\\*\\*))",
+          "match": "(?<!\\\\\\\\)(\\[.+?])?((\\*\\*)(.+?)(\\*\\*))",
           "name": "markup.strong.unconstrained.asciidoc"
         },
         {
@@ -6240,7 +6079,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<![\\\\;:\\p{Word}\\*])(\\[.+?\\])?((\\*)(\\S|\\S.*?\\S)(\\*)(?!\\p{Word}))",
+          "match": "(?<![\\\\;:[:word:]*])(\\[.+?])?((\\*)(\\S(?:|.*?\\S))(\\*)(?!\\p{word}))",
           "name": "markup.strong.constrained.asciidoc"
         }
       ]
@@ -6262,7 +6101,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(\\[.+?\\])?((~)(\\S+?)(~))",
+          "match": "(?<!\\\\)(\\[.+?])?((~)(\\S+?)(~))",
           "name": "markup.subscript.asciidoc"
         }
       ]
@@ -6284,7 +6123,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(\\[.+?\\])?((\\^)(\\S+?)(\\^))",
+          "match": "(?<!\\\\)(\\[.+?])?((\\^)(\\S+?)(\\^))",
           "name": "markup.superscript.asciidoc"
         }
       ]
@@ -6316,7 +6155,6 @@
                   "name": "markup.table.cell.delimiter.asciidoc"
                 }
               },
-              "comment": "cell separator",
               "match": ","
             },
             {
@@ -6350,7 +6188,6 @@
                   "name": "markup.table.cell.delimiter.asciidoc"
                 }
               },
-              "comment": "cell separator",
               "match": ":"
             },
             {
@@ -6387,8 +6224,7 @@
                   "name": "markup.table.cell.delimiter.asciidoc"
                 }
               },
-              "comment": "cell separator and attributes",
-              "match": "(^|[^\\p{Blank}\\\\]*)(?<!\\\\)(!)"
+              "match": "(^|[^[:blank:]\\\\]*)(?<!\\\\)(!)"
             },
             {
               "include": "#tables-includes"
@@ -6424,8 +6260,7 @@
                   "name": "markup.table.cell.delimiter.asciidoc"
                 }
               },
-              "comment": "cell separator and attributes",
-              "match": "(^|[^\\p{Blank}\\\\]*)(?<!\\\\)(\\|)"
+              "match": "(^|[^[:blank:]\\\\]*)(?<!\\\\)(\\|)"
             },
             {
               "include": "#tables-includes"
@@ -6487,7 +6322,7 @@
     "titles": {
       "patterns": [
         {
-          "begin": "^((?:=|#){6})([\\p{Blank}]+)(?=\\S+)",
+          "begin": "^([=#]{6})(\\p{blank}+)(?=\\S+)",
           "beginCaptures": {
             "1": {
               "name": "markup.heading.marker.asciidoc"
@@ -6505,7 +6340,7 @@
           ]
         },
         {
-          "begin": "^((?:=|#){5})([\\p{Blank}]+)(?=\\S+)",
+          "begin": "^([=#]{5})(\\p{blank}+)(?=\\S+)",
           "beginCaptures": {
             "1": {
               "name": "markup.heading.marker.asciidoc"
@@ -6523,7 +6358,7 @@
           ]
         },
         {
-          "begin": "^((?:=|#){4})([\\p{Blank}]+)(?=\\S+)",
+          "begin": "^([=#]{4})(\\p{blank}+)(?=\\S+)",
           "beginCaptures": {
             "1": {
               "name": "markup.heading.marker.asciidoc"
@@ -6541,7 +6376,7 @@
           ]
         },
         {
-          "begin": "^((?:=|#){3})([\\p{Blank}]+)(?=\\S+)",
+          "begin": "^([=#]{3})(\\p{blank}+)(?=\\S+)",
           "beginCaptures": {
             "1": {
               "name": "markup.heading.marker.asciidoc"
@@ -6559,7 +6394,7 @@
           ]
         },
         {
-          "begin": "^((?:=|#){2})([\\p{Blank}]+)(?=\\S+)",
+          "begin": "^([=#]{2})(\\p{blank}+)(?=\\S+)",
           "beginCaptures": {
             "1": {
               "name": "markup.heading.marker.asciidoc"
@@ -6577,7 +6412,7 @@
           ]
         },
         {
-          "begin": "^((?:=|#){1})([\\p{Blank}]+)(?=\\S+)",
+          "begin": "^([=#]{1})(\\p{blank}+)(?=\\S+)",
           "beginCaptures": {
             "1": {
               "name": "markup.heading.marker.asciidoc"
@@ -6610,8 +6445,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "comment": "double-quoted",
-          "match": "(?:^|(?<!\\p{Word}|;|:))(\\[([^\\]]+?)\\])?(\"`)(\\S|\\S.*?\\S)(`\")(?!\\p{Word})",
+          "match": "(?:^|(?<![[:word:];:]))(\\[([^\\]]+?)])?(\"`)(\\S(?:|.*?\\S))(`\")(?!\\p{word})",
           "name": "markup.italic.quote.typographic-quotes.asciidoc"
         },
         {
@@ -6626,8 +6460,7 @@
               "name": "punctuation.definition.asciidoc"
             }
           },
-          "comment": "single-quoted",
-          "match": "(?:^|(?<!\\p{Word}|;|:))(\\[([^\\]]+?)\\])?('`)(\\S|\\S.*?\\S)(`')(?!\\p{Word})",
+          "match": "(?:^|(?<![[:word:];:]))(\\[([^\\]]+?)])?('`)(\\S(?:|.*?\\S))(`')(?!\\p{word})",
           "name": "markup.italic.quote.typographic-quotes.asciidoc"
         }
       ]
@@ -6649,11 +6482,11 @@
               "name": "constant.asciidoc"
             }
           },
-          "match": "(?<!\\\\)(?:(<<)([\\p{Word}\":./]+,)?(.*?)(>>))",
+          "match": "(?<!\\\\)(<<)([[:word:]\":./]+,)?(.*?)(>>)",
           "name": "markup.reference.xref.asciidoc"
         },
         {
-          "begin": "(?<!\\\\)(xref:)([\\p{Word}\":.\\/].*?)(\\[)",
+          "begin": "(?<!\\\\)(xref:)([[:word:]\":./].*?)(\\[)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.asciidoc"
@@ -6663,7 +6496,7 @@
             }
           },
           "contentName": "string.unquoted.asciidoc",
-          "end": "\\]|^$",
+          "end": "]|^$",
           "name": "markup.reference.xref.asciidoc"
         }
       ]
diff --git a/resources/languages/asm.json b/resources/languages/asm.json
index bed6e7b..e3b6c14 100644
--- a/resources/languages/asm.json
+++ b/resources/languages/asm.json
@@ -47,8 +47,8 @@
           "name": "comment.block"
         },
         {
-          "begin": "^\\s*[\\#%]\\s*if\\s+0\\b",
-          "end": "^\\s*[\\#%]\\s*endif\\b",
+          "begin": "^\\s*[#%]\\s*if\\s+0\\b",
+          "end": "^\\s*[#%]\\s*endif\\b",
           "name": "comment.preprocessor"
         }
       ]
@@ -56,67 +56,67 @@
     "constants": {
       "patterns": [
         {
-          "match": "(?i)\\b0[by](?:[01][01_]*)\\.(?:(?:[01][01_]*)?(?:p[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\b0[by][01][01_]*\\.(?:(?:[01][01_]*)?(?:p[+-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.binary.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[by](?:[01][01_]*)(?:p[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\b0[by][01][01_]*p[+-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.binary.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[oq](?:[0-7][0-7_]*)\\.(?:(?:[0-7][0-7_]*)?(?:p[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\b0[oq][0-7][0-7_]*\\.(?:(?:[0-7][0-7_]*)?(?:p[+-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.octal.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[oq](?:[0-7][0-7_]*)(?:p[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\b0[oq][0-7][0-7_]*p[+-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.octal.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:0[dt])?(?:[0-9][0-9_]*)\\.(?:(?:[0-9][0-9_]*)?(?:e[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\b(?:0[dt])?[0-9][0-9_]*\\.(?:(?:[0-9][0-9_]*)?(?:e[+-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.decimal.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[0-9][0-9_]*)(?:e[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\b[0-9][0-9_]*e[+-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.decimal.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[0-9][0-9_]*)p(?:[0-9][0-9_]*)?\\b",
+          "match": "(?i)\\b[0-9][0-9_]*p(?:[0-9][0-9_]*)?\\b",
           "name": "constant.numeric.decimal.packed-bcd.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[xh](?:[[:xdigit:]][[:xdigit:]_]*)\\.(?:(?:[[:xdigit:]][[:xdigit:]_]*)?(?:p[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\b0[xh]\\h[\\h_]*\\.(?:(?:\\h[\\h_]*)?(?:p[+-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.hex.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b0[xh](?:[[:xdigit:]][[:xdigit:]_]*)(?:p[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\b0[xh]\\h[\\h_]*p[+-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.hex.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\$[0-9]\\_?(?:[[:xdigit:]][[:xdigit:]_]*)?\\.(?:(?:[[:xdigit:]][[:xdigit:]_]*)?(?:p[+-]?(?:[0-9][0-9_]*))?\\b)?",
+          "match": "(?i)\\$[0-9]_?(?:\\h[\\h_]*)?\\.(?:(?:\\h[\\h_]*)?(?:p[+-]?[0-9][0-9_]*)?\\b)?",
           "name": "constant.numeric.hex.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\$[0-9]\\_?(?:[[:xdigit:]][[:xdigit:]_]*)(?:p[+-]?(?:[0-9][0-9_]*))\\b",
+          "match": "(?i)\\$[0-9]_?\\h[\\h_]*p[+-]?[0-9][0-9_]*\\b",
           "name": "constant.numeric.hex.floating-point.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:0[by](?:[01][01_]*))|(?:(?:[01][01_]*)[by]))\\b",
+          "match": "(?i)\\b(?:0[by][01][01_]*|[01][01_]*[by])\\b",
           "name": "constant.numeric.binary.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:0[oq](?:[0-7][0-7_]*))|(?:(?:[0-7][0-7_]*)[oq]))\\b",
+          "match": "(?i)\\b(?:0[oq][0-7][0-7_]*|[0-7][0-7_]*[oq])\\b",
           "name": "constant.numeric.octal.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:0[dt](?:[0-9][0-9_]*))|(?:(?:[0-9][0-9_]*)[dt]?))\\b",
+          "match": "(?i)\\b(?:0[dt][0-9][0-9_]*|[0-9][0-9_]*[dt]?)\\b",
           "name": "constant.numeric.decimal.asm.x86_64"
         },
         {
-          "match": "(?i)(?:\\$[0-9]\\_?(?:[[:xdigit:]][[:xdigit:]_]*)?)\\b",
+          "match": "(?i)\\$[0-9]_?(?:\\h[\\h_]*)?\\b",
           "name": "constant.numeric.hex.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:0[xh](?:[[:xdigit:]][[:xdigit:]_]*))|(?:(?:[[:xdigit:]][[:xdigit:]_]*)[hxHX]))\\b",
+          "match": "(?i)\\b(?:0[xh]\\h[\\h_]*|\\h[\\h_]*[hxHX])\\b",
           "name": "constant.numeric.hex.asm.x86_64"
         }
       ]
@@ -124,7 +124,7 @@
     "entities": {
       "patterns": [
         {
-          "match": "((section|segment)\\s+)?\\.((ro)?data|bss|text)",
+          "match": "((se(?:ction|gment))\\s+)?\\.((ro)?data|bss|text)",
           "name": "entity.name.section"
         },
         {
@@ -147,7 +147,7 @@
               "name": "punctuation.separator.asm.x86_64"
             }
           },
-          "match": "(\\.\\.@)((?:[[:alpha:]_?](?:[[:alnum:]_$#@~.?]*)))(?:(\\:)?|\\b)",
+          "match": "(\\.\\.@)([[:alpha:]_?][[:alnum:]_$#@~.?]*)(?:(:)?|\\b)",
           "name": "entity.name.function.asm.x86_64"
         },
         {
@@ -162,7 +162,7 @@
               "name": "punctuation.separator.asm.x86_64"
             }
           },
-          "match": "(?:(\\.)?|\\b)((?:[[:alpha:]_?](?:[[:alnum:]_$#@~.?]*)))(?:(\\:))",
+          "match": "(?:(\\.)?|\\b)([[:alpha:]_?][[:alnum:]_$#@~.?]*)(:)",
           "name": "entity.name.function.asm.x86_64"
         },
         {
@@ -177,7 +177,7 @@
               "name": "punctuation.separator.asm.x86_64"
             }
           },
-          "match": "(\\.)([0-9]+(?:[[:alnum:]_$#@~.?]*))(?:(\\:)?|\\b)",
+          "match": "(\\.)([0-9]+[[:alnum:]_$#@~.?]*)(?:(:)?|\\b)",
           "name": "entity.name.function.asm.x86_64"
         },
         {
@@ -192,7 +192,7 @@
               "name": "punctuation.separator.asm.x86_64"
             }
           },
-          "match": "(?:(\\.)?|\\b)([0-9$@~](?:[[:alnum:]_$#@~.?]*))(?:(\\:))",
+          "match": "(?:(\\.)?|\\b)([0-9$@~][[:alnum:]_$#@~.?]*)(:)",
           "name": "invalid.illegal.entity.name.function.asm.x86_64"
         }
       ]
@@ -328,7 +328,7 @@
           "name": "keyword.operator.word.mnemonic.avx"
         },
         {
-          "match": "(?i)\\b(vaes((dec|enc)(last)?|imc|keygenassist)|vpclmulqdq)\\b",
+          "match": "(?i)\\b(v(?:aes((dec|enc)(last)?|imc|keygenassist)|pclmulqdq))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.aes"
         },
         {
@@ -340,7 +340,7 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.conversion"
         },
         {
-          "match": "(?i)\\b(vh((add|sub)p[ds])|vph((add|sub)([dw]|sw)|minposuw))\\b",
+          "match": "(?i)\\b(v(?:h((add|sub)p[ds])|ph((add|sub)([dw]|sw)|minposuw)))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.horizontal-packed-arithmetic"
         },
         {
@@ -352,7 +352,7 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.mov"
         },
         {
-          "match": "(?i)\\b(v((add|div|mul|sub|max|min|round|sqrt)[ps][ds]|(addsub|dp)p[ds]|(rcp|rsqrt)[ps]s))\\b",
+          "match": "(?i)\\b(v((add|div|mul|sub|max|min|round|sqrt)[ps][ds]|(addsub|dp)p[ds]|(r(?:cp|sqrt))[ps]s))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.packed-arithmetic"
         },
         {
@@ -360,11 +360,11 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.packed-conversion"
         },
         {
-          "match": "(?i)\\b(vp(shuf([bd]|[hl]w))|vshufp[ds])\\b",
+          "match": "(?i)\\b(v(?:p(shuf([bd]|[hl]w))|shufp[ds]))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.packed-shuffle"
         },
         {
-          "match": "(?i)\\b(vp((abs|sign|(max|min)[su])[bdw]|(add|sub)([bdqw]|u?s[bw])|avg[bw]|extr[bdqw]|madd(wd|ubsw)|mul(hu?w|hrsw|l[dw]|u?dq)|sadbw))\\b",
+          "match": "(?i)\\b(vp((abs|sign|(m(?:ax|in))[su])[bdw]|(add|sub)([bdqw]|u?s[bw])|avg[bw]|extr[bdqw]|madd(wd|ubsw)|mul(hu?w|hrsw|l[dw]|u?dq)|sadbw))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.supplemental.arithmetic"
         },
         {
@@ -384,7 +384,7 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.simd-integer"
         },
         {
-          "match": "(?i)\\b(vp(sra[dwq]|srl[dqw]))\\b",
+          "match": "(?i)\\b(vp(sr(?:a[dwq]|l[dqw])))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.shift-and-rotate"
         },
         {
@@ -404,15 +404,15 @@
           "name": "keyword.operator.word.mnemonic.avx.promoted.other"
         },
         {
-          "match": "(?i)\\b(v(maskmovdqu|movntdqa?))\\b",
+          "match": "(?i)\\b(v(m(?:askmovdqu|ovntdqa?)))\\b",
           "name": "keyword.operator.word.mnemonic.avx.promoted.cacheability-control"
         },
         {
-          "match": "(?i)\\b(vcvt(ph2ps|ps2ph))\\b",
+          "match": "(?i)\\b(vcvt(p(?:h2ps|s2ph)))\\b",
           "name": "keyword.operator.word.mnemonic.16-bit-floating-point-conversion"
         },
         {
-          "match": "(?i)\\b(vfn?m((add|sub)(132|213|231)[ps][ds])|vfm((addsub|subadd)(132|213|231)p[ds]))\\b",
+          "match": "(?i)\\b(vf(?:n?m((add|sub)(132|213|231)[ps][ds])|m((addsub|subadd)(132|213|231)p[ds])))\\b",
           "name": "keyword.operator.word.mnemonic.fma"
         }
       ]
@@ -432,7 +432,7 @@
           "name": "keyword.operator.word.mnemonic.avx2.blend"
         },
         {
-          "match": "(?i)\\b(vp?gather[dq][dq]|vgather([dq]|dq)p[ds])\\b",
+          "match": "(?i)\\b(v(?:p?gather[dq][dq]|gather([dq]|dq)p[ds]))\\b",
           "name": "keyword.operator.word.mnemonic.avx2.gather"
         }
       ]
@@ -513,7 +513,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.dq.extract"
         },
         {
-          "match": "(?i)\\bvp(mov(m2[dq]|b2d|q2m)|mullq)\\b",
+          "match": "(?i)\\bvp(m(?:ov(m2[dq]|b2d|q2m)|ullq))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.dq.pmov"
         }
       ]
@@ -553,7 +553,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.f.pblend"
         },
         {
-          "match": "(?i)\\bvp(erm[it]2(d|q|p[ds])|expand[dq]|(max|min)[su]q|movu?s(q[bdw]|d[bw]))\\b",
+          "match": "(?i)\\bvp(erm[it]2([dq]|p[ds])|expand[dq]|(m(?:ax|in))[su]q|movu?s(q[bdw]|d[bw]))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.f.permi"
         },
         {
@@ -569,7 +569,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.f.rcp"
         },
         {
-          "match": "(?i)\\bv(scatter[dq]{2}|shuf[fi](32|64)x[24])\\b",
+          "match": "(?i)\\bv(s(?:catter[dq]{2}|huf[fi](32|64)x[24]))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.f.scatter"
         }
       ]
@@ -577,7 +577,7 @@
     "mnemonics-avx512fp16": {
       "patterns": [
         {
-          "match": "(?i)\\bv((add|cmp|div|fc?(madd|mul)c|fpclass|get(exp|mant)|mul|rcp|reduce|(rnd)?scale|r?sqrt|sub)[ps]h|u?comish)\\b",
+          "match": "(?i)\\bv((add|cmp|div|fc?(m(?:add|ul))c|fpclass|get(exp|mant)|mul|rcp|reduce|(rnd)?scale|r?sqrt|sub)[ps]h|u?comish)\\b",
           "name": "keyword.operator.word.mnemonic.avx512.fp16.add"
         },
         {
@@ -589,7 +589,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.fp16.cvtph2x"
         },
         {
-          "match": "(?i)\\bvcvt(ph2psx|ps2phx)\\b",
+          "match": "(?i)\\bvcvt(p(?:h2psx|s2phx))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.fp16.cvtx"
         },
         {
@@ -613,7 +613,7 @@
           "name": "keyword.operator.word.mnemonic.avx512.fp16.fmaddsub"
         },
         {
-          "match": "(?i)\\bv((min|max)ph|mov(sh|w))\\b",
+          "match": "(?i)\\bv((m(?:in|ax))ph|mov(sh|w))\\b",
           "name": "keyword.operator.word.mnemonic.avx512.fp16.max"
         }
       ]
@@ -673,7 +673,7 @@
           "name": "keyword.operator.word.mnemonic.fpu.transcendental"
         },
         {
-          "match": "(?i)\\b(fld(1|z|pi|l2[et]|l[ng]2))\\b",
+          "match": "(?i)\\b(fld([1z]|pi|l2[et]|l[ng]2))\\b",
           "name": "keyword.operator.word.mnemonic.fpu.load-constants"
         },
         {
@@ -708,7 +708,7 @@
           "name": "keyword.operator.word.mnemonic.apx.cmpxadd"
         },
         {
-          "match": "(?i)\\b(jmpabs|(push|pop)2p?)\\b",
+          "match": "(?i)\\b(jmpabs|(p(?:ush|op))2p?)\\b",
           "name": "keyword.operator.word.mnemonic.apx.other"
         }
       ]
@@ -724,7 +724,7 @@
           "name": "keyword.operator.word.mnemonic.general-purpose.data-transfer.xchg"
         },
         {
-          "match": "(?i)\\b((push|pop)(ad?)?|cwde?|cdq|cbw)\\b",
+          "match": "(?i)\\b((p(?:ush|op))(ad?)?|cwde?|cdq|cbw)\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.data-transfer.other"
         },
         {
@@ -752,7 +752,7 @@
           "name": "keyword.operator.word.mnemonic.general-purpose.bit-and-byte.other"
         },
         {
-          "match": "(?i)\\b(jmp|jn?[abceglopsz]|jn?[abgl]e|jp[eo]|j[er]?cxz)\\b",
+          "match": "(?i)\\b(j(?:mp|n?[abceglopsz]|n?[abgl]e|p[eo]|[er]?cxz))\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.control-transfer.jmp"
         },
         {
@@ -768,7 +768,7 @@
           "name": "keyword.operator.word.mnemonic.general-purpose.io"
         },
         {
-          "match": "(?i)\\b((st|cl)[cdi]|cmc|[ls]ahf|(push|pop)f[dq]?)\\b",
+          "match": "(?i)\\b((st|cl)[cdi]|cmc|[ls]ahf|(p(?:ush|op))f[dq]?)\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.flag-control"
         },
         {
@@ -784,11 +784,11 @@
           "name": "keyword.operator.word.mnemonic.general-purpose.cache-control"
         },
         {
-          "match": "(?i)\\b(rdrand|rdseed)\\b",
+          "match": "(?i)\\b(rd(?:rand|seed))\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.rng"
         },
         {
-          "match": "(?i)\\b(andn|bextr|bls(i|r|msk)|bzhi|pdep|pext|[lt]zcnt|(mul|ror|sar|shl|shr)x)\\b",
+          "match": "(?i)\\b(andn|bextr|bls([ir]|msk)|bzhi|pdep|pext|[lt]zcnt|(mul|ror|sar|shl|shr)x)\\b",
           "name": "keyword.operator.word.mnemonic.general-purpose.bmi"
         }
       ]
@@ -832,7 +832,7 @@
           "name": "keyword.operator.word.mnemonic.other.m"
         },
         {
-          "match": "(?i)\\bp((abs|(max|min)[su]?|mull|sra)q|config|twrite)\\b",
+          "match": "(?i)\\bp((abs|(m(?:ax|in))[su]?|mull|sra)q|config|twrite)\\b",
           "name": "keyword.operator.word.mnemonic.other.p"
         },
         {
@@ -848,7 +848,7 @@
           "name": "keyword.operator.word.mnemonic.other.t"
         },
         {
-          "match": "(?i)\\bu(monitor|mwait)\\b",
+          "match": "(?i)\\bu(m(?:onitor|wait))\\b",
           "name": "keyword.operator.word.mnemonic.other.u"
         },
         {
@@ -856,7 +856,7 @@
           "name": "keyword.operator.word.mnemonic.other.vb"
         },
         {
-          "match": "(?i)\\bv(compressw|cvtne2?ps2bf16)\\b",
+          "match": "(?i)\\bv(c(?:ompressw|vtne2?ps2bf16))\\b",
           "name": "keyword.operator.word.mnemonic.other.vc"
         },
         {
@@ -872,7 +872,7 @@
           "name": "keyword.operator.word.mnemonic.other.vi"
         },
         {
-          "match": "(?i)\\bv(maskmov|(max|min)sh)\\b",
+          "match": "(?i)\\bv(maskmov|(m(?:ax|in))sh)\\b",
           "name": "keyword.operator.word.mnemonic.other.vm"
         },
         {
@@ -892,15 +892,15 @@
           "name": "keyword.operator.word.mnemonic.other.vpd"
         },
         {
-          "match": "(?i)\\b(vperm(b|t2[bw])|vp(expand[bw]|extrtd))\\b",
+          "match": "(?i)\\b(vp(?:erm(b|t2[bw])|(ex(?:pand[bw]|trtd))))\\b",
           "name": "keyword.operator.word.mnemonic.other.vpe"
         },
         {
-          "match": "(?i)\\bvp(madd52[hl]uq|mov(d(2m|[bw])|q[bdw]|wb)|mpov[bdqw]2m|multishiftqb)\\b",
+          "match": "(?i)\\bvp(m(?:add52[hl]uq|ov(d(2m|[bw])|q[bdw]|wb)|pov[bdqw]2m|ultishiftqb))\\b",
           "name": "keyword.operator.word.mnemonic.other.vpm"
         },
         {
-          "match": "(?i)\\b(vpopcnt[bdqw]|vpor[dq])\\b",
+          "match": "(?i)\\b(vpo(?:pcnt[bdqw]|r[dq]))\\b",
           "name": "keyword.operator.word.mnemonic.other.vpo"
         },
         {
@@ -908,7 +908,7 @@
           "name": "keyword.operator.word.mnemonic.other.vpr"
         },
         {
-          "match": "(?i)\\bvp(sh[lr]dv?[dqw]|shufbitqmb|shufps)\\b",
+          "match": "(?i)\\bvp(sh(?:[lr]dv?[dqw]|ufbitqmb|ufps))\\b",
           "name": "keyword.operator.word.mnemonic.other.vps"
         },
         {
@@ -920,11 +920,11 @@
           "name": "keyword.operator.word.mnemonic.other.vpx"
         },
         {
-          "match": "(?i)\\bv(scalef[ps][dhs]|scatter[dq]p[ds])\\b",
+          "match": "(?i)\\bv(sca(?:lef[ps][dhs]|tter[dq]p[ds]))\\b",
           "name": "keyword.operator.word.mnemonic.other.vs"
         },
         {
-          "match": "(?i)\\b(wbnoinvd|wru?ss[dq])\\b",
+          "match": "(?i)\\b(w(?:bnoinvd|ru?ss[dq]))\\b",
           "name": "keyword.operator.word.mnemonic.other.w"
         }
       ]
@@ -951,7 +951,7 @@
           "name": "invalid.keyword.operator.word.mnemonic.sse5.packed-arithmetic"
         },
         {
-          "match": "(?i)\\b(pcmov|permp[ds]|pperm|prot[bdqw]|psh[al][bdqw])\\b",
+          "match": "(?i)\\b(p(?:cmov|ermp[ds]|perm|rot[bdqw]|sh[al][bdqw]))\\b",
           "name": "invalid.keyword.operator.word.mnemonic.sse5.simd-integer"
         }
       ]
@@ -963,7 +963,7 @@
           "name": "keyword.operator.word.mnemonic.mmx.data-transfer"
         },
         {
-          "match": "(?i)\\b(pack(ssdw|[su]swb)|punpck[hl](bw|dq|wd))\\b",
+          "match": "(?i)\\b(p(?:ack(ssdw|[su]swb)|unpck[hl](bw|dq|wd)))\\b",
           "name": "keyword.operator.word.mnemonic.mmx.conversion"
         },
         {
@@ -975,7 +975,7 @@
           "name": "keyword.operator.word.mnemonic.mmx.comparison"
         },
         {
-          "match": "(?i)\\b(pandn?|px?or)\\b",
+          "match": "(?i)\\b(p(?:andn?|x?or))\\b",
           "name": "keyword.operator.word.mnemonic.mmx.logical"
         },
         {
@@ -1099,7 +1099,7 @@
           "name": "keyword.operator.word.mnemonic.sse.state-management"
         },
         {
-          "match": "(?i)\\b(p(avg[bw]|extrw|insrw|(max|min)(sw|ub)|sadbw|shufw|mulhuw|movmskb))\\b",
+          "match": "(?i)\\b(p(avg[bw]|extrw|insrw|(m(?:ax|in))(sw|ub)|sadbw|shufw|mulhuw|movmskb))\\b",
           "name": "keyword.operator.word.mnemonic.sse.simd-integer"
         },
         {
@@ -1187,7 +1187,7 @@
           "name": "keyword.operator.word.mnemonic.sse4.1.packed-blending"
         },
         {
-          "match": "(?i)\\b(p(min|max)(u[dw]|s[bd]))\\b",
+          "match": "(?i)\\b(p(m(?:in|ax))(u[dw]|s[bd]))\\b",
           "name": "keyword.operator.word.mnemonic.sse4.1.packed-integer"
         },
         {
@@ -1239,7 +1239,7 @@
           "name": "keyword.operator.word.mnemonic.supplemental.amd.sse4.a"
         },
         {
-          "match": "(?i)\\b(vfn?m((add|sub)[ps][ds])|vfm((addsub|subadd)p[ds]))\\b",
+          "match": "(?i)\\b(vf(?:n?m((add|sub)[ps][ds])|m((addsub|subadd)p[ds])))\\b",
           "name": "keyword.operator.word.mnemonic.supplemental.amd.fma4"
         },
         {
@@ -1251,7 +1251,7 @@
           "name": "keyword.operator.word.mnemonic.supplemental.amd.xop.simd-horizontal"
         },
         {
-          "match": "(?i)\\b(vfrcz[ps][ds]|vpermil2p[ds])\\b",
+          "match": "(?i)\\b(v(?:frcz[ps][ds]|permil2p[ds]))\\b",
           "name": "keyword.operator.word.mnemonic.supplemental.amd.xop.other"
         },
         {
@@ -1259,7 +1259,7 @@
           "name": "keyword.operator.word.mnemonic.supplemental.amd.3dnow"
         },
         {
-          "match": "(?i)\\b(p(avgusb|(f2i|i2f)[dw]|mulhrw|swapd)|pf((p?n)?acc|add|max|min|mul|rcp(it[12])?|rsqit1|rsqrt|subr?))\\b",
+          "match": "(?i)\\b(p(?:(avgusb|(f2i|i2f)[dw]|mulhrw|swapd)|f((p?n)?acc|add|max|min|mul|rcp(it[12])?|rsqit1|rsqrt|subr?)))\\b",
           "name": "keyword.operator.word.mnemonic.supplemental.amd.3dnow.simd"
         },
         {
@@ -1295,7 +1295,7 @@
           "name": "keyword.operator.word.mnemonic.system"
         },
         {
-          "match": "(?i)\\b(lock|hlt|rsm|(rd|wr)(msr|pkru|[fg]sbase)|rd(pmc|tscp?)|sys(enter|exit))\\b",
+          "match": "(?i)\\b(lock|hlt|rsm|(rd|wr)(msr|pkru|[fg]sbase)|rd(pmc|tscp?)|sys(e(?:nter|xit)))\\b",
           "name": "keyword.operator.word.mnemonic.system"
         },
         {
@@ -1355,13 +1355,13 @@
           ]
         },
         {
-          "begin": "^\\s*[#%]\\s*(include|import)\\b\\s+",
+          "begin": "^\\s*[#%]\\s*(i(?:nclude|mport))\\b\\s+",
           "captures": {
             "1": {
               "name": "keyword.control.import.include.c"
             }
           },
-          "end": "(?=(?://|/\\*))|$",
+          "end": "(?=/[/*])|$",
           "name": "meta.preprocessor.c.include",
           "patterns": [
             {
@@ -1407,7 +1407,7 @@
               "name": "keyword.control.import.c"
             }
           },
-          "end": "(?=(?://|/\\*))|$",
+          "end": "(?=/[/*])|$",
           "name": "meta.preprocessor.c",
           "patterns": [
             {
@@ -1420,7 +1420,7 @@
           ]
         },
         {
-          "begin": "^\\s*[#%]\\s*(assign|strlen|substr|(end|exit)?rep|push|pop|rotate|use|ifusing|ifusable|def(?:ailas|str|tok)|undef(?:alias)?)\\b",
+          "begin": "^\\s*[#%]\\s*(assign|strlen|substr|(e(?:nd|xit))?rep|push|pop|rotate|use|ifusing|ifusable|def(?:ailas|str|tok)|undef(?:alias)?)\\b",
           "captures": {
             "1": {
               "name": "keyword.control"
@@ -1443,7 +1443,7 @@
     "preprocessor-functions": {
       "patterns": [
         {
-          "begin": "((%)(?:(abs|cond|count|eval|isn?(?:def|macro|ctx|idni?|id|num|str|token|empty|env)?|num|sel|str(?:cat|len)?|substr|tok)\\s*(\\()))",
+          "begin": "((%)(abs|cond|count|eval|isn?(?:def|macro|ctx|idni?|id|num|str|token|empty|env)?|num|sel|str(?:cat|len)?|substr|tok)\\s*(\\())",
           "captures": {
             "3": {
               "name": "support.function.preprocessor.asm.x86_64"
@@ -1462,27 +1462,27 @@
     "registers": {
       "patterns": [
         {
-          "match": "(?i)\\b(?:[abcd][hl]|[er]?[abcd]x|[er]?(?:di|si|bp|sp)|dil|sil|bpl|spl|r(?:8|9|1[0-5])[bdlw]?)\\b",
+          "match": "(?i)\\b(?:[abcd][hl]|[er]?[abcd]x|[er]?(?:di|si|bp|sp)|dil|sil|bpl|spl|r(?:[89]|1[0-5])[bdlw]?)\\b",
           "name": "constant.language.register.general-purpose.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[cdefgs]s)\\b",
+          "match": "(?i)\\b[cdefgs]s\\b",
           "name": "constant.language.register.segment.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[er]?flags)\\b",
+          "match": "(?i)\\b[er]?flags\\b",
           "name": "constant.language.register.flags.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[er]?ip)\\b",
+          "match": "(?i)\\b[er]?ip\\b",
           "name": "constant.language.register.instruction-pointer.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:cr[02-4])\\b",
+          "match": "(?i)\\bcr[02-4]\\b",
           "name": "constant.language.register.control.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:mm|st|fpr)[0-7])\\b",
+          "match": "(?i)\\b(?:mm|st|fpr)[0-7]\\b",
           "name": "constant.language.register.mmx.asm.x86_64"
         },
         {
@@ -1490,19 +1490,19 @@
           "name": "constant.language.register.sse_avx.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:zmm(?:[12]?[0-9]|30|31))\\b",
+          "match": "(?i)\\bzmm(?:[12]?[0-9]|30|31)\\b",
           "name": "constant.language.register.avx512.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:bnd(?:[0-3]|cfg[su]|status))\\b",
+          "match": "(?i)\\bbnd(?:[0-3]|cfg[su]|status)\\b",
           "name": "constant.language.register.memory-protection.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:(?:[gil]dt)r?|tr)\\b",
+          "match": "(?i)\\b(?:[gil]dtr?|tr)\\b",
           "name": "constant.language.register.system-table-pointer.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:dr[0-367])\\b",
+          "match": "(?i)\\bdr[0-367]\\b",
           "name": "constant.language.register.debug.asm.x86_64"
         },
         {
@@ -1607,7 +1607,7 @@
           "name": "storage.modifier.asm.x86_64"
         },
         {
-          "match": "(?i)\\b(?:[ao](?:16|32|64))\\b",
+          "match": "(?i)\\b[ao](?:16|32|64)\\b",
           "name": "storage.modifier.prefix.asm.x86_64"
         },
         {
@@ -1620,7 +1620,7 @@
               "name": "storage.modifier.prefix.vex.asm.x86_64"
             }
           },
-          "match": "{(vex[23]?|evex|rex)}"
+          "match": "\\{(vex[23]?|evex|rex)}"
         },
         {
           "captures": {
@@ -1628,7 +1628,7 @@
               "name": "storage.modifier.opmask.asm.x86_64"
             }
           },
-          "match": "{(k[1-7])}"
+          "match": "\\{(k[1-7])}"
         },
         {
           "captures": {
@@ -1636,7 +1636,7 @@
               "name": "storage.modifier.precision.asm.x86_64"
             }
           },
-          "match": "{(1to(?:8|16))}"
+          "match": "\\{(1to(?:8|16))}"
         },
         {
           "captures": {
@@ -1644,18 +1644,18 @@
               "name": "storage.modifier.rounding.asm.x86_64"
             }
           },
-          "match": "{(z|(?:r[nudz]-)?sae)}"
+          "match": "\\{(z|(?:r[nudz]-)?sae)}"
         },
         {
           "match": "\\.\\.(?:start|imagebase|tlvp|got(?:pc(?:rel)?|(?:tp)?off)?|plt|sym|tlsie)\\b",
           "name": "support.constant.asm.x86_64"
         },
         {
-          "match": "\\b__\\?(?:utf(?:(?:16|32)(?:[lb]e)?)|float(?:8|16|32|64|80[me]|128[lh])|bfloat16|Infinity|[QS]?NaN)\\?__\\b",
+          "match": "\\b__\\?(?:utf(?:16|32)(?:[lb]e)?|float(?:8|16|32|64|80[me]|128[lh])|bfloat16|Infinity|[QS]?NaN)\\?__\\b",
           "name": "support.function.asm.x86_64"
         },
         {
-          "match": "\\b__(?:utf(?:(?:16|32)(?:[lb]e)?)|float(?:8|16|32|64|80[me]|128[lh])|bfloat16|Infinity|[QS]?NaN)__\\b",
+          "match": "\\b__(?:utf(?:16|32)(?:[lb]e)?|float(?:8|16|32|64|80[me]|128[lh])|bfloat16|Infinity|[QS]?NaN)__\\b",
           "name": "support.function.legacy.asm.x86_64"
         },
         {
@@ -1675,7 +1675,7 @@
           "name": "support.function.asm.x86_64"
         },
         {
-          "match": "\\b__\\?USE_(?:\\w+)\\?__\\b",
+          "match": "\\b__\\?USE_\\w+\\?__\\b",
           "name": "support.function.asm.x86_64"
         },
         {
@@ -1707,7 +1707,7 @@
           "name": "support.function.asm.x86_64"
         },
         {
-          "match": "\\b__USE_(?:\\w+)__\\b",
+          "match": "\\b__USE_\\w+__\\b",
           "name": "support.function.asm.x86_64"
         },
         {
@@ -1727,7 +1727,7 @@
           "name": "support.constant.fp.asm.x86_64"
         },
         {
-          "match": "\\b(?:float(?:8|16|32|64|80[me]|128[lh]))\\b",
+          "match": "\\bfloat(?:8|16|32|64|80[me]|128[lh])\\b",
           "name": "support.function.fp.asm.x86_64"
         },
         {
diff --git a/resources/languages/astro.json b/resources/languages/astro.json
index a4b1e73..56b4df9 100644
--- a/resources/languages/astro.json
+++ b/resources/languages/astro.json
@@ -257,11 +257,11 @@
                       ]
                     }
                   },
-                  "match": "(([^\\s\\\"'=<>`/]|/(?!>))+)",
+                  "match": "(([^\\s\"'=<>`/]|/(?!>))+)",
                   "name": "string.unquoted.astro"
                 },
                 {
-                  "begin": "([\"])",
+                  "begin": "(\")",
                   "beginCaptures": {
                     "0": {
                       "name": "punctuation.definition.string.begin.astro"
@@ -285,7 +285,7 @@
                           ]
                         }
                       },
-                      "match": "([^\\n\\\"/]|/(?![/*]))+"
+                      "match": "([^\\n\"/]|/(?![/*]))+"
                     },
                     {
                       "begin": "//",
@@ -294,7 +294,7 @@
                           "name": "punctuation.definition.comment.js"
                         }
                       },
-                      "end": "(?=\\\")|\\n",
+                      "end": "(?=\")|\\n",
                       "name": "comment.line.double-slash.js"
                     },
                     {
@@ -304,7 +304,7 @@
                           "name": "punctuation.definition.comment.begin.js"
                         }
                       },
-                      "end": "(?=\\\")|\\*/",
+                      "end": "(?=\")|\\*/",
                       "endCaptures": {
                         "0": {
                           "name": "punctuation.definition.comment.end.js"
@@ -315,7 +315,7 @@
                   ]
                 },
                 {
-                  "begin": "(['])",
+                  "begin": "(')",
                   "beginCaptures": {
                     "0": {
                       "name": "punctuation.definition.string.begin.astro"
@@ -339,7 +339,7 @@
                           ]
                         }
                       },
-                      "match": "([^\\n\\'/]|/(?![/*]))+"
+                      "match": "([^\\n'/]|/(?![/*]))+"
                     },
                     {
                       "begin": "//",
@@ -348,7 +348,7 @@
                           "name": "punctuation.definition.comment.js"
                         }
                       },
-                      "end": "(?=\\')|\\n",
+                      "end": "(?=')|\\n",
                       "name": "comment.line.double-slash.js"
                     },
                     {
@@ -358,7 +358,7 @@
                           "name": "punctuation.definition.comment.begin.js"
                         }
                       },
-                      "end": "(?=\\')|\\*/",
+                      "end": "(?=')|\\*/",
                       "endCaptures": {
                         "0": {
                           "name": "punctuation.definition.comment.end.js"
@@ -375,9 +375,9 @@
       ]
     },
     "attributes-interpolated": {
-      "begin": "(?<!:|=)\\s*({)",
+      "begin": "(?<![:=])\\s*(\\{)",
       "contentName": "meta.embedded.expression.astro source.tsx",
-      "end": "(\\})",
+      "end": "(})",
       "patterns": [
         {
           "include": "source.tsx"
@@ -471,7 +471,7 @@
               "name": "punctuation.definition.entity.astro"
             }
           },
-          "match": "(&)(?=[a-zA-Z])((a(s(ymp(eq)?|cr|t)|n(d(slope|d|v|and)?|g(s(t|ph)|zarr|e|le|rt(vb(d)?)?|msd(a(h|c|d|e|f|a|g|b))?)?)|c(y|irc|d|ute|E)?|tilde|o(pf|gon)|uml|p(id|os|prox(eq)?|e|E|acir)?|elig|f(r)?|w(conint|int)|l(pha|e(ph|fsym))|acute|ring|grave|m(p|a(cr|lg))|breve)|A(s(sign|cr)|nd|MP|c(y|irc)|tilde|o(pf|gon)|uml|pplyFunction|fr|Elig|lpha|acute|ring|grave|macr|breve))|(B(scr|cy|opf|umpeq|e(cause|ta|rnoullis)|fr|a(ckslash|r(v|wed))|reve)|b(s(cr|im(e)?|ol(hsub|b)?|emi)|n(ot|e(quiv)?)|c(y|ong)|ig(s(tar|qcup)|c(irc|up|ap)|triangle(down|up)|o(times|dot|plus)|uplus|vee|wedge)|o(t(tom)?|pf|wtie|x(h(d|u|D|U)?|times|H(d|u|D|U)?|d(R|l|r|L)|u(R|l|r|L)|plus|D(R|l|r|L)|v(R|h|H|l|r|L)?|U(R|l|r|L)|V(R|h|H|l|r|L)?|minus|box))|Not|dquo|u(ll(et)?|mp(e(q)?|E)?)|prime|e(caus(e)?|t(h|ween|a)|psi|rnou|mptyv)|karow|fr|l(ock|k(1(2|4)|34)|a(nk|ck(square|triangle(down|left|right)?|lozenge)))|a(ck(sim(eq)?|cong|prime|epsilon)|r(vee|wed(ge)?))|r(eve|vbar)|brk(tbrk)?))|(c(s(cr|u(p(e)?|b(e)?))|h(cy|i|eck(mark)?)|ylcty|c(irc|ups(sm)?|edil|a(ps|ron))|tdot|ir(scir|c(eq|le(d(R|circ|S|dash|ast)|arrow(left|right)))?|e|fnint|E|mid)?|o(n(int|g(dot)?)|p(y(sr)?|f|rod)|lon(e(q)?)?|m(p(fn|le(xes|ment))?|ma(t)?))|dot|u(darr(l|r)|p(s|c(up|ap)|or|dot|brcap)?|e(sc|pr)|vee|wed|larr(p)?|r(vearrow(left|right)|ly(eq(succ|prec)|vee|wedge)|arr(m)?|ren))|e(nt(erdot)?|dil|mptyv)|fr|w(conint|int)|lubs(uit)?|a(cute|p(s|c(up|ap)|dot|and|brcup)?|r(on|et))|r(oss|arr))|C(scr|hi|c(irc|onint|edil|aron)|ircle(Minus|Times|Dot|Plus)|Hcy|o(n(tourIntegral|int|gruent)|unterClockwiseContourIntegral|p(f|roduct)|lon(e)?)|dot|up(Cap)?|OPY|e(nterDot|dilla)|fr|lo(seCurly(DoubleQuote|Quote)|ckwiseContourIntegral)|a(yleys|cute|p(italDifferentialD)?)|ross))|(d(s(c(y|r)|trok|ol)|har(l|r)|c(y|aron)|t(dot|ri(f)?)|i(sin|e|v(ide(ontimes)?|onx)?|am(s|ond(suit)?)?|gamma)|Har|z(cy|igrarr)|o(t(square|plus|eq(dot)?|minus)?|ublebarwedge|pf|wn(harpoon(left|right)|downarrows|arrow)|llar)|d(otseq|a(rr|gger))?|u(har|arr)|jcy|e(lta|g|mptyv)|f(isht|r)|wangle|lc(orn|rop)|a(sh(v)?|leth|rr|gger)|r(c(orn|rop)|bkarow)|b(karow|lac)|Arr)|D(s(cr|trok)|c(y|aron)|Scy|i(fferentialD|a(critical(Grave|Tilde|Do(t|ubleAcute)|Acute)|mond))|o(t(Dot|Equal)?|uble(Right(Tee|Arrow)|ContourIntegral|Do(t|wnArrow)|Up(DownArrow|Arrow)|VerticalBar|L(ong(RightArrow|Left(RightArrow|Arrow))|eft(RightArrow|Tee|Arrow)))|pf|wn(Right(TeeVector|Vector(Bar)?)|Breve|Tee(Arrow)?|arrow|Left(RightVector|TeeVector|Vector(Bar)?)|Arrow(Bar|UpArrow)?))|Zcy|el(ta)?|D(otrahd)?|Jcy|fr|a(shv|rr|gger)))|(e(s(cr|im|dot)|n(sp|g)|c(y|ir(c)?|olon|aron)|t(h|a)|o(pf|gon)|dot|u(ro|ml)|p(si(v|lon)?|lus|ar(sl)?)|e|D(ot|Dot)|q(s(im|lant(less|gtr))|c(irc|olon)|u(iv(DD)?|est|als)|vparsl)|f(Dot|r)|l(s(dot)?|inters|l)?|a(ster|cute)|r(Dot|arr)|g(s(dot)?|rave)?|x(cl|ist|p(onentiale|ectation))|m(sp(1(3|4))?|pty(set|v)?|acr))|E(s(cr|im)|c(y|irc|aron)|ta|o(pf|gon)|NG|dot|uml|TH|psilon|qu(ilibrium|al(Tilde)?)|fr|lement|acute|grave|x(ists|ponentialE)|m(pty(SmallSquare|VerySmallSquare)|acr)))|(f(scr|nof|cy|ilig|o(pf|r(k(v)?|all))|jlig|partint|emale|f(ilig|l(ig|lig)|r)|l(tns|lig|at)|allingdotseq|r(own|a(sl|c(1(2|8|3|4|5|6)|78|2(3|5)|3(8|4|5)|45|5(8|6)))))|F(scr|cy|illed(SmallSquare|VerySmallSquare)|o(uriertrf|pf|rAll)|fr))|(G(scr|c(y|irc|edil)|t|opf|dot|T|Jcy|fr|amma(d)?|reater(Greater|SlantEqual|Tilde|Equal(Less)?|FullEqual|Less)|g|breve)|g(s(cr|im(e|l)?)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|irc)|t(c(c|ir)|dot|quest|lPar|r(sim|dot|eq(qless|less)|less|a(pprox|rr)))?|imel|opf|dot|jcy|e(s(cc|dot(o(l)?)?|l(es)?)?|q(slant|q)?|l)?|v(nE|ertneqq)|fr|E(l)?|l(j|E|a)?|a(cute|p|mma(d)?)|rave|g(g)?|breve))|(h(s(cr|trok|lash)|y(phen|bull)|circ|o(ok(leftarrow|rightarrow)|pf|arr|rbar|mtht)|e(llip|arts(uit)?|rcon)|ks(earow|warow)|fr|a(irsp|lf|r(dcy|r(cir|w)?)|milt)|bar|Arr)|H(s(cr|trok)|circ|ilbertSpace|o(pf|rizontalLine)|ump(DownHump|Equal)|fr|a(cek|t)|ARDcy))|(i(s(cr|in(s(v)?|dot|v|E)?)|n(care|t(cal|prod|e(rcal|gers)|larhk)?|odot|fin(tie)?)?|c(y|irc)?|t(ilde)?|i(nfin|i(nt|int)|ota)?|o(cy|ta|pf|gon)|u(kcy|ml)|jlig|prod|e(cy|xcl)|quest|f(f|r)|acute|grave|m(of|ped|a(cr|th|g(part|e|line))))|I(scr|n(t(e(rsection|gral))?|visible(Comma|Times))|c(y|irc)|tilde|o(ta|pf|gon)|dot|u(kcy|ml)|Ocy|Jlig|fr|Ecy|acute|grave|m(plies|a(cr|ginaryI))?))|(j(s(cr|ercy)|c(y|irc)|opf|ukcy|fr|math)|J(s(cr|ercy)|c(y|irc)|opf|ukcy|fr))|(k(scr|hcy|c(y|edil)|opf|jcy|fr|appa(v)?|green)|K(scr|c(y|edil)|Hcy|opf|Jcy|fr|appa))|(l(s(h|cr|trok|im(e|g)?|q(uo(r)?|b)|aquo)|h(ar(d|u(l)?)|blk)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|ub|e(il|dil)|aron)|Barr|t(hree|c(c|ir)|imes|dot|quest|larr|r(i(e|f)?|Par))?|Har|o(ng(left(arrow|rightarrow)|rightarrow|mapsto)|times|z(enge|f)?|oparrow(left|right)|p(f|lus|ar)|w(ast|bar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|r(dhar|ushar))|ur(dshar|uhar)|jcy|par(lt)?|e(s(s(sim|dot|eq(qgtr|gtr)|approx|gtr)|cc|dot(o(r)?)?|g(es)?)?|q(slant|q)?|ft(harpoon(down|up)|threetimes|leftarrows|arrow(tail)?|right(squigarrow|harpoons|arrow(s)?))|g)?|v(nE|ertneqq)|f(isht|loor|r)|E(g)?|l(hard|corner|tri|arr)?|a(ng(d|le)?|cute|t(e(s)?|ail)?|p|emptyv|quo|rr(sim|hk|tl|pl|fs|lp|b(fs)?)?|gran|mbda)|r(har(d)?|corner|tri|arr|m)|g(E)?|m(idot|oust(ache)?)|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr))|L(s(h|cr|trok)|c(y|edil|aron)|t|o(ng(RightArrow|left(arrow|rightarrow)|rightarrow|Left(RightArrow|Arrow))|pf|wer(RightArrow|LeftArrow))|T|e(ss(Greater|SlantEqual|Tilde|EqualGreater|FullEqual|Less)|ft(Right(Vector|Arrow)|Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|rightarrow|Floor|A(ngleBracket|rrow(RightArrow|Bar)?)))|Jcy|fr|l(eftarrow)?|a(ng|cute|placetrf|rr|mbda)|midot))|(M(scr|cy|inusPlus|opf|u|e(diumSpace|llintrf)|fr|ap)|m(s(cr|tpos)|ho|nplus|c(y|omma)|i(nus(d(u)?|b)?|cro|d(cir|dot|ast)?)|o(dels|pf)|dash|u(ltimap|map)?|p|easuredangle|DDot|fr|l(cp|dr)|a(cr|p(sto(down|up|left)?)?|l(t(ese)?|e)|rker)))|(n(s(hort(parallel|mid)|c(cue|e|r)?|im(e(q)?)?|u(cc(eq)?|p(set(eq(q)?)?|e|E)?|b(set(eq(q)?)?|e|E)?)|par|qsu(pe|be)|mid)|Rightarrow|h(par|arr|Arr)|G(t(v)?|g)|c(y|ong(dot)?|up|edil|a(p|ron))|t(ilde|lg|riangle(left(eq)?|right(eq)?)|gl)|i(s(d)?|v)?|o(t(ni(v(c|a|b))?|in(dot|v(c|a|b)|E)?)?|pf)|dash|u(m(sp|ero)?)?|jcy|p(olint|ar(sl|t|allel)?|r(cue|e(c(eq)?)?)?)|e(s(im|ear)|dot|quiv|ar(hk|r(ow)?)|xist(s)?|Arr)?|v(sim|infin|Harr|dash|Dash|l(t(rie)?|e|Arr)|ap|r(trie|Arr)|g(t|e))|fr|w(near|ar(hk|r(ow)?)|Arr)|V(dash|Dash)|l(sim|t(ri(e)?)?|dr|e(s(s)?|q(slant|q)?|ft(arrow|rightarrow))?|E|arr|Arr)|a(ng|cute|tur(al(s)?)?|p(id|os|prox|E)?|bla)|r(tri(e)?|ightarrow|arr(c|w)?|Arr)|g(sim|t(r)?|e(s|q(slant|q)?)?|E)|mid|L(t(v)?|eft(arrow|rightarrow)|l)|b(sp|ump(e)?))|N(scr|c(y|edil|aron)|tilde|o(nBreakingSpace|Break|t(R(ightTriangle(Bar|Equal)?|everseElement)|Greater(Greater|SlantEqual|Tilde|Equal|FullEqual|Less)?|S(u(cceeds(SlantEqual|Tilde|Equal)?|perset(Equal)?|bset(Equal)?)|quareSu(perset(Equal)?|bset(Equal)?))|Hump(DownHump|Equal)|Nested(GreaterGreater|LessLess)|C(ongruent|upCap)|Tilde(Tilde|Equal|FullEqual)?|DoubleVerticalBar|Precedes(SlantEqual|Equal)?|E(qual(Tilde)?|lement|xists)|VerticalBar|Le(ss(Greater|SlantEqual|Tilde|Equal|Less)?|ftTriangle(Bar|Equal)?))?|pf)|u|e(sted(GreaterGreater|LessLess)|wLine|gative(MediumSpace|Thi(nSpace|ckSpace)|VeryThinSpace))|Jcy|fr|acute))|(o(s(cr|ol|lash)|h(m|bar)|c(y|ir(c)?)|ti(lde|mes(as)?)|S|int|opf|d(sold|iv|ot|ash|blac)|uml|p(erp|lus|ar)|elig|vbar|f(cir|r)|l(c(ir|ross)|t|ine|arr)|a(st|cute)|r(slope|igof|or|d(er(of)?|f|m)?|v|arr)?|g(t|on|rave)|m(i(nus|cron|d)|ega|acr))|O(s(cr|lash)|c(y|irc)|ti(lde|mes)|opf|dblac|uml|penCurly(DoubleQuote|Quote)|ver(B(ar|rac(e|ket))|Parenthesis)|fr|Elig|acute|r|grave|m(icron|ega|acr)))|(p(s(cr|i)|h(i(v)?|one|mmat)|cy|i(tchfork|v)?|o(intint|und|pf)|uncsp|er(cnt|tenk|iod|p|mil)|fr|l(us(sim|cir|two|d(o|u)|e|acir|mn|b)?|an(ck(h)?|kv))|ar(s(im|l)|t|a(llel)?)?|r(sim|n(sim|E|ap)|cue|ime(s)?|o(d|p(to)?|f(surf|line|alar))|urel|e(c(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?)?|E|ap)?|m)|P(s(cr|i)|hi|cy|i|o(incareplane|pf)|fr|lusMinus|artialD|r(ime|o(duct|portion(al)?)|ecedes(SlantEqual|Tilde|Equal)?)?))|(q(scr|int|opf|u(ot|est(eq)?|at(int|ernions))|prime|fr)|Q(scr|opf|UOT|fr))|(R(s(h|cr)|ho|c(y|edil|aron)|Barr|ight(Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|Floor|A(ngleBracket|rrow(Bar|LeftArrow)?))|o(undImplies|pf)|uleDelayed|e(verse(UpEquilibrium|E(quilibrium|lement)))?|fr|EG|a(ng|cute|rr(tl)?)|rightarrow)|r(s(h|cr|q(uo(r)?|b)|aquo)|h(o(v)?|ar(d|u(l)?))|nmid|c(y|ub|e(il|dil)|aron)|Barr|t(hree|imes|ri(e|f|ltri)?)|i(singdotseq|ng|ght(squigarrow|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(tail)?|rightarrows))|Har|o(times|p(f|lus|ar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|ldhar)|uluhar|p(polint|ar(gt)?)|e(ct|al(s|ine|part)?|g)|f(isht|loor|r)|l(har|arr|m)|a(ng(d|e|le)?|c(ute|e)|t(io(nals)?|ail)|dic|emptyv|quo|rr(sim|hk|c|tl|pl|fs|w|lp|ap|b(fs)?)?)|rarr|x|moust(ache)?|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr)))|(s(s(cr|tarf|etmn|mile)|h(y|c(hcy|y)|ort(parallel|mid)|arp)|c(sim|y|n(sim|E|ap)|cue|irc|polint|e(dil)?|E|a(p|ron))?|t(ar(f)?|r(ns|aight(phi|epsilon)))|i(gma(v|f)?|m(ne|dot|plus|e(q)?|l(E)?|rarr|g(E)?)?)|zlig|o(pf|ftcy|l(b(ar)?)?)|dot(e|b)?|u(ng|cc(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?|p(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|hs(ol|ub)|1|n(e|E)|2|d(sub|ot)|3|plus|e(dot)?|E|larr|mult)?|m|b(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|n(e|E)|dot|plus|e(dot)?|E|rarr|mult)?)|pa(des(uit)?|r)|e(swar|ct|tm(n|inus)|ar(hk|r(ow)?)|xt|mi|Arr)|q(su(p(set(eq)?|e)?|b(set(eq)?|e)?)|c(up(s)?|ap(s)?)|u(f|ar(e|f))?)|fr(own)?|w(nwar|ar(hk|r(ow)?)|Arr)|larr|acute|rarr|m(t(e(s)?)?|i(d|le)|eparsl|a(shp|llsetminus))|bquo)|S(scr|hort(RightArrow|DownArrow|UpArrow|LeftArrow)|c(y|irc|edil|aron)?|tar|igma|H(cy|CHcy)|opf|u(c(hThat|ceeds(SlantEqual|Tilde|Equal)?)|p(set|erset(Equal)?)?|m|b(set(Equal)?)?)|OFTcy|q(uare(Su(perset(Equal)?|bset(Equal)?)|Intersection|Union)?|rt)|fr|acute|mallCircle))|(t(s(hcy|c(y|r)|trok)|h(i(nsp|ck(sim|approx))|orn|e(ta(sym|v)?|re(4|fore))|k(sim|ap))|c(y|edil|aron)|i(nt|lde|mes(d|b(ar)?)?)|o(sa|p(cir|f(ork)?|bot)?|ea)|dot|prime|elrec|fr|w(ixt|ohead(leftarrow|rightarrow))|a(u|rget)|r(i(sb|time|dot|plus|e|angle(down|q|left(eq)?|right(eq)?)?|minus)|pezium|ade)|brk)|T(s(cr|trok)|RADE|h(i(nSpace|ckSpace)|e(ta|refore))|c(y|edil|aron)|S(cy|Hcy)|ilde(Tilde|Equal|FullEqual)?|HORN|opf|fr|a(u|b)|ripleDot))|(u(scr|h(ar(l|r)|blk)|c(y|irc)|t(ilde|dot|ri(f)?)|Har|o(pf|gon)|d(har|arr|blac)|u(arr|ml)|p(si(h|lon)?|harpoon(left|right)|downarrow|uparrows|lus|arrow)|f(isht|r)|wangle|l(c(orn(er)?|rop)|tri)|a(cute|rr)|r(c(orn(er)?|rop)|tri|ing)|grave|m(l|acr)|br(cy|eve)|Arr)|U(scr|n(ion(Plus)?|der(B(ar|rac(e|ket))|Parenthesis))|c(y|irc)|tilde|o(pf|gon)|dblac|uml|p(si(lon)?|downarrow|Tee(Arrow)?|per(RightArrow|LeftArrow)|DownArrow|Equilibrium|arrow|Arrow(Bar|DownArrow)?)|fr|a(cute|rr(ocir)?)|ring|grave|macr|br(cy|eve)))|(v(s(cr|u(pn(e|E)|bn(e|E)))|nsu(p|b)|cy|Bar(v)?|zigzag|opf|dash|prop|e(e(eq|bar)?|llip|r(t|bar))|Dash|fr|ltri|a(ngrt|r(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|t(heta|riangle(left|right))|p(hi|i|ropto)|epsilon|kappa|r(ho)?))|rtri|Arr)|V(scr|cy|opf|dash(l)?|e(e|r(yThinSpace|t(ical(Bar|Separator|Tilde|Line))?|bar))|Dash|vdash|fr|bar))|(w(scr|circ|opf|p|e(ierp|d(ge(q)?|bar))|fr|r(eath)?)|W(scr|circ|opf|edge|fr))|(X(scr|i|opf|fr)|x(s(cr|qcup)|h(arr|Arr)|nis|c(irc|up|ap)|i|o(time|dot|p(f|lus))|dtri|u(tri|plus)|vee|fr|wedge|l(arr|Arr)|r(arr|Arr)|map))|(y(scr|c(y|irc)|icy|opf|u(cy|ml)|en|fr|ac(y|ute))|Y(scr|c(y|irc)|opf|uml|Icy|Ucy|fr|acute|Acy))|(z(scr|hcy|c(y|aron)|igrarr|opf|dot|e(ta|etrf)|fr|w(nj|j)|acute)|Z(scr|c(y|aron)|Hcy|opf|dot|e(ta|roWidthSpace)|fr|acute)))(;)",
+          "match": "(&)(?=[a-zA-Z])((a(s(ymp(eq)?|cr|t)|n(d(slope|[dv]|and)?|g(s(t|ph)|zarr|e|le|rt(vb(d)?)?|msd(a([hcdefagb]))?)?)|c(y|irc|d|ute|E)?|tilde|o(pf|gon)|uml|p(id|os|prox(eq)?|[eE]|acir)?|elig|f(r)?|w(conint|int)|l(pha|e(ph|fsym))|acute|ring|grave|m(p|a(cr|lg))|breve)|A(s(sign|cr)|nd|MP|c(y|irc)|tilde|o(pf|gon)|uml|pplyFunction|fr|Elig|lpha|acute|ring|grave|macr|breve))|(B(scr|cy|opf|umpeq|e(cause|ta|rnoullis)|fr|a(ckslash|r(v|wed))|reve)|b(s(cr|im(e)?|ol(hsub|b)?|emi)|n(ot|e(quiv)?)|c(y|ong)|ig(s(tar|qcup)|c(irc|up|ap)|triangle(down|up)|o(times|dot|plus)|uplus|vee|wedge)|o(t(tom)?|pf|wtie|x(h([duDU])?|times|H([duDU])?|d([RlrL])|u([RlrL])|plus|D([RlrL])|v([RhHlrL])?|U([RlrL])|V([RhHlrL])?|minus|box))|Not|dquo|u(ll(et)?|mp(e(q)?|E)?)|prime|e(caus(e)?|t(h|ween|a)|psi|rnou|mptyv)|karow|fr|l(ock|k(1([24])|34)|a(nk|ck(square|triangle(down|left|right)?|lozenge)))|a(ck(sim(eq)?|cong|prime|epsilon)|r(vee|wed(ge)?))|r(eve|vbar)|brk(tbrk)?))|(c(s(cr|u(p(e)?|b(e)?))|h(cy|i|eck(mark)?)|ylcty|c(irc|ups(sm)?|edil|a(ps|ron))|tdot|ir(scir|c(eq|le(d(R|circ|S|dash|ast)|arrow(left|right)))?|e|fnint|E|mid)?|o(n(int|g(dot)?)|p(y(sr)?|f|rod)|lon(e(q)?)?|m(p(fn|le(xes|ment))?|ma(t)?))|dot|u(darr([lr])|p(s|c(up|ap)|or|dot|brcap)?|e(sc|pr)|vee|wed|larr(p)?|r(vearrow(left|right)|ly(eq(succ|prec)|vee|wedge)|arr(m)?|ren))|e(nt(erdot)?|dil|mptyv)|fr|w(conint|int)|lubs(uit)?|a(cute|p(s|c(up|ap)|dot|and|brcup)?|r(on|et))|r(oss|arr))|C(scr|hi|c(irc|onint|edil|aron)|ircle(Minus|Times|Dot|Plus)|Hcy|o(n(tourIntegral|int|gruent)|unterClockwiseContourIntegral|p(f|roduct)|lon(e)?)|dot|up(Cap)?|OPY|e(nterDot|dilla)|fr|lo(seCurly(DoubleQuote|Quote)|ckwiseContourIntegral)|a(yleys|cute|p(italDifferentialD)?)|ross))|(d(s(c([yr])|trok|ol)|har([lr])|c(y|aron)|t(dot|ri(f)?)|i(sin|e|v(ide(ontimes)?|onx)?|am(s|ond(suit)?)?|gamma)|Har|z(cy|igrarr)|o(t(square|plus|eq(dot)?|minus)?|ublebarwedge|pf|wn(harpoon(left|right)|downarrows|arrow)|llar)|d(otseq|a(rr|gger))?|u(har|arr)|jcy|e(lta|g|mptyv)|f(isht|r)|wangle|lc(orn|rop)|a(sh(v)?|leth|rr|gger)|r(c(orn|rop)|bkarow)|b(karow|lac)|Arr)|D(s(cr|trok)|c(y|aron)|Scy|i(fferentialD|a(critical(Grave|Tilde|Do(t|ubleAcute)|Acute)|mond))|o(t(Dot|Equal)?|uble(Right(Tee|Arrow)|ContourIntegral|Do(t|wnArrow)|Up(DownArrow|Arrow)|VerticalBar|L(ong(RightArrow|Left(RightArrow|Arrow))|eft(RightArrow|Tee|Arrow)))|pf|wn(Right(TeeVector|Vector(Bar)?)|Breve|Tee(Arrow)?|arrow|Left(RightVector|TeeVector|Vector(Bar)?)|Arrow(Bar|UpArrow)?))|Zcy|el(ta)?|D(otrahd)?|Jcy|fr|a(shv|rr|gger)))|(e(s(cr|im|dot)|n(sp|g)|c(y|ir(c)?|olon|aron)|t([ha])|o(pf|gon)|dot|u(ro|ml)|p(si(v|lon)?|lus|ar(sl)?)|e|D(ot|Dot)|q(s(im|lant(less|gtr))|c(irc|olon)|u(iv(DD)?|est|als)|vparsl)|f(Dot|r)|l(s(dot)?|inters|l)?|a(ster|cute)|r(Dot|arr)|g(s(dot)?|rave)?|x(cl|ist|p(onentiale|ectation))|m(sp(1([34]))?|pty(set|v)?|acr))|E(s(cr|im)|c(y|irc|aron)|ta|o(pf|gon)|NG|dot|uml|TH|psilon|qu(ilibrium|al(Tilde)?)|fr|lement|acute|grave|x(ists|ponentialE)|m(pty(SmallSquare|VerySmallSquare)|acr)))|(f(scr|nof|cy|ilig|o(pf|r(k(v)?|all))|jlig|partint|emale|f(ilig|l(ig|lig)|r)|l(tns|lig|at)|allingdotseq|r(own|a(sl|c(1([283456])|78|2([35])|3([845])|45|5([86])))))|F(scr|cy|illed(SmallSquare|VerySmallSquare)|o(uriertrf|pf|rAll)|fr))|(G(scr|c(y|irc|edil)|t|opf|dot|T|Jcy|fr|amma(d)?|reater(Greater|SlantEqual|Tilde|Equal(Less)?|FullEqual|Less)|g|breve)|g(s(cr|im([el])?)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|irc)|t(c(c|ir)|dot|quest|lPar|r(sim|dot|eq(qless|less)|less|a(pprox|rr)))?|imel|opf|dot|jcy|e(s(cc|dot(o(l)?)?|l(es)?)?|q(slant|q)?|l)?|v(nE|ertneqq)|fr|E(l)?|l([jEa])?|a(cute|p|mma(d)?)|rave|g(g)?|breve))|(h(s(cr|trok|lash)|y(phen|bull)|circ|o(ok(leftarrow|rightarrow)|pf|arr|rbar|mtht)|e(llip|arts(uit)?|rcon)|ks(earow|warow)|fr|a(irsp|lf|r(dcy|r(cir|w)?)|milt)|bar|Arr)|H(s(cr|trok)|circ|ilbertSpace|o(pf|rizontalLine)|ump(DownHump|Equal)|fr|a(cek|t)|ARDcy))|(i(s(cr|in(s(v)?|dot|[vE])?)|n(care|t(cal|prod|e(rcal|gers)|larhk)?|odot|fin(tie)?)?|c(y|irc)?|t(ilde)?|i(nfin|i(nt|int)|ota)?|o(cy|ta|pf|gon)|u(kcy|ml)|jlig|prod|e(cy|xcl)|quest|f([fr])|acute|grave|m(of|ped|a(cr|th|g(part|e|line))))|I(scr|n(t(e(rsection|gral))?|visible(Comma|Times))|c(y|irc)|tilde|o(ta|pf|gon)|dot|u(kcy|ml)|Ocy|Jlig|fr|Ecy|acute|grave|m(plies|a(cr|ginaryI))?))|(j(s(cr|ercy)|c(y|irc)|opf|ukcy|fr|math)|J(s(cr|ercy)|c(y|irc)|opf|ukcy|fr))|(k(scr|hcy|c(y|edil)|opf|jcy|fr|appa(v)?|green)|K(scr|c(y|edil)|Hcy|opf|Jcy|fr|appa))|(l(s(h|cr|trok|im([eg])?|q(uo(r)?|b)|aquo)|h(ar(d|u(l)?)|blk)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|ub|e(il|dil)|aron)|Barr|t(hree|c(c|ir)|imes|dot|quest|larr|r(i([ef])?|Par))?|Har|o(ng(left(arrow|rightarrow)|rightarrow|mapsto)|times|z(enge|f)?|oparrow(left|right)|p(f|lus|ar)|w(ast|bar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|r(dhar|ushar))|ur(dshar|uhar)|jcy|par(lt)?|e(s(s(sim|dot|eq(qgtr|gtr)|approx|gtr)|cc|dot(o(r)?)?|g(es)?)?|q(slant|q)?|ft(harpoon(down|up)|threetimes|leftarrows|arrow(tail)?|right(squigarrow|harpoons|arrow(s)?))|g)?|v(nE|ertneqq)|f(isht|loor|r)|E(g)?|l(hard|corner|tri|arr)?|a(ng(d|le)?|cute|t(e(s)?|ail)?|p|emptyv|quo|rr(sim|hk|tl|pl|fs|lp|b(fs)?)?|gran|mbda)|r(har(d)?|corner|tri|arr|m)|g(E)?|m(idot|oust(ache)?)|b(arr|r(k(sl([du])|e)|ac([ek]))|brk)|A(tail|arr|rr))|L(s(h|cr|trok)|c(y|edil|aron)|t|o(ng(RightArrow|left(arrow|rightarrow)|rightarrow|Left(RightArrow|Arrow))|pf|wer(RightArrow|LeftArrow))|T|e(ss(Greater|SlantEqual|Tilde|EqualGreater|FullEqual|Less)|ft(Right(Vector|Arrow)|Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|rightarrow|Floor|A(ngleBracket|rrow(RightArrow|Bar)?)))|Jcy|fr|l(eftarrow)?|a(ng|cute|placetrf|rr|mbda)|midot))|(M(scr|cy|inusPlus|opf|u|e(diumSpace|llintrf)|fr|ap)|m(s(cr|tpos)|ho|nplus|c(y|omma)|i(nus(d(u)?|b)?|cro|d(cir|dot|ast)?)|o(dels|pf)|dash|u(ltimap|map)?|p|easuredangle|DDot|fr|l(cp|dr)|a(cr|p(sto(down|up|left)?)?|l(t(ese)?|e)|rker)))|(n(s(hort(parallel|mid)|c(cue|[er])?|im(e(q)?)?|u(cc(eq)?|p(set(eq(q)?)?|[eE])?|b(set(eq(q)?)?|[eE])?)|par|qsu(pe|be)|mid)|Rightarrow|h(par|arr|Arr)|G(t(v)?|g)|c(y|ong(dot)?|up|edil|a(p|ron))|t(ilde|lg|riangle(left(eq)?|right(eq)?)|gl)|i(s(d)?|v)?|o(t(ni(v([cab]))?|in(dot|v([cab])|E)?)?|pf)|dash|u(m(sp|ero)?)?|jcy|p(olint|ar(sl|t|allel)?|r(cue|e(c(eq)?)?)?)|e(s(im|ear)|dot|quiv|ar(hk|r(ow)?)|xist(s)?|Arr)?|v(sim|infin|Harr|dash|Dash|l(t(rie)?|e|Arr)|ap|r(trie|Arr)|g([te]))|fr|w(near|ar(hk|r(ow)?)|Arr)|V(dash|Dash)|l(sim|t(ri(e)?)?|dr|e(s(s)?|q(slant|q)?|ft(arrow|rightarrow))?|E|arr|Arr)|a(ng|cute|tur(al(s)?)?|p(id|os|prox|E)?|bla)|r(tri(e)?|ightarrow|arr([cw])?|Arr)|g(sim|t(r)?|e(s|q(slant|q)?)?|E)|mid|L(t(v)?|eft(arrow|rightarrow)|l)|b(sp|ump(e)?))|N(scr|c(y|edil|aron)|tilde|o(nBreakingSpace|Break|t(R(ightTriangle(Bar|Equal)?|everseElement)|Greater(Greater|SlantEqual|Tilde|Equal|FullEqual|Less)?|S(u(cceeds(SlantEqual|Tilde|Equal)?|perset(Equal)?|bset(Equal)?)|quareSu(perset(Equal)?|bset(Equal)?))|Hump(DownHump|Equal)|Nested(GreaterGreater|LessLess)|C(ongruent|upCap)|Tilde(Tilde|Equal|FullEqual)?|DoubleVerticalBar|Precedes(SlantEqual|Equal)?|E(qual(Tilde)?|lement|xists)|VerticalBar|Le(ss(Greater|SlantEqual|Tilde|Equal|Less)?|ftTriangle(Bar|Equal)?))?|pf)|u|e(sted(GreaterGreater|LessLess)|wLine|gative(MediumSpace|Thi(nSpace|ckSpace)|VeryThinSpace))|Jcy|fr|acute))|(o(s(cr|ol|lash)|h(m|bar)|c(y|ir(c)?)|ti(lde|mes(as)?)|S|int|opf|d(sold|iv|ot|ash|blac)|uml|p(erp|lus|ar)|elig|vbar|f(cir|r)|l(c(ir|ross)|t|ine|arr)|a(st|cute)|r(slope|igof|or|d(er(of)?|[fm])?|v|arr)?|g(t|on|rave)|m(i(nus|cron|d)|ega|acr))|O(s(cr|lash)|c(y|irc)|ti(lde|mes)|opf|dblac|uml|penCurly(DoubleQuote|Quote)|ver(B(ar|rac(e|ket))|Parenthesis)|fr|Elig|acute|r|grave|m(icron|ega|acr)))|(p(s(cr|i)|h(i(v)?|one|mmat)|cy|i(tchfork|v)?|o(intint|und|pf)|uncsp|er(cnt|tenk|iod|p|mil)|fr|l(us(sim|cir|two|d([ou])|e|acir|mn|b)?|an(ck(h)?|kv))|ar(s(im|l)|t|a(llel)?)?|r(sim|n(sim|E|ap)|cue|ime(s)?|o(d|p(to)?|f(surf|line|alar))|urel|e(c(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?)?|E|ap)?|m)|P(s(cr|i)|hi|cy|i|o(incareplane|pf)|fr|lusMinus|artialD|r(ime|o(duct|portion(al)?)|ecedes(SlantEqual|Tilde|Equal)?)?))|(q(scr|int|opf|u(ot|est(eq)?|at(int|ernions))|prime|fr)|Q(scr|opf|UOT|fr))|(R(s(h|cr)|ho|c(y|edil|aron)|Barr|ight(Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|Floor|A(ngleBracket|rrow(Bar|LeftArrow)?))|o(undImplies|pf)|uleDelayed|e(verse(UpEquilibrium|E(quilibrium|lement)))?|fr|EG|a(ng|cute|rr(tl)?)|rightarrow)|r(s(h|cr|q(uo(r)?|b)|aquo)|h(o(v)?|ar(d|u(l)?))|nmid|c(y|ub|e(il|dil)|aron)|Barr|t(hree|imes|ri([ef]|ltri)?)|i(singdotseq|ng|ght(squigarrow|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(tail)?|rightarrows))|Har|o(times|p(f|lus|ar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|ldhar)|uluhar|p(polint|ar(gt)?)|e(ct|al(s|ine|part)?|g)|f(isht|loor|r)|l(har|arr|m)|a(ng([de]|le)?|c(ute|e)|t(io(nals)?|ail)|dic|emptyv|quo|rr(sim|hk|c|tl|pl|fs|w|lp|ap|b(fs)?)?)|rarr|x|moust(ache)?|b(arr|r(k(sl([du])|e)|ac([ek]))|brk)|A(tail|arr|rr)))|(s(s(cr|tarf|etmn|mile)|h(y|c(hcy|y)|ort(parallel|mid)|arp)|c(sim|y|n(sim|E|ap)|cue|irc|polint|e(dil)?|E|a(p|ron))?|t(ar(f)?|r(ns|aight(phi|epsilon)))|i(gma([vf])?|m(ne|dot|plus|e(q)?|l(E)?|rarr|g(E)?)?)|zlig|o(pf|ftcy|l(b(ar)?)?)|dot([eb])?|u(ng|cc(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?|p(s(im|u([pb])|et(neq(q)?|eq(q)?)?)|hs(ol|ub)|1|n([eE])|2|d(sub|ot)|3|plus|e(dot)?|E|larr|mult)?|m|b(s(im|u([pb])|et(neq(q)?|eq(q)?)?)|n([eE])|dot|plus|e(dot)?|E|rarr|mult)?)|pa(des(uit)?|r)|e(swar|ct|tm(n|inus)|ar(hk|r(ow)?)|xt|mi|Arr)|q(su(p(set(eq)?|e)?|b(set(eq)?|e)?)|c(up(s)?|ap(s)?)|u(f|ar([ef]))?)|fr(own)?|w(nwar|ar(hk|r(ow)?)|Arr)|larr|acute|rarr|m(t(e(s)?)?|i(d|le)|eparsl|a(shp|llsetminus))|bquo)|S(scr|hort(RightArrow|DownArrow|UpArrow|LeftArrow)|c(y|irc|edil|aron)?|tar|igma|H(cy|CHcy)|opf|u(c(hThat|ceeds(SlantEqual|Tilde|Equal)?)|p(set|erset(Equal)?)?|m|b(set(Equal)?)?)|OFTcy|q(uare(Su(perset(Equal)?|bset(Equal)?)|Intersection|Union)?|rt)|fr|acute|mallCircle))|(t(s(hcy|c([yr])|trok)|h(i(nsp|ck(sim|approx))|orn|e(ta(sym|v)?|re(4|fore))|k(sim|ap))|c(y|edil|aron)|i(nt|lde|mes(d|b(ar)?)?)|o(sa|p(cir|f(ork)?|bot)?|ea)|dot|prime|elrec|fr|w(ixt|ohead(leftarrow|rightarrow))|a(u|rget)|r(i(sb|time|dot|plus|e|angle(down|q|left(eq)?|right(eq)?)?|minus)|pezium|ade)|brk)|T(s(cr|trok)|RADE|h(i(nSpace|ckSpace)|e(ta|refore))|c(y|edil|aron)|S(cy|Hcy)|ilde(Tilde|Equal|FullEqual)?|HORN|opf|fr|a([ub])|ripleDot))|(u(scr|h(ar([lr])|blk)|c(y|irc)|t(ilde|dot|ri(f)?)|Har|o(pf|gon)|d(har|arr|blac)|u(arr|ml)|p(si(h|lon)?|harpoon(left|right)|downarrow|uparrows|lus|arrow)|f(isht|r)|wangle|l(c(orn(er)?|rop)|tri)|a(cute|rr)|r(c(orn(er)?|rop)|tri|ing)|grave|m(l|acr)|br(cy|eve)|Arr)|U(scr|n(ion(Plus)?|der(B(ar|rac(e|ket))|Parenthesis))|c(y|irc)|tilde|o(pf|gon)|dblac|uml|p(si(lon)?|downarrow|Tee(Arrow)?|per(RightArrow|LeftArrow)|DownArrow|Equilibrium|arrow|Arrow(Bar|DownArrow)?)|fr|a(cute|rr(ocir)?)|ring|grave|macr|br(cy|eve)))|(v(s(cr|u(pn([eE])|bn([eE])))|nsu([pb])|cy|Bar(v)?|zigzag|opf|dash|prop|e(e(eq|bar)?|llip|r(t|bar))|Dash|fr|ltri|a(ngrt|r(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|t(heta|riangle(left|right))|p(hi|i|ropto)|epsilon|kappa|r(ho)?))|rtri|Arr)|V(scr|cy|opf|dash(l)?|e(e|r(yThinSpace|t(ical(Bar|Separator|Tilde|Line))?|bar))|Dash|vdash|fr|bar))|(w(scr|circ|opf|p|e(ierp|d(ge(q)?|bar))|fr|r(eath)?)|W(scr|circ|opf|edge|fr))|(X(scr|i|opf|fr)|x(s(cr|qcup)|h(arr|Arr)|nis|c(irc|up|ap)|i|o(time|dot|p(f|lus))|dtri|u(tri|plus)|vee|fr|wedge|l(arr|Arr)|r(arr|Arr)|map))|(y(scr|c(y|irc)|icy|opf|u(cy|ml)|en|fr|ac(y|ute))|Y(scr|c(y|irc)|opf|uml|Icy|Ucy|fr|acute|Acy))|(z(scr|hcy|c(y|aron)|igrarr|opf|dot|e(ta|etrf)|fr|w(nj|j)|acute)|Z(scr|c(y|aron)|Hcy|opf|dot|e(ta|roWidthSpace)|fr|acute)))(;)",
           "name": "constant.character.entity.named.$2.astro"
         },
         {
@@ -495,7 +495,7 @@
               "name": "punctuation.definition.entity.astro"
             }
           },
-          "match": "(&)#[xX][0-9a-fA-F]+(;)",
+          "match": "(&)#[xX]\\h+(;)",
           "name": "constant.character.entity.numeric.hexadecimal.astro"
         },
         {
@@ -534,7 +534,7 @@
             }
           },
           "contentName": "meta.embedded.expression.astro source.tsx",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.astro"
@@ -542,7 +542,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G\\s*(?={)",
+              "begin": "\\G\\s*(?=\\{)",
               "end": "(?<=})",
               "patterns": [
                 {
@@ -638,7 +638,7 @@
       "name": "meta.scope.tag.$2.astro"
     },
     "tags-general-start": {
-      "begin": "(<)([^/\\s>/]*)",
+      "begin": "(<)([^/\\s>]*)",
       "beginCaptures": {
         "0": {
           "patterns": [
@@ -662,7 +662,7 @@
       ]
     },
     "tags-lang": {
-      "begin": "<(script|style)",
+      "begin": "<(s(?:cript|tyle))",
       "beginCaptures": {
         "0": {
           "patterns": [
@@ -685,7 +685,7 @@
       "name": "meta.scope.tag.$1.astro meta.$1.astro",
       "patterns": [
         {
-          "begin": "\\G(?=\\s*[^>]*?(type|lang)\\s*=\\s*(['\"]|)(?:text\\/)?(application\\/ld\\+json)\\2)",
+          "begin": "\\G(?=\\s*[^>]*?(type|lang)\\s*=\\s*(['\"]|)(?:text/)?(application/ld\\+json)\\2)",
           "end": "(?=</|/>)",
           "name": "meta.lang.json.astro",
           "patterns": [
@@ -705,7 +705,7 @@
           ]
         },
         {
-          "begin": "\\G(?=\\s*[^>]*?(type|lang)\\s*=\\s*(['\"]|)(?:text/|application/)?([\\w\\/+]+)\\2)",
+          "begin": "\\G(?=\\s*[^>]*?(type|lang)\\s*=\\s*(['\"]|)(?:text/|application/)?([\\w/+]+)\\2)",
           "end": "(?=</|/>)",
           "name": "meta.lang.$3.astro",
           "patterns": [
@@ -802,7 +802,7 @@
           ]
         }
       },
-      "match": "(<)([^/\\s>/]*)",
+      "match": "(<)([^/\\s>]*)",
       "name": "meta.tag.start.astro"
     },
     "tags-void": {
@@ -831,8 +831,8 @@
     "text": {
       "patterns": [
         {
-          "begin": "(?<=^|---|>|})",
-          "end": "(?=<|{|$)",
+          "begin": "(?<=^|---|[>}])",
+          "end": "(?=[<{]|$)",
           "name": "text.astro",
           "patterns": [
             {
diff --git a/resources/languages/awk.json b/resources/languages/awk.json
index 5141753..2d90ce8 100644
--- a/resources/languages/awk.json
+++ b/resources/languages/awk.json
@@ -51,7 +51,7 @@
       ]
     },
     "escaped-char": {
-      "match": "\\\\(?:[\\\\abfnrtv/\"]|x[0-9A-Fa-f]{2}|[0-7]{3})",
+      "match": "\\\\(?:[\\\\abfnrtv/\"]|x\\h{2}|[0-7]{3})",
       "name": "constant.character.escape.awk"
     },
     "expression": {
@@ -136,7 +136,7 @@
           "name": "meta.brace.round.awk"
         },
         {
-          "match": "\\,",
+          "match": ",",
           "name": "punctuation.separator.parameters.awk"
         }
       ]
@@ -176,7 +176,7 @@
           "name": "keyword.operator.trinary.awk"
         },
         {
-          "match": "(\\[|\\])",
+          "match": "([\\[\\]])",
           "name": "keyword.operator.index.awk"
         }
       ]
@@ -199,7 +199,7 @@
     },
     "procedure": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#comment"
diff --git a/resources/languages/ballerina.json b/resources/languages/ballerina.json
index 444cf59..956c066 100644
--- a/resources/languages/ballerina.json
+++ b/resources/languages/ballerina.json
@@ -13,7 +13,7 @@
     "access-modifier": {
       "patterns": [
         {
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(p(?:ublic|rivate))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "storage.modifier.ballerina keyword.other.ballerina"
         }
       ]
@@ -35,7 +35,7 @@
               "name": "support.type.ballerina"
             }
           },
-          "match": "(@)((?:[_$[:alpha:]][_$[:alnum:]]*))\\s*(:?)\\s*((?:[_$[:alpha:]][_$[:alnum:]]*)?)"
+          "match": "(@)([_$[:alpha:]][_$[:alnum:]]*)\\s*(:?)\\s*((?:[_$[:alpha:]][_$[:alnum:]]*)?)"
         }
       ]
     },
@@ -64,7 +64,7 @@
           "name": "meta.brace.square.ballerina"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.ballerina"
@@ -97,7 +97,7 @@
               "name": "meta.arrow.ballerina storage.type.function.arrow.ballerina"
             }
           },
-          "end": ",|(?=\\})",
+          "end": ",|(?=})",
           "patterns": [
             {
               "include": "#code"
@@ -115,7 +115,7 @@
               "name": "keyword.ballerina"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ballerina.documentation"
@@ -141,7 +141,7 @@
               "name": "punctuation.definition.block.ballerina.documentation"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ballerina.documentation"
@@ -164,7 +164,7 @@
     "call": {
       "patterns": [
         {
-          "match": "(?:\\')?([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=\\()",
+          "match": "'?([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=\\()",
           "name": "entity.name.function.ballerina"
         }
       ]
@@ -178,7 +178,7 @@
               "name": "punctuation.definition.block.ballerina"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ballerina"
@@ -214,7 +214,7 @@
           "name": "punctuation.definition.block.ballerina"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ballerina"
@@ -245,7 +245,7 @@
         },
         {
           "begin": "(?<=:)\\s*",
-          "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))"
+          "end": "(?=[\\s;),}\\]:\\-+]|^\\s*$|^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b)"
         },
         {
           "include": "#decl-block"
@@ -268,7 +268,7 @@
           "name": "storage.type.class.ballerina keyword.other.ballerina"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.ballerina",
       "patterns": [
         {
@@ -339,7 +339,7 @@
     "comment": {
       "patterns": [
         {
-          "match": "\\/\\/.*",
+          "match": "//.*",
           "name": "comment.ballerina"
         }
       ]
@@ -383,7 +383,7 @@
               "name": "keyword.control.flow.ballerina"
             }
           },
-          "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))",
+          "end": "(?=[;}]|$|;|^\\s*$|^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -409,7 +409,7 @@
           "name": "punctuation.definition.block.ballerina"
         }
       },
-      "end": "(?=\\} external;)|(\\})",
+      "end": "(?=} external;)|(})",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ballerina"
@@ -501,7 +501,7 @@
               "name": "punctuation.definition.block.ballerina.documentation"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ballerina.documentation"
@@ -523,21 +523,21 @@
                   "name": "keyword.other.ballerina.documentation"
                 }
               },
-              "match": "(P|R|T|F|V)({{)(.*)(}})"
+              "match": "([PRTFV])(\\{\\{)(.*)(}})"
             },
             {
-              "begin": "\\```",
-              "end": "\\```",
+              "begin": "```",
+              "end": "```",
               "name": "comment.block.code.ballerina.documentation"
             },
             {
-              "begin": "\\``",
-              "end": "\\``",
+              "begin": "``",
+              "end": "``",
               "name": "comment.block.code.ballerina.documentation"
             },
             {
-              "begin": "\\`",
-              "end": "\\`",
+              "begin": "`",
+              "end": "`",
               "name": "comment.block.code.ballerina.documentation"
             },
             {
@@ -551,13 +551,13 @@
     "documentationDef": {
       "patterns": [
         {
-          "begin": "\\b(?:documentation|deprecated)\\b",
+          "begin": "\\bd(?:ocumentation|eprecated)\\b",
           "beginCaptures": {
             "0": {
               "name": "keyword.ballerina"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "delimiter.curly"
@@ -587,7 +587,7 @@
           "name": "entity.name.type.enum.ballerina"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.enum.declaration.ballerina",
       "patterns": [
         {
@@ -603,7 +603,7 @@
               "name": "punctuation.definition.block.ballerina"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ballerina"
@@ -623,7 +623,7 @@
                   "name": "variable.other.enummember.ballerina"
                 }
               },
-              "end": "(?=,|\\}|$)",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#comment"
@@ -634,8 +634,8 @@
               ]
             },
             {
-              "begin": "(?=((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\])))",
-              "end": "(?=,|\\}|$)",
+              "begin": "(?=(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+])))",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#string"
@@ -695,11 +695,11 @@
     "expression-operators": {
       "patterns": [
         {
-          "match": "\\*=|(?<!\\()/=|%=|\\+=|\\-=",
+          "match": "\\*=|(?<!\\()/=|%=|\\+=|-=",
           "name": "keyword.operator.assignment.compound.ballerina"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>=|>>>=|\\|=",
+          "match": "&=|\\^=|<<=|>>=|>>>=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.ballerina"
         },
         {
@@ -707,11 +707,11 @@
           "name": "keyword.operator.bitwise.shift.ballerina"
         },
         {
-          "match": "===|!==|==|!=",
+          "match": "(?:==|!=)(?:=|)",
           "name": "keyword.operator.comparison.ballerina"
         },
         {
-          "match": "<=|>=|<>|<|>",
+          "match": "<=|>=|<>|[<>]",
           "name": "keyword.operator.relational.ballerina"
         },
         {
@@ -726,18 +726,18 @@
               "name": "keyword.operator.arithmetic.ballerina"
             }
           },
-          "match": "(?<=[_$[:alnum:]])(\\!)\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:]])(!)\\s*(?:(/=)|(/)(?![/*]))"
         },
         {
-          "match": "\\!|&&|\\|\\||\\?\\?",
+          "match": "!|&&|\\|\\||\\?\\?",
           "name": "keyword.operator.logical.ballerina"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.ballerina"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.ballerina"
         },
         {
@@ -749,7 +749,7 @@
           "name": "keyword.operator.increment.ballerina"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.ballerina"
         }
       ]
@@ -862,7 +862,7 @@
               "name": "punctuation.definition.block.ballerina"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "#workerDef"
@@ -880,7 +880,7 @@
               "name": "keyword.control.ballerina"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ballerina"
@@ -906,13 +906,13 @@
           "include": "#decl-block"
         },
         {
-          "begin": "\\=>",
+          "begin": "=>",
           "beginCaptures": {
             "0": {
               "name": "meta.arrow.ballerina storage.type.function.arrow.ballerina"
             }
           },
-          "end": "(?=\\;)|(?=\\,)|(?=)(?=\\);)",
+          "end": "(?=;)|(?=,)|(?=)(?=\\);)",
           "name": "meta.block.ballerina",
           "patterns": [
             {
@@ -930,7 +930,7 @@
       ]
     },
     "function-defn": {
-      "begin": "(?:(public|private)\\s+)?(function\\b)",
+      "begin": "(?:(p(?:ublic|rivate))\\s+)?(function\\b)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.ballerina"
@@ -939,7 +939,7 @@
           "name": "keyword.other.ballerina"
         }
       },
-      "end": "(?<=\\;)|(?<=\\})|(?<=\\,)|(?=)(?=\\);)",
+      "end": "(?<=;)|(?<=})|(?<=,)|(?=)(?=\\);)",
       "name": "meta.function.ballerina",
       "patterns": [
         {
@@ -1008,7 +1008,7 @@
           "include": "#regex"
         },
         {
-          "match": "\\,",
+          "match": ",",
           "name": "punctuation.separator.parameter.ballerina"
         }
       ]
@@ -1051,13 +1051,13 @@
       ]
     },
     "functionParameters": {
-      "begin": "\\(|\\[",
+      "begin": "[(\\[]",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.parameters.begin.ballerina"
         }
       },
-      "end": "\\)|\\]",
+      "end": "[)\\]]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.parameters.end.ballerina"
@@ -1077,7 +1077,7 @@
           "name": "keyword.other.ballerina"
         }
       },
-      "end": "(?==>)|(\\=)|(?=\\{)|(\\))|(?=\\;)",
+      "end": "(?==>)|(=)|(?=\\{)|(\\))|(?=;)",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.ballerina"
@@ -1106,7 +1106,7 @@
               "name": "support.type.primitive.ballerina"
             }
           },
-          "match": "\\s*\\b(var)(?=\\s+|\\[|\\?)"
+          "match": "\\s*\\b(var)(?=\\s+|[\\[?])"
         },
         {
           "match": "\\|",
@@ -1140,7 +1140,7 @@
               "name": "keyword.ballerina"
             }
           },
-          "end": "(?=\\,)|(?=\\|)|(?=\\:)|(?==>)|(?=\\))|(?=\\])",
+          "end": "(?=,)|(?=\\|)|(?=:)|(?==>)|(?=\\))|(?=])",
           "patterns": [
             {
               "include": "#comment"
@@ -1215,7 +1215,7 @@
               "name": "keyword"
             }
           },
-          "end": "(?=\\,)|(?:\\|)|(?=\\])|(?=\\))",
+          "end": "(?=,)|\\||(?=])|(?=\\))",
           "patterns": [
             {
               "include": "#functionTypeReturnsParameter"
@@ -1230,13 +1230,13 @@
     "functionTypeReturnsParameter": {
       "patterns": [
         {
-          "begin": "((?=record|object|function)|(?:[_$[:alpha:]][_$[:alnum:]]*))",
+          "begin": "((?=record|object|function)|[_$[:alpha:]][_$[:alnum:]]*)",
           "beginCaptures": {
             "0": {
               "name": "storage.type.ballerina"
             }
           },
-          "end": "(?=\\,)|(?:\\|)|(?:\\:)|(?==>)|(?=\\))|(?=\\])",
+          "end": "(?=,)|[|:]|(?==>)|(?=\\))|(?=])",
           "patterns": [
             {
               "include": "#record"
@@ -1276,7 +1276,7 @@
               "name": "storage.type.ballerina"
             }
           },
-          "end": "(?=\\,)|(?:\\|)|(?=\\])|(?=\\))"
+          "end": "(?=,)|\\||(?=])|(?=\\))"
         }
       ]
     },
@@ -1294,7 +1294,7 @@
               "name": "entity.name.function.ballerina"
             }
           },
-          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*((((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))"
+          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*((((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))"
         },
         {
           "captures": {
@@ -1308,7 +1308,7 @@
               "name": "entity.name.function.ballerina"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=\\()"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=\\()"
         },
         {
           "captures": {
@@ -1322,7 +1322,7 @@
               "name": "variable.other.property.ballerina"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
           "include": "#type-primitive"
@@ -1362,7 +1362,7 @@
           "match": "([_$[:alpha:]][_$[:alnum:]]*)((\\.)([_$[:alpha:]][_$[:alnum:]]*)(\\()(\\)))?"
         },
         {
-          "match": "(\\')([_$[:alpha:]][_$[:alnum:]]*)",
+          "match": "(')([_$[:alpha:]][_$[:alnum:]]*)",
           "name": "variable.other.property.ballerina"
         },
         {
@@ -1374,7 +1374,7 @@
       "patterns": [
         {
           "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\b\\s*(?!\\{))",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#comment"
@@ -1438,7 +1438,7 @@
               ]
             },
             {
-              "begin": "(?<=\\))(?=\\s|\\=)",
+              "begin": "(?<=\\))(?=[\\s=])",
               "end": "(?=\\{)",
               "patterns": [
                 {
@@ -1491,7 +1491,7 @@
           "name": "keyword.control.import.ballerina"
         }
       },
-      "end": "\\;",
+      "end": ";",
       "endCaptures": {
         "0": {
           "name": "punctuation.terminator.statement.ballerina"
@@ -1500,7 +1500,7 @@
       "name": "meta.import.ballerina",
       "patterns": [
         {
-          "match": "(\\')([_$[:alpha:]][_$[:alnum:]]*)",
+          "match": "(')([_$[:alpha:]][_$[:alnum:]]*)",
           "name": "variable.other.property.ballerina"
         },
         {
@@ -1548,7 +1548,7 @@
           "name": "meta.arrow.ballerina storage.type.function.arrow.ballerina"
         },
         {
-          "match": "(!|%|\\+|\\-|~=|===|==|=|!=|!==|<|>|&|\\||\\?:|\\.\\.\\.|<=|>=|&&|\\|\\||~|>>|>>>)",
+          "match": "([!%+-]|~=|===|==|=|!=|!==|[<>\\&|]|\\?:|\\.\\.\\.|<=|>=|&&|\\|\\||~|>>|>>>)",
           "name": "keyword.operator.ballerina"
         },
         {
@@ -1588,7 +1588,7 @@
       "patterns": [
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#code"
@@ -1631,7 +1631,7 @@
               "name": "keyword.control.ballerina"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#matchStatementBody"
@@ -1655,7 +1655,7 @@
               "name": "punctuation.definition.block.ballerina.documentation"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ballerina.documentation"
@@ -1690,7 +1690,7 @@
               "name": "keyword.ballerina"
             }
           },
-          "end": "((\\})|;|,)",
+          "end": "((})|[;,])",
           "patterns": [
             {
               "include": "#callableUnitBody"
@@ -1703,7 +1703,7 @@
       ]
     },
     "mdDocumentation": {
-      "begin": "\\#",
+      "begin": "#",
       "end": "[\\r\\n]+",
       "name": "comment.mddocs.ballerina",
       "patterns": [
@@ -1718,7 +1718,7 @@
     "mdDocumentationParamDescription": {
       "patterns": [
         {
-          "begin": "(\\+\\s+)(\\'?[_$[:alpha:]][_$[:alnum:]]*)(\\s*\\-\\s+)",
+          "begin": "(\\+\\s+)('?[_$[:alpha:]][_$[:alnum:]]*)(\\s*-\\s+)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.ballerina"
@@ -1730,7 +1730,7 @@
               "name": "keyword.operator.ballerina"
             }
           },
-          "end": "(?=[^#\\r\\n]|(?:# *?\\+))",
+          "end": "(?=[^#\\r\\n]|# *?\\+)",
           "patterns": [
             {
               "match": "#.*",
@@ -1743,7 +1743,7 @@
     "mdDocumentationReturnParamDescription": {
       "patterns": [
         {
-          "begin": "(#)(?: *?)(\\+)(?: *)(return)(?: *)(-)?(.*)",
+          "begin": "(#) *?(\\+) *(return) *(-)?(.*)",
           "beginCaptures": {
             "1": {
               "name": "comment.mddocs.ballerina"
@@ -1761,7 +1761,7 @@
               "name": "comment.mddocs.returnparamdesc.ballerina"
             }
           },
-          "end": "(?=[^#\\r\\n]|(?:# *?\\+))",
+          "end": "(?=[^#\\r\\n]|# *?\\+)",
           "patterns": [
             {
               "match": "#.*",
@@ -1786,7 +1786,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "\\b0[xX][\\da-fA-F]+\\b|\\b\\d+(?:\\.(?:\\d+|$))?",
+          "match": "\\b(?:0[xX][\\da-fA-F]+\\b|\\d+(?:\\.(?:\\d+|$))?)",
           "name": "constant.numeric.decimal.ballerina"
         }
       ]
@@ -1798,7 +1798,7 @@
           "name": "punctuation.definition.block.ballerina"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ballerina"
@@ -1833,7 +1833,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?=:)|((?<=[\\]])(?=\\s*[\\(\\<]))",
+          "end": "(?=:)|((?<=])(?=\\s*[(<]))",
           "name": "meta.object.member.ballerina meta.object-literal.key.ballerina",
           "patterns": [
             {
@@ -1842,8 +1842,8 @@
           ]
         },
         {
-          "begin": "(?=[\\'\\\"\\`])",
-          "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\n*})|(\\s+(as)\\s+))))",
+          "begin": "(?=['\"`])",
+          "end": "(?=:)|((?<=['\"`])(?=((\\s*[(<,}])|(\\n*})|(\\s+(as)\\s+))))",
           "name": "meta.object.member.ballerina meta.object-literal.key.ballerina",
           "patterns": [
             {
@@ -1855,8 +1855,8 @@
           ]
         },
         {
-          "begin": "(?=(\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)))",
-          "end": "(?=:)|(?=\\s*([\\(\\<,}])|(\\s+as\\s+))",
+          "begin": "(?=(\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)))",
+          "end": "(?=:)|(?=\\s*([(<,}])|(\\s+as\\s+))",
           "name": "meta.object.member.ballerina meta.object-literal.key.ballerina",
           "patterns": [
             {
@@ -1868,8 +1868,8 @@
           ]
         },
         {
-          "begin": "(?<=[\\]\\'\\\"\\`])(?=\\s*[\\(\\<])",
-          "end": "(?=\\}|;|,)|(?<=\\})",
+          "begin": "(?<=[\\]'\"`])(?=\\s*[(<])",
+          "end": "(?=[};,])|(?<=})",
           "name": "meta.method.declaration.ballerina",
           "patterns": [
             {
@@ -1886,7 +1886,7 @@
               "name": "constant.numeric.decimal.ballerina"
             }
           },
-          "match": "(?![_$[:alpha:]])([[:digit:]]+)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "(?![_$[:alpha:]])(\\d+)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.ballerina"
         },
         {
@@ -1898,7 +1898,7 @@
               "name": "entity.name.function.ballerina"
             }
           },
-          "match": "(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*((((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:(\\s*/\\*([^*]|(\\*[^/]))*\\*/)*\\s*((((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))",
           "name": "meta.object.member.ballerina"
         },
         {
@@ -1907,7 +1907,7 @@
               "name": "meta.object-literal.key.ballerina"
             }
           },
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.ballerina"
         },
         {
@@ -1917,7 +1917,7 @@
               "name": "keyword.operator.spread.ballerina"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.ballerina",
           "patterns": [
             {
@@ -1931,7 +1931,7 @@
               "name": "variable.other.readwrite.ballerina"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.ballerina"
         },
         {
@@ -1953,12 +1953,12 @@
               "name": "keyword.control.as.ballerina"
             }
           },
-          "end": "(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+))",
+          "end": "(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+))",
           "name": "meta.object.member.ballerina"
         },
         {
           "begin": "(?=[_$[:alpha:]][_$[:alnum:]]*\\s*=)",
-          "end": "(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "end": "(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.ballerina",
           "patterns": [
             {
@@ -1977,7 +1977,7 @@
               "name": "keyword.other.ballerina"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#decl-block"
@@ -1995,7 +1995,7 @@
               "name": "punctuation.definition.block.ballerina"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ballerina"
@@ -2072,13 +2072,13 @@
     "parameter": {
       "patterns": [
         {
-          "begin": "((?=record|object|function)|([_$[:alpha:]][_$[:alnum:]]*)(?=\\|)|(?:[_$[:alpha:]][_$[:alnum:]]*))",
+          "begin": "((?=record|object|function)|([_$[:alpha:]][_$[:alnum:]]*)(?=\\|)|[_$[:alpha:]][_$[:alnum:]]*)",
           "beginCaptures": {
             "0": {
               "name": "storage.type.ballerina"
             }
           },
-          "end": "(?:\\,)|(?:\\|)|(?:\\:)|(?==>)|(?=\\))|(?=\\])",
+          "end": "[,|:]|(?==>)|(?=\\))|(?=])",
           "patterns": [
             {
               "include": "#parameterWithDescriptor"
@@ -2152,7 +2152,7 @@
               "name": "variable.parameter.ballerina"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|(string|int|boolean|float|byte|decimal|json|xml|anydata)|\\b(is|new|isolated|null|function|in)\\b|\\b(true|false)\\b|\\b(check|foreach|if|checkpanic)\\b|\\b(readonly|error|map)\\b|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|(string|int|boolean|float|byte|decimal|json|xml|anydata)|\\b(is|new|isolated|null|function|in)\\b|\\b(true|false)\\b|\\b(check|foreach|if|checkpanic)\\b|\\b(readonly|error|map)\\b|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
         }
       ]
     },
@@ -2160,7 +2160,7 @@
       "patterns": [
         {
           "begin": "\\[",
-          "end": "(?=\\,)|(?=\\|)|(?=\\:)|(?==>)|(?=\\))",
+          "end": "(?=,)|(?=\\|)|(?=:)|(?==>)|(?=\\))",
           "patterns": [
             {
               "include": "#record"
@@ -2184,8 +2184,8 @@
     "parameterTupleEnd": {
       "patterns": [
         {
-          "begin": "\\]",
-          "end": "(?=\\,)|(?=\\|)|(?=\\:)|(?==>)|(?=\\))",
+          "begin": "]",
+          "end": "(?=,)|(?=\\|)|(?=:)|(?==>)|(?=\\))",
           "patterns": [
             {
               "include": "#defaultWithParentheses"
@@ -2207,20 +2207,20 @@
               "name": "storage.type.ballerina"
             }
           },
-          "end": "(?:\\,)|(?:\\|)|(?=\\])"
+          "end": "[,|]|(?=])"
         }
       ]
     },
     "parameterWithDescriptor": {
       "patterns": [
         {
-          "begin": "\\&",
+          "begin": "&",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.ballerina"
             }
           },
-          "end": "(?=\\,)|(?=\\|)|(?=\\))",
+          "end": "(?=,)|(?=\\|)|(?=\\))",
           "patterns": [
             {
               "include": "#parameter"
@@ -2240,7 +2240,7 @@
           "name": "keyword.other.ballerina"
         },
         {
-          "match": "\\,",
+          "match": ",",
           "name": "punctuation.separator.parameter.ballerina"
         }
       ]
@@ -2305,7 +2305,7 @@
       "patterns": [
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "patterns": [
             {
               "include": "#comment"
@@ -2328,7 +2328,7 @@
               "name": "punctuation.accessor.optional.ballerina"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
         }
       ]
     },
@@ -2355,7 +2355,7 @@
           "name": "keyword.other.ballerina"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.record.ballerina",
       "patterns": [
         {
@@ -2379,7 +2379,7 @@
               "name": "punctuation.definition.block.ballerina"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ballerina"
@@ -2470,11 +2470,11 @@
     "regexp": {
       "patterns": [
         {
-          "match": "\\^|\\$",
+          "match": "[\\^$]",
           "name": "keyword.control.assertion.regexp.ballerina"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.regexp.ballerina"
         },
         {
@@ -2520,7 +2520,7 @@
               "name": "keyword.operator.negation.regexp.ballerina"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.end.regexp.ballerina"
@@ -2543,7 +2543,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\[^pPu]))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\[^pPu]))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\[^pPu]))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\[^pPu]))",
               "name": "constant.other.character-class.range.regexp.ballerina"
             },
             {
@@ -2600,7 +2600,7 @@
           "name": "keyword.ballerina"
         }
       },
-      "end": "(?=;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|(?<=\\})|(?<=\\,)",
+      "end": "(?=;|^\\s*$|^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b)|(?<=})|(?<=,)",
       "name": "meta.service.declaration.ballerina",
       "patterns": [
         {
@@ -2642,7 +2642,7 @@
           "include": "#string"
         },
         {
-          "match": "(\\/([_$[:alpha:]][_$[:alnum:]]*)|\\\"[_$[:alpha:]][_$[:alnum:]]*\\\")",
+          "match": "(/([_$[:alpha:]][_$[:alnum:]]*)|\"[_$[:alpha:]][_$[:alnum:]]*\")",
           "name": "entity.service.path.ballerina"
         }
       ]
@@ -2656,7 +2656,7 @@
               "name": "keyword.other.ballerina"
             }
           },
-          "end": "(?={)",
+          "end": "(?=\\{)",
           "patterns": [
             {
               "include": "#code"
@@ -2677,7 +2677,7 @@
               "name": "variable.other.readwrite.ballerina"
             }
           },
-          "end": "(?=\\,)|(?=\\;)"
+          "end": "(?=,)|(?=;)"
         }
       ]
     },
@@ -2730,7 +2730,7 @@
               "name": "punctuation.definition.string.begin.ballerina"
             }
           },
-          "end": "(\")|((?:[^\\\\\\n])$)",
+          "end": "(\")|([^\\\\\\n]$)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.ballerina"
@@ -2751,7 +2751,7 @@
     "string-character-escape": {
       "patterns": [
         {
-          "match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
+          "match": "\\\\(x\\h{2}|u\\h{4}|u\\{\\h+}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
           "name": "constant.character.escape.ballerina"
         }
       ]
@@ -2792,13 +2792,13 @@
     "strings": {
       "patterns": [
         {
-          "begin": "\\\"",
+          "begin": "\"",
           "beginCaptures": {
             "0": {
               "name": "string.begin.ballerina"
             }
           },
-          "end": "\\\"",
+          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "string.end.ballerina"
@@ -2827,7 +2827,7 @@
             }
           },
           "contentName": "meta.embedded.line.ballerina",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.template-expression.end.ballerina"
@@ -2845,7 +2845,7 @@
     "templateVariable": {
       "patterns": [
         {
-          "begin": "\\${",
+          "begin": "\\$\\{",
           "beginCaptures": {
             "0": {
               "name": "constant.character.escape.ballerina"
@@ -2866,7 +2866,7 @@
       ]
     },
     "ternary-expression": {
-      "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
+      "begin": "(?!\\?\\.\\s*\\D)(\\?)(?!\\?)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.ternary.ballerina"
@@ -2888,7 +2888,7 @@
       "patterns": [
         {
           "begin": "\\[",
-          "end": "(?=\\]|;)",
+          "end": "(?=[\\];])",
           "patterns": [
             {
               "include": "#comment"
@@ -2929,13 +2929,13 @@
     "type-annotation": {
       "patterns": [
         {
-          "begin": "(\\:)",
+          "begin": "(:)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.type.annotation.ballerina"
             }
           },
-          "end": "(?<![:|&])((?=$|^|[,);\\}\\]\\?\\>\\=>]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))(\\?)?",
+          "end": "(?<![:|\\&])((?=$|^|[,);}\\]?>=]|//)|(?==[^>])|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))(\\?)?",
           "name": "meta.type.annotation.ballerina",
           "patterns": [
             {
@@ -3023,7 +3023,7 @@
           "name": "meta.brace.square.ballerina"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.ballerina"
@@ -3078,7 +3078,7 @@
               "name": "entity.name.type.ballerina"
             }
           },
-          "end": "\\;",
+          "end": ";",
           "endCaptures": {
             "0": {
               "name": "punctuation.terminator.statement.ballerina"
@@ -3172,7 +3172,7 @@
     "unicode-property-escape": {
       "patterns": [
         {
-          "begin": "(\\\\p|\\\\P)(\\{)",
+          "begin": "(\\\\[pP])(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.unicode-property.regexp.ballerina"
@@ -3181,7 +3181,7 @@
               "name": "punctuation.other.unicode-property.begin.regexp.ballerina"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.other.unicode-property.end.regexp.ballerina"
@@ -3211,7 +3211,7 @@
               "name": "punctuation.other.unicode-value.begin.regexp.ballerina"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.other.unicode-value.end.regexp.ballerina"
@@ -3220,7 +3220,7 @@
           "name": "keyword.other.unicode-value.ballerina",
           "patterns": [
             {
-              "match": "([0-9A-Fa-f]{1,6})",
+              "match": "(\\h{1,6})",
               "name": "constant.other.unicode-value.regexp.ballerina"
             }
           ]
@@ -3236,11 +3236,11 @@
               "name": "storage.modifier.ballerina support.type.primitive.ballerina"
             }
           },
-          "end": "(?!\\b(var))((?=;|}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=(if)\\s+))|((?<!^string|[^\\._$[:alnum:]]string|^int|[^\\._$[:alnum:]]int)(?=\\s*$)))",
+          "end": "(?!\\b(var))((?=[;}]|^\\s*$|^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b)|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=(if)\\s+))|((?<!^string|[^._$[:alnum:]]string|^int|[^._$[:alnum:]]int)(?=\\s*$)))",
           "name": "meta.var.expr.ballerina",
           "patterns": [
             {
-              "begin": "\\b(var)(?=\\s+|\\[|\\?|\\||\\:)",
+              "begin": "\\b(var)(?=\\s+|[\\[?|:])",
               "beginCaptures": {
                 "0": {
                   "name": "support.type.primitive.ballerina"
@@ -3302,7 +3302,7 @@
         },
         {
           "begin": "(?=\\b(const(?!\\s+enum\\b)))",
-          "end": "(?!\\b(const(?!\\s+enum\\b)))((?=\\bannotation\\b|;|}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|((?<!^string|[^\\._$[:alnum:]]string|^int|[^\\._$[:alnum:]]int)(?=\\s*$)))",
+          "end": "(?!\\b(const(?!\\s+enum\\b)))((?=\\bannotation\\b|[;}]|^\\s*$|^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b)|((?<!^string|[^._$[:alnum:]]string|^int|[^._$[:alnum:]]int)(?=\\s*$)))",
           "name": "meta.var.expr.ballerina",
           "patterns": [
             {
@@ -3341,20 +3341,20 @@
           "include": "#punctuation-comma"
         },
         {
-          "begin": "(string|int|boolean|float|byte|decimal|json|xml|anydata)(?=\\s+|\\[|\\?|\\||\\:)",
+          "begin": "(string|int|boolean|float|byte|decimal|json|xml|anydata)(?=\\s+|[\\[?|:])",
           "beginCaptures": {
             "0": {
               "name": "support.type.primitive.ballerina"
             }
           },
-          "end": "(?!\\b(var))((?=;|}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|((?<!^string|[^\\._$[:alnum:]]string|^int|[^\\._$[:alnum:]]int)(?=\\s*$)))",
+          "end": "(?!\\b(var))((?=[;}]|^\\s*$|^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b)|((?<!^string|[^._$[:alnum:]]string|^int|[^._$[:alnum:]]int)(?=\\s*$)))",
           "name": "meta.var.expr.ballerina",
           "patterns": [
             {
               "include": "#xml"
             },
             {
-              "begin": "(string|int|boolean|float|byte|decimal|json|xml|anydata)(?=\\s+|\\[|\\?|\\||\\:)",
+              "begin": "(string|int|boolean|float|byte|decimal|json|xml|anydata)(?=\\s+|[\\[?|:])",
               "beginCaptures": {
                 "0": {
                   "name": "support.type.primitive.ballerina"
@@ -3437,7 +3437,7 @@
     "var-single-variable": {
       "patterns": [
         {
-          "begin": "((string|int|boolean|float|byte|decimal|json|xml|anydata)|\\b(readonly|error|map)\\b|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s+|\\;|\\>|\\|)",
+          "begin": "((string|int|boolean|float|byte|decimal|json|xml|anydata)|\\b(readonly|error|map)\\b|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s+|[;>|])",
           "beginCaptures": {
             "2": {
               "name": "support.type.primitive.ballerina"
@@ -3478,7 +3478,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s+(\\!)?",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s+(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ballerina variable.other.readwrite.ballerina"
@@ -3495,7 +3495,7 @@
     "variable-initializer": {
       "patterns": [
         {
-          "begin": "(?<!=|!)(=)(?!=|>)(?=\\s*\\S)",
+          "begin": "(?<![=!])(=)(?![=>])(?=\\s*\\S)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.ballerina"
@@ -3504,7 +3504,7 @@
           "end": "(?=$|[,);}\\]])",
           "patterns": [
             {
-              "match": "(\\')([_$[:alpha:]][_$[:alnum:]]*)",
+              "match": "(')([_$[:alpha:]][_$[:alnum:]]*)",
               "name": "variable.other.property.ballerina"
             },
             {
@@ -3525,7 +3525,7 @@
           ]
         },
         {
-          "begin": "(?<!=|!)(=)(?!=|>)",
+          "begin": "(?<![=!])(=)(?![=>])",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.ballerina"
@@ -3543,13 +3543,13 @@
     "variableDef": {
       "patterns": [
         {
-          "begin": "(?:(?!\\+)[_$[:alpha:]][_$[:alnum:]]*)(?: |\\t)|(?=\\()",
+          "begin": "(?!\\+)[_$[:alpha:]][_$[:alnum:]]*[ \\t]|(?=\\()",
           "beginCaptures": {
             "0": {
               "name": "storage.type.ballerina"
             }
           },
-          "end": "(?:[_$[:alpha:]][_$[:alnum:]]*)|(?=\\,)|(?=;)|\\.\\.\\.",
+          "end": "[_$[:alpha:]][_$[:alnum:]]*|(?=,)|(?=;)|\\.\\.\\.",
           "patterns": [
             {
               "include": "#tupleType"
@@ -3584,7 +3584,7 @@
       "patterns": [
         {
           "begin": "\\{",
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "#code"
@@ -3602,7 +3602,7 @@
               "name": "keyword.ballerina"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#functionReturns"
@@ -3673,13 +3673,13 @@
     "xmlDoubleQuotedString": {
       "patterns": [
         {
-          "begin": "\\\"",
+          "begin": "\"",
           "beginCaptures": {
             "0": {
               "name": "string.begin.ballerina"
             }
           },
-          "end": "\\\"",
+          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "string.end.ballerina"
@@ -3701,13 +3701,13 @@
     "xmlSingleQuotedString": {
       "patterns": [
         {
-          "begin": "\\'",
+          "begin": "'",
           "beginCaptures": {
             "0": {
               "name": "string.begin.ballerina"
             }
           },
-          "end": "\\'",
+          "end": "'",
           "endCaptures": {
             "0": {
               "name": "string.end.ballerina"
@@ -3729,7 +3729,7 @@
     "xmlTag": {
       "patterns": [
         {
-          "begin": "(<\\/?\\??)\\s*([-_a-zA-Z0-9]+)",
+          "begin": "(</?\\??)\\s*([-_a-zA-Z0-9]+)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.xml.ballerina"
@@ -3738,7 +3738,7 @@
               "name": "entity.name.tag.xml.ballerina"
             }
           },
-          "end": "\\??\\/?>",
+          "end": "\\??/?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.xml.ballerina"
diff --git a/resources/languages/bat.json b/resources/languages/bat.json
index 0e83045..8ac3cb5 100644
--- a/resources/languages/bat.json
+++ b/resources/languages/bat.json
@@ -55,7 +55,7 @@
               "name": "keyword.command.batchfile"
             }
           },
-          "end": "(?=$\\n|[&|><)])",
+          "end": "(?=$\\n|[\\&|><)])",
           "patterns": [
             {
               "include": "#command_set_inside"
@@ -117,7 +117,7 @@
               "name": "keyword.operator.assignment.batchfile"
             }
           },
-          "end": "(?=$\\n|[&|><)])",
+          "end": "(?=$\\n|[\\&|><)])",
           "patterns": [
             {
               "include": "#escaped_characters"
@@ -138,7 +138,7 @@
         },
         {
           "begin": "\\s+/[aA]\\s+",
-          "end": "(?=$\\n|[&|><)])",
+          "end": "(?=$\\n|[\\&|><)])",
           "name": "meta.expression.set.batchfile",
           "patterns": [
             {
@@ -177,7 +177,7 @@
         },
         {
           "begin": "\\s+/[pP]\\s+",
-          "end": "(?=$\\n|[&|><)])",
+          "end": "(?=$\\n|[\\&|><)])",
           "patterns": [
             {
               "include": "#command_set_strings"
@@ -192,7 +192,7 @@
                   "name": "keyword.operator.assignment.batchfile"
                 }
               },
-              "end": "(?=$\\n|[&|><)])",
+              "end": "(?=$\\n|[\\&|><)])",
               "name": "meta.prompt.set.batchfile",
               "patterns": [
                 {
@@ -229,10 +229,10 @@
               "name": "keyword.operator.assignment.augmented.batchfile"
             }
           },
-          "match": "([^ ]*)(\\+\\=|\\-\\=|\\*\\=|\\/\\=|%%\\=|&\\=|\\|\\=|\\^\\=|<<\\=|>>\\=)"
+          "match": "([^ ]*)(\\+=|-=|\\*=|/=|%%=|&=|\\|=|\\^=|<<=|>>=)"
         },
         {
-          "match": "\\+|\\-|/|\\*|%%|\\||&|\\^|<<|>>|~",
+          "match": "[+\\-/*]|%%|[|\\&^]|<<|>>|~",
           "name": "keyword.operator.arithmetic.batchfile"
         },
         {
@@ -295,7 +295,7 @@
           "name": "keyword.command.batchfile"
         },
         {
-          "begin": "(?i)(?<=^|[\\s@])(echo)(?:(?=$|\\.|:)|\\s+(?:(on|off)(?=\\s*$))?)",
+          "begin": "(?i)(?<=^|[\\s@])(echo)(?:(?=$|[.:])|\\s+(?:(o(?:n|ff))(?=\\s*$))?)",
           "beginCaptures": {
             "1": {
               "name": "keyword.command.batchfile"
@@ -304,7 +304,7 @@
               "name": "keyword.other.special-method.batchfile"
             }
           },
-          "end": "(?=$\\n|[&|><)])",
+          "end": "(?=$\\n|[\\&|><)])",
           "patterns": [
             {
               "include": "#escaped_characters"
@@ -329,7 +329,7 @@
               "name": "keyword.other.special-method.batchfile"
             }
           },
-          "match": "(?i)(?<=^|[\\s@])(setlocal)(?:\\s*$|\\s+(EnableExtensions|DisableExtensions|EnableDelayedExpansion|DisableDelayedExpansion)(?=\\s*$))"
+          "match": "(?i)(?<=^|[\\s@])(setlocal)(?:\\s*$|\\s+((?:Enable|Disable)(?:Extensions|DelayedExpansion))(?=\\s*$))"
         },
         {
           "include": "#command_set"
@@ -339,7 +339,7 @@
     "comments": {
       "patterns": [
         {
-          "begin": "(?:^|(&))\\s*(?=((?::[+=,;: ])))",
+          "begin": "(?:^|(&))\\s*(?=(:[+=,;: ]))",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.conditional.batchfile"
@@ -348,7 +348,7 @@
           "end": "\\n",
           "patterns": [
             {
-              "begin": "((?::[+=,;: ]))",
+              "begin": "(:[+=,;: ])",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.comment.batchfile"
@@ -369,7 +369,7 @@
               "name": "punctuation.separator.batchfile"
             }
           },
-          "end": "(?=$\\n|[&|><)])",
+          "end": "(?=$\\n|[\\&|><)])",
           "name": "comment.line.rem.batchfile"
         },
         {
@@ -401,7 +401,7 @@
     "controls": {
       "patterns": [
         {
-          "match": "(?i)(?<=^|\\s)(?:call|exit(?=$|\\s)|goto(?=$|\\s|:))",
+          "match": "(?i)(?<=^|\\s)(?:call|exit(?=$|\\s)|goto(?=$|[\\s:]))",
           "name": "keyword.control.statement.batchfile"
         },
         {
@@ -423,7 +423,7 @@
           "name": "keyword.control.conditional.batchfile"
         },
         {
-          "begin": "(?<=^|[\\s(&^])(?i)for(?=\\s)",
+          "begin": "(?<=^|[\\s(\\&^])(?i)for(?=\\s)",
           "beginCaptures": {
             "0": {
               "name": "keyword.control.repeat.batchfile"
@@ -484,7 +484,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "(?<=^|\\s|=)(0[xX][0-9A-Fa-f]*|[+-]?\\d+)(?=$|\\s|<|>)",
+          "match": "(?<=^|[\\s=])(0[xX]\\h*|[+-]?\\d+)(?=$|[\\s<>])",
           "name": "constant.numeric.batchfile"
         }
       ]
@@ -512,7 +512,7 @@
           "name": "keyword.operator.pipe.batchfile"
         },
         {
-          "match": "<&?|>[&>]?",
+          "match": "<&?|>[\\&>]?",
           "name": "keyword.operator.redirection.batchfile"
         }
       ]
@@ -535,7 +535,7 @@
           "name": "meta.group.batchfile",
           "patterns": [
             {
-              "match": ",|;",
+              "match": "[,;]",
               "name": "punctuation.separator.batchfile"
             },
             {
@@ -553,7 +553,7 @@
               "name": "punctuation.definition.variable.batchfile"
             }
           },
-          "match": "(%%)(?:(?i:~[fdpnxsatz]*(?:\\$PATH:)?)?[a-zA-Z])",
+          "match": "(%%)(?i:~[fdpnxsatz]*(?:\\$PATH:)?)?[a-zA-Z]",
           "name": "variable.parameter.repeat.batchfile"
         }
       ]
@@ -613,7 +613,7 @@
                   "name": "punctuation.separator.batchfile"
                 }
               },
-              "end": "(?=%|\\n)",
+              "end": "(?=[%\\n])",
               "name": "meta.variable.substring.batchfile",
               "patterns": [
                 {
@@ -628,7 +628,7 @@
                   "name": "punctuation.separator.batchfile"
                 }
               },
-              "end": "(?=%|\\n)",
+              "end": "(?=[%\\n])",
               "name": "meta.variable.substitution.batchfile",
               "patterns": [
                 {
@@ -641,7 +641,7 @@
                       "name": "punctuation.separator.batchfile"
                     }
                   },
-                  "end": "(?=%|\\n)",
+                  "end": "(?=[%\\n])",
                   "patterns": [
                     {
                       "include": "#variable_delayed_expansion"
@@ -682,7 +682,7 @@
                   "name": "punctuation.separator.batchfile"
                 }
               },
-              "end": "(?=!|\\n)",
+              "end": "(?=[!\\n])",
               "name": "meta.variable.substring.batchfile",
               "patterns": [
                 {
@@ -697,7 +697,7 @@
                   "name": "punctuation.separator.batchfile"
                 }
               },
-              "end": "(?=!|\\n)",
+              "end": "(?=[!\\n])",
               "name": "meta.variable.substitution.batchfile",
               "patterns": [
                 {
@@ -716,7 +716,7 @@
                       "name": "punctuation.separator.batchfile"
                     }
                   },
-                  "end": "(?=!|\\n)",
+                  "end": "(?=[!\\n])",
                   "patterns": [
                     {
                       "include": "#variable"
diff --git a/resources/languages/beancount.json b/resources/languages/beancount.json
index c0ab646..75b2617 100644
--- a/resources/languages/beancount.json
+++ b/resources/languages/beancount.json
@@ -6,12 +6,11 @@
   "name": "beancount",
   "patterns": [
     {
-      "comment": "Comments",
       "match": ";.*",
       "name": "comment.line.beancount"
     },
     {
-      "begin": "^\\s*(poptag|pushtag)\\s+(#)([A-Za-z0-9\\-_/.]+)",
+      "begin": "^\\s*(p(?:optag|ushtag))\\s+(#)([A-Za-z0-9\\-_/.]+)",
       "beginCaptures": {
         "1": {
           "name": "support.function.beancount"
@@ -23,8 +22,7 @@
           "name": "entity.name.tag.beancount"
         }
       },
-      "comment": "Tag directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.tag.beancount",
       "patterns": [
         {
@@ -36,7 +34,7 @@
       ]
     },
     {
-      "begin": "^\\s*(include)\\s+(\\\".*\\\")",
+      "begin": "^\\s*(include)\\s+(\".*\")",
       "beginCaptures": {
         "1": {
           "name": "support.function.beancount"
@@ -45,8 +43,7 @@
           "name": "string.quoted.double.beancount"
         }
       },
-      "comment": "Include directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.include.beancount",
       "patterns": [
         {
@@ -58,7 +55,7 @@
       ]
     },
     {
-      "begin": "^\\s*(option)\\s+(\\\".*\\\")\\s+(\\\".*\\\")",
+      "begin": "^\\s*(option)\\s+(\".*\")\\s+(\".*\")",
       "beginCaptures": {
         "1": {
           "name": "support.function.beancount"
@@ -70,8 +67,7 @@
           "name": "string.quoted.double.beancount"
         }
       },
-      "comment": "Option directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.option.beancount",
       "patterns": [
         {
@@ -98,8 +94,7 @@
           "name": "string.quoted.double.beancount"
         }
       },
-      "comment": "Plugin directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "keyword.operator.directive.beancount",
       "patterns": [
         {
@@ -111,7 +106,7 @@
       ]
     },
     {
-      "begin": "([0-9]{4})([\\-|/])([0-9]{2})([\\-|/])([0-9]{2})\\s+(open|close|pad)\\b",
+      "begin": "([0-9]{4})([-|/])([0-9]{2})([-|/])([0-9]{2})\\s+(open|close|pad)\\b",
       "beginCaptures": {
         "1": {
           "name": "constant.numeric.date.year.beancount"
@@ -132,8 +127,7 @@
           "name": "support.function.beancount"
         }
       },
-      "comment": "Open/Close/Pad directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.dated.beancount",
       "patterns": [
         {
@@ -149,7 +143,7 @@
           "include": "#commodity"
         },
         {
-          "match": "\\,",
+          "match": ",",
           "name": "punctuation.separator.beancount"
         },
         {
@@ -158,7 +152,7 @@
       ]
     },
     {
-      "begin": "([0-9]{4})([\\-|/])([0-9]{2})([\\-|/])([0-9]{2})\\s+(custom)\\b",
+      "begin": "([0-9]{4})([-|/])([0-9]{2})([-|/])([0-9]{2})\\s+(custom)\\b",
       "beginCaptures": {
         "1": {
           "name": "constant.numeric.date.year.beancount"
@@ -179,8 +173,7 @@
           "name": "support.function.beancount"
         }
       },
-      "comment": "Custom directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.dated.beancount",
       "patterns": [
         {
@@ -213,7 +206,7 @@
       ]
     },
     {
-      "begin": "([0-9]{4})([\\-|/])([0-9]{2})([\\-|/])([0-9]{2})\\s(event)",
+      "begin": "([0-9]{4})([-|/])([0-9]{2})([-|/])([0-9]{2})\\s(event)",
       "beginCaptures": {
         "1": {
           "name": "constant.numeric.date.year.beancount"
@@ -234,8 +227,7 @@
           "name": "support.function.directive.beancount"
         }
       },
-      "comment": "Event directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.dated.beancount",
       "patterns": [
         {
@@ -253,7 +245,7 @@
       ]
     },
     {
-      "begin": "([0-9]{4})([\\-|/])([0-9]{2})([\\-|/])([0-9]{2})\\s(commodity)",
+      "begin": "([0-9]{4})([-|/])([0-9]{2})([-|/])([0-9]{2})\\s(commodity)",
       "beginCaptures": {
         "1": {
           "name": "constant.numeric.date.year.beancount"
@@ -274,8 +266,7 @@
           "name": "support.function.directive.beancount"
         }
       },
-      "comment": "Commodity directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.dated.beancount",
       "patterns": [
         {
@@ -293,7 +284,7 @@
       ]
     },
     {
-      "begin": "([0-9]{4})([\\-|/])([0-9]{2})([\\-|/])([0-9]{2})\\s(note|document)",
+      "begin": "([0-9]{4})([-|/])([0-9]{2})([-|/])([0-9]{2})\\s(note|document)",
       "beginCaptures": {
         "1": {
           "name": "constant.numeric.date.year.beancount"
@@ -314,8 +305,7 @@
           "name": "support.function.directive.beancount"
         }
       },
-      "comment": "Note/Document directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.dated.beancount",
       "patterns": [
         {
@@ -336,7 +326,7 @@
       ]
     },
     {
-      "begin": "([0-9]{4})([\\-|/])([0-9]{2})([\\-|/])([0-9]{2})\\s(price)",
+      "begin": "([0-9]{4})([-|/])([0-9]{2})([-|/])([0-9]{2})\\s(price)",
       "beginCaptures": {
         "1": {
           "name": "constant.numeric.date.year.beancount"
@@ -357,8 +347,7 @@
           "name": "support.function.directive.beancount"
         }
       },
-      "comment": "Price directives",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.dated.beancount",
       "patterns": [
         {
@@ -379,7 +368,7 @@
       ]
     },
     {
-      "begin": "([0-9]{4})([\\-|/])([0-9]{2})([\\-|/])([0-9]{2})\\s(balance)",
+      "begin": "([0-9]{4})([-|/])([0-9]{2})([-|/])([0-9]{2})\\s(balance)",
       "beginCaptures": {
         "1": {
           "name": "constant.numeric.date.year.beancount"
@@ -400,8 +389,7 @@
           "name": "support.function.directive.beancount"
         }
       },
-      "comment": "Balance directives",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.dated.beancount",
       "patterns": [
         {
@@ -422,7 +410,7 @@
       ]
     },
     {
-      "begin": "([0-9]{4})([\\-|/])([0-9]{2})([\\-|/])([0-9]{2})\\s*(txn|[*!&#?%PSTCURM])\\s*(\".*?\")?\\s*(\".*?\")?",
+      "begin": "([0-9]{4})([-|/])([0-9]{2})([-|/])([0-9]{2})\\s*(txn|[*!\\&#?%PSTCURM])\\s*(\".*?\")?\\s*(\".*?\")?",
       "beginCaptures": {
         "1": {
           "name": "constant.numeric.date.year.beancount"
@@ -449,8 +437,7 @@
           "name": "string.quoted.narration.beancount"
         }
       },
-      "comment": "Transaction directive",
-      "end": "(?=(^\\s*$|^\\S))",
+      "end": "(?=(^(?:\\s*$|\\S)))",
       "name": "meta.directive.transaction.beancount",
       "patterns": [
         {
@@ -489,7 +476,7 @@
       "name": "meta.account.beancount",
       "patterns": [
         {
-          "begin": "(\\S+)([:]?)",
+          "begin": "(\\S+)(:?)",
           "beginCaptures": {
             "1": {
               "name": "variable.other.account.beancount"
@@ -498,8 +485,7 @@
               "name": "punctuation.separator.beancount"
             }
           },
-          "comment": "Sub accounts",
-          "end": "([:]?)|(\\s)",
+          "end": "(:?)|(\\s)",
           "patterns": [
             {
               "include": "$self"
@@ -523,7 +509,7 @@
           "name": "entity.name.type.commodity.beancount"
         }
       },
-      "match": "([\\-|\\+]?)(\\d+(?:,\\d{3})*(?:\\.\\d*)?)\\s*([A-Z][A-Z0-9\\'\\.\\_\\-]{0,22}[A-Z0-9])",
+      "match": "([-|+]?)(\\d+(?:,\\d{3})*(?:\\.\\d*)?)\\s*([A-Z][A-Z0-9'._-]{0,22}[A-Z0-9])",
       "name": "meta.amount.beancount"
     },
     "bool": {
@@ -549,7 +535,7 @@
       "match": "(;.*)$"
     },
     "commodity": {
-      "match": "([A-Z][A-Z0-9\\'\\.\\_\\-]{0,22}[A-Z0-9])",
+      "match": "([A-Z][A-Z0-9'._-]{0,22}[A-Z0-9])",
       "name": "entity.name.type.commodity.beancount"
     },
     "cost": {
@@ -559,7 +545,7 @@
           "name": "keyword.operator.assignment.beancount"
         }
       },
-      "end": "\\}\\}?",
+      "end": "}}?",
       "endCaptures": {
         "0": {
           "name": "keyword.operator.assignment.beancount"
@@ -574,7 +560,7 @@
           "include": "#date"
         },
         {
-          "match": "\\,",
+          "match": ",",
           "name": "punctuation.separator.beancount"
         },
         {
@@ -600,15 +586,15 @@
           "name": "constant.numeric.date.day.beancount"
         }
       },
-      "match": "([0-9]{4})([\\-|/])([0-9]{2})([\\-|/])([0-9]{2})",
+      "match": "([0-9]{4})([-|/])([0-9]{2})([-|/])([0-9]{2})",
       "name": "meta.date.beancount"
     },
     "flag": {
-      "match": "(?<=\\s)([*!&#?%PSTCURM])(?=\\s+)",
+      "match": "(?<=\\s)([*!\\&#?%PSTCURM])(?=\\s+)",
       "name": "keyword.other.beancount"
     },
     "illegal": {
-      "match": "[^\\s]",
+      "match": "\\S",
       "name": "invalid.illegal.unrecognized.beancount"
     },
     "link": {
@@ -623,7 +609,7 @@
       "match": "(\\^)([A-Za-z0-9\\-_/.]+)"
     },
     "meta": {
-      "begin": "^\\s*([a-z][A-Za-z0-9\\-_]+)([:])",
+      "begin": "^\\s*([a-z][A-Za-z0-9\\-_]+)(:)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.directive.beancount"
@@ -676,11 +662,11 @@
           "name": "constant.numeric.currency.beancount"
         }
       },
-      "match": "([\\-|\\+]?)(\\d+(?:,\\d{3})*(?:\\.\\d*)?)"
+      "match": "([-|+]?)(\\d+(?:,\\d{3})*(?:\\.\\d*)?)"
     },
     "posting": {
-      "begin": "^\\s+(?=([A-Z\\!]))",
-      "end": "(?=(^\\s*$|^\\S|^\\s*[A-Z]))",
+      "begin": "^\\s+(?=([A-Z!]))",
+      "end": "(?=(^(?:\\s*$|\\S|\\s*[A-Z])))",
       "name": "meta.posting.beancount",
       "patterns": [
         {
@@ -713,13 +699,13 @@
       ]
     },
     "price": {
-      "begin": "\\@\\@?",
+      "begin": "@@?",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.assignment.beancount"
         }
       },
-      "end": "(?=(;|\\n))",
+      "end": "(?=([;\\n]))",
       "name": "meta.price.beancount",
       "patterns": [
         {
@@ -731,8 +717,8 @@
       ]
     },
     "string": {
-      "begin": "\\\"",
-      "end": "\\\"",
+      "begin": "\"",
+      "end": "\"",
       "name": "string.quoted.double.beancount",
       "patterns": [
         {
diff --git a/resources/languages/berry.json b/resources/languages/berry.json
index 72c9e84..7d0bca5 100644
--- a/resources/languages/berry.json
+++ b/resources/languages/berry.json
@@ -35,8 +35,8 @@
   ],
   "repository": {
     "comment-block": {
-      "begin": "\\#\\-",
-      "end": "\\-#",
+      "begin": "#-",
+      "end": "-#",
       "name": "comment.berry",
       "patterns": [
         {
@@ -44,7 +44,7 @@
       ]
     },
     "comments": {
-      "begin": "\\#",
+      "begin": "#",
       "end": "\\n",
       "name": "comment.line.berry",
       "patterns": [
@@ -99,7 +99,7 @@
     "number": {
       "patterns": [
         {
-          "match": "0x[a-fA-F0-9]+|\\d+|(\\d+\\.?|\\.\\d)\\d*([eE][+-]?\\d+)?",
+          "match": "0x\\h+|\\d+|(\\d+\\.?|\\.\\d)\\d*([eE][+-]?\\d+)?",
           "name": "constant.numeric.berry"
         }
       ]
@@ -107,7 +107,7 @@
     "operator": {
       "patterns": [
         {
-          "match": "\\(|\\)|\\[|\\]|\\.|-|\\!|~|\\*|/|%|\\+|&|\\^|\\||<|>|=|:",
+          "match": "[()\\[\\].\\-!~*/%+\\&^|<>=:]",
           "name": "keyword.operator.berry"
         }
       ]
@@ -115,32 +115,32 @@
     "strings": {
       "patterns": [
         {
-          "begin": "(\"|')",
+          "begin": "([\"'])",
           "end": "\\1",
           "name": "string.quoted.double.berry",
           "patterns": [
             {
-              "match": "(\\\\x[\\h]{2})|(\\\\[0-7]{3})|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
+              "match": "(\\\\x\\h{2})|(\\\\[0-7]{3})|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
               "name": "constant.character.escape.berry"
             }
           ]
         },
         {
-          "begin": "f(\"|')",
+          "begin": "f([\"'])",
           "end": "\\1",
           "name": "string.quoted.other.berry",
           "patterns": [
             {
-              "match": "(\\\\x[\\h]{2})|(\\\\[0-7]{3})|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
+              "match": "(\\\\x\\h{2})|(\\\\[0-7]{3})|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
               "name": "constant.character.escape.berry"
             },
             {
-              "match": "\\{\\{[^\\}]*\\}\\}",
+              "match": "\\{\\{[^}]*}}",
               "name": "string.quoted.other.berry"
             },
             {
               "begin": "\\{",
-              "end": "\\}",
+              "end": "}",
               "name": "keyword.other.unit.berry",
               "patterns": [
                 {
diff --git a/resources/languages/bibtex.json b/resources/languages/bibtex.json
index 9e0cbb2..60a2eb6 100644
--- a/resources/languages/bibtex.json
+++ b/resources/languages/bibtex.json
@@ -12,210 +12,113 @@
       "name": "comment.block.at-sign.bibtex"
     },
     {
-      "begin": "((@)(?i:preamble))\\s*(\\{)\\s*",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.preamble.bibtex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.bibtex"
-        },
-        "3": {
-          "name": "punctuation.section.preamble.begin.bibtex"
-        }
-      },
-      "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.preamble.end.bibtex"
-        }
-      },
-      "name": "meta.preamble.braces.bibtex",
-      "patterns": [
-        {
-          "include": "#field_value"
-        }
-      ]
+      "include": "#preamble"
     },
     {
-      "begin": "((@)(?i:preamble))\\s*(\\()\\s*",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.preamble.bibtex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.bibtex"
-        },
-        "3": {
-          "name": "punctuation.section.preamble.begin.bibtex"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.preamble.end.bibtex"
-        }
-      },
-      "name": "meta.preamble.parenthesis.bibtex",
-      "patterns": [
-        {
-          "include": "#field_value"
-        }
-      ]
+      "include": "#string"
     },
     {
-      "begin": "((@)(?i:string))\\s*(\\{)\\s*([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.string-constant.bibtex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.bibtex"
-        },
-        "3": {
-          "name": "punctuation.section.string-constant.begin.bibtex"
-        },
-        "4": {
-          "name": "variable.other.bibtex"
-        }
-      },
-      "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.string-constant.end.bibtex"
-        }
-      },
-      "name": "meta.string-constant.braces.bibtex",
-      "patterns": [
-        {
-          "include": "#field_value"
-        }
-      ]
+      "include": "#entry"
     },
     {
-      "begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.string-constant.bibtex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.bibtex"
-        },
-        "3": {
-          "name": "punctuation.section.string-constant.begin.bibtex"
-        },
-        "4": {
-          "name": "variable.other.bibtex"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.string-constant.end.bibtex"
-        }
-      },
-      "name": "meta.string-constant.parenthesis.bibtex",
-      "patterns": [
-        {
-          "include": "#field_value"
-        }
-      ]
-    },
-    {
-      "begin": "((@)[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\{)\\s*([^\\s,}]*)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.entry-type.bibtex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.bibtex"
-        },
-        "3": {
-          "name": "punctuation.section.entry.begin.bibtex"
-        },
-        "4": {
-          "name": "entity.name.type.entry-key.bibtex"
-        }
-      },
-      "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.entry.end.bibtex"
-        }
-      },
-      "name": "meta.entry.braces.bibtex",
+      "begin": "[^@\\n]",
+      "end": "(?=@)",
+      "name": "comment.block.bibtex"
+    }
+  ],
+  "repository": {
+    "entry": {
       "patterns": [
         {
-          "begin": "([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\=)",
+          "begin": "((@)[a-zA-Z!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\{)\\s*([^\\s,}]*)",
           "beginCaptures": {
             "1": {
-              "name": "support.function.key.bibtex"
+              "name": "keyword.other.entry-type.bibtex"
             },
             "2": {
-              "name": "punctuation.separator.key-value.bibtex"
+              "name": "punctuation.definition.keyword.bibtex"
+            },
+            "3": {
+              "name": "punctuation.section.entry.begin.bibtex"
+            },
+            "4": {
+              "name": "entity.name.type.entry-key.bibtex"
             }
           },
-          "end": "(?=[,}])",
-          "name": "meta.key-assignment.bibtex",
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.entry.end.bibtex"
+            }
+          },
+          "name": "meta.entry.braces.bibtex",
           "patterns": [
             {
-              "include": "#field_value"
+              "begin": "([a-zA-Z!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(=)",
+              "beginCaptures": {
+                "1": {
+                  "name": "support.function.key.bibtex"
+                },
+                "2": {
+                  "name": "punctuation.separator.key-value.bibtex"
+                }
+              },
+              "end": "(?=[,}])",
+              "name": "meta.key-assignment.bibtex",
+              "patterns": [
+                {
+                  "include": "#field_value"
+                }
+              ]
             }
           ]
-        }
-      ]
-    },
-    {
-      "begin": "((@)[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\()\\s*([^\\s,]*)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.entry-type.bibtex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.bibtex"
         },
-        "3": {
-          "name": "punctuation.section.entry.begin.bibtex"
-        },
-        "4": {
-          "name": "entity.name.type.entry-key.bibtex"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.entry.end.bibtex"
-        }
-      },
-      "name": "meta.entry.parenthesis.bibtex",
-      "patterns": [
         {
-          "begin": "([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\=)",
+          "begin": "((@)[a-zA-Z!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\()\\s*([^\\s,]*)",
           "beginCaptures": {
             "1": {
-              "name": "support.function.key.bibtex"
+              "name": "keyword.other.entry-type.bibtex"
             },
             "2": {
-              "name": "punctuation.separator.key-value.bibtex"
+              "name": "punctuation.definition.keyword.bibtex"
+            },
+            "3": {
+              "name": "punctuation.section.entry.begin.bibtex"
+            },
+            "4": {
+              "name": "entity.name.type.entry-key.bibtex"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.entry.end.bibtex"
             }
           },
-          "end": "(?=[,)])",
-          "name": "meta.key-assignment.bibtex",
+          "name": "meta.entry.parenthesis.bibtex",
           "patterns": [
             {
-              "include": "#field_value"
+              "begin": "([a-zA-Z!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(=)",
+              "beginCaptures": {
+                "1": {
+                  "name": "support.function.key.bibtex"
+                },
+                "2": {
+                  "name": "punctuation.separator.key-value.bibtex"
+                }
+              },
+              "end": "(?=[,)])",
+              "name": "meta.key-assignment.bibtex",
+              "patterns": [
+                {
+                  "include": "#field_value"
+                }
+              ]
             }
           ]
         }
       ]
     },
-    {
-      "begin": "[^@\\n]",
-      "end": "(?=@)",
-      "name": "comment.block.bibtex"
-    }
-  ],
-  "repository": {
     "field_value": {
       "patterns": [
         {
@@ -248,7 +151,7 @@
           "name": "punctuation.definition.group.begin.bibtex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.group.end.bibtex"
@@ -260,6 +163,124 @@
         }
       ]
     },
+    "preamble": {
+      "patterns": [
+        {
+          "begin": "((@)(?i:preamble))\\s*(\\{)\\s*",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.preamble.bibtex"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.bibtex"
+            },
+            "3": {
+              "name": "punctuation.section.preamble.begin.bibtex"
+            }
+          },
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.preamble.end.bibtex"
+            }
+          },
+          "name": "meta.preamble.braces.bibtex",
+          "patterns": [
+            {
+              "include": "#field_value"
+            }
+          ]
+        },
+        {
+          "begin": "((@)(?i:preamble))\\s*(\\()\\s*",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.preamble.bibtex"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.bibtex"
+            },
+            "3": {
+              "name": "punctuation.section.preamble.begin.bibtex"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.preamble.end.bibtex"
+            }
+          },
+          "name": "meta.preamble.parenthesis.bibtex",
+          "patterns": [
+            {
+              "include": "#field_value"
+            }
+          ]
+        }
+      ]
+    },
+    "string": {
+      "patterns": [
+        {
+          "begin": "((@)(?i:string))\\s*(\\{)\\s*([a-zA-Z!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.string-constant.bibtex"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.bibtex"
+            },
+            "3": {
+              "name": "punctuation.section.string-constant.begin.bibtex"
+            },
+            "4": {
+              "name": "variable.other.bibtex"
+            }
+          },
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.string-constant.end.bibtex"
+            }
+          },
+          "name": "meta.string-constant.braces.bibtex",
+          "patterns": [
+            {
+              "include": "#field_value"
+            }
+          ]
+        },
+        {
+          "begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.string-constant.bibtex"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.bibtex"
+            },
+            "3": {
+              "name": "punctuation.section.string-constant.begin.bibtex"
+            },
+            "4": {
+              "name": "variable.other.bibtex"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.string-constant.end.bibtex"
+            }
+          },
+          "name": "meta.string-constant.parenthesis.bibtex",
+          "patterns": [
+            {
+              "include": "#field_value"
+            }
+          ]
+        }
+      ]
+    },
     "string_content": {
       "patterns": [
         {
@@ -269,7 +290,7 @@
               "name": "punctuation.definition.string.begin.bibtex"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.bibtex"
@@ -308,7 +329,7 @@
           "name": "support.variable.bibtex"
         }
       },
-      "match": "[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*"
+      "match": "[a-zA-Z!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$\\&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*"
     }
   },
   "scopeName": "text.bibtex"
diff --git a/resources/languages/bicep.json b/resources/languages/bicep.json
index 1cabdd9..caf6c7b 100644
--- a/resources/languages/bicep.json
+++ b/resources/languages/bicep.json
@@ -1,7 +1,8 @@
 {
   "displayName": "Bicep",
   "fileTypes": [
-    ".bicep"
+    ".bicep",
+    ".bicepparam"
   ],
   "name": "bicep",
   "patterns": [
@@ -14,7 +15,7 @@
   ],
   "repository": {
     "array-literal": {
-      "begin": "\\[(?!(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*\\bfor\\b)",
+      "begin": "\\[(?!(?:[ \\t\\r\\n]|/\\*(?:\\*(?!/)|[^*])*\\*/)*\\bfor\\b)",
       "end": "]",
       "name": "meta.array-literal.bicep",
       "patterns": [
@@ -42,7 +43,7 @@
       ]
     },
     "decorator": {
-      "begin": "@(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*(?=\\b[_$[:alpha:]][_$[:alnum:]]*\\b)",
+      "begin": "@(?:[ \\t\\r\\n]|/\\*(?:\\*(?!/)|[^*])*\\*/)*(?=\\b[_$[:alpha:]][_$[:alnum:]]*\\b)",
       "end": "",
       "name": "meta.decorator.bicep",
       "patterns": [
@@ -55,7 +56,7 @@
       ]
     },
     "directive": {
-      "begin": "#\\b[_a-zA-Z-0-9]+\\b",
+      "begin": "#\\b[_a-zA-Z\\-0-9]+\\b",
       "end": "$",
       "name": "meta.directive.bicep",
       "patterns": [
@@ -68,11 +69,11 @@
       ]
     },
     "directive-variable": {
-      "match": "\\b[_a-zA-Z-0-9]+\\b",
+      "match": "\\b[_a-zA-Z\\-0-9]+\\b",
       "name": "keyword.control.declaration.bicep"
     },
     "escape-character": {
-      "match": "\\\\(u{[0-9A-Fa-f]+}|n|r|t|\\\\|'|\\${)",
+      "match": "\\\\(u\\{\\h+}|[nrt\\\\']|\\$\\{)",
       "name": "constant.character.escape.bicep"
     },
     "expression": {
@@ -116,7 +117,7 @@
       ]
     },
     "function-call": {
-      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b)(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*\\(",
+      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b)(?:[ \\t\\r\\n]|/\\*(?:\\*(?!/)|[^*])*\\*/)*\\(",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.bicep"
@@ -134,7 +135,7 @@
       ]
     },
     "identifier": {
-      "match": "\\b[_$[:alpha:]][_$[:alnum:]]*\\b(?!(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*\\()",
+      "match": "\\b[_$[:alpha:]][_$[:alnum:]]*\\b(?!(?:[ \\t\\r\\n]|/\\*(?:\\*(?!/)|[^*])*\\*/)*\\()",
       "name": "variable.other.readwrite.bicep"
     },
     "keyword": {
@@ -142,7 +143,7 @@
       "name": "keyword.control.declaration.bicep"
     },
     "lambda-start": {
-      "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]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*=>)",
+      "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",
@@ -156,7 +157,7 @@
           ]
         }
       },
-      "end": "(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*=>",
+      "end": "(?:[ \\t\\r\\n]|/\\*(?:\\*(?!/)|[^*])*\\*/)*=>",
       "name": "meta.lambda-start.bicep"
     },
     "line-comment": {
@@ -172,7 +173,7 @@
       "name": "constant.numeric.bicep"
     },
     "object-literal": {
-      "begin": "{",
+      "begin": "\\{",
       "end": "}",
       "name": "meta.object-literal.bicep",
       "patterns": [
@@ -188,7 +189,7 @@
       ]
     },
     "object-property-key": {
-      "match": "\\b[_$[:alpha:]][_$[:alnum:]]*\\b(?=(?:[ \\t\\r\\n]|\\/\\*(?:\\*(?!\\/)|[^*])*\\*\\/)*:)",
+      "match": "\\b[_$[:alpha:]][_$[:alnum:]]*\\b(?=(?:[ \\t\\r\\n]|/\\*(?:\\*(?!/)|[^*])*\\*/)*:)",
       "name": "variable.other.property.bicep"
     },
     "string-literal": {
@@ -205,7 +206,7 @@
       ]
     },
     "string-literal-subst": {
-      "begin": "(?<!\\\\)(\\${)",
+      "begin": "(?<!\\\\)(\\$\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.template-expression.begin.bicep"
diff --git a/resources/languages/blade.json b/resources/languages/blade.json
index 7fce817..f6f42ce 100644
--- a/resources/languages/blade.json
+++ b/resources/languages/blade.json
@@ -4,7 +4,7 @@
     "blade.php"
   ],
   "foldingStartMarker": "(/\\*|\\{\\s*$|<<<HTML)",
-  "foldingStopMarker": "(\\*/|^\\s*\\}|^HTML;)",
+  "foldingStopMarker": "(\\*/|^\\s*}|^HTML;)",
   "injections": {
     "text.html.php.blade - (meta.embedded | meta.tag | comment.block.blade), L:(text.html.php.blade meta.tag - (comment.block.blade | meta.embedded.block.blade)), L:(source.js.embedded.html - (comment.block.blade | meta.embedded.block.blade))": {
       "patterns": [
@@ -131,7 +131,7 @@
   "name": "blade",
   "patterns": [
     {
-      "include": "text.html.basic"
+      "include": "text.html.derivative"
     }
   ],
   "repository": {
@@ -154,7 +154,7 @@
     "blade": {
       "patterns": [
         {
-          "begin": "{{--",
+          "begin": "\\{\\{--",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.blade"
@@ -286,7 +286,7 @@
           ]
         },
         {
-          "begin": "(?<!@){{{",
+          "begin": "(?<!@)\\{\\{\\{",
           "beginCaptures": {
             "0": {
               "name": "support.function.construct.begin.blade"
@@ -310,7 +310,7 @@
           ]
         },
         {
-          "begin": "(?<![@{]){{",
+          "begin": "(?<![@{])\\{\\{",
           "beginCaptures": {
             "0": {
               "name": "support.function.construct.begin.blade"
@@ -334,7 +334,7 @@
           ]
         },
         {
-          "begin": "(?<!@){!!",
+          "begin": "(?<!@)\\{!!",
           "beginCaptures": {
             "0": {
               "name": "support.function.construct.begin.blade"
@@ -358,7 +358,7 @@
           ]
         },
         {
-          "begin": "(@){{",
+          "begin": "(@)\\{\\{",
           "beginCaptures": {
             "0": {
               "name": "begin.bracket.round.blade"
@@ -385,7 +385,7 @@
           ]
         },
         {
-          "begin": "(?<![A-Za-z0-9_@])(@(?i:auth|break|can|cannot|case|choice|component|continue|dd|dump|each|elsecan|elsecannot|elseif|empty|error|extends|for|foreach|forelse|guest|hassection|if|include|includefirst|includeif|includeunless|includewhen|inject|isset|json|lang|once|prepend|push|section|sectionMissing|slot|stack|switch|unless|unset|while|yield|servers|task|story|finished|production|slack|method|props|env|livewire|php)[\\t ]*)(\\()",
+          "begin": "(?<![A-Za-z0-9_@])(@(?i:auth|break|can|canany|cannot|case|choice|component|continue|dd|dump|each|elsecan|elsecanany|elsecannot|elseif|empty|error|extends|for|foreach|forelse|guest|hassection|if|include|includefirst|includeif|includeunless|includewhen|inject|isset|json|lang|once|prepend|push|section|sectionMissing|slot|stack|switch|unless|unset|while|yield|servers|task|story|finished|production|slack|method|props|env|livewire|php|class|aware|js|checked|selected|disabled|style|readonly|required|pushOnce|pushIf|prependOnce|use|vite)[\\t ]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.blade"
@@ -409,7 +409,7 @@
           ]
         },
         {
-          "begin": "(?<![A-Za-z0-9_@])(@(?i:append|default|else|endauth|endcan|endcannot|endcomponent|endempty|enderror|endfor|endforeach|endforelse|endguest|endif|endisset|endlang|endonce|endprepend|endpush|endsection|endslot|endswitch|endunless|endwhile|overwrite|parent|show|stop|endtask|endstory|endfinished|endproduction|endenv)[\\t ]*)(\\()",
+          "begin": "(?<![A-Za-z0-9_@])(@(?i:append|default|else|endauth|endcan|endcanany|endcannot|endcomponent|endempty|enderror|endfor|endforeach|endforelse|endguest|endif|endisset|endlang|endonce|endprepend|endpush|endsection|endslot|endswitch|endunless|endwhile|overwrite|parent|show|stop|endtask|endstory|endfinished|endproduction|endenv|endPushOnce|endPushIf|endPrependOnce)[\\t ]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.blade"
@@ -437,7 +437,7 @@
           "name": "keyword.blade"
         },
         {
-          "match": "(?<![A-Za-z0-9_@])@(end)?(?i:auth|can|cannot|component|empty|error|for|foreach|forelse|guest|if|isset|lang|prepend|push|section|slot|switch|unless|verbatim|while|task|story|finished|production|env|once)\\b",
+          "match": "(?<![A-Za-z0-9_@])@(end)?(?i:auth|can|canany|cannot|component|empty|error|for|foreach|forelse|guest|if|isset|lang|prepend|push|section|slot|switch|unless|verbatim|while|task|story|finished|production|env|once|pushOnce|pushIf|prependOnce|session)\\b",
           "name": "keyword.blade"
         },
         {
@@ -448,7 +448,7 @@
             }
           },
           "contentName": "source.php",
-          "end": "(?<![A-Za-z0-9_@])(?=@(?i:endphp|endsetup)\\b)",
+          "end": "(?<![A-Za-z0-9_@])(?=@(?i:end(?:php|setup))\\b)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -462,7 +462,7 @@
           ]
         },
         {
-          "begin": "(?<![A-Za-z0-9_@])(@(?i:endphp|endsetup)[\\t ]*)(\\()",
+          "begin": "(?<![A-Za-z0-9_@])(@(?i:end(?:php|setup))[\\t ]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.end.php"
@@ -516,6 +516,41 @@
         {
           "match": "(?<![A-Za-z0-9_@])@\\w+(?:::w+)?\\b",
           "name": "entity.name.function.blade"
+        },
+        {
+          "begin": "(:[a-z-]+)(=)(\")",
+          "beginCaptures": {
+            "0": {
+              "name": "meta.attribute.unrecognized.$1.html"
+            },
+            "1": {
+              "name": "entity.other.attribute-name.html"
+            },
+            "2": {
+              "name": "punctuation.separator.key-value.html"
+            },
+            "3": {
+              "name": "string.quoted.double.html"
+            },
+            "4": {
+              "name": "punctuation.definition.string.begin.html"
+            }
+          },
+          "contentName": "source.php",
+          "end": "(\")",
+          "endCaptures": {
+            "0": {
+              "name": "string.quoted.double.html"
+            },
+            "1": {
+              "name": "punctuation.definition.string.end.html"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ]
         }
       ]
     },
@@ -527,7 +562,7 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "match": "(?xi)\n(\\\\)?\\b\n((APC|Append)Iterator|Array(Access|Iterator|Object)\n|Bad(Function|Method)CallException\n|(Caching|CallbackFilter)Iterator|Collator|Collectable|Cond|Countable|CURLFile\n|Date(Interval|Period|Time(Interface|Immutable|Zone)?)?|Directory(Iterator)?|DomainException\n|DOM(Attr|CdataSection|CharacterData|Comment|Document(Fragment)?|Element|EntityReference\n    |Implementation|NamedNodeMap|Node(list)?|ProcessingInstruction|Text|XPath)\n|(Error)?Exception|EmptyIterator\n|finfo\n|Ev(Check|Child|Embed|Fork|Idle|Io|Loop|Periodic|Prepare|Signal|Stat|Timer|Watcher)?\n|Event(Base|Buffer(Event)?|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?\n|FANNConnection|(Filter|Filesystem)Iterator\n|Gender\\\\Gender|GlobIterator|Gmagick(Draw|Pixel)?\n|Haru(Annotation|Destination|Doc|Encoder|Font|Image|Outline|Page)\n|Http((Inflate|Deflate)?Stream|Message|Request(Pool)?|Response|QueryString)\n|HRTime\\\\(PerformanceCounter|StopWatch)\n|Intl(Calendar|((CodePoint|RuleBased)?Break|Parts)?Iterator|DateFormatter|TimeZone)\n|Imagick(Draw|Pixel(Iterator)?)?\n|InfiniteIterator|InvalidArgumentException|Iterator(Aggregate|Iterator)?\n|JsonSerializable\n|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|(AttachedPicture)?Frame))\n|Lapack|(Length|Locale|Logic)Exception|LimitIterator|Lua(Closure)?\n|Mongo(BinData|Client|Code|Collection|CommandCursor|Cursor(Exception)?|Date|DB(Ref)?|DeleteBatch\n      |Grid(FS(Cursor|File)?)|Id|InsertBatch|Int(32|64)|Log|Pool|Regex|ResultException|Timestamp\n      |UpdateBatch|Write(Batch|ConcernException))?\n|Memcache(d)?|MessageFormatter|MultipleIterator|Mutex\n|mysqli(_(driver|stmt|warning|result))?\n|MysqlndUh(Connection|PreparedStatement)\n|NoRewindIterator|Normalizer|NumberFormatter\n|OCI-(Collection|Lob)|OuterIterator|(OutOf(Bounds|Range)|Overflow)Exception\n|ParentIterator|PDO(Statement)?|Phar(Data|FileInfo)?|php_user_filter|Pool\n|QuickHash(Int(Set|StringHash)|StringIntHash)\n|Recursive(Array|Caching|Directory|Fallback|Filter|Iterator|Regex|Tree)?Iterator\n|Reflection(Class|Function(Abstract)?|Method|Object|Parameter|Property|(Zend)?Extension)?\n|RangeException|Reflector|RegexIterator|ResourceBundle|RuntimeException|RRD(Creator|Graph|Updater)\n|SAM(Connection|Message)|SCA(_(SoapProxy|LocalProxy))?\n|SDO_(DAS_(ChangeSummary|Data(Factory|Object)|Relational|Setting|XML(_Document)?)\n     |Data(Factory|Object)|Exception|List|Model_(Property|ReflectionDataObject|Type)|Sequence)\n|SeekableIterator|Serializable|SessionHandler(Interface)?|SimpleXML(Iterator|Element)|SNMP\n|Soap(Client|Fault|Header|Param|Server|Var)\n|SphinxClient|Spoofchecker\n|Spl(DoublyLinkedList|Enum|File(Info|Object)|FixedArray|(Max|Min)?Heap|Observer|ObjectStorage\n    |(Priority)?Queue|Stack|Subject|Type|TempFileObject)\n|SQLite(3(Result|Stmt)?|Database|Result|Unbuffered)\n|stdClass|streamWrapper|SVM(Model)?|Swish(Result(s)?|Search)?|Sync(Event|Mutex|ReaderWriter|Semaphore)\n|Thread(ed)?|tidy(Node)?|TokyoTyrant(Table|Iterator|Query)?|Transliterator|Traversable\n|UConverter|(Underflow|UnexpectedValue)Exception\n|V8Js(Exception)?|Varnish(Admin|Log|Stat)\n|Worker|Weak(Map|Ref)\n|XML(Diff\\\\(Base|DOM|File|Memory)|Reader|Writer)|XsltProcessor\n|Yaf_(Route_(Interface|Map|Regex|Rewrite|Simple|Supervar)\n     |Action_Abstract|Application|Config_(Simple|Ini|Abstract)|Controller_Abstract\n     |Dispatcher|Exception|Loader|Plugin_Abstract|Registry|Request_(Abstract|Simple|Http)\n     |Response_Abstract|Router|Session|View_(Simple|Interface))\n|Yar_(Client(_Exception)?|Concurrent_Client|Server(_Exception)?)\n|ZipArchive|ZMQ(Context|Device|Poll|Socket)?)\n\\b",
+          "match": "(?i)(\\\\)?\\b((A(?:PC|ppend))Iterator|Array(Access|Iterator|Object)|Bad(Function|Method)CallException|(Ca(?:ching|llbackFilter))Iterator|Collator|Collectable|Cond|Countable|CURLFile|Date(Interval|Period|Time(Interface|Immutable|Zone)?)?|Directory(Iterator)?|DomainException|DOM(Attr|CdataSection|CharacterData|Comment|Document(Fragment)?|Element|EntityReference|Implementation|NamedNodeMap|Node(list)?|ProcessingInstruction|Text|XPath)|(Error)?Exception|EmptyIterator|finfo|Ev(Check|Child|Embed|Fork|Idle|Io|Loop|Periodic|Prepare|Signal|Stat|Timer|Watcher)?|Event(Base|Buffer(Event)?|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?|FANNConnection|(Fil(?:ter|esystem))Iterator|Gender\\\\Gender|GlobIterator|Gmagick(Draw|Pixel)?|Haru(Annotation|Destination|Doc|Encoder|Font|Image|Outline|Page)|Http((Inflate|Deflate)?Stream|Message|Request(Pool)?|Response|QueryString)|HRTime\\\\(PerformanceCounter|StopWatch)|Intl(Calendar|((CodePoint|RuleBased)?Break|Parts)?Iterator|DateFormatter|TimeZone)|Imagick(Draw|Pixel(Iterator)?)?|InfiniteIterator|InvalidArgumentException|Iterator(Aggregate|Iterator)?|JsonSerializable|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|(AttachedPicture)?Frame))|Lapack|(L(?:ength|ocale|ogic))Exception|LimitIterator|Lua(Closure)?|Mongo(BinData|Client|Code|Collection|CommandCursor|Cursor(Exception)?|Date|DB(Ref)?|DeleteBatch|Grid(FS(Cursor|File)?)|Id|InsertBatch|Int(32|64)|Log|Pool|Regex|ResultException|Timestamp|UpdateBatch|Write(Batch|ConcernException))?|Memcache(d)?|MessageFormatter|MultipleIterator|Mutex|mysqli(_(driver|stmt|warning|result))?|MysqlndUh(Connection|PreparedStatement)|NoRewindIterator|Normalizer|NumberFormatter|OCI-(Collection|Lob)|OuterIterator|(O(?:utOf(Bounds|Range)|verflow))Exception|ParentIterator|PDO(Statement)?|Phar(Data|FileInfo)?|php_user_filter|Pool|QuickHash(Int(S(?:et|tringHash))|StringIntHash)|Recursive(Array|Caching|Directory|Fallback|Filter|Iterator|Regex|Tree)?Iterator|Reflection(Class|Function(Abstract)?|Method|Object|Parameter|Property|(Zend)?Extension)?|RangeException|Reflector|RegexIterator|ResourceBundle|RuntimeException|RRD(Creator|Graph|Updater)|SAM(Connection|Message)|SCA(_(SoapProxy|LocalProxy))?|SDO_(DAS_(ChangeSummary|Data(Factory|Object)|Relational|Setting|XML(_Document)?)|Data(Factory|Object)|Exception|List|Model_(Property|ReflectionDataObject|Type)|Sequence)|SeekableIterator|Serializable|SessionHandler(Interface)?|SimpleXML(Iterator|Element)|SNMP|Soap(Client|Fault|Header|Param|Server|Var)|SphinxClient|Spoofchecker|Spl(DoublyLinkedList|Enum|File(Info|Object)|FixedArray|(M(?:ax|in))?Heap|Observer|ObjectStorage|(Priority)?Queue|Stack|Subject|Type|TempFileObject)|SQLite(3(Result|Stmt)?|Database|Result|Unbuffered)|stdClass|streamWrapper|SVM(Model)?|Swish(Result(s)?|Search)?|Sync(Event|Mutex|ReaderWriter|Semaphore)|Thread(ed)?|tidy(Node)?|TokyoTyrant(Table|Iterator|Query)?|Transliterator|Traversable|UConverter|(Un(?:derflow|expectedValue))Exception|V8Js(Exception)?|Varnish(Admin|Log|Stat)|Worker|Weak(Map|Ref)|XML(Diff\\\\(Base|DOM|File|Memory)|Reader|Writer)|XsltProcessor|Yaf_(Route_(Interface|Map|Regex|Rewrite|Simple|Supervar)|Action_Abstract|Application|Config_(Simple|Ini|Abstract)|Controller_Abstract|Dispatcher|Exception|Loader|Plugin_Abstract|Registry|Request_(Abstract|Simple|Http)|Response_Abstract|Router|Session|View_(Simple|Interface))|Yar_(Client(_Exception)?|Concurrent_Client|Server(_Exception)?)|ZipArchive|ZMQ(Context|Device|Poll|Socket)?)\\b",
           "name": "support.class.builtin.php"
         }
       ]
@@ -655,7 +690,7 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "match": "(\\\\)?\\b(DEFAULT_INCLUDE_PATH|EAR_(INSTALL|EXTENSION)_DIR|E_(ALL|COMPILE_(ERROR|WARNING)|CORE_(ERROR|WARNING)|DEPRECATED|ERROR|NOTICE|PARSE|RECOVERABLE_ERROR|STRICT|USER_(DEPRECATED|ERROR|NOTICE|WARNING)|WARNING)|PHP_(ROUND_HALF_(DOWN|EVEN|ODD|UP)|(MAJOR|MINOR|RELEASE)_VERSION|MAXPATHLEN|BINDIR|SHLIB_SUFFIX|SYSCONFDIR|SAPI|CONFIG_FILE_(PATH|SCAN_DIR)|INT_(MAX|SIZE)|ZTS|OS|OUTPUT_HANDLER_(START|CONT|END)|DEBUG|DATADIR|URL_(SCHEME|HOST|USER|PORT|PASS|PATH|QUERY|FRAGMENT)|PREFIX|EXTRA_VERSION|EXTENSION_DIR|EOL|VERSION(_ID)?|WINDOWS_(NT_(SERVER|DOMAIN_CONTROLLER|WORKSTATION)|VERSION_(MAJOR|MINOR)|BUILD|SUITEMASK|SP_(MAJOR|MINOR)|PRODUCTTYPE|PLATFORM)|LIBDIR|LOCALSTATEDIR)|STD(ERR|IN|OUT)|ZEND_(DEBUG_BUILD|THREAD_SAFE))\\b",
+          "match": "(\\\\)?\\b(DEFAULT_INCLUDE_PATH|EAR_(INSTALL|EXTENSION)_DIR|E_(ALL|COMPILE_(ERROR|WARNING)|CORE_(ERROR|WARNING)|DEPRECATED|ERROR|NOTICE|PARSE|RECOVERABLE_ERROR|STRICT|USER_(DEPRECATED|ERROR|NOTICE|WARNING)|WARNING)|PHP_(ROUND_HALF_(DOWN|EVEN|ODD|UP)|(MAJOR|MINOR|RELEASE)_VERSION|MAXPATHLEN|BINDIR|SHLIB_SUFFIX|SYSCONFDIR|SAPI|CONFIG_FILE_(PATH|SCAN_DIR)|INT_(MAX|SIZE)|ZTS|OS|OUTPUT_HANDLER_(START|CONT|END)|DEBUG|DATADIR|URL_(SCHEME|HOST|USER|PORT|PASS|PATH|QUERY|FRAGMENT)|PREFIX|EXTRA_VERSION|EXTENSION_DIR|EOL|VERSION(_ID)?|WINDOWS_(NT_(SERVER|DOMAIN_CONTROLLER|WORKSTATION)|VERSION_(M(?:AJOR|INOR))|BUILD|SUITEMASK|SP_(M(?:AJOR|INOR))|PRODUCTTYPE|PLATFORM)|LIBDIR|LOCALSTATEDIR)|STD(ERR|IN|OUT)|ZEND_(DEBUG_BUILD|THREAD_SAFE))\\b",
           "name": "support.constant.core.php"
         },
         {
@@ -664,7 +699,7 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "match": "(\\\\)?\\b(__COMPILER_HALT_OFFSET__|AB(MON_(1|2|3|4|5|6|7|8|9|10|11|12)|DAY[1-7])|AM_STR|ASSERT_(ACTIVE|BAIL|CALLBACK_QUIET_EVAL|WARNING)|ALT_DIGITS|CASE_(UPPER|LOWER)|CHAR_MAX|CONNECTION_(ABORTED|NORMAL|TIMEOUT)|CODESET|COUNT_(NORMAL|RECURSIVE)|CREDITS_(ALL|DOCS|FULLPAGE|GENERAL|GROUP|MODULES|QA|SAPI)|CRYPT_(BLOWFISH|EXT_DES|MD5|SHA(256|512)|SALT_LENGTH|STD_DES)|CURRENCY_SYMBOL|D_(T_)?FMT|DATE_(ATOM|COOKIE|ISO8601|RFC(822|850|1036|1123|2822|3339)|RSS|W3C)|DAY_[1-7]|DECIMAL_POINT|DIRECTORY_SEPARATOR|ENT_(COMPAT|IGNORE|(NO)?QUOTES)|EXTR_(IF_EXISTS|OVERWRITE|PREFIX_(ALL|IF_EXISTS|INVALID|SAME)|REFS|SKIP)|ERA(_(D_(T_)?FMT)|T_FMT|YEAR)?|FRAC_DIGITS|GROUPING|HASH_HMAC|HTML_(ENTITIES|SPECIALCHARS)|INF|INFO_(ALL|CREDITS|CONFIGURATION|ENVIRONMENT|GENERAL|LICENSEMODULES|VARIABLES)|INI_(ALL|CANNER_(NORMAL|RAW)|PERDIR|SYSTEM|USER)|INT_(CURR_SYMBOL|FRAC_DIGITS)|LC_(ALL|COLLATE|CTYPE|MESSAGES|MONETARY|NUMERIC|TIME)|LOCK_(EX|NB|SH|UN)|LOG_(ALERT|AUTH(PRIV)?|CRIT|CRON|CONS|DAEMON|DEBUG|EMERG|ERR|INFO|LOCAL[1-7]|LPR|KERN|MAIL|NEWS|NODELAY|NOTICE|NOWAIT|ODELAY|PID|PERROR|WARNING|SYSLOG|UCP|USER)|M_(1_PI|SQRT(1_2|2|3|PI)|2_(SQRT)?PI|PI(_(2|4))?|E(ULER)?|LN(10|2|PI)|LOG(10|2)E)|MON_(1|2|3|4|5|6|7|8|9|10|11|12|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|N_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN)|NAN|NEGATIVE_SIGN|NO(EXPR|STR)|P_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN)|PM_STR|POSITIVE_SIGN|PATH(_SEPARATOR|INFO_(EXTENSION|(BASE|DIR|FILE)NAME))|RADIXCHAR|SEEK_(CUR|END|SET)|SORT_(ASC|DESC|LOCALE_STRING|REGULAR|STRING)|STR_PAD_(BOTH|LEFT|RIGHT)|T_FMT(_AMPM)?|THOUSEP|THOUSANDS_SEP|UPLOAD_ERR_(CANT_WRITE|EXTENSION|(FORM|INI)_SIZE|NO_(FILE|TMP_DIR)|OK|PARTIAL)|YES(EXPR|STR))\\b",
+          "match": "(\\\\)?\\b(__COMPILER_HALT_OFFSET__|AB(MON_([123456789]|10|11|12)|DAY[1-7])|AM_STR|ASSERT_(ACTIVE|BAIL|CALLBACK_QUIET_EVAL|WARNING)|ALT_DIGITS|CASE_(UPPER|LOWER)|CHAR_MAX|CONNECTION_(ABORTED|NORMAL|TIMEOUT)|CODESET|COUNT_(NORMAL|RECURSIVE)|CREDITS_(ALL|DOCS|FULLPAGE|GENERAL|GROUP|MODULES|QA|SAPI)|CRYPT_(BLOWFISH|EXT_DES|MD5|SHA(256|512)|SALT_LENGTH|STD_DES)|CURRENCY_SYMBOL|D_(T_)?FMT|DATE_(ATOM|COOKIE|ISO8601|RFC(822|850|1036|1123|2822|3339)|RSS|W3C)|DAY_[1-7]|DECIMAL_POINT|DIRECTORY_SEPARATOR|ENT_(COMPAT|IGNORE|(NO)?QUOTES)|EXTR_(IF_EXISTS|OVERWRITE|PREFIX_(ALL|IF_EXISTS|INVALID|SAME)|REFS|SKIP)|ERA(_(D_(T_)?FMT)|T_FMT|YEAR)?|FRAC_DIGITS|GROUPING|HASH_HMAC|HTML_(ENTITIES|SPECIALCHARS)|INF|INFO_(ALL|CREDITS|CONFIGURATION|ENVIRONMENT|GENERAL|LICENSEMODULES|VARIABLES)|INI_(ALL|CANNER_(NORMAL|RAW)|PERDIR|SYSTEM|USER)|INT_(CURR_SYMBOL|FRAC_DIGITS)|LC_(ALL|COLLATE|CTYPE|MESSAGES|MONETARY|NUMERIC|TIME)|LOCK_(EX|NB|SH|UN)|LOG_(ALERT|AUTH(PRIV)?|CRIT|CRON|CONS|DAEMON|DEBUG|EMERG|ERR|INFO|LOCAL[1-7]|LPR|KERN|MAIL|NEWS|NODELAY|NOTICE|NOWAIT|ODELAY|PID|PERROR|WARNING|SYSLOG|UCP|USER)|M_(1_PI|SQRT(1_2|[23]|PI)|2_(SQRT)?PI|PI(_([24]))?|E(ULER)?|LN(10|2|PI)|LOG(10|2)E)|MON_([123456789]|10|11|12|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|N_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN)|NAN|NEGATIVE_SIGN|NO(EXPR|STR)|P_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN)|PM_STR|POSITIVE_SIGN|PATH(_SEPARATOR|INFO_(EXTENSION|(BASE|DIR|FILE)NAME))|RADIXCHAR|SEEK_(CUR|END|SET)|SORT_(ASC|DESC|LOCALE_STRING|REGULAR|STRING)|STR_PAD_(BOTH|LEFT|RIGHT)|T_FMT(_AMPM)?|THOUSEP|THOUSANDS_SEP|UPLOAD_ERR_(CANT_WRITE|EXTENSION|(FORM|INI)_SIZE|NO_(FILE|TMP_DIR)|OK|PARTIAL)|YES(EXPR|STR))\\b",
           "name": "support.constant.std.php"
         },
         {
@@ -673,7 +708,7 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "match": "(\\\\)?\\b(GLOB_(MARK|BRACE|NO(SORT|CHECK|ESCAPE)|ONLYDIR|ERR|AVAILABLE_FLAGS)|XML_(SAX_IMPL|(DTD|DOCUMENT(_(FRAG|TYPE))?|HTML_DOCUMENT|NOTATION|NAMESPACE_DECL|PI|COMMENT|DATA_SECTION|TEXT)_NODE|OPTION_(SKIP_(TAGSTART|WHITE)|CASE_FOLDING|TARGET_ENCODING)|ERROR_((BAD_CHAR|(ATTRIBUTE_EXTERNAL|BINARY|PARAM|RECURSIVE)_ENTITY)_REF|MISPLACED_XML_PI|SYNTAX|NONE|NO_(MEMORY|ELEMENTS)|TAG_MISMATCH|INCORRECT_ENCODING|INVALID_TOKEN|DUPLICATE_ATTRIBUTE|UNCLOSED_(CDATA_SECTION|TOKEN)|UNDEFINED_ENTITY|UNKNOWN_ENCODING|JUNK_AFTER_DOC_ELEMENT|PARTIAL_CHAR|EXTERNAL_ENTITY_HANDLING|ASYNC_ENTITY)|ENTITY_(((REF|DECL)_)?NODE)|ELEMENT(_DECL)?_NODE|LOCAL_NAMESPACE|ATTRIBUTE_(NMTOKEN(S)?|NOTATION|NODE)|CDATA|ID(REF(S)?)?|DECL_NODE|ENTITY|ENUMERATION)|MHASH_(RIPEMD(128|160|256|320)|GOST|MD(2|4|5)|SHA(1|224|256|384|512)|SNEFRU256|HAVAL(128|160|192|224|256)|CRC23(B)?|TIGER(128|160)?|WHIRLPOOL|ADLER32)|MYSQL_(BOTH|NUM|CLIENT_(SSL|COMPRESS|IGNORE_SPACE|INTERACTIVE|ASSOC))|MYSQLI_(REPORT_(STRICT|INDEX|OFF|ERROR|ALL)|REFRESH_(GRANT|MASTER|BACKUP_LOG|STATUS|SLAVE|HOSTS|THREADS|TABLES|LOG)|READ_DEFAULT_(FILE|GROUP)|(GROUP|MULTIPLE_KEY|BINARY|BLOB)_FLAG|BOTH|STMT_ATTR_(CURSOR_TYPE|UPDATE_MAX_LENGTH|PREFETCH_ROWS)|STORE_RESULT|SERVER_QUERY_(NO_((GOOD_)?INDEX_USED)|WAS_SLOW)|SET_(CHARSET_NAME|FLAG)|NO_(DEFAULT_VALUE_FLAG|DATA)|NOT_NULL_FLAG|NUM(_FLAG)?|CURSOR_TYPE_(READ_ONLY|SCROLLABLE|NO_CURSOR|FOR_UPDATE)|CLIENT_(SSL|NO_SCHEMA|COMPRESS|IGNORE_SPACE|INTERACTIVE|FOUND_ROWS)|TYPE_(GEOMETRY|((MEDIUM|LONG|TINY)_)?BLOB|BIT|SHORT|STRING|SET|YEAR|NULL|NEWDECIMAL|NEWDATE|CHAR|TIME(STAMP)?|TINY|INT24|INTERVAL|DOUBLE|DECIMAL|DATE(TIME)?|ENUM|VAR_STRING|FLOAT|LONG(LONG)?)|TIME_STAMP_FLAG|INIT_COMMAND|ZEROFILL_FLAG|ON_UPDATE_NOW_FLAG|OPT_(NET_((CMD|READ)_BUFFER_SIZE)|CONNECT_TIMEOUT|INT_AND_FLOAT_NATIVE|LOCAL_INFILE)|DEBUG_TRACE_ENABLED|DATA_TRUNCATED|USE_RESULT|(ENUM|(PART|PRI|UNIQUE)_KEY|UNSIGNED)_FLAG|ASSOC|ASYNC|AUTO_INCREMENT_FLAG)|MCRYPT_(RC(2|6)|RIJNDAEL_(128|192|256)|RAND|GOST|XTEA|MODE_(STREAM|NOFB|CBC|CFB|OFB|ECB)|MARS|BLOWFISH(_COMPAT)?|SERPENT|SKIPJACK|SAFER(64|128|PLUS)|CRYPT|CAST_(128|256)|TRIPLEDES|THREEWAY|TWOFISH|IDEA|(3)?DES|DECRYPT|DEV_(U)?RANDOM|PANAMA|ENCRYPT|ENIGNA|WAKE|LOKI97|ARCFOUR(_IV)?)|STREAM_(REPORT_ERRORS|MUST_SEEK|MKDIR_RECURSIVE|BUFFER_(NONE|FULL|LINE)|SHUT_(RD)?WR|SOCK_(RDM|RAW|STREAM|SEQPACKET|DGRAM)|SERVER_(BIND|LISTEN)|NOTIFY_(REDIRECTED|RESOLVE|MIME_TYPE_IS|SEVERITY_(INFO|ERR|WARN)|COMPLETED|CONNECT|PROGRESS|FILE_SIZE_IS|FAILURE|AUTH_(REQUIRED|RESULT))|CRYPTO_METHOD_((SSLv2(3)?|SSLv3|TLS)_(CLIENT|SERVER))|CLIENT_((ASYNC_)?CONNECT|PERSISTENT)|CAST_(AS_STREAM|FOR_SELECT)|(IGNORE|IS)_URL|IPPROTO_(RAW|TCP|ICMP|IP|UDP)|OOB|OPTION_(READ_(BUFFER|TIMEOUT)|BLOCKING|WRITE_BUFFER)|URL_STAT_(LINK|QUIET)|USE_PATH|PEEK|PF_(INET(6)?|UNIX)|ENFORCE_SAFE_MODE|FILTER_(ALL|READ|WRITE))|SUNFUNCS_RET_(DOUBLE|STRING|TIMESTAMP)|SQLITE_(READONLY|ROW|MISMATCH|MISUSE|BOTH|BUSY|SCHEMA|NOMEM|NOTFOUND|NOTADB|NOLFS|NUM|CORRUPT|CONSTRAINT|CANTOPEN|TOOBIG|INTERRUPT|INTERNAL|IOERR|OK|DONE|PROTOCOL|PERM|ERROR|EMPTY|FORMAT|FULL|LOCKED|ABORT|ASSOC|AUTH)|SQLITE3_(BOTH|BLOB|NUM|NULL|TEXT|INTEGER|OPEN_(READ(ONLY|WRITE)|CREATE)|FLOAT_ASSOC)|CURL(M_(BAD_((EASY)?HANDLE)|CALL_MULTI_PERFORM|INTERNAL_ERROR|OUT_OF_MEMORY|OK)|MSG_DONE|SSH_AUTH_(HOST|NONE|DEFAULT|PUBLICKEY|PASSWORD|KEYBOARD)|CLOSEPOLICY_(SLOWEST|CALLBACK|OLDEST|LEAST_(RECENTLY_USED|TRAFFIC)|INFO_(REDIRECT_(COUNT|TIME)|REQUEST_SIZE|SSL_VERIFYRESULT|STARTTRANSFER_TIME|(SIZE|SPEED)_(DOWNLOAD|UPLOAD)|HTTP_CODE|HEADER_(OUT|SIZE)|NAMELOOKUP_TIME|CONNECT_TIME|CONTENT_(TYPE|LENGTH_(DOWNLOAD|UPLOAD))|CERTINFO|TOTAL_TIME|PRIVATE|PRETRANSFER_TIME|EFFECTIVE_URL|FILETIME)|OPT_(RESUME_FROM|RETURNTRANSFER|REDIR_PROTOCOLS|REFERER|READ(DATA|FUNCTION)|RANGE|RANDOM_FILE|MAX(CONNECTS|REDIRS)|BINARYTRANSFER|BUFFERSIZE|SSH_(HOST_PUBLIC_KEY_MD5|(PRIVATE|PUBLIC)_KEYFILE)|AUTH_TYPES)|SSL(CERT(TYPE|PASSWD)?|ENGINE(_DEFAULT)?|VERSION|KEY(TYPE|PASSWD)?)|SSL_(CIPHER_LIST|VERIFY(HOST|PEER))|STDERR|HTTP(GET|HEADER|200ALIASES|_VERSION|PROXYTUNNEL|AUTH)|HEADER(FUNCTION)?|NO(BODY|SIGNAL|PROGRESS)|NETRC|CRLF|CONNECTTIMEOUT(_MS)?|COOKIE(SESSION|JAR|FILE)?|CUSTOMREQUEST|CERTINFO|CLOSEPOLICY|CA(INFO|PATH)|TRANSFERTEXT|TCP_NODELAY|TIME(CONDITION|OUT(_MS)?|VALUE)|INTERFACE|INFILE(SIZE)?|IPRESOLVE|DNS_(CACHE_TIMEOUT|USE_GLOBAL_CACHE)|URL|USER(AGENT|PWD)|UNRESTRICTED_AUTH|UPLOAD|PRIVATE|PROGRESSFUNCTION|PROXY(TYPE|USERPWD|PORT|AUTH)?|PROTOCOLS|PORT|POST(REDIR|QUOTE|FIELDS)?|PUT|EGDSOCKET|ENCODING|VERBOSE|KRB4LEVEL|KEYPASSWD|QUOTE|FRESH_CONNECT|FTP(APPEND|LISTONLY|PORT|SSLAUTH)|FTP_(SSL|SKIP_PASV_IP|CREATE_MISSING_DIRS|USE_EP(RT|SV)|FILEMETHOD)|FILE(TIME)?|FORBID_REUSE|FOLLOWLOCATION|FAILONERROR|WRITE(FUNCTION|HEADER)|LOW_SPEED_(LIMIT|TIME)|AUTOREFERER)|PROXY_(HTTP|SOCKS(4|5))|PROTO_(SCP|SFTP|HTTP(S)?|TELNET|TFTP|DICT|FTP(S)?|FILE|LDAP(S)?|ALL)|E_((RECV|READ)_ERROR|GOT_NOTHING|MALFORMAT_USER|BAD_(CONTENT_ENCODING|CALLING_ORDER|PASSWORD_ENTERED|FUNCTION_ARGUMENT)|SSH|SSL_(CIPHER|CONNECT_ERROR|CERTPROBLEM|CACERT|PEER_CERTIFICATE|ENGINE_(NOTFOUND|SETFAILED))|SHARE_IN_USE|SEND_ERROR|HTTP_(RANGE_ERROR|NOT_FOUND|PORT_FAILED|POST_ERROR)|COULDNT_(RESOLVE_(HOST|PROXY)|CONNECT)|TOO_MANY_REDIRECTS|TELNET_OPTION_SYNTAX|OBSOLETE|OUT_OF_MEMORY|OPERATION|TIMEOUTED|OK|URL_MALFORMAT(_USER)?|UNSUPPORTED_PROTOCOL|UNKNOWN_TELNET_OPTION|PARTIAL_FILE|FTP_(BAD_DOWNLOAD_RESUME|SSL_FAILED|COULDNT_(RETR_FILE|GET_SIZE|STOR_FILE|SET_(BINARY|ASCII)|USE_REST)|CANT_(GET_HOST|RECONNECT)|USER_PASSWORD_INCORRECT|PORT_FAILED|QUOTE_ERROR|WRITE_ERROR|WEIRD_((PASS|PASV|SERVER|USER)_REPLY|227_FORMAT)|ACCESS_DENIED)|FILESIZE_EXCEEDED|FILE_COULDNT_READ_FILE|FUNCTION_NOT_FOUND|FAILED_INIT|WRITE_ERROR|LIBRARY_NOT_FOUND|LDAP_(SEARCH_FAILED|CANNOT_BIND|INVALID_URL)|ABORTED_BY_CALLBACK)|VERSION_NOW|FTP(METHOD_(MULTI|SINGLE|NO)CWD|SSL_(ALL|NONE|CONTROL|TRY)|AUTH_(DEFAULT|SSL|TLS))|AUTH_(ANY(SAFE)?|BASIC|DIGEST|GSSNEGOTIATE|NTLM))|CURL_(HTTP_VERSION_(1_(0|1)|NONE)|NETRC_(REQUIRED|IGNORED|OPTIONAL)|TIMECOND_(IF(UN)?MODSINCE|LASTMOD)|IPRESOLVE_(V(4|6)|WHATEVER)|VERSION_(SSL|IPV6|KERBEROS4|LIBZ))|IMAGETYPE_(GIF|XBM|BMP|SWF|COUNT|TIFF_(MM|II)|ICO|IFF|UNKNOWN|JB2|JPX|JP2|JPC|JPEG(2000)?|PSD|PNG|WBMP)|INPUT_(REQUEST|GET|SERVER|SESSION|COOKIE|POST|ENV)|ICONV_(MIME_DECODE_(STRICT|CONTINUE_ON_ERROR)|IMPL|VERSION)|DNS_(MX|SRV|SOA|HINFO|NS|NAPTR|CNAME|TXT|PTR|ANY|ALL|AAAA|A(6)?)|DOM(STRING_SIZE_ERR)|DOM_((SYNTAX|HIERARCHY_REQUEST|NO_(MODIFICATION_ALLOWED|DATA_ALLOWED)|NOT_(FOUND|SUPPORTED)|NAMESPACE|INDEX_SIZE|USE_ATTRIBUTE|VALID_(MODIFICATION|STATE|CHARACTER|ACCESS)|PHP|VALIDATION|WRONG_DOCUMENT)_ERR)|JSON_(HEX_(TAG|QUOT|AMP|APOS)|NUMERIC_CHECK|ERROR_(SYNTAX|STATE_MISMATCH|NONE|CTRL_CHAR|DEPTH|UTF8)|FORCE_OBJECT)|PREG_((D_UTF8(_OFFSET)?|NO|INTERNAL|(BACKTRACK|RECURSION)_LIMIT)_ERROR|GREP_INVERT|SPLIT_(NO_EMPTY|(DELIM|OFFSET)_CAPTURE)|SET_ORDER|OFFSET_CAPTURE|PATTERN_ORDER)|PSFS_(PASS_ON|ERR_FATAL|FEED_ME|FLAG_(NORMAL|FLUSH_(CLOSE|INC)))|PCRE_VERSION|POSIX_((F|R|W|X)_OK|S_IF(REG|BLK|SOCK|CHR|IFO))|FNM_(NOESCAPE|CASEFOLD|PERIOD|PATHNAME)|FILTER_(REQUIRE_(SCALAR|ARRAY)|NULL_ON_FAILURE|CALLBACK|DEFAULT|UNSAFE_RAW|SANITIZE_(MAGIC_QUOTES|STRING|STRIPPED|SPECIAL_CHARS|NUMBER_(INT|FLOAT)|URL|EMAIL|ENCODED|FULL_SPCIAL_CHARS)|VALIDATE_(REGEXP|BOOLEAN|INT|IP|URL|EMAIL|FLOAT)|FORCE_ARRAY|FLAG_(SCHEME_REQUIRED|STRIP_(BACKTICK|HIGH|LOW)|HOST_REQUIRED|NONE|NO_(RES|PRIV)_RANGE|ENCODE_QUOTES|IPV(4|6)|PATH_REQUIRED|EMPTY_STRING_NULL|ENCODE_(HIGH|LOW|AMP)|QUERY_REQUIRED|ALLOW_(SCIENTIFIC|HEX|THOUSAND|OCTAL|FRACTION)))|FILE_(BINARY|SKIP_EMPTY_LINES|NO_DEFAULT_CONTEXT|TEXT|IGNORE_NEW_LINES|USE_INCLUDE_PATH|APPEND)|FILEINFO_(RAW|MIME(_(ENCODING|TYPE))?|SYMLINK|NONE|CONTINUE|DEVICES|PRESERVE_ATIME)|FORCE_(DEFLATE|GZIP)|LIBXML_(XINCLUDE|NSCLEAN|NO(XMLDECL|BLANKS|NET|CDATA|ERROR|EMPTYTAG|ENT|WARNING)|COMPACT|DTD(VALID|LOAD|ATTR)|((DOTTED|LOADED)_)?VERSION|PARSEHUGE|ERR_(NONE|ERROR|FATAL|WARNING)))\\b",
+          "match": "(\\\\)?\\b(GLOB_(MARK|BRACE|NO(SORT|CHECK|ESCAPE)|ONLYDIR|ERR|AVAILABLE_FLAGS)|XML_(SAX_IMPL|(DTD|DOCUMENT(_(FRAG|TYPE))?|HTML_DOCUMENT|NOTATION|NAMESPACE_DECL|PI|COMMENT|DATA_SECTION|TEXT)_NODE|OPTION_(SKIP_(TAGSTART|WHITE)|CASE_FOLDING|TARGET_ENCODING)|ERROR_((BAD_CHAR|(ATTRIBUTE_EXTERNAL|BINARY|PARAM|RECURSIVE)_ENTITY)_REF|MISPLACED_XML_PI|SYNTAX|NONE|NO_(MEMORY|ELEMENTS)|TAG_MISMATCH|INCORRECT_ENCODING|INVALID_TOKEN|DUPLICATE_ATTRIBUTE|UNCLOSED_(CDATA_SECTION|TOKEN)|UNDEFINED_ENTITY|UNKNOWN_ENCODING|JUNK_AFTER_DOC_ELEMENT|PARTIAL_CHAR|EXTERNAL_ENTITY_HANDLING|ASYNC_ENTITY)|ENTITY_(((REF|DECL)_)?NODE)|ELEMENT(_DECL)?_NODE|LOCAL_NAMESPACE|ATTRIBUTE_(N(?:MTOKEN(S)?|OTATION|ODE))|CDATA|ID(REF(S)?)?|DECL_NODE|ENTITY|ENUMERATION)|MHASH_(RIPEMD(128|160|256|320)|GOST|MD([245])|SHA(1|224|256|384|512)|SNEFRU256|HAVAL(128|160|192|224|256)|CRC23(B)?|TIGER(1(?:28|60))?|WHIRLPOOL|ADLER32)|MYSQL_(BOTH|NUM|CLIENT_(SSL|COMPRESS|IGNORE_SPACE|INTERACTIVE|ASSOC))|MYSQLI_(REPORT_(STRICT|INDEX|OFF|ERROR|ALL)|REFRESH_(GRANT|MASTER|BACKUP_LOG|STATUS|SLAVE|HOSTS|THREADS|TABLES|LOG)|READ_DEFAULT_(FILE|GROUP)|(GROUP|MULTIPLE_KEY|BINARY|BLOB)_FLAG|BOTH|STMT_ATTR_(CURSOR_TYPE|UPDATE_MAX_LENGTH|PREFETCH_ROWS)|STORE_RESULT|SERVER_QUERY_(NO_((GOOD_)?INDEX_USED)|WAS_SLOW)|SET_(CHARSET_NAME|FLAG)|NO_(D(?:EFAULT_VALUE_FLAG|ATA))|NOT_NULL_FLAG|NUM(_FLAG)?|CURSOR_TYPE_(READ_ONLY|SCROLLABLE|NO_CURSOR|FOR_UPDATE)|CLIENT_(SSL|NO_SCHEMA|COMPRESS|IGNORE_SPACE|INTERACTIVE|FOUND_ROWS)|TYPE_(GEOMETRY|((MEDIUM|LONG|TINY)_)?BLOB|BIT|SHORT|STRING|SET|YEAR|NULL|NEWDECIMAL|NEWDATE|CHAR|TIME(STAMP)?|TINY|INT24|INTERVAL|DOUBLE|DECIMAL|DATE(TIME)?|ENUM|VAR_STRING|FLOAT|LONG(LONG)?)|TIME_STAMP_FLAG|INIT_COMMAND|ZEROFILL_FLAG|ON_UPDATE_NOW_FLAG|OPT_(NET_((CMD|READ)_BUFFER_SIZE)|CONNECT_TIMEOUT|INT_AND_FLOAT_NATIVE|LOCAL_INFILE)|DEBUG_TRACE_ENABLED|DATA_TRUNCATED|USE_RESULT|(ENUM|(PART|PRI|UNIQUE)_KEY|UNSIGNED)_FLAG|ASSOC|ASYNC|AUTO_INCREMENT_FLAG)|MCRYPT_(RC([26])|RIJNDAEL_(128|192|256)|RAND|GOST|XTEA|MODE_(STREAM|NOFB|CBC|CFB|OFB|ECB)|MARS|BLOWFISH(_COMPAT)?|SERPENT|SKIPJACK|SAFER(64|128|PLUS)|CRYPT|CAST_(128|256)|TRIPLEDES|THREEWAY|TWOFISH|IDEA|(3)?DES|DECRYPT|DEV_(U)?RANDOM|PANAMA|ENCRYPT|ENIGNA|WAKE|LOKI97|ARCFOUR(_IV)?)|STREAM_(REPORT_ERRORS|MUST_SEEK|MKDIR_RECURSIVE|BUFFER_(NONE|FULL|LINE)|SHUT_(RD)?WR|SOCK_(RDM|RAW|STREAM|SEQPACKET|DGRAM)|SERVER_(BIND|LISTEN)|NOTIFY_(REDIRECTED|RESOLVE|MIME_TYPE_IS|SEVERITY_(INFO|ERR|WARN)|COMPLETED|CONNECT|PROGRESS|FILE_SIZE_IS|FAILURE|AUTH_(RE(?:QUIRED|SULT)))|CRYPTO_METHOD_((SSLv2(3)?|SSLv3|TLS)_(CLIENT|SERVER))|CLIENT_((ASYNC_)?CONNECT|PERSISTENT)|CAST_(AS_STREAM|FOR_SELECT)|(I(?:GNORE|S))_URL|IPPROTO_(RAW|TCP|ICMP|IP|UDP)|OOB|OPTION_(READ_(BUFFER|TIMEOUT)|BLOCKING|WRITE_BUFFER)|URL_STAT_(LINK|QUIET)|USE_PATH|PEEK|PF_(INET(6)?|UNIX)|ENFORCE_SAFE_MODE|FILTER_(ALL|READ|WRITE))|SUNFUNCS_RET_(DOUBLE|STRING|TIMESTAMP)|SQLITE_(READONLY|ROW|MISMATCH|MISUSE|BOTH|BUSY|SCHEMA|NOMEM|NOTFOUND|NOTADB|NOLFS|NUM|CORRUPT|CONSTRAINT|CANTOPEN|TOOBIG|INTERRUPT|INTERNAL|IOERR|OK|DONE|PROTOCOL|PERM|ERROR|EMPTY|FORMAT|FULL|LOCKED|ABORT|ASSOC|AUTH)|SQLITE3_(BOTH|BLOB|NUM|NULL|TEXT|INTEGER|OPEN_(READ(ONLY|WRITE)|CREATE)|FLOAT_ASSOC)|CURL(M_(BAD_((EASY)?HANDLE)|CALL_MULTI_PERFORM|INTERNAL_ERROR|OUT_OF_MEMORY|OK)|MSG_DONE|SSH_AUTH_(HOST|NONE|DEFAULT|PUBLICKEY|PASSWORD|KEYBOARD)|CLOSEPOLICY_(SLOWEST|CALLBACK|OLDEST|LEAST_(RECENTLY_USED|TRAFFIC)|INFO_(REDIRECT_(COUNT|TIME)|REQUEST_SIZE|SSL_VERIFYRESULT|STARTTRANSFER_TIME|(S(?:IZE|PEED))_(DOWNLOAD|UPLOAD)|HTTP_CODE|HEADER_(OUT|SIZE)|NAMELOOKUP_TIME|CONNECT_TIME|CONTENT_(TYPE|LENGTH_(DOWNLOAD|UPLOAD))|CERTINFO|TOTAL_TIME|PRIVATE|PRETRANSFER_TIME|EFFECTIVE_URL|FILETIME)|OPT_(RESUME_FROM|RETURNTRANSFER|REDIR_PROTOCOLS|REFERER|READ(DATA|FUNCTION)|RANGE|RANDOM_FILE|MAX(CONNECTS|REDIRS)|BINARYTRANSFER|BUFFERSIZE|SSH_(HOST_PUBLIC_KEY_MD5|(P(?:RIVATE|UBLIC))_KEYFILE)|AUTH_TYPES)|SSL(CERT(TYPE|PASSWD)?|ENGINE(_DEFAULT)?|VERSION|KEY(TYPE|PASSWD)?)|SSL_(CIPHER_LIST|VERIFY(HOST|PEER))|STDERR|HTTP(GET|HEADER|200ALIASES|_VERSION|PROXYTUNNEL|AUTH)|HEADER(FUNCTION)?|NO(BODY|SIGNAL|PROGRESS)|NETRC|CRLF|CONNECTTIMEOUT(_MS)?|COOKIE(SESSION|JAR|FILE)?|CUSTOMREQUEST|CERTINFO|CLOSEPOLICY|CA(INFO|PATH)|TRANSFERTEXT|TCP_NODELAY|TIME(CONDITION|OUT(_MS)?|VALUE)|INTERFACE|INFILE(SIZE)?|IPRESOLVE|DNS_(CACHE_TIMEOUT|USE_GLOBAL_CACHE)|URL|USER(AGENT|PWD)|UNRESTRICTED_AUTH|UPLOAD|PRIVATE|PROGRESSFUNCTION|PROXY(TYPE|USERPWD|PORT|AUTH)?|PROTOCOLS|PORT|POST(REDIR|QUOTE|FIELDS)?|PUT|EGDSOCKET|ENCODING|VERBOSE|KRB4LEVEL|KEYPASSWD|QUOTE|FRESH_CONNECT|FTP(APPEND|LISTONLY|PORT|SSLAUTH)|FTP_(SSL|SKIP_PASV_IP|CREATE_MISSING_DIRS|USE_EP(RT|SV)|FILEMETHOD)|FILE(TIME)?|FORBID_REUSE|FOLLOWLOCATION|FAILONERROR|WRITE(FUNCTION|HEADER)|LOW_SPEED_(LIMIT|TIME)|AUTOREFERER)|PROXY_(HTTP|SOCKS([45]))|PROTO_(SCP|SFTP|HTTP(S)?|TELNET|TFTP|DICT|FTP(S)?|FILE|LDAP(S)?|ALL)|E_((RE(?:CV|AD))_ERROR|GOT_NOTHING|MALFORMAT_USER|BAD_(CONTENT_ENCODING|CALLING_ORDER|PASSWORD_ENTERED|FUNCTION_ARGUMENT)|SSH|SSL_(CIPHER|CONNECT_ERROR|CERTPROBLEM|CACERT|PEER_CERTIFICATE|ENGINE_(NOTFOUND|SETFAILED))|SHARE_IN_USE|SEND_ERROR|HTTP_(RANGE_ERROR|NOT_FOUND|PORT_FAILED|POST_ERROR)|COULDNT_(RESOLVE_(HOST|PROXY)|CONNECT)|TOO_MANY_REDIRECTS|TELNET_OPTION_SYNTAX|OBSOLETE|OUT_OF_MEMORY|OPERATION|TIMEOUTED|OK|URL_MALFORMAT(_USER)?|UNSUPPORTED_PROTOCOL|UNKNOWN_TELNET_OPTION|PARTIAL_FILE|FTP_(BAD_DOWNLOAD_RESUME|SSL_FAILED|COULDNT_(RETR_FILE|GET_SIZE|STOR_FILE|SET_(BINARY|ASCII)|USE_REST)|CANT_(GET_HOST|RECONNECT)|USER_PASSWORD_INCORRECT|PORT_FAILED|QUOTE_ERROR|WRITE_ERROR|WEIRD_((PASS|PASV|SERVER|USER)_REPLY|227_FORMAT)|ACCESS_DENIED)|FILESIZE_EXCEEDED|FILE_COULDNT_READ_FILE|FUNCTION_NOT_FOUND|FAILED_INIT|WRITE_ERROR|LIBRARY_NOT_FOUND|LDAP_(SEARCH_FAILED|CANNOT_BIND|INVALID_URL)|ABORTED_BY_CALLBACK)|VERSION_NOW|FTP(METHOD_(MULTI|SINGLE|NO)CWD|SSL_(ALL|NONE|CONTROL|TRY)|AUTH_(DEFAULT|SSL|TLS))|AUTH_(ANY(SAFE)?|BASIC|DIGEST|GSSNEGOTIATE|NTLM))|CURL_(HTTP_VERSION_(1_([01])|NONE)|NETRC_(REQUIRED|IGNORED|OPTIONAL)|TIMECOND_(IF(UN)?MODSINCE|LASTMOD)|IPRESOLVE_(V([46])|WHATEVER)|VERSION_(SSL|IPV6|KERBEROS4|LIBZ))|IMAGETYPE_(GIF|XBM|BMP|SWF|COUNT|TIFF_(MM|II)|ICO|IFF|UNKNOWN|JB2|JPX|JP2|JPC|JPEG(2000)?|PSD|PNG|WBMP)|INPUT_(REQUEST|GET|SERVER|SESSION|COOKIE|POST|ENV)|ICONV_(MIME_DECODE_(STRICT|CONTINUE_ON_ERROR)|IMPL|VERSION)|DNS_(MX|SRV|SOA|HINFO|NS|NAPTR|CNAME|TXT|PTR|ANY|ALL|AAAA|A(6)?)|DOM(STRING_SIZE_ERR)|DOM_((SYNTAX|HIERARCHY_REQUEST|NO_(MODIFICATION_ALLOWED|DATA_ALLOWED)|NOT_(FOUND|SUPPORTED)|NAMESPACE|INDEX_SIZE|USE_ATTRIBUTE|VALID_(MODIFICATION|STATE|CHARACTER|ACCESS)|PHP|VALIDATION|WRONG_DOCUMENT)_ERR)|JSON_(HEX_(TAG|QUOT|AMP|APOS)|NUMERIC_CHECK|ERROR_(SYNTAX|STATE_MISMATCH|NONE|CTRL_CHAR|DEPTH|UTF8)|FORCE_OBJECT)|PREG_((D_UTF8(_OFFSET)?|NO|INTERNAL|(BACKTRACK|RECURSION)_LIMIT)_ERROR|GREP_INVERT|SPLIT_(NO_EMPTY|(DELIM|OFFSET)_CAPTURE)|SET_ORDER|OFFSET_CAPTURE|PATTERN_ORDER)|PSFS_(PASS_ON|ERR_FATAL|FEED_ME|FLAG_(NORMAL|FLUSH_(CLOSE|INC)))|PCRE_VERSION|POSIX_(([FRWX])_OK|S_IF(REG|BLK|SOCK|CHR|IFO))|FNM_(NOESCAPE|CASEFOLD|PERIOD|PATHNAME)|FILTER_(REQUIRE_(SCALAR|ARRAY)|NULL_ON_FAILURE|CALLBACK|DEFAULT|UNSAFE_RAW|SANITIZE_(MAGIC_QUOTES|STRING|STRIPPED|SPECIAL_CHARS|NUMBER_(INT|FLOAT)|URL|EMAIL|ENCODED|FULL_SPCIAL_CHARS)|VALIDATE_(REGEXP|BOOLEAN|INT|IP|URL|EMAIL|FLOAT)|FORCE_ARRAY|FLAG_(SCHEME_REQUIRED|STRIP_(BACKTICK|HIGH|LOW)|HOST_REQUIRED|NONE|NO_(RES|PRIV)_RANGE|ENCODE_QUOTES|IPV([46])|PATH_REQUIRED|EMPTY_STRING_NULL|ENCODE_(HIGH|LOW|AMP)|QUERY_REQUIRED|ALLOW_(SCIENTIFIC|HEX|THOUSAND|OCTAL|FRACTION)))|FILE_(BINARY|SKIP_EMPTY_LINES|NO_DEFAULT_CONTEXT|TEXT|IGNORE_NEW_LINES|USE_INCLUDE_PATH|APPEND)|FILEINFO_(RAW|MIME(_(ENCODING|TYPE))?|SYMLINK|NONE|CONTINUE|DEVICES|PRESERVE_ATIME)|FORCE_(DEFLATE|GZIP)|LIBXML_(XINCLUDE|NSCLEAN|NO(XMLDECL|BLANKS|NET|CDATA|ERROR|EMPTYTAG|ENT|WARNING)|COMPACT|DTD(VALID|LOAD|ATTR)|((DOTTED|LOADED)_)?VERSION|PARSEHUGE|ERR_(NONE|ERROR|FATAL|WARNING)))\\b",
           "name": "support.constant.ext.php"
         },
         {
@@ -686,7 +721,7 @@
           "name": "support.constant.parser-token.php"
         },
         {
-          "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+          "match": "(?i)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*",
           "name": "constant.other.php"
         }
       ]
@@ -694,7 +729,7 @@
     "function-call": {
       "patterns": [
         {
-          "begin": "(?xi)\n(\n  \\\\?\\b                                                # Optional root namespace\n  [a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*          # First namespace\n  (?:\\\\[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)+ # Additional namespaces\n)\\s*(\\()",
+          "begin": "(?i)(\\\\?\\b[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*(?:\\\\[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)+)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -702,7 +737,7 @@
                   "include": "#namespace"
                 },
                 {
-                  "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+                  "match": "(?i)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*",
                   "name": "entity.name.function.php"
                 }
               ]
@@ -725,7 +760,7 @@
           ]
         },
         {
-          "begin": "(?i)(\\\\)?\\b([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(\\()",
+          "begin": "(?i)(\\\\)?\\b([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -740,7 +775,7 @@
                   "include": "#support"
                 },
                 {
-                  "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+                  "match": "(?i)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*",
                   "name": "entity.name.function.php"
                 }
               ]
@@ -778,7 +813,7 @@
           "name": "punctuation.separator.delimiter.php"
         },
         {
-          "begin": "(?xi)\n(array)                                                            # Typehint\n\\s+((&)?\\s*(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # Variable name with possible reference\n\\s*(=)\\s*(array)\\s*(\\()                                        # Default value",
+          "begin": "(?i)(array)\\s+((&)?\\s*(\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s*(=)\\s*(array)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.type.php"
@@ -859,17 +894,17 @@
               "name": "punctuation.section.array.end.php"
             }
           },
-          "match": "(?xi)\n(array|callable)                                                   # Typehint\n\\s+((&)?\\s*(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # Variable name with possible reference\n(?:                                                                # Optional default value\n  \\s*(=)\\s*\n  (?:\n    (null)\n    |\n    (\\[)((?>[^\\[\\]]+|\\[\\g<8>\\])*)(\\])\n    |((?:\\S*?\\(\\))|(?:\\S*?))\n  )\n)?\n\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma or a comment",
+          "match": "(?i)(array|callable)\\s+((&)?\\s*(\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)(?:\\s*(=)\\s*(?:(null)|(\\[)((?>[^\\[\\]]+|\\[\\g<8>])*)(])|(\\S*?\\(\\)|\\S*?)))?\\s*(?=[,)]|/[/*]|#|$)",
           "name": "meta.function.parameter.array.php"
         },
         {
-          "begin": "(?xi)\n(\\\\?(?:[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*\\\\)*)                 # Optional namespace\n([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)                               # Typehinted class name\n\\s+((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # Variable name with possible reference",
+          "begin": "(?i)(\\\\?(?:[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*\\\\)*)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s+((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)",
           "beginCaptures": {
             "1": {
               "name": "support.other.namespace.php",
               "patterns": [
                 {
-                  "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+                  "match": "(?i)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*",
                   "name": "storage.type.php"
                 },
                 {
@@ -894,7 +929,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "end": "(?=,|\\)|/[/*]|\\#)",
+          "end": "(?=[,)]|/[/*]|#)",
           "name": "meta.function.parameter.typehinted.php",
           "patterns": [
             {
@@ -904,7 +939,7 @@
                   "name": "keyword.operator.assignment.php"
                 }
               },
-              "end": "(?=,|\\)|/[/*]|\\#)",
+              "end": "(?=[,)]|/[/*]|#)",
               "patterns": [
                 {
                   "include": "#language"
@@ -928,11 +963,11 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?xi)\n((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # Variable name with possible reference\n\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma or a comment",
+          "match": "(?i)((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s*(?=[,)]|/[/*]|#|$)",
           "name": "meta.function.parameter.no-default.php"
         },
         {
-          "begin": "(?xi)\n((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # Variable name with possible reference\n\\s*(=)\\s*\n(?:(\\[)((?>[^\\[\\]]+|\\[\\g<6>\\])*)(\\]))?                              # Optional default type",
+          "begin": "(?i)((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s*(=)\\s*(?:(\\[)((?>[^\\[\\]]+|\\[\\g<6>])*)(]))?",
           "beginCaptures": {
             "1": {
               "name": "variable.other.php"
@@ -963,7 +998,7 @@
               "name": "punctuation.section.array.end.php"
             }
           },
-          "end": "(?=,|\\)|/[/*]|\\#)",
+          "end": "(?=[,)]|/[/*]|#)",
           "name": "meta.function.parameter.default.php",
           "patterns": [
             {
@@ -976,7 +1011,7 @@
     "heredoc": {
       "patterns": [
         {
-          "begin": "(?i)(?=<<<\\s*(\"?)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)(\\1)\\s*$)",
+          "begin": "(?i)(?=<<<\\s*(\"?)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)(\\1)\\s*$)",
           "end": "(?!\\G)",
           "name": "string.unquoted.heredoc.php",
           "patterns": [
@@ -1108,7 +1143,7 @@
           ]
         },
         {
-          "begin": "(<<<)\\s*(\"?)(JAVASCRIPT|JS)(\\2)(\\s*)$",
+          "begin": "(<<<)\\s*(\"?)(J(?:AVASCRIPT|S))(\\2)(\\s*)$",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.embedded.begin.php"
@@ -1258,17 +1293,17 @@
                   "name": "punctuation.definition.arbitrary-repitition.php"
                 }
               },
-              "match": "({)\\d+(,\\d+)?(})",
+              "match": "(\\{)\\d+(,\\d+)?(})",
               "name": "string.regexp.arbitrary-repitition.php"
             },
             {
-              "begin": "\\[(?:\\^?\\])?",
+              "begin": "\\[(?:\\^?])?",
               "captures": {
                 "0": {
                   "name": "punctuation.definition.character-class.php"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "name": "string.regexp.character-class.php",
               "patterns": [
                 {
@@ -1282,7 +1317,7 @@
               "name": "keyword.operator.regexp.php"
             },
             {
-              "begin": "(?i)(?<=^|\\s)(#)\\s(?=[[a-z0-9_\\x{7f}-\\x{ff},. \\t?!-][^\\x{00}-\\x{7f}]]*$)",
+              "begin": "(?i)(?<=^|\\s)(#)\\s(?=[a-z0-9_\\x7F-ÿ,. \\t?!\\-[^\\x00-\\x7F]]*$)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.comment.php"
@@ -1299,7 +1334,7 @@
           ]
         },
         {
-          "begin": "(?i)(<<<)\\s*(\"?)([a-z_\\x{7f}-\\x{ff}]+[a-z0-9_\\x{7f}-\\x{ff}]*)(\\2)(\\s*)",
+          "begin": "(?i)(<<<)\\s*(\"?)([a-z_\\x7F-ÿ]+[a-z0-9_\\x7F-ÿ]*)(\\2)(\\s*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.php"
@@ -1332,10 +1367,10 @@
           "name": "keyword.other.new.php"
         }
       },
-      "end": "(?i)(?=[^a-z0-9_\\x{7f}-\\x{ff}\\\\])",
+      "end": "(?i)(?=[^a-z0-9_\\x7F-ÿ\\\\])",
       "patterns": [
         {
-          "match": "(?i)(parent|static|self)(?![a-z0-9_\\x{7f}-\\x{ff}])",
+          "match": "(?i)(parent|static|self)(?![a-z0-9_\\x7F-ÿ])",
           "name": "storage.type.php"
         },
         {
@@ -1353,11 +1388,11 @@
           "name": "constant.character.escape.octal.php"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f]{1,2}",
+          "match": "\\\\x\\h{1,2}",
           "name": "constant.character.escape.hex.php"
         },
         {
-          "match": "\\\\u{[0-9A-Fa-f]+}",
+          "match": "\\\\u\\{\\h+}",
           "name": "constant.character.escape.unicode.php"
         },
         {
@@ -1365,7 +1400,7 @@
           "name": "constant.character.escape.php"
         },
         {
-          "begin": "{(?=\\$.*?})",
+          "begin": "\\{(?=\\$.*?})",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.variable.php"
@@ -1397,7 +1432,7 @@
           "name": "variable.other.php"
         }
       },
-      "match": "(?i)(\\$+)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)(?=\\s*\\()",
+      "match": "(?i)(\\$+)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)(?=\\s*\\()",
       "name": "meta.function-call.invoke.php"
     },
     "language": {
@@ -1406,7 +1441,7 @@
           "include": "#comments"
         },
         {
-          "begin": "(?i)^\\s*(interface)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(extends)?\\s*",
+          "begin": "(?i)^\\s*(interface)\\s+([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s*(extends)?\\s*",
           "beginCaptures": {
             "1": {
               "name": "storage.type.interface.php"
@@ -1418,12 +1453,12 @@
               "name": "storage.modifier.extends.php"
             }
           },
-          "end": "(?i)((?:[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*\\s*,\\s*)*)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?\\s*(?:(?={)|$)",
+          "end": "(?i)((?:[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*\\s*,\\s*)*)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)?\\s*(?:(?=\\{)|$)",
           "endCaptures": {
             "1": {
               "patterns": [
                 {
-                  "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+                  "match": "(?i)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*",
                   "name": "entity.other.inherited-class.php"
                 },
                 {
@@ -1444,7 +1479,7 @@
           ]
         },
         {
-          "begin": "(?i)^\\s*(trait)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)",
+          "begin": "(?i)^\\s*(trait)\\s+([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.trait.php"
@@ -1453,7 +1488,7 @@
               "name": "entity.name.type.trait.php"
             }
           },
-          "end": "(?={)",
+          "end": "(?=\\{)",
           "name": "meta.trait.php",
           "patterns": [
             {
@@ -1476,7 +1511,7 @@
               ]
             }
           },
-          "match": "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\s+([a-z0-9_\\x{7f}-\\x{ff}\\\\]+)(?=\\s*;)",
+          "match": "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\s+([a-z0-9_\\x7F-ÿ\\\\]+)(?=\\s*;)",
           "name": "meta.namespace.php"
         },
         {
@@ -1503,11 +1538,11 @@
                   ]
                 }
               },
-              "match": "(?i)[a-z0-9_\\x{7f}-\\x{ff}\\\\]+",
+              "match": "(?i)[a-z0-9_\\x7F-ÿ\\\\]+",
               "name": "entity.name.type.namespace.php"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.namespace.begin.bracket.curly.php"
@@ -1526,7 +1561,7 @@
               ]
             },
             {
-              "match": "[^\\s]+",
+              "match": "\\S+",
               "name": "invalid.illegal.identifier.php"
             }
           ]
@@ -1549,7 +1584,7 @@
               "name": "storage.type.${1:/downcase}.php"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.use.begin.bracket.curly.php"
@@ -1577,7 +1612,7 @@
                       "name": "entity.other.alias.php"
                     }
                   },
-                  "match": "(?xi)\n\\b(as)\n\\s+(final|abstract|public|private|protected|static)\n\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n\\b"
+                  "match": "(?i)\\b(as)\\s+(final|abstract|public|private|protected|static)\\s+([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\b"
                 },
                 {
                   "captures": {
@@ -1597,7 +1632,7 @@
                       ]
                     }
                   },
-                  "match": "(?xi)\n\\b(as)\n\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n\\b"
+                  "match": "(?i)\\b(as)\\s+([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\b"
                 },
                 {
                   "captures": {
@@ -1608,7 +1643,7 @@
                       "name": "support.class.php"
                     }
                   },
-                  "match": "(?i)\\b(insteadof)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)"
+                  "match": "(?i)\\b(insteadof)\\s+([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)"
                 },
                 {
                   "match": ";",
@@ -1625,7 +1660,7 @@
           ]
         },
         {
-          "begin": "(?i)^\\s*(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)",
+          "begin": "(?i)^\\s*(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.${1:/downcase}.php"
@@ -1656,11 +1691,11 @@
                 }
               },
               "contentName": "meta.other.inherited-class.php",
-              "end": "(?i)(?=[^a-z0-9_\\x{7f}-\\x{ff}\\\\])",
+              "end": "(?i)(?=[^a-z0-9_\\x7F-ÿ\\\\])",
               "patterns": [
                 {
-                  "begin": "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*\\\\)",
-                  "end": "(?i)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{ff}\\\\])",
+                  "begin": "(?i)(?=\\\\?[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*\\\\)",
+                  "end": "(?i)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)?(?=[^a-z0-9_\\x7F-ÿ\\\\])",
                   "endCaptures": {
                     "1": {
                       "name": "entity.other.inherited-class.php"
@@ -1679,7 +1714,7 @@
                   "include": "#namespace"
                 },
                 {
-                  "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+                  "match": "(?i)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*",
                   "name": "entity.other.inherited-class.php"
                 }
               ]
@@ -1697,13 +1732,13 @@
                   "include": "#comments"
                 },
                 {
-                  "begin": "(?i)(?=[a-z0-9_\\x{7f}-\\x{ff}\\\\]+)",
+                  "begin": "(?i)(?=[a-z0-9_\\x7F-ÿ\\\\]+)",
                   "contentName": "meta.other.inherited-class.php",
-                  "end": "(?i)(?:\\s*(?:,|(?=[^a-z0-9_\\x{7f}-\\x{ff}\\\\\\s]))\\s*)",
+                  "end": "(?i)\\s*(?:,|(?=[^a-z0-9_\\x7F-ÿ\\\\\\s]))\\s*",
                   "patterns": [
                     {
-                      "begin": "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*\\\\)",
-                      "end": "(?i)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{ff}\\\\])",
+                      "begin": "(?i)(?=\\\\?[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*\\\\)",
+                      "end": "(?i)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)?(?=[^a-z0-9_\\x7F-ÿ\\\\])",
                       "endCaptures": {
                         "1": {
                           "name": "entity.other.inherited-class.php"
@@ -1722,7 +1757,7 @@
                       "include": "#namespace"
                     },
                     {
-                      "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+                      "match": "(?i)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*",
                       "name": "entity.other.inherited-class.php"
                     }
                   ]
@@ -1730,7 +1765,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.class.begin.bracket.curly.php"
@@ -1764,7 +1799,7 @@
               "name": "keyword.control.import.include.php"
             }
           },
-          "end": "(?=\\s|;|$|\\?>)",
+          "end": "(?=[\\s;]|$|\\?>)",
           "name": "meta.include.php",
           "patterns": [
             {
@@ -1801,7 +1836,7 @@
                 "2": {
                   "patterns": [
                     {
-                      "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+                      "match": "(?i)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*",
                       "name": "support.class.exception.php"
                     },
                     {
@@ -1817,7 +1852,7 @@
                   "name": "punctuation.definition.variable.php"
                 }
               },
-              "match": "(?xi)\n([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)                 # Exception class\n((?:\\s*\\|\\s*[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)*) # Optional additional exception classes\n\\s*\n((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)           # Variable"
+              "match": "(?i)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)((?:\\s*\\|\\s*[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)*)\\s*((\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)"
             }
           ]
         },
@@ -1832,7 +1867,7 @@
               "name": "storage.type.function.php"
             }
           },
-          "end": "(?={)",
+          "end": "(?=\\{)",
           "name": "meta.function.closure.php",
           "patterns": [
             {
@@ -1884,7 +1919,7 @@
                       "name": "punctuation.definition.variable.php"
                     }
                   },
-                  "match": "(?i)((&)?\\s*(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(?=,|\\))",
+                  "match": "(?i)((&)?\\s*(\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s*(?=[,)])",
                   "name": "meta.function.closure.use.php"
                 }
               ]
@@ -1892,7 +1927,7 @@
           ]
         },
         {
-          "begin": "((?:(?:final|abstract|public|private|protected|static)\\s+)*)(function)\\s+(?i:(__(?:call|construct|debugInfo|destruct|get|set|isset|unset|tostring|clone|set_state|sleep|wakeup|autoload|invoke|callStatic))|([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))\\s*(\\()",
+          "begin": "((?:(?:final|abstract|public|private|protected|static)\\s+)*)(function)\\s+(?i:(__(?:call|construct|debugInfo|destruct|get|set|isset|unset|tostring|clone|set_state|sleep|wakeup|autoload|invoke|callStatic))|([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1916,7 +1951,7 @@
             }
           },
           "contentName": "meta.function.parameters.php",
-          "end": "(\\))(?:\\s*(:)\\s*([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))?",
+          "end": "(\\))(?:\\s*(:)\\s*([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*))?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.parameters.end.bracket.round.php"
@@ -2048,7 +2083,7 @@
               "name": "storage.modifier.reference.php"
             }
           },
-          "match": "(?i)(\\=)(&)|(&)(?=[$a-z_])"
+          "match": "(?i)(=)(&)|(&)(?=[$a-z_])"
         },
         {
           "match": "@",
@@ -2059,19 +2094,19 @@
           "name": "keyword.operator.comparison.php"
         },
         {
-          "match": "=|\\+=|\\-=|\\*=|/=|%=|&=|\\|=|\\^=|<<=|>>=",
+          "match": "=|\\+=|-=|\\*=|/=|%=|&=|\\|=|\\^=|<<=|>>=",
           "name": "keyword.operator.assignment.php"
         },
         {
-          "match": "<=>|<=|>=|<|>",
+          "match": "<=>|<=|>=|[<>]",
           "name": "keyword.operator.comparison.php"
         },
         {
-          "match": "\\-\\-|\\+\\+",
+          "match": "--|\\+\\+",
           "name": "keyword.operator.increment-decrement.php"
         },
         {
-          "match": "\\-|\\+|\\*|/|%",
+          "match": "[-+*/%]",
           "name": "keyword.operator.arithmetic.php"
         },
         {
@@ -2082,7 +2117,7 @@
           "include": "#function-call"
         },
         {
-          "match": "<<|>>|~|\\^|&|\\|",
+          "match": "<<|>>|[~^\\&|]",
           "name": "keyword.operator.bitwise.php"
         },
         {
@@ -2092,7 +2127,7 @@
               "name": "keyword.operator.type.php"
             }
           },
-          "end": "(?=[^\\\\$a-z0-9_\\x{7f}-\\x{ff}])",
+          "end": "(?=[^\\\\$a-z0-9_\\x7F-ÿ])",
           "patterns": [
             {
               "include": "#class-name"
@@ -2114,7 +2149,7 @@
               "name": "support.other.php"
             }
           },
-          "match": "(?i)(goto)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)"
+          "match": "(?i)(goto)\\s+([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)"
         },
         {
           "captures": {
@@ -2122,13 +2157,13 @@
               "name": "entity.name.goto-label.php"
             }
           },
-          "match": "(?i)^\\s*([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*:(?!:)"
+          "match": "(?i)^\\s*([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s*:(?!:)"
         },
         {
           "include": "#string-backtick"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.begin.bracket.curly.php"
@@ -2153,7 +2188,7 @@
               "name": "punctuation.section.array.begin.php"
             }
           },
-          "end": "\\]|(?=\\?>)",
+          "end": "]|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.array.end.php"
@@ -2194,7 +2229,7 @@
       ]
     },
     "namespace": {
-      "begin": "(?i)(?:(namespace)|[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?(\\\\)(?=.*?[^a-z0-9_\\x{7f}-\\x{ff}\\\\])",
+      "begin": "(?i)(?:(namespace)|[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)?(\\\\)(?=.*?[^a-z0-9_\\x7F-ÿ\\\\])",
       "beginCaptures": {
         "1": {
           "name": "variable.language.namespace.php"
@@ -2203,7 +2238,7 @@
           "name": "punctuation.separator.inheritance.php"
         }
       },
-      "end": "(?i)(?=[a-z0-9_\\x{7f}-\\x{ff}]*[^a-z0-9_\\x{7f}-\\x{ff}\\\\])",
+      "end": "(?i)(?=[a-z0-9_\\x7F-ÿ]*[^a-z0-9_\\x7F-ÿ\\\\])",
       "name": "support.other.namespace.php",
       "patterns": [
         {
@@ -2314,7 +2349,7 @@
           ]
         },
         {
-          "begin": "(<<<)\\s*'(JAVASCRIPT|JS)'(\\s*)$",
+          "begin": "(<<<)\\s*'(J(?:AVASCRIPT|S))'(\\s*)$",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.embedded.begin.php"
@@ -2452,17 +2487,17 @@
                   "name": "punctuation.definition.arbitrary-repitition.php"
                 }
               },
-              "match": "({)\\d+(,\\d+)?(})",
+              "match": "(\\{)\\d+(,\\d+)?(})",
               "name": "string.regexp.arbitrary-repitition.php"
             },
             {
-              "begin": "\\[(?:\\^?\\])?",
+              "begin": "\\[(?:\\^?])?",
               "captures": {
                 "0": {
                   "name": "punctuation.definition.character-class.php"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "name": "string.regexp.character-class.php",
               "patterns": [
                 {
@@ -2476,7 +2511,7 @@
               "name": "keyword.operator.regexp.php"
             },
             {
-              "begin": "(?i)(?<=^|\\s)(#)\\s(?=[[a-z0-9_\\x{7f}-\\x{ff},. \\t?!-][^\\x{00}-\\x{7f}]]*$)",
+              "begin": "(?i)(?<=^|\\s)(#)\\s(?=[a-z0-9_\\x7F-ÿ,. \\t?!\\-[^\\x00-\\x7F]]*$)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.comment.php"
@@ -2493,7 +2528,7 @@
           ]
         },
         {
-          "begin": "(?i)(<<<)\\s*'([a-z_\\x{7f}-\\x{ff}]+[a-z0-9_\\x{7f}-\\x{ff}]*)'(\\s*)",
+          "begin": "(?i)(<<<)\\s*'([a-z_\\x7F-ÿ]+[a-z0-9_\\x7F-ÿ]*)'(\\s*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.php"
@@ -2517,7 +2552,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "0[xX][0-9a-fA-F]+",
+          "match": "0[xX]\\h+",
           "name": "constant.numeric.hex.php"
         },
         {
@@ -2549,7 +2584,7 @@
     "object": {
       "patterns": [
         {
-          "begin": "(->)(\\$?{)",
+          "begin": "(->)(\\$?\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -2571,7 +2606,7 @@
           ]
         },
         {
-          "begin": "(?i)(->)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(\\()",
+          "begin": "(?i)(->)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -2608,7 +2643,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?i)(->)((\\$+)?[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?"
+          "match": "(?i)(->)((\\$+)?[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)?"
         }
       ]
     },
@@ -2665,8 +2700,8 @@
           "include": "#instantiation"
         },
         {
-          "begin": "(?xi)\n(?=[a-z0-9_\\x{7f}-\\x{ff}\\\\]+(::)\n  ([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?\n)",
-          "end": "(?i)(::)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?",
+          "begin": "(?i)(?=[a-z0-9_\\x7F-ÿ\\\\]+(::)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)?)",
+          "end": "(?i)(::)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)?",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -2689,7 +2724,7 @@
     "php_doc": {
       "patterns": [
         {
-          "match": "^(?!\\s*\\*).*?(?:(?=\\*\\/)|$\\n?)",
+          "match": "^(?!\\s*\\*).*?(?:(?=\\*/)|$\\n?)",
           "name": "invalid.illegal.missing-asterisk.phpdoc.php"
         },
         {
@@ -2704,7 +2739,7 @@
               "name": "invalid.illegal.wrong-access-type.phpdoc.php"
             }
           },
-          "match": "^\\s*\\*\\s*(@access)\\s+((public|private|protected)|(.+))\\s*$"
+          "match": "^\\s*\\*\\s*(@access)\\s+((p(?:ublic|rivate|rotected))|(.+))\\s*$"
         },
         {
           "captures": {
@@ -2718,7 +2753,7 @@
           "match": "(@xlink)\\s+(.+)\\s*$"
         },
         {
-          "begin": "(@(?:global|param|property(-(read|write))?|return|throws|var))\\s+(?=[A-Za-z_\\x{7f}-\\x{ff}\\\\]|\\()",
+          "begin": "(@(?:global|param|property(-(read|write))?|return|throws|var))\\s+(?=[A-Za-z_\\x7F-ÿ\\\\(])",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.phpdoc.php"
@@ -2748,7 +2783,7 @@
               "name": "keyword.other.phpdoc.php"
             }
           },
-          "match": "{(@(link|inherit[Dd]oc)).+?}",
+          "match": "\\{(@(link|inherit[Dd]oc)).+?}",
           "name": "meta.tag.inline.phpdoc.php"
         }
       ]
@@ -2771,7 +2806,7 @@
           ]
         }
       },
-      "match": "(?i)[a-z_\\x{7f}-\\x{ff}\\\\][a-z0-9_\\x{7f}-\\x{ff}\\\\]*(\\|[a-z_\\x{7f}-\\x{ff}\\\\][a-z0-9_\\x{7f}-\\x{ff}\\\\]*)*"
+      "match": "(?i)[a-z_\\x7F-ÿ\\\\][a-z0-9_\\x7F-ÿ\\\\]*(\\|[a-z_\\x7F-ÿ\\\\][a-z0-9_\\x7F-ÿ\\\\]*)*"
     },
     "php_doc_types_array_multiple": {
       "begin": "\\(",
@@ -2780,7 +2815,7 @@
           "name": "punctuation.definition.type.begin.bracket.round.phpdoc.php"
         }
       },
-      "end": "(\\))(\\[\\])|(?=\\*/)",
+      "end": "(\\))(\\[])|(?=\\*/)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.type.end.bracket.round.phpdoc.php"
@@ -2818,7 +2853,7 @@
           "name": "keyword.other.array.phpdoc.php"
         }
       },
-      "match": "(?i)([a-z_\\x{7f}-\\x{ff}\\\\][a-z0-9_\\x{7f}-\\x{ff}\\\\]*)(\\[\\])"
+      "match": "(?i)([a-z_\\x7F-ÿ\\\\][a-z0-9_\\x7F-ÿ\\\\]*)(\\[])"
     },
     "regex-double-quoted": {
       "begin": "\"/(?=(\\\\.|[^\"/])++/[imsxeADSUXu]*\")",
@@ -2851,17 +2886,17 @@
               "name": "punctuation.definition.arbitrary-repetition.php"
             }
           },
-          "match": "({)\\d+(,\\d+)?(})",
+          "match": "(\\{)\\d+(,\\d+)?(})",
           "name": "string.regexp.arbitrary-repetition.php"
         },
         {
-          "begin": "\\[(?:\\^?\\])?",
+          "begin": "\\[(?:\\^?])?",
           "captures": {
             "0": {
               "name": "punctuation.definition.character-class.php"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.character-class.php",
           "patterns": [
             {
@@ -2902,17 +2937,17 @@
               "name": "punctuation.definition.arbitrary-repetition.php"
             }
           },
-          "match": "({)\\d+(,\\d+)?(})",
+          "match": "(\\{)\\d+(,\\d+)?(})",
           "name": "string.regexp.arbitrary-repetition.php"
         },
         {
-          "begin": "\\[(?:\\^?\\])?",
+          "begin": "\\[(?:\\^?])?",
           "captures": {
             "0": {
               "name": "punctuation.definition.character-class.php"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.character-class.php"
         },
         {
@@ -2944,10 +2979,10 @@
               ]
             }
           },
-          "match": "(?i)\\b([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)(?=\\s*::)"
+          "match": "(?i)\\b([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)(?=\\s*::)"
         },
         {
-          "begin": "(?i)(::)\\s*([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(\\()",
+          "begin": "(?i)(::)\\s*([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -2998,7 +3033,7 @@
               "name": "constant.other.class.php"
             }
           },
-          "match": "(?xi)\n(::)\\s*\n(?:\n  ((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # Variable\n  |\n  ([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)       # Constant\n)?"
+          "match": "(?i)(::)\\s*(?:((\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)|([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*))?"
         }
       ]
     },
@@ -3221,15 +3256,15 @@
     "support": {
       "patterns": [
         {
-          "match": "(?xi)\n\\b\napc_(\n  store|sma_info|compile_file|clear_cache|cas|cache_info|inc|dec|define_constants|delete(_file)?|\n  exists|fetch|load_constants|add|bin_(dump|load)(file)?\n)\\b",
+          "match": "(?i)\\bapc_(store|sma_info|compile_file|clear_cache|cas|cache_info|inc|dec|define_constants|delete(_file)?|exists|fetch|load_constants|add|bin_(dump|load)(file)?)\\b",
           "name": "support.function.apc.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  shuffle|sizeof|sort|next|nat(case)?sort|count|compact|current|in_array|usort|uksort|uasort|\n  pos|prev|end|each|extract|ksort|key(_exists)?|krsort|list|asort|arsort|rsort|reset|range|\n  array(_(shift|sum|splice|search|slice|chunk|change_key_case|count_values|column|combine|\n          (diff|intersect)(_(u)?(key|assoc))?|u(diff|intersect)(_(u)?assoc)?|unshift|unique|\n          pop|push|pad|product|values|keys|key_exists|filter|fill(_keys)?|flip|walk(_recursive)?|\n          reduce|replace(_recursive)?|reverse|rand|multisort|merge(_recursive)?|map)?)\n)\\b",
+          "match": "(?i)\\b(shuffle|sizeof|sort|next|nat(case)?sort|count|compact|current|in_array|usort|uksort|uasort|pos|prev|end|each|extract|ksort|key(_exists)?|krsort|list|asort|arsort|rsort|reset|range|array(_(shift|sum|splice|search|slice|chunk|change_key_case|count_values|column|combine|(diff|intersect)(_(u)?(key|assoc))?|u(diff|intersect)(_(u)?assoc)?|unshift|unique|pop|push|pad|product|values|keys|key_exists|filter|fill(_keys)?|flip|walk(_recursive)?|reduce|replace(_recursive)?|reverse|rand|multisort|merge(_recursive)?|map)?))\\b",
           "name": "support.function.array.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  show_source|sys_getloadavg|sleep|highlight_(file|string)|constant|connection_(aborted|status)|\n  time_(nanosleep|sleep_until)|ignore_user_abort|die|define(d)?|usleep|uniqid|unpack|__halt_compiler|\n  php_(check_syntax|strip_whitespace)|pack|eval|exit|get_browser\n)\\b",
+          "match": "(?i)\\b(show_source|sys_getloadavg|sleep|highlight_(file|string)|constant|connection_(aborted|status)|time_(nanosleep|sleep_until)|ignore_user_abort|die|define(d)?|usleep|uniqid|unpack|__halt_compiler|php_(check_syntax|strip_whitespace)|pack|eval|exit|get_browser)\\b",
           "name": "support.function.basic_functions.php"
         },
         {
@@ -3245,15 +3280,15 @@
           "name": "support.function.bz2.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  (French|Gregorian|Jewish|Julian)ToJD|cal_(to_jd|info|days_in_month|from_jd)|unixtojd|\n  jdto(unix|jewish)|easter_(date|days)|JD(MonthName|To(Gregorian|Julian|French)|DayOfWeek)\n)\\b",
+          "match": "(?i)\\b((French|Gregorian|Jewish|Julian)ToJD|cal_(to_jd|info|days_in_month|from_jd)|unixtojd|jdto(unix|jewish)|easter_(da(?:te|ys))|JD(MonthName|To(Gregorian|Julian|French)|DayOfWeek))\\b",
           "name": "support.function.calendar.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  class_alias|all_user_method(_array)?|is_(a|subclass_of)|__autoload|(class|interface|method|property|trait)_exists|\n  get_(class(_(vars|methods))?|(called|parent)_class|object_vars|declared_(classes|interfaces|traits))\n)\\b",
+          "match": "(?i)\\b(class_alias|all_user_method(_array)?|is_(a|subclass_of)|__autoload|(class|interface|method|property|trait)_exists|get_(class(_(vars|methods))?|(called|parent)_class|object_vars|declared_(classes|interfaces|traits)))\\b",
           "name": "support.function.classobj.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  com_(create_guid|print_typeinfo|event_sink|load_typelib|get_active_object|message_pump)|\n  variant_(sub|set(_type)?|not|neg|cast|cat|cmp|int|idiv|imp|or|div|date_(from|to)_timestamp|\n           pow|eqv|fix|and|add|abs|round|get_type|xor|mod|mul)\n)\\b",
+          "match": "(?i)\\b(com_(create_guid|print_typeinfo|event_sink|load_typelib|get_active_object|message_pump)|variant_(sub|set(_type)?|not|neg|cast|cat|cmp|int|idiv|imp|or|div|date_(from|to)_timestamp|pow|eqv|fix|and|add|abs|round|get_type|xor|mod|mul))\\b",
           "name": "support.function.com.php"
         },
         {
@@ -3269,11 +3304,11 @@
           "name": "support.function.ctype.php"
         },
         {
-          "match": "(?xi)\\b\ncurl_(\n  share_(close|init|setopt)|strerror|setopt(_array)?|copy_handle|close|init|unescape|pause|escape|\n  errno|error|exec|version|file_create|reset|getinfo|\n  multi_(strerror|setopt|select|close|init|info_read|(add|remove)_handle|getcontent|exec)\n)\\b",
+          "match": "(?i)\\bcurl_(share_(close|init|setopt)|strerror|setopt(_array)?|copy_handle|close|init|unescape|pause|escape|errno|error|exec|version|file_create|reset|getinfo|multi_(strerror|setopt|select|close|init|info_read|(add|remove)_handle|getcontent|exec))\\b",
           "name": "support.function.curl.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  strtotime|str[fp]time|checkdate|time|timezone_name_(from_abbr|get)|idate|\n  timezone_((location|offset|transitions|version)_get|(abbreviations|identifiers)_list|open)|\n  date(_(sun(rise|set)|sun_info|sub|create(_(immutable_)?from_format)?|timestamp_(get|set)|timezone_(get|set)|time_set|\n         isodate_set|interval_(create_from_date_string|format)|offset_get|diff|default_timezone_(get|set)|date_set|\n         parse(_from_format)?|format|add|get_last_errors|modify))?|\n  localtime|get(date|timeofday)|gm(strftime|date|mktime)|microtime|mktime\n)\\b",
+          "match": "(?i)\\b(strtotime|str[fp]time|checkdate|time|timezone_name_(from_abbr|get)|idate|timezone_((location|offset|transitions|version)_get|(abbreviations|identifiers)_list|open)|date(_(sun(rise|set)|sun_info|sub|create(_(immutable_)?from_format)?|timestamp_(get|set)|timezone_(get|set)|time_set|isodate_set|interval_(create_from_date_string|format)|offset_get|diff|default_timezone_(get|set)|date_set|parse(_from_format)?|format|add|get_last_errors|modify))?|localtime|get(date|timeofday)|gm(strftime|date|mktime)|microtime|mktime)\\b",
           "name": "support.function.datetime.php"
         },
         {
@@ -3289,11 +3324,11 @@
           "name": "support.function.dir.php"
         },
         {
-          "match": "(?xi)\\b\neio_(\n  sync(fs)?|sync_file_range|symlink|stat(vfs)?|sendfile|set_min_parallel|set_max_(idle|poll_(reqs|time)|parallel)|\n  seek|n(threads|op|pending|reqs|ready)|chown|chmod|custom|close|cancel|truncate|init|open|dup2|unlink|utime|poll|\n  event_loop|f(sync|stat(vfs)?|chown|chmod|truncate|datasync|utime|allocate)|write|lstat|link|rename|realpath|\n  read(ahead|dir|link)?|rmdir|get_(event_stream|last_error)|grp(_(add|cancel|limit))?|mknod|mkdir|busy\n)\\b",
+          "match": "(?i)\\beio_(sync(fs)?|sync_file_range|symlink|stat(vfs)?|sendfile|set_min_parallel|set_max_(idle|poll_(reqs|time)|parallel)|seek|n(threads|op|pending|reqs|ready)|chown|chmod|custom|close|cancel|truncate|init|open|dup2|unlink|utime|poll|event_loop|f(sync|stat(vfs)?|chown|chmod|truncate|datasync|utime|allocate)|write|lstat|link|rename|realpath|read(ahead|dir|link)?|rmdir|get_(event_stream|last_error)|grp(_(add|cancel|limit))?|mknod|mkdir|busy)\\b",
           "name": "support.function.eio.php"
         },
         {
-          "match": "(?xi)\\b\nenchant_(\n  dict_(store_replacement|suggest|check|is_in_session|describe|quick_check|add_to_(personal|session)|get_error)|\n  broker_(set_ordering|init|dict_exists|describe|free(_dict)?|list_dicts|request_(pwl_)?dict|get_error)\n)\\b",
+          "match": "(?i)\\benchant_(dict_(store_replacement|suggest|check|is_in_session|describe|quick_check|add_to_(personal|session)|get_error)|broker_(set_ordering|init|dict_exists|describe|free(_dict)?|list_dicts|request_(pwl_)?dict|get_error))\\b",
           "name": "support.function.enchant.php"
         },
         {
@@ -3301,7 +3336,7 @@
           "name": "support.function.ereg.php"
         },
         {
-          "match": "(?i)\\b((restore|set)_(error_handler|exception_handler)|trigger_error|debug_(print_)?backtrace|user_error|error_(log|reporting|get_last))\\b",
+          "match": "(?i)\\b((restore|set)_(e(?:rror_handler|xception_handler))|trigger_error|debug_(print_)?backtrace|user_error|error_(log|reporting|get_last))\\b",
           "name": "support.function.errorfunc.php"
         },
         {
@@ -3313,11 +3348,11 @@
           "name": "support.function.exif.php"
         },
         {
-          "match": "(?xi)\\b\nfann_(\n  (duplicate|length|merge|shuffle|subset)_train_data|scale_(train(_data)?|(input|output)(_train_data)?)|\n  set_(scaling_params|sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|\n       cascade_(num_candidate_groups|candidate_(change_fraction|limit|stagnation_epochs)|\n                output_(change_fraction|stagnation_epochs)|weight_multiplier|activation_(functions|steepnesses)|\n                (max|min)_(cand|out)_epochs)|\n       callback|training_algorithm|train_(error|stop)_function|(input|output)_scaling_params|error_log|\n       quickprop_(decay|mu)|weight(_array)?|learning_(momentum|rate)|bit_fail_limit|\n       activation_(function|steepness)(_(hidden|layer|output))?|\n       rprop_((decrease|increase)_factor|delta_(max|min|zero)))|\n  save(_train)?|num_(input|output)_train_data|copy|clear_scaling_params|cascadetrain_on_(file|data)|\n  create_((sparse|shortcut|standard)(_array)?|train(_from_callback)?|from_file)|\n  test(_data)?|train(_(on_(file|data)|epoch))?|init_weights|descale_(input|output|train)|destroy(_train)?|\n  print_error|run|reset_(MSE|err(no|str))|read_train_from_file|randomize_weights|\n  get_(sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|num_(input|output|layers)|\n       network_type|MSE|connection_(array|rate)|bias_array|bit_fail(_limit)?|\n       cascade_(num_(candidates|candidate_groups)|(candidate|output)_(change_fraction|limit|stagnation_epochs)|\n                weight_multiplier|activation_(functions|steepnesses)(_count)?|(max|min)_(cand|out)_epochs)|\n       total_(connections|neurons)|training_algorithm|train_(error|stop)_function|err(no|str)|\n       quickprop_(decay|mu)|learning_(momentum|rate)|layer_array|activation_(function|steepness)|\n       rprop_((decrease|increase)_factor|delta_(max|min|zero)))\n)\\b",
+          "match": "(?i)\\bfann_((duplicate|length|merge|shuffle|subset)_train_data|scale_(train(_data)?|(input|output)(_train_data)?)|set_(scaling_params|sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|cascade_(num_candidate_groups|candidate_(change_fraction|limit|stagnation_epochs)|output_(change_fraction|stagnation_epochs)|weight_multiplier|activation_(functions|steepnesses)|(m(?:ax|in))_(cand|out)_epochs)|callback|training_algorithm|train_(error|stop)_function|(input|output)_scaling_params|error_log|quickprop_(decay|mu)|weight(_array)?|learning_(momentum|rate)|bit_fail_limit|activation_(function|steepness)(_(hidden|layer|output))?|rprop_((decrease|increase)_factor|delta_(max|min|zero)))|save(_train)?|num_(input|output)_train_data|copy|clear_scaling_params|cascadetrain_on_(file|data)|create_((s(?:parse|hortcut|tandard))(_array)?|train(_from_callback)?|from_file)|test(_data)?|train(_(on_(file|data)|epoch))?|init_weights|descale_(input|output|train)|destroy(_train)?|print_error|run|reset_(MSE|err(no|str))|read_train_from_file|randomize_weights|get_(sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|num_(input|output|layers)|network_type|MSE|connection_(array|rate)|bias_array|bit_fail(_limit)?|cascade_(num_(candidate(?:s|_groups))|(candidate|output)_(change_fraction|limit|stagnation_epochs)|weight_multiplier|activation_(functions|steepnesses)(_count)?|(m(?:ax|in))_(cand|out)_epochs)|total_(connections|neurons)|training_algorithm|train_(error|stop)_function|err(no|str)|quickprop_(decay|mu)|learning_(momentum|rate)|layer_array|activation_(function|steepness)|rprop_((decrease|increase)_factor|delta_(max|min|zero))))\\b",
           "name": "support.function.fann.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  symlink|stat|set_file_buffer|chown|chgrp|chmod|copy|clearstatcache|touch|tempnam|tmpfile|\n  is_(dir|(uploaded_)?file|executable|link|readable|writ(e)?able)|disk_(free|total)_space|diskfreespace|\n  dirname|delete|unlink|umask|pclose|popen|pathinfo|parse_ini_(file|string)|fscanf|fstat|fseek|fnmatch|\n  fclose|ftell|ftruncate|file(size|[acm]time|type|inode|owner|perms|group)?|file_(exists|(get|put)_contents)|\n  f(open|puts|putcsv|passthru|eof|flush|write|lock|read|gets(s)?|getc(sv)?)|lstat|lchown|lchgrp|link(info)?|\n  rename|rewind|read(file|link)|realpath(_cache_(get|size))?|rmdir|glob|move_uploaded_file|mkdir|basename\n)\\b",
+          "match": "(?i)\\b(symlink|stat|set_file_buffer|chown|chgrp|chmod|copy|clearstatcache|touch|tempnam|tmpfile|is_(dir|(uploaded_)?file|executable|link|readable|writ(e)?able)|disk_(free|total)_space|diskfreespace|dirname|delete|unlink|umask|pclose|popen|pathinfo|parse_ini_(file|string)|fscanf|fstat|fseek|fnmatch|fclose|ftell|ftruncate|file(size|[acm]time|type|inode|owner|perms|group)?|file_(exists|(get|put)_contents)|f(open|puts|putcsv|passthru|eof|flush|write|lock|read|gets(s)?|getc(sv)?)|lstat|lchown|lchgrp|link(info)?|rename|rewind|read(file|link)|realpath(_cache_(get|size))?|rmdir|glob|move_uploaded_file|mkdir|basename)\\b",
           "name": "support.function.file.php"
         },
         {
@@ -3341,7 +3376,7 @@
           "name": "support.function.gettext.php"
         },
         {
-          "match": "(?xi)\\b\ngmp_(\n  scan[01]|strval|sign|sub|setbit|sqrt(rem)?|hamdist|neg|nextprime|com|clrbit|cmp|testbit|\n  intval|init|invert|import|or|div(exact)?|div_(q|qr|r)|jacobi|popcount|pow(m)?|perfect_square|\n  prob_prime|export|fact|legendre|and|add|abs|root(rem)?|random(_(bits|range))?|gcd(ext)?|xor|mod|mul\n)\\b",
+          "match": "(?i)\\bgmp_(scan[01]|strval|sign|sub|setbit|sqrt(rem)?|hamdist|neg|nextprime|com|clrbit|cmp|testbit|intval|init|invert|import|or|div(exact)?|div_(q|qr|r)|jacobi|popcount|pow(m)?|perfect_square|prob_prime|export|fact|legendre|and|add|abs|root(rem)?|random(_(bits|range))?|gcd(ext)?|xor|mod|mul)\\b",
           "name": "support.function.gmp.php"
         },
         {
@@ -3349,7 +3384,7 @@
           "name": "support.function.hash.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  http_(support|send_(status|stream|content_(disposition|type)|data|file|last_modified)|head|\n        negotiate_(charset|content_type|language)|chunked_decode|cache_(etag|last_modified)|throttle|\n        inflate|deflate|date|post_(data|fields)|put_(data|file|stream)|persistent_handles_(count|clean|ident)|\n        parse_(cookie|headers|message|params)|redirect|request(_(method_(exists|name|(un)?register)|body_encode))?|\n        get(_request_(headers|body(_stream)?))?|match_(etag|modified|request_header)|build_(cookie|str|url))|\n  ob_(etag|deflate|inflate)handler\n)\\b",
+          "match": "(?i)\\b(http_(support|send_(status|stream|content_(disposition|type)|data|file|last_modified)|head|negotiate_(charset|content_type|language)|chunked_decode|cache_(etag|last_modified)|throttle|inflate|deflate|date|post_(data|fields)|put_(data|file|stream)|persistent_handles_(count|clean|ident)|parse_(cookie|headers|message|params)|redirect|request(_(method_(exists|name|(un)?register)|body_encode))?|get(_request_(headers|body(_stream)?))?|match_(etag|modified|request_header)|build_(cookie|str|url))|ob_(etag|deflate|inflate)handler)\\b",
           "name": "support.function.http.php"
         },
         {
@@ -3357,23 +3392,23 @@
           "name": "support.function.iconv.php"
         },
         {
-          "match": "(?i)\\biis_((start|stop)_(service|server)|set_(script_map|server_rights|dir_security|app_settings)|(add|remove)_server|get_(script_map|service_state|server_(rights|by_(comment|path))|dir_security))\\b",
+          "match": "(?i)\\biis_((st(?:art|op))_(serv(?:ice|er))|set_(script_map|server_rights|dir_security|app_settings)|(add|remove)_server|get_(script_map|service_state|server_(rights|by_(comment|path))|dir_security))\\b",
           "name": "support.function.iisfunc.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  iptc(embed|parse)|(jpeg|png)2wbmp|gd_info|getimagesize(fromstring)?|\n  image(s[xy]|scale|(char|string)(up)?|set(style|thickness|tile|interpolation|pixel|brush)|savealpha|\n        convolution|copy(resampled|resized|merge(gray)?)?|colors(forindex|total)|\n        color(set|closest(alpha|hwb)?|transparent|deallocate|(allocate|exact|resolve)(alpha)?|at|match)|\n        crop(auto)?|create(truecolor|from(string|jpeg|png|wbmp|webp|gif|gd(2(part)?)?|xpm|xbm))?|\n        types|ttf(bbox|text)|truecolortopalette|istruecolor|interlace|2wbmp|destroy|dashedline|jpeg|\n        _type_to_(extension|mime_type)|ps(slantfont|text|(encode|extend|free|load)font|bbox)|png|polygon|\n        palette(copy|totruecolor)|ellipse|ft(text|bbox)|filter|fill|filltoborder|\n        filled(arc|ellipse|polygon|rectangle)|font(height|width)|flip|webp|wbmp|line|loadfont|layereffect|\n        antialias|affine(matrix(concat|get))?|alphablending|arc|rotate|rectangle|gif|gd(2)?|gammacorrect|\n        grab(screen|window)|xbm)\n)\\b",
+          "match": "(?i)\\b(iptc(embed|parse)|(jpeg|png)2wbmp|gd_info|getimagesize(fromstring)?|image(s[xy]|scale|(char|string)(up)?|set(style|thickness|tile|interpolation|pixel|brush)|savealpha|convolution|copy(resampled|resized|merge(gray)?)?|colors(forindex|total)|color(set|closest(alpha|hwb)?|transparent|deallocate|(allocate|exact|resolve)(alpha)?|at|match)|crop(auto)?|create(truecolor|from(string|jpeg|png|wbmp|webp|gif|gd(2(part)?)?|xpm|xbm))?|types|ttf(bbox|text)|truecolortopalette|istruecolor|interlace|2wbmp|destroy|dashedline|jpeg|_type_to_(extension|mime_type)|ps(slantfont|text|(encode|extend|free|load)font|bbox)|png|polygon|palette(copy|totruecolor)|ellipse|ft(text|bbox)|filter|fill|filltoborder|filled(arc|ellipse|polygon|rectangle)|font(height|width)|flip|webp|wbmp|line|loadfont|layereffect|antialias|affine(matrix(concat|get))?|alphablending|arc|rotate|rectangle|gif|gd(2)?|gammacorrect|grab(screen|window)|xbm))\\b",
           "name": "support.function.image.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  sys_get_temp_dir|set_(time_limit|include_path|magic_quotes_runtime)|cli_(get|set)_process_title|\n  ini_(alter|get(_all)?|restore|set)|zend_(thread_id|version|logo_guid)|dl|php(credits|info|version)|\n  php_(sapi_name|ini_(scanned_files|loaded_file)|uname|logo_guid)|putenv|extension_loaded|version_compare|\n  assert(_options)?|restore_include_path|gc_(collect_cycles|disable|enable(d)?)|getopt|\n  get_(cfg_var|current_user|defined_constants|extension_funcs|include_path|included_files|loaded_extensions|\n       magic_quotes_(gpc|runtime)|required_files|resources)|\n  get(env|lastmod|rusage|my(inode|[gup]id))|\n  memory_get_(peak_)?usage|main|magic_quotes_runtime\n)\\b",
+          "match": "(?i)\\b(sys_get_temp_dir|set_(time_limit|include_path|magic_quotes_runtime)|cli_(get|set)_process_title|ini_(alter|get(_all)?|restore|set)|zend_(thread_id|version|logo_guid)|dl|php(credits|info|version)|php_(sapi_name|ini_(scanned_files|loaded_file)|uname|logo_guid)|putenv|extension_loaded|version_compare|assert(_options)?|restore_include_path|gc_(collect_cycles|disable|enable(d)?)|getopt|get_(cfg_var|current_user|defined_constants|extension_funcs|include_path|included_files|loaded_extensions|magic_quotes_(gpc|runtime)|required_files|resources)|get(env|lastmod|rusage|my(inode|[gup]id))|memory_get_(peak_)?usage|main|magic_quotes_runtime)\\b",
           "name": "support.function.info.php"
         },
         {
-          "match": "(?xi)\\b\nibase_(\n  set_event_handler|service_(attach|detach)|server_info|num_(fields|params)|name_result|connect|\n  commit(_ret)?|close|trans|delete_user|drop_db|db_info|pconnect|param_info|prepare|err(code|msg)|\n  execute|query|field_info|fetch_(assoc|object|row)|free_(event_handler|query|result)|wait_event|\n  add_user|affected_rows|rollback(_ret)?|restore|gen_id|modify_user|maintain_db|backup|\n  blob_(cancel|close|create|import|info|open|echo|add|get)\n)\\b",
+          "match": "(?i)\\bibase_(set_event_handler|service_(attach|detach)|server_info|num_(fields|params)|name_result|connect|commit(_ret)?|close|trans|delete_user|drop_db|db_info|pconnect|param_info|prepare|err(code|msg)|execute|query|field_info|fetch_(assoc|object|row)|free_(event_handler|query|result)|wait_event|add_user|affected_rows|rollback(_ret)?|restore|gen_id|modify_user|maintain_db|backup|blob_(cancel|close|create|import|info|open|echo|add|get))\\b",
           "name": "support.function.interbase.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  normalizer_(normalize|is_normalized)|idn_to_(unicode|utf8|ascii)|\n  numfmt_(set_(symbol|(text_)?attribute|pattern)|create|(parse|format)(_currency)?|\n          get_(symbol|(text_)?attribute|pattern|error_(code|message)|locale))|\n  collator_(sort(_with_sort_keys)?|set_(attribute|strength)|compare|create|asort|\n            get_(strength|sort_key|error_(code|message)|locale|attribute))|\n  transliterator_(create(_(inverse|from_rules))?|transliterate|list_ids|get_error_(code|message))|\n  intl(cal|tz)_get_error_(code|message)|intl_(is_failure|error_name|get_error_(code|message))|\n  datefmt_(set_(calendar|lenient|pattern|timezone(_id)?)|create|is_lenient|parse|format(_object)?|localtime|\n           get_(calendar(_object)?|time(type|zone(_id)?)|datetype|pattern|error_(code|message)|locale))|\n  locale_(set_default|compose|canonicalize|parse|filter_matches|lookup|accept_from_http|\n          get_(script|display_(script|name|variant|language|region)|default|primary_language|keywords|all_variants|region))|\n  resourcebundle_(create|count|locales|get(_(error_(code|message)))?)|\n  grapheme_(str(i?str|r?i?pos|len)|substr|extract)|\n  msgfmt_(set_pattern|create|(format|parse)(_message)?|get_(pattern|error_(code|message)|locale))\n)\\b",
+          "match": "(?i)\\b(normalizer_(normalize|is_normalized)|idn_to_(unicode|utf8|ascii)|numfmt_(set_(symbol|(text_)?attribute|pattern)|create|(parse|format)(_currency)?|get_(symbol|(text_)?attribute|pattern|error_(code|message)|locale))|collator_(sort(_with_sort_keys)?|set_(attribute|strength)|compare|create|asort|get_(strength|sort_key|error_(code|message)|locale|attribute))|transliterator_(create(_(inverse|from_rules))?|transliterate|list_ids|get_error_(code|message))|intl(cal|tz)_get_error_(code|message)|intl_(is_failure|error_name|get_error_(code|message))|datefmt_(set_(calendar|lenient|pattern|timezone(_id)?)|create|is_lenient|parse|format(_object)?|localtime|get_(calendar(_object)?|time(type|zone(_id)?)|datetype|pattern|error_(code|message)|locale))|locale_(set_default|compose|canonicalize|parse|filter_matches|lookup|accept_from_http|get_(script|display_(script|name|variant|language|region)|default|primary_language|keywords|all_variants|region))|resourcebundle_(create|count|locales|get(_(error_(code|message)))?)|grapheme_(str(i?str|r?i?pos|len)|substr|extract)|msgfmt_(set_pattern|create|(format|parse)(_message)?|get_(pattern|error_(code|message)|locale)))\\b",
           "name": "support.function.intl.php"
         },
         {
@@ -3381,7 +3416,7 @@
           "name": "support.function.json.php"
         },
         {
-          "match": "(?xi)\\b\nldap_(\n  start|tls|sort|search|sasl_bind|set_(option|rebind_proc)|(first|next)_(attribute|entry|reference)|\n  connect|control_paged_result(_response)?|count_entries|compare|close|t61_to_8859|8859_to_t61|\n  dn2ufn|delete|unbind|parse_(reference|result)|escape|errno|err2str|error|explode_dn|bind|\n  free_result|list|add|rename|read|get_(option|dn|entries|values(_len)?|attributes)|modify(_batch)?|\n  mod_(add|del|replace)\n)\\b",
+          "match": "(?i)\\bldap_(start|tls|sort|search|sasl_bind|set_(option|rebind_proc)|(first|next)_(attribute|entry|reference)|connect|control_paged_result(_response)?|count_entries|compare|close|t61_to_8859|8859_to_t61|dn2ufn|delete|unbind|parse_(re(?:ference|sult))|escape|errno|err2str|error|explode_dn|bind|free_result|list|add|rename|read|get_(option|dn|entries|values(_len)?|attributes)|modify(_batch)?|mod_(add|del|replace))\\b",
           "name": "support.function.ldap.php"
         },
         {
@@ -3393,15 +3428,15 @@
           "name": "support.function.mail.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  (a)?(cos|sin|tan)(h)?|sqrt|srand|hypot|hexdec|ceil|is_(nan|(in)?finite)|octdec|dec(hex|oct|bin)|deg2rad|\n  pi|pow|exp(m1)?|floor|fmod|lcg_value|log(1(p|0))?|atan2|abs|round|rand|rad2deg|getrandmax|\n  mt_(srand|rand|getrandmax)|max|min|bindec|base_convert\n)\\b",
+          "match": "(?i)\\b((a)?(cos|sin|tan)(h)?|sqrt|srand|hypot|hexdec|ceil|is_(nan|(in)?finite)|octdec|dec(hex|oct|bin)|deg2rad|pi|pow|exp(m1)?|floor|fmod|lcg_value|log(1([p0]))?|atan2|abs|round|rand|rad2deg|getrandmax|mt_(srand|rand|getrandmax)|max|min|bindec|base_convert)\\b",
           "name": "support.function.math.php"
         },
         {
-          "match": "(?xi)\\b\nmb_(\n  str(cut|str|to(lower|upper)|istr|ipos|imwidth|pos|width|len|rchr|richr|ripos|rpos)|\n  substitute_character|substr(_count)?|split|send_mail|http_(input|output)|check_encoding|\n  convert_(case|encoding|kana|variables)|internal_encoding|output_handler|decode_(numericentity|mimeheader)|\n  detect_(encoding|order)|parse_str|preferred_mime_name|encoding_aliases|encode_(numericentity|mimeheader)|\n  ereg(i(_replace)?)?|ereg_(search(_(get(pos|regs)|init|regs|(set)?pos))?|replace(_callback)?|match)|\n  list_encodings|language|regex_(set_options|encoding)|get_info\n)\\b",
+          "match": "(?i)\\bmb_(str(cut|str|to(lower|upper)|istr|ipos|imwidth|pos|width|len|rchr|richr|ripos|rpos)|substitute_character|substr(_count)?|split|send_mail|http_(input|output)|check_encoding|convert_(case|encoding|kana|variables)|internal_encoding|output_handler|decode_(numericentity|mimeheader)|detect_(encoding|order)|parse_str|preferred_mime_name|encoding_aliases|encode_(numericentity|mimeheader)|ereg(i(_replace)?)?|ereg_(search(_(get(pos|regs)|init|regs|(set)?pos))?|replace(_callback)?|match)|list_encodings|language|regex_(set_options|encoding)|get_info)\\b",
           "name": "support.function.mbstring.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  mcrypt_(\n    cfb|create_iv|cbc|ofb|decrypt|encrypt|ecb|list_(algorithms|modes)|generic(_((de)?init|end))?|\n    enc_(self_test|is_block_(algorithm|algorithm_mode|mode)|\n    get_(supported_key_sizes|(block|iv|key)_size|(algorithms|modes)_name))|\n    get_(cipher_name|(block|iv|key)_size)|\n    module_(close|self_test|is_block_(algorithm|algorithm_mode|mode)|open|\n            get_(supported_key_sizes|algo_(block|key)_size)))|\n  mdecrypt_generic\n)\\b",
+          "match": "(?i)\\b(m(?:crypt_(cfb|create_iv|cbc|ofb|decrypt|encrypt|ecb|list_(algorithms|modes)|generic(_((de)?init|end))?|enc_(self_test|is_block_(algorithm|algorithm_mode|mode)|get_(supported_key_sizes|(block|iv|key)_size|(algorithms|modes)_name))|get_(cipher_name|(block|iv|key)_size)|module_(close|self_test|is_block_(algorithm|algorithm_mode|mode)|open|get_(supported_key_sizes|algo_(block|key)_size)))|decrypt_generic))\\b",
           "name": "support.function.mcrypt.php"
         },
         {
@@ -3417,11 +3452,11 @@
           "name": "support.function.mongo.php"
         },
         {
-          "match": "(?xi)\\b\nmysql_(\n  stat|set_charset|select_db|num_(fields|rows)|connect|client_encoding|close|create_db|escape_string|\n  thread_id|tablename|insert_id|info|data_seek|drop_db|db_(name|query)|unbuffered_query|pconnect|ping|\n  errno|error|query|field_(seek|name|type|table|flags|len)|fetch_(object|field|lengths|assoc|array|row)|\n  free_result|list_(tables|dbs|processes|fields)|affected_rows|result|real_escape_string|\n  get_(client|host|proto|server)_info\n)\\b",
+          "match": "(?i)\\bmysql_(stat|set_charset|select_db|num_(fields|rows)|connect|client_encoding|close|create_db|escape_string|thread_id|tablename|insert_id|info|data_seek|drop_db|db_(name|query)|unbuffered_query|pconnect|ping|errno|error|query|field_(seek|name|type|table|flags|len)|fetch_(object|field|lengths|assoc|array|row)|free_result|list_(tables|dbs|processes|fields)|affected_rows|result|real_escape_string|get_(client|host|proto|server)_info)\\b",
           "name": "support.function.mysql.php"
         },
         {
-          "match": "(?xi)\\b\nmysqli_(\n  ssl_set|store_result|stat|send_(query|long_data)|set_(charset|opt|local_infile_(default|handler))|\n  stmt_(store_result|send_long_data|next_result|close|init|data_seek|prepare|execute|fetch|free_result|\n        attr_(get|set)|result_metadata|reset|get_(result|warnings)|more_results|bind_(param|result))|\n  select_db|slave_query|savepoint|next_result|change_user|character_set_name|connect|commit|\n  client_encoding|close|thread_safe|init|options|(enable|disable)_(reads_from_master|rpl_parse)|\n  dump_debug_info|debug|data_seek|use_result|ping|poll|param_count|prepare|escape_string|execute|\n  embedded_server_(start|end)|kill|query|field_seek|free_result|autocommit|rollback|report|refresh|\n  fetch(_(object|fields|field(_direct)?|assoc|all|array|row))?|rpl_(parse_enabled|probe|query_type)|\n  release_savepoint|reap_async_query|real_(connect|escape_string|query)|more_results|multi_query|\n  get_(charset|connection_stats|client_(stats|info|version)|cache_stats|warnings|links_stats|metadata)|\n  master_query|bind_(param|result)|begin_transaction\n)\\b",
+          "match": "(?i)\\bmysqli_(ssl_set|store_result|stat|send_(query|long_data)|set_(charset|opt|local_infile_(default|handler))|stmt_(store_result|send_long_data|next_result|close|init|data_seek|prepare|execute|fetch|free_result|attr_(get|set)|result_metadata|reset|get_(result|warnings)|more_results|bind_(param|result))|select_db|slave_query|savepoint|next_result|change_user|character_set_name|connect|commit|client_encoding|close|thread_safe|init|options|(enable|disable)_(r(?:eads_from_master|pl_parse))|dump_debug_info|debug|data_seek|use_result|ping|poll|param_count|prepare|escape_string|execute|embedded_server_(start|end)|kill|query|field_seek|free_result|autocommit|rollback|report|refresh|fetch(_(object|fields|field(_direct)?|assoc|all|array|row))?|rpl_(parse_enabled|probe|query_type)|release_savepoint|reap_async_query|real_(connect|escape_string|query)|more_results|multi_query|get_(charset|connection_stats|client_(stats|info|version)|cache_stats|warnings|links_stats|metadata)|master_query|bind_(param|result)|begin_transaction)\\b",
           "name": "support.function.mysqli.php"
         },
         {
@@ -3441,7 +3476,7 @@
           "name": "support.function.mysqlnd-uh.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  syslog|socket_(set_(blocking|timeout)|get_status)|set(raw)?cookie|http_response_code|openlog|\n  headers_(list|sent)|header(_(register_callback|remove))?|checkdnsrr|closelog|inet_(ntop|pton)|ip2long|\n  openlog|dns_(check_record|get_(record|mx))|define_syslog_variables|(p)?fsockopen|long2ip|\n  get(servby(name|port)|host(name|by(name(l)?|addr))|protoby(name|number)|mxrr)\n)\\b",
+          "match": "(?i)\\b(syslog|socket_(set_(blocking|timeout)|get_status)|set(raw)?cookie|http_response_code|openlog|headers_(list|sent)|header(_(re(?:gister_callback|move)))?|checkdnsrr|closelog|inet_(ntop|pton)|ip2long|openlog|dns_(check_record|get_(record|mx))|define_syslog_variables|(p)?fsockopen|long2ip|get(servby(name|port)|host(name|by(name(l)?|addr))|protoby(n(?:ame|umber))|mxrr))\\b",
           "name": "support.function.network.php"
         },
         {
@@ -3449,7 +3484,7 @@
           "name": "support.function.nsapi.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  oci(statementtype|setprefetch|serverversion|savelob(file)?|numcols|new(collection|cursor|descriptor)|nlogon|\n      column(scale|size|name|type(raw)?|isnull|precision)|coll(size|trim|assign(elem)?|append|getelem|max)|commit|\n      closelob|cancel|internaldebug|definebyname|plogon|parse|error|execute|fetch(statement|into)?|\n      free(statement|collection|cursor|desc)|write(temporarylob|lobtofile)|loadlob|log(on|off)|rowcount|rollback|\n      result|bindbyname)|\n  oci_(statement_type|set_(client_(info|identifier)|prefetch|edition|action|module_name)|server_version|\n       num_(fields|rows)|new_(connect|collection|cursor|descriptor)|connect|commit|client_version|close|cancel|\n       internal_debug|define_by_name|pconnect|password_change|parse|error|execute|bind_(array_)?by_name|\n       field_(scale|size|name|type(_raw)?|is_null|precision)|fetch(_(object|assoc|all|array|row))?|\n       free_(statement|descriptor)|lob_(copy|is_equal)|rollback|result|get_implicit_resultset)\n)\\b",
+          "match": "(?i)\\b(oci(?:(statementtype|setprefetch|serverversion|savelob(file)?|numcols|new(collection|cursor|descriptor)|nlogon|column(scale|size|name|type(raw)?|isnull|precision)|coll(size|trim|assign(elem)?|append|getelem|max)|commit|closelob|cancel|internaldebug|definebyname|plogon|parse|error|execute|fetch(statement|into)?|free(statement|collection|cursor|desc)|write(temporarylob|lobtofile)|loadlob|log(o(?:n|ff))|rowcount|rollback|result|bindbyname)|_(statement_type|set_(client_(i(?:nfo|dentifier))|prefetch|edition|action|module_name)|server_version|num_(fields|rows)|new_(connect|collection|cursor|descriptor)|connect|commit|client_version|close|cancel|internal_debug|define_by_name|pconnect|password_change|parse|error|execute|bind_(array_)?by_name|field_(scale|size|name|type(_raw)?|is_null|precision)|fetch(_(object|assoc|all|array|row))?|free_(statement|descriptor)|lob_(copy|is_equal)|rollback|result|get_implicit_resultset)))\\b",
           "name": "support.function.oci8.php"
         },
         {
@@ -3457,11 +3492,11 @@
           "name": "support.function.opcache.php"
         },
         {
-          "match": "(?xi)\\b\nopenssl_(\n  sign|spki_(new|export(_challenge)?|verify)|seal|csr_(sign|new|export(_to_file)?|get_(subject|public_key))|\n  cipher_iv_length|open|dh_compute_key|digest|decrypt|public_(decrypt|encrypt)|encrypt|error_string|\n  pkcs12_(export(_to_file)?|read)|pkcs7_(sign|decrypt|encrypt|verify)|verify|free_key|random_pseudo_bytes|\n  pkey_(new|export(_to_file)?|free|get_(details|public|private))|private_(decrypt|encrypt)|pbkdf2|\n  get_((cipher|md)_methods|cert_locations|(public|private)key)|\n  x509_(check_private_key|checkpurpose|parse|export(_to_file)?|fingerprint|free|read)\n)\\b",
+          "match": "(?i)\\bopenssl_(sign|spki_(new|export(_challenge)?|verify)|seal|csr_(sign|new|export(_to_file)?|get_(subject|public_key))|cipher_iv_length|open|dh_compute_key|digest|decrypt|public_(decrypt|encrypt)|encrypt|error_string|pkcs12_(export(_to_file)?|read)|pkcs7_(sign|decrypt|encrypt|verify)|verify|free_key|random_pseudo_bytes|pkey_(new|export(_to_file)?|free|get_(details|public|private))|private_(decrypt|encrypt)|pbkdf2|get_((cipher|md)_methods|cert_locations|(p(?:ublic|rivate))key)|x509_(check_private_key|checkpurpose|parse|export(_to_file)?|fingerprint|free|read))\\b",
           "name": "support.function.openssl.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  output_(add_rewrite_var|reset_rewrite_vars)|flush|\n  ob_(start|clean|implicit_flush|end_(clean|flush)|flush|list_handlers|gzhandler|\n      get_(status|contents|clean|flush|length|level))\n)\\b",
+          "match": "(?i)\\b(output_(add_rewrite_var|reset_rewrite_vars)|flush|ob_(start|clean|implicit_flush|end_(clean|flush)|flush|list_handlers|gzhandler|get_(status|contents|clean|flush|length|level)))\\b",
           "name": "support.function.output.php"
         },
         {
@@ -3469,11 +3504,11 @@
           "name": "support.function.password.php"
         },
         {
-          "match": "(?xi)\\b\npcntl_(\n  strerror|signal(_dispatch)?|sig(timedwait|procmask|waitinfo)|setpriority|errno|exec|fork|\n  w(stopsig|termsig|if(stopped|signaled|exited))|wait(pid)?|alarm|getpriority|get_last_error\n)\\b",
+          "match": "(?i)\\bpcntl_(strerror|signal(_dispatch)?|sig(timedwait|procmask|waitinfo)|setpriority|errno|exec|fork|w(stopsig|termsig|if(stopped|signaled|exited))|wait(pid)?|alarm|getpriority|get_last_error)\\b",
           "name": "support.function.pcntl.php"
         },
         {
-          "match": "(?xi)\\b\npg_(\n  socket|send_(prepare|execute|query(_params)?)|set_(client_encoding|error_verbosity)|select|host|\n  num_(fields|rows)|consume_input|connection_(status|reset|busy)|connect(_poll)?|convert|copy_(from|to)|\n  client_encoding|close|cancel_query|tty|transaction_status|trace|insert|options|delete|dbname|untrace|\n  unescape_bytea|update|pconnect|ping|port|put_line|parameter_status|prepare|version|query(_params)?|\n  escape_(string|identifier|literal|bytea)|end_copy|execute|flush|free_result|last_(notice|error|oid)|\n  field_(size|num|name|type(_oid)?|table|is_null|prtlen)|affected_rows|result_(status|seek|error(_field)?)|\n  fetch_(object|assoc|all(_columns)?|array|row|result)|get_(notify|pid|result)|meta_data|\n  lo_(seek|close|create|tell|truncate|import|open|unlink|export|write|read(_all)?)|\n)\\b",
+          "match": "(?i)\\bpg_(socket|send_(prepare|execute|query(_params)?)|set_(client_encoding|error_verbosity)|select|host|num_(fields|rows)|consume_input|connection_(status|reset|busy)|connect(_poll)?|convert|copy_(from|to)|client_encoding|close|cancel_query|tty|transaction_status|trace|insert|options|delete|dbname|untrace|unescape_bytea|update|pconnect|ping|port|put_line|parameter_status|prepare|version|query(_params)?|escape_(string|identifier|literal|bytea)|end_copy|execute|flush|free_result|last_(notice|error|oid)|field_(size|num|name|type(_oid)?|table|is_null|prtlen)|affected_rows|result_(status|seek|error(_field)?)|fetch_(object|assoc|all(_columns)?|array|row|result)|get_(notify|pid|result)|meta_data|lo_(seek|close|create|tell|truncate|import|open|unlink|export|write|read(_all)?)|)\\b",
           "name": "support.function.pgsql.php"
         },
         {
@@ -3485,19 +3520,19 @@
           "name": "support.function.php_dom.php"
         },
         {
-          "match": "(?xi)\\b\nftp_(\n  ssl_connect|systype|site|size|set_option|nlist|nb_(continue|f?(put|get))|ch(dir|mod)|connect|cdup|close|\n  delete|put|pwd|pasv|exec|quit|f(put|get)|login|alloc|rename|raw(list)?|rmdir|get(_option)?|mdtm|mkdir\n)\\b",
+          "match": "(?i)\\bftp_(ssl_connect|systype|site|size|set_option|nlist|nb_(continue|f?(put|get))|ch(dir|mod)|connect|cdup|close|delete|put|pwd|pasv|exec|quit|f(put|get)|login|alloc|rename|raw(list)?|rmdir|get(_option)?|mdtm|mkdir)\\b",
           "name": "support.function.php_ftp.php"
         },
         {
-          "match": "(?xi)\\b\nimap_(\n  (create|delete|list|rename|scan)(mailbox)?|status|sort|subscribe|set_quota|set(flag_full|acl)|search|savebody|\n  num_(recent|msg)|check|close|clearflag_full|thread|timeout|open|header(info)?|headers|append|alerts|reopen|\n  8bit|unsubscribe|undelete|utf7_(decode|encode)|utf8|uid|ping|errors|expunge|qprint|gc|\n  fetch(structure|header|text|mime|body)|fetch_overview|lsub|list(scan|subscribed)|last_error|\n  rfc822_(parse_(headers|adrlist)|write_address)|get(subscribed|acl|mailboxes)|get_quota(root)?|\n  msgno|mime_header_decode|mail_(copy|compose|move)|mail|mailboxmsginfo|binary|body(struct)?|base64\n)\\b",
+          "match": "(?i)\\bimap_((create|delete|list|rename|scan)(mailbox)?|status|sort|subscribe|set_quota|set(flag_full|acl)|search|savebody|num_(recent|msg)|check|close|clearflag_full|thread|timeout|open|header(info)?|headers|append|alerts|reopen|8bit|unsubscribe|undelete|utf7_(decode|encode)|utf8|uid|ping|errors|expunge|qprint|gc|fetch(structure|header|text|mime|body)|fetch_overview|lsub|list(s(?:can|ubscribed))|last_error|rfc822_(parse_(headers|adrlist)|write_address)|get(subscribed|acl|mailboxes)|get_quota(root)?|msgno|mime_header_decode|mail_(copy|compose|move)|mail|mailboxmsginfo|binary|body(struct)?|base64)\\b",
           "name": "support.function.php_imap.php"
         },
         {
-          "match": "(?xi)\\b\nmssql_(\n  select_db|num_(fields|rows)|next_result|connect|close|init|data_seek|pconnect|execute|query|\n  field_(seek|name|type|length)|fetch_(object|field|assoc|array|row|batch)|free_(statement|result)|\n  rows_affected|result|guid_string|get_last_message|min_(error|message)_severity|bind\n)\\b",
+          "match": "(?i)\\bmssql_(select_db|num_(fields|rows)|next_result|connect|close|init|data_seek|pconnect|execute|query|field_(seek|name|type|length)|fetch_(object|field|assoc|array|row|batch)|free_(statement|result)|rows_affected|result|guid_string|get_last_message|min_(error|message)_severity|bind)\\b",
           "name": "support.function.php_mssql.php"
         },
         {
-          "match": "(?xi)\\b\nodbc_(\n  statistics|specialcolumns|setoption|num_(fields|rows)|next_result|connect|columns|columnprivileges|commit|\n  cursor|close(_all)?|tables|tableprivileges|do|data_source|pconnect|primarykeys|procedures|procedurecolumns|\n  prepare|error(msg)?|exec(ute)?|field_(scale|num|name|type|precision|len)|foreignkeys|free_result|\n  fetch_(into|object|array|row)|longreadlen|autocommit|rollback|result(_all)?|gettypeinfo|binmode\n)\\b",
+          "match": "(?i)\\bodbc_(statistics|specialcolumns|setoption|num_(fields|rows)|next_result|connect|columns|columnprivileges|commit|cursor|close(_all)?|tables|tableprivileges|do|data_source|pconnect|primarykeys|procedures|procedurecolumns|prepare|error(msg)?|exec(ute)?|field_(scale|num|name|type|precision|len)|foreignkeys|free_result|fetch_(into|object|array|row)|longreadlen|autocommit|rollback|result(_all)?|gettypeinfo|binmode)\\b",
           "name": "support.function.php_odbc.php"
         },
         {
@@ -3513,7 +3548,7 @@
           "name": "support.function.php_zip.php"
         },
         {
-          "match": "(?xi)\\b\nposix_(\n  strerror|set(s|e?u|[ep]?g)id|ctermid|ttyname|times|isatty|initgroups|uname|errno|kill|access|\n  get(sid|cwd|uid|pid|ppid|pwnam|pwuid|pgid|pgrp|euid|egid|login|rlimit|gid|grnam|groups|grgid)|\n  get_last_error|mknod|mkfifo\n)\\b",
+          "match": "(?i)\\bposix_(strerror|set(s|e?u|[ep]?g)id|ctermid|ttyname|times|isatty|initgroups|uname|errno|kill|access|get(sid|cwd|uid|pid|ppid|pwnam|pwuid|pgid|pgrp|euid|egid|login|rlimit|gid|grnam|groups|grgid)|get_last_error|mknod|mkfifo)\\b",
           "name": "support.function.posix.php"
         },
         {
@@ -3521,7 +3556,7 @@
           "name": "support.function.proctitle.php"
         },
         {
-          "match": "(?xi)\\b\npspell_(\n  store_replacement|suggest|save_wordlist|new(_(config|personal))?|check|clear_session|\n  config_(save_repl|create|ignore|(data|dict)_dir|personal|runtogether|repl|mode)|add_to_(session|personal)\n)\\b",
+          "match": "(?i)\\bpspell_(store_replacement|suggest|save_wordlist|new(_(config|personal))?|check|clear_session|config_(save_repl|create|ignore|(d(?:ata|ict))_dir|personal|runtogether|repl|mode)|add_to_(session|personal))\\b",
           "name": "support.function.pspell.php"
         },
         {
@@ -3537,11 +3572,11 @@
           "name": "support.function.rrd.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  shm_((get|has|remove|put)_var|detach|attach|remove)|sem_(acquire|release|remove|get)|ftok|\n  msg_((get|remove|set|stat)_queue|send|queue_exists|receive)\n)\\b",
+          "match": "(?i)\\b(shm_((get|has|remove|put)_var|detach|attach|remove)|sem_(acquire|release|remove|get)|ftok|msg_((get|remove|set|stat)_queue|send|queue_exists|receive))\\b",
           "name": "support.function.sem.php"
         },
         {
-          "match": "(?xi)\\b\nsession_(\n  status|start|set_(save_handler|cookie_params)|save_path|name|commit|cache_(expire|limiter)|\n  is_registered|id|destroy|decode|unset|unregister|encode|write_close|abort|reset|register(_shutdown)?|\n  regenerate_id|get_cookie_params|module_name\n)\\b",
+          "match": "(?i)\\bsession_(status|start|set_(save_handler|cookie_params)|save_path|name|commit|cache_(expire|limiter)|is_registered|id|destroy|decode|unset|unregister|encode|write_close|abort|reset|register(_shutdown)?|regenerate_id|get_cookie_params|module_name)\\b",
           "name": "support.function.session.php"
         },
         {
@@ -3553,7 +3588,7 @@
           "name": "support.function.simplexml.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  snmp(walk(oid)?|realwalk|get(next)?|set)|\n  snmp_(set_(valueretrieval|quick_print|enum_print|oid_(numeric_print|output_format))|read_mib|\n        get_(valueretrieval|quick_print))|\n  snmp[23]_(set|walk|real_walk|get(next)?)\n)\\b",
+          "match": "(?i)\\b(snmp(?:(walk(oid)?|realwalk|get(next)?|set)|_(set_(valueretrieval|quick_print|enum_print|oid_(numeric_print|output_format))|read_mib|get_(valueretrieval|quick_print))|[23]_(set|walk|real_walk|get(next)?)))\\b",
           "name": "support.function.snmp.php"
         },
         {
@@ -3561,31 +3596,31 @@
           "name": "support.function.soap.php"
         },
         {
-          "match": "(?xi)\\b\nsocket_(\n  shutdown|strerror|send(to|msg)?|set_((non)?block|option)|select|connect|close|clear_error|bind|\n  create(_(pair|listen))?|cmsg_space|import_stream|write|listen|last_error|accept|recv(from|msg)?|\n  read|get(peer|sock)name|get_option\n)\\b",
+          "match": "(?i)\\bsocket_(shutdown|strerror|send(to|msg)?|set_((non)?block|option)|select|connect|close|clear_error|bind|create(_(pair|listen))?|cmsg_space|import_stream|write|listen|last_error|accept|recv(from|msg)?|read|get(peer|sock)name|get_option)\\b",
           "name": "support.function.sockets.php"
         },
         {
-          "match": "(?xi)\\b\nsqlite_(\n  single_query|seek|has_(more|prev)|num_(fields|rows)|next|changes|column|current|close|\n  create_(aggregate|function)|open|unbuffered_query|udf_(decode|encode)_binary|popen|prev|\n  escape_string|error_string|exec|valid|key|query|field_name|factory|\n  fetch_(string|single|column_types|object|all|array)|lib(encoding|version)|\n  last_(insert_rowid|error)|array_query|rewind|busy_timeout\n)\\b",
+          "match": "(?i)\\bsqlite_(single_query|seek|has_(more|prev)|num_(fields|rows)|next|changes|column|current|close|create_(aggregate|function)|open|unbuffered_query|udf_(decode|encode)_binary|popen|prev|escape_string|error_string|exec|valid|key|query|field_name|factory|fetch_(string|single|column_types|object|all|array)|lib(encoding|version)|last_(insert_rowid|error)|array_query|rewind|busy_timeout)\\b",
           "name": "support.function.sqlite.php"
         },
         {
-          "match": "(?xi)\\b\nsqlsrv_(\n  send_stream_data|server_info|has_rows|num_(fields|rows)|next_result|connect|configure|commit|\n  client_info|close|cancel|prepare|errors|execute|query|field_metadata|fetch(_(array|object))?|\n  free_stmt|rows_affected|rollback|get_(config|field)|begin_transaction\n)\\b",
+          "match": "(?i)\\bsqlsrv_(send_stream_data|server_info|has_rows|num_(fields|rows)|next_result|connect|configure|commit|client_info|close|cancel|prepare|errors|execute|query|field_metadata|fetch(_(array|object))?|free_stmt|rows_affected|rollback|get_(config|field)|begin_transaction)\\b",
           "name": "support.function.sqlsrv.php"
         },
         {
-          "match": "(?xi)\\b\nstats_(\n  harmonic_mean|covariance|standard_deviation|skew|\n  cdf_(noncentral_(chisquare|f)|negative_binomial|chisquare|cauchy|t|uniform|poisson|exponential|f|weibull|\n       logistic|laplace|gamma|binomial|beta)|\n  stat_(noncentral_t|correlation|innerproduct|independent_t|powersum|percentile|paired_t|gennch|binomial_coef)|\n  dens_(normal|negative_binomial|chisquare|cauchy|t|pmf_(hypergeometric|poisson|binomial)|exponential|f|\n        weibull|logistic|laplace|gamma|beta)|\n  den_uniform|variance|kurtosis|absolute_deviation|\n  rand_(setall|phrase_to_seeds|ranf|get_seeds|\n        gen_(noncentral_[ft]|noncenral_chisquare|normal|chisquare|t|int|\n             i(uniform|poisson|binomial(_negative)?)|exponential|f(uniform)?|gamma|beta))\n)\\b",
+          "match": "(?i)\\bstats_(harmonic_mean|covariance|standard_deviation|skew|cdf_(noncentral_(chisquare|f)|negative_binomial|chisquare|cauchy|t|uniform|poisson|exponential|f|weibull|logistic|laplace|gamma|binomial|beta)|stat_(noncentral_t|correlation|innerproduct|independent_t|powersum|percentile|paired_t|gennch|binomial_coef)|dens_(normal|negative_binomial|chisquare|cauchy|t|pmf_(hypergeometric|poisson|binomial)|exponential|f|weibull|logistic|laplace|gamma|beta)|den_uniform|variance|kurtosis|absolute_deviation|rand_(setall|phrase_to_seeds|ranf|get_seeds|gen_(noncentral_[ft]|noncenral_chisquare|normal|chisquare|t|int|i(uniform|poisson|binomial(_negative)?)|exponential|f(uniform)?|gamma|beta)))\\b",
           "name": "support.function.stats.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  set_socket_blocking|\n  stream_(socket_(shutdown|sendto|server|client|pair|enable_crypto|accept|recvfrom|get_name)|\n    set_(chunk_size|timeout|(read|write)_buffer|blocking)|select|notification_callback|supports_lock|\n    context_(set_(option|default|params)|create|get_(options|default|params))|copy_to_stream|is_local|\n    encoding|filter_(append|prepend|register|remove)|wrapper_((un)?register|restore)|\n    resolve_include_path|register_wrapper|get_(contents|transports|filters|wrappers|line|meta_data)|\n    bucket_(new|prepend|append|make_writeable)\n  )\n)\\b",
+          "match": "(?i)\\b(s(?:et_socket_blocking|tream_(socket_(shutdown|sendto|server|client|pair|enable_crypto|accept|recvfrom|get_name)|set_(chunk_size|timeout|(read|write)_buffer|blocking)|select|notification_callback|supports_lock|context_(set_(option|default|params)|create|get_(options|default|params))|copy_to_stream|is_local|encoding|filter_(append|prepend|register|remove)|wrapper_((un)?register|restore)|resolve_include_path|register_wrapper|get_(contents|transports|filters|wrappers|line|meta_data)|bucket_(new|prepend|append|make_writeable))))\\b",
           "name": "support.function.streamsfuncs.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  money_format|md5(_file)?|metaphone|bin2hex|sscanf|sha1(_file)?|\n  str(str|c?spn|n(at)?(case)?cmp|chr|coll|(case)?cmp|to(upper|lower)|tok|tr|istr|pos|pbrk|len|rchr|ri?pos|rev)|\n  str_(getcsv|ireplace|pad|repeat|replace|rot13|shuffle|split|word_count)|\n  strip(c?slashes|os)|strip_tags|similar_text|soundex|substr(_(count|compare|replace))?|setlocale|\n  html(specialchars(_decode)?|entities)|html_entity_decode|hex2bin|hebrev(c)?|number_format|nl2br|nl_langinfo|\n  chop|chunk_split|chr|convert_(cyr_string|uu(decode|encode))|count_chars|crypt|crc32|trim|implode|ord|\n  uc(first|words)|join|parse_str|print(f)?|echo|explode|v?[fs]?printf|quoted_printable_(decode|encode)|\n  quotemeta|wordwrap|lcfirst|[lr]trim|localeconv|levenshtein|addc?slashes|get_html_translation_table\n)\\b",
+          "match": "(?i)\\b(money_format|md5(_file)?|metaphone|bin2hex|sscanf|sha1(_file)?|str(str|c?spn|n(at)?(case)?cmp|chr|coll|(case)?cmp|to(upper|lower)|tok|tr|istr|pos|pbrk|len|rchr|ri?pos|rev)|str_(getcsv|ireplace|pad|repeat|replace|rot13|shuffle|split|word_count)|strip(c?slashes|os)|strip_tags|similar_text|soundex|substr(_(count|compare|replace))?|setlocale|html(specialchars(_decode)?|entities)|html_entity_decode|hex2bin|hebrev(c)?|number_format|nl2br|nl_langinfo|chop|chunk_split|chr|convert_(cyr_string|uu(decode|encode))|count_chars|crypt|crc32|trim|implode|ord|uc(first|words)|join|parse_str|print(f)?|echo|explode|v?[fs]?printf|quoted_printable_(decode|encode)|quotemeta|wordwrap|lcfirst|[lr]trim|localeconv|levenshtein|addc?slashes|get_html_translation_table)\\b",
           "name": "support.function.string.php"
         },
         {
-          "match": "(?xi)\\b\nsybase_(\n  set_message_handler|select_db|num_(fields|rows)|connect|close|deadlock_retry_count|data_seek|\n  unbuffered_query|pconnect|query|field_seek|fetch_(object|field|assoc|array|row)|free_result|\n  affected_rows|result|get_last_message|min_(client|error|message|server)_severity\n)\\b",
+          "match": "(?i)\\bsybase_(set_message_handler|select_db|num_(fields|rows)|connect|close|deadlock_retry_count|data_seek|unbuffered_query|pconnect|query|field_seek|fetch_(object|field|assoc|array|row)|free_result|affected_rows|result|get_last_message|min_(client|error|message|server)_severity)\\b",
           "name": "support.function.sybase.php"
         },
         {
@@ -3593,7 +3628,7 @@
           "name": "support.function.taint.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  tidy_((get|set)opt|set_encoding|save_config|config_count|clean_repair|is_(xhtml|xml)|diagnose|\n        (access|error|warning)_count|load_config|reset_config|(parse|repair)_(string|file)|\n        get_(status|html(_ver)?|head|config|output|opt_doc|root|release|body))|\n  ob_tidyhandler\n)\\b",
+          "match": "(?i)\\b(tidy_((get|set)opt|set_encoding|save_config|config_count|clean_repair|is_(x(?:html|ml))|diagnose|(access|error|warning)_count|load_config|reset_config|(parse|repair)_(string|file)|get_(status|html(_ver)?|head|config|output|opt_doc|root|release|body))|ob_tidyhandler)\\b",
           "name": "support.function.tidy.php"
         },
         {
@@ -3601,7 +3636,7 @@
           "name": "support.function.tokenizer.php"
         },
         {
-          "match": "(?xi)\\b\ntrader_(\n  stoch(f|r|rsi)?|stddev|sin(h)?|sum|sub|set_(compat|unstable_period)|sqrt|sar(ext)?|sma|\n  ht_(sine|trend(line|mode)|dc(period|phase)|phasor)|natr|cci|cos(h)?|correl|\n  cdl(shootingstar|shortline|sticksandwich|stalledpattern|spinningtop|separatinglines|\n      hikkake(mod)?|highwave|homingpigeon|hangingman|harami(cross)?|hammer|concealbabyswall|\n      counterattack|closingmarubozu|thrusting|tasukigap|takuri|tristar|inneck|invertedhammer|\n      identical3crows|2crows|onneck|doji(star)?|darkcloudcover|dragonflydoji|unique3river|\n      upsidegap2crows|3(starsinsouth|inside|outside|whitesoldiers|linestrike|blackcrows)|\n      piercing|engulfing|evening(doji)?star|kicking(bylength)?|longline|longleggeddoji|\n      ladderbottom|advanceblock|abandonedbaby|risefall3methods|rickshawman|gapsidesidewhite|\n      gravestonedoji|xsidegap3methods|morning(doji)?star|mathold|matchinglow|marubozu|\n      belthold|breakaway)|\n  ceil|cmo|tsf|typprice|t3|tema|tan(h)?|trix|trima|trange|obv|div|dema|dx|ultosc|ppo|\n  plus_d[im]|errno|exp|ema|var|kama|floor|wclprice|willr|wma|ln|log10|bop|beta|bbands|\n  linearreg(_(slope|intercept|angle))?|asin|acos|atan|atr|adosc|ad|add|adx(r)?|apo|avgprice|\n  aroon(osc)?|rsi|roc|rocp|rocr(100)?|get_(compat|unstable_period)|min(index)?|minus_d[im]|\n  minmax(index)?|mid(point|price)|mom|mult|medprice|mfi|macd(ext|fix)?|mavp|max(index)?|ma(ma)?\n)\\b",
+          "match": "(?i)\\btrader_(stoch([fr]|rsi)?|stddev|sin(h)?|sum|sub|set_(compat|unstable_period)|sqrt|sar(ext)?|sma|ht_(sine|trend(line|mode)|dc(p(?:eriod|hase))|phasor)|natr|cci|cos(h)?|correl|cdl(shootingstar|shortline|sticksandwich|stalledpattern|spinningtop|separatinglines|hikkake(mod)?|highwave|homingpigeon|hangingman|harami(cross)?|hammer|concealbabyswall|counterattack|closingmarubozu|thrusting|tasukigap|takuri|tristar|inneck|invertedhammer|identical3crows|2crows|onneck|doji(star)?|darkcloudcover|dragonflydoji|unique3river|upsidegap2crows|3(starsinsouth|inside|outside|whitesoldiers|linestrike|blackcrows)|piercing|engulfing|evening(doji)?star|kicking(bylength)?|longline|longleggeddoji|ladderbottom|advanceblock|abandonedbaby|risefall3methods|rickshawman|gapsidesidewhite|gravestonedoji|xsidegap3methods|morning(doji)?star|mathold|matchinglow|marubozu|belthold|breakaway)|ceil|cmo|tsf|typprice|t3|tema|tan(h)?|trix|trima|trange|obv|div|dema|dx|ultosc|ppo|plus_d[im]|errno|exp|ema|var|kama|floor|wclprice|willr|wma|ln|log10|bop|beta|bbands|linearreg(_(slope|intercept|angle))?|asin|acos|atan|atr|adosc|ad|add|adx(r)?|apo|avgprice|aroon(osc)?|rsi|roc|rocp|rocr(100)?|get_(compat|unstable_period)|min(index)?|minus_d[im]|minmax(index)?|mid(p(?:oint|rice))|mom|mult|medprice|mfi|macd(ext|fix)?|mavp|max(index)?|ma(ma)?)\\b",
           "name": "support.function.trader.php"
         },
         {
@@ -3613,11 +3648,11 @@
           "name": "support.function.url.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  strval|settype|serialize|(bool|double|float)val|debug_zval_dump|intval|import_request_variables|isset|\n  is_(scalar|string|null|numeric|callable|int(eger)?|object|double|float|long|array|resource|real|bool)|\n  unset|unserialize|print_r|empty|var_(dump|export)|gettype|get_(defined_vars|resource_type)\n)\\b",
+          "match": "(?i)\\b(strval|settype|serialize|(bool|double|float)val|debug_zval_dump|intval|import_request_variables|isset|is_(scalar|string|null|numeric|callable|int(eger)?|object|double|float|long|array|resource|real|bool)|unset|unserialize|print_r|empty|var_(dump|export)|gettype|get_(defined_vars|resource_type))\\b",
           "name": "support.function.var.php"
         },
         {
-          "match": "(?i)\\bwddx_(serialize_(value|vars)|deserialize|packet_(start|end)|add_vars)\\b",
+          "match": "(?i)\\bwddx_(serialize_(va(?:lue|rs))|deserialize|packet_(start|end)|add_vars)\\b",
           "name": "support.function.wddx.php"
         },
         {
@@ -3625,19 +3660,19 @@
           "name": "support.function.xhprof.php"
         },
         {
-          "match": "(?xi)\n\\b\n(\n  utf8_(decode|encode)|\n  xml_(set_((notation|(end|start)_namespace|unparsed_entity)_decl_handler|\n            (character_data|default|element|external_entity_ref|processing_instruction)_handler|object)|\n       parse(_into_struct)?|parser_((get|set)_option|create(_ns)?|free)|error_string|\n       get_(current_((column|line)_number|byte_index)|error_code))\n)\\b",
+          "match": "(?i)\\b(utf8_(decode|encode)|xml_(set_((notation|(end|start)_namespace|unparsed_entity)_decl_handler|(character_data|default|element|external_entity_ref|processing_instruction)_handler|object)|parse(_into_struct)?|parser_((get|set)_option|create(_ns)?|free)|error_string|get_(current_((column|line)_number|byte_index)|error_code)))\\b",
           "name": "support.function.xml.php"
         },
         {
-          "match": "(?xi)\\b\nxmlrpc_(\n  server_(call_method|create|destroy|add_introspection_data|register_(introspection_callback|method))|\n  is_fault|decode(_request)?|parse_method_descriptions|encode(_request)?|(get|set)_type\n)\\b",
+          "match": "(?i)\\bxmlrpc_(server_(call_method|create|destroy|add_introspection_data|register_(introspection_callback|method))|is_fault|decode(_request)?|parse_method_descriptions|encode(_request)?|(get|set)_type)\\b",
           "name": "support.function.xmlrpc.php"
         },
         {
-          "match": "(?xi)\\b\nxmlwriter_(\n  (end|start|write)_(comment|cdata|dtd(_(attlist|entity|element))?|document|pi|attribute|element)|\n  (start|write)_(attribute|element)_ns|write_raw|set_indent(_string)?|text|output_memory|open_(memory|uri)|\n  full_end_element|flush|\n)\\b",
+          "match": "(?i)\\bxmlwriter_((end|start|write)_(comment|cdata|dtd(_(attlist|entity|element))?|document|pi|attribute|element)|(start|write)_(attribute|element)_ns|write_raw|set_indent(_string)?|text|output_memory|open_(memory|uri)|full_end_element|flush|)\\b",
           "name": "support.function.xmlwriter.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  zlib_(decode|encode|get_coding_type)|readgzfile|\n  gz(seek|compress|close|tell|inflate|open|decode|deflate|uncompress|puts|passthru|encode|eof|file|\n     write|rewind|read|getc|getss?)\n)\\b",
+          "match": "(?i)\\b(zlib_(decode|encode|get_coding_type)|readgzfile|gz(seek|compress|close|tell|inflate|open|decode|deflate|uncompress|puts|passthru|encode|eof|file|write|rewind|read|getc|getss?))\\b",
           "name": "support.function.zlib.php"
         },
         {
@@ -3686,7 +3721,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.section.switch-block.begin.bracket.curly.php"
@@ -3715,7 +3750,7 @@
               "name": "keyword.other.use-as.php"
             }
           },
-          "end": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+          "end": "(?i)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*",
           "endCaptures": {
             "0": {
               "name": "entity.other.alias.php"
@@ -3739,7 +3774,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?i)(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*\\b",
+          "match": "(?i)(\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*\\b",
           "name": "variable.other.php"
         }
       ]
@@ -3750,7 +3785,7 @@
           "name": "punctuation.definition.variable.php"
         }
       },
-      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg(v|c))\\b",
+      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg([vc]))\\b",
       "name": "variable.other.global.php"
     },
     "var_global_safer": {
@@ -3812,7 +3847,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?xi)\n((\\$)(?<name>[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*))\n(?:\n  (->)(\\g<name>)\n  |\n  (\\[)(?:(\\d+)|((\\$)\\g<name>)|([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*))(\\])\n)?"
+          "match": "(?i)((\\$)(?<name>[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*))(?:(->)(\\g<name>)|(\\[)(?:(\\d+)|((\\$)\\g<name>)|([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*))(]))?"
         },
         {
           "captures": {
@@ -3826,7 +3861,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?i)((\\${)(?<name>[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)(}))"
+          "match": "(?i)((\\$\\{)(?<name>[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)(}))"
         }
       ]
     },
@@ -3845,7 +3880,7 @@
           "include": "#var_basic"
         },
         {
-          "begin": "\\${(?=.*?})",
+          "begin": "\\$\\{(?=.*?})",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.variable.php"
diff --git a/resources/languages/bsl.json b/resources/languages/bsl.json
index 51ca16d..f96e342 100644
--- a/resources/languages/bsl.json
+++ b/resources/languages/bsl.json
@@ -13,7 +13,7 @@
       "include": "#miscellaneous"
     },
     {
-      "begin": "(?i:(?<=[^\\wа-яё\\.]|^)(Процедура|Procedure|Функция|Function)\\s+([a-zа-яё0-9_]+)\\s*(\\())",
+      "begin": "(?i:(?<=[^\\wа-яё.]|^)(Процедура|Procedure|Функция|Function)\\s+([a-zа-яё0-9_]+)\\s*(\\())",
       "beginCaptures": {
         "1": {
           "name": "storage.type.bsl"
@@ -25,8 +25,7 @@
           "name": "punctuation.bracket.begin.bsl"
         }
       },
-      "comment": "Proc and function definition",
-      "end": "(?i:(\\))\\s*((Экспорт|Export)(?=[^\\wа-яё\\.]|$))?)",
+      "end": "(?i:(\\))\\s*((Экспорт|Export)(?=[^\\wа-яё.]|$))?)",
       "endCaptures": {
         "1": {
           "name": "punctuation.bracket.end.bsl"
@@ -47,15 +46,15 @@
           "name": "keyword.operator.assignment.bsl"
         },
         {
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Знач|Val)(?=[^\\wа-яё\\.]|$))",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Знач|Val)(?=[^\\wа-яё.]|$))",
           "name": "storage.modifier.bsl"
         },
         {
-          "match": "(?<=[^\\wа-яё\\.]|^)((?<==)(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё\\.]|$)",
+          "match": "(?<=[^\\wа-яё.]|^)((?<==)(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё.]|$)",
           "name": "invalid.illegal.bsl"
         },
         {
-          "match": "(?<=[^\\wа-яё\\.]|^)((?<==\\s)\\s*(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё\\.]|$)",
+          "match": "(?<=[^\\wа-яё.]|^)((?<==\\s)\\s*(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё.]|$)",
           "name": "invalid.illegal.bsl"
         },
         {
@@ -65,7 +64,7 @@
       ]
     },
     {
-      "begin": "(?i:(?<=[^\\wа-яё\\.]|^)(Перем|Var)\\s+([a-zа-яё0-9_]+)\\s*)",
+      "begin": "(?i:(?<=[^\\wа-яё.]|^)(Перем|Var)\\s+([a-zа-яё0-9_]+)\\s*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.var.bsl"
@@ -74,7 +73,6 @@
           "name": "variable.bsl"
         }
       },
-      "comment": "Define of variable",
       "end": "(;)",
       "endCaptures": {
         "1": {
@@ -87,7 +85,7 @@
           "name": "keyword.operator.bsl"
         },
         {
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Экспорт|Export)(?=[^\\wа-яё\\.]|$))",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Экспорт|Export)(?=[^\\wа-яё.]|$))",
           "name": "storage.modifier.bsl"
         },
         {
@@ -103,7 +101,6 @@
           "name": "keyword.control.conditional.bsl"
         }
       },
-      "comment": "Conditional",
       "end": "(?i:(Тогда|Then))",
       "endCaptures": {
         "1": {
@@ -130,7 +127,6 @@
           "name": "keyword.operator.assignment.bsl"
         }
       },
-      "comment": "Variable assignment",
       "end": "(?i:(?=(;|Иначе|Конец|Els|End)))",
       "name": "meta.var-single-variable.bsl",
       "patterns": [
@@ -143,11 +139,11 @@
       ]
     },
     {
-      "match": "(?i:(?<=[^\\wа-яё\\.]|^)(КонецПроцедуры|EndProcedure|КонецФункции|EndFunction)(?=[^\\wа-яё\\.]|$))",
+      "match": "(?i:(?<=[^\\wа-яё.]|^)(КонецПроцедуры|EndProcedure|КонецФункции|EndFunction)(?=[^\\wа-яё.]|$))",
       "name": "storage.type.bsl"
     },
     {
-      "match": "(?i)#(Использовать|Use)(?=[^\\wа-яё\\.]|$)",
+      "match": "(?i)#(Использовать|Use)(?=[^\\wа-яё.]|$)",
       "name": "keyword.control.import.bsl"
     },
     {
@@ -155,19 +151,19 @@
       "name": "keyword.control.native.bsl"
     },
     {
-      "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Прервать|Break|Продолжить|Continue|Возврат|Return)(?=[^\\wа-яё\\.]|$))",
+      "match": "(?i:(?<=[^\\wа-яё.]|^)(Прервать|Break|Продолжить|Continue|Возврат|Return)(?=[^\\wа-яё.]|$))",
       "name": "keyword.control.bsl"
     },
     {
-      "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Если|If|Иначе|Else|ИначеЕсли|ElsIf|Тогда|Then|КонецЕсли|EndIf)(?=[^\\wа-яё\\.]|$))",
+      "match": "(?i:(?<=[^\\wа-яё.]|^)(Если|If|Иначе|Else|ИначеЕсли|ElsIf|Тогда|Then|КонецЕсли|EndIf)(?=[^\\wа-яё.]|$))",
       "name": "keyword.control.conditional.bsl"
     },
     {
-      "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Попытка|Try|Исключение|Except|КонецПопытки|EndTry|ВызватьИсключение|Raise)(?=[^\\wа-яё\\.]|$))",
+      "match": "(?i:(?<=[^\\wа-яё.]|^)(Попытка|Try|Исключение|Except|КонецПопытки|EndTry|ВызватьИсключение|Raise)(?=[^\\wа-яё.]|$))",
       "name": "keyword.control.exception.bsl"
     },
     {
-      "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Пока|While|(Для|For)(\\s+(Каждого|Each))?|Из|In|По|To|Цикл|Do|КонецЦикла|EndDo)(?=[^\\wа-яё\\.]|$))",
+      "match": "(?i:(?<=[^\\wа-яё.]|^)(Пока|While|(Для|For)(\\s+(Каждого|Each))?|Из|In|По|To|Цикл|Do|КонецЦикла|EndDo)(?=[^\\wа-яё.]|$))",
       "name": "keyword.control.repeat.bsl"
     },
     {
@@ -191,31 +187,25 @@
           "name": "entity.name.section.bsl"
         }
       },
-      "comment": "Region start",
       "end": "$"
     },
     {
-      "comment": "Region end",
       "match": "(?i)#(КонецОбласти|EndRegion)",
       "name": "keyword.other.section.bsl"
     },
     {
-      "comment": "Delete start",
       "match": "(?i)#(Удаление|Delete)",
       "name": "keyword.other.section.bsl"
     },
     {
-      "comment": "Delete end",
       "match": "(?i)#(КонецУдаления|EndDelete)",
       "name": "keyword.other.section.bsl"
     },
     {
-      "comment": "Inster start",
       "match": "(?i)#(Вставка|Insert)",
       "name": "keyword.other.section.bsl"
     },
     {
-      "comment": "Insert end",
       "match": "(?i)#(КонецВставки|EndInsert)",
       "name": "keyword.other.section.bsl"
     }
@@ -233,7 +223,6 @@
               "name": "punctuation.bracket.begin.bsl"
             }
           },
-          "comment": "Annotations with parameters",
           "end": "(\\))",
           "endCaptures": {
             "1": {
@@ -249,11 +238,11 @@
               "name": "keyword.operator.assignment.bsl"
             },
             {
-              "match": "(?<=[^\\wа-яё\\.]|^)((?<==)(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё\\.]|$)",
+              "match": "(?<=[^\\wа-яё.]|^)((?<==)(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё.]|$)",
               "name": "invalid.illegal.bsl"
             },
             {
-              "match": "(?<=[^\\wа-яё\\.]|^)((?<==\\s)\\s*(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё\\.]|$)",
+              "match": "(?<=[^\\wа-яё.]|^)((?<==\\s)\\s*(?i)[a-zа-яё0-9_]+)(?=[^\\wа-яё.]|$)",
               "name": "invalid.illegal.bsl"
             },
             {
@@ -263,7 +252,6 @@
           ]
         },
         {
-          "comment": "Annotations without parameters",
           "match": "(?i)(&([a-zа-яё0-9_]+))",
           "name": "storage.type.annotation.bsl"
         }
@@ -277,15 +265,15 @@
           "name": "comment.line.double-slash.bsl"
         },
         {
-          "begin": "\\\"",
-          "end": "\\\"(?![\\\"])",
+          "begin": "\"",
+          "end": "\"(?!\")",
           "name": "string.quoted.double.bsl",
           "patterns": [
             {
               "include": "#query"
             },
             {
-              "match": "\\\"\\\"",
+              "match": "\"\"",
               "name": "constant.character.escape.bsl"
             },
             {
@@ -295,15 +283,15 @@
           ]
         },
         {
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Неопределено|Undefined|Истина|True|Ложь|False|NULL)(?=[^\\wа-яё\\.]|$))",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Неопределено|Undefined|Истина|True|Ложь|False|NULL)(?=[^\\wа-яё.]|$))",
           "name": "constant.language.bsl"
         },
         {
-          "match": "(?<=[^\\wа-яё\\.]|^)(\\d+\\.?\\d*)(?=[^\\wа-яё\\.]|$)",
+          "match": "(?<=[^\\wа-яё.]|^)(\\d+\\.?\\d*)(?=[^\\wа-яё.]|$)",
           "name": "constant.numeric.bsl"
         },
         {
-          "match": "\\'((\\d{4}[^\\d\\']*\\d{2}[^\\d\\']*\\d{2})([^\\d\\']*\\d{2}[^\\d\\']*\\d{2}([^\\d\\']*\\d{2})?)?)\\'",
+          "match": "'((\\d{4}[^\\d']*\\d{2}[^\\d']*\\d{2})([^\\d']*\\d{2}[^\\d']*\\d{2}([^\\d']*\\d{2})?)?)'",
           "name": "constant.other.date.bsl"
         },
         {
@@ -323,176 +311,147 @@
     "miscellaneous": {
       "patterns": [
         {
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(НЕ|NOT|И|AND|ИЛИ|OR)(?=[^\\wа-яё\\.]|$))",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(НЕ|NOT|И|AND|ИЛИ|OR)(?=[^\\wа-яё.]|$))",
           "name": "keyword.operator.logical.bsl"
         },
         {
-          "match": "<=|>=|=|<|>",
+          "match": "<=|>=|[=<>]",
           "name": "keyword.operator.comparison.bsl"
         },
         {
-          "match": "(\\+|-|\\*|/|%)",
+          "match": "([+\\-*/%])",
           "name": "keyword.operator.arithmetic.bsl"
         },
         {
-          "match": "(;|\\?)",
+          "match": "([;?])",
           "name": "keyword.operator.bsl"
         },
         {
-          "comment": "Functions w/o brackets",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Новый|New)(?=[^\\wа-яё\\.]|$))",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Новый|New)(?=[^\\wа-яё.]|$))",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - функции работы со значениями типа Строка",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(СтрДлина|StrLen|СокрЛ|TrimL|СокрП|TrimR|СокрЛП|TrimAll|Лев|Left|Прав|Right|Сред|Mid|СтрНайти|StrFind|ВРег|Upper|НРег|Lower|ТРег|Title|Символ|Char|КодСимвола|CharCode|ПустаяСтрока|IsBlankString|СтрЗаменить|StrReplace|СтрЧислоСтрок|StrLineCount|СтрПолучитьСтроку|StrGetLine|СтрЧислоВхождений|StrOccurrenceCount|СтрСравнить|StrCompare|СтрНачинаетсяС|StrStartWith|СтрЗаканчиваетсяНа|StrEndsWith|СтрРазделить|StrSplit|СтрСоединить|StrConcat)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(СтрДлина|StrLen|СокрЛ|TrimL|СокрП|TrimR|СокрЛП|TrimAll|Лев|Left|Прав|Right|Сред|Mid|СтрНайти|StrFind|ВРег|Upper|НРег|Lower|ТРег|Title|Символ|Char|КодСимвола|CharCode|ПустаяСтрока|IsBlankString|СтрЗаменить|StrReplace|СтрЧислоСтрок|StrLineCount|СтрПолучитьСтроку|StrGetLine|СтрЧислоВхождений|StrOccurrenceCount|СтрСравнить|StrCompare|СтрНачинаетсяС|StrStartWith|СтрЗаканчиваетсяНа|StrEndsWith|СтрРазделить|StrSplit|СтрСоединить|StrConcat)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - функции работы со значениями типа Число",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Цел|Int|Окр|Round|ACos|ASin|ATan|Cos|Exp|Log|Log10|Pow|Sin|Sqrt|Tan)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Цел|Int|Окр|Round|ACos|ASin|ATan|Cos|Exp|Log|Log10|Pow|Sin|Sqrt|Tan)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - функции работы со значениями типа Дата",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Год|Year|Месяц|Month|День|Day|Час|Hour|Минута|Minute|Секунда|Second|НачалоГода|BegOfYear|НачалоДня|BegOfDay|НачалоКвартала|BegOfQuarter|НачалоМесяца|BegOfMonth|НачалоМинуты|BegOfMinute|НачалоНедели|BegOfWeek|НачалоЧаса|BegOfHour|КонецГода|EndOfYear|КонецДня|EndOfDay|КонецКвартала|EndOfQuarter|КонецМесяца|EndOfMonth|КонецМинуты|EndOfMinute|КонецНедели|EndOfWeek|КонецЧаса|EndOfHour|НеделяГода|WeekOfYear|ДеньГода|DayOfYear|ДеньНедели|WeekDay|ТекущаяДата|CurrentDate|ДобавитьМесяц|AddMonth)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Год|Year|Месяц|Month|День|Day|Час|Hour|Минута|Minute|Секунда|Second|НачалоГода|BegOfYear|НачалоДня|BegOfDay|НачалоКвартала|BegOfQuarter|НачалоМесяца|BegOfMonth|НачалоМинуты|BegOfMinute|НачалоНедели|BegOfWeek|НачалоЧаса|BegOfHour|КонецГода|EndOfYear|КонецДня|EndOfDay|КонецКвартала|EndOfQuarter|КонецМесяца|EndOfMonth|КонецМинуты|EndOfMinute|КонецНедели|EndOfWeek|КонецЧаса|EndOfHour|НеделяГода|WeekOfYear|ДеньГода|DayOfYear|ДеньНедели|WeekDay|ТекущаяДата|CurrentDate|ДобавитьМесяц|AddMonth)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - функции работы со значениями типа Тип",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Тип|Type|ТипЗнч|TypeOf)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Тип|Type|ТипЗнч|TypeOf)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - функции преобразования значений",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Булево|Boolean|Число|Number|Строка|String|Дата|Date)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Булево|Boolean|Число|Number|Строка|String|Дата|Date)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - процедуры и функции интерактивной работы",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ПоказатьВопрос|ShowQueryBox|Вопрос|DoQueryBox|ПоказатьПредупреждение|ShowMessageBox|Предупреждение|DoMessageBox|Сообщить|Message|ОчиститьСообщения|ClearMessages|ОповеститьОбИзменении|NotifyChanged|Состояние|Status|Сигнал|Beep|ПоказатьЗначение|ShowValue|ОткрытьЗначение|OpenValue|Оповестить|Notify|ОбработкаПрерыванияПользователя|UserInterruptProcessing|ОткрытьСодержаниеСправки|OpenHelpContent|ОткрытьИндексСправки|OpenHelpIndex|ОткрытьСправку|OpenHelp|ПоказатьИнформациюОбОшибке|ShowErrorInfo|КраткоеПредставлениеОшибки|BriefErrorDescription|ПодробноеПредставлениеОшибки|DetailErrorDescription|ПолучитьФорму|GetForm|ЗакрытьСправку|CloseHelp|ПоказатьОповещениеПользователя|ShowUserNotification|ОткрытьФорму|OpenForm|ОткрытьФормуМодально|OpenFormModal|АктивноеОкно|ActiveWindow|ВыполнитьОбработкуОповещения|ExecuteNotifyProcessing)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ПоказатьВопрос|ShowQueryBox|Вопрос|DoQueryBox|ПоказатьПредупреждение|ShowMessageBox|Предупреждение|DoMessageBox|Сообщить|Message|ОчиститьСообщения|ClearMessages|ОповеститьОбИзменении|NotifyChanged|Состояние|Status|Сигнал|Beep|ПоказатьЗначение|ShowValue|ОткрытьЗначение|OpenValue|Оповестить|Notify|ОбработкаПрерыванияПользователя|UserInterruptProcessing|ОткрытьСодержаниеСправки|OpenHelpContent|ОткрытьИндексСправки|OpenHelpIndex|ОткрытьСправку|OpenHelp|ПоказатьИнформациюОбОшибке|ShowErrorInfo|КраткоеПредставлениеОшибки|BriefErrorDescription|ПодробноеПредставлениеОшибки|DetailErrorDescription|ПолучитьФорму|GetForm|ЗакрытьСправку|CloseHelp|ПоказатьОповещениеПользователя|ShowUserNotification|ОткрытьФорму|OpenForm|ОткрытьФормуМодально|OpenFormModal|АктивноеОкно|ActiveWindow|ВыполнитьОбработкуОповещения|ExecuteNotifyProcessing)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - функции для вызова диалога ввода данных",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ПоказатьВводЗначения|ShowInputValue|ВвестиЗначение|InputValue|ПоказатьВводЧисла|ShowInputNumber|ВвестиЧисло|InputNumber|ПоказатьВводСтроки|ShowInputString|ВвестиСтроку|InputString|ПоказатьВводДаты|ShowInputDate|ВвестиДату|InputDate)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ПоказатьВводЗначения|ShowInputValue|ВвестиЗначение|InputValue|ПоказатьВводЧисла|ShowInputNumber|ВвестиЧисло|InputNumber|ПоказатьВводСтроки|ShowInputString|ВвестиСтроку|InputString|ПоказатьВводДаты|ShowInputDate|ВвестиДату|InputDate)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - функции форматирования",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Формат|Format|ЧислоПрописью|NumberInWords|НСтр|NStr|ПредставлениеПериода|PeriodPresentation|СтрШаблон|StrTemplate)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Формат|Format|ЧислоПрописью|NumberInWords|НСтр|NStr|ПредставлениеПериода|PeriodPresentation|СтрШаблон|StrTemplate)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - функции обращения к конфигурации",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ПолучитьОбщийМакет|GetCommonTemplate|ПолучитьОбщуюФорму|GetCommonForm|ПредопределенноеЗначение|PredefinedValue|ПолучитьПолноеИмяПредопределенногоЗначения|GetPredefinedValueFullName)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ПолучитьОбщийМакет|GetCommonTemplate|ПолучитьОбщуюФорму|GetCommonForm|ПредопределенноеЗначение|PredefinedValue|ПолучитьПолноеИмяПредопределенногоЗначения|GetPredefinedValueFullName)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - процедуры и функции сеанса работы",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ПолучитьЗаголовокСистемы|GetCaption|ПолучитьСкоростьКлиентскогоСоединения|GetClientConnectionSpeed|ПодключитьОбработчикОжидания|AttachIdleHandler|УстановитьЗаголовокСистемы|SetCaption|ОтключитьОбработчикОжидания|DetachIdleHandler|ИмяКомпьютера|ComputerName|ЗавершитьРаботуСистемы|Exit|ИмяПользователя|UserName|ПрекратитьРаботуСистемы|Terminate|ПолноеИмяПользователя|UserFullName|ЗаблокироватьРаботуПользователя|LockApplication|КаталогПрограммы|BinDir|КаталогВременныхФайлов|TempFilesDir|ПравоДоступа|AccessRight|РольДоступна|IsInRole|ТекущийЯзык|CurrentLanguage|ТекущийКодЛокализации|CurrentLocaleCode|СтрокаСоединенияИнформационнойБазы|InfoBaseConnectionString|ПодключитьОбработчикОповещения|AttachNotificationHandler|ОтключитьОбработчикОповещения|DetachNotificationHandler|ПолучитьСообщенияПользователю|GetUserMessages|ПараметрыДоступа|AccessParameters|ПредставлениеПриложения|ApplicationPresentation|ТекущийЯзыкСистемы|CurrentSystemLanguage|ЗапуститьСистему|RunSystem|ТекущийРежимЗапуска|CurrentRunMode|УстановитьЧасовойПоясСеанса|SetSessionTimeZone|ЧасовойПоясСеанса|SessionTimeZone|ТекущаяДатаСеанса|CurrentSessionDate|УстановитьКраткийЗаголовокПриложения|SetShortApplicationCaption|ПолучитьКраткийЗаголовокПриложения|GetShortApplicationCaption|ПредставлениеПрава|RightPresentation|ВыполнитьПроверкуПравДоступа|VerifyAccessRights|РабочийКаталогДанныхПользователя|UserDataWorkDir|КаталогДокументов|DocumentsDir|ПолучитьИнформациюЭкрановКлиента|GetClientDisplaysInformation|ТекущийВариантОсновногоШрифтаКлиентскогоПриложения|ClientApplicationBaseFontCurrentVariant|ТекущийВариантИнтерфейсаКлиентскогоПриложения|ClientApplicationInterfaceCurrentVariant|УстановитьЗаголовокКлиентскогоПриложения|SetClientApplicationCaption|ПолучитьЗаголовокКлиентскогоПриложения|GetClientApplicationCaption|НачатьПолучениеКаталогаВременныхФайлов|BeginGettingTempFilesDir|НачатьПолучениеКаталогаДокументов|BeginGettingDocumentsDir|НачатьПолучениеРабочегоКаталогаДанныхПользователя|BeginGettingUserDataWorkDir|ПодключитьОбработчикЗапросаНастроекКлиентаЛицензирования|AttachLicensingClientParametersRequestHandler|ОтключитьОбработчикЗапросаНастроекКлиентаЛицензирования|DetachLicensingClientParametersRequestHandler|КаталогБиблиотекиМобильногоУстройства|MobileDeviceLibraryDir)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ПолучитьЗаголовокСистемы|GetCaption|ПолучитьСкоростьКлиентскогоСоединения|GetClientConnectionSpeed|ПодключитьОбработчикОжидания|AttachIdleHandler|УстановитьЗаголовокСистемы|SetCaption|ОтключитьОбработчикОжидания|DetachIdleHandler|ИмяКомпьютера|ComputerName|ЗавершитьРаботуСистемы|Exit|ИмяПользователя|UserName|ПрекратитьРаботуСистемы|Terminate|ПолноеИмяПользователя|UserFullName|ЗаблокироватьРаботуПользователя|LockApplication|КаталогПрограммы|BinDir|КаталогВременныхФайлов|TempFilesDir|ПравоДоступа|AccessRight|РольДоступна|IsInRole|ТекущийЯзык|CurrentLanguage|ТекущийКодЛокализации|CurrentLocaleCode|СтрокаСоединенияИнформационнойБазы|InfoBaseConnectionString|ПодключитьОбработчикОповещения|AttachNotificationHandler|ОтключитьОбработчикОповещения|DetachNotificationHandler|ПолучитьСообщенияПользователю|GetUserMessages|ПараметрыДоступа|AccessParameters|ПредставлениеПриложения|ApplicationPresentation|ТекущийЯзыкСистемы|CurrentSystemLanguage|ЗапуститьСистему|RunSystem|ТекущийРежимЗапуска|CurrentRunMode|УстановитьЧасовойПоясСеанса|SetSessionTimeZone|ЧасовойПоясСеанса|SessionTimeZone|ТекущаяДатаСеанса|CurrentSessionDate|УстановитьКраткийЗаголовокПриложения|SetShortApplicationCaption|ПолучитьКраткийЗаголовокПриложения|GetShortApplicationCaption|ПредставлениеПрава|RightPresentation|ВыполнитьПроверкуПравДоступа|VerifyAccessRights|РабочийКаталогДанныхПользователя|UserDataWorkDir|КаталогДокументов|DocumentsDir|ПолучитьИнформациюЭкрановКлиента|GetClientDisplaysInformation|ТекущийВариантОсновногоШрифтаКлиентскогоПриложения|ClientApplicationBaseFontCurrentVariant|ТекущийВариантИнтерфейсаКлиентскогоПриложения|ClientApplicationInterfaceCurrentVariant|УстановитьЗаголовокКлиентскогоПриложения|SetClientApplicationCaption|ПолучитьЗаголовокКлиентскогоПриложения|GetClientApplicationCaption|НачатьПолучениеКаталогаВременныхФайлов|BeginGettingTempFilesDir|НачатьПолучениеКаталогаДокументов|BeginGettingDocumentsDir|НачатьПолучениеРабочегоКаталогаДанныхПользователя|BeginGettingUserDataWorkDir|ПодключитьОбработчикЗапросаНастроекКлиентаЛицензирования|AttachLicensingClientParametersRequestHandler|ОтключитьОбработчикЗапросаНастроекКлиентаЛицензирования|DetachLicensingClientParametersRequestHandler|КаталогБиблиотекиМобильногоУстройства|MobileDeviceLibraryDir)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - процедуры и функции сохранения значений",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ЗначениеВСтрокуВнутр|ValueToStringInternal|ЗначениеИзСтрокиВнутр|ValueFromStringInternal|ЗначениеВФайл|ValueToFile|ЗначениеИзФайла|ValueFromFile)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ЗначениеВСтрокуВнутр|ValueToStringInternal|ЗначениеИзСтрокиВнутр|ValueFromStringInternal|ЗначениеВФайл|ValueToFile|ЗначениеИзФайла|ValueFromFile)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с операционной системой",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(КомандаСистемы|System|ЗапуститьПриложение|RunApp|ПолучитьCOMОбъект|GetCOMObject|ПользователиОС|OSUsers|НачатьЗапускПриложения|BeginRunningApplication)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(КомандаСистемы|System|ЗапуститьПриложение|RunApp|ПолучитьCOMОбъект|GetCOMObject|ПользователиОС|OSUsers|НачатьЗапускПриложения|BeginRunningApplication)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с внешними компонентами",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ПодключитьВнешнююКомпоненту|AttachAddIn|НачатьУстановкуВнешнейКомпоненты|BeginInstallAddIn|УстановитьВнешнююКомпоненту|InstallAddIn|НачатьПодключениеВнешнейКомпоненты|BeginAttachingAddIn)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ПодключитьВнешнююКомпоненту|AttachAddIn|НачатьУстановкуВнешнейКомпоненты|BeginInstallAddIn|УстановитьВнешнююКомпоненту|InstallAddIn|НачатьПодключениеВнешнейКомпоненты|BeginAttachingAddIn)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с файлами",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(КопироватьФайл|FileCopy|ПереместитьФайл|MoveFile|УдалитьФайлы|DeleteFiles|НайтиФайлы|FindFiles|СоздатьКаталог|CreateDirectory|ПолучитьИмяВременногоФайла|GetTempFileName|РазделитьФайл|SplitFile|ОбъединитьФайлы|MergeFiles|ПолучитьФайл|GetFile|НачатьПомещениеФайла|BeginPutFile|ПоместитьФайл|PutFile|ЭтоАдресВременногоХранилища|IsTempStorageURL|УдалитьИзВременногоХранилища|DeleteFromTempStorage|ПолучитьИзВременногоХранилища|GetFromTempStorage|ПоместитьВоВременноеХранилище|PutToTempStorage|ПодключитьРасширениеРаботыСФайлами|AttachFileSystemExtension|НачатьУстановкуРасширенияРаботыСФайлами|BeginInstallFileSystemExtension|УстановитьРасширениеРаботыСФайлами|InstallFileSystemExtension|ПолучитьФайлы|GetFiles|ПоместитьФайлы|PutFiles|ЗапроситьРазрешениеПользователя|RequestUserPermission|ПолучитьМаскуВсеФайлы|GetAllFilesMask|ПолучитьМаскуВсеФайлыКлиента|GetClientAllFilesMask|ПолучитьМаскуВсеФайлыСервера|GetServerAllFilesMask|ПолучитьРазделительПути|GetPathSeparator|ПолучитьРазделительПутиКлиента|GetClientPathSeparator|ПолучитьРазделительПутиСервера|GetServerPathSeparator|НачатьПодключениеРасширенияРаботыСФайлами|BeginAttachingFileSystemExtension|НачатьЗапросРазрешенияПользователя|BeginRequestingUserPermission|НачатьПоискФайлов|BeginFindingFiles|НачатьСозданиеКаталога|BeginCreatingDirectory|НачатьКопированиеФайла|BeginCopyingFile|НачатьПеремещениеФайла|BeginMovingFile|НачатьУдалениеФайлов|BeginDeletingFiles|НачатьПолучениеФайлов|BeginGettingFiles|НачатьПомещениеФайлов|BeginPuttingFiles|НачатьСозданиеДвоичныхДанныхИзФайла|BeginCreateBinaryDataFromFile)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(КопироватьФайл|FileCopy|ПереместитьФайл|MoveFile|УдалитьФайлы|DeleteFiles|НайтиФайлы|FindFiles|СоздатьКаталог|CreateDirectory|ПолучитьИмяВременногоФайла|GetTempFileName|РазделитьФайл|SplitFile|ОбъединитьФайлы|MergeFiles|ПолучитьФайл|GetFile|НачатьПомещениеФайла|BeginPutFile|ПоместитьФайл|PutFile|ЭтоАдресВременногоХранилища|IsTempStorageURL|УдалитьИзВременногоХранилища|DeleteFromTempStorage|ПолучитьИзВременногоХранилища|GetFromTempStorage|ПоместитьВоВременноеХранилище|PutToTempStorage|ПодключитьРасширениеРаботыСФайлами|AttachFileSystemExtension|НачатьУстановкуРасширенияРаботыСФайлами|BeginInstallFileSystemExtension|УстановитьРасширениеРаботыСФайлами|InstallFileSystemExtension|ПолучитьФайлы|GetFiles|ПоместитьФайлы|PutFiles|ЗапроситьРазрешениеПользователя|RequestUserPermission|ПолучитьМаскуВсеФайлы|GetAllFilesMask|ПолучитьМаскуВсеФайлыКлиента|GetClientAllFilesMask|ПолучитьМаскуВсеФайлыСервера|GetServerAllFilesMask|ПолучитьРазделительПути|GetPathSeparator|ПолучитьРазделительПутиКлиента|GetClientPathSeparator|ПолучитьРазделительПутиСервера|GetServerPathSeparator|НачатьПодключениеРасширенияРаботыСФайлами|BeginAttachingFileSystemExtension|НачатьЗапросРазрешенияПользователя|BeginRequestingUserPermission|НачатьПоискФайлов|BeginFindingFiles|НачатьСозданиеКаталога|BeginCreatingDirectory|НачатьКопированиеФайла|BeginCopyingFile|НачатьПеремещениеФайла|BeginMovingFile|НачатьУдалениеФайлов|BeginDeletingFiles|НачатьПолучениеФайлов|BeginGettingFiles|НачатьПомещениеФайлов|BeginPuttingFiles|НачатьСозданиеДвоичныхДанныхИзФайла|BeginCreateBinaryDataFromFile)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с информационной базой",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(НачатьТранзакцию|BeginTransaction|ЗафиксироватьТранзакцию|CommitTransaction|ОтменитьТранзакцию|RollbackTransaction|УстановитьМонопольныйРежим|SetExclusiveMode|МонопольныйРежим|ExclusiveMode|ПолучитьОперативнуюОтметкуВремени|GetRealTimeTimestamp|ПолучитьСоединенияИнформационнойБазы|GetInfoBaseConnections|НомерСоединенияИнформационнойБазы|InfoBaseConnectionNumber|КонфигурацияИзменена|ConfigurationChanged|КонфигурацияБазыДанныхИзмененаДинамически|DataBaseConfigurationChangedDynamically|УстановитьВремяОжиданияБлокировкиДанных|SetLockWaitTime|ОбновитьНумерациюОбъектов|RefreshObjectsNumbering|ПолучитьВремяОжиданияБлокировкиДанных|GetLockWaitTime|КодЛокализацииИнформационнойБазы|InfoBaseLocaleCode|УстановитьМинимальнуюДлинуПаролейПользователей|SetUserPasswordMinLength|ПолучитьМинимальнуюДлинуПаролейПользователей|GetUserPasswordMinLength|ИнициализироватьПредопределенныеДанные|InitializePredefinedData|УдалитьДанныеИнформационнойБазы|EraseInfoBaseData|УстановитьПроверкуСложностиПаролейПользователей|SetUserPasswordStrengthCheck|ПолучитьПроверкуСложностиПаролейПользователей|GetUserPasswordStrengthCheck|ПолучитьСтруктуруХраненияБазыДанных|GetDBStorageStructureInfo|УстановитьПривилегированныйРежим|SetPrivilegedMode|ПривилегированныйРежим|PrivilegedMode|ТранзакцияАктивна|TransactionActive|НеобходимостьЗавершенияСоединения|ConnectionStopRequest|НомерСеансаИнформационнойБазы|InfoBaseSessionNumber|ПолучитьСеансыИнформационнойБазы|GetInfoBaseSessions|ЗаблокироватьДанныеДляРедактирования|LockDataForEdit|УстановитьСоединениеСВнешнимИсточникомДанных|ConnectExternalDataSource|РазблокироватьДанныеДляРедактирования|UnlockDataForEdit|РазорватьСоединениеСВнешнимИсточникомДанных|DisconnectExternalDataSource|ПолучитьБлокировкуСеансов|GetSessionsLock|УстановитьБлокировкуСеансов|SetSessionsLock|ОбновитьПовторноИспользуемыеЗначения|RefreshReusableValues|УстановитьБезопасныйРежим|SetSafeMode|БезопасныйРежим|SafeMode|ПолучитьДанныеВыбора|GetChoiceData|УстановитьЧасовойПоясИнформационнойБазы|SetInfoBaseTimeZone|ПолучитьЧасовойПоясИнформационнойБазы|GetInfoBaseTimeZone|ПолучитьОбновлениеКонфигурацииБазыДанных|GetDataBaseConfigurationUpdate|УстановитьБезопасныйРежимРазделенияДанных|SetDataSeparationSafeMode|БезопасныйРежимРазделенияДанных|DataSeparationSafeMode|УстановитьВремяЗасыпанияПассивногоСеанса|SetPassiveSessionHibernateTime|ПолучитьВремяЗасыпанияПассивногоСеанса|GetPassiveSessionHibernateTime|УстановитьВремяЗавершенияСпящегоСеанса|SetHibernateSessionTerminateTime|ПолучитьВремяЗавершенияСпящегоСеанса|GetHibernateSessionTerminateTime|ПолучитьТекущийСеансИнформационнойБазы|GetCurrentInfoBaseSession|ПолучитьИдентификаторКонфигурации|GetConfigurationID|УстановитьНастройкиКлиентаЛицензирования|SetLicensingClientParameters|ПолучитьИмяКлиентаЛицензирования|GetLicensingClientName|ПолучитьДополнительныйПараметрКлиентаЛицензирования|GetLicensingClientAdditionalParameter|ПолучитьОтключениеБезопасногоРежима|GetSafeModeDisabled|УстановитьОтключениеБезопасногоРежима|SetSafeModeDisabled)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(НачатьТранзакцию|BeginTransaction|ЗафиксироватьТранзакцию|CommitTransaction|ОтменитьТранзакцию|RollbackTransaction|УстановитьМонопольныйРежим|SetExclusiveMode|МонопольныйРежим|ExclusiveMode|ПолучитьОперативнуюОтметкуВремени|GetRealTimeTimestamp|ПолучитьСоединенияИнформационнойБазы|GetInfoBaseConnections|НомерСоединенияИнформационнойБазы|InfoBaseConnectionNumber|КонфигурацияИзменена|ConfigurationChanged|КонфигурацияБазыДанныхИзмененаДинамически|DataBaseConfigurationChangedDynamically|УстановитьВремяОжиданияБлокировкиДанных|SetLockWaitTime|ОбновитьНумерациюОбъектов|RefreshObjectsNumbering|ПолучитьВремяОжиданияБлокировкиДанных|GetLockWaitTime|КодЛокализацииИнформационнойБазы|InfoBaseLocaleCode|УстановитьМинимальнуюДлинуПаролейПользователей|SetUserPasswordMinLength|ПолучитьМинимальнуюДлинуПаролейПользователей|GetUserPasswordMinLength|ИнициализироватьПредопределенныеДанные|InitializePredefinedData|УдалитьДанныеИнформационнойБазы|EraseInfoBaseData|УстановитьПроверкуСложностиПаролейПользователей|SetUserPasswordStrengthCheck|ПолучитьПроверкуСложностиПаролейПользователей|GetUserPasswordStrengthCheck|ПолучитьСтруктуруХраненияБазыДанных|GetDBStorageStructureInfo|УстановитьПривилегированныйРежим|SetPrivilegedMode|ПривилегированныйРежим|PrivilegedMode|ТранзакцияАктивна|TransactionActive|НеобходимостьЗавершенияСоединения|ConnectionStopRequest|НомерСеансаИнформационнойБазы|InfoBaseSessionNumber|ПолучитьСеансыИнформационнойБазы|GetInfoBaseSessions|ЗаблокироватьДанныеДляРедактирования|LockDataForEdit|УстановитьСоединениеСВнешнимИсточникомДанных|ConnectExternalDataSource|РазблокироватьДанныеДляРедактирования|UnlockDataForEdit|РазорватьСоединениеСВнешнимИсточникомДанных|DisconnectExternalDataSource|ПолучитьБлокировкуСеансов|GetSessionsLock|УстановитьБлокировкуСеансов|SetSessionsLock|ОбновитьПовторноИспользуемыеЗначения|RefreshReusableValues|УстановитьБезопасныйРежим|SetSafeMode|БезопасныйРежим|SafeMode|ПолучитьДанныеВыбора|GetChoiceData|УстановитьЧасовойПоясИнформационнойБазы|SetInfoBaseTimeZone|ПолучитьЧасовойПоясИнформационнойБазы|GetInfoBaseTimeZone|ПолучитьОбновлениеКонфигурацииБазыДанных|GetDataBaseConfigurationUpdate|УстановитьБезопасныйРежимРазделенияДанных|SetDataSeparationSafeMode|БезопасныйРежимРазделенияДанных|DataSeparationSafeMode|УстановитьВремяЗасыпанияПассивногоСеанса|SetPassiveSessionHibernateTime|ПолучитьВремяЗасыпанияПассивногоСеанса|GetPassiveSessionHibernateTime|УстановитьВремяЗавершенияСпящегоСеанса|SetHibernateSessionTerminateTime|ПолучитьВремяЗавершенияСпящегоСеанса|GetHibernateSessionTerminateTime|ПолучитьТекущийСеансИнформационнойБазы|GetCurrentInfoBaseSession|ПолучитьИдентификаторКонфигурации|GetConfigurationID|УстановитьНастройкиКлиентаЛицензирования|SetLicensingClientParameters|ПолучитьИмяКлиентаЛицензирования|GetLicensingClientName|ПолучитьДополнительныйПараметрКлиентаЛицензирования|GetLicensingClientAdditionalParameter|ПолучитьОтключениеБезопасногоРежима|GetSafeModeDisabled|УстановитьОтключениеБезопасногоРежима|SetSafeModeDisabled)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с данными информационной базы",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(НайтиПомеченныеНаУдаление|FindMarkedForDeletion|НайтиПоСсылкам|FindByRef|УдалитьОбъекты|DeleteObjects|УстановитьОбновлениеПредопределенныхДанныхИнформационнойБазы|SetInfoBasePredefinedDataUpdate|ПолучитьОбновлениеПредопределенныхДанныхИнформационнойБазы|GetInfoBasePredefinedData)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(НайтиПомеченныеНаУдаление|FindMarkedForDeletion|НайтиПоСсылкам|FindByRef|УдалитьОбъекты|DeleteObjects|УстановитьОбновлениеПредопределенныхДанныхИнформационнойБазы|SetInfoBasePredefinedDataUpdate|ПолучитьОбновлениеПредопределенныхДанныхИнформационнойБазы|GetInfoBasePredefinedData)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с XML",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(XMLСтрока|XMLString|XMLЗначение|XMLValue|XMLТип|XMLType|XMLТипЗнч|XMLTypeOf|ИзXMLТипа|FromXMLType|ВозможностьЧтенияXML|CanReadXML|ПолучитьXMLТип|GetXMLType|ПрочитатьXML|ReadXML|ЗаписатьXML|WriteXML|НайтиНедопустимыеСимволыXML|FindDisallowedXMLCharacters|ИмпортМоделиXDTO|ImportXDTOModel|СоздатьФабрикуXDTO|CreateXDTOFactory)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(XMLСтрока|XMLString|XMLЗначение|XMLValue|XMLТип|XMLType|XMLТипЗнч|XMLTypeOf|ИзXMLТипа|FromXMLType|ВозможностьЧтенияXML|CanReadXML|ПолучитьXMLТип|GetXMLType|ПрочитатьXML|ReadXML|ЗаписатьXML|WriteXML|НайтиНедопустимыеСимволыXML|FindDisallowedXMLCharacters|ИмпортМоделиXDTO|ImportXDTOModel|СоздатьФабрикуXDTO|CreateXDTOFactory)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с JSON",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ЗаписатьJSON|WriteJSON|ПрочитатьJSON|ReadJSON|ПрочитатьДатуJSON|ReadJSONDate|ЗаписатьДатуJSON|WriteJSONDate)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ЗаписатьJSON|WriteJSON|ПрочитатьJSON|ReadJSON|ПрочитатьДатуJSON|ReadJSONDate|ЗаписатьДатуJSON|WriteJSONDate)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с журналом регистрации",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ЗаписьЖурналаРегистрации|WriteLogEvent|ПолучитьИспользованиеЖурналаРегистрации|GetEventLogUsing|УстановитьИспользованиеЖурналаРегистрации|SetEventLogUsing|ПредставлениеСобытияЖурналаРегистрации|EventLogEventPresentation|ВыгрузитьЖурналРегистрации|UnloadEventLog|ПолучитьЗначенияОтбораЖурналаРегистрации|GetEventLogFilterValues|УстановитьИспользованиеСобытияЖурналаРегистрации|SetEventLogEventUse|ПолучитьИспользованиеСобытияЖурналаРегистрации|GetEventLogEventUse|СкопироватьЖурналРегистрации|CopyEventLog|ОчиститьЖурналРегистрации|ClearEventLog)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ЗаписьЖурналаРегистрации|WriteLogEvent|ПолучитьИспользованиеЖурналаРегистрации|GetEventLogUsing|УстановитьИспользованиеЖурналаРегистрации|SetEventLogUsing|ПредставлениеСобытияЖурналаРегистрации|EventLogEventPresentation|ВыгрузитьЖурналРегистрации|UnloadEventLog|ПолучитьЗначенияОтбораЖурналаРегистрации|GetEventLogFilterValues|УстановитьИспользованиеСобытияЖурналаРегистрации|SetEventLogEventUse|ПолучитьИспользованиеСобытияЖурналаРегистрации|GetEventLogEventUse|СкопироватьЖурналРегистрации|CopyEventLog|ОчиститьЖурналРегистрации|ClearEventLog)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с универсальными объектами",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ЗначениеВДанныеФормы|ValueToFormData|ДанныеФормыВЗначение|FormDataToValue|КопироватьДанныеФормы|CopyFormData|УстановитьСоответствиеОбъектаИФормы|SetObjectAndFormConformity|ПолучитьСоответствиеОбъектаИФормы|GetObjectAndFormConformity)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ЗначениеВДанныеФормы|ValueToFormData|ДанныеФормыВЗначение|FormDataToValue|КопироватьДанныеФормы|CopyFormData|УстановитьСоответствиеОбъектаИФормы|SetObjectAndFormConformity|ПолучитьСоответствиеОбъектаИФормы|GetObjectAndFormConformity)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с функциональными опциями",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ПолучитьФункциональнуюОпцию|GetFunctionalOption|ПолучитьФункциональнуюОпциюИнтерфейса|GetInterfaceFunctionalOption|УстановитьПараметрыФункциональныхОпцийИнтерфейса|SetInterfaceFunctionalOptionParameters|ПолучитьПараметрыФункциональныхОпцийИнтерфейса|GetInterfaceFunctionalOptionParameters|ОбновитьИнтерфейс|RefreshInterface)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ПолучитьФункциональнуюОпцию|GetFunctionalOption|ПолучитьФункциональнуюОпциюИнтерфейса|GetInterfaceFunctionalOption|УстановитьПараметрыФункциональныхОпцийИнтерфейса|SetInterfaceFunctionalOptionParameters|ПолучитьПараметрыФункциональныхОпцийИнтерфейса|GetInterfaceFunctionalOptionParameters|ОбновитьИнтерфейс|RefreshInterface)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с криптографией",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(УстановитьРасширениеРаботыСКриптографией|InstallCryptoExtension|НачатьУстановкуРасширенияРаботыСКриптографией|BeginInstallCryptoExtension|ПодключитьРасширениеРаботыСКриптографией|AttachCryptoExtension|НачатьПодключениеРасширенияРаботыСКриптографией|BeginAttachingCryptoExtension)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(УстановитьРасширениеРаботыСКриптографией|InstallCryptoExtension|НачатьУстановкуРасширенияРаботыСКриптографией|BeginInstallCryptoExtension|ПодключитьРасширениеРаботыСКриптографией|AttachCryptoExtension|НачатьПодключениеРасширенияРаботыСКриптографией|BeginAttachingCryptoExtension)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы со стандартным интерфейсом OData",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(УстановитьСоставСтандартногоИнтерфейсаOData|SetStandardODataInterfaceContent|ПолучитьСоставСтандартногоИнтерфейсаOData|GetStandardODataInterfaceContent)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(УстановитьСоставСтандартногоИнтерфейсаOData|SetStandardODataInterfaceContent|ПолучитьСоставСтандартногоИнтерфейсаOData|GetStandardODataInterfaceContent)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Процедуры и функции работы с двоичными данными",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(СоединитьБуферыДвоичныхДанных|ConcatBinaryDataBuffers)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(СоединитьБуферыДвоичныхДанных|ConcatBinaryDataBuffers)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Прочие процедуры и функции",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(Мин|Min|Макс|Max|ОписаниеОшибки|ErrorDescription|Вычислить|Eval|ИнформацияОбОшибке|ErrorInfo|Base64Значение|Base64Value|Base64Строка|Base64String|ЗаполнитьЗначенияСвойств|FillPropertyValues|ЗначениеЗаполнено|ValueIsFilled|ПолучитьПредставленияНавигационныхСсылок|GetURLsPresentations|НайтиОкноПоНавигационнойСсылке|FindWindowByURL|ПолучитьОкна|GetWindows|ПерейтиПоНавигационнойСсылке|GotoURL|ПолучитьНавигационнуюСсылку|GetURL|ПолучитьДопустимыеКодыЛокализации|GetAvailableLocaleCodes|ПолучитьНавигационнуюСсылкуИнформационнойБазы|GetInfoBaseURL|ПредставлениеКодаЛокализации|LocaleCodePresentation|ПолучитьДопустимыеЧасовыеПояса|GetAvailableTimeZones|ПредставлениеЧасовогоПояса|TimeZonePresentation|ТекущаяУниверсальнаяДата|CurrentUniversalDate|ТекущаяУниверсальнаяДатаВМиллисекундах|CurrentUniversalDateInMilliseconds|МестноеВремя|ToLocalTime|УниверсальноеВремя|ToUniversalTime|ЧасовойПояс|TimeZone|СмещениеЛетнегоВремени|DaylightTimeOffset|СмещениеСтандартногоВремени|StandardTimeOffset|КодироватьСтроку|EncodeString|РаскодироватьСтроку|DecodeString|Найти|Find|ПродолжитьВызов|ProceedWithCall)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(Мин|Min|Макс|Max|ОписаниеОшибки|ErrorDescription|Вычислить|Eval|ИнформацияОбОшибке|ErrorInfo|Base64Значение|Base64Value|Base64Строка|Base64String|ЗаполнитьЗначенияСвойств|FillPropertyValues|ЗначениеЗаполнено|ValueIsFilled|ПолучитьПредставленияНавигационныхСсылок|GetURLsPresentations|НайтиОкноПоНавигационнойСсылке|FindWindowByURL|ПолучитьОкна|GetWindows|ПерейтиПоНавигационнойСсылке|GotoURL|ПолучитьНавигационнуюСсылку|GetURL|ПолучитьДопустимыеКодыЛокализации|GetAvailableLocaleCodes|ПолучитьНавигационнуюСсылкуИнформационнойБазы|GetInfoBaseURL|ПредставлениеКодаЛокализации|LocaleCodePresentation|ПолучитьДопустимыеЧасовыеПояса|GetAvailableTimeZones|ПредставлениеЧасовогоПояса|TimeZonePresentation|ТекущаяУниверсальнаяДата|CurrentUniversalDate|ТекущаяУниверсальнаяДатаВМиллисекундах|CurrentUniversalDateInMilliseconds|МестноеВремя|ToLocalTime|УниверсальноеВремя|ToUniversalTime|ЧасовойПояс|TimeZone|СмещениеЛетнегоВремени|DaylightTimeOffset|СмещениеСтандартногоВремени|StandardTimeOffset|КодироватьСтроку|EncodeString|РаскодироватьСтроку|DecodeString|Найти|Find|ПродолжитьВызов|ProceedWithCall)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - События приложения и сеанса",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ПередНачаломРаботыСистемы|BeforeStart|ПриНачалеРаботыСистемы|OnStart|ПередЗавершениемРаботыСистемы|BeforeExit|ПриЗавершенииРаботыСистемы|OnExit|ОбработкаВнешнегоСобытия|ExternEventProcessing|УстановкаПараметровСеанса|SessionParametersSetting|ПриИзмененииПараметровЭкрана|OnChangeDisplaySettings)\\s*(?=\\())",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ПередНачаломРаботыСистемы|BeforeStart|ПриНачалеРаботыСистемы|OnStart|ПередЗавершениемРаботыСистемы|BeforeExit|ПриЗавершенииРаботыСистемы|OnExit|ОбработкаВнешнегоСобытия|ExternEventProcessing|УстановкаПараметровСеанса|SessionParametersSetting|ПриИзмененииПараметровЭкрана|OnChangeDisplaySettings)\\s*(?=\\())",
           "name": "support.function.bsl"
         },
         {
-          "comment": "Глобальный контекст - Свойства (классы)",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(WSСсылки|WSReferences|БиблиотекаКартинок|PictureLib|БиблиотекаМакетовОформленияКомпоновкиДанных|DataCompositionAppearanceTemplateLib|БиблиотекаСтилей|StyleLib|БизнесПроцессы|BusinessProcesses|ВнешниеИсточникиДанных|ExternalDataSources|ВнешниеОбработки|ExternalDataProcessors|ВнешниеОтчеты|ExternalReports|Документы|Documents|ДоставляемыеУведомления|DeliverableNotifications|ЖурналыДокументов|DocumentJournals|Задачи|Tasks|ИнформацияОбИнтернетСоединении|InternetConnectionInformation|ИспользованиеРабочейДаты|WorkingDateUse|ИсторияРаботыПользователя|UserWorkHistory|Константы|Constants|КритерииОтбора|FilterCriteria|Метаданные|Metadata|Обработки|DataProcessors|ОтправкаДоставляемыхУведомлений|DeliverableNotificationSend|Отчеты|Reports|ПараметрыСеанса|SessionParameters|Перечисления|Enums|ПланыВидовРасчета|ChartsOfCalculationTypes|ПланыВидовХарактеристик|ChartsOfCharacteristicTypes|ПланыОбмена|ExchangePlans|ПланыСчетов|ChartsOfAccounts|ПолнотекстовыйПоиск|FullTextSearch|ПользователиИнформационнойБазы|InfoBaseUsers|Последовательности|Sequences|РасширенияКонфигурации|ConfigurationExtensions|РегистрыБухгалтерии|AccountingRegisters|РегистрыНакопления|AccumulationRegisters|РегистрыРасчета|CalculationRegisters|РегистрыСведений|InformationRegisters|РегламентныеЗадания|ScheduledJobs|СериализаторXDTO|XDTOSerializer|Справочники|Catalogs|СредстваГеопозиционирования|LocationTools|СредстваКриптографии|CryptoToolsManager|СредстваМультимедиа|MultimediaTools|СредстваОтображенияРекламы|AdvertisingPresentationTools|СредстваПочты|MailTools|СредстваТелефонии|TelephonyTools|ФабрикаXDTO|XDTOFactory|ФайловыеПотоки|FileStreams|ФоновыеЗадания|BackgroundJobs|ХранилищаНастроек|SettingsStorages|ВстроенныеПокупки|InAppPurchases|ОтображениеРекламы|AdRepresentation|ПанельЗадачОС|OSTaskbar|ПроверкаВстроенныхПокупок|InAppPurchasesValidation)(?=[^\\wа-яё]|$))",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(WSСсылки|WSReferences|БиблиотекаКартинок|PictureLib|БиблиотекаМакетовОформленияКомпоновкиДанных|DataCompositionAppearanceTemplateLib|БиблиотекаСтилей|StyleLib|БизнесПроцессы|BusinessProcesses|ВнешниеИсточникиДанных|ExternalDataSources|ВнешниеОбработки|ExternalDataProcessors|ВнешниеОтчеты|ExternalReports|Документы|Documents|ДоставляемыеУведомления|DeliverableNotifications|ЖурналыДокументов|DocumentJournals|Задачи|Tasks|ИнформацияОбИнтернетСоединении|InternetConnectionInformation|ИспользованиеРабочейДаты|WorkingDateUse|ИсторияРаботыПользователя|UserWorkHistory|Константы|Constants|КритерииОтбора|FilterCriteria|Метаданные|Metadata|Обработки|DataProcessors|ОтправкаДоставляемыхУведомлений|DeliverableNotificationSend|Отчеты|Reports|ПараметрыСеанса|SessionParameters|Перечисления|Enums|ПланыВидовРасчета|ChartsOfCalculationTypes|ПланыВидовХарактеристик|ChartsOfCharacteristicTypes|ПланыОбмена|ExchangePlans|ПланыСчетов|ChartsOfAccounts|ПолнотекстовыйПоиск|FullTextSearch|ПользователиИнформационнойБазы|InfoBaseUsers|Последовательности|Sequences|РасширенияКонфигурации|ConfigurationExtensions|РегистрыБухгалтерии|AccountingRegisters|РегистрыНакопления|AccumulationRegisters|РегистрыРасчета|CalculationRegisters|РегистрыСведений|InformationRegisters|РегламентныеЗадания|ScheduledJobs|СериализаторXDTO|XDTOSerializer|Справочники|Catalogs|СредстваГеопозиционирования|LocationTools|СредстваКриптографии|CryptoToolsManager|СредстваМультимедиа|MultimediaTools|СредстваОтображенияРекламы|AdvertisingPresentationTools|СредстваПочты|MailTools|СредстваТелефонии|TelephonyTools|ФабрикаXDTO|XDTOFactory|ФайловыеПотоки|FileStreams|ФоновыеЗадания|BackgroundJobs|ХранилищаНастроек|SettingsStorages|ВстроенныеПокупки|InAppPurchases|ОтображениеРекламы|AdRepresentation|ПанельЗадачОС|OSTaskbar|ПроверкаВстроенныхПокупок|InAppPurchasesValidation)(?=[^\\wа-яё]|$))",
           "name": "support.class.bsl"
         },
         {
-          "comment": "Глобальный контекст - Свойства (переменные)",
-          "match": "(?i:(?<=[^\\wа-яё\\.]|^)(ГлавныйИнтерфейс|MainInterface|ГлавныйСтиль|MainStyle|ПараметрЗапуска|LaunchParameter|РабочаяДата|WorkingDate|ХранилищеВариантовОтчетов|ReportsVariantsStorage|ХранилищеНастроекДанныхФорм|FormDataSettingsStorage|ХранилищеОбщихНастроек|CommonSettingsStorage|ХранилищеПользовательскихНастроекДинамическихСписков|DynamicListsUserSettingsStorage|ХранилищеПользовательскихНастроекОтчетов|ReportsUserSettingsStorage|ХранилищеСистемныхНастроек|SystemSettingsStorage)(?=[^\\wа-яё]|$))",
+          "match": "(?i:(?<=[^\\wа-яё.]|^)(ГлавныйИнтерфейс|MainInterface|ГлавныйСтиль|MainStyle|ПараметрЗапуска|LaunchParameter|РабочаяДата|WorkingDate|ХранилищеВариантовОтчетов|ReportsVariantsStorage|ХранилищеНастроекДанныхФорм|FormDataSettingsStorage|ХранилищеОбщихНастроек|CommonSettingsStorage|ХранилищеПользовательскихНастроекДинамическихСписков|DynamicListsUserSettingsStorage|ХранилищеПользовательскихНастроекОтчетов|ReportsUserSettingsStorage|ХранилищеСистемныхНастроек|SystemSettingsStorage)(?=[^\\wа-яё]|$))",
           "name": "support.variable.bsl"
         }
       ]
     },
     "query": {
-      "begin": "(?i)(?<=[^\\wа-яё\\.]|^)(Выбрать|Select(\\s+Разрешенные|\\s+Allowed)?(\\s+Различные|\\s+Distinct)?(\\s+Первые|\\s+Top)?)(?=[^\\wа-яё\\.]|$)",
+      "begin": "(?i)(?<=[^\\wа-яё.]|^)(Выбрать|Select(\\s+Разрешенные|\\s+Allowed)?(\\s+Различные|\\s+Distinct)?(\\s+Первые|\\s+Top)?)(?=[^\\wа-яё.]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.sdbl"
         }
       },
-      "end": "(?=\\\"[^\\\"])",
+      "end": "(?=\"[^\"])",
       "patterns": [
         {
           "begin": "^\\s*//",
@@ -500,11 +459,11 @@
           "name": "comment.line.double-slash.bsl"
         },
         {
-          "match": "(//((\\\"\\\")|[^\\\"])*)",
+          "match": "(//((\"\")|[^\"])*)",
           "name": "comment.line.double-slash.sdbl"
         },
         {
-          "match": "\\\"\\\"[^\"]*\\\"\\\"",
+          "match": "\"\"[^\"]*\"\"",
           "name": "string.quoted.double.sdbl"
         },
         {
diff --git a/resources/languages/c.json b/resources/languages/c.json
index 9b20a99..ef3ae3f 100644
--- a/resources/languages/c.json
+++ b/resources/languages/c.json
@@ -119,7 +119,7 @@
   ],
   "repository": {
     "access-method": {
-      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))\\s*(?:(\\.)|(->))((?:[a-zA-Z_][a-zA-Z_0-9]*\\s*(?:\\.|->))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
       "beginCaptures": {
         "1": {
           "name": "variable.object.c"
@@ -227,11 +227,11 @@
       "name": "support.type.sys-types.c"
     },
     "anon_pattern_9": {
-      "match": "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b",
+      "match": "\\b(pthread_(?:attr_t|cond_t|condattr_t|mutex_t|mutexattr_t|once_t|rwlock_t|rwlockattr_t|t|key_t))\\b",
       "name": "support.type.pthread.c"
     },
     "anon_pattern_range_1": {
-      "begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((#)\\s*define\\b)\\s+((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?:(\\()([^()\\\\]+)(\\)))?",
+      "begin": "((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((#)\\s*define\\b)\\s+((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?:(\\()([^()\\\\]+)(\\)))?",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -252,7 +252,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -371,7 +371,7 @@
       ]
     },
     "anon_pattern_range_3": {
-      "begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
+      "begin": "^\\s*((#)\\s*(i(?:nclude(?:_next)?|mport)))\\b\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.$3.c"
@@ -380,7 +380,7 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.include.c",
       "patterns": [
         {
@@ -428,7 +428,7 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.c",
       "patterns": [
         {
@@ -443,7 +443,7 @@
       ]
     },
     "anon_pattern_range_5": {
-      "begin": "^\\s*(?:((#)\\s*undef))\\b",
+      "begin": "^\\s*((#)\\s*undef)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.undef.c"
@@ -452,7 +452,7 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.c",
       "patterns": [
         {
@@ -465,7 +465,7 @@
       ]
     },
     "anon_pattern_range_6": {
-      "begin": "^\\s*(?:((#)\\s*pragma))\\b",
+      "begin": "^\\s*((#)\\s*pragma)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.pragma.c"
@@ -474,7 +474,7 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.pragma.c",
       "patterns": [
         {
@@ -503,7 +503,7 @@
       ]
     },
     "anon_pattern_range_8": {
-      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
+      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!])",
       "beginCaptures": {
         "1": {
           "name": "variable.object.c"
@@ -512,7 +512,7 @@
           "name": "punctuation.definition.begin.bracket.square.c"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.end.bracket.square.c"
@@ -526,23 +526,23 @@
       ]
     },
     "anon_pattern_range_9": {
-      "match": "\\[\\s*\\]",
+      "match": "\\[\\s*]",
       "name": "storage.modifier.array.bracket.square.c"
     },
     "backslash_escapes": {
-      "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3][0-7]{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+      "match": "\\\\([\\\\abefnprtv'\"?]|[0-3][0-7]{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
       "name": "constant.character.escape.c"
     },
     "block": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.c"
             }
           },
-          "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+          "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.c"
@@ -560,13 +560,13 @@
     "block_comment": {
       "patterns": [
         {
-          "begin": "\\s*+(\\/\\*)",
+          "begin": "\\s*+(/\\*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.begin.c"
             }
           },
-          "end": "\\*\\/",
+          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.c"
@@ -575,13 +575,13 @@
           "name": "comment.block.c"
         },
         {
-          "begin": "\\s*+(\\/\\*)",
+          "begin": "\\s*+(/\\*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.begin.c"
             }
           },
-          "end": "\\*\\/",
+          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.c"
@@ -612,7 +612,7 @@
           "include": "#c_function_call"
         },
         {
-          "begin": "(?:(?:(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)))((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+          "begin": "(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.other.c"
@@ -635,13 +635,13 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.c"
             }
           },
-          "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+          "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.c"
@@ -672,7 +672,7 @@
       ]
     },
     "c_function_call": {
-      "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+      "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
       "end": "(?<=\\))(?!\\w)",
       "name": "meta.function-call.c",
       "patterns": [
@@ -682,7 +682,7 @@
       ]
     },
     "case_statement": {
-      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)case(?!\\w))",
+      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)case(?!\\w))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -700,7 +700,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -736,7 +736,7 @@
             {
               "patterns": [
                 {
-                  "begin": "(?:^)(?>\\s*)(\\/\\/[!\\/]+)",
+                  "begin": "^(?>\\s*)(//[!/]+)",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.documentation.c"
@@ -749,7 +749,7 @@
                       "include": "#line_continuation_character"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -761,7 +761,7 @@
                           "name": "markup.italic.doxygen.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
                     },
                     {
                       "captures": {
@@ -772,7 +772,7 @@
                           "name": "markup.bold.doxygen.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
                     },
                     {
                       "captures": {
@@ -783,14 +783,14 @@
                           "name": "markup.inline.raw.string.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -810,14 +810,14 @@
                           "name": "variable.parameter.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)"
+                      "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)])?\\s+(\\b\\w+\\b)"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -834,7 +834,7 @@
                     "2": {
                       "patterns": [
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
@@ -846,7 +846,7 @@
                               "name": "markup.italic.doxygen.c"
                             }
                           },
-                          "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+                          "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
                         },
                         {
                           "captures": {
@@ -857,7 +857,7 @@
                               "name": "markup.bold.doxygen.c"
                             }
                           },
-                          "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+                          "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
                         },
                         {
                           "captures": {
@@ -868,14 +868,14 @@
                               "name": "markup.inline.raw.string.c"
                             }
                           },
-                          "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+                          "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
                         },
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
@@ -895,14 +895,14 @@
                               "name": "variable.parameter.c"
                             }
                           },
-                          "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)"
+                          "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)])?\\s+(\\b\\w+\\b)"
                         },
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
@@ -915,17 +915,17 @@
                       "name": "punctuation.definition.comment.end.documentation.c"
                     }
                   },
-                  "match": "(\\/\\*[!*]+(?=\\s))(.+)([!*]*\\*\\/)",
+                  "match": "(/\\*[!*]+(?=\\s))(.+)([!*]*\\*/)",
                   "name": "comment.block.documentation.c"
                 },
                 {
-                  "begin": "((?>\\s*)\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))",
+                  "begin": "((?>\\s*)/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.begin.documentation.c"
                     }
                   },
-                  "end": "([!*]*\\*\\/)",
+                  "end": "([!*]*\\*/)",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.end.documentation.c"
@@ -934,7 +934,7 @@
                   "name": "comment.block.documentation.c",
                   "patterns": [
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -946,7 +946,7 @@
                           "name": "markup.italic.doxygen.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
                     },
                     {
                       "captures": {
@@ -957,7 +957,7 @@
                           "name": "markup.bold.doxygen.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
                     },
                     {
                       "captures": {
@@ -968,14 +968,14 @@
                           "name": "markup.inline.raw.string.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -995,14 +995,14 @@
                           "name": "variable.parameter.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)"
+                      "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)])?\\s+(\\b\\w+\\b)"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -1017,17 +1017,17 @@
                       "name": "meta.toc-list.banner.block.c"
                     }
                   },
-                  "match": "^\\/\\* =(\\s*.*?)\\s*= \\*\\/$\\n?",
+                  "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
                   "name": "comment.block.banner.c"
                 },
                 {
-                  "begin": "(\\/\\*)",
+                  "begin": "(/\\*)",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.begin.c"
                     }
                   },
-                  "end": "(\\*\\/)",
+                  "end": "(\\*/)",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.end.c"
@@ -1041,11 +1041,11 @@
                       "name": "meta.toc-list.banner.line.c"
                     }
                   },
-                  "match": "^\\/\\/ =(\\s*.*?)\\s*=$\\n?",
+                  "match": "^// =(\\s*.*?)\\s*=$\\n?",
                   "name": "comment.line.banner.c"
                 },
                 {
-                  "begin": "((?:^[ \\t]+)?)(?=\\/\\/)",
+                  "begin": "((?:^[ \\t]+)?)(?=//)",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.whitespace.comment.leading.c"
@@ -1054,7 +1054,7 @@
                   "end": "(?!\\G)",
                   "patterns": [
                     {
-                      "begin": "(\\/\\/)",
+                      "begin": "(//)",
                       "beginCaptures": {
                         "1": {
                           "name": "punctuation.definition.comment.c"
@@ -1089,7 +1089,7 @@
       ]
     },
     "default_statement": {
-      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)default(?!\\w))",
+      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)default(?!\\w))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1107,7 +1107,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -1176,7 +1176,7 @@
           "include": "#operators"
         },
         {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.c"
@@ -1236,7 +1236,7 @@
           "include": "#vararg_ellipses"
         },
         {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.c"
@@ -1300,7 +1300,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "\\*\\/",
+                      "match": "\\*/",
                       "name": "comment.block.c punctuation.definition.comment.end.c"
                     },
                     {
@@ -1310,7 +1310,7 @@
                   ]
                 }
               },
-              "match": "(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/))"
+              "match": "(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/))"
             },
             {
               "captures": {
@@ -1323,7 +1323,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "\\*\\/",
+                      "match": "\\*/",
                       "name": "comment.block.c punctuation.definition.comment.end.c"
                     },
                     {
@@ -1333,7 +1333,7 @@
                   ]
                 }
               },
-              "match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))"
+              "match": "(/\\*)((?:[^*]|\\*++[^/])*+(\\*++/))"
             }
           ]
         },
@@ -1348,7 +1348,7 @@
             "3": {
               "patterns": [
                 {
-                  "match": "\\*\\/",
+                  "match": "\\*/",
                   "name": "comment.block.c punctuation.definition.comment.end.c"
                 },
                 {
@@ -1358,14 +1358,14 @@
               ]
             }
           },
-          "match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))"
+          "match": "(/\\*)((?:[^*]|\\*++[^/])*+(\\*++/))"
         }
       ]
     },
     "line_comment": {
       "patterns": [
         {
-          "begin": "\\s*+(\\/\\/)",
+          "begin": "\\s*+(//)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.c"
@@ -1382,7 +1382,7 @@
           ]
         },
         {
-          "begin": "\\s*+(\\/\\/)",
+          "begin": "\\s*+(//)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.c"
@@ -1443,7 +1443,7 @@
                   "name": "punctuation.separator.pointer-access.c"
                 }
               },
-              "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             }
           ]
         },
@@ -1451,10 +1451,10 @@
           "name": "variable.other.member.c"
         }
       },
-      "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!(?:atomic_uint_least64_t|atomic_uint_least16_t|atomic_uint_least32_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_fast64_t|atomic_uint_fast32_t|atomic_int_least64_t|atomic_int_least32_t|pthread_rwlockattr_t|atomic_uint_fast16_t|pthread_mutexattr_t|atomic_int_fast16_t|atomic_uint_fast8_t|atomic_int_fast64_t|atomic_int_least8_t|atomic_int_fast32_t|atomic_int_fast8_t|pthread_condattr_t|atomic_uintptr_t|atomic_ptrdiff_t|pthread_rwlock_t|atomic_uintmax_t|pthread_mutex_t|atomic_intmax_t|atomic_intptr_t|atomic_char32_t|atomic_char16_t|pthread_attr_t|atomic_wchar_t|uint_least64_t|uint_least32_t|uint_least16_t|pthread_cond_t|pthread_once_t|uint_fast64_t|uint_fast16_t|atomic_size_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|pthread_key_t|atomic_ullong|atomic_ushort|uint_fast32_t|atomic_schar|atomic_short|uint_fast8_t|int_fast64_t|int_fast32_t|int_fast16_t|atomic_ulong|atomic_llong|int_least8_t|atomic_uchar|memory_order|suseconds_t|int_fast8_t|atomic_bool|atomic_char|atomic_uint|atomic_long|atomic_int|useconds_t|_Imaginary|blksize_t|pthread_t|in_addr_t|uintptr_t|in_port_t|uintmax_t|uintmax_t|blkcnt_t|uint16_t|unsigned|_Complex|uint32_t|intptr_t|intmax_t|intmax_t|uint64_t|u_quad_t|int64_t|int32_t|ssize_t|caddr_t|clock_t|uint8_t|u_short|swblk_t|segsz_t|int16_t|fixpt_t|daddr_t|nlink_t|qaddr_t|size_t|time_t|mode_t|signed|quad_t|ushort|u_long|u_char|double|int8_t|ino_t|uid_t|pid_t|_Bool|float|dev_t|div_t|short|gid_t|off_t|u_int|key_t|id_t|uint|long|void|char|bool|id_t|int)\\b)[a-zA-Z_]\\w*\\b(?!\\())"
+      "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*(\\b(?!(?:atomic_uint_least64_t|atomic_uint_least16_t|atomic_uint_least32_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_fast64_t|atomic_uint_fast32_t|atomic_int_least64_t|atomic_int_least32_t|pthread_rwlockattr_t|atomic_uint_fast16_t|pthread_mutexattr_t|atomic_int_fast16_t|atomic_uint_fast8_t|atomic_int_fast64_t|atomic_int_least8_t|atomic_int_fast32_t|atomic_int_fast8_t|pthread_condattr_t|atomic_uintptr_t|atomic_ptrdiff_t|pthread_rwlock_t|atomic_uintmax_t|pthread_mutex_t|atomic_intmax_t|atomic_intptr_t|atomic_char32_t|atomic_char16_t|pthread_attr_t|atomic_wchar_t|uint_least64_t|uint_least32_t|uint_least16_t|pthread_cond_t|pthread_once_t|uint_fast64_t|uint_fast16_t|atomic_size_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|pthread_key_t|atomic_ullong|atomic_ushort|uint_fast32_t|atomic_schar|atomic_short|uint_fast8_t|int_fast64_t|int_fast32_t|int_fast16_t|atomic_ulong|atomic_llong|int_least8_t|atomic_uchar|memory_order|suseconds_t|int_fast8_t|atomic_bool|atomic_char|atomic_uint|atomic_long|atomic_int|useconds_t|_Imaginary|blksize_t|pthread_t|in_addr_t|uintptr_t|in_port_t|uintmax_t|uintmax_t|blkcnt_t|uint16_t|unsigned|_Complex|uint32_t|intptr_t|intmax_t|intmax_t|uint64_t|u_quad_t|int64_t|int32_t|ssize_t|caddr_t|clock_t|uint8_t|u_short|swblk_t|segsz_t|int16_t|fixpt_t|daddr_t|nlink_t|qaddr_t|size_t|time_t|mode_t|signed|quad_t|ushort|u_long|u_char|double|int8_t|ino_t|uid_t|pid_t|_Bool|float|dev_t|div_t|short|gid_t|off_t|u_int|key_t|id_t|uint|long|void|char|bool|id_t|int)\\b)[a-zA-Z_]\\w*\\b(?!\\())"
     },
     "method_access": {
-      "begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
+      "begin": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
       "beginCaptures": {
         "1": {
           "name": "variable.other.object.access.c"
@@ -1485,7 +1485,7 @@
                   "name": "punctuation.separator.pointer-access.c"
                 }
               },
-              "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             }
           ]
         },
@@ -1529,7 +1529,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1541,7 +1541,7 @@
                       "name": "constant.numeric.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1556,7 +1556,7 @@
                       "name": "constant.numeric.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1571,7 +1571,7 @@
                       "name": "keyword.operator.plus.exponent.hexadecimal.c"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1582,7 +1582,7 @@
                       "name": "constant.numeric.exponent.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1594,7 +1594,7 @@
                       "name": "constant.numeric.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1609,7 +1609,7 @@
                       "name": "constant.numeric.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1624,7 +1624,7 @@
                       "name": "keyword.operator.plus.exponent.decimal.c"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1635,7 +1635,7 @@
                       "name": "constant.numeric.binary.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1647,7 +1647,7 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1658,7 +1658,7 @@
                       "name": "constant.numeric.octal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1670,7 +1670,7 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1681,7 +1681,7 @@
                       "name": "constant.numeric.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1702,7 +1702,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1711,7 +1711,7 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)((?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1719,7 +1719,7 @@
                       "name": "constant.numeric.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1740,7 +1740,7 @@
                       "name": "constant.numeric.exponent.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1749,10 +1749,10 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)((?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
-                  "match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])+",
                   "name": "invalid.illegal.constant.numeric"
                 }
               ]
@@ -1760,7 +1760,7 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])*"
     },
     "operators": {
       "patterns": [
@@ -1789,7 +1789,7 @@
           "name": "keyword.operator.bitwise.shift.c"
         },
         {
-          "match": "!=|<=|>=|==|<|>",
+          "match": "!=|<=|>=|==|[<>]",
           "name": "keyword.operator.comparison.c"
         },
         {
@@ -1797,7 +1797,7 @@
           "name": "keyword.operator.logical.c"
         },
         {
-          "match": "&|\\||\\^|~",
+          "match": "[\\&|^~]",
           "name": "keyword.operator.c"
         },
         {
@@ -1805,7 +1805,7 @@
           "name": "keyword.operator.assignment.c"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.c"
         },
         {
@@ -1871,7 +1871,7 @@
           "include": "#block_innards"
         },
         {
-          "match": "(?-mix:(?<!:):(?!:))",
+          "match": "(?-im:(?<!:):(?!:))",
           "name": "punctuation.range-based.c"
         }
       ]
@@ -1939,7 +1939,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -1986,7 +1986,7 @@
               "name": "invalid.illegal.stray-$1.c"
             }
           },
-          "match": "^\\s*#\\s*(else|elif|endif)\\b"
+          "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
         }
       ]
     },
@@ -2019,7 +2019,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2066,14 +2066,14 @@
               "name": "invalid.illegal.stray-$1.c"
             }
           },
-          "match": "^\\s*#\\s*(else|elif|endif)\\b"
+          "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
         }
       ]
     },
     "preprocessor-rule-conditional-line": {
       "patterns": [
         {
-          "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
+          "match": "\\bdefined\\b(?:\\s*$|(?=\\s*\\(*\\s*(?!defined\\b)[a-zA-Z_$][\\w$]*\\b\\s*\\)*\\s*(?:\\n|//|/\\*|[?:]|&&|\\|\\||\\\\\\s*\\n)))",
           "name": "keyword.control.directive.conditional.c"
         },
         {
@@ -2146,13 +2146,13 @@
     "preprocessor-rule-define-line-blocks": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.c"
             }
           },
-          "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+          "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.c"
@@ -2178,13 +2178,13 @@
           "include": "#vararg_ellipses"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.c"
             }
           },
-          "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+          "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.c"
@@ -2206,7 +2206,7 @@
           "name": "punctuation.section.parens.end.bracket.round.c"
         },
         {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
           "end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
           "name": "meta.function.c",
           "patterns": [
@@ -2296,7 +2296,7 @@
           "include": "#operators"
         },
         {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.c"
@@ -2370,7 +2370,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2404,10 +2404,10 @@
                   "name": "punctuation.definition.directive.c"
                 }
               },
-              "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.c",
                   "patterns": [
@@ -2424,7 +2424,7 @@
             {
               "begin": "\\n",
               "contentName": "comment.block.preprocessor.if-branch.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2467,7 +2467,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2501,10 +2501,10 @@
                   "name": "punctuation.definition.directive.c"
                 }
               },
-              "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.c",
                   "patterns": [
@@ -2521,7 +2521,7 @@
             {
               "begin": "\\n",
               "contentName": "comment.block.preprocessor.if-branch.in-block.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2548,10 +2548,10 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+      "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
       "patterns": [
         {
-          "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+          "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
           "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.c",
           "patterns": [
@@ -2566,7 +2566,7 @@
         {
           "begin": "\\n",
           "contentName": "comment.block.preprocessor.elif-branch.c",
-          "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
           "patterns": [
             {
               "include": "#disabled"
@@ -2610,7 +2610,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2660,7 +2660,7 @@
                 }
               },
               "contentName": "comment.block.preprocessor.if-branch.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2672,7 +2672,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "$self"
@@ -2712,7 +2712,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2762,7 +2762,7 @@
                 }
               },
               "contentName": "comment.block.preprocessor.if-branch.in-block.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2774,7 +2774,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#block_innards"
@@ -2801,7 +2801,7 @@
       "end": "(?=^\\s*((#)\\s*endif\\b))",
       "patterns": [
         {
-          "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+          "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
           "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.c",
           "patterns": [
@@ -2815,7 +2815,7 @@
         },
         {
           "begin": "\\n",
-          "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
               "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2855,7 +2855,7 @@
                 }
               },
               "contentName": "comment.block.preprocessor.elif-branch.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2888,7 +2888,7 @@
       "end": "(?=^\\s*((#)\\s*endif\\b))",
       "patterns": [
         {
-          "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+          "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
           "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.c",
           "patterns": [
@@ -2902,7 +2902,7 @@
         },
         {
           "begin": "\\n",
-          "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
               "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2942,7 +2942,7 @@
                 }
               },
               "contentName": "comment.block.preprocessor.elif-branch.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -3005,10 +3005,10 @@
           "name": "variable.parameter.probably.c"
         }
       },
-      "match": "(?<=(?:[a-zA-Z_0-9] )|(?:[&*>\\]\\)]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
+      "match": "(?<=(?:[a-zA-Z_0-9] |[\\&*>\\])]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[]\\s*)?[,)])"
     },
     "static_assert": {
-      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3029,7 +3029,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -3057,7 +3057,7 @@
         "9": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -3075,7 +3075,7 @@
       },
       "patterns": [
         {
-          "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
+          "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\")?)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.delimiter.comma.c"
@@ -3097,15 +3097,15 @@
     "storage_types": {
       "patterns": [
         {
-          "match": "(?-mix:(?<!\\w)(?:unsigned|signed|double|_Bool|short|float|long|void|char|bool|int)(?!\\w))",
+          "match": "(?-im:(?<!\\w)(?:unsigned|signed|double|_Bool|short|float|long|void|char|bool|int)(?!\\w))",
           "name": "storage.type.built-in.primitive.c"
         },
         {
-          "match": "(?-mix:(?<!\\w)(?:atomic_uint_least64_t|atomic_uint_least16_t|atomic_uint_least32_t|pthread_rwlockattr_t|atomic_uint_fast64_t|atomic_uint_fast32_t|atomic_uint_fast16_t|atomic_int_least64_t|atomic_int_least32_t|atomic_int_least16_t|atomic_uint_least8_t|atomic_uint_fast8_t|atomic_int_least8_t|atomic_int_fast16_t|pthread_mutexattr_t|atomic_int_fast32_t|atomic_int_fast64_t|atomic_int_fast8_t|pthread_condattr_t|atomic_ptrdiff_t|pthread_rwlock_t|atomic_uintptr_t|atomic_uintmax_t|atomic_intmax_t|atomic_intptr_t|atomic_char32_t|atomic_char16_t|pthread_mutex_t|pthread_cond_t|atomic_wchar_t|uint_least64_t|uint_least32_t|uint_least16_t|pthread_once_t|pthread_attr_t|int_least32_t|pthread_key_t|int_least16_t|int_least64_t|uint_least8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|atomic_ushort|atomic_ullong|atomic_size_t|int_fast16_t|int_fast64_t|uint_fast8_t|atomic_short|atomic_uchar|atomic_schar|int_least8_t|memory_order|atomic_llong|atomic_ulong|int_fast32_t|atomic_long|atomic_uint|atomic_char|int_fast8_t|suseconds_t|atomic_bool|atomic_int|_Imaginary|useconds_t|in_port_t|uintmax_t|uintmax_t|pthread_t|blksize_t|in_addr_t|uintptr_t|blkcnt_t|uint16_t|uint32_t|uint64_t|u_quad_t|_Complex|intptr_t|intmax_t|intmax_t|segsz_t|u_short|nlink_t|uint8_t|int64_t|int32_t|int16_t|fixpt_t|daddr_t|caddr_t|qaddr_t|ssize_t|clock_t|swblk_t|u_long|mode_t|int8_t|time_t|ushort|u_char|quad_t|size_t|pid_t|gid_t|uid_t|dev_t|div_t|off_t|u_int|key_t|ino_t|uint|id_t|id_t)(?!\\w))",
+          "match": "(?-im:(?<!\\w)(?:atomic_uint_least64_t|atomic_uint_least16_t|atomic_uint_least32_t|pthread_rwlockattr_t|atomic_uint_fast64_t|atomic_uint_fast32_t|atomic_uint_fast16_t|atomic_int_least64_t|atomic_int_least32_t|atomic_int_least16_t|atomic_uint_least8_t|atomic_uint_fast8_t|atomic_int_least8_t|atomic_int_fast16_t|pthread_mutexattr_t|atomic_int_fast32_t|atomic_int_fast64_t|atomic_int_fast8_t|pthread_condattr_t|atomic_ptrdiff_t|pthread_rwlock_t|atomic_uintptr_t|atomic_uintmax_t|atomic_intmax_t|atomic_intptr_t|atomic_char32_t|atomic_char16_t|pthread_mutex_t|pthread_cond_t|atomic_wchar_t|uint_least64_t|uint_least32_t|uint_least16_t|pthread_once_t|pthread_attr_t|int_least32_t|pthread_key_t|int_least16_t|int_least64_t|uint_least8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|atomic_ushort|atomic_ullong|atomic_size_t|int_fast16_t|int_fast64_t|uint_fast8_t|atomic_short|atomic_uchar|atomic_schar|int_least8_t|memory_order|atomic_llong|atomic_ulong|int_fast32_t|atomic_long|atomic_uint|atomic_char|int_fast8_t|suseconds_t|atomic_bool|atomic_int|_Imaginary|useconds_t|in_port_t|uintmax_t|uintmax_t|pthread_t|blksize_t|in_addr_t|uintptr_t|blkcnt_t|uint16_t|uint32_t|uint64_t|u_quad_t|_Complex|intptr_t|intmax_t|intmax_t|segsz_t|u_short|nlink_t|uint8_t|int64_t|int32_t|int16_t|fixpt_t|daddr_t|caddr_t|qaddr_t|ssize_t|clock_t|swblk_t|u_long|mode_t|int8_t|time_t|ushort|u_char|quad_t|size_t|pid_t|gid_t|uid_t|dev_t|div_t|off_t|u_int|key_t|ino_t|uint|id_t|id_t)(?!\\w))",
           "name": "storage.type.built-in.c"
         },
         {
-          "match": "(?-mix:\\b(enum|struct|union)\\b)",
+          "match": "(?-im:\\b(enum|struct|union)\\b)",
           "name": "storage.type.$1.c"
         },
         {
@@ -3139,7 +3139,7 @@
                 "4": {
                   "patterns": [
                     {
-                      "match": "\\*\\/",
+                      "match": "\\*/",
                       "name": "comment.block.c punctuation.definition.comment.end.c"
                     },
                     {
@@ -3149,13 +3149,13 @@
                   ]
                 }
               },
-              "match": "(?:^)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\n|$)"
+              "match": "^((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\n|$)"
             },
             {
               "include": "#comments"
             },
             {
-              "begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\()",
+              "begin": "(((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\()",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.section.parens.begin.bracket.round.assembly.c"
@@ -3176,7 +3176,7 @@
                 "5": {
                   "patterns": [
                     {
-                      "match": "\\*\\/",
+                      "match": "\\*/",
                       "name": "comment.block.c punctuation.definition.comment.end.c"
                     },
                     {
@@ -3269,7 +3269,7 @@
                     "4": {
                       "patterns": [
                         {
-                          "match": "\\*\\/",
+                          "match": "\\*/",
                           "name": "comment.block.c punctuation.definition.comment.end.c"
                         },
                         {
@@ -3297,7 +3297,7 @@
                     "9": {
                       "patterns": [
                         {
-                          "match": "\\*\\/",
+                          "match": "\\*/",
                           "name": "comment.block.c punctuation.definition.comment.end.c"
                         },
                         {
@@ -3307,7 +3307,7 @@
                       ]
                     }
                   },
-                  "match": "\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))([a-zA-Z_]\\w*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]"
+                  "match": "\\[((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))([a-zA-Z_]\\w*)((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))]"
                 },
                 {
                   "match": ":",
@@ -3325,7 +3325,7 @@
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+          "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
           "name": "constant.character.escape.c"
         },
         {
@@ -3337,7 +3337,7 @@
     "string_placeholder": {
       "patterns": [
         {
-          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
           "name": "constant.other.placeholder.c"
         },
         {
@@ -3404,7 +3404,7 @@
       ]
     },
     "switch_conditional_parentheses": {
-      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3422,7 +3422,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -3452,7 +3452,7 @@
       ]
     },
     "switch_statement": {
-      "begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)switch(?!\\w)))",
+      "begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)switch(?!\\w)))",
       "beginCaptures": {
         "1": {
           "name": "meta.head.switch.c"
@@ -3473,7 +3473,7 @@
         "5": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -3486,7 +3486,7 @@
           "name": "keyword.control.switch.c"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "name": "meta.block.switch.c",
       "patterns": [
         {
@@ -3509,7 +3509,7 @@
         },
         {
           "begin": "(?<=\\{|<%|\\?\\?<)",
-          "end": "(\\}|%>|\\?\\?>)",
+          "end": "(}|%>|\\?\\?>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.block.end.bracket.curly.switch.c"
@@ -3532,7 +3532,7 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+          "begin": "(?<=}|%>|\\?\\?>)[\\s\\n]*",
           "end": "[\\s\\n]*(?=;)",
           "name": "meta.tail.switch.c",
           "patterns": [
diff --git a/resources/languages/cadence.json b/resources/languages/cadence.json
index 9de271c..28426f2 100644
--- a/resources/languages/cadence.json
+++ b/resources/languages/cadence.json
@@ -32,7 +32,7 @@
           "name": "punctuation.section.scope.begin.cadence"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.cadence"
@@ -174,7 +174,7 @@
       }
     },
     "composite": {
-      "begin": "\\b((?:(?:struct|resource|contract)(?:\\s+interface)?)|transaction|enum)\\s+([\\p{L}_][\\p{L}_\\p{N}\\p{M}]*)",
+      "begin": "\\b((?:struct|resource|contract)(?:\\s+interface)?|transaction|enum)\\s+([\\p{L}_][\\p{L}_\\p{N}\\p{M}]*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.$1.cadence"
@@ -183,7 +183,7 @@
           "name": "entity.name.type.$1.cadence"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.definition.type.composite.cadence",
       "patterns": [
         {
@@ -199,7 +199,7 @@
               "name": "punctuation.definition.type.begin.cadence"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.type.end.cadence"
@@ -290,7 +290,6 @@
               "name": "punctuation.separator.argument-label.cadence"
             }
           },
-          "comment": "an element with a label",
           "end": "(?=[,)\\]])",
           "patterns": [
             {
@@ -300,7 +299,6 @@
         },
         {
           "begin": "(?![,)\\]])(?=\\S)",
-          "comment": "an element without a label (i.e. anything else)",
           "end": "(?=[,)\\]])",
           "patterns": [
             {
@@ -339,7 +337,7 @@
           "name": "entity.name.function.cadence"
         }
       },
-      "end": "(?<=\\})|$",
+      "end": "(?<=})|$",
       "name": "meta.definition.function.cadence",
       "patterns": [
         {
@@ -358,7 +356,7 @@
               "name": "punctuation.section.function.begin.cadence"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.end.cadence"
@@ -385,7 +383,6 @@
               "name": "punctuation.definition.arguments.begin.cadence"
             }
           },
-          "comment": "foo(args) -- a call whose callee is a highlightable name",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -402,13 +399,13 @@
       ]
     },
     "function-result": {
-      "begin": "(?<![/=\\-+!*%<>&|\\^~.])(:)(?![/=\\-+!*%<>&|\\^~.])\\s*",
+      "begin": "(?<![/=\\-+!*%<>\\&|^~.])(:)(?![/=\\-+!*%<>\\&|^~.])\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.function-result.cadence"
         }
       },
-      "end": "(?!\\G)(?=\\{|;)|$",
+      "end": "(?!\\G)(?=[{;])|$",
       "name": "meta.function-result.cadence",
       "patterns": [
         {
@@ -417,13 +414,13 @@
       ]
     },
     "initializer": {
-      "begin": "(?<!\\.)\\b(init)\\s*(?=\\(|<)",
+      "begin": "(?<!\\.)\\b(init)\\s*(?=[(<])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.cadence"
         }
       },
-      "end": "(?<=\\})|$",
+      "end": "(?<=})|$",
       "name": "meta.definition.function.initializer.cadence",
       "patterns": [
         {
@@ -439,7 +436,7 @@
               "name": "punctuation.section.function.begin.cadence"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.end.cadence"
@@ -532,23 +529,19 @@
           ],
           "repository": {
             "binary": {
-              "comment": "",
-              "match": "(\\B\\-|\\b)0b[01]([_01]*[01])?\\b",
+              "match": "(\\B-|\\b)0b[01]([_01]*[01])?\\b",
               "name": "constant.numeric.integer.binary.cadence"
             },
             "decimal": {
-              "comment": "",
-              "match": "(\\B\\-|\\b)[0-9]([_0-9]*[0-9])?\\b",
+              "match": "(\\B-|\\b)[0-9]([_0-9]*[0-9])?\\b",
               "name": "constant.numeric.integer.decimal.cadence"
             },
             "hexadecimal": {
-              "comment": "",
-              "match": "(\\B\\-|\\b)0x[0-9A-Fa-f]([_0-9A-Fa-f]*[0-9A-Fa-f])?\\b",
+              "match": "(\\B-|\\b)0x\\h([_\\h]*\\h)?\\b",
               "name": "constant.numeric.integer.hexadecimal.cadence"
             },
             "octal": {
-              "comment": "",
-              "match": "(\\B\\-|\\b)0o[0-7]([_0-7]*[0-7])?\\b",
+              "match": "(\\B-|\\b)0o[0-7]([_0-7]*[0-7])?\\b",
               "name": "constant.numeric.integer.octal.cadence"
             }
           }
@@ -571,7 +564,7 @@
               "name": "string.quoted.double.single-line.cadence",
               "patterns": [
                 {
-                  "match": "\\r|\\n",
+                  "match": "[\\r\\n]",
                   "name": "invalid.illegal.returns-not-allowed.cadence"
                 },
                 {
@@ -588,7 +581,7 @@
                   "name": "constant.character.escape.cadence"
                 },
                 {
-                  "match": "\\\\u\\{[0-9a-fA-F]{1,8}\\}",
+                  "match": "\\\\u\\{\\h{1,8}}",
                   "name": "constant.character.escape.unicode.cadence"
                 }
               ]
@@ -600,7 +593,7 @@
     "operators": {
       "patterns": [
         {
-          "match": "\\-",
+          "match": "-",
           "name": "keyword.operator.arithmetic.unary.cadence"
         },
         {
@@ -620,7 +613,7 @@
           "name": "keyword.operator.force-move.cadence"
         },
         {
-          "match": "\\+|\\-|\\*|/",
+          "match": "[+\\-*/]",
           "name": "keyword.operator.arithmetic.cadence"
         },
         {
@@ -628,7 +621,7 @@
           "name": "keyword.operator.arithmetic.remainder.cadence"
         },
         {
-          "match": "==|!=|>|<|>=|<=",
+          "match": "==|!=|[><]|>=|<=",
           "name": "keyword.operator.comparison.cadence"
         },
         {
@@ -676,7 +669,6 @@
               "name": "variable.parameter.function.cadence"
             }
           },
-          "comment": "External parameter labels are considered part of the function name",
           "match": "([\\p{L}_][\\p{L}_\\p{N}\\p{M}]*)\\s+([\\p{L}_][\\p{L}_\\p{N}\\p{M}]*)(?=\\s*:)"
         },
         {
@@ -688,7 +680,6 @@
               "name": "entity.name.function.cadence"
             }
           },
-          "comment": "If no external label is given, the name is both the external label and the internal variable name",
           "match": "(([\\p{L}_][\\p{L}_\\p{N}\\p{M}]*))(?=\\s*:)"
         },
         {
diff --git a/resources/languages/cairo.json b/resources/languages/cairo.json
index 5d3d46b..76de498 100644
--- a/resources/languages/cairo.json
+++ b/resources/languages/cairo.json
@@ -13,7 +13,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.control.end"
@@ -37,7 +37,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.control.end"
@@ -61,7 +61,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.control.end"
@@ -91,11 +91,11 @@
       "name": "keyword.other.meta"
     },
     {
-      "match": "\\b(SIZEOF_LOCALS|SIZE)\\b",
+      "match": "\\b(SIZE(?:OF_LOCALS|))\\b",
       "name": "markup.italic"
     },
     {
-      "match": "//[^\n]*\n",
+      "match": "//[^\\n]*\\n",
       "name": "comment.line.sharp"
     },
     {
@@ -113,7 +113,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "storage.type.function.cairo"
@@ -137,7 +137,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "storage.type.function.cairo"
@@ -155,7 +155,7 @@
       "name": "constant.numeric.decimal"
     },
     {
-      "match": "\\b[+-]?0x[0-9a-fA-F]+\\b",
+      "match": "\\b[+-]?0x\\h+\\b",
       "name": "constant.numeric.hexadecimal"
     },
     {
@@ -167,7 +167,7 @@
       "name": "string.quoted.double"
     },
     {
-      "begin": "%{",
+      "begin": "%\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.embedded.begin.python"
diff --git a/resources/languages/clarity.json b/resources/languages/clarity.json
index c3d42ba..8df9a09 100644
--- a/resources/languages/clarity.json
+++ b/resources/languages/clarity.json
@@ -32,7 +32,7 @@
   ],
   "repository": {
     "built-in-func": {
-      "begin": "(\\()\\s*(\\-|\\+|<\\=|>\\=|<|>|\\*|/|and|append|as-contract|as-max-len\\?|asserts!|at-block|begin|bit-and|bit-not|bit-or|bit-shift-left|bit-shift-right|bit-xor|buff-to-int-be|buff-to-int-le|buff-to-uint-be|buff-to-uint-le|concat|contract-call\\?|contract-of|default-to|element-at|element-at\\?|filter|fold|from-consensus-buff\\?|ft-burn\\?|ft-get-balance|ft-get-supply|ft-mint\\?|ft-transfer\\?|get-block-info\\?|get-burn-block-info\\?|get-stacks-block-info\\?|get-tenure-info\\?|get-burn-block-info\\?|hash160|if|impl-trait|index-of|index-of\\?|int-to-ascii|int-to-utf8|is-eq|is-err|is-none|is-ok|is-some|is-standard|keccak256|len|log2|map|match|merge|mod|nft-burn\\?|nft-get-owner\\?|nft-mint\\?|nft-transfer\\?|not|or|pow|principal-construct\\?|principal-destruct\\?|principal-of\\?|print|replace-at\\?|secp256k1-recover\\?|secp256k1-verify|sha256|sha512|sha512/256|slice\\?|sqrti|string-to-int\\?|string-to-uint\\?|stx-account|stx-burn\\?|stx-get-balance|stx-transfer-memo\\?|stx-transfer\\?|to-consensus-buff\\?|to-int|to-uint|try!|unwrap!|unwrap-err!|unwrap-err-panic|unwrap-panic|xor)\\s+",
+      "begin": "(\\()\\s*([-+]|<=|>=|[<>*/]|and|append|as-contract|as-max-len\\?|asserts!|at-block|begin|bit-and|bit-not|bit-or|bit-shift-left|bit-shift-right|bit-xor|buff-to-int-be|buff-to-int-le|buff-to-uint-be|buff-to-uint-le|concat|contract-call\\?|contract-of|default-to|element-at|element-at\\?|filter|fold|from-consensus-buff\\?|ft-burn\\?|ft-get-balance|ft-get-supply|ft-mint\\?|ft-transfer\\?|get-block-info\\?|get-burn-block-info\\?|get-stacks-block-info\\?|get-tenure-info\\?|get-burn-block-info\\?|hash160|if|impl-trait|index-of|index-of\\?|int-to-ascii|int-to-utf8|is-eq|is-err|is-none|is-ok|is-some|is-standard|keccak256|len|log2|map|match|merge|mod|nft-burn\\?|nft-get-owner\\?|nft-mint\\?|nft-transfer\\?|not|or|pow|principal-construct\\?|principal-destruct\\?|principal-of\\?|print|replace-at\\?|secp256k1-recover\\?|secp256k1-verify|sha256|sha512|sha512/256|slice\\?|sqrti|string-to-int\\?|string-to-uint\\?|stx-account|stx-burn\\?|stx-get-balance|stx-transfer-memo\\?|stx-transfer\\?|to-consensus-buff\\?|to-int|to-uint|try!|unwrap!|unwrap-err!|unwrap-err-panic|unwrap-panic|xor)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.built-in-function.start.clarity"
@@ -67,17 +67,14 @@
           "include": "#comment"
         },
         {
-          "comment": "numerics",
           "match": "\\b(uint|int)\\b",
           "name": "entity.name.type.numeric.clarity"
         },
         {
-          "comment": "principal",
           "match": "\\b(principal)\\b",
           "name": "entity.name.type.principal.clarity"
         },
         {
-          "comment": "bool",
           "match": "\\b(bool)\\b",
           "name": "entity.name.type.bool.clarity"
         },
@@ -96,7 +93,7 @@
               "name": "punctuation.string_type-def.end.clarity"
             }
           },
-          "match": "(\\()\\s*(?:(string-ascii|string-utf8)\\s+(\\d+))\\s*(\\))"
+          "match": "(\\()\\s*(string-(?:ascii|utf8))\\s+(\\d+)\\s*(\\))"
         },
         {
           "captures": {
@@ -125,7 +122,6 @@
               "name": "storage.type.modifier"
             }
           },
-          "comment": "optional",
           "end": "(\\))",
           "endCaptures": {
             "1": {
@@ -149,7 +145,6 @@
               "name": "storage.type.modifier"
             }
           },
-          "comment": "response",
           "end": "(\\))",
           "endCaptures": {
             "1": {
@@ -176,7 +171,6 @@
               "name": "constant.numeric.list-len.clarity"
             }
           },
-          "comment": "list",
           "end": "(\\))",
           "endCaptures": {
             "1": {
@@ -197,7 +191,7 @@
               "name": "punctuation.tuple-def.start.clarity"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.tuple-def.end.clarity"
@@ -206,7 +200,7 @@
           "name": "meta.tuple-def",
           "patterns": [
             {
-              "match": "([a-zA-Z][\\w\\?\\!\\-]*)(?=:)",
+              "match": "([a-zA-Z][\\w?!-]*)(?=:)",
               "name": "entity.name.tag.tuple-data-type-key.clarity"
             },
             {
@@ -217,7 +211,7 @@
       ]
     },
     "define-constant": {
-      "begin": "(\\()\\s*(define-constant)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-constant)\\s+([a-zA-Z][\\w?!-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-constant.start.clarity"
@@ -243,7 +237,7 @@
       ]
     },
     "define-data-var": {
-      "begin": "(\\()\\s*(define-data-var)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-data-var)\\s+([a-zA-Z][\\w?!-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-data-var.start.clarity"
@@ -293,7 +287,7 @@
           "include": "#expression"
         },
         {
-          "begin": "(\\()\\s*([a-zA-Z][\\w\\?\\!\\-]*)\\s*",
+          "begin": "(\\()\\s*([a-zA-Z][\\w?!-]*)\\s*",
           "beginCaptures": {
             "1": {
               "name": "punctuation.function-signature.start.clarity"
@@ -311,7 +305,7 @@
           "name": "meta.define-function-signature",
           "patterns": [
             {
-              "begin": "(\\()\\s*([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
+              "begin": "(\\()\\s*([a-zA-Z][\\w?!-]*)\\s+",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.function-argument.start.clarity"
@@ -358,10 +352,10 @@
           "name": "punctuation.define-fungible-token.end.clarity"
         }
       },
-      "match": "(\\()\\s*(define-fungible-token)\\s+([a-zA-Z][\\w\\?\\!\\-]*)(?:\\s+(u\\d+))?"
+      "match": "(\\()\\s*(define-fungible-token)\\s+([a-zA-Z][\\w?!-]*)(?:\\s+(u\\d+))?"
     },
     "define-map": {
-      "begin": "(\\()\\s*(define-map)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-map)\\s+([a-zA-Z][\\w?!-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-map.start.clarity"
@@ -390,7 +384,7 @@
       ]
     },
     "define-non-fungible-token": {
-      "begin": "(\\()\\s*(define-non-fungible-token)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-non-fungible-token)\\s+([a-zA-Z][\\w?!-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-non-fungible-token.start.clarity"
@@ -416,7 +410,7 @@
       ]
     },
     "define-trait": {
-      "begin": "(\\()\\s*(define-trait)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-trait)\\s+([a-zA-Z][\\w?!-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-trait.start.clarity"
@@ -455,7 +449,7 @@
               "include": "#expression"
             },
             {
-              "begin": "(\\()\\s*([a-zA-Z][\\w\\!\\?\\-]*)\\s+",
+              "begin": "(\\()\\s*([a-zA-Z][\\w!?-]*)\\s+",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.trait-function.start.clarity"
@@ -524,7 +518,7 @@
       ]
     },
     "get-set-func": {
-      "begin": "(\\()\\s*(var-get|var-set|map-get\\?|map-set|map-insert|map-delete|get)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s*",
+      "begin": "(\\()\\s*(var-get|var-set|map-get\\?|map-set|map-insert|map-delete|get)\\s+([a-zA-Z][\\w?!-]*)\\s*",
       "beginCaptures": {
         "1": {
           "name": "punctuation.get-set-func.start.clarity"
@@ -593,7 +587,7 @@
           "name": "meta.let-var",
           "patterns": [
             {
-              "begin": "(\\()([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
+              "begin": "(\\()([a-zA-Z][\\w?!-]*)\\s+",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.let-local-var.start.clarity"
@@ -686,17 +680,14 @@
         "number-literal": {
           "patterns": [
             {
-              "comment": "unsigned integers",
               "match": "(?<!\\S)(?!-)\\bu\\d+\\b(?!\\s*-)",
               "name": "constant.numeric.uint.clarity"
             },
             {
-              "comment": "signed integers",
               "match": "(?<!\\S)(?!-)\\b\\d+\\b(?!\\s*-)",
               "name": "constant.numeric.int.clarity"
             },
             {
-              "comment": "hexadecimals",
               "match": "(?<!\\S)(?!-)\\b0x[0-9a-f]*\\b(?!\\s*-)",
               "name": "constant.numeric.hex.clarity"
             }
@@ -734,7 +725,7 @@
           ]
         },
         "principal-literal": {
-          "match": "\\'[0-9A-Z]{28,41}(:?\\.[a-zA-Z][a-zA-Z0-9\\-]+){0,2}|(\\.[a-zA-Z][a-zA-Z0-9\\-]*){1,2}(?=[\\s(){},]|$)",
+          "match": "'[0-9A-Z]{28,41}(:?\\.[a-zA-Z][a-zA-Z0-9-]+){0,2}|(\\.[a-zA-Z][a-zA-Z0-9-]*){1,2}(?=[\\s(){},]|$)",
           "name": "constant.other.principal.clarity"
         },
         "response-literal": {
@@ -798,7 +789,7 @@
               "name": "punctuation.tuple.start.clarity"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.tuple.end.clarity"
@@ -807,7 +798,7 @@
           "name": "meta.tuple",
           "patterns": [
             {
-              "match": "([a-zA-Z][\\w\\?\\!\\-]*)(?=:)",
+              "match": "([a-zA-Z][\\w?!-]*)(?=:)",
               "name": "entity.name.tag.tuple-key.clarity"
             },
             {
@@ -821,7 +812,7 @@
       }
     },
     "use-trait": {
-      "begin": "(\\()\\s*(use-trait)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
+      "begin": "(\\()\\s*(use-trait)\\s+([a-zA-Z][\\w?!-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.use-trait.start.clarity"
@@ -847,7 +838,7 @@
       ]
     },
     "user-func": {
-      "begin": "(\\()\\s*(([a-zA-Z][\\w\\?\\!\\-]*))\\s*",
+      "begin": "(\\()\\s*(([a-zA-Z][\\w?!-]*))\\s*",
       "beginCaptures": {
         "1": {
           "name": "punctuation.user-function.start.clarity"
diff --git a/resources/languages/clojure.json b/resources/languages/clojure.json
index 35857c4..386b856 100644
--- a/resources/languages/clojure.json
+++ b/resources/languages/clojure.json
@@ -65,7 +65,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "(nil)(?=(\\s|\\)|\\]|\\}))",
+          "match": "(nil)(?=([\\s)\\]}]))",
           "name": "constant.language.nil.clojure"
         },
         {
@@ -81,11 +81,11 @@
           "name": "constant.numeric.ratio.clojure"
         },
         {
-          "match": "([-+]?(?:(?:3[0-6])|(?:[12]\\d)|[2-9])[rR][0-9A-Za-z]+N?)",
+          "match": "([-+]?(?:3[0-6]|[12]\\d|[2-9])[rR][0-9A-Za-z]+N?)",
           "name": "constant.numeric.arbitrary-radix.clojure"
         },
         {
-          "match": "([-+]?0[xX][0-9a-fA-F]+N?)",
+          "match": "([-+]?0[xX]\\h+N?)",
           "name": "constant.numeric.hexadecimal.clojure"
         },
         {
@@ -93,7 +93,7 @@
           "name": "constant.numeric.octal.clojure"
         },
         {
-          "match": "([-+]?[0-9]+(?:(\\.|(?=[eEM]))[0-9]*([eE][-+]?[0-9]+)?)M?)",
+          "match": "([-+]?[0-9]+(\\.|(?=[eEM]))[0-9]*([eE][-+]?[0-9]+)?M?)",
           "name": "constant.numeric.double.clojure"
         },
         {
@@ -106,23 +106,23 @@
       ]
     },
     "dynamic-variables": {
-      "match": "\\*[\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\d]+\\*",
+      "match": "\\*[\\w.\\-_:+=><!?\\d]+\\*",
       "name": "meta.symbol.dynamic.clojure"
     },
     "keyfn": {
       "patterns": [
         {
-          "match": "(?<=(\\s|\\(|\\[|\\{))(if(-[-\\p{Ll}\\?]*)?|when(-[-\\p{Ll}]*)?|for(-[-\\p{Ll}]*)?|cond|do|let(-[-\\p{Ll}\\?]*)?|binding|loop|recur|fn|throw[\\p{Ll}\\-]*|try|catch|finally|([\\p{Ll}]*case))(?=(\\s|\\)|\\]|\\}))",
+          "match": "(?<=([\\s(\\[{]))(if(-[-\\p{Ll}?]*)?|when(-[-\\p{Ll}]*)?|for(-[-\\p{Ll}]*)?|cond|do|let(-[-\\p{Ll}?]*)?|binding|loop|recur|fn|throw[\\p{Ll}-]*|try|catch|finally|(\\p{Ll}*case))(?=([\\s)\\]}]))",
           "name": "storage.control.clojure"
         },
         {
-          "match": "(?<=(\\s|\\(|\\[|\\{))(declare-?|(in-)?ns|import|use|require|load|compile|(def[\\p{Ll}\\-]*))(?=(\\s|\\)|\\]|\\}))",
+          "match": "(?<=([\\s(\\[{]))(declare-?|(in-)?ns|import|use|require|load|compile|(def[\\p{Ll}-]*))(?=([\\s)\\]}]))",
           "name": "keyword.control.clojure"
         }
       ]
     },
     "keyword": {
-      "match": "(?<=(\\s|\\(|\\[|\\{)):[\\w\\#\\.\\-\\_\\:\\+\\=\\>\\<\\/\\!\\?\\*]+(?=(\\s|\\)|\\]|\\}|\\,))",
+      "match": "(?<=([\\s(\\[{])):[\\w#.\\-_:+=></!?*]+(?=([\\s)\\]},]))",
       "name": "constant.keyword.clojure"
     },
     "map": {
@@ -132,7 +132,7 @@
           "name": "punctuation.section.map.begin.clojure"
         }
       },
-      "end": "(\\}(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\})",
+      "end": "(}(?=[}\\])\\s]*(?:;|$)))|(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.map.end.trailing.clojure"
@@ -157,7 +157,7 @@
               "name": "punctuation.section.metadata.map.begin.clojure"
             }
           },
-          "end": "(\\}(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\})",
+          "end": "(}(?=[}\\])\\s]*(?:;|$)))|(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.metadata.map.end.trailing.clojure"
@@ -196,18 +196,18 @@
               "name": "meta.symbol.namespace.clojure"
             }
           },
-          "match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)/"
+          "match": "([\\p{L}.\\-_+=><!?*][\\w.\\-_:+=><!?*\\d]*)/"
         }
       ]
     },
     "quoted-sexp": {
-      "begin": "(['``]\\()",
+      "begin": "(['`]\\()",
       "beginCaptures": {
         "1": {
           "name": "punctuation.section.expression.begin.clojure"
         }
       },
-      "end": "(\\))$|(\\)(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\))",
+      "end": "(\\))$|(\\)(?=[}\\])\\s]*(?:;|$)))|(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.expression.end.trailing.clojure"
@@ -251,13 +251,13 @@
       "name": "constant.character.escape.clojure"
     },
     "set": {
-      "begin": "(\\#\\{)",
+      "begin": "(#\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.section.set.begin.clojure"
         }
       },
-      "end": "(\\}(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\})",
+      "end": "(}(?=[}\\])\\s]*(?:;|$)))|(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.set.end.trailing.clojure"
@@ -280,7 +280,7 @@
           "name": "punctuation.section.expression.begin.clojure"
         }
       },
-      "end": "(\\))$|(\\)(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\))",
+      "end": "(\\))$|(\\)(?=[}\\])\\s]*(?:;|$)))|(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.expression.end.trailing.clojure"
@@ -311,7 +311,7 @@
               "include": "#dynamic-variables"
             },
             {
-              "match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
+              "match": "([\\p{L}.\\-_+=><!?*][\\w.\\-_:+=><!?*\\d]*)",
               "name": "entity.global.clojure"
             },
             {
@@ -343,7 +343,7 @@
               "name": "entity.name.function.clojure"
             }
           },
-          "match": "(?<=\\()(.+?)(?=\\s|\\))",
+          "match": "(?<=\\()(.+?)(?=[\\s)])",
           "patterns": [
             {
               "include": "$self"
@@ -389,13 +389,13 @@
     "symbol": {
       "patterns": [
         {
-          "match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
+          "match": "([\\p{L}.\\-_+=><!?*][\\w.\\-_:+=><!?*\\d]*)",
           "name": "meta.symbol.clojure"
         }
       ]
     },
     "var": {
-      "match": "(?<=(\\s|\\(|\\[|\\{)\\#)'[\\w\\.\\-\\_\\:\\+\\=\\>\\<\\/\\!\\?\\*]+(?=(\\s|\\)|\\]|\\}))",
+      "match": "(?<=([\\s(\\[{])#)'[\\w.\\-_:+=></!?*]+(?=([\\s)\\]}]))",
       "name": "meta.var.clojure"
     },
     "vector": {
@@ -405,7 +405,7 @@
           "name": "punctuation.section.vector.begin.clojure"
         }
       },
-      "end": "(\\](?=[\\}\\]\\)\\s]*(?:;|$)))|(\\])",
+      "end": "(](?=[}\\])\\s]*(?:;|$)))|(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.vector.end.trailing.clojure"
diff --git a/resources/languages/cmake.json b/resources/languages/cmake.json
index c68da46..e8870ed 100644
--- a/resources/languages/cmake.json
+++ b/resources/languages/cmake.json
@@ -7,47 +7,40 @@
   "name": "cmake",
   "patterns": [
     {
-      "comment": "Variables That Describe the System",
       "match": "\\b(?i:APPLE|BORLAND|(CMAKE_)?(CL_64|COMPILER_2005|HOST_APPLE|HOST_SYSTEM|HOST_SYSTEM_NAME|HOST_SYSTEM_PROCESSOR|HOST_SYSTEM_VERSION|HOST_UNIX|HOST_WIN32|LIBRARY_ARCHITECTURE|LIBRARY_ARCHITECTURE_REGEX|OBJECT_PATH_MAX|SYSTEM|SYSTEM_NAME|SYSTEM_PROCESSOR|SYSTEM_VERSION)|CYGWIN|MSVC|MSVC80|MSVC_IDE|MSVC_VERSION|UNIX|WIN32|XCODE_VERSION|MSVC60|MSVC70|MSVC90|MSVC71)\\b",
       "name": "constant.source.cmake"
     },
     {
-      "comment": "cmakeOperators",
       "match": "\\b(?i:ABSOLUTE|AND|BOOL|CACHE|COMMAND|COMMENT|DEFINED|DOC|EQUAL|EXISTS|EXT|FALSE|GREATER|GREATER_EQUAL|INTERNAL|IN_LIST|IS_ABSOLUTE|IS_DIRECTORY|IS_NEWER_THAN|IS_SYMLINK|LESS|LESS_EQUAL|MATCHES|NAME|NAMES|NAME_WE|NOT|OFF|ON|OR|PATH|PATHS|POLICY|PROGRAM|STREQUAL|STRGREATER|STRGREATER_EQUAL|STRING|STRLESS|STRLESS_EQUAL|TARGET|TEST|TRUE|VERSION_EQUAL|VERSION_GREATER|VERSION_GREATER_EQUAL|VERSION_LESS)\\b",
       "name": "keyword.cmake"
     },
     {
-      "comment": "Commands",
       "match": "^\\s*\\b(?i:add_compile_options|add_custom_command|add_custom_target|add_definitions|add_dependencies|add_executable|add_library|add_subdirectory|add_test|aux_source_directory|break|build_command|build_name|cmake_host_system_information|cmake_minimum_required|cmake_policy|configure_file|continue|create_test_sourcelist|ctest_build|ctest_configure|ctest_coverage|ctest_empty_binary_directory|ctest_memcheck|ctest_read_custom_files|ctest_run_script|ctest_sleep|ctest_start|ctest_submit|ctest_test|ctest_update|ctest_upload|define_property|else|elseif|enable_language|enable_testing|endforeach|endfunction|endif|endmacro|endwhile|exec_program|execute_process|export|export_library_dependencies|file|find_file|find_library|find_package|find_path|find_program|fltk_wrap_ui|foreach|function|get_cmake_property|get_directory_property|get_filename_component|get_property|get_source_file_property|get_target_property|get_test_property|if|include|include_directories|include_external_msproject|include_regular_expression|install|install_files|install_programs|install_targets|link_directories|link_libraries|list|load_cache|load_command|macro|make_directory|mark_as_advanced|math|message|option|output_required_files|project|qt_wrap_cpp|qt_wrap_ui|remove|remove_definitions|return|separate_arguments|set|set_directory_properties|set_property|set_source_files_properties|set_target_properties|set_tests_properties|site_name|source_group|string|subdir_depends|subdirs|target_compile_definitions|target_compile_features|target_compile_options|target_include_directories|target_link_libraries|target_sources|try_compile|try_run|unset|use_mangled_mesa|utility_source|variable_requires|variable_watch|while|write_file)\\b",
       "name": "keyword.cmake"
     },
     {
-      "comment": "Variables That Change Behavior",
       "match": "\\b(?i:BUILD_SHARED_LIBS|(CMAKE_)?(ABSOLUTE_DESTINATION_FILES|AUTOMOC_RELAXED_MODE|BACKWARDS_COMPATIBILITY|BUILD_TYPE|COLOR_MAKEFILE|CONFIGURATION_TYPES|DEBUG_TARGET_PROPERTIES|DISABLE_FIND_PACKAGE_\\w+|FIND_LIBRARY_PREFIXES|FIND_LIBRARY_SUFFIXES|IGNORE_PATH|INCLUDE_PATH|INSTALL_DEFAULT_COMPONENT_NAME|INSTALL_PREFIX|LIBRARY_PATH|MFC_FLAG|MODULE_PATH|NOT_USING_CONFIG_FLAGS|POLICY_DEFAULT_CMP\\w+|PREFIX_PATH|PROGRAM_PATH|SKIP_INSTALL_ALL_DEPENDENCY|SYSTEM_IGNORE_PATH|SYSTEM_INCLUDE_PATH|SYSTEM_LIBRARY_PATH|SYSTEM_PREFIX_PATH|SYSTEM_PROGRAM_PATH|USER_MAKE_RULES_OVERRIDE|WARN_ON_ABSOLUTE_INSTALL_DESTINATION))\\b",
       "name": "variable.source.cmake"
     },
     {
-      "match": "\\$\\{\\w+\\}",
+      "match": "\\$\\{\\w+}",
       "name": "storage.source.cmake"
     },
     {
-      "match": "\\$ENV\\{\\w+\\}",
+      "match": "\\$ENV\\{\\w+}",
       "name": "storage.source.cmake"
     },
     {
-      "comment": "Variables that Control the Build",
       "match": "\\b(?i:(CMAKE_)?(\\w+_POSTFIX|ARCHIVE_OUTPUT_DIRECTORY|AUTOMOC|AUTOMOC_MOC_OPTIONS|BUILD_WITH_INSTALL_RPATH|DEBUG_POSTFIX|EXE_LINKER_FLAGS|EXE_LINKER_FLAGS_\\w+|Fortran_FORMAT|Fortran_MODULE_DIRECTORY|GNUtoMS|INCLUDE_CURRENT_DIR|INCLUDE_CURRENT_DIR_IN_INTERFACE|INSTALL_NAME_DIR|INSTALL_RPATH|INSTALL_RPATH_USE_LINK_PATH|LIBRARY_OUTPUT_DIRECTORY|LIBRARY_PATH_FLAG|LINK_DEF_FILE_FLAG|LINK_DEPENDS_NO_SHARED|LINK_INTERFACE_LIBRARIES|LINK_LIBRARY_FILE_FLAG|LINK_LIBRARY_FLAG|MACOSX_BUNDLE|NO_BUILTIN_CHRPATH|PDB_OUTPUT_DIRECTORY|POSITION_INDEPENDENT_CODE|RUNTIME_OUTPUT_DIRECTORY|SKIP_BUILD_RPATH|SKIP_INSTALL_RPATH|TRY_COMPILE_CONFIGURATION|USE_RELATIVE_PATHS|WIN32_EXECUTABLE)|EXECUTABLE_OUTPUT_PATH|LIBRARY_OUTPUT_PATH)\\b",
       "name": "variable.source.cmake"
     },
     {
-      "comment": "Variables that Provide Information",
       "match": "\\b(?i:CMAKE_(AR|ARGC|ARGV0|BINARY_DIR|BUILD_TOOL|CACHEFILE_DIR|CACHE_MAJOR_VERSION|CACHE_MINOR_VERSION|CACHE_PATCH_VERSION|CFG_INTDIR|COMMAND|CROSSCOMPILING|CTEST_COMMAND|CURRENT_BINARY_DIR|CURRENT_LIST_DIR|CURRENT_LIST_FILE|CURRENT_LIST_LINE|CURRENT_SOURCE_DIR|DL_LIBS|EDIT_COMMAND|EXECUTABLE_SUFFIX|EXTRA_GENERATOR|EXTRA_SHARED_LIBRARY_SUFFIXES|GENERATOR|HOME_DIRECTORY|IMPORT_LIBRARY_PREFIX|IMPORT_LIBRARY_SUFFIX|LINK_LIBRARY_SUFFIX|MAJOR_VERSION|MAKE_PROGRAM|MINOR_VERSION|PARENT_LIST_FILE|PATCH_VERSION|PROJECT_NAME|RANLIB|ROOT|SCRIPT_MODE_FILE|SHARED_LIBRARY_PREFIX|SHARED_LIBRARY_SUFFIX|SHARED_MODULE_PREFIX|SHARED_MODULE_SUFFIX|SIZEOF_VOID_P|SKIP_RPATH|SOURCE_DIR|STANDARD_LIBRARIES|STATIC_LIBRARY_PREFIX|STATIC_LIBRARY_SUFFIX|TWEAK_VERSION|USING_VC_FREE_TOOLS|VERBOSE_MAKEFILE|VERSION)|PROJECT_BINARY_DIR|PROJECT_NAME|PROJECT_SOURCE_DIR|\\w+_BINARY_DIR|\\w+__SOURCE_DIR)\\b",
       "name": "variable.source.cmake"
     },
     {
       "begin": "#\\[(=*)\\[",
-      "comment": "BracketArgs",
-      "end": "\\]\\1\\]",
+      "end": "]\\1]",
       "name": "comment.source.cmake",
       "patterns": [
         {
@@ -58,8 +51,7 @@
     },
     {
       "begin": "\\[(=*)\\[",
-      "comment": "BracketArgs",
-      "end": "\\]\\1\\]",
+      "end": "]\\1]",
       "name": "argument.source.cmake",
       "patterns": [
         {
@@ -73,38 +65,31 @@
       "name": "comment.source.cmake"
     },
     {
-      "comment": "Properties on Cache Entries",
       "match": "\\b(?i:ADVANCED|HELPSTRING|MODIFIED|STRINGS|TYPE|VALUE)\\b",
       "name": "entity.source.cmake"
     },
     {
-      "comment": "Properties on Source Files",
       "match": "\\b(?i:ABSTRACT|COMPILE_DEFINITIONS|COMPILE_DEFINITIONS_<CONFIG>|COMPILE_FLAGS|EXTERNAL_OBJECT|Fortran_FORMAT|GENERATED|HEADER_FILE_ONLY|KEEP_EXTENSION|LABELS|LANGUAGE|LOCATION|MACOSX_PACKAGE_LOCATION|OBJECT_DEPENDS|OBJECT_OUTPUTS|SYMBOLIC|WRAP_EXCLUDE)\\b",
       "name": "entity.source.cmake"
     },
     {
-      "comment": "Properties on Tests",
       "match": "\\b(?i:ATTACHED_FILES|ATTACHED_FILES_ON_FAIL|COST|DEPENDS|ENVIRONMENT|FAIL_REGULAR_EXPRESSION|LABELS|MEASUREMENT|PASS_REGULAR_EXPRESSION|PROCESSORS|REQUIRED_FILES|RESOURCE_LOCK|RUN_SERIAL|TIMEOUT|WILL_FAIL|WORKING_DIRECTORY)\\b",
       "name": "entity.source.cmake"
     },
     {
-      "comment": "Properties on Directories",
       "match": "\\b(?i:ADDITIONAL_MAKE_CLEAN_FILES|CACHE_VARIABLES|CLEAN_NO_CUSTOM|COMPILE_DEFINITIONS|COMPILE_DEFINITIONS_\\w+|DEFINITIONS|EXCLUDE_FROM_ALL|IMPLICIT_DEPENDS_INCLUDE_TRANSFORM|INCLUDE_DIRECTORIES|INCLUDE_REGULAR_EXPRESSION|INTERPROCEDURAL_OPTIMIZATION|INTERPROCEDURAL_OPTIMIZATION_\\w+|LINK_DIRECTORIES|LISTFILE_STACK|MACROS|PARENT_DIRECTORY|RULE_LAUNCH_COMPILE|RULE_LAUNCH_CUSTOM|RULE_LAUNCH_LINK|TEST_INCLUDE_FILE|VARIABLES|VS_GLOBAL_SECTION_POST_\\w+|VS_GLOBAL_SECTION_PRE_\\w+)\\b",
       "name": "entity.source.cmake"
     },
     {
-      "comment": "Properties of Global Scope",
       "match": "\\b(?i:ALLOW_DUPLICATE_CUSTOM_TARGETS|DEBUG_CONFIGURATIONS|DISABLED_FEATURES|ENABLED_FEATURES|ENABLED_LANGUAGES|FIND_LIBRARY_USE_LIB64_PATHS|FIND_LIBRARY_USE_OPENBSD_VERSIONING|GLOBAL_DEPENDS_DEBUG_MODE|GLOBAL_DEPENDS_NO_CYCLES|IN_TRY_COMPILE|PACKAGES_FOUND|PACKAGES_NOT_FOUND|PREDEFINED_TARGETS_FOLDER|REPORT_UNDEFINED_PROPERTIES|RULE_LAUNCH_COMPILE|RULE_LAUNCH_CUSTOM|RULE_LAUNCH_LINK|RULE_MESSAGES|TARGET_ARCHIVES_MAY_BE_SHARED_LIBS|TARGET_SUPPORTS_SHARED_LIBS|USE_FOLDERS|__CMAKE_DELETE_CACHE_CHANGE_VARS_)\\b",
       "name": "entity.source.cmake"
     },
     {
-      "comment": "Properties on Targets",
       "match": "\\b(?i:\\w+_(OUTPUT_NAME|POSTFIX)|ARCHIVE_OUTPUT_(DIRECTORY(_\\w+)?|NAME(_\\w+)?)|AUTOMOC(_MOC_OPTIONS)?|BUILD_WITH_INSTALL_RPATH|BUNDLE|BUNDLE(_EXTENSION)?|COMPATIBLE_INTERFACE_BOOL|COMPATIBLE_INTERFACE_STRING|COMPILE_(DEFINITIONS(_\\w+)?|FLAGS)|DEBUG_POSTFIX|DEFINE_SYMBOL|ENABLE_EXPORTS|EXCLUDE_FROM_ALL|EchoString|FOLDER|FRAMEWORK|Fortran_(FORMAT|MODULE_DIRECTORY)|GENERATOR_FILE_NAME|GNUtoMS|HAS_CXX|IMPLICIT_DEPENDS_INCLUDE_TRANSFORM|IMPORTED|IMPORTED_(CONFIGURATIONS|IMPLIB(_\\w+)?|LINK_DEPENDENT_LIBRARIES(_\\w+)?|LINK_INTERFACE_LANGUAGES(_\\w+)?|LINK_INTERFACE_LIBRARIES(_\\w+)?|LINK_INTERFACE_MULTIPLICITY(_\\w+)?|LOCATION(_\\w+)?|NO_SONAME(_\\w+)?|SONAME(_\\w+)?)|IMPORT_PREFIX|IMPORT_SUFFIX|INSTALL_NAME_DIR|INSTALL_RPATH|INSTALL_RPATH_USE_LINK_PATH|INTERFACE|INTERFACE_COMPILE_DEFINITIONS|INTERFACE_INCLUDE_DIRECTORIES|INTERPROCEDURAL_OPTIMIZATION|INTERPROCEDURAL_OPTIMIZATION_\\w+|LABELS|LIBRARY_OUTPUT_DIRECTORY(_\\w+)?|LIBRARY_OUTPUT_NAME(_\\w+)?|LINKER_LANGUAGE|LINK_DEPENDS|LINK_FLAGS(_\\w+)?|LINK_INTERFACE_LIBRARIES(_\\w+)?|LINK_INTERFACE_MULTIPLICITY(_\\w+)?|LINK_LIBRARIES|LINK_SEARCH_END_STATIC|LINK_SEARCH_START_STATIC|LOCATION(_\\w+)?|MACOSX_BUNDLE|MACOSX_BUNDLE_INFO_PLIST|MACOSX_FRAMEWORK_INFO_PLIST|MAP_IMPORTED_CONFIG_\\w+|NO_SONAME|OSX_ARCHITECTURES(_\\w+)?|OUTPUT_NAME(_\\w+)?|PDB_NAME(_\\w+)?|POST_INSTALL_SCRIPT|PREFIX|PRE_INSTALL_SCRIPT|PRIVATE|PRIVATE_HEADER|PROJECT_LABEL|PUBLIC|PUBLIC_HEADER|RESOURCE|RULE_LAUNCH_(COMPILE|CUSTOM|LINK)|RUNTIME_OUTPUT_(DIRECTORY(_\\w+)?|NAME(_\\w+)?)|SKIP_BUILD_RPATH|SOURCES|SOVERSION|STATIC_LIBRARY_FLAGS(_\\w+)?|SUFFIX|TYPE|VERSION|VS_DOTNET_REFERENCES|VS_GLOBAL_(\\w+|KEYWORD|PROJECT_TYPES)|VS_KEYWORD|VS_SCC_(AUXPATH|LOCALPATH|PROJECTNAME|PROVIDER)|VS_WINRT_EXTENSIONS|VS_WINRT_REFERENCES|WIN32_EXECUTABLE|XCODE_ATTRIBUTE_\\w+)\\b",
       "name": "entity.source.cmake"
     },
     {
       "begin": "\\\\\"",
-      "comment": "Escaped Strings",
       "end": "\\\\\"",
       "name": "string.source.cmake",
       "patterns": [
@@ -116,7 +101,6 @@
     },
     {
       "begin": "\"",
-      "comment": "Normal Strings",
       "end": "\"",
       "name": "string.source.cmake",
       "patterns": [
@@ -127,13 +111,11 @@
       ]
     },
     {
-      "comment": "Derecated keyword",
       "match": "\\bBUILD_NAME\\b",
       "name": "invalid.deprecated.source.cmake"
     },
     {
-      "comment": "Compiler Flags",
-      "match": "\\b(?i:(CMAKE_)?(CXX_FLAGS|CMAKE_CXX_FLAGS_DEBUG|CMAKE_CXX_FLAGS_MINSIZEREL|CMAKE_CXX_FLAGS_RELEASE|CMAKE_CXX_FLAGS_RELWITHDEBINFO))\\b",
+      "match": "\\b(?i:(CMAKE_)?(C(?:XX_FLAGS|MAKE_CXX_FLAGS_DEBUG|MAKE_CXX_FLAGS_MINSIZEREL|MAKE_CXX_FLAGS_RELEASE|MAKE_CXX_FLAGS_RELWITHDEBINFO)))\\b",
       "name": "variable.source.cmake"
     }
   ],
diff --git a/resources/languages/cobol.json b/resources/languages/cobol.json
index c5bdc43..a21742f 100644
--- a/resources/languages/cobol.json
+++ b/resources/languages/cobol.json
@@ -30,7 +30,7 @@
   "name": "cobol",
   "patterns": [
     {
-      "match": "(^[ \\*][ \\*][ \\*][ \\*][ \\*][ \\*])([dD]\\s.*$)",
+      "match": "(^[ *][ *][ *][ *][ *][ *])([dD]\\s.*$)",
       "name": "token.info-token.cobol"
     },
     {
@@ -42,7 +42,7 @@
           "name": "comment.line.cobol.newpage"
         }
       },
-      "match": "(^[ \\*][ \\*][ \\*][ \\*][ \\*][ \\*])(\\/.*$)"
+      "match": "(^[ *][ *][ *][ *][ *][ *])(/.*$)"
     },
     {
       "captures": {
@@ -53,7 +53,7 @@
           "name": "comment.line.cobol.fixed"
         }
       },
-      "match": "(^[ \\*][ \\*][ \\*][ \\*][ \\*][ \\*])(\\*.*$)"
+      "match": "(^[ *][ *][ *][ *][ *][ *])(\\*.*$)"
     },
     {
       "captures": {
@@ -64,7 +64,7 @@
           "name": "comment.line.cobol.newpage"
         }
       },
-      "match": "(^[0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s])(\\/.*$)"
+      "match": "(^[0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s])(/.*$)"
     },
     {
       "match": "^[0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s]$",
@@ -84,13 +84,13 @@
     {
       "captures": {
         "1": {
-          "name": "constant.cobol"
+          "name": "constant.numeric.cobol"
         },
         "2": {
           "name": "comment.line.cobol.fixed"
         }
       },
-      "match": "(^[0-9a-zA-Z\\s\\$#%\\.@\\- ][0-9a-zA-Z\\s\\$#%\\.@\\- ][0-9a-zA-Z\\s\\$#%\\.@\\- ][0-9a-zA-Z\\s\\$#%\\.@\\- ][0-9a-zA-Z\\s\\$#%\\.@\\- ][0-9a-zA-Z\\s\\$#%\\.@\\- ])(\\*.*$)"
+      "match": "(^[0-9a-zA-Z\\s$#%.@\\- +][0-9a-zA-Z\\s$#%.@\\- +][0-9a-zA-Z\\s$#%.@\\- +][0-9a-zA-Z\\s$#%.@\\- +][0-9a-zA-Z\\s$#%.@\\- +][0-9a-zA-Z\\s$#%.@\\- +])(\\*.*$)"
     },
     {
       "captures": {
@@ -126,7 +126,7 @@
           "name": "comment.line.cobol.newpage"
         }
       },
-      "match": "(^[0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@])(\\/.*$)"
+      "match": "(^[0-9a-zA-Z\\s$#%.@][0-9a-zA-Z\\s$#%.@][0-9a-zA-Z\\s$#%.@][0-9a-zA-Z\\s$#%.@][0-9a-zA-Z\\s$#%.@][0-9a-zA-Z\\s$#%.@])(/.*$)"
     },
     {
       "match": "^\\*.*$",
@@ -252,7 +252,7 @@
           "name": "entity.other.attribute-name.preprocessor.cobol"
         }
       },
-      "match": "(\\$region|\\$end-region)(.*$)"
+      "match": "(\\$(?:region|end-region))(.*$)"
     },
     {
       "begin": "\\$(?i:doc)(.*$)",
@@ -264,7 +264,7 @@
       "name": "invalid.illegal.meta.preprocessor.cobolit"
     },
     {
-      "match": "(?i:substitute-case|substitute)\\s+",
+      "match": "(?i:substitute(?:-case|))\\s+",
       "name": "invalid.illegal.functions.cobolit"
     },
     {
@@ -279,7 +279,7 @@
           "name": "invalid.illegal.entity.name.function.preprocessor.cobol"
         }
       },
-      "match": "((((>>|\\$)[\\s]*)(?i:elif))(.*$))"
+      "match": "((((>>|\\$)\\s*)(?i:elif))(.*$))"
     },
     {
       "captures": {
@@ -293,7 +293,7 @@
           "name": "entity.name.function.preprocessor.cobol"
         }
       },
-      "match": "((((>>|\\$)[\\s]*)(?i:if|else|elif|end-if|end-evaluate|end|define|evaluate|when|display|call-convention|set))(.*$))"
+      "match": "((((>>|\\$)\\s*)(?i:if|else|elif|end-if|end-evaluate|end|define|evaluate|when|display|call-convention|set))(.*$))"
     },
     {
       "captures": {
@@ -354,13 +354,13 @@
       "name": "meta.symbol.forced.cobol"
     },
     {
-      "begin": "((?<![-_a-zA-Z0-9()-])(?i:installation|author|source-computer|object-computer|date-written|security|date-compiled)(\\.|$))",
+      "begin": "((?<![-_a-zA-Z0-9()])(?i:installation|author|source-computer|object-computer|date-written|security|date-compiled)(\\.|$))",
       "beginCaptures": {
         "0": {
           "name": "keyword.identifiers.cobol"
         }
       },
-      "end": "(?=((?<![-_])(?i:remarks|author|date-written|source-computer|object-computer|installation|date-compiled|special-names|security|environment\\s+division|data\\s+division|working-storage\\s+section|input-output\\s+section|linkage\\s+section|procedure\\s+division|local-storage\\s+section)|^[ \\*][ \\*][ \\*][ \\*][ \\*][ \\*]\\*.*$|^\\+$))",
+      "end": "(?=((?<![-_])(?i:remarks|author|date-written|source-computer|object-computer|installation|date-compiled|special-names|security|environment\\s+division|data\\s+division|working-storage\\s+section|input-output\\s+section|linkage\\s+section|procedure\\s+division|local-storage\\s+section)|^[ *][ *][ *][ *][ *][ *]\\*.*$|^\\+$))",
       "name": "comment.block.cobol.remark",
       "patterns": [
         {
@@ -381,8 +381,7 @@
           "name": "keyword.end.bracket.cobol"
         }
       },
-      "comment": "simple numerics in () and []",
-      "match": "(?<=(\\(|\\[))((\\-\\+)*\\s*[0-9 ,\\.\\+\\-\\*\\/]+)(?=(\\)|\\]))",
+      "match": "(?<=([(\\[]))((-\\+)*\\s*[0-9 ,.+\\-*/]+)(?=([)\\]]))",
       "name": "constant.numeric.cobol"
     },
     {
@@ -396,13 +395,13 @@
       "name": "constant.language.cobol"
     },
     {
-      "match": "(?<![-_])(?i:zeroes|alphabetic-lower|alphabetic-upper|alphanumeric-edited|alphabetic|alphabet|alphanumeric|zeros|zeros|zero|spaces|space|quotes|quote|low-values|low-value|high-values|high-value)(?=\\s+|\\.|,|\\))",
+      "match": "(?<![-_])(?i:zeroes|alphabetic-lower|alphabetic-upper|alphanumeric-edited|alphabetic|alphabet|alphanumeric|zeros|zeros|zero|spaces|space|quotes|quote|low-values|low-value|high-values|high-value)(?=\\s+|[.,)])",
       "name": "constant.language.figurative.cobol"
     },
     {
-      "begin": "(?i:exec\\s+sqlims|exec\\s+sql)",
+      "begin": "(?i:exec(?:\\s+sqlims|\\s+sql))",
       "contentName": "meta.embedded.block.openesql",
-      "end": "(?i:end\\-exec)",
+      "end": "(?i:end-exec)",
       "name": "keyword.verb.cobol",
       "patterns": [
         {
@@ -418,7 +417,7 @@
           "name": "comment.line.modern"
         },
         {
-          "match": "(\\:([0-9a-zA-Z\\-_])*)",
+          "match": "(:([0-9a-zA-Z\\-_])*)",
           "name": "variable.cobol"
         },
         {
@@ -429,7 +428,7 @@
     {
       "begin": "(?i:exec\\s+cics)",
       "contentName": "meta.embedded.block.cics",
-      "end": "(?i:end\\-exec)",
+      "end": "(?i:end-exec)",
       "name": "keyword.verb.cobol",
       "patterns": [
         {
@@ -452,7 +451,7 @@
           "include": "#number-simple-constant"
         },
         {
-          "match": "([a-zA-Z-0-9_]*[a-zA-Z0-9]|([#]?[0-9a-zA-Z]+[a-zA-Z-0-9_]*[a-zA-Z0-9]))",
+          "match": "([a-zA-Z\\-0-9_]*[a-zA-Z0-9]|(#?[0-9a-zA-Z]+[a-zA-Z\\-0-9_]*[a-zA-Z0-9]))",
           "name": "variable.cobol"
         }
       ]
@@ -460,7 +459,7 @@
     {
       "begin": "(?i:exec\\s+dli)",
       "contentName": "meta.embedded.block.dli",
-      "end": "(?i:end\\-exec)",
+      "end": "(?i:end-exec)",
       "name": "keyword.verb.cobol",
       "patterns": [
         {
@@ -486,7 +485,7 @@
           "include": "#number-simple-constant"
         },
         {
-          "match": "([a-zA-Z-0-9_]*[a-zA-Z0-9]|([#]?[0-9a-zA-Z]+[a-zA-Z-0-9_]*[a-zA-Z0-9]))",
+          "match": "([a-zA-Z\\-0-9_]*[a-zA-Z0-9]|(#?[0-9a-zA-Z]+[a-zA-Z\\-0-9_]*[a-zA-Z0-9]))",
           "name": "variable.cobol"
         }
       ]
@@ -494,7 +493,7 @@
     {
       "begin": "(?i:exec\\s+sqlims)",
       "contentName": "meta.embedded.block.openesql",
-      "end": "(?i:end\\-exec)",
+      "end": "(?i:end-exec)",
       "name": "keyword.verb.cobol",
       "patterns": [
         {
@@ -502,7 +501,7 @@
           "name": "comment.line.modern"
         },
         {
-          "match": "(\\:([a-zA-Z\\-])*)",
+          "match": "(:([a-zA-Z-])*)",
           "name": "variable.cobol"
         },
         {
@@ -513,7 +512,7 @@
     {
       "begin": "(?i:exec\\s+ado)",
       "contentName": "meta.embedded.block.openesql",
-      "end": "(?i:end\\-exec)",
+      "end": "(?i:end-exec)",
       "name": "keyword.verb.cobol",
       "patterns": [
         {
@@ -525,7 +524,7 @@
           "name": "comment.line.modern"
         },
         {
-          "match": "(\\:([a-zA-Z\\-])*)",
+          "match": "(:([a-zA-Z-])*)",
           "name": "variable.cobol"
         },
         {
@@ -536,7 +535,7 @@
     {
       "begin": "(?i:exec\\s+html)",
       "contentName": "meta.embedded.block.html",
-      "end": "(?i:end\\-exec)",
+      "end": "(?i:end-exec)",
       "name": "keyword.verb.cobol",
       "patterns": [
         {
@@ -547,7 +546,7 @@
     {
       "begin": "(?i:exec\\s+java)",
       "contentName": "meta.embedded.block.java",
-      "end": "(?i:end\\-exec)",
+      "end": "(?i:end-exec)",
       "name": "keyword.verb.cobol",
       "patterns": [
         {
@@ -610,7 +609,7 @@
           "name": "punctuation.definition.string.end.cobol"
         }
       },
-      "match": "(\\')(CBL_.*)(\\')"
+      "match": "(')(CBL_.*)(')"
     },
     {
       "captures": {
@@ -624,7 +623,7 @@
           "name": "punctuation.definition.string.end.cobol"
         }
       },
-      "match": "(\\')(PC_.*)(\\')"
+      "match": "(')(PC_.*)(')"
     },
     {
       "begin": "'",
@@ -642,7 +641,7 @@
       "name": "string.quoted.single.cobol"
     },
     {
-      "begin": "(?<![\\-\\w])[gGzZ]\"",
+      "begin": "(?<![-\\w])[gGzZ]\"",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.cobol"
@@ -657,7 +656,7 @@
       "name": "string.quoted.double.cobol"
     },
     {
-      "begin": "(?<![\\-\\w])[gGzZ]'",
+      "begin": "(?<![-\\w])[gGzZ]'",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.cobol"
@@ -672,7 +671,7 @@
       "name": "string.quoted.single.cobol"
     },
     {
-      "begin": "(?<![\\-\\w])[gGnN]\"",
+      "begin": "(?<![-\\w])[gGnN]\"",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.cobol"
@@ -687,7 +686,7 @@
       "name": "string.quoted.double.cobol"
     },
     {
-      "begin": "(?<![\\-\\w])[gGnN]'",
+      "begin": "(?<![-\\w])[gGnN]'",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.cobol"
@@ -702,7 +701,7 @@
       "name": "string.quoted.single.cobol"
     },
     {
-      "begin": "(?<![\\-\\w])[uU]\"",
+      "begin": "(?<![-\\w])[uU]\"",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.cobol"
@@ -717,7 +716,7 @@
       "name": "string.quoted.utf8.double.cobol"
     },
     {
-      "begin": "(?<![\\-\\w])[uU]'",
+      "begin": "(?<![-\\w])[uU]'",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.cobol"
@@ -744,26 +743,26 @@
           "name": "entity.name.function.cobol"
         }
       },
-      "match": "(?<![-_])((?i:valuetype-id|operator-id|method-id|method|property-id|attribute-id|enum-id|iterator-id|class-id|program-id|operator-id|end\\s+program|end\\s+valuetype|extension))[\\.]*[\\s]+([a-zA-Z0-9_-]*)"
+      "match": "(?<![-_])((?i:valuetype-id|operator-id|method-id|method|property-id|attribute-id|enum-id|iterator-id|class-id|program-id|operator-id|end\\s+program|end\\s+valuetype|extension))\\.*\\s+([a-zA-Z0-9_-]*)"
     },
     {
-      "match": "(?<![-_])(?i:implements|inherits|constraints|constrain)(?=\\s|\\.)",
+      "match": "(?<![-_])(?i:implements|inherits|constraints|constrain)(?=[\\s.])",
       "name": "keyword.verb.cobol"
     },
     {
-      "match": "(?<![-_])(?i:end\\s+enum|end\\s+interface|end\\s+class|end\\s+property|end\\s+method|end\\s+object|end\\s+iterator|end\\s+function|end\\s+operator|end\\s+program|end\\s+indexer|create|reset|instance|delegate|end-delegate|delegate-id|declare|exception-object|as|stop\\s+iterator|stop\\s+run|stop)(?=\\s|\\.|,|\\))",
+      "match": "(?<![-_])(?i:end\\s+enum|end\\s+interface|end\\s+class|end\\s+property|end\\s+method|end\\s+object|end\\s+iterator|end\\s+function|end\\s+operator|end\\s+program|end\\s+indexer|create|reset|instance|delegate|end-delegate|delegate-id|declare|exception-object|as|stop\\s+iterator|stop\\s+run|stop)(?=[\\s.,)])",
       "name": "keyword.identifiers.cobol"
     },
     {
-      "match": "\\s+(?i:attach\\s+method|attach\\s+del|attach|detach\\s+del|detach\\s+method|detach|method|del)(?=\\s|\\.|$)",
+      "match": "\\s+(?i:attach\\s+method|attach\\s+del|attach|detach\\s+del|detach\\s+method|detach|method|del)(?=[\\s.]|$)",
       "name": "keyword.identifiers.cobol"
     },
     {
-      "match": "\\s+(?i:sync\\s+(?i:on))(?=\\s|\\.)",
+      "match": "\\s+(?i:sync\\s+(?i:on))(?=[\\s.])",
       "name": "keyword.other.sync.cobol"
     },
     {
-      "match": "\\s+(?i:try|finally|catch|end-try|throw)(?=\\s|\\.|$)",
+      "match": "\\s+(?i:try|finally|catch|end-try|throw)(?=[\\s.]|$)",
       "name": "keyword.control.catch-exception.cobol"
     },
     {
@@ -771,15 +770,15 @@
       "name": "keyword.otherverb.cobol"
     },
     {
-      "match": "(?i:dynamic)\\s+(?i:length)(?=\\s|\\.)",
+      "match": "(?i:dynamic)\\s+(?i:length)(?=[\\s.])",
       "name": "storage.type.dynamiclength.cobol"
     },
     {
-      "match": "(?<![-_])(?i:assign|external|prototype|organization|organisation|indexed|column|plus|line\\*s*sequential|sequential|access|dynamic|relative|label|block|contains|standard|records|record\\s+key|record|is|alternate|duplicates|reel|tape|terminal|disk\\sfilename|disk|disc|recording\\smode|mode|random)(?=\\s|\\.)",
+      "match": "(?<![-_])(?i:assign|external|prototype|organization|organisation|indexed|column|plus|line\\*s*sequential|sequential|access|dynamic|relative|label|block|contains|standard|records|record\\s+key|record|is|alternate|duplicates|reel|tape|terminal|disk\\sfilename|disk|disc|recording\\smode|mode|random)(?=[\\s.])",
       "name": "keyword.identifers.cobol"
     },
     {
-      "match": "(?<![-_])(?i:max|min|integer-of-date|integer-of-day|integer-part|integer|date-to-yyyymmdd|year-to-yyyy|day-to-yyyyddd|exp|exception-file|exception-location|exception-statement|exception-status|e|variance|integer-of-date|rem|pi|factorial|sqrt|log10|fraction-part|mean|exp|log|char|day-of-integer|date-of-integer|exp10|atan|integer-part|tan|sin|cos|midrange|addr|acos|asin|annuity|present-value|integer-of-day|ord-max|ord-min|ord|random|integer-of-date|sum|standard-deviation|median|reverse|abs|upper-case|lower-case|char-national|numval|mod|range|length|locale-date|locale-time-from-seconds|locale-time|seconds-past-midnight|stored-char-length|seconds-from-formatted-time|seconds-past-midnight|trim|length-an|numval-c|current-date|national-of|display-of|when-compiled|integer-of-boolean|combined-datetime|concatenate)(?=\\s|\\.|\\(|\\))",
+      "match": "(?<![-_])(?i:max|min|integer-of-date|integer-of-day|integer-part|integer|date-to-yyyymmdd|year-to-yyyy|day-to-yyyyddd|exp|exception-file|exception-location|exception-statement|exception-status|e|variance|integer-of-date|rem|pi|factorial|sqrt|log10|fraction-part|mean|exp|log|char|day-of-integer|date-of-integer|exp10|atan|integer-part|tan|sin|cos|midrange|addr|acos|asin|annuity|present-value|integer-of-day|ord-max|ord-min|ord|random|integer-of-date|sum|standard-deviation|median|reverse|abs|upper-case|lower-case|char-national|numval|mod|range|length|locale-date|locale-time-from-seconds|locale-time|seconds-past-midnight|stored-char-length|seconds-from-formatted-time|seconds-past-midnight|trim|length-an|numval-c|current-date|national-of|display-of|when-compiled|integer-of-boolean|combined-datetime|concatenate)(?=[\\s.()])",
       "name": "support.function.cobol"
     },
     {
@@ -797,10 +796,10 @@
           "name": "punctuation.definition.string.end.cobol"
         }
       },
-      "match": "(?<![-_])(?i:DFHRESP|DFHVALUE)(\\s*\\(\\s*)([a-zA-Z]*)(\\s*\\))"
+      "match": "(?<![-_])(?i:DFH(?:RESP|VALUE))(\\s*\\(\\s*)([a-zA-Z]*)(\\s*\\))"
     },
     {
-      "match": "(?<![-_])(?i:function)(?=\\s|\\.)",
+      "match": "(?<![-_])(?i:function)(?=[\\s.])",
       "name": "keyword.verb.cobol"
     },
     {
@@ -824,15 +823,14 @@
           "name": "storage.type.cobol"
         }
       },
-      "comment": "type ssss ",
-      "match": "(?<![-_])(?i:type|new)\\s+([a-zA-Z][a-zA-Z0-9\\$\\-\\._]*|[a-zA-Z])(?=\\.$)"
+      "match": "(?<![-_])(?i:type|new)\\s+([a-zA-Z][a-zA-Z0-9$\\-._]*|[a-zA-Z])(?=\\.$)"
     },
     {
       "match": "(?<![-_])(?i:string)(?=\\s+value|\\.)",
       "name": "storage.type.cobol"
     },
     {
-      "match": "(?<![-_])(?i:bit|byte|binary-char|binary-char-unsigned|binary-short|binary-short-unsigned|binary.long|binary-c-long|binary-long-unsigned|binary-long|binary-double|binary-double-unsigned|float-short|float-extended|float-long|bit|condition-value|characters|character\\s+type|character|comma|crt|decimal|object\\+sreference|object-reference|object|list|dictionary|unsigned)(?=\\s|\\.|,|\\]|\\[)",
+      "match": "(?<![-_])(?i:bit|byte|binary-char|binary-char-unsigned|binary-short|binary-short-unsigned|binary.long|binary-c-long|binary-long-unsigned|binary-long|binary-double|binary-double-unsigned|float-short|float-extended|float-long|bit|condition-value|characters|character\\s+type|character|comma|crt|decimal|object\\+sreference|object-reference|object|list|dictionary|unsigned)(?=[\\s.,\\]\\[])",
       "name": "storage.type.cobol"
     },
     {
@@ -844,8 +842,7 @@
           "name": "meta.symbol.cobol"
         }
       },
-      "comment": "operator-id ssss ",
-      "match": "(operator-id\\s+[+\\-\\*\\/])",
+      "match": "(operator-id\\s+[+\\-*/])",
       "name": "keyword.operator-id.cobol"
     },
     {
@@ -857,8 +854,7 @@
           "name": "entity.name.function.b3"
         }
       },
-      "comment": " ::.. ",
-      "match": "(?i:self)(\\:\\:)([0-9a-zA-Z_\\-\\.]*)(?=\\.$)"
+      "match": "(?i:self)(::)([0-9a-zA-Z_\\-.]*)(?=\\.$)"
     },
     {
       "captures": {
@@ -869,8 +865,7 @@
           "name": "entity.name.function.cobol"
         }
       },
-      "comment": " ::.. ",
-      "match": "(\\:\\:)([0-9a-zA-Z_\\-\\.]*)"
+      "match": "(::)([0-9a-zA-Z_\\-.]*)"
     },
     {
       "captures": {
@@ -881,10 +876,10 @@
           "name": "storage.type.cobol.bb"
         }
       },
-      "match": "(?<![-_])(?i:type)\\s+([0-9a-zA-Z\\.]*)"
+      "match": "(?<![-_])(?i:type)\\s+([0-9a-zA-Z.]*)"
     },
     {
-      "match": "(?<![-_])(?i:if|else|end-if|exit\\s+iterator|exit\\s+program|exit\\s+method|evaluate|end-evaluate|exit\\s+perform|perform|end-perform|when\\s+other|when|continue|call|end-call|chain|end-chain|invoke|end\\s+invoke|go\\s+to|go|sort|merge|use|xml|parse|stop\\s+run|goback\\s+returning|goback|raise|exit\\s+function|exit\\sparagraph|await)(?![0-9A-Za-z_-])",
+      "match": "(?<![-_])(?i:if|else|end-if|exit\\s+iterator|exit\\s+program|exit\\s+method|evaluate|end-evaluate|exit\\s+perform|perform|end-perform|when\\s+other|when|continue|call|end-call|chain|end-chain|invoke|end\\s+invoke|end-xml|go\\s+to|go|sort|merge|use|xml\\s+parse|xml|top\\s+run|goback\\s+returning|goback|raise|exit\\s+function|exit\\sparagraph|await)(?![0-9A-Za-z_-])",
       "name": "keyword.control.cobol"
     },
     {
@@ -902,7 +897,7 @@
           "name": "constant.numeric.cobol"
         }
       },
-      "match": "(?<![-_])((?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBxXuUpPnNzZ/,.]*)\\(([0-9]*)\\)([vV][-+sS\\*$09aAbBxXuUpPnNzZ/,\\.]*)\\(([0-9]*)\\)[-|+]"
+      "match": "(?<![-_])((?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[-+sS*$09aAbBxXuUpPnNzZ/,.]*)\\(([0-9]*)\\)([vV][-+sS*$09aAbBxXuUpPnNzZ/,.]*)\\(([0-9]*)\\)[-|+]"
     },
     {
       "captures": {
@@ -919,7 +914,7 @@
           "name": "constant.numeric.cobol"
         }
       },
-      "match": "(?<![-_])((?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBxXuUpPnNzZ/,.]*)\\(([0-9]*)\\)([vV][-+sS\\*$09aAbBxXuUpPnNzZ/,\\.]*)\\(([0-9]*)\\)"
+      "match": "(?<![-_])((?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[-+sS*$09aAbBxXuUpPnNzZ/,.]*)\\(([0-9]*)\\)([vV][-+sS*$09aAbBxXuUpPnNzZ/,.]*)\\(([0-9]*)\\)"
     },
     {
       "captures": {
@@ -933,14 +928,14 @@
           "name": "storage.type.picture8.cobol"
         }
       },
-      "match": "(?<![-_])((?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBxXuUpPnNzZ/,.]*)\\(([0-9]*)\\)([vV\\.][-+s\\*$09aAbBsSnNxXuUzZ/,]*[0-9\\.()])*"
+      "match": "(?<![-_])((?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[-+sS*$09aAbBxXuUpPnNzZ/,.]*)\\(([0-9]*)\\)([vV.][-+s*$09aAbBSnNxXuUzZ/,]*[0-9.()])*"
     },
     {
-      "match": "(?<![-_])(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBsSnpPNxXuUzZ/,.]*\\([0-9]*\\)[Vv\\.][-+s\\*0$9aAbBsSnNxpPxXuUzZ/,]*",
+      "match": "(?<![-_])(?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[-+sS*$09aAbBnpPNxXuUzZ/,.]*\\([0-9]*\\)[Vv.][-+s*0$9aAbBSnNxpPXuUzZ/,]*",
       "name": "storage.type.picture7.cobol"
     },
     {
-      "match": "(?<![-_])(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBsSnpPNxXuUzZ/,.]*\\([0-9]*\\)[-+s\\*0$9aAbBsSnNxpPxXuUzZ/,]*[Vv\\.][-+s\\*0$9aAbBsSnNxpPxXuUzZ/,]*",
+      "match": "(?<![-_])(?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[-+sS*$09aAbBnpPNxXuUzZ/,.]*\\([0-9]*\\)[-+s*0$9aAbBSnNxpPXuUzZ/,]*[Vv.][-+s*0$9aAbBSnNxpPXuUzZ/,]*",
       "name": "storage.type.picture6.cobol"
     },
     {
@@ -952,22 +947,22 @@
           "name": "constant.numeric.cobol"
         }
       },
-      "match": "(?<![-_])((?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBsSnpPNxuUXzZ/,.]*)\\(([0-9]*)\\)[-+s\\*0$9aAbBsSnNxpPxXuUzZ/,]*"
+      "match": "(?<![-_])((?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[-+sS*$09aAbBnpPNxuUXzZ/,.]*)\\(([0-9]*)\\)[-+s*0$9aAbBSnNxpPXuUzZ/,]*"
     },
     {
-      "match": "(?<![-_])(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+sS\\*$09aAbBsSnpNNxXuUzZ/,.]*\\([0-9]*\\)",
+      "match": "(?<![-_])(?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[-+sS*$09aAbBnpNxXuUzZ/,.]*\\([0-9]*\\)",
       "name": "storage.type.picture4.cobol"
     },
     {
-      "match": "(?<![-_])(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[sS]?[9aAbBsSnNxXuUzZ]*[Vv][9aAxbXuUzZ]*\\([0-9]*\\)",
+      "match": "(?<![-_])(?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[sS]?[9aAbBsSnNxXuUzZ]*[Vv][9aAxbXuUzZ]*\\([0-9]*\\)",
       "name": "storage.type.picture3.cobol"
     },
     {
-      "match": "(?<![-_])(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[sS]?[9aAbBsSnNxXuUzZ]*[Vv][9aAxbXuUzZ]*",
+      "match": "(?<![-_])(?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[sS]?[9aAbBsSnNxXuUzZ]*[Vv][9aAxbXuUzZ]*",
       "name": "storage.type.picture2.cobol"
     },
     {
-      "match": "(?<![-_])(?i:picture\\s+is|picture|pic\\s+is|pic)\\s+[-+\\*$9aAbBsSnpPNxXuUzZ/,.vV]*",
+      "match": "(?<![-_])(?i:pic(?:ture\\s+is|ture|\\s+is|))\\s+[-+*$9aAbBsSnpPNxXuUzZ/,.vV]*",
       "name": "storage.type.picture1.cobol"
     },
     {
@@ -982,11 +977,11 @@
       "match": "((?<![-_])(?i:binary|computational-4|comp-4|computational-5|comp-5))\\(([0-9]*)\\)"
     },
     {
-      "match": "(?i:cblt-x1-compx-const|cblt-x2-compx-const|cblt-x4-compx-const|cblt-alphanum-const|cblt-x9-compx|cblt-x8-compx|cblt-x8-comp5|cblt-x4-compx|cblt-x4-comp5|cblt-x2-compx|cblt-x2-comp5|cblt-x1-compx|cblt-x1-comp5|cblt-x1|cblt-vfile-status|cblt-vfile-handle|cblt-sx8-comp5|cblt-sx4-comp5|cblt-sx2-comp5|cblt-sx1-comp5|cblt-subsys-params|cblt-splitjoin-buf|cblt-screen-position|cblt-rtncode|cblt-request-context|cblt-reqhand-service-info|cblt-reqhand-service-funcs|cblt-reqhand-response|cblt-reqhand-funcs|cblt-prog-info-params|cblt-prog-info-arg-info|cblt-printer-properties|cblt-printer-name|cblt-printer-info|cblt-printer-default|cblt-ppointer|cblt-pointer|cblt-os-ssize|cblt-os-size|cblt-os-offset|cblt-os-info-params|cblt-os-flags|cblt-node-name|cblt-nls-msg-params|cblt-nls-msg-number-pair|cblt-nls-msg-ins-struct|cblt-nls-msg-buffer|cblt-mouse-shape|cblt-mouse-rect|cblt-mouse-pos|cblt-mouse-event|cblt-mem-validate-param|cblt-idp-exit-service-funcs|cblt-idp-exit-info|cblt-HWND|cblt-HINSTANCE|cblt-get-scr-line-draw-buffer|cblt-get-scr-graphics-buffer|cblt-generic-attr-value|cblt-generic-attr-rgb-values|cblt-generic-attr-information|cblt-file-status|cblt-fileexist-buf|cblt-exit-params|cblt-exit-info-params|cblt-cancel-proc-params|cblt-bytestream-handle|cblt-alphanum)",
+      "match": "(?i:cblt-(?:x1-compx-const|x2-compx-const|x4-compx-const|alphanum-const|x9-compx|x8-compx|x8-comp5|x4-compx|x4-comp5|x2-compx|x2-comp5|x1-compx|x1-comp5|x1|vfile-status|vfile-handle|sx8-comp5|sx4-comp5|sx2-comp5|sx1-comp5|subsys-params|splitjoin-buf|screen-position|rtncode|request-context|reqhand-service-info|reqhand-service-funcs|reqhand-response|reqhand-funcs|prog-info-params|prog-info-arg-info|printer-properties|printer-name|printer-info|printer-default|ppointer|pointer|os-ssize|os-size|os-offset|os-info-params|os-flags|node-name|nls-msg-params|nls-msg-number-pair|nls-msg-ins-struct|nls-msg-buffer|mouse-shape|mouse-rect|mouse-pos|mouse-event|mem-validate-param|idp-exit-service-funcs|idp-exit-info|HWND|HINSTANCE|get-scr-line-draw-buffer|get-scr-graphics-buffer|generic-attr-value|generic-attr-rgb-values|generic-attr-information|file-status|fileexist-buf|exit-params|exit-info-params|cancel-proc-params|bytestream-handle|alphanum))",
       "name": "support.function.cbltypes.cobol"
     },
     {
-      "match": "(?<![-_])(?i:computational-1|comp-1|computational-2|comp-2|computational-3|comp-3|computational-4|comp-4|computational-x|comp-x|computational-5|comp-5|computational-6|comp-6|computational-n|comp-n|packed-decimal|index|float|double|signed-short|unsigned-short|signed-int|unsigned-int|signed-long|unsigned-long|comp|computational|group-usage|usage\\sis\\sdisplay|usage\\sis\\sfont|usage\\s+display|binary|mutex-pointer|data-pointer|thread-pointer|sempahore-pointer|event-pointer|program-pointer|procedure-pointer|pointer|window|subwindow|control-type|thread|menu|variant|layout-manager|occurs|typedef|any|times|display\\s+blank\\s+when|blank\\s+when|blank\\s+screen|blank|usage\\sis|is\\spartial|usage|justified|just|right|signed|trailing\\s+separate|sign|seperate|sql)(?=\\s|\\.|\\))",
+      "match": "(?<![-_])(?i:computational-1|comp-1|computational-2|comp-2|computational-3|comp-3|computational-4|comp-4|computational-x|comp-x|computational-5|comp-5|computational-6|comp-6|computational-n|comp-n|packed-decimal|index|float|double|signed-short|unsigned-short|signed-int|unsigned-int|signed-long|unsigned-long|comp|computational|group-usage|usage\\sis\\sdisplay|usage\\sis\\sfont|usage\\s+display|binary|mutex-pointer|data-pointer|thread-pointer|sempahore-pointer|event-pointer|program-pointer|procedure-pointer|pointer-32|pointer|window|subwindow|control-type|thread|menu|variant|layout-manager|occurs|typedef|any|times|display\\s+blank\\s+when|blank\\s+when|blank\\s+screen|blank|usage\\sis|is\\spartial|usage|justified|just|right|signed|trailing\\s+separate|sign|seperate|sql)(?=[\\s.)])",
       "name": "storage.type.picture.cobol"
     },
     {
@@ -1010,11 +1005,11 @@
       "name": "invalid.illegal.screens.acu.cobol"
     },
     {
-      "match": "(?<![-_])(?i:internal|public|protected|final|private|static|new|abstract|override|readonly|property|async-void|async-value|async)(?=\\s|\\.)",
+      "match": "(?<![-_])(?i:internal|public|protected|final|private|static|new|abstract|override|readonly|property|async-void|async-value|async)(?=[\\s.])",
       "name": "storage.modifier.cobol"
     },
     {
-      "match": "=|<|>|<=|>=|<>|\\+|\\-|\\*|\\/|(?<![-_])(?i:b-and|b-or|b-xor|b-exor|b-not|b-left|b-right|and|or|equals|equal|greater\\s+than|less\\s+than|greater)(?![0-9A-Za-z_-])",
+      "match": "[=<>]|<=|>=|<>|[+\\-*/]|(?<![-_])(?i:b-and|b-or|b-xor|b-exor|b-not|b-left|b-right|and|or|equals|equal|greater\\s+than|less\\s+than|greater)(?![0-9A-Za-z_-])",
       "name": "keyword.operator.cobol"
     },
     {
@@ -1030,7 +1025,7 @@
       "name": "support.type.cobol"
     },
     {
-      "match": "(?<![-_])(?i:end-xml|processing.*procedure|xml\\sparse|xml|xml-information|xml-text|xml-schemal|xml-declaration)(?![0-9A-Za-z_-])",
+      "match": "(?<![-_])(?i:processing.*procedure|xml-information|xml-text|xml-schemal|xml-declaration)(?![0-9A-Za-z_-])",
       "name": "keyword.xml.cobol"
     },
     {
@@ -1038,11 +1033,11 @@
       "name": "keyword.json.cobol"
     },
     {
-      "match": "(?<![-_])(?i:modify|inquire|tab|title|event|center|label-offset|cell|help-id|cells|push-button|radio-button|page-layout-screen|entry-field|list-box|label|default-font|id|no-tab|unsorted|color|height|width|bind|thread|erase|modeless|scroll|system|menu|title-bar|wrap|destroy|resizeable|user-gray|large-font|newline|3-d|data-columns|display-columns|alignment|separation|cursor-frame-width|divider-color|drag-color|heading-color|heading-divider-color|num-rows|record-data|tiled-headings|vpadding|centered-headings|column-headings|self-act|cancel-button|vscroll|report-composer|clsid|primary-interface|active-x-control|default-interface|default-source|auto-minimize|auto-resize|resource|engraved|initial-state|frame|acuactivexcontrol|activex-res|grid|box|message|namespace|class-name|module|constructor|version|strong|culture|method|handle|exception-value|read-only|dividers|graphical|indexed|termination-value|permanent|boxed|visible|centered|record-position|convert)(?=\\s|\\.|,|;|$)",
+      "match": "(?<![-_])(?i:modify|inquire|tab|title|event|center|label-offset|cell|help-id|cells|push-button|radio-button|page-layout-screen|entry-field|list-box|label|default-font|id|no-tab|unsorted|color|height|width|bind|thread|erase|modeless|scroll|system|menu|title-bar|wrap|destroy|resizeable|user-gray|large-font|newline|3-d|data-columns|display-columns|alignment|separation|cursor-frame-width|divider-color|drag-color|heading-color|heading-divider-color|num-rows|record-data|tiled-headings|vpadding|centered-headings|column-headings|self-act|cancel-button|vscroll|report-composer|clsid|primary-interface|active-x-control|default-interface|default-source|auto-minimize|auto-resize|resource|engraved|initial-state|frame|acuactivexcontrol|activex-res|grid|box|message|namespace|class-name|module|constructor|version|strong|culture|method|handle|exception-value|read-only|dividers|graphical|indexed|termination-value|permanent|boxed|visible|centered|record-position|convert)(?=[\\s.,;]|$)",
       "name": "invalid.illegal.acu.cobol"
     },
     {
-      "match": "(?<![-_])(?i:actual|auto|automatic|based-storage|complex|connect|contained|core-index|db-access-control-key|db-data-name|db-exception|db-record-name|db-set-name|db-status|dead-lock|endcobol|end-disable|end-enable|end-send|end-transceive|eos|file-limits|file-limit|formatted|sort-status|usage-mode)(?=\\s|\\.|,|;|$)",
+      "match": "(?<![-_])(?i:actual|auto|automatic|based-storage|complex|connect|contained|core-index|db-access-control-key|db-data-name|db-exception|db-record-name|db-set-name|db-status|dead-lock|endcobol|end-disable|end-enable|end-send|end-transceive|eos|file-limits|file-limit|formatted|sort-status|usage-mode)(?=[\\s.,;]|$)",
       "name": "invalid.illegal.netcobol.cobol"
     },
     {
@@ -1050,7 +1045,7 @@
       "name": "support.type.cobol.acu strong"
     },
     {
-      "match": "(?<![-_])(?i:alter)(?=\\s|\\.)",
+      "match": "(?<![-_])(?i:alter)(?=[\\s.])",
       "name": "invalid.illegal.cobol"
     },
     {
@@ -1070,7 +1065,7 @@
       "name": "variable.language"
     },
     {
-      "match": "(?<![-_])(?i:shortint1|shortint2|shortint3|shortint4|shortint5|shortint6|shortint7|longint1|longint2|longint3|longint4|longint5|longint6|bigint1|bigint2|blob-locator|clob-locator|dbclob-locator|dbclob-file|blob-file|clob-file|clob|dbclob|blob|varbinary|long-varbinary|time-record|timestamp-record|timestamp-offset-record|timestamp-offset|timestamp|rowid|xml|long-varchar)(?=\\s|\\.|\\)|\\()",
+      "match": "(?<![-_])(?i:shortint1|shortint2|shortint3|shortint4|shortint5|shortint6|shortint7|longint1|longint2|longint3|longint4|longint5|longint6|bigint1|bigint2|blob-locator|clob-locator|dbclob-locator|dbclob-file|blob-file|clob-file|clob|dbclob|blob|varbinary|long-varbinary|time-record|timestamp-record|timestamp-offset-record|timestamp-offset|timestamp|rowid|xml|long-varchar)(?=[\\s.)(])",
       "name": "storage.type.sql.picture.cobol"
     },
     {
@@ -1106,29 +1101,29 @@
       "match": "(\\()([0-9]*)(:)([0-9]*)(\\))"
     },
     {
-      "match": "([a-zA-Z-0-9-_]*[a-zA-Z0-9]|([#]?[0-9a-zA-Z]+[a-zA-Z-0-9_-]*[a-zA-Z0-9]))",
+      "match": "([a-zA-Z\\-0-9_]*[a-zA-Z0-9]|(#?[0-9a-zA-Z]+[a-zA-Z\\-0-9_]*[a-zA-Z0-9]))",
       "name": "meta.symbol.cobol"
     }
   ],
   "repository": {
     "cics-keywords": {
-      "match": "(?<![\\-\\w])(?i:abcode|abdump|abend|abort|abprogram|abstime|accum|acee|acqactivity|acqprocess|acquactivity|action|activity|activityid|actpartn|add|address|after|aid|alarm|all|allocate|alter|alternate|altscrnht|altscrnwd|and|anykey|aplkybd|apltext|applid|as|asa|asis|asktime|asraintrpt|asrakey|asrapsw|asraregs|asraspc|asrastg|assign|asynchronous|at|attach|attachid|attributes|authenticate|autopage|auxiliary|base64|basicauth|below|bif|binary|bit|bodycharset|bookmark|brdata|brdatalength|brexit|bridge|browsetoken|btrans|buffer|build|burgeability|caddrlength|cancel|card|cbuff|ccsid|certificate|change|changetime|channel|char|characterset|check|chunkend|chunking|chunkno|chunkyes|cicsdatakey|ciphers|class|clear|cliconvert|client|clientaddr|clientaddrnu|clientconv|clientname|clntaddr6nu|clntipfamily|close|closestatus|clrpartn|cmdsec|cnamelength|cnotcompl|codepage|color|commarea|commonname|commonnamlen|comparemax|comparemin|complete|composite|compstatus|condition|confirm|confirmation|connect|consistent|console|container|contexttype|control|convdata|converse|convertst|converttime|convid|copy|counter|country|countrylen|create|critical|ctlchar|current|cursor|cwa|cwaleng|data|data1|data2|datalength|datalenth|dataonly|datapointer|dataset|datastr|datatoxml|datatype|datcontainer|date|dateform|datesep|datestring|day|daycount|dayofmonth|dayofweek|dayofyear|days|daysleft|day-of-week|dcounter|ddmmyy|ddmmyyyy|debkey|debrec|debug-contents|debug-item|debug-line|debug-name|debug-sub-1|debug-sub-2|debug-sub-3|deedit|default|define|defresp|defscrnht|defscrnwd|delay|delete|deleteq|delimiter|deq|destcount|destid|destidleng|detail|detaillength|dfhresp|dfhvalue|digest|digesttype|disconnect|docdelete|docsize|docstatus|doctoken|document|ds3270|dsscs|dump|dumpcode|dumpid|duprec|ecaddr|ecblist|eib|elemname|elemnamelen|elemns|elemnslen|end|endactivity|endbr|endbrowse|endfile|endoutput|enq|enter|entry|entryname|eoc|eods|eprfield|eprfrom|eprinto|eprlength|eprset|eprtype|equal|erase|eraseaup|error|errterm|esmreason|esmresp|event|eventtype|eventual|ewasupp|exception|expect|expirytime|extds|external|extract|facility|facilitytokn|false|faultactlen|faultactor|faultcode|faultcodelen|faultcodestr|faultstring|faultstrlen|fci|fct|field|file|firestatus|flength|fmh|fmhparm|for|force|formattime|formfeed|formfield|free|freekb|freemain|from|fromactivity|fromccsid|fromchannel|fromcodepage|fromdoc|fromflength|fromlength|fromprocess|frset|fulldate|function|gchars|gcodes|gds|generic|get|getmain|getnext|gmmi|groupid|gtec|gteq|handle|head|header|hex|high-value|high-values|hilight|hold|honeom|host|hostcodepage|hostlength|hosttype|hours|httpheader|httpmethod|httprnum|httpversion|httpvnum|ignore|immediate|in|increment|initimg|initparm|initparmlen|inpartn|input|inputevent|inputmsg|inputmsglen|inquire|insert|integer|interval|into|intoccsid|intocodepage|invalidcount|invite|invmpsz|invoke|invokingprog|invpartn|invreq|issue|issuer|item|iutype|journalname|jtypeid|jusfirst|juslast|justify|katakana|keep|keylength|keynumber|l40|l64|l80|label|langinuse|languagecode|last|lastusetime|ldc|ldcmnem|ldcnum|leavekb|length|lengthlist|level|lightpen|linage-counter|line|lineaddr|line-counter|link|list|listlength|llid|load|locality|localitylen|logmessage|logmode|logonlogmode|logonmsg|low-value|low-values|luname|main|map|mapcolumn|mapfail|mapheight|mapline|maponly|mapped|mappingdev|mapset|mapwidth|massinsert|maxdatalen|maxflength|maximum|maxlength|maxlifetime|maxproclen|mcc|mediatype|message|messageid|metadata|metadatalen|method|methodlength|milliseconds|minimum|minutes|mmddyy|mmddyyyy|mode|modename|monitor|month|monthofyear|move|msr|msrcontrol|name|namelength|natlang|natlanginuse|netname|newpassword|newphrase|newphraselen|next|nexttransid|nleom|noautopage|nocc|nocheck|nocliconvert|noclose|nodata|node|nodocdelete|nodump|noedit|noflush|nohandle|noinconvert|none|nooutconert|noqueue|noquiesce|nosrvconvert|nosuspend|note|notpurgeable|notruncate|nowait|nscontainer|null|nulls|numciphers|numevents|numitems|numrec|numroutes|numsegments|numtab|of|oidcard|on|opclass|open|operation|operator|operid|operkeys|operpurge|opid|opsecurity|options|or|orgabcode|organization|organizatlen|orgunit|orgunitlen|outdescr|outline|outpartn|output|owner|pa1|pa2|pa3|page|pagenum|page-counter|paging|parse|partn|partner|partnfail|partnpage|partns|partnset|pass|passbk|password|passwordlen|path|pathlength|pct|pf1|pf10|pf11|pf12|pf13|pf14|pf15|pf16|pf17|pf18|pf19|pf2|pf20|pf21|pf22|pf23|pf24|pf3|pf4|pf5|pf6|pf7|pf8|pf9|pfxleng|phrase|phraselen|piplength|piplist|point|pool|pop|portnumber|portnumnu|post|ppt|predicate|prefix|prepare|princonvid|prinsysid|print|priority|privacy|process|processtype|proclength|procname|profile|program|protect|ps|punch|purge|purgeable|push|put|qname|query|queryparm|querystring|querystrlen|queue|quote|quotes|random|rba|rbn|rdatt|read|readnext|readprev|readq|reattach|receive|receiver|recfm|record|recordlen|recordlength|reduce|refparms|refparmslen|relatesindex|relatestype|relatesuri|release|remove|repeatable|repetable|replace|reply|replylength|reqid|requesttype|resclass|reset|resetbr|resid|residlength|resource|resp|resp2|ressec|restart|restype|result|resume|retain|retcode|retcord|retriece|retrieve|return|returnprog|return-code|rewind|rewrite|ridfld|role|rolelength|rollback|route|routecodes|rprocess|rresource|rrn|rtermid|rtransid|run|saddrlength|scheme|schemename|scope|scopelen|scrnht|scrnwd|seconds|security|segmentlist|send|sender|serialnum|serialnumlen|server|serveraddr|serveraddrnu|serverconv|servername|service|session|sesstoken|set|shared|shift-in|shift-out|sigdata|signal|signoff|signon|sit|snamelength|soapfault|sort-control|sort-core-size|sort-file-size|sort-message|sort-mode-size|sort-return|sosi|space|spaces|spoolclose|spoolopen|spoolread|spoolwrite|srvconvert|srvraddr6nu|srvripfamily|ssltype|start|startbr|startbrowse|startcode|state|statelen|stationid|status|statuscode|statuslen|statustext|storage|strfield|stringformat|subaddr|subcodelen|subcodestr|subevent|subevent1|subevent2|subevent3|subevent4|subevent5|subevent6|subevent7|subevent8|sum|suspend|suspstatus|symbol|symbollist|synchronous|synclevel|synconreturn|syncpoint|sysid|tables|tally|task|taskpriority|tcpip|tcpipservice|tct|tctua|tctualeng|td|tellerid|template|termcode|termid|terminal|termpriority|test|text|textkybd|textlength|textprint|time|timeout|timer|timesep|title|to|toactivity|tochannel|tocontainer|toflength|token|tolength|toprocess|trace|tracenum|trailer|tranpriority|transaction|transform|transid|trigger|trt|true|ts|twa|twaleng|type|typename|typenamelen|typens|typenslen|unattend|uncommitted|unescaped|unexpin|unlock|until|uow|update|uri|urimap|url|urllength|userdatakey|userid|username|usernamelen|userpriority|using|validation|value|valuelength|verify|versionlen|volume|volumeleng|wait|waitcics|web|when-compiled|wpmedia1|wpmedia2|wpmedia3|wpmedia4|wrap|write|writeq|wsacontext|wsaepr|xctl|xmlcontainer|xmltodata|xmltransform|xrba|year|yyddd|yyddmm|yymmdd|yyyyddd|yyyyddmm|yyyymmdd|zero|zeroes|zeros)(?![\\-\\w])",
+      "match": "(?<![-\\w])(?i:abcode|abdump|abend|abort|abprogram|abstime|accum|acee|acqactivity|acqprocess|acquactivity|action|activity|activityid|actpartn|add|address|after|aid|alarm|all|allocate|alter|alternate|altscrnht|altscrnwd|and|anykey|aplkybd|apltext|applid|as|asa|asis|asktime|asraintrpt|asrakey|asrapsw|asraregs|asraspc|asrastg|assign|asynchronous|at|attach|attachid|attributes|authenticate|autopage|auxiliary|base64|basicauth|below|bif|binary|bit|bodycharset|bookmark|brdata|brdatalength|brexit|bridge|browsetoken|btrans|buffer|build|burgeability|caddrlength|cancel|card|cbuff|ccsid|certificate|change|changetime|channel|char|characterset|check|chunkend|chunking|chunkno|chunkyes|cicsdatakey|ciphers|class|clear|cliconvert|client|clientaddr|clientaddrnu|clientconv|clientname|clntaddr6nu|clntipfamily|close|closestatus|clrpartn|cmdsec|cnamelength|cnotcompl|codepage|color|commarea|commonname|commonnamlen|comparemax|comparemin|complete|composite|compstatus|condition|confirm|confirmation|connect|consistent|console|container|contexttype|control|convdata|converse|convertst|converttime|convid|copy|counter|country|countrylen|create|critical|ctlchar|current|cursor|cwa|cwaleng|data|data1|data2|datalength|datalenth|dataonly|datapointer|dataset|datastr|datatoxml|datatype|datcontainer|date|dateform|datesep|datestring|day|daycount|dayofmonth|dayofweek|dayofyear|days|daysleft|day-of-week|dcounter|ddmmyy|ddmmyyyy|debkey|debrec|debug-contents|debug-item|debug-line|debug-name|debug-sub-1|debug-sub-2|debug-sub-3|deedit|default|define|defresp|defscrnht|defscrnwd|delay|delete|deleteq|delimiter|deq|destcount|destid|destidleng|detail|detaillength|dfhresp|dfhvalue|digest|digesttype|disconnect|docdelete|docsize|docstatus|doctoken|document|ds3270|dsscs|dump|dumpcode|dumpid|duprec|ecaddr|ecblist|eib|elemname|elemnamelen|elemns|elemnslen|end|endactivity|endbr|endbrowse|endfile|endoutput|enq|enter|entry|entryname|eoc|eods|eprfield|eprfrom|eprinto|eprlength|eprset|eprtype|equal|erase|eraseaup|error|errterm|esmreason|esmresp|event|eventtype|eventual|ewasupp|exception|expect|expirytime|extds|external|extract|facility|facilitytokn|false|faultactlen|faultactor|faultcode|faultcodelen|faultcodestr|faultstring|faultstrlen|fci|fct|field|file|firestatus|flength|fmh|fmhparm|for|force|formattime|formfeed|formfield|free|freekb|freemain|from|fromactivity|fromccsid|fromchannel|fromcodepage|fromdoc|fromflength|fromlength|fromprocess|frset|fulldate|function|gchars|gcodes|gds|generic|get|getmain|getnext|gmmi|groupid|gtec|gteq|handle|head|header|hex|high-value|high-values|hilight|hold|honeom|host|hostcodepage|hostlength|hosttype|hours|httpheader|httpmethod|httprnum|httpversion|httpvnum|ignore|immediate|in|increment|initimg|initparm|initparmlen|inpartn|input|inputevent|inputmsg|inputmsglen|inquire|insert|integer|interval|into|intoccsid|intocodepage|invalidcount|invite|invmpsz|invoke|invokingprog|invpartn|invreq|issue|issuer|item|iutype|journalname|jtypeid|jusfirst|juslast|justify|katakana|keep|keylength|keynumber|l40|l64|l80|label|langinuse|languagecode|last|lastusetime|ldc|ldcmnem|ldcnum|leavekb|length|lengthlist|level|lightpen|linage-counter|line|lineaddr|line-counter|link|list|listlength|llid|load|locality|localitylen|logmessage|logmode|logonlogmode|logonmsg|low-value|low-values|luname|main|map|mapcolumn|mapfail|mapheight|mapline|maponly|mapped|mappingdev|mapset|mapwidth|massinsert|maxdatalen|maxflength|maximum|maxlength|maxlifetime|maxproclen|mcc|mediatype|message|messageid|metadata|metadatalen|method|methodlength|milliseconds|minimum|minutes|mmddyy|mmddyyyy|mode|modename|monitor|month|monthofyear|move|msr|msrcontrol|name|namelength|natlang|natlanginuse|netname|newpassword|newphrase|newphraselen|next|nexttransid|nleom|noautopage|nocc|nocheck|nocliconvert|noclose|nodata|node|nodocdelete|nodump|noedit|noflush|nohandle|noinconvert|none|nooutconert|noqueue|noquiesce|nosrvconvert|nosuspend|note|notpurgeable|notruncate|nowait|nscontainer|null|nulls|numciphers|numevents|numitems|numrec|numroutes|numsegments|numtab|of|oidcard|on|opclass|open|operation|operator|operid|operkeys|operpurge|opid|opsecurity|options|or|orgabcode|organization|organizatlen|orgunit|orgunitlen|outdescr|outline|outpartn|output|owner|pa1|pa2|pa3|page|pagenum|page-counter|paging|parse|partn|partner|partnfail|partnpage|partns|partnset|pass|passbk|password|passwordlen|path|pathlength|pct|pf1|pf10|pf11|pf12|pf13|pf14|pf15|pf16|pf17|pf18|pf19|pf2|pf20|pf21|pf22|pf23|pf24|pf3|pf4|pf5|pf6|pf7|pf8|pf9|pfxleng|phrase|phraselen|piplength|piplist|point|pool|pop|portnumber|portnumnu|post|ppt|predicate|prefix|prepare|princonvid|prinsysid|print|priority|privacy|process|processtype|proclength|procname|profile|program|protect|ps|punch|purge|purgeable|push|put|qname|query|queryparm|querystring|querystrlen|queue|quote|quotes|random|rba|rbn|rdatt|read|readnext|readprev|readq|reattach|receive|receiver|recfm|record|recordlen|recordlength|reduce|refparms|refparmslen|relatesindex|relatestype|relatesuri|release|remove|repeatable|repetable|replace|reply|replylength|reqid|requesttype|resclass|reset|resetbr|resid|residlength|resource|resp|resp2|ressec|restart|restype|result|resume|retain|retcode|retcord|retriece|retrieve|return|returnprog|return-code|rewind|rewrite|ridfld|role|rolelength|rollback|route|routecodes|rprocess|rresource|rrn|rtermid|rtransid|run|saddrlength|scheme|schemename|scope|scopelen|scrnht|scrnwd|seconds|security|segmentlist|send|sender|serialnum|serialnumlen|server|serveraddr|serveraddrnu|serverconv|servername|service|session|sesstoken|set|shared|shift-in|shift-out|sigdata|signal|signoff|signon|sit|snamelength|soapfault|sort-control|sort-core-size|sort-file-size|sort-message|sort-mode-size|sort-return|sosi|space|spaces|spoolclose|spoolopen|spoolread|spoolwrite|srvconvert|srvraddr6nu|srvripfamily|ssltype|start|startbr|startbrowse|startcode|state|statelen|stationid|status|statuscode|statuslen|statustext|storage|strfield|stringformat|subaddr|subcodelen|subcodestr|subevent|subevent1|subevent2|subevent3|subevent4|subevent5|subevent6|subevent7|subevent8|sum|suspend|suspstatus|symbol|symbollist|synchronous|synclevel|synconreturn|syncpoint|sysid|tables|tally|task|taskpriority|tcpip|tcpipservice|tct|tctua|tctualeng|td|tellerid|template|termcode|termid|terminal|termpriority|test|text|textkybd|textlength|textprint|time|timeout|timer|timesep|title|to|toactivity|tochannel|tocontainer|toflength|token|tolength|toprocess|trace|tracenum|trailer|tranpriority|transaction|transform|transid|trigger|trt|true|ts|twa|twaleng|type|typename|typenamelen|typens|typenslen|unattend|uncommitted|unescaped|unexpin|unlock|until|uow|update|uri|urimap|url|urllength|userdatakey|userid|username|usernamelen|userpriority|using|validation|value|valuelength|verify|versionlen|volume|volumeleng|wait|waitcics|web|when-compiled|wpmedia1|wpmedia2|wpmedia3|wpmedia4|wrap|write|writeq|wsacontext|wsaepr|xctl|xmlcontainer|xmltodata|xmltransform|xrba|year|yyddd|yyddmm|yymmdd|yyyyddd|yyyyddmm|yyyymmdd|zero|zeroes|zeros)(?![-\\w])",
       "name": "keyword.verb.cics"
     },
     "dli-keywords": {
-      "match": "(?<![\\-\\w])(?i:accept|chkp|deq|dlet|gnp|gn|gu|isrt|load|log|pos|query|refresh|repl|retrieve|rolb|roll|rols|schd|sets|setu|symchkp|term|xrst)(?![\\-\\w])",
+      "match": "(?<![-\\w])(?i:accept|chkp|deq|dlet|gnp|gn|gu|isrt|load|log|pos|query|refresh|repl|retrieve|rolb|roll|rols|schd|sets|setu|symchkp|term|xrst)(?![-\\w])",
       "name": "keyword.verb.dli"
     },
     "dli-options": {
-      "match": "(?<![\\-\\w])(?i:statusgroup|checkpoint|chkp|id|lockclass|segment|info|where|from|using|keyfeedback|feedbacklen|variable|first|last|current|seglength|offset|locked|movenext|getfirst|set|setcond|setzero|setparent|fieldlength|keys|maxlength|length[0-9]*|area[0-9]*|psc|pcs|pcb|sysserve|into)(?![\\-\\w])",
+      "match": "(?<![-\\w])(?i:statusgroup|checkpoint|chkp|id|lockclass|segment|info|where|from|using|keyfeedback|feedbacklen|variable|first|last|current|seglength|offset|locked|movenext|getfirst|set|setcond|setzero|setparent|fieldlength|keys|maxlength|length[0-9]*|area[0-9]*|psc|pcs|pcb|sysserve|into)(?![-\\w])",
       "name": "keyword.other.dli"
     },
     "number-complex-constant": {
-      "match": "(\\-|\\+)?((([0-9]+(\\.[0-9]+))|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?(?=\\s|\\.$|,|\\))",
+      "match": "([-+])?((([0-9]+(\\.[0-9]+))|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([LlFfUuDd]|UL|ul)?(?=\\s|\\.$|[,)])",
       "name": "constant.numeric.cobol"
     },
     "number-simple-constant": {
-      "match": "(\\-|\\+)?([0-9]+)(?=\\s|\\.$|,|\\))",
+      "match": "([-+])?([0-9]+)(?=\\s|\\.$|[,)])",
       "name": "constant.numeric.cobol"
     },
     "string-double-quoted-constant": {
diff --git a/resources/languages/codeql.json b/resources/languages/codeql.json
index 37c37b2..8b8d4f2 100644
--- a/resources/languages/codeql.json
+++ b/resources/languages/codeql.json
@@ -12,15 +12,15 @@
   ],
   "repository": {
     "abstract": {
-      "match": "\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\babstract(?![0-9A-Za-z_])",
       "name": "storage.modifier.abstract.ql"
     },
     "additional": {
-      "match": "\\b(?:additional)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\badditional(?![0-9A-Za-z_])",
       "name": "storage.modifier.additional.ql"
     },
     "and": {
-      "match": "\\b(?:and)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\band(?![0-9A-Za-z_])",
       "name": "keyword.other.and.ql"
     },
     "annotation": {
@@ -92,34 +92,34 @@
       ]
     },
     "any": {
-      "match": "\\b(?:any)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bany(?![0-9A-Za-z_])",
       "name": "keyword.quantifier.any.ql"
     },
     "arithmetic-operator": {
-      "match": "\\+|-|\\*|/|%",
+      "match": "[+\\-*/%]",
       "name": "keyword.operator.arithmetic.ql"
     },
     "as": {
-      "match": "\\b(?:as)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bas(?![0-9A-Za-z_])",
       "name": "keyword.other.as.ql"
     },
     "asc": {
-      "match": "\\b(?:asc)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\basc(?![0-9A-Za-z_])",
       "name": "keyword.order.asc.ql"
     },
     "at-lower-id": {
-      "match": "@[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_])))"
+      "match": "@[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])"
     },
     "avg": {
-      "match": "\\b(?:avg)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bavg(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.avg.ql"
     },
     "bindingset": {
-      "match": "\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bbindingset(?![0-9A-Za-z_])",
       "name": "storage.modifier.bindingset.ql"
     },
     "bindingset-annotation": {
-      "begin": "((?:\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bbindingset(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -129,7 +129,7 @@
           ]
         }
       },
-      "end": "(?!(?:\\s|$|(?://|/\\*))|\\[)|(?<=\\])",
+      "end": "(?!(?:\\s|$|/[/*])|\\[)|(?<=])",
       "name": "meta.block.bindingset-annotation.ql",
       "patterns": [
         {
@@ -141,7 +141,7 @@
       ]
     },
     "bindingset-annotation-body": {
-      "begin": "((?:\\[))",
+      "begin": "(\\[)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -151,7 +151,7 @@
           ]
         }
       },
-      "end": "((?:\\]))",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -167,29 +167,29 @@
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "variable.parameter.ql"
         }
       ]
     },
     "boolean": {
-      "match": "\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bboolean(?![0-9A-Za-z_])",
       "name": "keyword.type.boolean.ql"
     },
     "by": {
-      "match": "\\b(?:by)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bby(?![0-9A-Za-z_])",
       "name": "keyword.order.by.ql"
     },
     "cached": {
-      "match": "\\b(?:cached)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bcached(?![0-9A-Za-z_])",
       "name": "storage.modifier.cached.ql"
     },
     "class": {
-      "match": "\\b(?:class)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bclass(?![0-9A-Za-z_])",
       "name": "keyword.other.class.ql"
     },
     "class-body": {
-      "begin": "((?:\\{))",
+      "begin": "(\\{)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -199,7 +199,7 @@
           ]
         }
       },
-      "end": "((?:\\}))",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -217,7 +217,7 @@
       ]
     },
     "class-declaration": {
-      "begin": "((?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bclass(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -227,7 +227,7 @@
           ]
         }
       },
-      "end": "(?<=\\}|;)",
+      "end": "(?<=[};])",
       "name": "meta.block.class-declaration.ql",
       "patterns": [
         {
@@ -240,7 +240,7 @@
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.class.ql"
         }
       ]
@@ -263,11 +263,11 @@
       "name": "punctuation.anglebracket.close.ql"
     },
     "close-brace": {
-      "match": "\\}",
+      "match": "}",
       "name": "punctuation.curlybrace.close.ql"
     },
     "close-bracket": {
-      "match": "\\]",
+      "match": "]",
       "name": "punctuation.squarebracket.close.ql"
     },
     "close-paren": {
@@ -293,7 +293,7 @@
                   "name": "keyword.tag.ql"
                 }
               ],
-              "while": "(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|[*](?!/))*$)"
+              "while": "(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|\\*(?!/))*$)"
             }
           ]
         },
@@ -309,38 +309,38 @@
       ]
     },
     "comment-start": {
-      "match": "//|/\\*"
+      "match": "/[/*]"
     },
     "comparison-operator": {
-      "match": "=|\\!\\=",
+      "match": "=|!=",
       "name": "keyword.operator.comparison.ql"
     },
     "concat": {
-      "match": "\\b(?:concat)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bconcat(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.concat.ql"
     },
     "count": {
-      "match": "\\b(?:count)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bcount(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.count.ql"
     },
     "date": {
-      "match": "\\b(?:date)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bdate(?![0-9A-Za-z_])",
       "name": "keyword.type.date.ql"
     },
     "default": {
-      "match": "\\b(?:default)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bdefault(?![0-9A-Za-z_])",
       "name": "storage.modifier.default.ql"
     },
     "deprecated": {
-      "match": "\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bdeprecated(?![0-9A-Za-z_])",
       "name": "storage.modifier.deprecated.ql"
     },
     "desc": {
-      "match": "\\b(?:desc)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bdesc(?![0-9A-Za-z_])",
       "name": "keyword.order.desc.ql"
     },
     "dont-care": {
-      "match": "\\b(?:_)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\b_(?![0-9A-Za-z_])",
       "name": "variable.language.dont-care.ql"
     },
     "dot": {
@@ -352,21 +352,21 @@
       "name": "punctuation.operator.range.ql"
     },
     "else": {
-      "match": "\\b(?:else)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\belse(?![0-9A-Za-z_])",
       "name": "keyword.other.else.ql"
     },
     "end-of-as-clause": {
-      "match": "(?:(?<=(?:[0-9A-Za-z_]))(?!(?:[0-9A-Za-z_]))(?<!(?<!(?:[0-9A-Za-z_]))as))|(?=\\s*(?!(?://|/\\*)|(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_])))))\\S)|(?=\\s*(?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:unique)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_])))))))"
+      "match": "(?<=[0-9A-Za-z_])(?![0-9A-Za-z_])(?<!(?<![0-9A-Za-z_])as)|(?=\\s*(?!/[/*]|\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_]))\\S)|(?=\\s*\\b(?:_(?![0-9A-Za-z_])|and(?![0-9A-Za-z_])|any(?![0-9A-Za-z_])|as(?![0-9A-Za-z_])|asc(?![0-9A-Za-z_])|avg(?![0-9A-Za-z_])|boolean(?![0-9A-Za-z_])|by(?![0-9A-Za-z_])|class(?![0-9A-Za-z_])|concat(?![0-9A-Za-z_])|count(?![0-9A-Za-z_])|date(?![0-9A-Za-z_])|desc(?![0-9A-Za-z_])|else(?![0-9A-Za-z_])|exists(?![0-9A-Za-z_])|extends(?![0-9A-Za-z_])|false(?![0-9A-Za-z_])|float(?![0-9A-Za-z_])|forall(?![0-9A-Za-z_])|forex(?![0-9A-Za-z_])|from(?![0-9A-Za-z_])|if(?![0-9A-Za-z_])|implies(?![0-9A-Za-z_])|import(?![0-9A-Za-z_])|in(?![0-9A-Za-z_])|instanceof(?![0-9A-Za-z_])|int(?![0-9A-Za-z_])|max(?![0-9A-Za-z_])|min(?![0-9A-Za-z_])|module(?![0-9A-Za-z_])|newtype(?![0-9A-Za-z_])|none(?![0-9A-Za-z_])|not(?![0-9A-Za-z_])|or(?![0-9A-Za-z_])|order(?![0-9A-Za-z_])|predicate(?![0-9A-Za-z_])|rank(?![0-9A-Za-z_])|result(?![0-9A-Za-z_])|select(?![0-9A-Za-z_])|strictconcat(?![0-9A-Za-z_])|strictcount(?![0-9A-Za-z_])|strictsum(?![0-9A-Za-z_])|string(?![0-9A-Za-z_])|sum(?![0-9A-Za-z_])|super(?![0-9A-Za-z_])|then(?![0-9A-Za-z_])|this(?![0-9A-Za-z_])|true(?![0-9A-Za-z_])|unique(?![0-9A-Za-z_])|where(?![0-9A-Za-z_])))"
     },
     "end-of-id": {
-      "match": "(?!(?:[0-9A-Za-z_]))"
+      "match": "(?![0-9A-Za-z_])"
     },
     "exists": {
-      "match": "\\b(?:exists)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bexists(?![0-9A-Za-z_])",
       "name": "keyword.quantifier.exists.ql"
     },
     "expr-as-clause": {
-      "begin": "((?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bas(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -376,24 +376,24 @@
           ]
         }
       },
-      "end": "(?:(?:(?<=(?:[0-9A-Za-z_]))(?!(?:[0-9A-Za-z_]))(?<!(?<!(?:[0-9A-Za-z_]))as))|(?=\\s*(?!(?://|/\\*)|(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_])))))\\S)|(?=\\s*(?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:unique)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))))",
+      "end": "(?:(?<=[0-9A-Za-z_])(?![0-9A-Za-z_])(?<!(?<![0-9A-Za-z_])as)|(?=\\s*(?!/[/*]|\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_]))\\S)|(?=\\s*\\b(?:_(?![0-9A-Za-z_])|and(?![0-9A-Za-z_])|any(?![0-9A-Za-z_])|as(?![0-9A-Za-z_])|asc(?![0-9A-Za-z_])|avg(?![0-9A-Za-z_])|boolean(?![0-9A-Za-z_])|by(?![0-9A-Za-z_])|class(?![0-9A-Za-z_])|concat(?![0-9A-Za-z_])|count(?![0-9A-Za-z_])|date(?![0-9A-Za-z_])|desc(?![0-9A-Za-z_])|else(?![0-9A-Za-z_])|exists(?![0-9A-Za-z_])|extends(?![0-9A-Za-z_])|false(?![0-9A-Za-z_])|float(?![0-9A-Za-z_])|forall(?![0-9A-Za-z_])|forex(?![0-9A-Za-z_])|from(?![0-9A-Za-z_])|if(?![0-9A-Za-z_])|implies(?![0-9A-Za-z_])|import(?![0-9A-Za-z_])|in(?![0-9A-Za-z_])|instanceof(?![0-9A-Za-z_])|int(?![0-9A-Za-z_])|max(?![0-9A-Za-z_])|min(?![0-9A-Za-z_])|module(?![0-9A-Za-z_])|newtype(?![0-9A-Za-z_])|none(?![0-9A-Za-z_])|not(?![0-9A-Za-z_])|or(?![0-9A-Za-z_])|order(?![0-9A-Za-z_])|predicate(?![0-9A-Za-z_])|rank(?![0-9A-Za-z_])|result(?![0-9A-Za-z_])|select(?![0-9A-Za-z_])|strictconcat(?![0-9A-Za-z_])|strictcount(?![0-9A-Za-z_])|strictsum(?![0-9A-Za-z_])|string(?![0-9A-Za-z_])|sum(?![0-9A-Za-z_])|super(?![0-9A-Za-z_])|then(?![0-9A-Za-z_])|this(?![0-9A-Za-z_])|true(?![0-9A-Za-z_])|unique(?![0-9A-Za-z_])|where(?![0-9A-Za-z_]))))",
       "name": "meta.block.expr-as-clause.ql",
       "patterns": [
         {
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "variable.other.ql"
         }
       ]
     },
     "extends": {
-      "match": "\\b(?:extends)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bextends(?![0-9A-Za-z_])",
       "name": "keyword.other.extends.ql"
     },
     "extends-clause": {
-      "begin": "((?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bextends(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -410,25 +410,25 @@
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])|@[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.ql"
         }
       ]
     },
     "external": {
-      "match": "\\b(?:external)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bexternal(?![0-9A-Za-z_])",
       "name": "storage.modifier.external.ql"
     },
     "false": {
-      "match": "\\b(?:false)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bfalse(?![0-9A-Za-z_])",
       "name": "constant.language.boolean.false.ql"
     },
     "final": {
-      "match": "\\b(?:final)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bfinal(?![0-9A-Za-z_])",
       "name": "storage.modifier.final.ql"
     },
     "float": {
-      "match": "\\b(?:float)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bfloat(?![0-9A-Za-z_])",
       "name": "keyword.type.float.ql"
     },
     "float-literal": {
@@ -436,19 +436,19 @@
       "name": "constant.numeric.decimal.ql"
     },
     "forall": {
-      "match": "\\b(?:forall)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bforall(?![0-9A-Za-z_])",
       "name": "keyword.quantifier.forall.ql"
     },
     "forex": {
-      "match": "\\b(?:forex)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bforex(?![0-9A-Za-z_])",
       "name": "keyword.quantifier.forex.ql"
     },
     "from": {
-      "match": "\\b(?:from)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bfrom(?![0-9A-Za-z_])",
       "name": "keyword.other.from.ql"
     },
     "from-section": {
-      "begin": "((?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bfrom(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -458,25 +458,25 @@
           ]
         }
       },
-      "end": "(?=(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_])))))",
+      "end": "(?=\\b(?:select(?![0-9A-Za-z_])|where(?![0-9A-Za-z_])))",
       "name": "meta.block.from-section.ql",
       "patterns": [
         {
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))(?=\\s*(?:,|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|$))",
+          "match": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])(?=\\s*(?:,|\\bwhere(?![0-9A-Za-z_])|\\bselect(?![0-9A-Za-z_])|$))",
           "name": "variable.parameter.ql"
         },
         {
           "include": "#module-qualifier"
         },
         {
-          "match": "(?:\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])|@[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.ql"
         },
         {
-          "match": "(?:\\b[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "variable.parameter.ql"
         }
       ]
@@ -485,15 +485,15 @@
       "match": "[0-9A-Za-z_]"
     },
     "if": {
-      "match": "\\b(?:if)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bif(?![0-9A-Za-z_])",
       "name": "keyword.other.if.ql"
     },
     "implements": {
-      "match": "\\b(?:implements)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bimplements(?![0-9A-Za-z_])",
       "name": "keyword.other.implements.ql"
     },
     "implements-clause": {
-      "begin": "((?:\\b(?:implements)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bimplements(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -510,21 +510,21 @@
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])|@[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.ql"
         }
       ]
     },
     "implies": {
-      "match": "\\b(?:implies)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bimplies(?![0-9A-Za-z_])",
       "name": "keyword.other.implies.ql"
     },
     "import": {
-      "match": "\\b(?:import)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bimport(?![0-9A-Za-z_])",
       "name": "keyword.other.import.ql"
     },
     "import-as-clause": {
-      "begin": "((?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bas(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -534,20 +534,20 @@
           ]
         }
       },
-      "end": "(?:(?:(?<=(?:[0-9A-Za-z_]))(?!(?:[0-9A-Za-z_]))(?<!(?<!(?:[0-9A-Za-z_]))as))|(?=\\s*(?!(?://|/\\*)|(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_])))))\\S)|(?=\\s*(?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:unique)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))))",
+      "end": "(?:(?<=[0-9A-Za-z_])(?![0-9A-Za-z_])(?<!(?<![0-9A-Za-z_])as)|(?=\\s*(?!/[/*]|\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_]))\\S)|(?=\\s*\\b(?:_(?![0-9A-Za-z_])|and(?![0-9A-Za-z_])|any(?![0-9A-Za-z_])|as(?![0-9A-Za-z_])|asc(?![0-9A-Za-z_])|avg(?![0-9A-Za-z_])|boolean(?![0-9A-Za-z_])|by(?![0-9A-Za-z_])|class(?![0-9A-Za-z_])|concat(?![0-9A-Za-z_])|count(?![0-9A-Za-z_])|date(?![0-9A-Za-z_])|desc(?![0-9A-Za-z_])|else(?![0-9A-Za-z_])|exists(?![0-9A-Za-z_])|extends(?![0-9A-Za-z_])|false(?![0-9A-Za-z_])|float(?![0-9A-Za-z_])|forall(?![0-9A-Za-z_])|forex(?![0-9A-Za-z_])|from(?![0-9A-Za-z_])|if(?![0-9A-Za-z_])|implies(?![0-9A-Za-z_])|import(?![0-9A-Za-z_])|in(?![0-9A-Za-z_])|instanceof(?![0-9A-Za-z_])|int(?![0-9A-Za-z_])|max(?![0-9A-Za-z_])|min(?![0-9A-Za-z_])|module(?![0-9A-Za-z_])|newtype(?![0-9A-Za-z_])|none(?![0-9A-Za-z_])|not(?![0-9A-Za-z_])|or(?![0-9A-Za-z_])|order(?![0-9A-Za-z_])|predicate(?![0-9A-Za-z_])|rank(?![0-9A-Za-z_])|result(?![0-9A-Za-z_])|select(?![0-9A-Za-z_])|strictconcat(?![0-9A-Za-z_])|strictcount(?![0-9A-Za-z_])|strictsum(?![0-9A-Za-z_])|string(?![0-9A-Za-z_])|sum(?![0-9A-Za-z_])|super(?![0-9A-Za-z_])|then(?![0-9A-Za-z_])|this(?![0-9A-Za-z_])|true(?![0-9A-Za-z_])|unique(?![0-9A-Za-z_])|where(?![0-9A-Za-z_]))))",
       "name": "meta.block.import-as-clause.ql",
       "patterns": [
         {
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.namespace.ql"
         }
       ]
     },
     "import-directive": {
-      "begin": "((?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bimport(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -557,7 +557,7 @@
           ]
         }
       },
-      "end": "(?<!\\bimport)(?<=(?:\\>)|[A-Za-z0-9_])(?!\\s*(\\.|\\:\\:|\\,|(?:<)))",
+      "end": "(?<!\\bimport)(?<=[>A-Za-z0-9_])(?!\\s*(\\.|::|[,<]))",
       "name": "meta.block.import-directive.ql",
       "patterns": [
         {
@@ -567,21 +567,21 @@
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.namespace.ql"
         }
       ]
     },
     "in": {
-      "match": "\\b(?:in)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bin(?![0-9A-Za-z_])",
       "name": "keyword.other.in.ql"
     },
     "instanceof": {
-      "match": "\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\binstanceof(?![0-9A-Za-z_])",
       "name": "keyword.other.instanceof.ql"
     },
     "instantiation-args": {
-      "begin": "((?:<))",
+      "begin": "(<)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -591,7 +591,7 @@
           ]
         }
       },
-      "end": "((?:>))",
+      "end": "(>)",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -610,13 +610,13 @@
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.namespace.ql"
         }
       ]
     },
     "int": {
-      "match": "\\b(?:int)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bint(?![0-9A-Za-z_])",
       "name": "keyword.type.int.ql"
     },
     "int-literal": {
@@ -778,11 +778,11 @@
       ]
     },
     "language": {
-      "match": "\\b(?:language)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\blanguage(?![0-9A-Za-z_])",
       "name": "storage.modifier.language.ql"
     },
     "language-annotation": {
-      "begin": "((?:\\b(?:language)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\blanguage(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -792,7 +792,7 @@
           ]
         }
       },
-      "end": "(?!(?:\\s|$|(?://|/\\*))|\\[)|(?<=\\])",
+      "end": "(?!(?:\\s|$|/[/*])|\\[)|(?<=])",
       "name": "meta.block.language-annotation.ql",
       "patterns": [
         {
@@ -804,7 +804,7 @@
       ]
     },
     "language-annotation-body": {
-      "begin": "((?:\\[))",
+      "begin": "(\\[)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -814,7 +814,7 @@
           ]
         }
       },
-      "end": "((?:\\]))",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -830,13 +830,13 @@
           "include": "#non-context-sensitive"
         },
         {
-          "match": "\\b(?:monotonicAggregates)(?:(?!(?:[0-9A-Za-z_])))",
+          "match": "\\bmonotonicAggregates(?![0-9A-Za-z_])",
           "name": "storage.modifier.ql"
         }
       ]
     },
     "library": {
-      "match": "\\b(?:library)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\blibrary(?![0-9A-Za-z_])",
       "name": "storage.modifier.library.ql"
     },
     "literal": {
@@ -853,22 +853,22 @@
       ]
     },
     "lower-id": {
-      "match": "\\b[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_])))"
+      "match": "\\b[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])"
     },
     "max": {
-      "match": "\\b(?:max)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bmax(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.max.ql"
     },
     "min": {
-      "match": "\\b(?:min)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bmin(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.min.ql"
     },
     "module": {
-      "match": "\\b(?:module)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bmodule(?![0-9A-Za-z_])",
       "name": "keyword.other.module.ql"
     },
     "module-body": {
-      "begin": "((?:\\{))",
+      "begin": "(\\{)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -878,7 +878,7 @@
           ]
         }
       },
-      "end": "((?:\\}))",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -896,7 +896,7 @@
       ]
     },
     "module-declaration": {
-      "begin": "((?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bmodule(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -906,7 +906,7 @@
           ]
         }
       },
-      "end": "(?<=\\}|;)",
+      "end": "(?<=[};])",
       "name": "meta.block.module-declaration.ql",
       "patterns": [
         {
@@ -919,7 +919,7 @@
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.namespace.ql"
         }
       ]
@@ -965,15 +965,15 @@
       ]
     },
     "module-qualifier": {
-      "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))(?=\\s*\\:\\:)",
+      "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])(?=\\s*::)",
       "name": "entity.name.type.namespace.ql"
     },
     "newtype": {
-      "match": "\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bnewtype(?![0-9A-Za-z_])",
       "name": "keyword.other.newtype.ql"
     },
     "newtype-branch-name-with-prefix": {
-      "begin": "\\=|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))",
+      "begin": "=|\\bor(?![0-9A-Za-z_])",
       "beginCaptures": {
         "0": {
           "patterns": [
@@ -986,7 +986,7 @@
           ]
         }
       },
-      "end": "(?:\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+      "end": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
       "endCaptures": {
         "0": {
           "name": "entity.name.type.ql"
@@ -1000,7 +1000,7 @@
       ]
     },
     "newtype-declaration": {
-      "begin": "((?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bnewtype(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1010,7 +1010,7 @@
           ]
         }
       },
-      "end": "(?:\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+      "end": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
       "endCaptures": {
         "0": {
           "name": "entity.name.type.ql"
@@ -1040,11 +1040,11 @@
       ]
     },
     "none": {
-      "match": "\\b(?:none)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bnone(?![0-9A-Za-z_])",
       "name": "keyword.quantifier.none.ql"
     },
     "not": {
-      "match": "\\b(?:not)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bnot(?![0-9A-Za-z_])",
       "name": "keyword.other.not.ql"
     },
     "open-angle": {
@@ -1116,15 +1116,15 @@
       ]
     },
     "or": {
-      "match": "\\b(?:or)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bor(?![0-9A-Za-z_])",
       "name": "keyword.other.or.ql"
     },
     "order": {
-      "match": "\\b(?:order)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\border(?![0-9A-Za-z_])",
       "name": "keyword.order.order.ql"
     },
     "override": {
-      "match": "\\b(?:override)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\boverride(?![0-9A-Za-z_])",
       "name": "storage.modifier.override.ql"
     },
     "pipe": {
@@ -1132,11 +1132,11 @@
       "name": "punctuation.separator.pipe.ql"
     },
     "pragma": {
-      "match": "\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bpragma(?![0-9A-Za-z_])",
       "name": "storage.modifier.pragma.ql"
     },
     "pragma-annotation": {
-      "begin": "((?:\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bpragma(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1146,7 +1146,7 @@
           ]
         }
       },
-      "end": "(?!(?:\\s|$|(?://|/\\*))|\\[)|(?<=\\])",
+      "end": "(?!(?:\\s|$|/[/*])|\\[)|(?<=])",
       "name": "meta.block.pragma-annotation.ql",
       "patterns": [
         {
@@ -1158,7 +1158,7 @@
       ]
     },
     "pragma-annotation-body": {
-      "begin": "((?:\\[))",
+      "begin": "(\\[)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1168,7 +1168,7 @@
           ]
         }
       },
-      "end": "((?:\\]))",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -1187,11 +1187,11 @@
       ]
     },
     "predicate": {
-      "match": "\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bpredicate(?![0-9A-Za-z_])",
       "name": "keyword.other.predicate.ql"
     },
     "predicate-body": {
-      "begin": "((?:\\{))",
+      "begin": "(\\{)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1201,7 +1201,7 @@
           ]
         }
       },
-      "end": "((?:\\}))",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -1230,22 +1230,22 @@
           "include": "#module-qualifier"
         },
         {
-          "match": "(?:\\b[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))\\s*(?:\\*|\\+)?\\s*(?=\\()",
+          "match": "\\b[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])\\s*[*+]?\\s*(?=\\()",
           "name": "entity.name.function.ql"
         },
         {
-          "match": "(?:\\b[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "variable.other.ql"
         },
         {
-          "match": "(?:\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])|@[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.ql"
         }
       ]
     },
     "predicate-or-field-declaration": {
-      "begin": "(?:(?=(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_])))))(?!(?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:unique)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))|(?:(?:(?:\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:additional)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:cached)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:default)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:external)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:final)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:language)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:library)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:override)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:private)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:query)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:signature)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:transient)(?:(?!(?:[0-9A-Za-z_]))))))))|(?=(?:(?:(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_])))))))|(?=(?:@[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_])))))",
-      "end": "(?<=\\}|;)",
+      "begin": "(?=\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_]))(?!\\b(?:(?:_(?![0-9A-Za-z_])|and(?![0-9A-Za-z_])|any(?![0-9A-Za-z_])|as(?![0-9A-Za-z_])|asc(?![0-9A-Za-z_])|avg(?![0-9A-Za-z_])|boolean(?![0-9A-Za-z_])|by(?![0-9A-Za-z_])|class(?![0-9A-Za-z_])|concat(?![0-9A-Za-z_])|count(?![0-9A-Za-z_])|date(?![0-9A-Za-z_])|desc(?![0-9A-Za-z_])|else(?![0-9A-Za-z_])|exists(?![0-9A-Za-z_])|extends(?![0-9A-Za-z_])|false(?![0-9A-Za-z_])|float(?![0-9A-Za-z_])|forall(?![0-9A-Za-z_])|forex(?![0-9A-Za-z_])|from(?![0-9A-Za-z_])|if(?![0-9A-Za-z_])|implies(?![0-9A-Za-z_])|import(?![0-9A-Za-z_])|in(?![0-9A-Za-z_])|instanceof(?![0-9A-Za-z_])|int(?![0-9A-Za-z_])|max(?![0-9A-Za-z_])|min(?![0-9A-Za-z_])|module(?![0-9A-Za-z_])|newtype(?![0-9A-Za-z_])|none(?![0-9A-Za-z_])|not(?![0-9A-Za-z_])|or(?![0-9A-Za-z_])|order(?![0-9A-Za-z_])|predicate(?![0-9A-Za-z_])|rank(?![0-9A-Za-z_])|result(?![0-9A-Za-z_])|select(?![0-9A-Za-z_])|strictconcat(?![0-9A-Za-z_])|strictcount(?![0-9A-Za-z_])|strictsum(?![0-9A-Za-z_])|string(?![0-9A-Za-z_])|sum(?![0-9A-Za-z_])|super(?![0-9A-Za-z_])|then(?![0-9A-Za-z_])|this(?![0-9A-Za-z_])|true(?![0-9A-Za-z_])|unique(?![0-9A-Za-z_])|where(?![0-9A-Za-z_]))|(?:abstract(?![0-9A-Za-z_])|additional(?![0-9A-Za-z_])|bindingset(?![0-9A-Za-z_])|cached(?![0-9A-Za-z_])|default(?![0-9A-Za-z_])|deprecated(?![0-9A-Za-z_])|external(?![0-9A-Za-z_])|final(?![0-9A-Za-z_])|language(?![0-9A-Za-z_])|library(?![0-9A-Za-z_])|override(?![0-9A-Za-z_])|pragma(?![0-9A-Za-z_])|private(?![0-9A-Za-z_])|query(?![0-9A-Za-z_])|signature(?![0-9A-Za-z_])|transient(?![0-9A-Za-z_]))))|(?=\\b(?:boolean(?![0-9A-Za-z_])|date(?![0-9A-Za-z_])|float(?![0-9A-Za-z_])|int(?![0-9A-Za-z_])|predicate(?![0-9A-Za-z_])|string(?![0-9A-Za-z_])))|(?=@[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_]))",
+      "end": "(?<=[};])",
       "name": "meta.block.predicate-or-field-declaration.ql",
       "patterns": [
         {
@@ -1261,21 +1261,21 @@
           "include": "#module-qualifier"
         },
         {
-          "match": "(?:\\b[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))(?=\\s*;)",
+          "match": "\\b[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])(?=\\s*;)",
           "name": "variable.field.ql"
         },
         {
-          "match": "(?:\\b[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.function.ql"
         },
         {
-          "match": "(?:\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])|@[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.ql"
         }
       ]
     },
     "predicate-parameter-list": {
-      "begin": "((?:\\())",
+      "begin": "(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1285,7 +1285,7 @@
           ]
         }
       },
-      "end": "((?:\\)))",
+      "end": "(\\))",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -1301,18 +1301,18 @@
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))(?=\\s*(?:,|\\)))",
+          "match": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])(?=\\s*[,)])",
           "name": "variable.parameter.ql"
         },
         {
           "include": "#module-qualifier"
         },
         {
-          "match": "(?:\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])|@[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "entity.name.type.ql"
         },
         {
-          "match": "(?:\\b[a-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[a-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "variable.parameter.ql"
         }
       ]
@@ -1340,15 +1340,15 @@
       ]
     },
     "private": {
-      "match": "\\b(?:private)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bprivate(?![0-9A-Za-z_])",
       "name": "storage.modifier.private.ql"
     },
     "query": {
-      "match": "\\b(?:query)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bquery(?![0-9A-Za-z_])",
       "name": "storage.modifier.query.ql"
     },
     "rank": {
-      "match": "\\b(?:rank)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\brank(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.rank.ql"
     },
     "relational-operator": {
@@ -1356,15 +1356,15 @@
       "name": "keyword.operator.relational.ql"
     },
     "result": {
-      "match": "\\b(?:result)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bresult(?![0-9A-Za-z_])",
       "name": "variable.language.result.ql"
     },
     "select": {
-      "match": "\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bselect(?![0-9A-Za-z_])",
       "name": "keyword.query.select.ql"
     },
     "select-as-clause": {
-      "begin": "((?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bas(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1374,21 +1374,21 @@
           ]
         }
       },
-      "end": "(?<=(?:[0-9A-Za-z_]))(?:(?!(?:[0-9A-Za-z_])))",
+      "end": "(?<=[0-9A-Za-z_])(?![0-9A-Za-z_])",
       "match": "meta.block.select-as-clause.ql",
       "patterns": [
         {
           "include": "#non-context-sensitive"
         },
         {
-          "match": "(?:\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_]))))",
+          "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])",
           "name": "variable.other.ql"
         }
       ]
     },
     "select-clause": {
-      "begin": "(?=(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))))",
-      "end": "(?!(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(?=\\b(?:from(?![0-9A-Za-z_])|where(?![0-9A-Za-z_])|select(?![0-9A-Za-z_])))",
+      "end": "(?!\\b(?:from(?![0-9A-Za-z_])|where(?![0-9A-Za-z_])|select(?![0-9A-Za-z_])))",
       "name": "meta.block.select-clause.ql",
       "patterns": [
         {
@@ -1403,7 +1403,7 @@
       ]
     },
     "select-section": {
-      "begin": "((?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bselect(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1429,26 +1429,26 @@
       "name": "punctuation.separator.statement.ql"
     },
     "signature": {
-      "match": "\\b(?:signature)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bsignature(?![0-9A-Za-z_])",
       "name": "storage.modifier.signature.ql"
     },
     "simple-id": {
-      "match": "\\b[A-Za-z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_])))"
+      "match": "\\b[A-Za-z][0-9A-Za-z_]*(?![0-9A-Za-z_])"
     },
     "strictconcat": {
-      "match": "\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bstrictconcat(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.strictconcat.ql"
     },
     "strictcount": {
-      "match": "\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bstrictcount(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.strictcount.ql"
     },
     "strictsum": {
-      "match": "\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bstrictsum(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.strictsum.ql"
     },
     "string": {
-      "match": "\\b(?:string)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bstring(?![0-9A-Za-z_])",
       "name": "keyword.type.string.ql"
     },
     "string-escape": {
@@ -1462,7 +1462,7 @@
           "name": "punctuation.definition.string.begin.ql"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.ql"
@@ -1479,42 +1479,42 @@
       ]
     },
     "sum": {
-      "match": "\\b(?:sum)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bsum(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.sum.ql"
     },
     "super": {
-      "match": "\\b(?:super)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bsuper(?![0-9A-Za-z_])",
       "name": "variable.language.super.ql"
     },
     "then": {
-      "match": "\\b(?:then)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bthen(?![0-9A-Za-z_])",
       "name": "keyword.other.then.ql"
     },
     "this": {
-      "match": "\\b(?:this)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bthis(?![0-9A-Za-z_])",
       "name": "variable.language.this.ql"
     },
     "transient": {
-      "match": "\\b(?:transient)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\btransient(?![0-9A-Za-z_])",
       "name": "storage.modifier.transient.ql"
     },
     "true": {
-      "match": "\\b(?:true)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\btrue(?![0-9A-Za-z_])",
       "name": "constant.language.boolean.true.ql"
     },
     "unique": {
-      "match": "\\b(?:unique)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bunique(?![0-9A-Za-z_])",
       "name": "keyword.aggregate.unique.ql"
     },
     "upper-id": {
-      "match": "\\b[A-Z][0-9A-Za-z_]*(?:(?!(?:[0-9A-Za-z_])))"
+      "match": "\\b[A-Z][0-9A-Za-z_]*(?![0-9A-Za-z_])"
     },
     "where": {
-      "match": "\\b(?:where)(?:(?!(?:[0-9A-Za-z_])))",
+      "match": "\\bwhere(?![0-9A-Za-z_])",
       "name": "keyword.query.where.ql"
     },
     "where-section": {
-      "begin": "((?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_])))))",
+      "begin": "(\\bwhere(?![0-9A-Za-z_]))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1524,7 +1524,7 @@
           ]
         }
       },
-      "end": "(?=(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))))",
+      "end": "(?=\\bselect(?![0-9A-Za-z_]))",
       "name": "meta.block.where-section.ql",
       "patterns": [
         {
@@ -1533,7 +1533,7 @@
       ]
     },
     "whitespace-or-comment-start": {
-      "match": "\\s|$|(?://|/\\*)"
+      "match": "\\s|$|/[/*]"
     }
   },
   "scopeName": "source.ql"
diff --git a/resources/languages/coffee.json b/resources/languages/coffee.json
index 782bb9c..75518c3 100644
--- a/resources/languages/coffee.json
+++ b/resources/languages/coffee.json
@@ -20,7 +20,7 @@
           "name": "entity.name.type.instance.coffee"
         }
       },
-      "match": "(new)\\s+(?:(?:(class)\\s+(\\w+(?:\\.\\w*)*)?)|(\\w+(?:\\.\\w*)*))",
+      "match": "(new)\\s+(?:(class)\\s+(\\w+(?:\\.\\w*)*)?|(\\w+(?:\\.\\w*)*))",
       "name": "meta.class.instance.constructor.coffee"
     },
     {
@@ -170,19 +170,19 @@
       ]
     },
     {
-      "match": "\\b(?<![\\.\\$])(break|by|catch|continue|else|finally|for|in|of|if|return|switch|then|throw|try|unless|when|while|until|loop|do|export|import|default|from|as|yield|async|await|(?<=for)\\s+own)(?!\\s*:)\\b",
+      "match": "\\b(?<![.$])(break|by|catch|continue|else|finally|for|in|of|if|return|switch|then|throw|try|unless|when|while|until|loop|do|export|import|default|from|as|yield|async|await|(?<=for)\\s+own)(?!\\s*:)\\b",
       "name": "keyword.control.coffee"
     },
     {
-      "match": "\\b(?<![\\.\\$])(delete|instanceof|new|typeof)(?!\\s*:)\\b",
+      "match": "\\b(?<![.$])(delete|instanceof|new|typeof)(?!\\s*:)\\b",
       "name": "keyword.operator.$1.coffee"
     },
     {
-      "match": "\\b(?<![\\.\\$])(case|function|var|void|with|const|let|enum|native|__hasProp|__extends|__slice|__bind|__indexOf|implements|interface|package|private|protected|public|static)(?!\\s*:)\\b",
+      "match": "\\b(?<![.$])(case|function|var|void|with|const|let|enum|native|__hasProp|__extends|__slice|__bind|__indexOf|implements|interface|package|private|protected|public|static)(?!\\s*:)\\b",
       "name": "keyword.reserved.coffee"
     },
     {
-      "begin": "(?<=\\s|^)((@)?[a-zA-Z_$][\\w$]*)\\s*([:=])\\s*(?=(\\([^\\(\\)]*\\)\\s*)?[=-]>)",
+      "begin": "(?<=\\s|^)((@)?[a-zA-Z_$][\\w$]*)\\s*([:=])\\s*(?=(\\([^()]*\\)\\s*)?[=-]>)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.coffee"
@@ -208,7 +208,7 @@
       ]
     },
     {
-      "begin": "(?<=\\s|^)(?:((')([^']*?)('))|((\")([^\"]*?)(\")))\\s*([:=])\\s*(?=(\\([^\\(\\)]*\\)\\s*)?[=-]>)",
+      "begin": "(?<=\\s|^)(?:((')([^']*?)('))|((\")([^\"]*?)(\")))\\s*([:=])\\s*(?=(\\([^()]*\\)\\s*)?[=-]>)",
       "beginCaptures": {
         "1": {
           "name": "string.quoted.single.coffee"
@@ -252,7 +252,7 @@
       ]
     },
     {
-      "begin": "(?=(\\([^\\(\\)]*\\)\\s*)?[=-]>)",
+      "begin": "(?=(\\([^()]*\\)\\s*)?[=-]>)",
       "end": "[=-]>",
       "endCaptures": {
         "0": {
@@ -267,7 +267,7 @@
       ]
     },
     {
-      "begin": "(?<=\\s|^)({)(?=[^'\"#]+?}[\\s\\]}]*=)",
+      "begin": "(?<=\\s|^)(\\{)(?=[^'\"#]+?}[\\s\\]}]*=)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.destructuring.begin.bracket.curly.coffee"
@@ -291,13 +291,13 @@
       ]
     },
     {
-      "begin": "(?<=\\s|^)(\\[)(?=[^'\"#]+?\\][\\s\\]}]*=)",
+      "begin": "(?<=\\s|^)(\\[)(?=[^'\"#]+?][\\s\\]}]*=)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.destructuring.begin.bracket.square.coffee"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.destructuring.end.bracket.square.coffee"
@@ -346,7 +346,7 @@
           "name": "entity.other.inherited-class.coffee"
         }
       },
-      "match": "(?<=\\s|^|\\[|\\()(class)\\s+(extends)\\s+(@?[a-zA-Z\\$\\._][\\w\\.]*)",
+      "match": "(?<=\\s|^|[\\[(])(class)\\s+(extends)\\s+(@?[a-zA-Z$._][\\w.]*)",
       "name": "meta.class.coffee"
     },
     {
@@ -364,7 +364,7 @@
           "name": "entity.other.inherited-class.coffee"
         }
       },
-      "match": "(?<=\\s|^|\\[|\\()(class\\b)\\s+(@?[a-zA-Z\\$_][\\w\\.]*)?(?:\\s+(extends)\\s+(@?[a-zA-Z\\$\\._][\\w\\.]*))?",
+      "match": "(?<=\\s|^|[\\[(])(class\\b)\\s+(@?[a-zA-Z$_][\\w.]*)?(?:\\s+(extends)\\s+(@?[a-zA-Z$._][\\w.]*))?",
       "name": "meta.class.coffee"
     },
     {
@@ -446,7 +446,7 @@
       "name": "punctuation.separator.delimiter.coffee"
     },
     {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "meta.brace.curly.coffee"
@@ -471,7 +471,7 @@
           "name": "punctuation.definition.array.begin.bracket.square.coffee"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.array.end.bracket.square.coffee"
@@ -544,8 +544,8 @@
           ]
         },
         {
-          "begin": "(?=(@|@?[\\w$]+|[=-]>|\\-\\d|\\[|{|\"|'))",
-          "end": "(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*(}|\\]|\\)|#|$))",
+          "begin": "(?=(@|@?[\\w$]+|[=-]>|-\\d|[\\[{\"']))",
+          "end": "(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*([}\\])#]|$))",
           "name": "meta.arguments.coffee",
           "patterns": [
             {
@@ -578,7 +578,7 @@
                   "name": "punctuation.definition.escape.backslash.coffee"
                 }
               },
-              "match": "(\\\\)(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)",
+              "match": "(\\\\)(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)",
               "name": "constant.character.escape.backslash.coffee"
             },
             {
@@ -626,7 +626,7 @@
           ]
         },
         {
-          "begin": "(@)?([\\w$]+)\\s*(?=\\s+(?!(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))(?=(@?[\\w$]+|[=-]>|\\-\\d|\\[|{|\"|')))",
+          "begin": "(@)?([\\w$]+)\\s*(?=\\s+(?!(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))(?=(@?[\\w$]+|[=-]>|-\\d|[\\[{\"'])))",
           "beginCaptures": {
             "1": {
               "name": "variable.other.readwrite.instance.coffee"
@@ -639,7 +639,7 @@
               ]
             }
           },
-          "end": "(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*(}|\\]|\\)|#|$))",
+          "end": "(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*([}\\])#]|$))",
           "name": "meta.function-call.coffee",
           "patterns": [
             {
@@ -714,7 +714,7 @@
     "heregexp": {
       "patterns": [
         {
-          "match": "\\\\[bB]|\\^|\\$",
+          "match": "\\\\[bB]|[\\^$]",
           "name": "keyword.control.anchor.regexp"
         },
         {
@@ -722,7 +722,7 @@
           "name": "keyword.other.back-reference.regexp"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.regexp"
         },
         {
@@ -785,7 +785,7 @@
               "name": "keyword.operator.negation.regexp"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.regexp"
@@ -814,7 +814,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))",
               "name": "constant.other.character-class.range.regexp"
             },
             {
@@ -836,7 +836,7 @@
     "instance_variable": {
       "patterns": [
         {
-          "match": "(@)([a-zA-Z_\\$]\\w*)?",
+          "match": "(@)([a-zA-Z_$]\\w*)?",
           "name": "variable.other.readwrite.instance.coffee"
         }
       ]
@@ -844,13 +844,13 @@
     "interpolated_coffee": {
       "patterns": [
         {
-          "begin": "\\#\\{",
+          "begin": "#\\{",
           "captures": {
             "0": {
               "name": "punctuation.section.embedded.coffee"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "source.coffee.embedded.source",
           "patterns": [
             {
@@ -897,7 +897,7 @@
     "jsx-end-tag": {
       "patterns": [
         {
-          "begin": "(</)([-\\w\\.]+)",
+          "begin": "(</)([-\\w.]+)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.coffee"
@@ -912,7 +912,7 @@
       ]
     },
     "jsx-expression": {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "meta.brace.curly.coffee"
@@ -936,7 +936,7 @@
     "jsx-tag": {
       "patterns": [
         {
-          "begin": "(<)([-\\w\\.]+)",
+          "begin": "(<)([-\\w.]+)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.coffee"
@@ -983,7 +983,7 @@
           ]
         },
         {
-          "begin": "(?:(\\.)|(::))\\s*([\\w$]+)\\s*(?=\\s+(?!(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))(?=(@|@?[\\w$]+|[=-]>|\\-\\d|\\[|{|\"|')))",
+          "begin": "(?:(\\.)|(::))\\s*([\\w$]+)\\s*(?=\\s+(?!(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))(?=(@|@?[\\w$]+|[=-]>|-\\d|[\\[{\"'])))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.method.period.coffee"
@@ -999,7 +999,7 @@
               ]
             }
           },
-          "end": "(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*(}|\\]|\\)|#|$))",
+          "end": "(?=\\s*(?<![\\w$])(of|in|then|is|isnt|and|or|for|else|when|if|unless|by|instanceof)(?![\\w$]))|(?=\\s*([}\\])#]|$))",
           "name": "meta.method-call.coffee",
           "patterns": [
             {
@@ -1036,15 +1036,15 @@
     "numbers": {
       "patterns": [
         {
-          "match": "\\b(?<!\\$)0(x|X)[0-9a-fA-F]+\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0([xX])\\h+\\b(?!\\$)",
           "name": "constant.numeric.hex.coffee"
         },
         {
-          "match": "\\b(?<!\\$)0(b|B)[01]+\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0([bB])[01]+\\b(?!\\$)",
           "name": "constant.numeric.binary.coffee"
         },
         {
-          "match": "\\b(?<!\\$)0(o|O)?[0-7]+\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0([oO])?[0-7]+\\b(?!\\$)",
           "name": "constant.numeric.octal.coffee"
         },
         {
@@ -1071,7 +1071,7 @@
               "name": "punctuation.separator.decimal.period.coffee"
             }
           },
-          "match": "(?<!\\$)(?:(?:\\b[0-9]+(\\.)[0-9]+[eE][+-]?[0-9]+\\b)|(?:\\b[0-9]+(\\.)[eE][+-]?[0-9]+\\b)|(?:\\B(\\.)[0-9]+[eE][+-]?[0-9]+\\b)|(?:\\b[0-9]+[eE][+-]?[0-9]+\\b)|(?:\\b[0-9]+(\\.)[0-9]+\\b)|(?:\\b[0-9]+(?=\\.{2,3}))|(?:\\b[0-9]+(\\.)\\B)|(?:\\B(\\.)[0-9]+\\b)|(?:\\b[0-9]+\\b(?!\\.)))(?!\\$)"
+          "match": "(?<!\\$)(?:\\b[0-9]+(\\.)[0-9]+[eE][+-]?[0-9]+\\b|\\b[0-9]+(\\.)[eE][+-]?[0-9]+\\b|\\B(\\.)[0-9]+[eE][+-]?[0-9]+\\b|\\b[0-9]+[eE][+-]?[0-9]+\\b|\\b[0-9]+(\\.)[0-9]+\\b|\\b[0-9]+(?=\\.{2,3})|\\b[0-9]+(\\.)\\B|\\B(\\.)[0-9]+\\b|\\b[0-9]+\\b(?!\\.))(?!\\$)"
         }
       ]
     },
@@ -1127,7 +1127,7 @@
           "name": "keyword.operator.bitwise.shift.coffee"
         },
         {
-          "match": "!=|<=|>=|==|<|>",
+          "match": "!=|<=|>=|==|[<>]",
           "name": "keyword.operator.comparison.coffee"
         },
         {
@@ -1135,7 +1135,7 @@
           "name": "keyword.operator.logical.coffee"
         },
         {
-          "match": "&|\\||\\^|~",
+          "match": "[\\&|^~]",
           "name": "keyword.operator.bitwise.coffee"
         },
         {
@@ -1166,7 +1166,7 @@
           "name": "keyword.operator.existential.coffee"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.coffee"
         },
         {
@@ -1178,7 +1178,7 @@
               "name": "keyword.operator.comparison.coffee"
             }
           },
-          "match": "\\b(?<![\\.\\$])(?:(and|or|not)|(is|isnt))(?!\\s*:)\\b"
+          "match": "\\b(?<![.$])(?:(and|or|not)|(is(?:|nt)))(?!\\s*:)\\b"
         }
       ]
     },
@@ -1263,7 +1263,7 @@
           "name": "constant.character.character-class.regexp"
         },
         {
-          "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})",
+          "match": "\\\\([0-7]{3}|x\\h{2}|u\\h{4})",
           "name": "constant.character.numeric.regexp"
         },
         {
@@ -1299,7 +1299,7 @@
                   "name": "punctuation.definition.escape.backslash.coffee"
                 }
               },
-              "match": "(\\\\)(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
+              "match": "(\\\\)(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
               "name": "constant.character.escape.backslash.coffee"
             }
           ]
diff --git a/resources/languages/common-lisp.json b/resources/languages/common-lisp.json
index f022ba7..4b5430b 100644
--- a/resources/languages/common-lisp.json
+++ b/resources/languages/common-lisp.json
@@ -72,9 +72,9 @@
   ],
   "repository": {
     "block-comment": {
-      "begin": "\\#\\|",
+      "begin": "#\\|",
       "contentName": "comment.block.commonlisp",
-      "end": "\\|\\#",
+      "end": "\\|#",
       "name": "comment",
       "patterns": [
         {
@@ -84,7 +84,7 @@
       ]
     },
     "class": {
-      "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:two-way-stream|synonym-stream|symbol|structure-object|structure-class|string-stream|stream|standard-object|standard-method|\nstandard-generic-function|standard-class|sequence|restart|real|readtable|ratio|random-state|package|number|method|integer|hash-table|\ngeneric-function|file-stream|echo-stream|concatenated-stream|class|built-in-class|broadcast-stream|bit-vector|array)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+      "match": "(?i)(?<=^|[\\s(])(?:two-way-stream|synonym-stream|symbol|structure-object|structure-class|string-stream|stream|standard-object|standard-method|standard-generic-function|standard-class|sequence|restart|real|readtable|ratio|random-state|package|number|method|integer|hash-table|generic-function|file-stream|echo-stream|concatenated-stream|class|built-in-class|broadcast-stream|bit-vector|array)(?=([\\s()]))",
       "name": "support.class.commonlisp"
     },
     "comment": {
@@ -109,31 +109,31 @@
       ]
     },
     "condition-type": {
-      "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:warning|undefined-function|unbound-variable|unbound-slot|type-error|style-warning|stream-error|storage-condition|simple-warning|\nsimple-type-error|simple-error|simple-condition|serious-condition|reader-error|program-error|print-not-readable|parse-error|package-error|\nfloating-point-underflow|floating-point-overflow|floating-point-invalid-operation|floating-point-inexact|file-error|error|end-of-file|\ndivision-by-zero|control-error|condition|cell-error|arithmetic-error)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+      "match": "(?i)(?<=^|[\\s(])(?:warning|undefined-function|unbound-variable|unbound-slot|type-error|style-warning|stream-error|storage-condition|simple-warning|simple-type-error|simple-error|simple-condition|serious-condition|reader-error|program-error|print-not-readable|parse-error|package-error|floating-point-underflow|floating-point-overflow|floating-point-invalid-operation|floating-point-inexact|file-error|error|end-of-file|division-by-zero|control-error|condition|cell-error|arithmetic-error)(?=([\\s()]))",
       "name": "support.type.exception.commonlisp"
     },
     "constant": {
       "patterns": [
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(?:t|single-float-negative-epsilon|single-float-epsilon|short-float-negative-epsilon|short-float-epsilon|pi|\nnil|multiple-values-limit|most-positive-single-float|most-positive-short-float|most-positive-long-float|\nmost-positive-fixnum|most-positive-double-float|most-negative-single-float|most-negative-short-float|\nmost-negative-long-float|most-negative-fixnum|most-negative-double-float|long-float-negative-epsilon|\nlong-float-epsilon|least-positive-single-float|least-positive-short-float|least-positive-normalized-single-float|\nleast-positive-normalized-short-float|least-positive-normalized-long-float|least-positive-normalized-double-float|\nleast-positive-long-float|least-positive-double-float|least-negative-single-float|least-negative-short-float|\nleast-negative-normalized-single-float|least-negative-normalized-short-float|least-negative-normalized-long-float|\nleast-negative-normalized-double-float|least-negative-long-float|least-negative-double-float|lambda-parameters-limit|\nlambda-list-keywords|internal-time-units-per-second|double-float-negative-epsilon|double-float-epsilon|char-code-limit|\ncall-arguments-limit|boole-xor|boole-set|boole-orc2|boole-orc1|boole-nor|boole-nand|boole-ior|boole-eqv|boole-clr|\nboole-c2|boole-c1|boole-andc2|boole-andc1|boole-and|boole-2|boole-1|array-total-size-limit|array-rank-limit|array-dimension-limit)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(?:t|single-float-negative-epsilon|single-float-epsilon|short-float-negative-epsilon|short-float-epsilon|pi|nil|multiple-values-limit|most-positive-single-float|most-positive-short-float|most-positive-long-float|most-positive-fixnum|most-positive-double-float|most-negative-single-float|most-negative-short-float|most-negative-long-float|most-negative-fixnum|most-negative-double-float|long-float-negative-epsilon|long-float-epsilon|least-positive-single-float|least-positive-short-float|least-positive-normalized-single-float|least-positive-normalized-short-float|least-positive-normalized-long-float|least-positive-normalized-double-float|least-positive-long-float|least-positive-double-float|least-negative-single-float|least-negative-short-float|least-negative-normalized-single-float|least-negative-normalized-short-float|least-negative-normalized-long-float|least-negative-normalized-double-float|least-negative-long-float|least-negative-double-float|lambda-parameters-limit|lambda-list-keywords|internal-time-units-per-second|double-float-negative-epsilon|double-float-epsilon|char-code-limit|call-arguments-limit|boole-xor|boole-set|boole-orc2|boole-orc1|boole-nor|boole-nand|boole-ior|boole-eqv|boole-clr|boole-c2|boole-c1|boole-andc2|boole-andc1|boole-and|boole-2|boole-1|array-total-size-limit|array-rank-limit|array-dimension-limit)(?=([\\s()]))",
           "name": "constant.language.commonlisp"
         },
         {
-          "match": "(?<=^|\\s|\\(|,@|,\\.|,)([+-]?[0-9]+(?:\\/[0-9]+)*|[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?|(\\#b|\\#B)[01\\/+-]+|(\\#o|\\#O)[0-7\\/+-]+|(\\#x|\\#X)[0-9a-fA-F\\/+-]+|(\\#[0-9]+[rR]?)[0-9a-zA-Z\\/+-]+)(?=(\\s|\\)))",
+          "match": "(?<=^|[\\s(]|,@|,\\.|,)([+-]?[0-9]+(?:/[0-9]+)*|[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?|(#[bB])[01/+-]+|(#[oO])[0-7/+-]+|(#[xX])[/+\\-\\h]+|(#[0-9]+[rR]?)[0-9a-zA-Z/+-]+)(?=([\\s)]))",
           "name": "constant.numeric.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=\\s) # preceded by space\n(\\.)\n(?=\\s)",
+          "match": "(?i)(?<=\\s)(\\.)(?=\\s)",
           "name": "variable.other.constant.dot.commonlisp"
         },
         {
-          "match": "(?<=^|\\s|\\(|,@|,\\.|,)([+-]?[0-9]*\\.[0-9]*((e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+)?|[+-]?[0-9]+(\\.[0-9]*)?(e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+)(?=(\\s|\\)))",
+          "match": "(?<=^|[\\s(]|,@|,\\.|,)([+-]?[0-9]*\\.[0-9]*(([esfdlESFDL])[+-]?[0-9]+)?|[+-]?[0-9]+(\\.[0-9]*)?([esfdlESFDL])[+-]?[0-9]+)(?=([\\s)]))",
           "name": "constant.numeric.commonlisp"
         }
       ]
     },
     "declaration": {
-      "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:type|speed|special|space|safety|optimize|notinline|inline|ignore|ignorable|ftype|dynamic-extent|declaration|debug|compilation-speed)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+      "match": "(?i)(?<=^|[\\s(])(?:type|speed|special|space|safety|optimize|notinline|inline|ignore|ignorable|ftype|dynamic-extent|declaration|debug|compilation-speed)(?=([\\s()]))",
       "name": "storage.type.function.declaration.commonlisp"
     },
     "def-name": {
@@ -175,7 +175,7 @@
               ]
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\()                     # preceded by (\n(defun|defsetf|defmethod|defmacro|define-symbol-macro|define-setf-expander|\ndefine-modify-macro|define-method-combination|define-compiler-macro|defgeneric)  #1 keywords\n\\s+\n(   \\(\\s*\n        ([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+) #3\n    \\s*\n        ((,@|,\\.|,)?) #4\n        ([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?)      #6 (<3>something+ <6>name)\n    |\n        ((,@|,\\.|,)?) #7\n        ([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?)      #9 name\n) #2\n(?=(\\s|\\(|\\)))"
+          "match": "(?i)(?<=^|[\\s(])(def(?:un|setf|method|macro|ine-symbol-macro|ine-setf-expander|ine-modify-macro|ine-method-combination|ine-compiler-macro|generic))\\s+(\\(\\s*([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+)\\s*((,(?:[@.]|))?)([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)|((,(?:[@.]|))?)([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?))(?=([\\s()]))"
         },
         {
           "captures": {
@@ -186,7 +186,7 @@
               "name": "entity.name.type.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\()\n(deftype|defpackage|define-condition|defclass)              # keywords\n\\s+\n([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?)                   # name\n(?=(\\s|\\(|\\)))"
+          "match": "(?i)(?<=^|[\\s(])(def(?:type|package|ine-condition|class))\\s+([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
         },
         {
           "captures": {
@@ -205,7 +205,7 @@
               ]
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\()\n(defconstant)         # keywords\n\\s+\n([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?)                # name\n(?=(\\s|\\(|\\)))"
+          "match": "(?i)(?<=^|[\\s(])(defconstant)\\s+([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
         },
         {
           "captures": {
@@ -213,7 +213,7 @@
               "name": "storage.type.function.defname.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\()\n(defvar|defparameter) # keywords\n\\s+\n(?=(\\s|\\(|\\)))"
+          "match": "(?i)(?<=^|[\\s(])(def(?:var|parameter))\\s+(?=([\\s()]))"
         },
         {
           "captures": {
@@ -224,7 +224,7 @@
               "name": "entity.name.type.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\()\n(defstruct)         # keywords\n\\s+\\(?\\s*\n([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?)              # name\n(?=(\\s|\\(|\\)))"
+          "match": "(?i)(?<=^|[\\s(])(defstruct)\\s+\\(?\\s*([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
         },
         {
           "captures": {
@@ -243,58 +243,58 @@
               ]
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\()\n(macrolet|labels|flet)        # keywords\n\\s+\\(\\s*\\(\\s*\n([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?)                        # name\n(?=(\\s|\\(|\\)))"
+          "match": "(?i)(?<=^|[\\s(])(macrolet|labels|flet)\\s+\\(\\s*\\(\\s*([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
         }
       ]
     },
     "escape": {
-      "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:\\#\\\\\\S+?)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+      "match": "(?i)(?<=^|[\\s(])#\\\\\\S+?(?=([\\s()]))",
       "name": "constant.character.escape.commonlisp"
     },
     "function": {
       "patterns": [
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|\\#') # preceded by space or (\n(?:values|third|tenth|symbol-value|symbol-plist|symbol-function|svref|subseq|sixth|seventh|second|schar|sbit|row-major-aref|\n   rest|readtable-case|nth|ninth|mask-field|macro-function|logical-pathname-translations|ldb|gethash|getf|get|fourth|first|\n   find-class|fill-pointer|fifth|fdefinition|elt|eighth|compiler-macro-function|char|cdr|cddr|cdddr|cddddr|cdddar|cddar|cddadr|\n   cddaar|cdar|cdadr|cdaddr|cdadar|cdaar|cdaadr|cdaaar|car|cadr|caddr|cadddr|caddar|cadar|cadadr|cadaar|caar|caadr|caaddr|caadar|\n   caaar|caaadr|caaaar|bit|aref)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|#')(?:values|third|tenth|symbol-value|symbol-plist|symbol-function|svref|subseq|sixth|seventh|second|schar|sbit|row-major-aref|rest|readtable-case|nth|ninth|mask-field|macro-function|logical-pathname-translations|ldb|gethash|getf|get|fourth|first|find-class|fill-pointer|fifth|fdefinition|elt|eighth|compiler-macro-function|char|cdr|cddr|cdddr|cddddr|cdddar|cddar|cddadr|cddaar|cdar|cdadr|cdaddr|cdadar|cdaar|cdaadr|cdaaar|car|cadr|caddr|cadddr|caddar|cadar|cadadr|cadaar|caar|caadr|caaddr|caadar|caaar|caaadr|caaaar|bit|aref)(?=([\\s()]))",
           "name": "support.function.accessor.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|\\#') # preceded by space or (\n(?:yes-or-no-p|y-or-n-p|write-sequence|write-char|write-byte|warn|vector-pop|use-value|use-package|unuse-package|union|unintern|\nunexport|terpri|tailp|substitute-if-not|substitute-if|substitute|subst-if-not|subst-if|subst|sublis|string-upcase|string-downcase|\nstring-capitalize|store-value|sleep|signal|shadowing-import|shadow|set-syntax-from-char|set-macro-character|set-exclusive-or|\nset-dispatch-macro-character|set-difference|set|rplacd|rplaca|room|reverse|revappend|require|replace|remprop|remove-if-not|remove-if|\nremove-duplicates|remove|remhash|read-sequence|read-byte|random|provide|pprint-tabular|pprint-newline|pprint-linear|pprint-fill|\nnunion|nsubstitute-if-not|nsubstitute-if|nsubstitute|nsubst-if-not|nsubst-if|nsubst|nsublis|nstring-upcase|nstring-downcase|nstring-capitalize|\nnset-exclusive-or|nset-difference|nreverse|nreconc|nintersection|nconc|muffle-warning|method-combination-error|maphash|makunbound|ldiff|\ninvoke-restart-interactively|invoke-restart|invoke-debugger|invalid-method-error|intersection|inspect|import|get-output-stream-string|\nget-macro-character|get-dispatch-macro-character|gentemp|gensym|fresh-line|fill|file-position|export|describe|delete-if-not|delete-if|\ndelete-duplicates|delete|continue|clrhash|close|clear-input|break|abort)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|#')(?:yes-or-no-p|y-or-n-p|write-sequence|write-char|write-byte|warn|vector-pop|use-value|use-package|unuse-package|union|unintern|unexport|terpri|tailp|substitute-if-not|substitute-if|substitute|subst-if-not|subst-if|subst|sublis|string-upcase|string-downcase|string-capitalize|store-value|sleep|signal|shadowing-import|shadow|set-syntax-from-char|set-macro-character|set-exclusive-or|set-dispatch-macro-character|set-difference|set|rplacd|rplaca|room|reverse|revappend|require|replace|remprop|remove-if-not|remove-if|remove-duplicates|remove|remhash|read-sequence|read-byte|random|provide|pprint-tabular|pprint-newline|pprint-linear|pprint-fill|nunion|nsubstitute-if-not|nsubstitute-if|nsubstitute|nsubst-if-not|nsubst-if|nsubst|nsublis|nstring-upcase|nstring-downcase|nstring-capitalize|nset-exclusive-or|nset-difference|nreverse|nreconc|nintersection|nconc|muffle-warning|method-combination-error|maphash|makunbound|ldiff|invoke-restart-interactively|invoke-restart|invoke-debugger|invalid-method-error|intersection|inspect|import|get-output-stream-string|get-macro-character|get-dispatch-macro-character|gentemp|gensym|fresh-line|fill|file-position|export|describe|delete-if-not|delete-if|delete-duplicates|delete|continue|clrhash|close|clear-input|break|abort)(?=([\\s()]))",
           "name": "support.function.f.sideeffects.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|\\#') # preceded by space or (\n(?:zerop|write-to-string|write-string|write-line|write|wild-pathname-p|vectorp|vector-push-extend|vector-push|vector|values-list|\nuser-homedir-pathname|upper-case-p|upgraded-complex-part-type|upgraded-array-element-type|unread-char|unbound-slot-instance|typep|type-of|\ntype-error-expected-type|type-error-datum|two-way-stream-output-stream|two-way-stream-input-stream|truncate|truename|tree-equal|translate-pathname|\ntranslate-logical-pathname|tanh|tan|synonym-stream-symbol|symbolp|symbol-package|symbol-name|sxhash|subtypep|subsetp|stringp|string>=|string>|\nstring=|string<=|string<|string\\/=|string-trim|string-right-trim|string-not-lessp|string-not-greaterp|string-not-equal|string-lessp|\nstring-left-trim|string-greaterp|string-equal|string|streamp|stream-external-format|stream-error-stream|stream-element-type|standard-char-p|\nstable-sort|sqrt|special-operator-p|sort|some|software-version|software-type|slot-value|slot-makunbound|slot-exists-p|slot-boundp|sinh|sin|\nsimple-vector-p|simple-string-p|simple-condition-format-control|simple-condition-format-arguments|simple-bit-vector-p|signum|short-site-name|\nset-pprint-dispatch|search|scale-float|round|restart-name|rename-package|rename-file|rem|reduce|realpart|realp|readtablep|\nread-preserving-whitespace|read-line|read-from-string|read-delimited-list|read-char-no-hang|read-char|read|rationalp|rationalize|\nrational|rassoc-if-not|rassoc-if|rassoc|random-state-p|proclaim|probe-file|print-not-readable-object|print|princ-to-string|princ|\nprin1-to-string|prin1|pprint-tab|pprint-indent|pprint-dispatch|pprint|position-if-not|position-if|position|plusp|phase|peek-char|pathnamep|\npathname-version|pathname-type|pathname-name|pathname-match-p|pathname-host|pathname-directory|pathname-device|pathname|parse-namestring|\nparse-integer|pairlis|packagep|package-used-by-list|package-use-list|package-shadowing-symbols|package-nicknames|package-name|package-error-package|\noutput-stream-p|open-stream-p|open|oddp|numerator|numberp|null|nthcdr|notevery|notany|not|next-method-p|nbutlast|namestring|name-char|mod|mismatch|\nminusp|min|merge-pathnames|merge|member-if-not|member-if|member|max|maplist|mapl|mapcon|mapcar|mapcan|mapc|map-into|map|make-two-way-stream|\nmake-synonym-stream|make-symbol|make-string-output-stream|make-string-input-stream|make-string|make-sequence|make-random-state|make-pathname|\nmake-package|make-load-form-saving-slots|make-list|make-hash-table|make-echo-stream|make-dispatch-macro-character|make-condition|\nmake-concatenated-stream|make-broadcast-stream|make-array|macroexpand-1|macroexpand|machine-version|machine-type|machine-instance|lower-case-p|\nlong-site-name|logxor|logtest|logorc2|logorc1|lognot|lognor|lognand|logior|logical-pathname|logeqv|logcount|logbitp|logandc2|logandc1|logand|\nlog|load-logical-pathname-translations|load|listp|listen|list-length|list-all-packages|list\\*|list|lisp-implementation-version|\nlisp-implementation-type|length|ldb-test|lcm|last|keywordp|isqrt|intern|interactive-stream-p|integerp|integer-length|integer-decode-float|\ninput-stream-p|imagpart|identity|host-namestring|hash-table-test|hash-table-size|hash-table-rehash-threshold|hash-table-rehash-size|hash-table-p|\nhash-table-count|graphic-char-p|get-universal-time|get-setf-expansion|get-properties|get-internal-run-time|get-internal-real-time|\nget-decoded-time|gcd|functionp|function-lambda-expression|funcall|ftruncate|fround|format|force-output|fmakunbound|floor|floatp|float-sign|\nfloat-radix|float-precision|float-digits|float|finish-output|find-symbol|find-restart|find-package|find-if-not|find-if|find-all-symbols|find|\nfile-write-date|file-string-length|file-namestring|file-length|file-error-pathname|file-author|ffloor|fceiling|fboundp|expt|exp|every|evenp|\neval|equalp|equal|eql|eq|ensure-generic-function|ensure-directories-exist|enough-namestring|endp|encode-universal-time|ed|echo-stream-output-stream|\necho-stream-input-stream|dribble|dpb|disassemble|directory-namestring|directory|digit-char-p|digit-char|deposit-field|denominator|delete-package|\ndelete-file|decode-universal-time|decode-float|count-if-not|count-if|count|cosh|cos|copy-tree|copy-symbol|copy-structure|copy-seq|copy-readtable|\ncopy-pprint-dispatch|copy-list|copy-alist|constantp|constantly|consp|cons|conjugate|concatenated-stream-streams|concatenate|compute-restarts|\ncomplexp|complex|complement|compiled-function-p|compile-file-pathname|compile-file|compile|coerce|code-char|clear-output|class-of|cis|characterp|\ncharacter|char>=|char>|char=|char<=|char<|char\\/=|char-upcase|char-not-lessp|char-not-greaterp|char-not-equal|char-name|char-lessp|char-int|\nchar-greaterp|char-equal|char-downcase|char-code|cerror|cell-error-name|ceiling|call-next-method|byte-size|byte-position|byte|butlast|\nbroadcast-stream-streams|boundp|both-case-p|boole|bit-xor|bit-vector-p|bit-orc2|bit-orc1|bit-not|bit-nor|bit-nand|bit-ior|bit-eqv|bit-andc2|\nbit-andc1|bit-and|atom|atanh|atan|assoc-if-not|assoc-if|assoc|asinh|asin|ash|arrayp|array-total-size|array-row-major-index|array-rank|\narray-in-bounds-p|array-has-fill-pointer-p|array-element-type|array-displacement|array-dimensions|array-dimension|arithmetic-error-operation|\narithmetic-error-operands|apropos-list|apropos|apply|append|alphanumericp|alpha-char-p|adjustable-array-p|adjust-array|adjoin|acosh|acos|acons|\nabs|>=|>|=|<=|<|1-|1\\+|\\/=|\\/|-|\\+|\\*)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|#')(?:zerop|write-to-string|write-string|write-line|write|wild-pathname-p|vectorp|vector-push-extend|vector-push|vector|values-list|user-homedir-pathname|upper-case-p|upgraded-complex-part-type|upgraded-array-element-type|unread-char|unbound-slot-instance|typep|type-of|type-error-expected-type|type-error-datum|two-way-stream-output-stream|two-way-stream-input-stream|truncate|truename|tree-equal|translate-pathname|translate-logical-pathname|tanh|tan|synonym-stream-symbol|symbolp|symbol-package|symbol-name|sxhash|subtypep|subsetp|stringp|string>=|string>|string=|string<=|string<|string/=|string-trim|string-right-trim|string-not-lessp|string-not-greaterp|string-not-equal|string-lessp|string-left-trim|string-greaterp|string-equal|string|streamp|stream-external-format|stream-error-stream|stream-element-type|standard-char-p|stable-sort|sqrt|special-operator-p|sort|some|software-version|software-type|slot-value|slot-makunbound|slot-exists-p|slot-boundp|sinh|sin|simple-vector-p|simple-string-p|simple-condition-format-control|simple-condition-format-arguments|simple-bit-vector-p|signum|short-site-name|set-pprint-dispatch|search|scale-float|round|restart-name|rename-package|rename-file|rem|reduce|realpart|realp|readtablep|read-preserving-whitespace|read-line|read-from-string|read-delimited-list|read-char-no-hang|read-char|read|rationalp|rationalize|rational|rassoc-if-not|rassoc-if|rassoc|random-state-p|proclaim|probe-file|print-not-readable-object|print|princ-to-string|princ|prin1-to-string|prin1|pprint-tab|pprint-indent|pprint-dispatch|pprint|position-if-not|position-if|position|plusp|phase|peek-char|pathnamep|pathname-version|pathname-type|pathname-name|pathname-match-p|pathname-host|pathname-directory|pathname-device|pathname|parse-namestring|parse-integer|pairlis|packagep|package-used-by-list|package-use-list|package-shadowing-symbols|package-nicknames|package-name|package-error-package|output-stream-p|open-stream-p|open|oddp|numerator|numberp|null|nthcdr|notevery|notany|not|next-method-p|nbutlast|namestring|name-char|mod|mismatch|minusp|min|merge-pathnames|merge|member-if-not|member-if|member|max|maplist|mapl|mapcon|mapcar|mapcan|mapc|map-into|map|make-two-way-stream|make-synonym-stream|make-symbol|make-string-output-stream|make-string-input-stream|make-string|make-sequence|make-random-state|make-pathname|make-package|make-load-form-saving-slots|make-list|make-hash-table|make-echo-stream|make-dispatch-macro-character|make-condition|make-concatenated-stream|make-broadcast-stream|make-array|macroexpand-1|macroexpand|machine-version|machine-type|machine-instance|lower-case-p|long-site-name|logxor|logtest|logorc2|logorc1|lognot|lognor|lognand|logior|logical-pathname|logeqv|logcount|logbitp|logandc2|logandc1|logand|log|load-logical-pathname-translations|load|listp|listen|list-length|list-all-packages|list\\*|list|lisp-implementation-version|lisp-implementation-type|length|ldb-test|lcm|last|keywordp|isqrt|intern|interactive-stream-p|integerp|integer-length|integer-decode-float|input-stream-p|imagpart|identity|host-namestring|hash-table-test|hash-table-size|hash-table-rehash-threshold|hash-table-rehash-size|hash-table-p|hash-table-count|graphic-char-p|get-universal-time|get-setf-expansion|get-properties|get-internal-run-time|get-internal-real-time|get-decoded-time|gcd|functionp|function-lambda-expression|funcall|ftruncate|fround|format|force-output|fmakunbound|floor|floatp|float-sign|float-radix|float-precision|float-digits|float|finish-output|find-symbol|find-restart|find-package|find-if-not|find-if|find-all-symbols|find|file-write-date|file-string-length|file-namestring|file-length|file-error-pathname|file-author|ffloor|fceiling|fboundp|expt|exp|every|evenp|eval|equalp|equal|eql|eq|ensure-generic-function|ensure-directories-exist|enough-namestring|endp|encode-universal-time|ed|echo-stream-output-stream|echo-stream-input-stream|dribble|dpb|disassemble|directory-namestring|directory|digit-char-p|digit-char|deposit-field|denominator|delete-package|delete-file|decode-universal-time|decode-float|count-if-not|count-if|count|cosh|cos|copy-tree|copy-symbol|copy-structure|copy-seq|copy-readtable|copy-pprint-dispatch|copy-list|copy-alist|constantp|constantly|consp|cons|conjugate|concatenated-stream-streams|concatenate|compute-restarts|complexp|complex|complement|compiled-function-p|compile-file-pathname|compile-file|compile|coerce|code-char|clear-output|class-of|cis|characterp|character|char>=|char>|char=|char<=|char<|char/=|char-upcase|char-not-lessp|char-not-greaterp|char-not-equal|char-name|char-lessp|char-int|char-greaterp|char-equal|char-downcase|char-code|cerror|cell-error-name|ceiling|call-next-method|byte-size|byte-position|byte|butlast|broadcast-stream-streams|boundp|both-case-p|boole|bit-xor|bit-vector-p|bit-orc2|bit-orc1|bit-not|bit-nor|bit-nand|bit-ior|bit-eqv|bit-andc2|bit-andc1|bit-and|atom|atanh|atan|assoc-if-not|assoc-if|assoc|asinh|asin|ash|arrayp|array-total-size|array-row-major-index|array-rank|array-in-bounds-p|array-has-fill-pointer-p|array-element-type|array-displacement|array-dimensions|array-dimension|arithmetic-error-operation|arithmetic-error-operands|apropos-list|apropos|apply|append|alphanumericp|alpha-char-p|adjustable-array-p|adjust-array|adjoin|acosh|acos|acons|abs|>=|[>=]|<=|<|1-|1\\+|/=|[/\\-+*])(?=([\\s()]))",
           "name": "support.function.f.sideeffects.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|\\#') # preceded by space or (\n(?:variable|update-instance-for-redefined-class|update-instance-for-different-class|structure|slot-unbound|slot-missing|shared-initialize|\nremove-method|print-object|no-next-method|no-applicable-method|method-qualifiers|make-load-form|make-instances-obsolete|make-instance|\ninitialize-instance|function-keywords|find-method|documentation|describe-object|compute-applicable-methods|compiler-macro|class-name|\nchange-class|allocate-instance|add-method)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|#')(?:variable|update-instance-for-redefined-class|update-instance-for-different-class|structure|slot-unbound|slot-missing|shared-initialize|remove-method|print-object|no-next-method|no-applicable-method|method-qualifiers|make-load-form|make-instances-obsolete|make-instance|initialize-instance|function-keywords|find-method|documentation|describe-object|compute-applicable-methods|compiler-macro|class-name|change-class|allocate-instance|add-method)(?=([\\s()]))",
           "name": "support.function.sgf.nosideeffects.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|\\#') # preceded by space or (\n(?:reinitialize-instance)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|#')reinitialize-instance(?=([\\s()]))",
           "name": "support.function.sgf.sideeffects.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|\\#') # preceded by space or (\n(?:satisfies)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|#')satisfies(?=([\\s()]))",
           "name": "support.function.typespecifier.commonlisp"
         }
       ]
     },
     "lambda-list": {
-      "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:&[#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?|&whole|&rest|&optional|&key|&environment|&body|&aux|&allow-other-keys)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
+      "match": "(?i)(?<=^|[\\s(])&(?:[#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?|whole|rest|optional|key|environment|body|aux|allow-other-keys)(?=([\\s()]))",
       "name": "keyword.other.lambdalist.commonlisp"
     },
     "macro": {
       "patterns": [
         {
-          "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:with-standard-io-syntax|with-slots|with-simple-restart|with-package-iterator|with-hash-table-iterator|with-condition-restarts|\nwith-compilation-unit|with-accessors|when|unless|typecase|time|step|shiftf|setf|rotatef|return|restart-case|restart-bind|psetf|prog2|prog1|\nprog\\*|prog|print-unreadable-object|pprint-logical-block|pprint-exit-if-list-exhausted|or|nth-value|multiple-value-setq|multiple-value-list|\nmultiple-value-bind|make-method|loop|lambda|ignore-errors|handler-case|handler-bind|formatter|etypecase|dotimes|dolist|do-symbols|do-external-symbols|\ndo-all-symbols|do\\*|do|destructuring-bind|defun|deftype|defstruct|defsetf|defpackage|defmethod|defmacro|define-symbol-macro|define-setf-expander|\ndefine-condition|define-compiler-macro|defgeneric|defconstant|defclass|declaim|ctypecase|cond|call-method|assert|and)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(])(?:with-standard-io-syntax|with-slots|with-simple-restart|with-package-iterator|with-hash-table-iterator|with-condition-restarts|with-compilation-unit|with-accessors|when|unless|typecase|time|step|shiftf|setf|rotatef|return|restart-case|restart-bind|psetf|prog2|prog1|prog\\*|prog|print-unreadable-object|pprint-logical-block|pprint-exit-if-list-exhausted|or|nth-value|multiple-value-setq|multiple-value-list|multiple-value-bind|make-method|loop|lambda|ignore-errors|handler-case|handler-bind|formatter|etypecase|dotimes|dolist|do-symbols|do-external-symbols|do-all-symbols|do\\*|do|destructuring-bind|defun|deftype|defstruct|defsetf|defpackage|defmethod|defmacro|define-symbol-macro|define-setf-expander|define-condition|define-compiler-macro|defgeneric|defconstant|defclass|declaim|ctypecase|cond|call-method|assert|and)(?=([\\s()]))",
           "name": "storage.type.function.m.nosideeffects.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:with-output-to-string|with-open-stream|with-open-file|with-input-from-string|untrace|trace|remf|pushnew|push|psetq|pprint-pop|pop|\notherwise|loop-finish|incf|in-package|ecase|defvar|defparameter|define-modify-macro|define-method-combination|decf|check-type|ccase|case)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(])(?:with-output-to-string|with-open-stream|with-open-file|with-input-from-string|untrace|trace|remf|pushnew|push|psetq|pprint-pop|pop|otherwise|loop-finish|incf|in-package|ecase|defvar|defparameter|define-modify-macro|define-method-combination|decf|check-type|ccase|case)(?=([\\s()]))",
           "name": "storage.type.function.m.sideeffects.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:setq)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(])setq(?=([\\s()]))",
           "name": "storage.type.function.specialform.commonlisp"
         }
       ]
@@ -310,18 +310,18 @@
               "name": "support.type.package.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\n  ([A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?)  #2\n  | \n  (\\#) #3\n)\n(?=\\:\\:|\\:)"
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(([A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)|(#))(?=:(?::|))"
         }
       ]
     },
     "punctuation": {
       "patterns": [
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n('|`)\n(?=\\S)",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(['`])(?=\\S)",
           "name": "variable.other.constant.singlequote.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(?:\\:[#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?)\n(?=(\\s|\\(|\\)))       # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,):[#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?(?=([\\s()]))",
           "name": "entity.name.variable.commonlisp"
         },
         {
@@ -333,7 +333,7 @@
               "name": "constant.numeric.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\#)([0-9]*)\n(?=\\()"
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#)([0-9]*)(?=\\()"
         },
         {
           "captures": {
@@ -347,10 +347,10 @@
               "name": "variable.other.constant.sharpsign.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\#)\n([0-9]*)\n(\\*)\n(?=0|1)"
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#)([0-9]*)(\\*)(?=[01])"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\#\\*|\\#0\\*)\n(?=(\\s|\\(|\\)))       # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#(?:\\*|0\\*))(?=([\\s()]))",
           "name": "variable.other.constant.sharpsign.commonlisp"
         },
         {
@@ -365,7 +365,7 @@
               "name": "variable.other.constant.sharpsign.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\#)\n([0-9]+)\n(a|A)\n(?=.)"
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#)([0-9]+)([aA])(?=.)"
         },
         {
           "captures": {
@@ -379,7 +379,7 @@
               "name": "variable.other.constant.sharpsign.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\#)\n([0-9]+)\n(=)\n(?=.)"
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#)([0-9]+)(=)(?=.)"
         },
         {
           "captures": {
@@ -393,14 +393,14 @@
               "name": "variable.other.constant.sharpsign.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\#)\n([0-9]+)\n(\\#)\n(?=.)"
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#)([0-9]+)(#)(?=.)"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\#(\\+|-))\n(?=\\S)",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#([+-]))(?=\\S)",
           "name": "variable.other.constant.sharpsign.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\#('|,|\\.|c|C|s|S|p|P))\n(?=\\S)",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#([',.cCsSpP]))(?=\\S)",
           "name": "variable.other.constant.sharpsign.commonlisp"
         },
         {
@@ -409,7 +409,7 @@
               "name": "support.type.package.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\#)\n(:)\n(?=\\S)"
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#)(:)(?=\\S)"
         },
         {
           "captures": {
@@ -426,7 +426,7 @@
               "name": "variable.other.constant.backquote.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(\n    (`\\#) #2\n    |\n    (`)(,@|,\\.|,)? #3, #4\n    |\n    (,@|,\\.|,) #5\n)\n(?=\\S)"
+          "match": "(?i)(?<=^|[\\s(])((`#)|(`)(,(?:[@.]|))?|(,(?:[@.]|)))(?=\\S)"
         }
       ]
     },
@@ -436,7 +436,7 @@
           "name": "keyword.control.commonlisp"
         }
       },
-      "match": "(?xi)\n(\\(\\s*) # preceded by (\n(unwind-protect|throw|the|tagbody|symbol-macrolet|return-from|quote|progv|progn|multiple-value-prog1|multiple-value-call|\nmacrolet|locally|load-time-value|let\\*|let|labels|if|go|function|flet|eval-when|catch|block)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )"
+      "match": "(?i)(\\(\\s*)(unwind-protect|throw|the|tagbody|symbol-macrolet|return-from|quote|progv|progn|multiple-value-prog1|multiple-value-call|macrolet|locally|load-time-value|let\\*|let|labels|if|go|function|flet|eval-when|catch|block)(?=([\\s()]))"
     },
     "string": {
       "begin": "(\")",
@@ -472,7 +472,7 @@
               "name": "storage.type.function.formattedstring.commonlisp"
             }
           },
-          "match": "(?xi)\n\n(~) #1 tilde\n(\n    (\n        (([+-]?[0-9]+)|('.)|V|\\#)*?\n        (,)?\n    )\n*?) #2 prefix parameters, signed decimal numbers|single char, separated by commas\n(\n    (:@|@:|:|@)\n?) #8 modifiers\n(\\(|\\)|\\[|\\]|;|{|}|<|>|\\^) #10 control structures"
+          "match": "(?i)(~)(((([+-]?[0-9]+)|('.)|[V#])*?(,)?)*?)((:@|@:|[:@])?)([()\\[\\];{}<>^])"
         },
         {
           "captures": {
@@ -489,7 +489,7 @@
               "name": "entity.name.variable.commonlisp"
             }
           },
-          "match": "(?xi)\n\n(~) #1 tilde\n(\n    (\n        (([+-]?[0-9]+)|('.)|V|\\#)*?\n        (,)?\n    )\n*?) #2 prefix parameters, signed decimal numbers|single char, separated by commas\n(\n    (:@|@:|:|@)\n?) #8 modifiers\n(A|S|D|B|O|X|R|P|C|F|E|G|\\$|%|\\&|\\||~|T|\\*|\\?|_|W|I) #10 directives"
+          "match": "(?i)(~)(((([+-]?[0-9]+)|('.)|[V#])*?(,)?)*?)((:@|@:|[:@])?)([ASDBOXRPCFEG$%\\&|~T*?_WI])"
         },
         {
           "captures": {
@@ -512,7 +512,7 @@
               "name": "entity.name.variable.commonlisp"
             }
           },
-          "match": "(?xi)\n\n(~) #1 tilde\n(\n    (\n        (([+-]?[0-9]+)|('.)|V|\\#)*?\n        (,)?\n    )\n*?) #2 prefix parameters, signed decimal numbers|single char, separated by commas\n(\n    (:@|@:|:|@)\n?) #8 modifiers\n(\\/) #10\n([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+?) #11 call function\n(\\/) #12"
+          "match": "(?i)(~)(((([+-]?[0-9]+)|('.)|[V#])*?(,)?)*?)((:@|@:|[:@])?)(/)([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(/)"
         },
         {
           "match": "(~\\n)",
@@ -528,34 +528,34 @@
               "name": "source.commonlisp"
             }
           },
-          "match": "(?xi)\n(?<=^'|\\s'|\\('|,@'|,\\.'|,')\n(\\S+?)\n(\\:\\:|\\:)\n((\\+[^\\s\\+]+\\+)|(\\*[^\\s\\*]+\\*))\n(?=(\\s|\\(|\\)))"
+          "match": "(?i)(?<=^'|\\s'|\\('|,@'|,\\.'|,')(\\S+?)(:(?::|))((\\+[^\\s+]+\\+)|(\\*[^\\s*]+\\*))(?=([\\s()]))"
         },
         {
-          "match": "(?xi)\n(?<=\\S:|^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\+[^\\s\\+]+\\+)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=\\S:|^|[\\s(]|,@|,\\.|,)(\\+[^\\s+]+\\+)(?=([\\s()]))",
           "name": "variable.other.constant.earmuffsplus.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=\\S:|^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\*[^\\s\\*]+\\*)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=\\S:|^|[\\s(]|,@|,\\.|,)(\\*[^\\s*]+\\*)(?=([\\s()]))",
           "name": "string.regexp.earmuffsasterisk.commonlisp"
         }
       ]
     },
     "symbol": {
-      "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:method-combination|declare)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+      "match": "(?i)(?<=^|[\\s(])(?:method-combination|declare)(?=([\\s()]))",
       "name": "storage.type.function.symbol.commonlisp"
     },
     "type": {
-      "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:unsigned-byte|standard-char|standard|single-float|simple-vector|simple-string|simple-bit-vector|simple-base-string|simple-array|\nsigned-byte|short-float|long-float|keyword|fixnum|extended-char|double-float|compiled-function|boolean|bignum|base-string|base-char)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+      "match": "(?i)(?<=^|[\\s(])(?:unsigned-byte|standard-char|standard|single-float|simple-vector|simple-string|simple-bit-vector|simple-base-string|simple-array|signed-byte|short-float|long-float|keyword|fixnum|extended-char|double-float|compiled-function|boolean|bignum|base-string|base-char)(?=([\\s()]))",
       "name": "support.type.t.commonlisp"
     },
     "variable": {
       "patterns": [
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(?:\\*trace-output\\*|\\*terminal-io\\*|\\*standard-output\\*|\\*standard-input\\*|\\*readtable\\*|\\*read-suppress\\*|\\*read-eval\\*|\n\\*read-default-float-format\\*|\\*read-base\\*|\\*random-state\\*|\\*query-io\\*|\\*print-right-margin\\*|\\*print-readably\\*|\\*print-radix\\*|\\*print-pretty\\*|\n\\*print-pprint-dispatch\\*|\\*print-miser-width\\*|\\*print-lines\\*|\\*print-level\\*|\\*print-length\\*|\\*print-gensym\\*|\\*print-escape\\*|\\*print-circle\\*|\n\\*print-case\\*|\\*print-base\\*|\\*print-array\\*|\\*package\\*|\\*modules\\*|\\*macroexpand-hook\\*|\\*load-verbose\\*|\\*load-truename\\*|\\*load-print\\*|\n\\*load-pathname\\*|\\*gensym-counter\\*|\\*features\\*|\\*error-output\\*|\\*default-pathname-defaults\\*|\\*debugger-hook\\*|\\*debug-io\\*|\\*compile-verbose\\*|\n\\*compile-print\\*|\\*compile-file-truename\\*|\\*compile-file-pathname\\*|\\*break-on-signals\\*)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)\\*(?:trace-output\\*|terminal-io\\*|standard-output\\*|standard-input\\*|readtable\\*|read-suppress\\*|read-eval\\*|read-default-float-format\\*|read-base\\*|random-state\\*|query-io\\*|print-right-margin\\*|print-readably\\*|print-radix\\*|print-pretty\\*|print-pprint-dispatch\\*|print-miser-width\\*|print-lines\\*|print-level\\*|print-length\\*|print-gensym\\*|print-escape\\*|print-circle\\*|print-case\\*|print-base\\*|print-array\\*|package\\*|modules\\*|macroexpand-hook\\*|load-verbose\\*|load-truename\\*|load-print\\*|load-pathname\\*|gensym-counter\\*|features\\*|error-output\\*|default-pathname-defaults\\*|debugger-hook\\*|debug-io\\*|compile-verbose\\*|compile-print\\*|compile-file-truename\\*|compile-file-pathname\\*|break-on-signals\\*)(?=([\\s()]))",
           "name": "string.regexp.earmuffsasterisk.commonlisp"
         },
         {
-          "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(?:\\*\\*\\*|\\*\\*|\\+\\+\\+|\\+\\+|\\/\\/\\/|\\/\\/)\n(?=(\\s|\\(|\\)))  # followed by space, ( or )",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(?:\\*\\*\\*|\\*\\*|\\+\\+\\+|\\+\\+|///|//)(?=([\\s()]))",
           "name": "variable.other.repl.commonlisp"
         }
       ]
diff --git a/resources/languages/coq.json b/resources/languages/coq.json
index e6d971f..681133c 100644
--- a/resources/languages/coq.json
+++ b/resources/languages/coq.json
@@ -6,12 +6,10 @@
   "name": "coq",
   "patterns": [
     {
-      "comment": "Vernacular import keywords",
       "match": "\\b(From|Require|Import|Export|Local|Global|Include)\\b",
       "name": "keyword.control.import.coq"
     },
     {
-      "comment": "Vernacular scope keywords",
       "match": "\\b((Open|Close|Delimit|Undelimit|Bind)\\s+Scope)\\b",
       "name": "keyword.control.import.coq"
     },
@@ -24,8 +22,7 @@
           "name": "entity.name.function.theorem.coq"
         }
       },
-      "comment": "Theorem declarations",
-      "match": "\\b(Theorem|Lemma|Remark|Fact|Corollary|Property|Proposition)\\s+((\\p{L}|[_\\u00A0])(\\p{L}|[0-9_\\u00A0'])*)"
+      "match": "\\b(Theorem|Lemma|Remark|Fact|Corollary|Property|Proposition)\\s+(([\\p{L}_ ])([\\p{L}0-9_ '])*)"
     },
     {
       "match": "\\bGoal\\b",
@@ -43,8 +40,7 @@
           "name": "entity.name.assumption.coq"
         }
       },
-      "comment": "Assumptions",
-      "match": "\\b(Parameters?|Axioms?|Conjectures?|Variables?|Hypothesis|Hypotheses)(\\s+Inline)?\\b\\s*\\(?\\s*((\\p{L}|[_\\u00A0])(\\p{L}|[0-9_\\u00A0'])*)"
+      "match": "\\b(Parameters?|Axioms?|Conjectures?|Variables?|Hypothesis|Hypotheses)(\\s+Inline)?\\b\\s*\\(?\\s*(([\\p{L}_ ])([\\p{L}0-9_ '])*)"
     },
     {
       "captures": {
@@ -55,8 +51,7 @@
           "name": "entity.name.assumption.coq"
         }
       },
-      "comment": "Context",
-      "match": "\\b(Context)\\b\\s*`?\\s*(\\(|\\{)?\\s*((\\p{L}|[_\\u00A0])(\\p{L}|[0-9_\\u00A0'])*)"
+      "match": "\\b(Context)\\b\\s*`?\\s*([({])?\\s*(([\\p{L}_ ])([\\p{L}0-9_ '])*)"
     },
     {
       "captures": {
@@ -70,8 +65,7 @@
           "name": "entity.name.function.coq"
         }
       },
-      "comment": "Definitions",
-      "match": "(\\b(?:Program|Local)\\s+)?\\b(Definition|Fixpoint|CoFixpoint|Function|Example|Let(?:\\s+Fixpoint|\\s+CoFixpoint)?|Instance|Equations|Equations?)\\s+((\\p{L}|[_\\u00A0])(\\p{L}|[0-9_\\u00A0'])*)"
+      "match": "(\\b(?:Program|Local)\\s+)?\\b(Definition|Fixpoint|CoFixpoint|Function|Example|Let(?:\\s+Fixpoint|\\s+CoFixpoint)?|Instance|Equations|Equations?)\\s+(([\\p{L}_ ])([\\p{L}0-9_ '])*)"
     },
     {
       "captures": {
@@ -79,7 +73,6 @@
           "name": "keyword.source.coq"
         }
       },
-      "comment": "Obligations",
       "match": "\\b((Show\\s+)?Obligation\\s+Tactic|Obligations\\s+of|Obligation|Next\\s+Obligation(\\s+of)?|Solve\\s+Obligations(\\s+of)?|Solve\\s+All\\s+Obligations|Admit\\s+Obligations(\\s+of)?|Instance)\\b"
     },
     {
@@ -91,8 +84,7 @@
           "name": "entity.name.type.coq"
         }
       },
-      "comment": "Type declarations",
-      "match": "\\b(CoInductive|Inductive|Variant|Record|Structure|Class)\\s+(>\\s*)?((\\p{L}|[_\\u00A0])(\\p{L}|[0-9_\\u00A0'])*)"
+      "match": "\\b(CoInductive|Inductive|Variant|Record|Structure|Class)\\s+(>\\s*)?(([\\p{L}_ ])([\\p{L}0-9_ '])*)"
     },
     {
       "captures": {
@@ -103,56 +95,45 @@
           "name": "entity.name.function.ltac"
         }
       },
-      "comment": "Ltac declarations",
-      "match": "\\b(Ltac)\\s+((\\p{L}|[_\\u00A0])(\\p{L}|[0-9_\\u00A0'])*)"
+      "match": "\\b(Ltac)\\s+(([\\p{L}_ ])([\\p{L}0-9_ '])*)"
     },
     {
-      "comment": "Vernacular keywords",
-      "match": "\\b(Hint|Constructors|Resolve|Rewrite|Ltac|Implicit(\\s+Types)?|Set|Unset|Remove\\s+Printing|Arguments|Tactic\\s+Notation|Notation|Infix|Reserved\\s+Notation|Section|Module\\s+Type|Module|End|Check|Print|Eval|Search|Universe|Coercions?|Generalizable\\s+All|Generalizable\\s+Variable?|Existing\\s+Instance|Existing\\s+Class|Canonical|About|Locate|Collection|Typeclasses\\s+(Opaque|Transparent))\\b",
+      "match": "\\b(Hint(\\s+Mode)?|Create\\s+HintDb|Constructors|Resolve|Rewrite|Ltac|Ltac2|Implicit(\\s+Types)?|Set|Unset|Remove\\s+Printing|Arguments|((Tactic|Reserved)\\s+)?Notation|Infix|Section|Module(\\s+Type)?|End|Check|Print(\\s+All)?|Eval|Compute|Search|Universe|Coercions|Generalizable(\\s+(All|Variable))?|Existing(\\s+(Class|Instance))?|Canonical|About|Locate|Collection|Typeclasses\\s+(Opaque|Transparent))\\b",
       "name": "keyword.source.coq"
     },
     {
-      "comment": "Proof keywords",
       "match": "\\b(Proof|Qed|Defined|Save|Abort(\\s+All)?|Undo(\\s+To)?|Restart|Focus|Unfocus|Unfocused|Show\\s+Proof|Show\\s+Existentials|Show|Unshelve)\\b",
       "name": "keyword.source.coq"
     },
     {
-      "comment": "Vernacular Debug keywords",
       "match": "\\b(Quit|Drop|Time|Redirect|Timeout|Fail)\\b",
       "name": "keyword.debug.coq"
     },
     {
-      "comment": "Admits are bad",
       "match": "\\b(admit|Admitted)\\b",
       "name": "invalid.illegal.admit.coq"
     },
     {
-      "comment": "Operators",
-      "match": ":|\\||=|<|>|\\*|\\+|-|\\{|\\}|≠|∨|∧|↔|¬|→|≤|≥",
+      "match": "[:|=<>*+\\-{}≠∨∧↔¬→≤≥]",
       "name": "keyword.operator.coq"
     },
     {
-      "comment": "Type keywords",
-      "match": "\\b(forall|exists|Type|Set|Prop|nat|bool|option|list|unit|sum|prod|comparison|Empty_set)\\b|∀|∃",
+      "match": "\\b(forall|exists|Type|Set|Prop|nat|bool|option|list|unit|sum|prod|comparison|Empty_set)\\b|[∀∃]",
       "name": "support.type.coq"
     },
     {
-      "comment": "Ltac keywords",
       "match": "\\b(try|repeat|rew|progress|fresh|solve|now|first|tryif|at|once|do|only)\\b",
       "name": "keyword.control.ltac"
     },
     {
-      "comment": "Common Ltac connectors",
       "match": "\\b(into|with|eqn|by|move|as|using)\\b",
       "name": "keyword.control.ltac"
     },
     {
-      "comment": "Gallina keywords",
       "match": "\\b(match|lazymatch|multimatch|fun|with|return|end|let|in|if|then|else|fix|for|where|and)\\b|λ",
       "name": "keyword.control.gallina"
     },
     {
-      "comment": "Ltac builtins",
       "match": "\\b(intro|intros|revert|induction|destruct|auto|eauto|tauto|eassumption|apply|eapply|assumption|constructor|econstructor|reflexivity|inversion|injection|assert|split|esplit|omega|fold|unfold|specialize|rewrite|erewrite|change|symmetry|refine|simpl|intuition|firstorder|generalize|idtac|exist|exists|eexists|elim|eelim|rename|subst|congruence|trivial|left|right|set|pose|discriminate|clear|clearbody|contradict|contradiction|exact|dependent|remember|case|easy|unshelve|pattern|transitivity|etransitivity|f_equal|exfalso|replace|abstract|cycle|swap|revgoals|shelve|unshelve)\\b",
       "name": "support.function.builtin.ltac"
     },
@@ -171,12 +152,11 @@
       ]
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b",
+      "match": "\\b((0([xX])\\h+)|([0-9]+(\\.[0-9]+)?))\\b",
       "name": "constant.numeric.gallina"
     },
     {
-      "comment": "Gallina builtin constructors",
-      "match": "\\b(True|False|tt|false|true|Some|None|nil|cons|pair|inl|inr|O|S|Eq|Lt|Gt|id|ex|all|unique)\\b",
+      "match": "\\b(True|False|tt|false|true|Some|None|nil|cons|pair|inl|inr|[OS]|Eq|Lt|Gt|id|ex|all|unique)\\b",
       "name": "constant.language.constructor.gallina"
     },
     {
diff --git a/resources/languages/cpp-macro.json b/resources/languages/cpp-macro.json
index cdea968..35d5286 100644
--- a/resources/languages/cpp-macro.json
+++ b/resources/languages/cpp-macro.json
@@ -98,7 +98,7 @@
           "name": "punctuation.section.attribute.begin.cpp"
         }
       },
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.attribute.end.cpp"
@@ -113,7 +113,7 @@
           "begin": "\\(",
           "beginCaptures": {
           },
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "patterns": [
@@ -137,7 +137,7 @@
               "name": "entity.name.namespace.cpp"
             }
           },
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
         },
         {
           "match": ",",
@@ -148,11 +148,11 @@
           "name": "punctuation.accessor.attribute.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=::)",
           "name": "entity.name.namespace.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
           "name": "entity.other.attribute.$0.cpp"
         },
         {
@@ -164,7 +164,7 @@
       ]
     },
     "alignas_operator": {
-      "begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)alignas(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
@@ -190,7 +190,7 @@
         }
       },
       "contentName": "meta.arguments.operator.alignas",
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp"
@@ -203,7 +203,7 @@
       ]
     },
     "alignof_operator": {
-      "begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)alignof(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
@@ -229,7 +229,7 @@
         }
       },
       "contentName": "meta.arguments.operator.alignof",
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp"
@@ -242,7 +242,7 @@
       ]
     },
     "assembly": {
-      "begin": "(\\b(?:__asm__|asm)\\b)(?:\\s+)?((?:volatile)?)",
+      "begin": "(\\b(?:__asm__|asm)\\b)\\s+{0,1}((?:volatile)?)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.asm.cpp"
@@ -251,7 +251,7 @@
           "name": "storage.modifier.cpp"
         }
       },
-      "end": "(?!\\G)|(?=(?<!\\\\)\n)",
+      "end": "(?!\\G)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.asm.cpp",
@@ -275,13 +275,13 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\n|$)"
+          "match": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\n|$)"
         },
         {
           "include": "#comments"
         },
         {
-          "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\(",
+          "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.parens.begin.bracket.round.assembly.cpp"
@@ -303,7 +303,7 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.parens.end.bracket.round.assembly.cpp"
@@ -321,7 +321,7 @@
                 }
               },
               "contentName": "meta.embedded.assembly",
-              "end": "\"|(?=(?<!\\\\)\n)",
+              "end": "\"|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.end.assembly.cpp"
@@ -356,7 +356,7 @@
                   "name": "punctuation.section.parens.begin.bracket.round.assembly.inner.cpp"
                 }
               },
-              "end": "\\)|(?=(?<!\\\\)\n)",
+              "end": "\\)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.parens.end.bracket.round.assembly.inner.cpp"
@@ -406,7 +406,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\[((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]"
+              "match": "\\[((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]"
             },
             {
               "match": ":",
@@ -436,13 +436,13 @@
       ]
     },
     "block": {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.block.begin.bracket.curly.cpp"
         }
       },
-      "end": "}|(?=(?<!\\\\)\n)",
+      "end": "}|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.block.end.bracket.curly.cpp"
@@ -456,13 +456,13 @@
       ]
     },
     "block_comment": {
-      "begin": "\\s*+(\\/\\*)",
+      "begin": "\\s*+(/\\*)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.begin.cpp"
         }
       },
-      "end": "\\*\\/|(?=(?<!\\\\)\n)",
+      "end": "\\*/|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.cpp"
@@ -471,7 +471,7 @@
       "name": "comment.block.cpp"
     },
     "builtin_storage_type_initilizer": {
-      "begin": "\\s*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_]\\w*_t))(?!\\w)\\s*+(?<!\\w)(\\()",
+      "begin": "\\s*+(?<!\\w)(?:(?:(?:((?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int))|((?:uint_least32_t|uint_least64_t|uint_least16_t|uint_fast64_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|uint_fast16_t|uint_fast32_t|int_least8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintmax_t|in_port_t|uintmax_t|in_addr_t|blksize_t|uintptr_t|intmax_t|intptr_t|blkcnt_t|intmax_t|u_quad_t|uint16_t|uint32_t|uint64_t|ssize_t|fixpt_t|qaddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|daddr_t|caddr_t|swblk_t|clock_t|segsz_t|nlink_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)))|(pthread_(?:rwlockattr_t|mutexattr_t|condattr_t|rwlock_t|mutex_t|cond_t|attr_t|once_t|key_t|t)))|([a-zA-Z_]\\w*_t))(?!\\w)\\s*+(?<!\\w)(\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
@@ -489,7 +489,7 @@
           "name": "punctuation.section.arguments.begin.bracket.round.initializer.cpp"
         }
       },
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.initializer.cpp"
@@ -502,7 +502,7 @@
       ]
     },
     "case_statement": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)case(?!\\w))",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)case(?!\\w))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -524,7 +524,7 @@
           "name": "keyword.control.case.cpp"
         }
       },
-      "end": ":|(?=(?<!\\\\)\n)",
+      "end": ":|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.separator.colon.case.cpp"
@@ -538,7 +538,7 @@
       ]
     },
     "class_block": {
-      "begin": "((?<!\\w)class(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+      "begin": "((?<!\\w)class(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
       "beginCaptures": {
         "0": {
           "name": "meta.head.class.cpp"
@@ -573,7 +573,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+              "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
             },
             {
               "captures": {
@@ -616,14 +616,14 @@
                   "name": "comment.block.cpp"
                 }
               },
-              "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+              "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
             },
             {
               "match": "DLLEXPORT",
               "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
             }
           ]
@@ -703,7 +703,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -718,7 +718,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.class.cpp"
@@ -741,7 +741,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.class.cpp"
@@ -767,10 +767,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.class.cpp",
@@ -785,13 +785,13 @@
     "comments": {
       "patterns": [
         {
-          "begin": "^(?:\\s+)?+(\\/\\/[!\\/]+)",
+          "begin": "^\\s+{1,0}(//[!/]+)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.documentation.cpp"
             }
           },
-          "end": "(?<=\\n)(?<!\\\\\\n)|(?=(?<!\\\\)\n)",
+          "end": "(?<=\\n)(?<!\\\\\\n)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "comment.line.double-slash.documentation.cpp",
@@ -800,7 +800,7 @@
               "include": "source.cpp#line_continuation_character"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -812,7 +812,7 @@
                   "name": "markup.italic.doxygen.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
             },
             {
               "captures": {
@@ -823,7 +823,7 @@
                   "name": "markup.bold.doxygen.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
             },
             {
               "captures": {
@@ -834,14 +834,14 @@
                   "name": "markup.inline.raw.string.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -860,7 +860,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                      "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                       "name": "variable.parameter.cpp"
                     },
                     {
@@ -879,14 +879,14 @@
                   "name": "variable.parameter.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:\\s+)?(?:in|out)(?:\\s+)?)+)\\])?(\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(,)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))*)"
+              "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s+{0,1}(?:in|out)\\s+{0,1})+)])?(\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(?:(,)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))*)"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -903,7 +903,7 @@
             "2": {
               "patterns": [
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
@@ -915,7 +915,7 @@
                       "name": "markup.italic.doxygen.cpp"
                     }
                   },
-                  "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+                  "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
                 },
                 {
                   "captures": {
@@ -926,7 +926,7 @@
                       "name": "markup.bold.doxygen.cpp"
                     }
                   },
-                  "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+                  "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
                 },
                 {
                   "captures": {
@@ -937,14 +937,14 @@
                       "name": "markup.inline.raw.string.cpp"
                     }
                   },
-                  "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+                  "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
                 },
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
@@ -963,7 +963,7 @@
                     "3": {
                       "patterns": [
                         {
-                          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                           "name": "variable.parameter.cpp"
                         },
                         {
@@ -982,14 +982,14 @@
                       "name": "variable.parameter.cpp"
                     }
                   },
-                  "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:\\s+)?(?:in|out)(?:\\s+)?)+)\\])?(\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(,)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))*)"
+                  "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s+{0,1}(?:in|out)\\s+{0,1})+)])?(\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(?:(,)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))*)"
                 },
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
@@ -1002,17 +1002,17 @@
               "name": "punctuation.definition.comment.end.documentation.cpp"
             }
           },
-          "match": "(\\/\\*[!*]+(?=\\s))(.+)([!*]*\\*\\/)",
+          "match": "(/\\*[!*]+(?=\\s))(.+)([!*]*\\*/)",
           "name": "comment.block.documentation.cpp"
         },
         {
-          "begin": "(?:\\s+)?+\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s))",
+          "begin": "\\s+{1,0}/\\*[!*]+(?:(?:\\n|$)|(?=\\s))",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.documentation.cpp"
             }
           },
-          "end": "[!*]*\\*\\/|(?=(?<!\\\\)\n)",
+          "end": "[!*]*\\*/|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.documentation.cpp"
@@ -1021,7 +1021,7 @@
           "name": "comment.block.documentation.cpp",
           "patterns": [
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -1033,7 +1033,7 @@
                   "name": "markup.italic.doxygen.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
             },
             {
               "captures": {
@@ -1044,7 +1044,7 @@
                   "name": "markup.bold.doxygen.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
             },
             {
               "captures": {
@@ -1055,14 +1055,14 @@
                   "name": "markup.inline.raw.string.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -1081,7 +1081,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                      "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                       "name": "variable.parameter.cpp"
                     },
                     {
@@ -1100,14 +1100,14 @@
                   "name": "variable.parameter.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:\\s+)?(?:in|out)(?:\\s+)?)+)\\])?(\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(,)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))*)"
+              "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s+{0,1}(?:in|out)\\s+{0,1})+)])?(\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(?:(,)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))*)"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -1131,7 +1131,7 @@
       ]
     },
     "constructor_inline": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*)((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\())",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:constexpr|consteval|explicit|mutable|virtual|inline|friend)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*)((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=\\())",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.constructor.cpp"
@@ -1198,7 +1198,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.constructor.cpp",
@@ -1207,7 +1207,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
@@ -1246,7 +1246,7 @@
                   "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "include": "source.cpp#functional_specifiers_pre_parameters"
@@ -1258,12 +1258,12 @@
                   "name": "punctuation.separator.initializers.cpp"
                 }
               },
-              "end": "(?=\\{)|(?=(?<!\\\\)\n)",
+              "end": "(?=\\{)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
               },
               "patterns": [
                 {
-                  "begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(\\()",
+                  "begin": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(\\()",
                   "beginCaptures": {
                     "1": {
                       "name": "entity.name.function.call.initializer.cpp"
@@ -1292,7 +1292,7 @@
                     }
                   },
                   "contentName": "meta.parameter.initialization",
-                  "end": "\\)|(?=(?<!\\\\)\n)",
+                  "end": "\\)|(?=(?<!\\\\)\\n)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
@@ -1305,7 +1305,7 @@
                   ]
                 },
                 {
-                  "begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\{)",
+                  "begin": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(\\{)",
                   "beginCaptures": {
                     "1": {
                       "name": "entity.name.function.call.initializer.cpp"
@@ -1315,7 +1315,7 @@
                     }
                   },
                   "contentName": "meta.parameter.initialization",
-                  "end": "\\}|(?=(?<!\\\\)\n)",
+                  "end": "}|(?=(?<!\\\\)\\n)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
@@ -1344,7 +1344,7 @@
                 }
               },
               "contentName": "meta.function.definition.parameters.special.constructor",
-              "end": "\\)|(?=(?<!\\\\)\n)",
+              "end": "\\)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.parameters.end.bracket.round.special.constructor.cpp"
@@ -1371,7 +1371,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
@@ -1385,10 +1385,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.constructor.cpp",
@@ -1401,7 +1401,7 @@
       ]
     },
     "constructor_root": {
-      "begin": "\\s*+((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<8>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))::((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\10)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\())",
+      "begin": "\\s*+((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<8>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))::((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\10((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\())",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.constructor.cpp"
@@ -1482,7 +1482,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.constructor.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.constructor.cpp"
             },
             {
@@ -1502,11 +1502,11 @@
         "9": {
           "patterns": [
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?=:)",
               "name": "entity.name.type.constructor.cpp"
             },
             {
-              "match": "(?<=:)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?<=:)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.function.definition.special.constructor.cpp"
             },
             {
@@ -1516,7 +1516,7 @@
           ]
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.constructor.cpp",
@@ -1525,7 +1525,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
@@ -1564,7 +1564,7 @@
                   "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "include": "source.cpp#functional_specifiers_pre_parameters"
@@ -1576,12 +1576,12 @@
                   "name": "punctuation.separator.initializers.cpp"
                 }
               },
-              "end": "(?=\\{)|(?=(?<!\\\\)\n)",
+              "end": "(?=\\{)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
               },
               "patterns": [
                 {
-                  "begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(\\()",
+                  "begin": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(\\()",
                   "beginCaptures": {
                     "1": {
                       "name": "entity.name.function.call.initializer.cpp"
@@ -1610,7 +1610,7 @@
                     }
                   },
                   "contentName": "meta.parameter.initialization",
-                  "end": "\\)|(?=(?<!\\\\)\n)",
+                  "end": "\\)|(?=(?<!\\\\)\\n)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
@@ -1623,7 +1623,7 @@
                   ]
                 },
                 {
-                  "begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\{)",
+                  "begin": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(\\{)",
                   "beginCaptures": {
                     "1": {
                       "name": "entity.name.function.call.initializer.cpp"
@@ -1633,7 +1633,7 @@
                     }
                   },
                   "contentName": "meta.parameter.initialization",
-                  "end": "\\}|(?=(?<!\\\\)\n)",
+                  "end": "}|(?=(?<!\\\\)\\n)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
@@ -1662,7 +1662,7 @@
                 }
               },
               "contentName": "meta.function.definition.parameters.special.constructor",
-              "end": "\\)|(?=(?<!\\\\)\n)",
+              "end": "\\)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.parameters.end.bracket.round.special.constructor.cpp"
@@ -1689,7 +1689,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
@@ -1703,10 +1703,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.constructor.cpp",
@@ -1725,7 +1725,7 @@
           "name": "punctuation.section.attribute.begin.cpp"
         }
       },
-      "end": "\\]\\]|(?=(?<!\\\\)\n)",
+      "end": "]]|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.attribute.end.cpp"
@@ -1740,7 +1740,7 @@
           "begin": "\\(",
           "beginCaptures": {
           },
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "patterns": [
@@ -1764,7 +1764,7 @@
               "name": "entity.name.namespace.cpp"
             }
           },
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
         },
         {
           "match": ",",
@@ -1775,11 +1775,11 @@
           "name": "punctuation.accessor.attribute.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=::)",
           "name": "entity.name.namespace.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
           "name": "entity.other.attribute.$0.cpp"
         },
         {
@@ -1791,7 +1791,7 @@
       ]
     },
     "curly_initializer": {
-      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\{)",
+      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\{)",
       "beginCaptures": {
         "1": {
           "name": "meta.qualified_type.cpp",
@@ -1801,7 +1801,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -1829,7 +1829,7 @@
                   "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
                 }
               },
-              "end": ">|(?=(?<!\\\\)\n)",
+              "end": ">|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -1843,7 +1843,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -1858,7 +1858,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -1952,7 +1952,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "\\}|(?=(?<!\\\\)\n)",
+      "end": "}|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.curly.initializer.cpp"
@@ -1969,7 +1969,7 @@
       ]
     },
     "decltype": {
-      "begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)decltype(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
@@ -1995,7 +1995,7 @@
         }
       },
       "contentName": "meta.arguments.decltype",
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.decltype.cpp"
@@ -2008,7 +2008,7 @@
       ]
     },
     "decltype_specifier": {
-      "begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)decltype(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
@@ -2034,7 +2034,7 @@
         }
       },
       "contentName": "meta.arguments.decltype",
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.decltype.cpp"
@@ -2047,7 +2047,7 @@
       ]
     },
     "default_statement": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)default(?!\\w))",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)default(?!\\w))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -2069,7 +2069,7 @@
           "name": "keyword.control.default.cpp"
         }
       },
-      "end": ":|(?=(?<!\\\\)\n)",
+      "end": ":|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.separator.colon.case.default.cpp"
@@ -2083,7 +2083,7 @@
       ]
     },
     "destructor_inline": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*)(~(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\())",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:constexpr|consteval|explicit|mutable|virtual|inline|friend)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*)(~(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=\\())",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.member.destructor.cpp"
@@ -2150,7 +2150,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.member.destructor.cpp",
@@ -2159,7 +2159,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.function.definition.special.member.destructor.cpp"
@@ -2198,7 +2198,7 @@
                   "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp keyword.other.delete.destructor.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "begin": "\\(",
@@ -2208,7 +2208,7 @@
                 }
               },
               "contentName": "meta.function.definition.parameters.special.member.destructor",
-              "end": "\\)|(?=(?<!\\\\)\n)",
+              "end": "\\)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.parameters.end.bracket.round.special.member.destructor.cpp"
@@ -2229,7 +2229,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
@@ -2243,10 +2243,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.member.destructor.cpp",
@@ -2259,7 +2259,7 @@
       ]
     },
     "destructor_root": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))::((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))~(?:\\14)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\())",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))::((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))~\\14((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\())",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.member.destructor.cpp"
@@ -2278,7 +2278,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.destructor.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.destructor.cpp"
             },
             {
@@ -2298,11 +2298,11 @@
         "13": {
           "patterns": [
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?=:)",
               "name": "entity.name.type.destructor.cpp"
             },
             {
-              "match": "(?<=:)~(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?<=:)~(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.function.definition.special.member.destructor.cpp"
             },
             {
@@ -2390,7 +2390,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.member.destructor.cpp",
@@ -2399,7 +2399,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.function.definition.special.member.destructor.cpp"
@@ -2438,7 +2438,7 @@
                   "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp keyword.other.delete.destructor.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "begin": "\\(",
@@ -2448,7 +2448,7 @@
                 }
               },
               "contentName": "meta.function.definition.parameters.special.member.destructor",
-              "end": "\\)|(?=(?<!\\\\)\n)",
+              "end": "\\)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.parameters.end.bracket.round.special.member.destructor.cpp"
@@ -2469,7 +2469,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
@@ -2483,10 +2483,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.member.destructor.cpp",
@@ -2499,7 +2499,7 @@
       ]
     },
     "diagnostic": {
-      "begin": "(^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?((?:error|warning)))\\b(?:\\s+)?",
+      "begin": "(^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}((?:error|warning)))\\b\\s+{0,1}",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.diagnostic.$7.cpp"
@@ -2526,7 +2526,7 @@
         "7": {
         }
       },
-      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\n)",
+      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.preprocessor.diagnostic.$reference(directive).cpp",
@@ -2541,7 +2541,7 @@
               "name": "punctuation.definition.string.begin.cpp"
             }
           },
-          "end": "(?:(\")|(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$)))|(?=(?<!\\\\)\n)",
+          "end": "(?:(\")|(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$)))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.cpp"
@@ -2561,7 +2561,7 @@
               "name": "punctuation.definition.string.begin.cpp"
             }
           },
-          "end": "(?:(')|(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$)))|(?=(?<!\\\\)\n)",
+          "end": "(?:(')|(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$)))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.cpp"
@@ -2578,7 +2578,7 @@
           "begin": "[^'\"]",
           "beginCaptures": {
           },
-          "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\n)",
+          "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "string.unquoted.cpp",
@@ -2594,7 +2594,7 @@
       ]
     },
     "enum_block": {
-      "begin": "((?<!\\w)enum(?!\\w))(?:\\s+(class|struct))?(?:(?:\\s+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:\\s+)?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:(?:\\s+)?(:)(?:\\s+)?(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::))?(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))?",
+      "begin": "((?<!\\w)enum(?!\\w))(?:\\s+(class|struct))?(?:(?:\\s+|((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?=\\{))\\s+{0,1}((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)(?:\\s+{0,1}(:)\\s+{0,1}(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::))?\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))?",
       "beginCaptures": {
         "0": {
           "name": "meta.head.enum.cpp"
@@ -2669,7 +2669,7 @@
         "9": {
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -2684,7 +2684,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.enum.cpp"
@@ -2701,7 +2701,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.enum.cpp"
@@ -2727,10 +2727,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.enum.cpp",
@@ -2868,7 +2868,7 @@
       ]
     },
     "extern_block": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(extern)(?=\\s*\\\")",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(extern)(?=\\s*\")",
       "beginCaptures": {
         "0": {
           "name": "meta.head.extern.cpp"
@@ -2893,7 +2893,7 @@
           "name": "storage.type.extern.cpp"
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -2908,7 +2908,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.extern.cpp"
@@ -2925,7 +2925,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.extern.cpp"
@@ -2939,10 +2939,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.extern.cpp",
@@ -3031,7 +3031,7 @@
       ]
     },
     "function_call": {
-      "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<11>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Wuint_least8_t|^uint_least8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wsynchronized|^synchronized|\\Wuint_fast8_t|^uint_fast8_t|\\Wdynamic_cast|^dynamic_cast|\\Wint_least8_t|^int_least8_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wsuseconds_t|^suseconds_t|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wconstinit|^constinit|\\Wco_return|^co_return|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wtemplate|^template|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wexplicit|^explicit|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Woperator|^operator|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wrequires|^requires|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wreflexpr|^reflexpr|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wssize_t|^ssize_t|\\Wconcept|^concept|\\Wmutable|^mutable|\\Wfixpt_t|^fixpt_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wtypedef|^typedef|\\Wdaddr_t|^daddr_t|\\Wcaddr_t|^caddr_t|\\Wqaddr_t|^qaddr_t|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wsegsz_t|^segsz_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\W__asm__|^__asm__|\\Walignas|^alignas|\\Walignof|^alignof|\\Wmutable|^mutable|\\Wnullptr|^nullptr|\\Wclock_t|^clock_t|\\Wmode_t|^mode_t|\\Wpublic|^public|\\Wsize_t|^size_t|\\Wdouble|^double|\\Wquad_t|^quad_t|\\Wstatic|^static|\\Wtime_t|^time_t|\\Wmodule|^module|\\Wimport|^import|\\Wexport|^export|\\Wextern|^extern|\\Winline|^inline|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wreturn|^return|\\Wfriend|^friend|\\Wnot_eq|^not_eq|\\Wsigned|^signed|\\Wstruct|^struct|\\Wint8_t|^int8_t|\\Wushort|^ushort|\\Wswitch|^switch|\\Wu_long|^u_long|\\Wtypeid|^typeid|\\Wu_char|^u_char|\\Wsizeof|^sizeof|\\Wbitand|^bitand|\\Wdelete|^delete|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wuid_t|^uid_t|\\Wshort|^short|\\Wbreak|^break|\\Wcatch|^catch|\\Wcompl|^compl|\\Wwhile|^while|\\Wfalse|^false|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wconst|^const|\\Wthrow|^throw|\\Wbitor|^bitor|\\Wu_int|^u_int|\\Wusing|^using|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wgid_t|^gid_t|\\Wfloat|^float|\\Wlong|^long|\\Wgoto|^goto|\\Wuint|^uint|\\Wid_t|^id_t|\\Wcase|^case|\\Wauto|^auto|\\Wvoid|^void|\\Wenum|^enum|\\Wtrue|^true|\\Wchar|^char|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wthis|^this|\\Wbool|^bool|\\Welse|^else|\\Wfor|^for|\\Wnew|^new|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wasm|^asm|\\Wint|^int|\\Wtry|^try|\\Wdo|^do|\\Wif|^if|\\Wor|^or)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<11>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(\\()",
+      "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<11>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\b(?<!(?:\\W|^)(?:reinterpret_cast|atomic_noexcept|uint_least16_t|uint_least32_t|uint_least64_t|atomic_cancel|atomic_commit|uint_least8_t|uint_fast16_t|uint_fast32_t|int_least16_t|int_least32_t|int_least64_t|uint_fast64_t|thread_local|int_fast16_t|int_fast32_t|int_fast64_t|synchronized|uint_fast8_t|dynamic_cast|int_least8_t|int_fast8_t|static_cast|suseconds_t|const_cast|useconds_t|constinit|co_return|uintmax_t|uintmax_t|uintmax_t|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|blksize_t|co_return|in_addr_t|in_port_t|uintptr_t|template|noexcept|noexcept|continue|co_await|co_yield|unsigned|u_quad_t|blkcnt_t|uint16_t|uint32_t|uint64_t|intptr_t|intmax_t|intmax_t|volatile|register|restrict|explicit|volatile|noexcept|operator|decltype|typename|requires|co_await|co_yield|reflexpr|swblk_t|virtual|ssize_t|concept|mutable|fixpt_t|int16_t|int32_t|int64_t|uint8_t|typedef|daddr_t|caddr_t|qaddr_t|default|nlink_t|segsz_t|u_short|wchar_t|private|__asm__|alignas|alignof|mutable|nullptr|clock_t|mode_t|public|size_t|double|quad_t|static|time_t|module|import|export|extern|inline|xor_eq|and_eq|return|friend|not_eq|signed|struct|int8_t|ushort|switch|u_long|typeid|u_char|sizeof|bitand|delete|ino_t|key_t|pid_t|off_t|uid_t|short|break|catch|compl|while|false|class|union|const|or_eq|const|throw|bitor|u_int|using|div_t|dev_t|gid_t|float|long|goto|uint|id_t|case|auto|void|enum|true|char|id_t|NULL|this|bool|else|for|new|not|xor|and|asm|int|try|do|if|or))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<11>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3094,7 +3094,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.function.call.cpp"
@@ -3107,7 +3107,7 @@
       ]
     },
     "function_definition": {
-      "begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>|\\*\\/))\\s*+(?:((?<!\\w)template(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?<!\\w)(?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<52>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<52>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<52>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Wuint_least8_t|^uint_least8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wsynchronized|^synchronized|\\Wuint_fast8_t|^uint_fast8_t|\\Wdynamic_cast|^dynamic_cast|\\Wint_least8_t|^int_least8_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wsuseconds_t|^suseconds_t|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wconstinit|^constinit|\\Wco_return|^co_return|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wtemplate|^template|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wexplicit|^explicit|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Woperator|^operator|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wrequires|^requires|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wreflexpr|^reflexpr|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wssize_t|^ssize_t|\\Wconcept|^concept|\\Wmutable|^mutable|\\Wfixpt_t|^fixpt_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wtypedef|^typedef|\\Wdaddr_t|^daddr_t|\\Wcaddr_t|^caddr_t|\\Wqaddr_t|^qaddr_t|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wsegsz_t|^segsz_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\W__asm__|^__asm__|\\Walignas|^alignas|\\Walignof|^alignof|\\Wmutable|^mutable|\\Wnullptr|^nullptr|\\Wclock_t|^clock_t|\\Wmode_t|^mode_t|\\Wpublic|^public|\\Wsize_t|^size_t|\\Wdouble|^double|\\Wquad_t|^quad_t|\\Wstatic|^static|\\Wtime_t|^time_t|\\Wmodule|^module|\\Wimport|^import|\\Wexport|^export|\\Wextern|^extern|\\Winline|^inline|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wreturn|^return|\\Wfriend|^friend|\\Wnot_eq|^not_eq|\\Wsigned|^signed|\\Wstruct|^struct|\\Wint8_t|^int8_t|\\Wushort|^ushort|\\Wswitch|^switch|\\Wu_long|^u_long|\\Wtypeid|^typeid|\\Wu_char|^u_char|\\Wsizeof|^sizeof|\\Wbitand|^bitand|\\Wdelete|^delete|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wuid_t|^uid_t|\\Wshort|^short|\\Wbreak|^break|\\Wcatch|^catch|\\Wcompl|^compl|\\Wwhile|^while|\\Wfalse|^false|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wconst|^const|\\Wthrow|^throw|\\Wbitor|^bitor|\\Wu_int|^u_int|\\Wusing|^using|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wgid_t|^gid_t|\\Wfloat|^float|\\Wlong|^long|\\Wgoto|^goto|\\Wuint|^uint|\\Wid_t|^id_t|\\Wcase|^case|\\Wauto|^auto|\\Wvoid|^void|\\Wenum|^enum|\\Wtrue|^true|\\Wchar|^char|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wthis|^this|\\Wbool|^bool|\\Welse|^else|\\Wfor|^for|\\Wnew|^new|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wasm|^asm|\\Wint|^int|\\Wtry|^try|\\Wdo|^do|\\Wif|^if|\\Wor|^or)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\()",
+      "begin": "(?:(?:^|\\G|(?<=[;}]))|(?<=>|\\*/))\\s*+(?:((?<!\\w)template(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?<!\\w)(?:(?:constexpr|consteval|explicit|mutable|virtual|inline|friend)|(?:thread_local|volatile|register|restrict|static|extern|const))(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*)(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<52>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<52>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<52>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\b(?<!(?:\\W|^)(?:reinterpret_cast|atomic_noexcept|uint_least16_t|uint_least32_t|uint_least64_t|atomic_cancel|atomic_commit|uint_least8_t|uint_fast16_t|uint_fast32_t|int_least16_t|int_least32_t|int_least64_t|uint_fast64_t|thread_local|int_fast16_t|int_fast32_t|int_fast64_t|synchronized|uint_fast8_t|dynamic_cast|int_least8_t|int_fast8_t|static_cast|suseconds_t|const_cast|useconds_t|constinit|co_return|uintmax_t|uintmax_t|uintmax_t|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|blksize_t|co_return|in_addr_t|in_port_t|uintptr_t|template|noexcept|noexcept|continue|co_await|co_yield|unsigned|u_quad_t|blkcnt_t|uint16_t|uint32_t|uint64_t|intptr_t|intmax_t|intmax_t|volatile|register|restrict|explicit|volatile|noexcept|operator|decltype|typename|requires|co_await|co_yield|reflexpr|swblk_t|virtual|ssize_t|concept|mutable|fixpt_t|int16_t|int32_t|int64_t|uint8_t|typedef|daddr_t|caddr_t|qaddr_t|default|nlink_t|segsz_t|u_short|wchar_t|private|__asm__|alignas|alignof|mutable|nullptr|clock_t|mode_t|public|size_t|double|quad_t|static|time_t|module|import|export|extern|inline|xor_eq|and_eq|return|friend|not_eq|signed|struct|int8_t|ushort|switch|u_long|typeid|u_char|sizeof|bitand|delete|ino_t|key_t|pid_t|off_t|uid_t|short|break|catch|compl|while|false|class|union|const|or_eq|const|throw|bitor|u_int|using|div_t|dev_t|gid_t|float|long|goto|uint|id_t|case|auto|void|enum|true|char|id_t|NULL|this|bool|else|for|new|not|xor|and|asm|int|try|do|if|or))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\()",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.cpp"
@@ -3132,7 +3132,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -3160,7 +3160,7 @@
                   "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
                 }
               },
-              "end": ">|(?=(?<!\\\\)\n)",
+              "end": ">|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -3174,7 +3174,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -3235,7 +3235,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -3298,11 +3298,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -3452,7 +3452,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "((?<!\\w)(?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+              "match": "((?<!\\w)(?:(?:constexpr|consteval|explicit|mutable|virtual|inline|friend)|(?:thread_local|volatile|register|restrict|static|extern|const))(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
             }
           ]
         },
@@ -3467,7 +3467,7 @@
           ]
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.function.definition.cpp",
@@ -3476,7 +3476,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.function.definition.cpp"
@@ -3495,7 +3495,7 @@
                 }
               },
               "contentName": "meta.function.definition.parameters",
-              "end": "\\)|(?=(?<!\\\\)\n)",
+              "end": "\\)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.parameters.end.bracket.round.cpp"
@@ -3550,7 +3550,7 @@
                       "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
                     },
                     {
-                      "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                      "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                       "name": "entity.name.scope-resolution.type.cpp"
                     },
                     {
@@ -3609,7 +3609,7 @@
                       "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
                     },
                     {
-                      "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+                      "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
                       "name": "storage.type.$0.cpp"
                     },
                     {
@@ -3637,7 +3637,7 @@
                           "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
                         }
                       },
-                      "end": ">|(?=(?<!\\\\)\n)",
+                      "end": ">|(?=(?<!\\\\)\\n)",
                       "endCaptures": {
                         "0": {
                           "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -3651,7 +3651,7 @@
                       ]
                     },
                     {
-                      "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                      "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                       "name": "entity.name.type.cpp"
                     }
                   ]
@@ -3677,7 +3677,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
                 }
               },
-              "match": "(?<=^|\\))(?:\\s+)?(->)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<23>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<23>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))"
+              "match": "(?<=^|\\))\\s+{0,1}(->)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<23>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<23>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))"
             },
             {
               "include": "$self"
@@ -3688,7 +3688,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.cpp"
@@ -3702,10 +3702,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.cpp",
@@ -3731,7 +3731,7 @@
       ]
     },
     "function_pointer": {
-      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(?:(\\[)(\\w*)(\\])(?:\\s+)?)*(\\))(?:\\s+)?(\\()",
+      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()(\\*)\\s+{0,1}((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)?)\\s+{0,1}(?:(\\[)(\\w*)(])\\s+{0,1})*(\\))\\s+{0,1}(\\()",
       "beginCaptures": {
         "1": {
           "name": "meta.qualified_type.cpp",
@@ -3741,7 +3741,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -3769,7 +3769,7 @@
                   "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
                 }
               },
-              "end": ">|(?=(?<!\\\\)\n)",
+              "end": ">|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -3783,7 +3783,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -3798,7 +3798,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -3858,11 +3858,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -3983,7 +3983,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()|(?=(?<!\\\\)\n)",
+      "end": "(\\))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[{=,);>\\n])(?!\\()|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -4012,7 +4012,7 @@
       ]
     },
     "function_pointer_parameter": {
-      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(?:(\\[)(\\w*)(\\])(?:\\s+)?)*(\\))(?:\\s+)?(\\()",
+      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()(\\*)\\s+{0,1}((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)?)\\s+{0,1}(?:(\\[)(\\w*)(])\\s+{0,1})*(\\))\\s+{0,1}(\\()",
       "beginCaptures": {
         "1": {
           "name": "meta.qualified_type.cpp",
@@ -4022,7 +4022,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -4050,7 +4050,7 @@
                   "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
                 }
               },
-              "end": ">|(?=(?<!\\\\)\n)",
+              "end": ">|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -4064,7 +4064,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -4079,7 +4079,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -4139,11 +4139,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -4264,7 +4264,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()|(?=(?<!\\\\)\n)",
+      "end": "(\\))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[{=,);>\\n])(?!\\()|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -4299,7 +4299,7 @@
           "name": "punctuation.section.attribute.begin.cpp"
         }
       },
-      "end": "\\)\\s*\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)\\s*\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.attribute.end.cpp"
@@ -4314,7 +4314,7 @@
           "begin": "\\(",
           "beginCaptures": {
           },
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "patterns": [
@@ -4338,7 +4338,7 @@
               "name": "entity.name.namespace.cpp"
             }
           },
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
         },
         {
           "match": ",",
@@ -4349,11 +4349,11 @@
           "name": "punctuation.accessor.attribute.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=::)",
           "name": "entity.name.namespace.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
           "name": "entity.other.attribute.$0.cpp"
         },
         {
@@ -4374,7 +4374,7 @@
           "name": "punctuation.separator.delimiter.comma.inheritance.cpp"
         },
         {
-          "match": "(?<!\\w)(?:(?:protected)|(?:private)|(?:public))(?!\\w)",
+          "match": "(?<!\\w)p(?:rotected|rivate|ublic)(?!\\w)",
           "name": "storage.type.modifier.access.$0.cpp"
         },
         {
@@ -4391,7 +4391,7 @@
                   "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
                 },
                 {
-                  "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+                  "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
                   "name": "storage.type.$0.cpp"
                 },
                 {
@@ -4419,7 +4419,7 @@
                       "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
                     }
                   },
-                  "end": ">|(?=(?<!\\\\)\n)",
+                  "end": ">|(?=(?<!\\\\)\\n)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -4433,7 +4433,7 @@
                   ]
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.type.cpp"
                 }
               ]
@@ -4459,7 +4459,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -4496,7 +4496,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -4521,7 +4521,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -4532,7 +4532,7 @@
                   "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
                 },
                 {
-                  "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                  "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                   "name": "entity.name.scope-resolution.type.cpp"
                 },
                 {
@@ -4550,12 +4550,12 @@
             "9": {
             }
           },
-          "match": "(?<=protected|virtual|private|public|,|:)(?:\\s+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))"
+          "match": "(?<=protected|virtual|private|public|[,:])\\s+{0,1}(?!(?:p(?:rotected|rivate|ublic)|virtual))(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))"
         }
       ]
     },
     "lambdas": {
-      "begin": "(?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[\\*&\">])|(?<=\\Wreturn|^return))(?:\\s+)?(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?:[^\\[\\]]*+\\g<3>?)++\\]))*+)(\\](?!((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))[\\[\\];=]))",
+      "begin": "(?:(?<=\\S|^)(?<![\\w\\])\\[*\\&\">])|(?<=\\Wreturn|^return))\\s+{0,1}(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?:[^\\[\\]]*+\\g<3>?)++]))*+)(](?!((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))[\\[\\];=]))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.capture.begin.lambda.cpp"
@@ -4594,7 +4594,7 @@
                   "name": "keyword.operator.assignment.cpp"
                 }
               },
-              "match": "((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))"
+              "match": "((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?=]|\\z|$)|(,))|(=))"
             },
             {
               "include": "#evaluation_context"
@@ -4623,7 +4623,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "(?<=[;}])|(?=(?<!\\\\)\n)",
+      "end": "(?<=[;}])|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "patterns": [
@@ -4634,7 +4634,7 @@
               "name": "punctuation.definition.parameters.begin.lambda.cpp"
             }
           },
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.parameters.end.lambda.cpp"
@@ -4648,7 +4648,7 @@
           ]
         },
         {
-          "match": "(?<!\\w)(?:(?:constexpr)|(?:consteval)|(?:mutable))(?!\\w)",
+          "match": "(?<!\\w)(?:constexpr|consteval|mutable)(?!\\w)",
           "name": "storage.modifier.lambda.$0.cpp"
         },
         {
@@ -4658,7 +4658,7 @@
               "name": "punctuation.definition.lambda.return-type.cpp"
             }
           },
-          "end": "(?=\\{)|(?=(?<!\\\\)\n)",
+          "end": "(?=\\{)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "patterns": [
@@ -4678,7 +4678,7 @@
               "name": "punctuation.section.block.begin.bracket.curly.lambda.cpp"
             }
           },
-          "end": "\\}|(?=(?<!\\\\)\n)",
+          "end": "}|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.lambda.cpp"
@@ -4694,7 +4694,7 @@
       ]
     },
     "line": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?line\\b",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}line\\b",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.directive.line.cpp"
@@ -4719,7 +4719,7 @@
           "name": "punctuation.definition.directive.cpp"
         }
       },
-      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\n)",
+      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.preprocessor.line.cpp",
@@ -4736,13 +4736,13 @@
       ]
     },
     "line_comment": {
-      "begin": "\\s*+(\\/\\/)",
+      "begin": "\\s*+(//)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.cpp"
         }
       },
-      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\n)",
+      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "comment.line.double-slash.cpp",
@@ -4753,7 +4753,7 @@
       ]
     },
     "macro": {
-      "begin": "(^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?define\\b)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+      "begin": "(^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}define\\b)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.define.cpp"
@@ -4781,7 +4781,7 @@
           "name": "entity.name.function.preprocessor.cpp"
         }
       },
-      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\n)",
+      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.preprocessor.macro.cpp",
@@ -4800,7 +4800,7 @@
                       "name": "variable.parameter.preprocessor.cpp"
                     }
                   },
-                  "match": "(?<=[(,])(?:\\s+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s+)?"
+                  "match": "(?<=[(,])\\s+{0,1}((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\s+{0,1}"
                 },
                 {
                   "match": ",",
@@ -4816,7 +4816,7 @@
               "name": "punctuation.definition.parameters.end.preprocessor.cpp"
             }
           },
-          "match": "\\G(?:\\s+)?(\\()([^\\(]*)(\\))"
+          "match": "\\G\\s+{0,1}(\\()([^(]*)(\\))"
         },
         {
           "include": "#macro_context"
@@ -4834,7 +4834,7 @@
       ]
     },
     "method_access": {
-      "begin": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:\\s+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:\\s+)?)*)(?:\\s+)?(~?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s+)?(\\()",
+      "begin": "(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*|(?<=[\\])]))\\s+{0,1}))(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\s+{0,1}(?:\\.(?:\\*|)|->(?:\\*|))\\s+{0,1})*)\\s+{0,1}(~?(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\s+{0,1}(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -4903,7 +4903,7 @@
                   "name": "punctuation.separator.pointer-access.cpp"
                 }
               },
-              "match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:\\s+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:\\s+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s+{0,1}(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*|(?<=[\\])]))\\s+{0,1}))(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             },
             {
               "captures": {
@@ -4936,7 +4936,7 @@
                   "name": "punctuation.separator.pointer-access.cpp"
                 }
               },
-              "match": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:\\s+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*|(?<=[\\])]))\\s+{0,1}))(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             },
             {
               "include": "source.cpp#member_access"
@@ -4947,7 +4947,7 @@
           ]
         }
       },
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.function.member.cpp"
@@ -4966,7 +4966,7 @@
           "name": "punctuation.section.attribute.begin.cpp"
         }
       },
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.attribute.end.cpp"
@@ -4981,7 +4981,7 @@
           "begin": "\\(",
           "beginCaptures": {
           },
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "patterns": [
@@ -5005,7 +5005,7 @@
               "name": "entity.name.namespace.cpp"
             }
           },
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
         },
         {
           "match": ",",
@@ -5016,11 +5016,11 @@
           "name": "punctuation.accessor.attribute.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=::)",
           "name": "entity.name.namespace.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
           "name": "entity.other.attribute.$0.cpp"
         },
         {
@@ -5041,7 +5041,7 @@
           "name": "keyword.other.namespace.definition.cpp storage.type.namespace.definition.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.block.namespace.cpp",
@@ -5050,7 +5050,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.namespace.cpp"
@@ -5095,7 +5095,7 @@
                   "name": "storage.modifier.inline.cpp"
                 }
               },
-              "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<4>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:\\s+)?(?:(::)(?:\\s+)?(inline))?"
+              "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<4>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s+{0,1}(?:(::)\\s+{0,1}(inline))?"
             }
           ]
         },
@@ -5103,7 +5103,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.namespace.cpp"
@@ -5117,10 +5117,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.namespace.cpp",
@@ -5133,7 +5133,7 @@
       ]
     },
     "noexcept_operator": {
-      "begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)noexcept(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.cpp"
@@ -5159,7 +5159,7 @@
         }
       },
       "contentName": "meta.arguments.operator.noexcept",
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.operator.noexcept.cpp"
@@ -5172,7 +5172,7 @@
       ]
     },
     "operator_overload": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<55>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<55>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<55>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(operator)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<55>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|\\+|\\-|!|~|\\*|&|\\*|\\/|%|\\+|\\-|<|>|&|\\^|\\||=))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:\\[\\])?)))|(\"\")((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\<|\\()",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(operator)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(?:(?:((?:delete\\[]|delete|new\\[]|<=>|<<=|new|>>=|->\\*|/=|%=|&=|>=|\\|=|\\+\\+|--|\\(\\)|\\[]|->|\\+\\+|<<|>>|--|<=|\\^=|==|!=|&&|\\|\\||\\+=|-=|\\*=|[,+\\-!~*\\&/%<>^|=]))|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:\\[])?)))|(\"\")((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[<(])",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.operator-overload.cpp"
@@ -5210,7 +5210,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -5273,11 +5273,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -5378,7 +5378,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.operator.cpp"
             },
             {
@@ -5413,7 +5413,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -5441,7 +5441,7 @@
                   "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
                 }
               },
-              "end": ">|(?=(?<!\\\\)\n)",
+              "end": ">|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -5455,7 +5455,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -5476,7 +5476,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator-overload.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.operator-overload.cpp"
             },
             {
@@ -5524,11 +5524,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "entity.name.operator.type.reference.cpp"
             }
           ]
@@ -5646,7 +5646,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.operator-overload.cpp",
@@ -5655,7 +5655,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.function.definition.special.operator-overload.cpp"
@@ -5677,7 +5677,7 @@
                 }
               },
               "contentName": "meta.function.definition.parameters.special.operator-overload",
-              "end": "\\)|(?=(?<!\\\\)\n)",
+              "end": "\\)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.parameters.end.bracket.round.special.operator-overload.cpp"
@@ -5723,7 +5723,7 @@
                   "name": "keyword.other.delete.function.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "include": "$self"
@@ -5734,7 +5734,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.operator-overload.cpp"
@@ -5748,10 +5748,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.operator-overload.cpp",
@@ -5766,7 +5766,7 @@
     "operators": {
       "patterns": [
         {
-          "begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)sizeof(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
@@ -5792,7 +5792,7 @@
             }
           },
           "contentName": "meta.arguments.operator.sizeof",
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp"
@@ -5805,7 +5805,7 @@
           ]
         },
         {
-          "begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)alignof(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
@@ -5831,7 +5831,7 @@
             }
           },
           "contentName": "meta.arguments.operator.alignof",
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp"
@@ -5844,7 +5844,7 @@
           ]
         },
         {
-          "begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)alignas(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
@@ -5870,7 +5870,7 @@
             }
           },
           "contentName": "meta.arguments.operator.alignas",
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp"
@@ -5883,7 +5883,7 @@
           ]
         },
         {
-          "begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)typeid(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
@@ -5909,7 +5909,7 @@
             }
           },
           "contentName": "meta.arguments.operator.typeid",
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp"
@@ -5922,7 +5922,7 @@
           ]
         },
         {
-          "begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)noexcept(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.cpp"
@@ -5948,7 +5948,7 @@
             }
           },
           "contentName": "meta.arguments.operator.noexcept",
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.arguments.end.bracket.round.operator.noexcept.cpp"
@@ -5961,7 +5961,7 @@
           ]
         },
         {
-          "begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "(\\bsizeof\\.\\.\\.)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.variadic.cpp"
@@ -5987,7 +5987,7 @@
             }
           },
           "contentName": "meta.arguments.operator.sizeof.variadic",
-          "end": "\\)|(?=(?<!\\\\)\n)",
+          "end": "\\)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.variadic.cpp"
@@ -6008,7 +6008,7 @@
           "name": "keyword.operator.increment.cpp"
         },
         {
-          "match": "%=|\\+=|-=|\\*=|(?<!\\()\\/=",
+          "match": "%=|\\+=|-=|\\*=|(?<!\\()/=",
           "name": "keyword.operator.assignment.compound.cpp"
         },
         {
@@ -6020,7 +6020,7 @@
           "name": "keyword.operator.bitwise.shift.cpp"
         },
         {
-          "match": "!=|<=|>=|==|<|>",
+          "match": "!=|<=|>=|==|[<>]",
           "name": "keyword.operator.comparison.cpp"
         },
         {
@@ -6028,14 +6028,14 @@
           "name": "keyword.operator.logical.cpp"
         },
         {
-          "match": "&|\\||\\^|~",
+          "match": "[\\&|^~]",
           "name": "keyword.operator.bitwise.cpp"
         },
         {
           "include": "source.cpp#assignment_operator"
         },
         {
-          "match": "%|\\*|\\/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.cpp"
         },
         {
@@ -6044,7 +6044,7 @@
       ]
     },
     "parameter": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\w)",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\w)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -6063,7 +6063,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.separator.delimiter.comma.cpp"
@@ -6162,7 +6162,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\s*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_]\\w*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wthread_local|^thread_local|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=,|\\)|=)"
+          "match": "((?:((?:thread_local|volatile|register|restrict|static|extern|const))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\s*+(?<!\\w)(?:(?:(?:((?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int))|((?:uint_least32_t|uint_least64_t|uint_least16_t|uint_fast64_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|uint_fast16_t|uint_fast32_t|int_least8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintmax_t|in_port_t|uintmax_t|in_addr_t|blksize_t|uintptr_t|intmax_t|intptr_t|blkcnt_t|intmax_t|u_quad_t|uint16_t|uint32_t|uint64_t|ssize_t|fixpt_t|qaddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|daddr_t|caddr_t|swblk_t|clock_t|segsz_t|nlink_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)))|(pthread_(?:rwlockattr_t|mutexattr_t|condattr_t|rwlock_t|mutex_t|cond_t|attr_t|once_t|key_t|t)))|([a-zA-Z_]\\w*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\b\\b(?<!(?:\\W|^)(?:thread_local|volatile|register|restrict|static|extern|const))))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[,)=])"
         },
         {
           "include": "#storage_types"
@@ -6171,14 +6171,14 @@
           "include": "source.cpp#scope_resolution_parameter_inner_generated"
         },
         {
-          "match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
+          "match": "(?:struct|class|union|enum)",
           "name": "storage.type.$0.cpp"
         },
         {
           "begin": "(?<==)",
           "beginCaptures": {
           },
-          "end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
+          "end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.delimiter.comma.cpp"
@@ -6191,7 +6191,7 @@
           ]
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.cpp"
         },
         {
@@ -6232,7 +6232,7 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "(?<!\\s|\\(|,|:)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\)|,|\\[|=|\\n)"
+          "match": "(?<![\\s(,:])((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[),\\[=\\n])"
         },
         {
           "include": "#attributes_context"
@@ -6244,7 +6244,7 @@
               "name": "punctuation.definition.begin.bracket.square.array.type.cpp"
             }
           },
-          "end": "\\]|(?=(?<!\\\\)\n)",
+          "end": "]|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.array.type.cpp"
@@ -6258,7 +6258,7 @@
           ]
         },
         {
-          "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?<!\\Wstruct|^struct|\\Wclass|^class|\\Wunion|^union|\\Wenum|^enum)",
+          "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b(?<!(?:\\W|^)(?:struct|class|union|enum))",
           "name": "entity.name.type.parameter.cpp"
         },
         {
@@ -6291,11 +6291,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -6333,7 +6333,7 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*)"
+          "match": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*]"
         },
         {
           "include": "#ever_present_context"
@@ -6341,7 +6341,7 @@
       ]
     },
     "parameter_or_maybe_value": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\w)",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\w)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -6360,7 +6360,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.separator.delimiter.comma.cpp"
@@ -6465,7 +6465,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\s*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_]\\w*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wthread_local|^thread_local|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=,|\\)|=)"
+          "match": "((?:((?:thread_local|volatile|register|restrict|static|extern|const))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\s*+(?<!\\w)(?:(?:(?:((?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int))|((?:uint_least32_t|uint_least64_t|uint_least16_t|uint_fast64_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|uint_fast16_t|uint_fast32_t|int_least8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintmax_t|in_port_t|uintmax_t|in_addr_t|blksize_t|uintptr_t|intmax_t|intptr_t|blkcnt_t|intmax_t|u_quad_t|uint16_t|uint32_t|uint64_t|ssize_t|fixpt_t|qaddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|daddr_t|caddr_t|swblk_t|clock_t|segsz_t|nlink_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)))|(pthread_(?:rwlockattr_t|mutexattr_t|condattr_t|rwlock_t|mutex_t|cond_t|attr_t|once_t|key_t|t)))|([a-zA-Z_]\\w*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\b\\b(?<!(?:\\W|^)(?:thread_local|volatile|register|restrict|static|extern|const))))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[,)=])"
         },
         {
           "include": "#storage_types"
@@ -6477,14 +6477,14 @@
           "include": "source.cpp#scope_resolution_parameter_inner_generated"
         },
         {
-          "match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
+          "match": "(?:struct|class|union|enum)",
           "name": "storage.type.$0.cpp"
         },
         {
           "begin": "(?<==)",
           "beginCaptures": {
           },
-          "end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
+          "end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.delimiter.comma.cpp"
@@ -6534,7 +6534,7 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "(?<!\\s|\\(|,|:)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=(?:\\)|,|\\[|=|\\/\\/|(?:\\n|$)))"
+          "match": "(?<![\\s(,:])((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=(?:[),\\[=]|//|(?:\\n|$)))"
         },
         {
           "include": "#attributes_context"
@@ -6546,7 +6546,7 @@
               "name": "punctuation.definition.begin.bracket.square.array.type.cpp"
             }
           },
-          "end": "\\]|(?=(?<!\\\\)\n)",
+          "end": "]|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.array.type.cpp"
@@ -6560,7 +6560,7 @@
           ]
         },
         {
-          "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?<!\\Wstruct|^struct|\\Wclass|^class|\\Wunion|^union|\\Wenum|^enum)",
+          "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b(?<!(?:\\W|^)(?:struct|class|union|enum))",
           "name": "entity.name.type.parameter.cpp"
         },
         {
@@ -6593,11 +6593,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -6635,7 +6635,7 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*)"
+          "match": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*]"
         },
         {
           "include": "#evaluation_context"
@@ -6652,7 +6652,7 @@
           "name": "punctuation.section.parens.begin.bracket.round.cpp"
         }
       },
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.parens.end.bracket.round.cpp"
@@ -6673,7 +6673,7 @@
       ]
     },
     "pragma": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?pragma\\b",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}pragma\\b",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.directive.pragma.cpp"
@@ -6698,7 +6698,7 @@
           "name": "punctuation.definition.directive.cpp"
         }
       },
-      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\n)",
+      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.preprocessor.pragma.cpp",
@@ -6762,7 +6762,7 @@
           "name": "punctuation.section.parens.control.defined.cpp"
         }
       },
-      "end": "(?:\\)|(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$)))|(?=(?<!\\\\)\n)",
+      "end": "(?:\\)|(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$)))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.parens.control.defined.cpp"
@@ -6781,7 +6781,7 @@
           "name": "punctuation.section.parens.begin.bracket.round.cpp"
         }
       },
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.parens.end.bracket.round.cpp"
@@ -6790,7 +6790,7 @@
       "name": "meta.parens.preprocessor.conditional.cpp"
     },
     "preprocessor_conditional_range": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?((?:(?:ifndef|ifdef)|if))",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}(if(?:(?:ndef|def)|))",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.directive.conditional.$6.cpp"
@@ -6818,7 +6818,7 @@
         }
       },
       "contentName": "meta.preprocessor.conditional",
-      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\n)",
+      "end": "(?<!\\\\)(?:(?=\\n)|(?<=^\\n|[^\\\\]\\n)(?=$))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "patterns": [
@@ -6865,7 +6865,7 @@
       ]
     },
     "sizeof_operator": {
-      "begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)sizeof(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
@@ -6891,7 +6891,7 @@
         }
       },
       "contentName": "meta.arguments.operator.sizeof",
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp"
@@ -6904,7 +6904,7 @@
       ]
     },
     "sizeof_variadic_operator": {
-      "begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "(\\bsizeof\\.\\.\\.)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.variadic.cpp"
@@ -6930,7 +6930,7 @@
         }
       },
       "contentName": "meta.arguments.operator.sizeof.variadic",
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.variadic.cpp"
@@ -6943,7 +6943,7 @@
       ]
     },
     "square_brackets": {
-      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
+      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!])",
       "beginCaptures": {
         "1": {
           "name": "variable.other.object"
@@ -6952,7 +6952,7 @@
           "name": "punctuation.definition.begin.bracket.square"
         }
       },
-      "end": "\\]|(?=(?<!\\\\)\n)",
+      "end": "]|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.end.bracket.square"
@@ -6966,7 +6966,7 @@
       ]
     },
     "static_assert": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -7007,7 +7007,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.static_assert.cpp"
@@ -7015,13 +7015,13 @@
       },
       "patterns": [
         {
-          "begin": "(,)(?:\\s+)?(?=(?:L|u8|u|U(?:\\s+)?\\\")?)",
+          "begin": "(,)\\s+{0,1}(?=(?:L|u8|u|U\\s+{0,1}\")?)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.delimiter.comma.cpp"
             }
           },
-          "end": "(?=\\))|(?=(?<!\\\\)\n)",
+          "end": "(?=\\))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.static_assert.message.cpp",
@@ -7055,7 +7055,7 @@
     "string_context": {
       "patterns": [
         {
-          "begin": "((?:u|u8|U|L)?)\"",
+          "begin": "((?:u|u8|[UL])?)\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -7064,7 +7064,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "(\")(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?|(?=(?<!\\\\)\n)",
+          "end": "(\")(?:((?:[a-zA-Z]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)|(_(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))?|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.cpp"
@@ -7079,7 +7079,7 @@
           "name": "string.quoted.double.cpp",
           "patterns": [
             {
-              "match": "(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8})",
+              "match": "\\\\(?:u\\h{4}|U\\h{8})",
               "name": "constant.character.escape.cpp"
             },
             {
@@ -7099,7 +7099,7 @@
                   "name": "invalid.illegal.unknown-escape.cpp"
                 }
               },
-              "match": "(?:(\\\\x0*[0-9a-fA-F]{2}(?![0-9a-fA-F]))|((?:\\\\x[0-9a-fA-F]*|\\\\x)))"
+              "match": "(?:(\\\\x0*\\h{2}(?!\\h))|(\\\\x(?:\\h*|)))"
             },
             {
               "include": "source.cpp#string_escapes_context_c"
@@ -7107,7 +7107,7 @@
           ]
         },
         {
-          "begin": "(?<![0-9A-Fa-f])((?:u|u8|U|L)?)'",
+          "begin": "(?<!\\h)((?:u|u8|[UL])?)'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -7116,7 +7116,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "(')(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?|(?=(?<!\\\\)\n)",
+          "end": "(')(?:((?:[a-zA-Z]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)|(_(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))?|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.cpp"
@@ -7139,7 +7139,7 @@
                   "name": "invalid.illegal.unknown-escape.cpp"
                 }
               },
-              "match": "(?:(\\\\x0*[0-9a-fA-F]{2}(?![0-9a-fA-F]))|((?:\\\\x[0-9a-fA-F]*|\\\\x)))"
+              "match": "(?:(\\\\x0*\\h{2}(?!\\h))|(\\\\x(?:\\h*|)))"
             },
             {
               "include": "source.cpp#string_escapes_context_c"
@@ -7150,7 +7150,7 @@
           ]
         },
         {
-          "begin": "((?:[uUL]8?)?R)\\\"(?:(?:_r|re)|regex)\\(",
+          "begin": "((?:[uUL]8?)?R)\"(?:(?:_r|re)|regex)\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -7159,7 +7159,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "\\)(?:(?:_r|re)|regex)\\\"|(?=(?<!\\\\)\n)",
+          "end": "\\)(?:(?:_r|re)|regex)\"|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cpp"
@@ -7173,7 +7173,7 @@
           ]
         },
         {
-          "begin": "((?:[uUL]8?)?R)\\\"(?:glsl|GLSL)\\(",
+          "begin": "((?:[uUL]8?)?R)\"(?:glsl|GLSL)\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -7182,7 +7182,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "\\)(?:glsl|GLSL)\\\"|(?=(?<!\\\\)\n)",
+          "end": "\\)(?:glsl|GLSL)\"|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cpp"
@@ -7196,7 +7196,7 @@
           ]
         },
         {
-          "begin": "((?:[uUL]8?)?R)\\\"(?:[pP]?(?:sql|SQL)|d[dm]l)\\(",
+          "begin": "((?:[uUL]8?)?R)\"(?:[pP]?(?:sql|SQL)|d[dm]l)\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -7205,7 +7205,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "\\)(?:[pP]?(?:sql|SQL)|d[dm]l)\\\"|(?=(?<!\\\\)\n)",
+          "end": "\\)(?:[pP]?(?:sql|SQL)|d[dm]l)\"|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cpp"
@@ -7219,7 +7219,7 @@
           ]
         },
         {
-          "begin": "((?:u|u8|U|L)?R)\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+          "begin": "((?:u|u8|[UL])?R)\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin"
@@ -7231,7 +7231,7 @@
               "name": "invalid.illegal.delimiter-too-long"
             }
           },
-          "end": "(\\)\\2(\\3)\")(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?|(?=(?<!\\\\)\n)",
+          "end": "(\\)\\2(\\3)\")(?:((?:[a-zA-Z]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)|(_(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))?|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end"
@@ -7251,7 +7251,7 @@
       ]
     },
     "struct_block": {
-      "begin": "((?<!\\w)struct(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+      "begin": "((?<!\\w)struct(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
       "beginCaptures": {
         "0": {
           "name": "meta.head.struct.cpp"
@@ -7286,7 +7286,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+              "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
             },
             {
               "captures": {
@@ -7329,14 +7329,14 @@
                   "name": "comment.block.cpp"
                 }
               },
-              "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+              "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
             },
             {
               "match": "DLLEXPORT",
               "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
             }
           ]
@@ -7416,7 +7416,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -7431,7 +7431,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.struct.cpp"
@@ -7454,7 +7454,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.struct.cpp"
@@ -7480,10 +7480,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.struct.cpp",
@@ -7496,7 +7496,7 @@
       ]
     },
     "switch_conditional_parentheses": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -7518,7 +7518,7 @@
           "name": "punctuation.section.parens.begin.bracket.round.conditional.switch.cpp"
         }
       },
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.parens.end.bracket.round.conditional.switch.cpp"
@@ -7532,7 +7532,7 @@
       ]
     },
     "switch_statement": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)switch(?!\\w))",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)switch(?!\\w))",
       "beginCaptures": {
         "0": {
           "name": "meta.head.switch.cpp"
@@ -7557,7 +7557,7 @@
           "name": "keyword.control.switch.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "name": "meta.block.switch.cpp",
@@ -7566,7 +7566,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.switch.cpp"
@@ -7586,7 +7586,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.switch.cpp"
@@ -7606,10 +7606,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.switch.cpp",
@@ -7662,7 +7662,7 @@
           "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
         }
       },
-      "end": ">|(?=(?<!\\\\)\n)",
+      "end": ">|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -7676,7 +7676,7 @@
       ]
     },
     "template_definition": {
-      "begin": "(?<!\\w)(template)(?:\\s+)?(<)",
+      "begin": "(?<!\\w)(template)\\s+{0,1}(<)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.template.cpp"
@@ -7685,7 +7685,7 @@
           "name": "punctuation.section.angle-brackets.begin.template.definition.cpp"
         }
       },
-      "end": ">|(?=(?<!\\\\)\n)",
+      "end": ">|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.angle-brackets.end.template.definition.cpp"
@@ -7694,13 +7694,13 @@
       "name": "meta.template.definition.cpp",
       "patterns": [
         {
-          "begin": "(?<=\\w)(?:\\s+)?<",
+          "begin": "(?<=\\w)\\s+{0,1}<",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
             }
           },
-          "end": ">|(?=(?<!\\\\)\n)",
+          "end": ">|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -7744,7 +7744,7 @@
           "name": "keyword.operator.ternary.cpp"
         }
       },
-      "end": ":|(?=(?<!\\\\)\n)",
+      "end": ":|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "keyword.operator.ternary.cpp"
@@ -7832,18 +7832,18 @@
       ]
     },
     "typedef_class": {
-      "begin": "((?<!\\w)typedef(?!\\w))(?:\\s+)?(?=(?<!\\w)class(?!\\w))",
+      "begin": "((?<!\\w)typedef(?!\\w))\\s+{0,1}(?=(?<!\\w)class(?!\\w))",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.typedef.cpp"
         }
       },
-      "end": "(?<=;)|(?=(?<!\\\\)\n)",
+      "end": "(?<=;)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "patterns": [
         {
-          "begin": "((?<!\\w)class(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+          "begin": "((?<!\\w)class(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
           "beginCaptures": {
             "0": {
               "name": "meta.head.class.cpp"
@@ -7878,7 +7878,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+                  "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
                 },
                 {
                   "captures": {
@@ -7921,14 +7921,14 @@
                       "name": "comment.block.cpp"
                     }
                   },
-                  "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+                  "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
                 },
                 {
                   "match": "DLLEXPORT",
                   "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
                 }
               ]
@@ -8008,7 +8008,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+          "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.statement.cpp"
@@ -8023,7 +8023,7 @@
               "begin": "\\G ?",
               "beginCaptures": {
               },
-              "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+              "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.class.cpp"
@@ -8046,7 +8046,7 @@
               "begin": "(?<=\\{|<%|\\?\\?<)",
               "beginCaptures": {
               },
-              "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+              "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.class.cpp"
@@ -8072,10 +8072,10 @@
               ]
             },
             {
-              "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+              "begin": "(?<=}|%>|\\?\\?>)\\s*",
               "beginCaptures": {
               },
-              "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+              "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
               },
               "name": "meta.tail.class.cpp",
@@ -8107,11 +8107,11 @@
                               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                             }
                           },
-                          "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                          "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                           "name": "invalid.illegal.reference-type.cpp"
                         },
                         {
-                          "match": "\\&",
+                          "match": "&",
                           "name": "storage.modifier.reference.cpp"
                         }
                       ]
@@ -8168,7 +8168,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+                  "match": "(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
                 },
                 {
                   "match": ","
@@ -8180,18 +8180,18 @@
       ]
     },
     "typedef_function_pointer": {
-      "begin": "((?<!\\w)typedef(?!\\w))(?:\\s+)?(?=.*\\(\\*\\s*(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*\\))",
+      "begin": "((?<!\\w)typedef(?!\\w))\\s+{0,1}(?=.*\\(\\*\\s*(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\s*\\))",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.typedef.cpp"
         }
       },
-      "end": "(?<=;)|(?=(?<!\\\\)\n)",
+      "end": "(?<=;)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "patterns": [
         {
-          "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(?:(\\[)(\\w*)(\\])(?:\\s+)?)*(\\))(?:\\s+)?(\\()",
+          "begin": "(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()(\\*)\\s+{0,1}((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)?)\\s+{0,1}(?:(\\[)(\\w*)(])\\s+{0,1})*(\\))\\s+{0,1}(\\()",
           "beginCaptures": {
             "1": {
               "name": "meta.qualified_type.cpp",
@@ -8201,7 +8201,7 @@
                   "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
                 },
                 {
-                  "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+                  "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
                   "name": "storage.type.$0.cpp"
                 },
                 {
@@ -8229,7 +8229,7 @@
                       "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
                     }
                   },
-                  "end": ">|(?=(?<!\\\\)\n)",
+                  "end": ">|(?=(?<!\\\\)\\n)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.angle-brackets.end.template.call.cpp"
@@ -8243,7 +8243,7 @@
                   ]
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.type.cpp"
                 }
               ]
@@ -8258,7 +8258,7 @@
                   "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
                 },
                 {
-                  "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                  "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                   "name": "entity.name.scope-resolution.type.cpp"
                 },
                 {
@@ -8318,11 +8318,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -8443,7 +8443,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()|(?=(?<!\\\\)\n)",
+          "end": "(\\))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[{=,);>\\n])(?!\\()|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -8474,18 +8474,18 @@
       ]
     },
     "typedef_struct": {
-      "begin": "((?<!\\w)typedef(?!\\w))(?:\\s+)?(?=(?<!\\w)struct(?!\\w))",
+      "begin": "((?<!\\w)typedef(?!\\w))\\s+{0,1}(?=(?<!\\w)struct(?!\\w))",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.typedef.cpp"
         }
       },
-      "end": "(?<=;)|(?=(?<!\\\\)\n)",
+      "end": "(?<=;)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "patterns": [
         {
-          "begin": "((?<!\\w)struct(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+          "begin": "((?<!\\w)struct(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
           "beginCaptures": {
             "0": {
               "name": "meta.head.struct.cpp"
@@ -8520,7 +8520,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+                  "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
                 },
                 {
                   "captures": {
@@ -8563,14 +8563,14 @@
                       "name": "comment.block.cpp"
                     }
                   },
-                  "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+                  "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
                 },
                 {
                   "match": "DLLEXPORT",
                   "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
                 }
               ]
@@ -8650,7 +8650,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+          "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.statement.cpp"
@@ -8665,7 +8665,7 @@
               "begin": "\\G ?",
               "beginCaptures": {
               },
-              "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+              "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.struct.cpp"
@@ -8688,7 +8688,7 @@
               "begin": "(?<=\\{|<%|\\?\\?<)",
               "beginCaptures": {
               },
-              "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+              "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.struct.cpp"
@@ -8714,10 +8714,10 @@
               ]
             },
             {
-              "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+              "begin": "(?<=}|%>|\\?\\?>)\\s*",
               "beginCaptures": {
               },
-              "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+              "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
               },
               "name": "meta.tail.struct.cpp",
@@ -8749,11 +8749,11 @@
                               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                             }
                           },
-                          "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                          "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                           "name": "invalid.illegal.reference-type.cpp"
                         },
                         {
-                          "match": "\\&",
+                          "match": "&",
                           "name": "storage.modifier.reference.cpp"
                         }
                       ]
@@ -8810,7 +8810,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+                  "match": "(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
                 },
                 {
                   "match": ","
@@ -8822,18 +8822,18 @@
       ]
     },
     "typedef_union": {
-      "begin": "((?<!\\w)typedef(?!\\w))(?:\\s+)?(?=(?<!\\w)union(?!\\w))",
+      "begin": "((?<!\\w)typedef(?!\\w))\\s+{0,1}(?=(?<!\\w)union(?!\\w))",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.typedef.cpp"
         }
       },
-      "end": "(?<=;)|(?=(?<!\\\\)\n)",
+      "end": "(?<=;)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
       },
       "patterns": [
         {
-          "begin": "((?<!\\w)union(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+          "begin": "((?<!\\w)union(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
           "beginCaptures": {
             "0": {
               "name": "meta.head.union.cpp"
@@ -8868,7 +8868,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+                  "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
                 },
                 {
                   "captures": {
@@ -8911,14 +8911,14 @@
                       "name": "comment.block.cpp"
                     }
                   },
-                  "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+                  "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
                 },
                 {
                   "match": "DLLEXPORT",
                   "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
                 }
               ]
@@ -8998,7 +8998,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+          "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.statement.cpp"
@@ -9013,7 +9013,7 @@
               "begin": "\\G ?",
               "beginCaptures": {
               },
-              "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+              "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.union.cpp"
@@ -9036,7 +9036,7 @@
               "begin": "(?<=\\{|<%|\\?\\?<)",
               "beginCaptures": {
               },
-              "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+              "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.union.cpp"
@@ -9062,10 +9062,10 @@
               ]
             },
             {
-              "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+              "begin": "(?<=}|%>|\\?\\?>)\\s*",
               "beginCaptures": {
               },
-              "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+              "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
               "endCaptures": {
               },
               "name": "meta.tail.union.cpp",
@@ -9097,11 +9097,11 @@
                               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                             }
                           },
-                          "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                          "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                           "name": "invalid.illegal.reference-type.cpp"
                         },
                         {
-                          "match": "\\&",
+                          "match": "&",
                           "name": "storage.modifier.reference.cpp"
                         }
                       ]
@@ -9158,7 +9158,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+                  "match": "(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
                 },
                 {
                   "match": ","
@@ -9170,7 +9170,7 @@
       ]
     },
     "typeid_operator": {
-      "begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)typeid(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
@@ -9196,7 +9196,7 @@
         }
       },
       "contentName": "meta.arguments.operator.typeid",
-      "end": "\\)|(?=(?<!\\\\)\n)",
+      "end": "\\)|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp"
@@ -9209,7 +9209,7 @@
       ]
     },
     "union_block": {
-      "begin": "((?<!\\w)union(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+      "begin": "((?<!\\w)union(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
       "beginCaptures": {
         "0": {
           "name": "meta.head.union.cpp"
@@ -9244,7 +9244,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+              "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
             },
             {
               "captures": {
@@ -9287,14 +9287,14 @@
                   "name": "comment.block.cpp"
                 }
               },
-              "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+              "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
             },
             {
               "match": "DLLEXPORT",
               "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
             }
           ]
@@ -9374,7 +9374,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -9389,7 +9389,7 @@
           "begin": "\\G ?",
           "beginCaptures": {
           },
-          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+          "end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.union.cpp"
@@ -9412,7 +9412,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+          "end": "}|%>|\\?\\?>|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.union.cpp"
@@ -9438,10 +9438,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+          "end": "\\s*(?=;)|(?=(?<!\\\\)\\n)",
           "endCaptures": {
           },
           "name": "meta.tail.union.cpp",
@@ -9454,7 +9454,7 @@
       ]
     },
     "using_namespace": {
-      "begin": "(?<!\\w)(using)\\s+(namespace)\\s+((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<6>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?=;|\\n)",
+      "begin": "(?<!\\w)(using)\\s+(namespace)\\s+((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<6>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)?((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(?=[;\\n])",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.using.directive.cpp"
@@ -9485,7 +9485,7 @@
           "name": "entity.name.namespace.cpp"
         }
       },
-      "end": ";|(?=(?<!\\\\)\n)",
+      "end": ";|(?=(?<!\\\\)\\n)",
       "endCaptures": {
         "0": {
           "name": "punctuation.terminator.statement.cpp"
diff --git a/resources/languages/cpp.json b/resources/languages/cpp.json
index 2a40b56..779cdb8 100644
--- a/resources/languages/cpp.json
+++ b/resources/languages/cpp.json
@@ -114,7 +114,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -127,7 +127,7 @@
           "name": "punctuation.separator.colon.access.control.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(((?:(?:protected)|(?:private)|(?:public)))(?:\\s+)?(:))"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((p(?:rotected|rivate|ublic))\\s+{0,1}(:))"
     },
     "alignas_attribute": {
       "begin": "alignas\\(",
@@ -175,7 +175,7 @@
               "name": "entity.name.namespace.cpp"
             }
           },
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
         },
         {
           "match": ",",
@@ -186,11 +186,11 @@
           "name": "punctuation.accessor.attribute.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=::)",
           "name": "entity.name.namespace.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
           "name": "entity.other.attribute.$0.cpp"
         },
         {
@@ -202,7 +202,7 @@
       ]
     },
     "alignas_operator": {
-      "begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)alignas(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
@@ -241,7 +241,7 @@
       ]
     },
     "alignof_operator": {
-      "begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)alignof(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
@@ -280,7 +280,7 @@
       ]
     },
     "assembly": {
-      "begin": "(\\b(?:__asm__|asm)\\b)(?:\\s+)?((?:volatile)?)",
+      "begin": "(\\b(?:__asm__|asm)\\b)\\s+{0,1}((?:volatile)?)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.asm.cpp"
@@ -313,13 +313,13 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\n|$)"
+          "match": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\n|$)"
         },
         {
           "include": "#comments"
         },
         {
-          "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\(",
+          "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.parens.begin.bracket.round.assembly.cpp"
@@ -444,7 +444,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\[((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]"
+              "match": "\\[((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]"
             },
             {
               "match": ":",
@@ -458,7 +458,7 @@
       ]
     },
     "assignment_operator": {
-      "match": "\\=",
+      "match": "=",
       "name": "keyword.operator.assignment.cpp"
     },
     "attributes_context": {
@@ -478,11 +478,11 @@
       ]
     },
     "backslash_escapes": {
-      "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3][0-7]{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+      "match": "\\\\([\\\\abefnprtv'\"?]|[0-3][0-7]{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
       "name": "constant.character.escape"
     },
     "block": {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.block.begin.bracket.curly.cpp"
@@ -502,13 +502,13 @@
       ]
     },
     "block_comment": {
-      "begin": "\\s*+(\\/\\*)",
+      "begin": "\\s*+(/\\*)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.begin.cpp"
         }
       },
-      "end": "\\*\\/",
+      "end": "\\*/",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.cpp"
@@ -517,7 +517,7 @@
       "name": "comment.block.cpp"
     },
     "builtin_storage_type_initilizer": {
-      "begin": "\\s*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_]\\w*_t))(?!\\w)\\s*+(?<!\\w)(\\()",
+      "begin": "\\s*+(?<!\\w)(?:(?:(?:((?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int))|((?:uint_least32_t|uint_least64_t|uint_least16_t|uint_fast64_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|uint_fast16_t|uint_fast32_t|int_least8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintmax_t|in_port_t|uintmax_t|in_addr_t|blksize_t|uintptr_t|intmax_t|intptr_t|blkcnt_t|intmax_t|u_quad_t|uint16_t|uint32_t|uint64_t|ssize_t|fixpt_t|qaddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|daddr_t|caddr_t|swblk_t|clock_t|segsz_t|nlink_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)))|(pthread_(?:rwlockattr_t|mutexattr_t|condattr_t|rwlock_t|mutex_t|cond_t|attr_t|once_t|key_t|t)))|([a-zA-Z_]\\w*_t))(?!\\w)\\s*+(?<!\\w)(\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
@@ -548,7 +548,7 @@
       ]
     },
     "case_statement": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)case(?!\\w))",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)case(?!\\w))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -584,7 +584,7 @@
       ]
     },
     "class_block": {
-      "begin": "((?<!\\w)class(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+      "begin": "((?<!\\w)class(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
       "beginCaptures": {
         "0": {
           "name": "meta.head.class.cpp"
@@ -619,7 +619,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+              "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
             },
             {
               "captures": {
@@ -662,14 +662,14 @@
                   "name": "comment.block.cpp"
                 }
               },
-              "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+              "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
             },
             {
               "match": "DLLEXPORT",
               "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
             }
           ]
@@ -749,7 +749,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -787,7 +787,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.class.cpp"
@@ -813,10 +813,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.class.cpp",
@@ -854,7 +854,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -882,7 +882,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -907,7 +907,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -939,11 +939,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -969,7 +969,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -994,12 +994,12 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "((?<!\\w)class(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
+      "match": "((?<!\\w)class(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
     },
     "comma": {
       "match": ",",
@@ -1012,7 +1012,7 @@
     "comments": {
       "patterns": [
         {
-          "begin": "^(?:\\s+)?+(\\/\\/[!\\/]+)",
+          "begin": "^\\s+{1,0}(//[!/]+)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.documentation.cpp"
@@ -1027,7 +1027,7 @@
               "include": "#line_continuation_character"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -1039,7 +1039,7 @@
                   "name": "markup.italic.doxygen.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
             },
             {
               "captures": {
@@ -1050,7 +1050,7 @@
                   "name": "markup.bold.doxygen.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
             },
             {
               "captures": {
@@ -1061,14 +1061,14 @@
                   "name": "markup.inline.raw.string.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -1087,7 +1087,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                      "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                       "name": "variable.parameter.cpp"
                     },
                     {
@@ -1106,14 +1106,14 @@
                   "name": "variable.parameter.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:\\s+)?(?:in|out)(?:\\s+)?)+)\\])?(\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(,)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))*)"
+              "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s+{0,1}(?:in|out)\\s+{0,1})+)])?(\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(?:(,)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))*)"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -1130,7 +1130,7 @@
             "2": {
               "patterns": [
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
@@ -1142,7 +1142,7 @@
                       "name": "markup.italic.doxygen.cpp"
                     }
                   },
-                  "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+                  "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
                 },
                 {
                   "captures": {
@@ -1153,7 +1153,7 @@
                       "name": "markup.bold.doxygen.cpp"
                     }
                   },
-                  "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+                  "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
                 },
                 {
                   "captures": {
@@ -1164,14 +1164,14 @@
                       "name": "markup.inline.raw.string.cpp"
                     }
                   },
-                  "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+                  "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
                 },
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
@@ -1190,7 +1190,7 @@
                     "3": {
                       "patterns": [
                         {
-                          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                           "name": "variable.parameter.cpp"
                         },
                         {
@@ -1209,14 +1209,14 @@
                       "name": "variable.parameter.cpp"
                     }
                   },
-                  "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:\\s+)?(?:in|out)(?:\\s+)?)+)\\])?(\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(,)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))*)"
+                  "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s+{0,1}(?:in|out)\\s+{0,1})+)])?(\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(?:(,)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))*)"
                 },
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
-                  "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+                  "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
                   "name": "storage.type.class.doxygen.cpp"
                 },
                 {
@@ -1229,17 +1229,17 @@
               "name": "punctuation.definition.comment.end.documentation.cpp"
             }
           },
-          "match": "(\\/\\*[!*]+(?=\\s))(.+)([!*]*\\*\\/)",
+          "match": "(/\\*[!*]+(?=\\s))(.+)([!*]*\\*/)",
           "name": "comment.block.documentation.cpp"
         },
         {
-          "begin": "(?:\\s+)?+\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s))",
+          "begin": "\\s+{1,0}/\\*[!*]+(?:(?:\\n|$)|(?=\\s))",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.documentation.cpp"
             }
           },
-          "end": "[!*]*\\*\\/",
+          "end": "[!*]*\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.documentation.cpp"
@@ -1248,7 +1248,7 @@
           "name": "comment.block.documentation.cpp",
           "patterns": [
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -1260,7 +1260,7 @@
                   "name": "markup.italic.doxygen.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
             },
             {
               "captures": {
@@ -1271,7 +1271,7 @@
                   "name": "markup.bold.doxygen.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
             },
             {
               "captures": {
@@ -1282,14 +1282,14 @@
                   "name": "markup.inline.raw.string.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+              "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -1308,7 +1308,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                      "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                       "name": "variable.parameter.cpp"
                     },
                     {
@@ -1327,14 +1327,14 @@
                   "name": "variable.parameter.cpp"
                 }
               },
-              "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:\\s+)?(?:in|out)(?:\\s+)?)+)\\])?(\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:(,)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))*)"
+              "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s+{0,1}(?:in|out)\\s+{0,1})+)])?(\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(?:(,)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))*)"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|throws|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
-              "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+              "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|startuml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
               "name": "storage.type.class.doxygen.cpp"
             },
             {
@@ -1358,7 +1358,7 @@
       ]
     },
     "constructor_inline": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*)((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\())",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:constexpr|consteval|explicit|mutable|virtual|inline|friend)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*)((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=\\())",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.constructor.cpp"
@@ -1425,7 +1425,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.constructor.cpp",
@@ -1473,7 +1473,7 @@
                   "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "include": "#functional_specifiers_pre_parameters"
@@ -1490,7 +1490,7 @@
               },
               "patterns": [
                 {
-                  "begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(\\()",
+                  "begin": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(\\()",
                   "beginCaptures": {
                     "1": {
                       "name": "entity.name.function.call.initializer.cpp"
@@ -1532,7 +1532,7 @@
                   ]
                 },
                 {
-                  "begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\{)",
+                  "begin": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(\\{)",
                   "beginCaptures": {
                     "1": {
                       "name": "entity.name.function.call.initializer.cpp"
@@ -1542,7 +1542,7 @@
                     }
                   },
                   "contentName": "meta.parameter.initialization",
-                  "end": "\\}",
+                  "end": "}",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
@@ -1598,7 +1598,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
@@ -1612,10 +1612,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.constructor.cpp",
@@ -1628,7 +1628,7 @@
       ]
     },
     "constructor_root": {
-      "begin": "\\s*+((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<8>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))::((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\10)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\())",
+      "begin": "\\s*+((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<8>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))::((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\10((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\())",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.constructor.cpp"
@@ -1709,7 +1709,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.constructor.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.constructor.cpp"
             },
             {
@@ -1729,11 +1729,11 @@
         "9": {
           "patterns": [
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?=:)",
               "name": "entity.name.type.constructor.cpp"
             },
             {
-              "match": "(?<=:)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?<=:)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.function.definition.special.constructor.cpp"
             },
             {
@@ -1743,7 +1743,7 @@
           ]
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.constructor.cpp",
@@ -1791,7 +1791,7 @@
                   "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "include": "#functional_specifiers_pre_parameters"
@@ -1808,7 +1808,7 @@
               },
               "patterns": [
                 {
-                  "begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(\\()",
+                  "begin": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(\\()",
                   "beginCaptures": {
                     "1": {
                       "name": "entity.name.function.call.initializer.cpp"
@@ -1850,7 +1850,7 @@
                   ]
                 },
                 {
-                  "begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\{)",
+                  "begin": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(\\{)",
                   "beginCaptures": {
                     "1": {
                       "name": "entity.name.function.call.initializer.cpp"
@@ -1860,7 +1860,7 @@
                     }
                   },
                   "contentName": "meta.parameter.initialization",
-                  "end": "\\}",
+                  "end": "}",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
@@ -1916,7 +1916,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
@@ -1930,10 +1930,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.constructor.cpp",
@@ -1968,7 +1968,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -1976,7 +1976,7 @@
           "name": "keyword.control.$3.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:(?:co_return)|(?:co_yield)|(?:co_await)|(?:continue)|(?:default)|(?:switch)|(?:return)|(?:catch)|(?:while)|(?:throw)|(?:break)|(?:case)|(?:goto)|(?:else)|(?:for)|(?:try)|(?:if)|(?:do))(?!\\w))"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:co_return|co_yield|co_await|continue|default|switch|return|catch|while|throw|break|case|goto|else|for|try|if|do)(?!\\w))"
     },
     "cpp_attributes": {
       "begin": "\\[\\[",
@@ -1985,7 +1985,7 @@
           "name": "punctuation.section.attribute.begin.cpp"
         }
       },
-      "end": "\\]\\]",
+      "end": "]]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.attribute.end.cpp"
@@ -2024,7 +2024,7 @@
               "name": "entity.name.namespace.cpp"
             }
           },
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
         },
         {
           "match": ",",
@@ -2035,11 +2035,11 @@
           "name": "punctuation.accessor.attribute.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=::)",
           "name": "entity.name.namespace.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
           "name": "entity.other.attribute.$0.cpp"
         },
         {
@@ -2051,7 +2051,7 @@
       ]
     },
     "curly_initializer": {
-      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\{)",
+      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\{)",
       "beginCaptures": {
         "1": {
           "name": "meta.qualified_type.cpp",
@@ -2061,7 +2061,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -2103,7 +2103,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -2118,7 +2118,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -2212,7 +2212,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.arguments.end.bracket.curly.initializer.cpp"
@@ -2267,7 +2267,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -2295,7 +2295,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -2320,7 +2320,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -2338,7 +2338,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -2363,7 +2363,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -2403,12 +2403,12 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((import))(?:\\s+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=\\/\\/)))|((\\\")[^\\\"]*(\\\"?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=\\/\\/))))|(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=(?:\\/\\/|;)))))|((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=(?:\\/\\/|;))))(?:\\s+)?(;?)",
+      "match": "^((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((import))\\s+{0,1}(?:(?:(?:((<)[^>]*(>?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:\\n|$)|(?=//)))|((\")[^\"]*(\"?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:\\n|$)|(?=//))))|(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?:\\.(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)*((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:\\n|$)|(?=(?://|;)))))|((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:\\n|$)|(?=(?://|;))))\\s+{0,1}(;?)",
       "name": "meta.preprocessor.import.cpp"
     },
     "d9bc4796b0b_preprocessor_number_literal": {
@@ -2432,7 +2432,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2444,7 +2444,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2459,7 +2459,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2477,7 +2477,7 @@
                       "name": "keyword.operator.minus.exponent.hexadecimal.cpp"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([pP])(\\+?)(\\-?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?(?:(?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -2485,7 +2485,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2503,7 +2503,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2524,13 +2524,13 @@
                       "name": "constant.numeric.exponent.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
                     }
                   },
-                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([eE])(\\+?)(\\-?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$"
+                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -2541,7 +2541,7 @@
                       "name": "constant.numeric.binary.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2553,7 +2553,7 @@
                       "name": "keyword.other.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
                     }
                   },
-                  "match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -2564,7 +2564,7 @@
                       "name": "constant.numeric.octal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2576,7 +2576,7 @@
                       "name": "keyword.other.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
                     }
                   },
-                  "match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -2587,7 +2587,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2608,7 +2608,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2617,7 +2617,7 @@
                       "name": "keyword.other.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([pP])(\\+?)(\\-?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)(?:(?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -2625,7 +2625,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2646,7 +2646,7 @@
                       "name": "constant.numeric.exponent.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -2655,10 +2655,10 @@
                       "name": "keyword.other.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
                     }
                   },
-                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([eE])(\\+?)(\\-?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?$"
                 },
                 {
-                  "match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])+",
                   "name": "invalid.illegal.constant.numeric.cpp"
                 }
               ]
@@ -2666,10 +2666,10 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])*"
     },
     "decltype": {
-      "begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)decltype(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
@@ -2708,7 +2708,7 @@
       ]
     },
     "decltype_specifier": {
-      "begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)decltype(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
@@ -2747,7 +2747,7 @@
       ]
     },
     "default_statement": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)default(?!\\w))",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)default(?!\\w))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -2783,7 +2783,7 @@
       ]
     },
     "destructor_inline": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*)(~(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\())",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:constexpr|consteval|explicit|mutable|virtual|inline|friend)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*)(~(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=\\())",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.member.destructor.cpp"
@@ -2850,7 +2850,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.member.destructor.cpp",
@@ -2898,7 +2898,7 @@
                   "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp keyword.other.delete.destructor.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "begin": "\\(",
@@ -2929,7 +2929,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
@@ -2943,10 +2943,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.member.destructor.cpp",
@@ -2959,7 +2959,7 @@
       ]
     },
     "destructor_root": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))::((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))~(?:\\14)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\())",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(((?>(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))::((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))~\\14((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\())",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.member.destructor.cpp"
@@ -2978,7 +2978,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.destructor.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.destructor.cpp"
             },
             {
@@ -2998,11 +2998,11 @@
         "13": {
           "patterns": [
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?=:)",
               "name": "entity.name.type.destructor.cpp"
             },
             {
-              "match": "(?<=:)~(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?<=:)~(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.function.definition.special.member.destructor.cpp"
             },
             {
@@ -3090,7 +3090,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.member.destructor.cpp",
@@ -3138,7 +3138,7 @@
                   "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp keyword.other.delete.destructor.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "begin": "\\(",
@@ -3169,7 +3169,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
@@ -3183,10 +3183,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.member.destructor.cpp",
@@ -3199,7 +3199,7 @@
       ]
     },
     "diagnostic": {
-      "begin": "(^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?((?:error|warning)))\\b(?:\\s+)?",
+      "begin": "(^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}((?:error|warning)))\\b\\s+{0,1}",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.diagnostic.$7.cpp"
@@ -3320,14 +3320,14 @@
           "name": "meta.banner.character.cpp"
         }
       },
-      "match": "(?:(^(?:\\s+)?((\\/\\/)(?:\\s+)?((?:[#;\\/=*C~]+)++(?![#;\\/=*C~]))(?:\\s+)?.+(?:\\s+)?(?:\\4)(?:\\s+)?(?:\\n|$)))|(^(?:\\s+)?((\\/\\*)(?:\\s+)?((?:[#;\\/=*C~]+)++(?![#;\\/=*C~]))(?:\\s+)?.+(?:\\s+)?(?:\\8)(?:\\s+)?\\*\\/)))"
+      "match": "(?:(^\\s+{0,1}((//)\\s+{0,1}([#;/=*C~]++(?![#;/=*C~]))\\s+{0,1}.+\\s+{0,1}\\4\\s+{0,1}(?:\\n|$)))|(^\\s+{0,1}((/\\*)\\s+{0,1}([#;/=*C~]++(?![#;/=*C~]))\\s+{0,1}.+\\s+{0,1}\\8\\s+{0,1}\\*/)))"
     },
     "empty_square_brackets": {
-      "match": "(?<!delete)\\[(?:\\s+)?\\]",
+      "match": "(?<!delete)\\[\\s+{0,1}]",
       "name": "storage.modifier.array.bracket.square"
     },
     "enum_block": {
-      "begin": "((?<!\\w)enum(?!\\w))(?:\\s+(class|struct))?(?:(?:\\s+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:\\s+)?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:(?:\\s+)?(:)(?:\\s+)?(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::))?(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))?",
+      "begin": "((?<!\\w)enum(?!\\w))(?:\\s+(class|struct))?(?:(?:\\s+|((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?=\\{))\\s+{0,1}((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)(?:\\s+{0,1}(:)\\s+{0,1}(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::))?\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))?",
       "beginCaptures": {
         "0": {
           "name": "meta.head.enum.cpp"
@@ -3402,7 +3402,7 @@
         "9": {
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -3434,7 +3434,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.enum.cpp"
@@ -3460,10 +3460,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.enum.cpp",
@@ -3501,7 +3501,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -3529,7 +3529,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -3554,7 +3554,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -3586,11 +3586,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -3616,7 +3616,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -3641,12 +3641,12 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "((?<!\\w)enum(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
+      "match": "((?<!\\w)enum(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
     },
     "enumerator_list": {
       "captures": {
@@ -3684,7 +3684,7 @@
           ]
         }
       },
-      "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:\\s+)?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:\\s+)?(?:(\\=)(?:\\s+)?(.+?)(?:\\s+)?)?(?:(?:((?:[,;](?!')|\\n))|(?=\\}[^']))|(?=(?:\\/\\/|\\/\\*)))",
+      "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s+{0,1}((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s+{0,1}(?:(=)\\s+{0,1}(.+?)\\s+{0,1})?(?:(?:((?:[,;](?!')|\\n))|(?=}[^']))|(?=/[/*]))",
       "name": "meta.enum.definition.cpp"
     },
     "evaluation_context": {
@@ -3835,7 +3835,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -3843,10 +3843,10 @@
           "name": "keyword.control.exception.$3.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:(?:throw)|(?:catch)|(?:try))(?!\\w))"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:throw|catch|try)(?!\\w))"
     },
     "extern_block": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(extern)(?=\\s*\\\")",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(extern)(?=\\s*\")",
       "beginCaptures": {
         "0": {
           "name": "meta.head.extern.cpp"
@@ -3871,7 +3871,7 @@
           "name": "storage.type.extern.cpp"
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -3903,7 +3903,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.extern.cpp"
@@ -3917,10 +3917,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.extern.cpp",
@@ -4009,7 +4009,7 @@
       ]
     },
     "function_call": {
-      "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<11>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Wuint_least8_t|^uint_least8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wsynchronized|^synchronized|\\Wuint_fast8_t|^uint_fast8_t|\\Wdynamic_cast|^dynamic_cast|\\Wint_least8_t|^int_least8_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wsuseconds_t|^suseconds_t|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wconstinit|^constinit|\\Wco_return|^co_return|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wtemplate|^template|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wexplicit|^explicit|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Woperator|^operator|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wrequires|^requires|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wreflexpr|^reflexpr|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wssize_t|^ssize_t|\\Wconcept|^concept|\\Wmutable|^mutable|\\Wfixpt_t|^fixpt_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wtypedef|^typedef|\\Wdaddr_t|^daddr_t|\\Wcaddr_t|^caddr_t|\\Wqaddr_t|^qaddr_t|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wsegsz_t|^segsz_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\W__asm__|^__asm__|\\Walignas|^alignas|\\Walignof|^alignof|\\Wmutable|^mutable|\\Wnullptr|^nullptr|\\Wclock_t|^clock_t|\\Wmode_t|^mode_t|\\Wpublic|^public|\\Wsize_t|^size_t|\\Wdouble|^double|\\Wquad_t|^quad_t|\\Wstatic|^static|\\Wtime_t|^time_t|\\Wmodule|^module|\\Wimport|^import|\\Wexport|^export|\\Wextern|^extern|\\Winline|^inline|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wreturn|^return|\\Wfriend|^friend|\\Wnot_eq|^not_eq|\\Wsigned|^signed|\\Wstruct|^struct|\\Wint8_t|^int8_t|\\Wushort|^ushort|\\Wswitch|^switch|\\Wu_long|^u_long|\\Wtypeid|^typeid|\\Wu_char|^u_char|\\Wsizeof|^sizeof|\\Wbitand|^bitand|\\Wdelete|^delete|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wuid_t|^uid_t|\\Wshort|^short|\\Wbreak|^break|\\Wcatch|^catch|\\Wcompl|^compl|\\Wwhile|^while|\\Wfalse|^false|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wconst|^const|\\Wthrow|^throw|\\Wbitor|^bitor|\\Wu_int|^u_int|\\Wusing|^using|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wgid_t|^gid_t|\\Wfloat|^float|\\Wlong|^long|\\Wgoto|^goto|\\Wuint|^uint|\\Wid_t|^id_t|\\Wcase|^case|\\Wauto|^auto|\\Wvoid|^void|\\Wenum|^enum|\\Wtrue|^true|\\Wchar|^char|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wthis|^this|\\Wbool|^bool|\\Welse|^else|\\Wfor|^for|\\Wnew|^new|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wasm|^asm|\\Wint|^int|\\Wtry|^try|\\Wdo|^do|\\Wif|^if|\\Wor|^or)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<11>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(\\()",
+      "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<11>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\b(?<!(?:\\W|^)(?:reinterpret_cast|atomic_noexcept|uint_least16_t|uint_least32_t|uint_least64_t|atomic_cancel|atomic_commit|uint_least8_t|uint_fast16_t|uint_fast32_t|int_least16_t|int_least32_t|int_least64_t|uint_fast64_t|thread_local|int_fast16_t|int_fast32_t|int_fast64_t|synchronized|uint_fast8_t|dynamic_cast|int_least8_t|int_fast8_t|static_cast|suseconds_t|const_cast|useconds_t|constinit|co_return|uintmax_t|uintmax_t|uintmax_t|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|blksize_t|co_return|in_addr_t|in_port_t|uintptr_t|template|noexcept|noexcept|continue|co_await|co_yield|unsigned|u_quad_t|blkcnt_t|uint16_t|uint32_t|uint64_t|intptr_t|intmax_t|intmax_t|volatile|register|restrict|explicit|volatile|noexcept|operator|decltype|typename|requires|co_await|co_yield|reflexpr|swblk_t|virtual|ssize_t|concept|mutable|fixpt_t|int16_t|int32_t|int64_t|uint8_t|typedef|daddr_t|caddr_t|qaddr_t|default|nlink_t|segsz_t|u_short|wchar_t|private|__asm__|alignas|alignof|mutable|nullptr|clock_t|mode_t|public|size_t|double|quad_t|static|time_t|module|import|export|extern|inline|xor_eq|and_eq|return|friend|not_eq|signed|struct|int8_t|ushort|switch|u_long|typeid|u_char|sizeof|bitand|delete|ino_t|key_t|pid_t|off_t|uid_t|short|break|catch|compl|while|false|class|union|const|or_eq|const|throw|bitor|u_int|using|div_t|dev_t|gid_t|float|long|goto|uint|id_t|case|auto|void|enum|true|char|id_t|NULL|this|bool|else|for|new|not|xor|and|asm|int|try|do|if|or))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<11>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -4085,7 +4085,7 @@
       ]
     },
     "function_definition": {
-      "begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>|\\*\\/))\\s*+(?:((?<!\\w)template(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?<!\\w)(?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<52>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<52>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<52>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Wuint_least8_t|^uint_least8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wsynchronized|^synchronized|\\Wuint_fast8_t|^uint_fast8_t|\\Wdynamic_cast|^dynamic_cast|\\Wint_least8_t|^int_least8_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wsuseconds_t|^suseconds_t|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wconstinit|^constinit|\\Wco_return|^co_return|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wtemplate|^template|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wexplicit|^explicit|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Woperator|^operator|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wrequires|^requires|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wreflexpr|^reflexpr|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wssize_t|^ssize_t|\\Wconcept|^concept|\\Wmutable|^mutable|\\Wfixpt_t|^fixpt_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wtypedef|^typedef|\\Wdaddr_t|^daddr_t|\\Wcaddr_t|^caddr_t|\\Wqaddr_t|^qaddr_t|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wsegsz_t|^segsz_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\W__asm__|^__asm__|\\Walignas|^alignas|\\Walignof|^alignof|\\Wmutable|^mutable|\\Wnullptr|^nullptr|\\Wclock_t|^clock_t|\\Wmode_t|^mode_t|\\Wpublic|^public|\\Wsize_t|^size_t|\\Wdouble|^double|\\Wquad_t|^quad_t|\\Wstatic|^static|\\Wtime_t|^time_t|\\Wmodule|^module|\\Wimport|^import|\\Wexport|^export|\\Wextern|^extern|\\Winline|^inline|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wreturn|^return|\\Wfriend|^friend|\\Wnot_eq|^not_eq|\\Wsigned|^signed|\\Wstruct|^struct|\\Wint8_t|^int8_t|\\Wushort|^ushort|\\Wswitch|^switch|\\Wu_long|^u_long|\\Wtypeid|^typeid|\\Wu_char|^u_char|\\Wsizeof|^sizeof|\\Wbitand|^bitand|\\Wdelete|^delete|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wuid_t|^uid_t|\\Wshort|^short|\\Wbreak|^break|\\Wcatch|^catch|\\Wcompl|^compl|\\Wwhile|^while|\\Wfalse|^false|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wconst|^const|\\Wthrow|^throw|\\Wbitor|^bitor|\\Wu_int|^u_int|\\Wusing|^using|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wgid_t|^gid_t|\\Wfloat|^float|\\Wlong|^long|\\Wgoto|^goto|\\Wuint|^uint|\\Wid_t|^id_t|\\Wcase|^case|\\Wauto|^auto|\\Wvoid|^void|\\Wenum|^enum|\\Wtrue|^true|\\Wchar|^char|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wthis|^this|\\Wbool|^bool|\\Welse|^else|\\Wfor|^for|\\Wnew|^new|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wasm|^asm|\\Wint|^int|\\Wtry|^try|\\Wdo|^do|\\Wif|^if|\\Wor|^or)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\()",
+      "begin": "(?:(?:^|\\G|(?<=[;}]))|(?<=>|\\*/))\\s*+(?:((?<!\\w)template(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?<!\\w)(?:(?:constexpr|consteval|explicit|mutable|virtual|inline|friend)|(?:thread_local|volatile|register|restrict|static|extern|const))(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*)(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<52>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<52>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<52>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\b(?<!(?:\\W|^)(?:reinterpret_cast|atomic_noexcept|uint_least16_t|uint_least32_t|uint_least64_t|atomic_cancel|atomic_commit|uint_least8_t|uint_fast16_t|uint_fast32_t|int_least16_t|int_least32_t|int_least64_t|uint_fast64_t|thread_local|int_fast16_t|int_fast32_t|int_fast64_t|synchronized|uint_fast8_t|dynamic_cast|int_least8_t|int_fast8_t|static_cast|suseconds_t|const_cast|useconds_t|constinit|co_return|uintmax_t|uintmax_t|uintmax_t|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|blksize_t|co_return|in_addr_t|in_port_t|uintptr_t|template|noexcept|noexcept|continue|co_await|co_yield|unsigned|u_quad_t|blkcnt_t|uint16_t|uint32_t|uint64_t|intptr_t|intmax_t|intmax_t|volatile|register|restrict|explicit|volatile|noexcept|operator|decltype|typename|requires|co_await|co_yield|reflexpr|swblk_t|virtual|ssize_t|concept|mutable|fixpt_t|int16_t|int32_t|int64_t|uint8_t|typedef|daddr_t|caddr_t|qaddr_t|default|nlink_t|segsz_t|u_short|wchar_t|private|__asm__|alignas|alignof|mutable|nullptr|clock_t|mode_t|public|size_t|double|quad_t|static|time_t|module|import|export|extern|inline|xor_eq|and_eq|return|friend|not_eq|signed|struct|int8_t|ushort|switch|u_long|typeid|u_char|sizeof|bitand|delete|ino_t|key_t|pid_t|off_t|uid_t|short|break|catch|compl|while|false|class|union|const|or_eq|const|throw|bitor|u_int|using|div_t|dev_t|gid_t|float|long|goto|uint|id_t|case|auto|void|enum|true|char|id_t|NULL|this|bool|else|for|new|not|xor|and|asm|int|try|do|if|or))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\()",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.cpp"
@@ -4110,7 +4110,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -4152,7 +4152,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -4213,7 +4213,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -4276,11 +4276,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -4430,7 +4430,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "((?<!\\w)(?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+              "match": "((?<!\\w)(?:(?:constexpr|consteval|explicit|mutable|virtual|inline|friend)|(?:thread_local|volatile|register|restrict|static|extern|const))(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
             }
           ]
         },
@@ -4445,7 +4445,7 @@
           ]
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "endCaptures": {
       },
       "name": "meta.function.definition.cpp",
@@ -4528,7 +4528,7 @@
                       "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
                     },
                     {
-                      "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                      "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                       "name": "entity.name.scope-resolution.type.cpp"
                     },
                     {
@@ -4587,7 +4587,7 @@
                       "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
                     },
                     {
-                      "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+                      "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
                       "name": "storage.type.$0.cpp"
                     },
                     {
@@ -4629,7 +4629,7 @@
                       ]
                     },
                     {
-                      "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                      "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                       "name": "entity.name.type.cpp"
                     }
                   ]
@@ -4655,7 +4655,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
                 }
               },
-              "match": "(?<=^|\\))(?:\\s+)?(->)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<23>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<23>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))"
+              "match": "(?<=^|\\))\\s+{0,1}(->)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<23>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<23>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))"
             },
             {
               "include": "$self"
@@ -4666,7 +4666,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.cpp"
@@ -4680,10 +4680,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.cpp",
@@ -4709,7 +4709,7 @@
       ]
     },
     "function_pointer": {
-      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(?:(\\[)(\\w*)(\\])(?:\\s+)?)*(\\))(?:\\s+)?(\\()",
+      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()(\\*)\\s+{0,1}((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)?)\\s+{0,1}(?:(\\[)(\\w*)(])\\s+{0,1})*(\\))\\s+{0,1}(\\()",
       "beginCaptures": {
         "1": {
           "name": "meta.qualified_type.cpp",
@@ -4719,7 +4719,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -4761,7 +4761,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -4776,7 +4776,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -4836,11 +4836,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -4961,7 +4961,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()",
+      "end": "(\\))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[{=,);>\\n])(?!\\()",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -4990,7 +4990,7 @@
       ]
     },
     "function_pointer_parameter": {
-      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(?:(\\[)(\\w*)(\\])(?:\\s+)?)*(\\))(?:\\s+)?(\\()",
+      "begin": "(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()(\\*)\\s+{0,1}((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)?)\\s+{0,1}(?:(\\[)(\\w*)(])\\s+{0,1})*(\\))\\s+{0,1}(\\()",
       "beginCaptures": {
         "1": {
           "name": "meta.qualified_type.cpp",
@@ -5000,7 +5000,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -5042,7 +5042,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -5057,7 +5057,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -5117,11 +5117,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -5242,7 +5242,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()",
+      "end": "(\\))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[{=,);>\\n])(?!\\()",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -5271,7 +5271,7 @@
       ]
     },
     "functional_specifiers_pre_parameters": {
-      "match": "(?<!\\w)(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))(?!\\w)",
+      "match": "(?<!\\w)(?:constexpr|consteval|explicit|mutable|virtual|inline|friend)(?!\\w)",
       "name": "storage.modifier.specifier.functional.pre-parameters.$0.cpp"
     },
     "gcc_attributes": {
@@ -5320,7 +5320,7 @@
               "name": "entity.name.namespace.cpp"
             }
           },
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
         },
         {
           "match": ",",
@@ -5331,11 +5331,11 @@
           "name": "punctuation.accessor.attribute.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=::)",
           "name": "entity.name.namespace.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
           "name": "entity.other.attribute.$0.cpp"
         },
         {
@@ -5369,7 +5369,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5397,7 +5397,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5405,10 +5405,10 @@
           "name": "entity.name.label.call.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)goto(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)goto(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)"
     },
     "identifier": {
-      "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*"
+      "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*"
     },
     "include": {
       "captures": {
@@ -5433,7 +5433,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5467,7 +5467,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5495,7 +5495,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5520,7 +5520,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5538,7 +5538,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5563,7 +5563,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5590,7 +5590,7 @@
           ]
         }
       },
-      "match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((#)(?:\\s+)?((?:include|include_next))\\b)(?:\\s+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=\\/\\/)))|((\\\")[^\\\"]*(\\\"?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=\\/\\/))))|(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=(?:\\/\\/|;)))))|((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=(?:\\/\\/|;))))",
+      "match": "^((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((#)\\s+{0,1}(include(?:|_next))\\b)\\s+{0,1}(?:(?:(?:((<)[^>]*(>?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:\\n|$)|(?=//)))|((\")[^\"]*(\"?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:\\n|$)|(?=//))))|(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?:\\.(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)*((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:\\n|$)|(?=(?://|;)))))|((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:\\n|$)|(?=(?://|;))))",
       "name": "meta.preprocessor.include.cpp"
     },
     "inheritance_context": {
@@ -5603,7 +5603,7 @@
           "name": "punctuation.separator.delimiter.comma.inheritance.cpp"
         },
         {
-          "match": "(?<!\\w)(?:(?:protected)|(?:private)|(?:public))(?!\\w)",
+          "match": "(?<!\\w)p(?:rotected|rivate|ublic)(?!\\w)",
           "name": "storage.type.modifier.access.$0.cpp"
         },
         {
@@ -5620,7 +5620,7 @@
                   "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
                 },
                 {
-                  "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+                  "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
                   "name": "storage.type.$0.cpp"
                 },
                 {
@@ -5662,7 +5662,7 @@
                   ]
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.type.cpp"
                 }
               ]
@@ -5688,7 +5688,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -5725,7 +5725,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -5750,7 +5750,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -5761,7 +5761,7 @@
                   "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
                 },
                 {
-                  "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                  "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                   "name": "entity.name.scope-resolution.type.cpp"
                 },
                 {
@@ -5779,7 +5779,7 @@
             "9": {
             }
           },
-          "match": "(?<=protected|virtual|private|public|,|:)(?:\\s+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))"
+          "match": "(?<=protected|virtual|private|public|[,:])\\s+{0,1}(?!(?:p(?:rotected|rivate|ublic)|virtual))(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))"
         }
       ]
     },
@@ -5798,7 +5798,7 @@
           "name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
         }
       },
-      "match": "\\s*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_]\\w*_t))(?!\\w)"
+      "match": "\\s*+(?<!\\w)(?:(?:(?:((?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int))|((?:uint_least32_t|uint_least64_t|uint_least16_t|uint_fast64_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|uint_fast16_t|uint_fast32_t|int_least8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintmax_t|in_port_t|uintmax_t|in_addr_t|blksize_t|uintptr_t|intmax_t|intptr_t|blkcnt_t|intmax_t|u_quad_t|uint16_t|uint32_t|uint64_t|ssize_t|fixpt_t|qaddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|daddr_t|caddr_t|swblk_t|clock_t|segsz_t|nlink_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)))|(pthread_(?:rwlockattr_t|mutexattr_t|condattr_t|rwlock_t|mutex_t|cond_t|attr_t|once_t|key_t|t)))|([a-zA-Z_]\\w*_t))(?!\\w)"
     },
     "inline_comment": {
       "captures": {
@@ -5812,10 +5812,10 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "match": "(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))"
+      "match": "(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))"
     },
     "invalid_comment_end": {
-      "match": "\\*\\/",
+      "match": "\\*/",
       "name": "invalid.illegal.unexpected.punctuation.definition.comment.end.cpp"
     },
     "label": {
@@ -5841,7 +5841,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5869,7 +5869,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -5877,10 +5877,10 @@
           "name": "punctuation.separator.label.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\b(?<!case|default)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:)"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\b(?<!case|default)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:)"
     },
     "lambdas": {
-      "begin": "(?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[\\*&\">])|(?<=\\Wreturn|^return))(?:\\s+)?(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?:[^\\[\\]]*+\\g<3>?)++\\]))*+)(\\](?!((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))[\\[\\];=]))",
+      "begin": "(?:(?<=\\S|^)(?<![\\w\\])\\[*\\&\">])|(?<=\\Wreturn|^return))\\s+{0,1}(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?:[^\\[\\]]*+\\g<3>?)++]))*+)(](?!((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))[\\[\\];=]))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.capture.begin.lambda.cpp"
@@ -5919,7 +5919,7 @@
                   "name": "keyword.operator.assignment.cpp"
                 }
               },
-              "match": "((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))"
+              "match": "((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?=]|\\z|$)|(,))|(=))"
             },
             {
               "include": "#evaluation_context"
@@ -5973,7 +5973,7 @@
           ]
         },
         {
-          "match": "(?<!\\w)(?:(?:constexpr)|(?:consteval)|(?:mutable))(?!\\w)",
+          "match": "(?<!\\w)(?:constexpr|consteval|mutable)(?!\\w)",
           "name": "storage.modifier.lambda.$0.cpp"
         },
         {
@@ -6003,7 +6003,7 @@
               "name": "punctuation.section.block.begin.bracket.curly.lambda.cpp"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.lambda.cpp"
@@ -6019,11 +6019,11 @@
       ]
     },
     "language_constants": {
-      "match": "(?<!\\w)(?:(?:nullptr)|(?:false)|(?:NULL)|(?:true))(?!\\w)",
+      "match": "(?<!\\w)(?:nullptr|false|NULL|true)(?!\\w)",
       "name": "constant.language.$0.cpp"
     },
     "line": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?line\\b",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}line\\b",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.directive.line.cpp"
@@ -6065,7 +6065,7 @@
       ]
     },
     "line_comment": {
-      "begin": "\\s*+(\\/\\/)",
+      "begin": "\\s*+(//)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.cpp"
@@ -6086,7 +6086,7 @@
       "name": "constant.character.escape.line-continuation.cpp"
     },
     "macro": {
-      "begin": "(^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?define\\b)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+      "begin": "(^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}define\\b)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.define.cpp"
@@ -6133,7 +6133,7 @@
                       "name": "variable.parameter.preprocessor.cpp"
                     }
                   },
-                  "match": "(?<=[(,])(?:\\s+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s+)?"
+                  "match": "(?<=[(,])\\s+{0,1}((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\s+{0,1}"
                 },
                 {
                   "match": ",",
@@ -6149,7 +6149,7 @@
               "name": "punctuation.definition.parameters.end.preprocessor.cpp"
             }
           },
-          "match": "\\G(?:\\s+)?(\\()([^\\(]*)(\\))"
+          "match": "\\G\\s+{0,1}(\\()([^(]*)(\\))"
         },
         {
           "include": "#macro_context"
@@ -6160,7 +6160,7 @@
       ]
     },
     "macro_argument": {
-      "match": "##?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+      "match": "##?(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
       "name": "variable.other.macro.argument.cpp"
     },
     "macro_context": {
@@ -6171,7 +6171,7 @@
       ]
     },
     "macro_name": {
-      "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+      "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
       "name": "entity.name.function.preprocessor.cpp"
     },
     "member_access": {
@@ -6197,7 +6197,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -6246,7 +6246,7 @@
                   "name": "punctuation.separator.pointer-access.cpp"
                 }
               },
-              "match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:\\s+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:\\s+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s+{0,1}(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*|(?<=[\\])]))\\s+{0,1}))(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             },
             {
               "captures": {
@@ -6279,7 +6279,7 @@
                   "name": "punctuation.separator.pointer-access.cpp"
                 }
               },
-              "match": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:\\s+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*|(?<=[\\])]))\\s+{0,1}))(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             },
             {
               "include": "#member_access"
@@ -6293,7 +6293,7 @@
           "name": "variable.other.property.cpp"
         }
       },
-      "match": "(?:((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:\\s+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:\\s+)?)*)(?:\\s+)?(\\b(?!uint_least32_t[^\\w]|uint_least16_t[^\\w]|uint_least64_t[^\\w]|int_least32_t[^\\w]|int_least64_t[^\\w]|uint_fast32_t[^\\w]|uint_fast64_t[^\\w]|uint_least8_t[^\\w]|uint_fast16_t[^\\w]|int_least16_t[^\\w]|int_fast16_t[^\\w]|int_least8_t[^\\w]|uint_fast8_t[^\\w]|int_fast64_t[^\\w]|int_fast32_t[^\\w]|int_fast8_t[^\\w]|suseconds_t[^\\w]|useconds_t[^\\w]|in_addr_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|in_port_t[^\\w]|uintptr_t[^\\w]|blksize_t[^\\w]|uint32_t[^\\w]|uint64_t[^\\w]|u_quad_t[^\\w]|intmax_t[^\\w]|intmax_t[^\\w]|unsigned[^\\w]|blkcnt_t[^\\w]|uint16_t[^\\w]|intptr_t[^\\w]|swblk_t[^\\w]|wchar_t[^\\w]|u_short[^\\w]|qaddr_t[^\\w]|caddr_t[^\\w]|daddr_t[^\\w]|fixpt_t[^\\w]|nlink_t[^\\w]|segsz_t[^\\w]|clock_t[^\\w]|ssize_t[^\\w]|int16_t[^\\w]|int32_t[^\\w]|int64_t[^\\w]|uint8_t[^\\w]|int8_t[^\\w]|mode_t[^\\w]|quad_t[^\\w]|ushort[^\\w]|u_long[^\\w]|u_char[^\\w]|double[^\\w]|signed[^\\w]|time_t[^\\w]|size_t[^\\w]|key_t[^\\w]|div_t[^\\w]|ino_t[^\\w]|uid_t[^\\w]|gid_t[^\\w]|off_t[^\\w]|pid_t[^\\w]|float[^\\w]|dev_t[^\\w]|u_int[^\\w]|short[^\\w]|bool[^\\w]|id_t[^\\w]|uint[^\\w]|long[^\\w]|char[^\\w]|void[^\\w]|auto[^\\w]|id_t[^\\w]|int[^\\w])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())"
+      "match": "(?:((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*|(?<=[\\])]))\\s+{0,1}))(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\s+{0,1}(?:\\.(?:\\*|)|->(?:\\*|))\\s+{0,1})*)\\s+{0,1}(\\b(?!uint_least32_t\\W|uint_least16_t\\W|uint_least64_t\\W|int_least32_t\\W|int_least64_t\\W|uint_fast32_t\\W|uint_fast64_t\\W|uint_least8_t\\W|uint_fast16_t\\W|int_least16_t\\W|int_fast16_t\\W|int_least8_t\\W|uint_fast8_t\\W|int_fast64_t\\W|int_fast32_t\\W|int_fast8_t\\W|suseconds_t\\W|useconds_t\\W|in_addr_t\\W|uintmax_t\\W|uintmax_t\\W|uintmax_t\\W|in_port_t\\W|uintptr_t\\W|blksize_t\\W|uint32_t\\W|uint64_t\\W|u_quad_t\\W|intmax_t\\W|intmax_t\\W|unsigned\\W|blkcnt_t\\W|uint16_t\\W|intptr_t\\W|swblk_t\\W|wchar_t\\W|u_short\\W|qaddr_t\\W|caddr_t\\W|daddr_t\\W|fixpt_t\\W|nlink_t\\W|segsz_t\\W|clock_t\\W|ssize_t\\W|int16_t\\W|int32_t\\W|int64_t\\W|uint8_t\\W|int8_t\\W|mode_t\\W|quad_t\\W|ushort\\W|u_long\\W|u_char\\W|double\\W|signed\\W|time_t\\W|size_t\\W|key_t\\W|div_t\\W|ino_t\\W|uid_t\\W|gid_t\\W|off_t\\W|pid_t\\W|float\\W|dev_t\\W|u_int\\W|short\\W|bool\\W|id_t\\W|uint\\W|long\\W|char\\W|void\\W|auto\\W|id_t\\W|int\\W)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b(?!\\())"
     },
     "memory_operators": {
       "captures": {
@@ -6318,7 +6318,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -6338,10 +6338,10 @@
           "name": "keyword.operator.new.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:(?:(delete)(?:\\s+)?(\\[\\])|(delete))|(new))(?!\\w))"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:(delete)\\s+{0,1}(\\[])|(delete))|(new))(?!\\w))"
     },
     "method_access": {
-      "begin": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:\\s+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:\\s+)?)*)(?:\\s+)?(~?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s+)?(\\()",
+      "begin": "(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*|(?<=[\\])]))\\s+{0,1}))(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\s+{0,1}(?:\\.(?:\\*|)|->(?:\\*|))\\s+{0,1})*)\\s+{0,1}(~?(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\s+{0,1}(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -6410,7 +6410,7 @@
                   "name": "punctuation.separator.pointer-access.cpp"
                 }
               },
-              "match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:\\s+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:\\s+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s+{0,1}(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*|(?<=[\\])]))\\s+{0,1}))(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             },
             {
               "captures": {
@@ -6443,7 +6443,7 @@
                   "name": "punctuation.separator.pointer-access.cpp"
                 }
               },
-              "match": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))(?:\\s+)?))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*|(?<=[\\])]))\\s+{0,1}))(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             },
             {
               "include": "#member_access"
@@ -6489,7 +6489,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -6497,7 +6497,7 @@
           "name": "keyword.other.$3.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:(?:constinit)|(?:requires)|(?:typedef)|(?:concept)|(?:export)|(?:module))(?!\\w))"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:constinit|requires|typedef|concept|export|module)(?!\\w))"
     },
     "ms_attributes": {
       "begin": "__declspec\\(",
@@ -6545,7 +6545,7 @@
               "name": "entity.name.namespace.cpp"
             }
           },
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
         },
         {
           "match": ",",
@@ -6556,11 +6556,11 @@
           "name": "punctuation.accessor.attribute.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(?=::)",
           "name": "entity.name.namespace.cpp"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+          "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
           "name": "entity.other.attribute.$0.cpp"
         },
         {
@@ -6609,7 +6609,7 @@
           "name": "entity.name.namespace.cpp"
         }
       },
-      "match": "(?<!\\w)(namespace)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:\\s+)?(\\=)(?:\\s+)?(((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<8>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:\\s+)?(?:(;)|\\n))",
+      "match": "(?<!\\w)(namespace)\\s+((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s+{0,1}(=)\\s+{0,1}(((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<8>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s+{0,1}(?:(;)|\\n))",
       "name": "meta.declaration.namespace.alias.cpp"
     },
     "namespace_block": {
@@ -6622,7 +6622,7 @@
           "name": "keyword.other.namespace.definition.cpp storage.type.namespace.definition.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "endCaptures": {
       },
       "name": "meta.block.namespace.cpp",
@@ -6676,7 +6676,7 @@
                   "name": "storage.modifier.inline.cpp"
                 }
               },
-              "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<4>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)(?:\\s+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?:\\s+)?(?:(::)(?:\\s+)?(inline))?"
+              "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<4>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)\\s+{0,1}((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s+{0,1}(?:(::)\\s+{0,1}(inline))?"
             }
           ]
         },
@@ -6684,7 +6684,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.namespace.cpp"
@@ -6698,10 +6698,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.namespace.cpp",
@@ -6714,7 +6714,7 @@
       ]
     },
     "noexcept_operator": {
-      "begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)noexcept(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.cpp"
@@ -6773,7 +6773,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -6788,7 +6788,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -6803,7 +6803,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -6821,7 +6821,7 @@
                       "name": "keyword.operator.minus.exponent.hexadecimal.cpp"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([pP])(\\+?)(\\-?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?(?:(?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?((?:\\w(?<![pP\\h])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -6829,7 +6829,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -6850,7 +6850,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -6871,13 +6871,13 @@
                       "name": "constant.numeric.exponent.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
                     }
                   },
-                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([eE])(\\+?)(\\-?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
+                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -6888,7 +6888,7 @@
                       "name": "constant.numeric.binary.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -6903,7 +6903,7 @@
                       "name": "keyword.other.suffix.literal.user-defined.integer.cpp keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
+                  "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -6914,7 +6914,7 @@
                       "name": "constant.numeric.octal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -6929,7 +6929,7 @@
                       "name": "keyword.other.suffix.literal.user-defined.integer.cpp keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
+                  "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -6940,7 +6940,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -6961,7 +6961,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -6973,7 +6973,7 @@
                       "name": "keyword.other.suffix.literal.user-defined.integer.cpp keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([pP])(\\+?)(\\-?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)(?:(?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![pP\\h])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -6981,7 +6981,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -7002,7 +7002,7 @@
                       "name": "constant.numeric.exponent.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -7014,10 +7014,10 @@
                       "name": "keyword.other.suffix.literal.user-defined.integer.cpp keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([eE])(\\+?)(\\-?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
+                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
                 },
                 {
-                  "match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])+",
                   "name": "invalid.illegal.constant.numeric.cpp"
                 }
               ]
@@ -7025,10 +7025,10 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])*"
     },
     "operator_overload": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<55>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<55>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<55>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(operator)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<55>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|\\+|\\-|!|~|\\*|&|\\*|\\/|%|\\+|\\-|<|>|&|\\^|\\||=))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:\\[\\])?)))|(\"\")((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\<|\\()",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(operator)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(?:(?:((?:delete\\[]|delete|new\\[]|<=>|<<=|new|>>=|->\\*|/=|%=|&=|>=|\\|=|\\+\\+|--|\\(\\)|\\[]|->|\\+\\+|<<|>>|--|<=|\\^=|==|!=|&&|\\|\\||\\+=|-=|\\*=|[,+\\-!~*\\&/%<>^|=]))|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:\\[])?)))|(\"\")((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[<(])",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.operator-overload.cpp"
@@ -7066,7 +7066,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -7129,11 +7129,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -7234,7 +7234,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.operator.cpp"
             },
             {
@@ -7269,7 +7269,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -7311,7 +7311,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -7332,7 +7332,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator-overload.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.operator-overload.cpp"
             },
             {
@@ -7380,11 +7380,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "entity.name.operator.type.reference.cpp"
             }
           ]
@@ -7502,7 +7502,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "endCaptures": {
       },
       "name": "meta.function.definition.special.operator-overload.cpp",
@@ -7579,7 +7579,7 @@
                   "name": "keyword.other.delete.function.cpp"
                 }
               },
-              "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))"
+              "match": "(=)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(default)|(delete))"
             },
             {
               "include": "$self"
@@ -7590,7 +7590,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.function.definition.special.operator-overload.cpp"
@@ -7604,10 +7604,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.function.definition.special.operator-overload.cpp",
@@ -7622,7 +7622,7 @@
     "operators": {
       "patterns": [
         {
-          "begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)sizeof(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
@@ -7661,7 +7661,7 @@
           ]
         },
         {
-          "begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)alignof(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
@@ -7700,7 +7700,7 @@
           ]
         },
         {
-          "begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)alignas(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
@@ -7739,7 +7739,7 @@
           ]
         },
         {
-          "begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)typeid(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
@@ -7778,7 +7778,7 @@
           ]
         },
         {
-          "begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "((?<!\\w)noexcept(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.cpp"
@@ -7817,7 +7817,7 @@
           ]
         },
         {
-          "begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+          "begin": "(\\bsizeof\\.\\.\\.)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.variadic.cpp"
@@ -7864,7 +7864,7 @@
           "name": "keyword.operator.increment.cpp"
         },
         {
-          "match": "%=|\\+=|-=|\\*=|(?<!\\()\\/=",
+          "match": "%=|\\+=|-=|\\*=|(?<!\\()/=",
           "name": "keyword.operator.assignment.compound.cpp"
         },
         {
@@ -7876,7 +7876,7 @@
           "name": "keyword.operator.bitwise.shift.cpp"
         },
         {
-          "match": "!=|<=|>=|==|<|>",
+          "match": "!=|<=|>=|==|[<>]",
           "name": "keyword.operator.comparison.cpp"
         },
         {
@@ -7884,14 +7884,14 @@
           "name": "keyword.operator.logical.cpp"
         },
         {
-          "match": "&|\\||\\^|~",
+          "match": "[\\&|^~]",
           "name": "keyword.operator.bitwise.cpp"
         },
         {
           "include": "#assignment_operator"
         },
         {
-          "match": "%|\\*|\\/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.cpp"
         },
         {
@@ -7927,7 +7927,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -7952,7 +7952,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -7980,7 +7980,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8005,7 +8005,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8037,7 +8037,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8055,7 +8055,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8083,7 +8083,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8112,11 +8112,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -8142,12 +8142,12 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             }
           },
-          "match": "(\\bstruct)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=,|\\)|\\n)"
+          "match": "(\\bstruct)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\[((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[,)\\n])"
         },
         {
           "captures": {
@@ -8175,7 +8175,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8200,7 +8200,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8228,7 +8228,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8253,7 +8253,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8285,7 +8285,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8303,7 +8303,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8331,7 +8331,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8360,11 +8360,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -8390,12 +8390,12 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             }
           },
-          "match": "(\\benum)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=,|\\)|\\n)"
+          "match": "(\\benum)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\[((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[,)\\n])"
         },
         {
           "captures": {
@@ -8423,7 +8423,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8448,7 +8448,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8476,7 +8476,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8501,7 +8501,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8533,7 +8533,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8551,7 +8551,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8579,7 +8579,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8608,11 +8608,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -8638,12 +8638,12 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             }
           },
-          "match": "(\\bunion)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=,|\\)|\\n)"
+          "match": "(\\bunion)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\[((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[,)\\n])"
         },
         {
           "captures": {
@@ -8671,7 +8671,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8696,7 +8696,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8724,7 +8724,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8749,7 +8749,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8781,7 +8781,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8799,7 +8799,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8827,7 +8827,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -8856,11 +8856,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -8886,17 +8886,17 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             }
           },
-          "match": "(\\bclass)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=,|\\)|\\n)"
+          "match": "(\\bclass)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\[((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[,)\\n])"
         }
       ]
     },
     "parameter": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\w)",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\w)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -9014,7 +9014,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\s*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_]\\w*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wthread_local|^thread_local|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=,|\\)|=)"
+          "match": "((?:((?:thread_local|volatile|register|restrict|static|extern|const))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\s*+(?<!\\w)(?:(?:(?:((?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int))|((?:uint_least32_t|uint_least64_t|uint_least16_t|uint_fast64_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|uint_fast16_t|uint_fast32_t|int_least8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintmax_t|in_port_t|uintmax_t|in_addr_t|blksize_t|uintptr_t|intmax_t|intptr_t|blkcnt_t|intmax_t|u_quad_t|uint16_t|uint32_t|uint64_t|ssize_t|fixpt_t|qaddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|daddr_t|caddr_t|swblk_t|clock_t|segsz_t|nlink_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)))|(pthread_(?:rwlockattr_t|mutexattr_t|condattr_t|rwlock_t|mutex_t|cond_t|attr_t|once_t|key_t|t)))|([a-zA-Z_]\\w*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\b\\b(?<!(?:\\W|^)(?:thread_local|volatile|register|restrict|static|extern|const))))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[,)=])"
         },
         {
           "include": "#storage_types"
@@ -9023,7 +9023,7 @@
           "include": "#scope_resolution_parameter_inner_generated"
         },
         {
-          "match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
+          "match": "(?:struct|class|union|enum)",
           "name": "storage.type.$0.cpp"
         },
         {
@@ -9043,7 +9043,7 @@
           ]
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.cpp"
         },
         {
@@ -9084,7 +9084,7 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "(?<!\\s|\\(|,|:)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\)|,|\\[|=|\\n)"
+          "match": "(?<![\\s(,:])((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[),\\[=\\n])"
         },
         {
           "include": "#attributes_context"
@@ -9096,7 +9096,7 @@
               "name": "punctuation.definition.begin.bracket.square.array.type.cpp"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.array.type.cpp"
@@ -9110,7 +9110,7 @@
           ]
         },
         {
-          "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?<!\\Wstruct|^struct|\\Wclass|^class|\\Wunion|^union|\\Wenum|^enum)",
+          "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b(?<!(?:\\W|^)(?:struct|class|union|enum))",
           "name": "entity.name.type.parameter.cpp"
         },
         {
@@ -9143,11 +9143,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -9185,7 +9185,7 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*)"
+          "match": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*]"
         },
         {
           "include": "#ever_present_context"
@@ -9218,7 +9218,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9243,7 +9243,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9271,7 +9271,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9296,7 +9296,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9328,7 +9328,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9346,7 +9346,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9374,7 +9374,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9403,11 +9403,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -9433,12 +9433,12 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "(\\bclass)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=,|\\)|\\n)"
+      "match": "(\\bclass)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\[((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[,)\\n])"
     },
     "parameter_enum": {
       "captures": {
@@ -9466,7 +9466,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9491,7 +9491,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9519,7 +9519,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9544,7 +9544,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9576,7 +9576,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9594,7 +9594,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9622,7 +9622,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -9651,11 +9651,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -9681,15 +9681,15 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "(\\benum)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=,|\\)|\\n)"
+      "match": "(\\benum)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\[((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[,)\\n])"
     },
     "parameter_or_maybe_value": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\w)",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\w)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -9813,7 +9813,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\s*+(?<!\\w)(?:(?:(?:((?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int)))|((?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_least64_t)|(?:int_least32_t)|(?:int_least16_t)|(?:uint_fast16_t)|(?:uint_fast32_t)|(?:int_least8_t)|(?:int_fast16_t)|(?:int_fast32_t)|(?:int_fast64_t)|(?:uint_fast8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintmax_t)|(?:in_port_t)|(?:uintmax_t)|(?:in_addr_t)|(?:blksize_t)|(?:uintptr_t)|(?:intmax_t)|(?:intptr_t)|(?:blkcnt_t)|(?:intmax_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:uint64_t)|(?:ssize_t)|(?:fixpt_t)|(?:qaddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:daddr_t)|(?:caddr_t)|(?:swblk_t)|(?:clock_t)|(?:segsz_t)|(?:nlink_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))))|((?:(?:pthread_rwlockattr_t)|(?:pthread_mutexattr_t)|(?:pthread_condattr_t)|(?:pthread_rwlock_t)|(?:pthread_mutex_t)|(?:pthread_cond_t)|(?:pthread_attr_t)|(?:pthread_once_t)|(?:pthread_key_t)|(?:pthread_t))))|([a-zA-Z_]\\w*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wthread_local|^thread_local|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=,|\\)|=)"
+          "match": "((?:((?:thread_local|volatile|register|restrict|static|extern|const))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\s*+(?<!\\w)(?:(?:(?:((?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int))|((?:uint_least32_t|uint_least64_t|uint_least16_t|uint_fast64_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|uint_fast16_t|uint_fast32_t|int_least8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintmax_t|in_port_t|uintmax_t|in_addr_t|blksize_t|uintptr_t|intmax_t|intptr_t|blkcnt_t|intmax_t|u_quad_t|uint16_t|uint32_t|uint64_t|ssize_t|fixpt_t|qaddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|daddr_t|caddr_t|swblk_t|clock_t|segsz_t|nlink_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)))|(pthread_(?:rwlockattr_t|mutexattr_t|condattr_t|rwlock_t|mutex_t|cond_t|attr_t|once_t|key_t|t)))|([a-zA-Z_]\\w*_t))(?!\\w)|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\b\\b(?<!(?:\\W|^)(?:thread_local|volatile|register|restrict|static|extern|const))))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[,)=])"
         },
         {
           "include": "#storage_types"
@@ -9825,7 +9825,7 @@
           "include": "#scope_resolution_parameter_inner_generated"
         },
         {
-          "match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
+          "match": "(?:struct|class|union|enum)",
           "name": "storage.type.$0.cpp"
         },
         {
@@ -9882,7 +9882,7 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "(?<!\\s|\\(|,|:)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=(?:\\)|,|\\[|=|\\/\\/|(?:\\n|$)))"
+          "match": "(?<![\\s(,:])((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=(?:[),\\[=]|//|(?:\\n|$)))"
         },
         {
           "include": "#attributes_context"
@@ -9894,7 +9894,7 @@
               "name": "punctuation.definition.begin.bracket.square.array.type.cpp"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.array.type.cpp"
@@ -9908,7 +9908,7 @@
           ]
         },
         {
-          "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?<!\\Wstruct|^struct|\\Wclass|^class|\\Wunion|^union|\\Wenum|^enum)",
+          "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b(?<!(?:\\W|^)(?:struct|class|union|enum))",
           "name": "entity.name.type.parameter.cpp"
         },
         {
@@ -9941,11 +9941,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -9983,7 +9983,7 @@
               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
             }
           },
-          "match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*)"
+          "match": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*]"
         },
         {
           "include": "#evaluation_context"
@@ -10019,7 +10019,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10044,7 +10044,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10072,7 +10072,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10097,7 +10097,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10129,7 +10129,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10147,7 +10147,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10175,7 +10175,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10204,11 +10204,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -10234,12 +10234,12 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "(\\bstruct)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=,|\\)|\\n)"
+      "match": "(\\bstruct)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\[((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[,)\\n])"
     },
     "parameter_union": {
       "captures": {
@@ -10267,7 +10267,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10292,7 +10292,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10320,7 +10320,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10345,7 +10345,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10377,7 +10377,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10395,7 +10395,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10423,7 +10423,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10452,11 +10452,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -10482,12 +10482,12 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "(\\bunion)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:\\[((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\]((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=,|\\)|\\n)"
+      "match": "(\\bunion)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))?)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:\\[((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[,)\\n])"
     },
     "parentheses": {
       "begin": "\\(",
@@ -10517,7 +10517,7 @@
       ]
     },
     "pragma": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?pragma\\b",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}pragma\\b",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.directive.pragma.cpp"
@@ -10591,7 +10591,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10602,7 +10602,7 @@
           "name": "entity.name.tag.pragma-mark.cpp"
         }
       },
-      "match": "(^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?pragma\\s+mark)\\s+(.*)",
+      "match": "(^((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}pragma\\s+mark)\\s+(.*)",
       "name": "meta.preprocessor.pragma.cpp"
     },
     "predefined_macros": {
@@ -10690,7 +10690,7 @@
       "name": "meta.parens.preprocessor.conditional.cpp"
     },
     "preprocessor_conditional_range": {
-      "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?((?:(?:ifndef|ifdef)|if))",
+      "begin": "^((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}(if(?:(?:ndef|def)|))",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.directive.conditional.$6.cpp"
@@ -10750,7 +10750,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10758,7 +10758,7 @@
           "name": "punctuation.definition.directive.cpp"
         }
       },
-      "match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?((?<!\\w)(?:endif|else|elif)(?!\\w))",
+      "match": "^((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}((?<!\\w)e(?:ndif|lse|lif)(?!\\w))",
       "name": "keyword.control.directive.$4.cpp"
     },
     "preprocessor_context": {
@@ -10807,7 +10807,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -10849,7 +10849,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -10878,7 +10878,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10903,7 +10903,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10928,7 +10928,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -10939,7 +10939,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -10962,7 +10962,7 @@
           ]
         }
       },
-      "match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<11>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<11>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.])",
+      "match": "\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<11>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<11>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.])",
       "name": "meta.qualified_type.cpp"
     },
     "qualifiers_and_specifiers_post_parameters": {
@@ -10991,12 +10991,12 @@
                   "name": "storage.modifier.specifier.functional.post-parameters.$5.cpp"
                 }
               },
-              "match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:(?:override)|(?:volatile)|(?:noexcept)|(?:final)|(?:const))(?!\\w))"
+              "match": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:override|volatile|noexcept|final|const)(?!\\w))"
             }
           ]
         }
       },
-      "match": "((?:(?:(?:(?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)(?<!\\w)(?:(?:override)|(?:volatile)|(?:noexcept)|(?:final)|(?:const))(?!\\w))+)(?=\\s*(?:\\{|;|\\n|\\r|=))"
+      "match": "((?:(?:(?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)(?<!\\w)(?:override|volatile|noexcept|final|const)(?!\\w))+)(?=\\s*[{;\\n\\r=])"
     },
     "scope_resolution": {
       "captures": {
@@ -11018,7 +11018,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_function_call": {
       "captures": {
@@ -11040,7 +11040,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_function_call_inner_generated": {
       "captures": {
@@ -11089,7 +11089,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "scope_resolution_function_definition": {
       "captures": {
@@ -11111,7 +11111,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_function_definition_inner_generated": {
       "captures": {
@@ -11160,7 +11160,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "scope_resolution_function_definition_operator_overload": {
       "captures": {
@@ -11182,7 +11182,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_function_definition_operator_overload_inner_generated": {
       "captures": {
@@ -11231,7 +11231,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "scope_resolution_inner_generated": {
       "captures": {
@@ -11280,7 +11280,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "scope_resolution_namespace_alias": {
       "captures": {
@@ -11302,7 +11302,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_namespace_alias_inner_generated": {
       "captures": {
@@ -11351,7 +11351,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "scope_resolution_namespace_block": {
       "captures": {
@@ -11373,7 +11373,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_namespace_block_inner_generated": {
       "captures": {
@@ -11422,7 +11422,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "scope_resolution_namespace_using": {
       "captures": {
@@ -11444,7 +11444,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_namespace_using_inner_generated": {
       "captures": {
@@ -11493,7 +11493,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "scope_resolution_parameter": {
       "captures": {
@@ -11515,7 +11515,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_parameter_inner_generated": {
       "captures": {
@@ -11564,7 +11564,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "scope_resolution_template_call": {
       "captures": {
@@ -11586,7 +11586,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_template_call_inner_generated": {
       "captures": {
@@ -11635,7 +11635,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "scope_resolution_template_definition": {
       "captures": {
@@ -11657,7 +11657,7 @@
           ]
         }
       },
-      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<3>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+"
+      "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<3>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+"
     },
     "scope_resolution_template_definition_inner_generated": {
       "captures": {
@@ -11706,7 +11706,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<7>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)"
+      "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))\\s*+(((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<7>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?(::)"
     },
     "semicolon": {
       "match": ";",
@@ -11722,7 +11722,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -11764,7 +11764,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -11790,7 +11790,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -11821,11 +11821,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -11851,7 +11851,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -11876,7 +11876,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -11911,7 +11911,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -11936,7 +11936,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -11947,7 +11947,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -11965,7 +11965,7 @@
         "9": {
         }
       },
-      "match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<12>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?"
+      "match": "(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<12>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?"
     },
     "single_line_macro": {
       "captures": {
@@ -12000,15 +12000,15 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))#define.*(?<![\\\\])(?:\\n|$)"
+      "match": "^((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))#define.*(?<!\\\\)(?:\\n|$)"
     },
     "sizeof_operator": {
-      "begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)sizeof(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
@@ -12047,7 +12047,7 @@
       ]
     },
     "sizeof_variadic_operator": {
-      "begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "(\\bsizeof\\.\\.\\.)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.variadic.cpp"
@@ -12086,7 +12086,7 @@
       ]
     },
     "square_brackets": {
-      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
+      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!])",
       "beginCaptures": {
         "1": {
           "name": "variable.other.object"
@@ -12095,7 +12095,7 @@
           "name": "punctuation.definition.begin.bracket.square"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.end.bracket.square"
@@ -12136,7 +12136,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12164,7 +12164,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12189,7 +12189,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12221,11 +12221,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -12251,7 +12251,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12276,12 +12276,12 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             }
           },
-          "match": "((?<!\\w)struct(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
+          "match": "((?<!\\w)struct(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
         },
         {
           "captures": {
@@ -12309,7 +12309,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12337,7 +12337,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12362,7 +12362,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12394,11 +12394,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -12424,7 +12424,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12449,12 +12449,12 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             }
           },
-          "match": "((?<!\\w)union(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
+          "match": "((?<!\\w)union(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
         },
         {
           "captures": {
@@ -12482,7 +12482,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12510,7 +12510,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12535,7 +12535,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12567,11 +12567,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -12597,7 +12597,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12622,12 +12622,12 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             }
           },
-          "match": "((?<!\\w)enum(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
+          "match": "((?<!\\w)enum(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
         },
         {
           "captures": {
@@ -12655,7 +12655,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12683,7 +12683,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12708,7 +12708,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12740,11 +12740,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -12770,7 +12770,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             },
@@ -12795,17 +12795,17 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+                  "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
                 }
               ]
             }
           },
-          "match": "((?<!\\w)class(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
+          "match": "((?<!\\w)class(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
         }
       ]
     },
     "static_assert": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -12854,7 +12854,7 @@
       },
       "patterns": [
         {
-          "begin": "(,)(?:\\s+)?(?=(?:L|u8|u|U(?:\\s+)?\\\")?)",
+          "begin": "(,)\\s+{0,1}(?=(?:L|u8|u|U\\s+{0,1}\")?)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.delimiter.comma.cpp"
@@ -12898,12 +12898,12 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "(?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)"
+      "match": "(?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)"
     },
     "storage_specifiers": {
       "captures": {
@@ -12928,7 +12928,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -12936,7 +12936,7 @@
           "name": "storage.modifier.specifier.$3.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const))(?!\\w))"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:thread_local|volatile|register|restrict|static|extern|const)(?!\\w))"
     },
     "storage_types": {
       "patterns": [
@@ -12957,7 +12957,7 @@
     "string_context": {
       "patterns": [
         {
-          "begin": "((?:u|u8|U|L)?)\"",
+          "begin": "((?:u|u8|[UL])?)\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -12966,7 +12966,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "(\")(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?",
+          "end": "(\")(?:((?:[a-zA-Z]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)|(_(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.cpp"
@@ -12981,7 +12981,7 @@
           "name": "string.quoted.double.cpp",
           "patterns": [
             {
-              "match": "(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8})",
+              "match": "\\\\(?:u\\h{4}|U\\h{8})",
               "name": "constant.character.escape.cpp"
             },
             {
@@ -13001,7 +13001,7 @@
                   "name": "invalid.illegal.unknown-escape.cpp"
                 }
               },
-              "match": "(?:(\\\\x0*[0-9a-fA-F]{2}(?![0-9a-fA-F]))|((?:\\\\x[0-9a-fA-F]*|\\\\x)))"
+              "match": "(?:(\\\\x0*\\h{2}(?!\\h))|(\\\\x(?:\\h*|)))"
             },
             {
               "include": "#string_escapes_context_c"
@@ -13009,7 +13009,7 @@
           ]
         },
         {
-          "begin": "(?<![0-9A-Fa-f])((?:u|u8|U|L)?)'",
+          "begin": "(?<!\\h)((?:u|u8|[UL])?)'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -13018,7 +13018,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "(')(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?",
+          "end": "(')(?:((?:[a-zA-Z]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)|(_(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.cpp"
@@ -13041,7 +13041,7 @@
                   "name": "invalid.illegal.unknown-escape.cpp"
                 }
               },
-              "match": "(?:(\\\\x0*[0-9a-fA-F]{2}(?![0-9a-fA-F]))|((?:\\\\x[0-9a-fA-F]*|\\\\x)))"
+              "match": "(?:(\\\\x0*\\h{2}(?!\\h))|(\\\\x(?:\\h*|)))"
             },
             {
               "include": "#string_escapes_context_c"
@@ -13052,7 +13052,7 @@
           ]
         },
         {
-          "begin": "((?:[uUL]8?)?R)\\\"(?:(?:_r|re)|regex)\\(",
+          "begin": "((?:[uUL]8?)?R)\"(?:(?:_r|re)|regex)\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -13061,7 +13061,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "\\)(?:(?:_r|re)|regex)\\\"",
+          "end": "\\)(?:(?:_r|re)|regex)\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cpp"
@@ -13075,7 +13075,7 @@
           ]
         },
         {
-          "begin": "((?:[uUL]8?)?R)\\\"(?:glsl|GLSL)\\(",
+          "begin": "((?:[uUL]8?)?R)\"(?:glsl|GLSL)\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -13084,7 +13084,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "\\)(?:glsl|GLSL)\\\"",
+          "end": "\\)(?:glsl|GLSL)\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cpp"
@@ -13098,7 +13098,7 @@
           ]
         },
         {
-          "begin": "((?:[uUL]8?)?R)\\\"(?:[pP]?(?:sql|SQL)|d[dm]l)\\(",
+          "begin": "((?:[uUL]8?)?R)\"(?:[pP]?(?:sql|SQL)|d[dm]l)\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cpp"
@@ -13107,7 +13107,7 @@
               "name": "meta.encoding.cpp"
             }
           },
-          "end": "\\)(?:[pP]?(?:sql|SQL)|d[dm]l)\\\"",
+          "end": "\\)(?:[pP]?(?:sql|SQL)|d[dm]l)\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cpp"
@@ -13121,7 +13121,7 @@
           ]
         },
         {
-          "begin": "((?:u|u8|U|L)?R)\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+          "begin": "((?:u|u8|[UL])?R)\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin"
@@ -13133,7 +13133,7 @@
               "name": "invalid.illegal.delimiter-too-long"
             }
           },
-          "end": "(\\)\\2(\\3)\")(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?",
+          "end": "(\\)\\2(\\3)\")(?:((?:[a-zA-Z]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)|(_(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end"
@@ -13155,7 +13155,7 @@
     "string_escapes_context_c": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3][0-7]{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+          "match": "\\\\([\\\\abefnprtv'\"?]|[0-3][0-7]{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
           "name": "constant.character.escape"
         },
         {
@@ -13163,13 +13163,13 @@
           "name": "invalid.illegal.unknown-escape"
         },
         {
-          "match": "(?!%')(?!%\")%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+          "match": "(?!%')(?!%\")%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
           "name": "constant.other.placeholder"
         }
       ]
     },
     "struct_block": {
-      "begin": "((?<!\\w)struct(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+      "begin": "((?<!\\w)struct(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
       "beginCaptures": {
         "0": {
           "name": "meta.head.struct.cpp"
@@ -13204,7 +13204,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+              "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
             },
             {
               "captures": {
@@ -13247,14 +13247,14 @@
                   "name": "comment.block.cpp"
                 }
               },
-              "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+              "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
             },
             {
               "match": "DLLEXPORT",
               "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
             }
           ]
@@ -13334,7 +13334,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -13372,7 +13372,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.struct.cpp"
@@ -13398,10 +13398,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.struct.cpp",
@@ -13439,7 +13439,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -13467,7 +13467,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -13492,7 +13492,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -13524,11 +13524,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -13554,7 +13554,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -13579,15 +13579,15 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "((?<!\\w)struct(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
+      "match": "((?<!\\w)struct(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
     },
     "switch_conditional_parentheses": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -13623,7 +13623,7 @@
       ]
     },
     "switch_statement": {
-      "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)switch(?!\\w))",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)switch(?!\\w))",
       "beginCaptures": {
         "0": {
           "name": "meta.head.switch.cpp"
@@ -13648,7 +13648,7 @@
           "name": "keyword.control.switch.cpp"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "endCaptures": {
       },
       "name": "meta.block.switch.cpp",
@@ -13677,7 +13677,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.switch.cpp"
@@ -13697,10 +13697,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.switch.cpp",
@@ -13724,7 +13724,7 @@
           "name": "keyword.operator.assignment.cpp"
         }
       },
-      "match": "(?<=<|,)(?:\\s+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s+((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(\\=)"
+      "match": "(?<=[<,])\\s+{0,1}((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\s+((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)?)\\s+{0,1}(=)"
     },
     "template_call_context": {
       "patterns": [
@@ -13779,7 +13779,7 @@
           "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
         }
       },
-      "match": "((?<!<)<(?!<)(?:(?:(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/)))|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<1>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+",
+      "match": "((?<!<)<(?!<)(?:(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<1>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+",
       "name": "meta.template.call.cpp"
     },
     "template_call_range": {
@@ -13803,7 +13803,7 @@
       ]
     },
     "template_definition": {
-      "begin": "(?<!\\w)(template)(?:\\s+)?(<)",
+      "begin": "(?<!\\w)(template)\\s+{0,1}(<)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.template.cpp"
@@ -13821,7 +13821,7 @@
       "name": "meta.template.definition.cpp",
       "patterns": [
         {
-          "begin": "(?<=\\w)(?:\\s+)?<",
+          "begin": "(?<=\\w)\\s+{0,1}<",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.angle-brackets.begin.template.call.cpp"
@@ -13891,7 +13891,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -13901,7 +13901,7 @@
         "4": {
           "patterns": [
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "storage.type.template.argument.$0.cpp"
             }
           ]
@@ -13922,7 +13922,7 @@
           "name": "storage.type.template.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s+)?(\\.\\.\\.)(?:\\s+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|(?<!\\w)(template)(?:\\s+)?(<)(?:\\s+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(>)(?:\\s+)?(class|typename)(?:\\s+((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?)(?:\\s+)?(?:(\\=)(?:\\s+)?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?(?:(,)|(?=>|$))"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)|((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\s+)+)((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))|((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\s+{0,1}(\\.\\.\\.)\\s+{0,1}((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))|(?<!\\w)(template)\\s+{0,1}(<)\\s+{0,1}((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\s+{0,1}((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)?)\\s+{0,1}(>)\\s+{0,1}(class|typename)(?:\\s+((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))?)\\s+{0,1}(?:(=)\\s+{0,1}(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)?(?:(,)|(?=>|$))"
     },
     "template_definition_context": {
       "patterns": [
@@ -13975,7 +13975,7 @@
           "name": "punctuation.section.angle-brackets.end.template.definition.cpp"
         }
       },
-      "match": "(?<!\\w)(template)(?:\\s+)?(<)(.*)(>)(?:\\s+)?$"
+      "match": "(?<!\\w)(template)\\s+{0,1}(<)(.*)(>)\\s+{0,1}$"
     },
     "ternary_operator": {
       "applyEndPatternLast": 1,
@@ -14095,7 +14095,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -14103,7 +14103,7 @@
           "name": "variable.language.this.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)this(?!\\w))"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)this(?!\\w))"
     },
     "type_alias": {
       "captures": {
@@ -14131,7 +14131,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -14156,7 +14156,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -14167,7 +14167,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -14203,7 +14203,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -14243,11 +14243,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -14273,7 +14273,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -14298,7 +14298,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -14323,7 +14323,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -14380,7 +14380,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -14392,7 +14392,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -14434,7 +14434,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -14450,7 +14450,7 @@
           ]
         }
       },
-      "match": "(using)\\s+(?!namespace)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s+)?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:\\s+)?(\\=)(?:\\s+)?((?:typename)?)(?:\\s+)?((?:(?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)(?<!\\w)(?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const))(?!\\w)\\s+)+)?(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<19>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<19>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))|(.*(?<!;)))(?:(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?:(\\[)(\\w*)(\\])(?:\\s+)?)?(?:\\s+)?(?:(;)|\\n)",
+      "match": "(using)\\s+(?!namespace)((?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)\\s+{0,1}((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s+{0,1}(=)\\s+{0,1}((?:typename)?)\\s+{0,1}((?:(?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)(?<!\\w)(?:thread_local|volatile|register|restrict|static|extern|const)(?!\\w)\\s+)+)?(?:(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<19>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<19>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))|(.*(?<!;)))(?:(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?:(\\[)(\\w*)(])\\s+{0,1})?\\s+{0,1}(?:(;)|\\n)",
       "name": "meta.declaration.type.alias.cpp"
     },
     "type_casting_operators": {
@@ -14476,7 +14476,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -14484,10 +14484,10 @@
           "name": "keyword.operator.wordlike.cpp keyword.operator.cast.$3.cpp"
         }
       },
-      "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:(?:reinterpret_cast)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast))(?!\\w))"
+      "match": "((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:reinterpret_cast|dynamic_cast|static_cast|const_cast)(?!\\w))"
     },
     "typedef_class": {
-      "begin": "((?<!\\w)typedef(?!\\w))(?:\\s+)?(?=(?<!\\w)class(?!\\w))",
+      "begin": "((?<!\\w)typedef(?!\\w))\\s+{0,1}(?=(?<!\\w)class(?!\\w))",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.typedef.cpp"
@@ -14498,7 +14498,7 @@
       },
       "patterns": [
         {
-          "begin": "((?<!\\w)class(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+          "begin": "((?<!\\w)class(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
           "beginCaptures": {
             "0": {
               "name": "meta.head.class.cpp"
@@ -14533,7 +14533,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+                  "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
                 },
                 {
                   "captures": {
@@ -14576,14 +14576,14 @@
                       "name": "comment.block.cpp"
                     }
                   },
-                  "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+                  "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
                 },
                 {
                   "match": "DLLEXPORT",
                   "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
                 }
               ]
@@ -14663,7 +14663,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))",
+          "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.statement.cpp"
@@ -14701,7 +14701,7 @@
               "begin": "(?<=\\{|<%|\\?\\?<)",
               "beginCaptures": {
               },
-              "end": "\\}|%>|\\?\\?>",
+              "end": "}|%>|\\?\\?>",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.class.cpp"
@@ -14727,10 +14727,10 @@
               ]
             },
             {
-              "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+              "begin": "(?<=}|%>|\\?\\?>)\\s*",
               "beginCaptures": {
               },
-              "end": "[\\s]*(?=;)",
+              "end": "\\s*(?=;)",
               "endCaptures": {
               },
               "name": "meta.tail.class.cpp",
@@ -14762,11 +14762,11 @@
                               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                             }
                           },
-                          "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                          "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                           "name": "invalid.illegal.reference-type.cpp"
                         },
                         {
-                          "match": "\\&",
+                          "match": "&",
                           "name": "storage.modifier.reference.cpp"
                         }
                       ]
@@ -14823,7 +14823,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+                  "match": "(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
                 },
                 {
                   "match": ","
@@ -14835,7 +14835,7 @@
       ]
     },
     "typedef_function_pointer": {
-      "begin": "((?<!\\w)typedef(?!\\w))(?:\\s+)?(?=.*\\(\\*\\s*(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*\\))",
+      "begin": "((?<!\\w)typedef(?!\\w))\\s+{0,1}(?=.*\\(\\*\\s*(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\s*\\))",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.typedef.cpp"
@@ -14846,7 +14846,7 @@
       },
       "patterns": [
         {
-          "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(?:(\\[)(\\w*)(\\])(?:\\s+)?)*(\\))(?:\\s+)?(\\()",
+          "begin": "(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<18>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()(\\*)\\s+{0,1}((?:(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)?)\\s+{0,1}(?:(\\[)(\\w*)(])\\s+{0,1})*(\\))\\s+{0,1}(\\()",
           "beginCaptures": {
             "1": {
               "name": "meta.qualified_type.cpp",
@@ -14856,7 +14856,7 @@
                   "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
                 },
                 {
-                  "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+                  "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
                   "name": "storage.type.$0.cpp"
                 },
                 {
@@ -14898,7 +14898,7 @@
                   ]
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.type.cpp"
                 }
               ]
@@ -14913,7 +14913,7 @@
                   "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
                 },
                 {
-                  "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+                  "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
                   "name": "entity.name.scope-resolution.type.cpp"
                 },
                 {
@@ -14973,11 +14973,11 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                  "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                   "name": "invalid.illegal.reference-type.cpp"
                 },
                 {
-                  "match": "\\&",
+                  "match": "&",
                   "name": "storage.modifier.reference.cpp"
                 }
               ]
@@ -15098,7 +15098,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()",
+          "end": "(\\))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[{=,);>\\n])(?!\\()",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -15129,7 +15129,7 @@
       ]
     },
     "typedef_struct": {
-      "begin": "((?<!\\w)typedef(?!\\w))(?:\\s+)?(?=(?<!\\w)struct(?!\\w))",
+      "begin": "((?<!\\w)typedef(?!\\w))\\s+{0,1}(?=(?<!\\w)struct(?!\\w))",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.typedef.cpp"
@@ -15140,7 +15140,7 @@
       },
       "patterns": [
         {
-          "begin": "((?<!\\w)struct(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+          "begin": "((?<!\\w)struct(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
           "beginCaptures": {
             "0": {
               "name": "meta.head.struct.cpp"
@@ -15175,7 +15175,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+                  "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
                 },
                 {
                   "captures": {
@@ -15218,14 +15218,14 @@
                       "name": "comment.block.cpp"
                     }
                   },
-                  "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+                  "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
                 },
                 {
                   "match": "DLLEXPORT",
                   "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
                 }
               ]
@@ -15305,7 +15305,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))",
+          "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.statement.cpp"
@@ -15343,7 +15343,7 @@
               "begin": "(?<=\\{|<%|\\?\\?<)",
               "beginCaptures": {
               },
-              "end": "\\}|%>|\\?\\?>",
+              "end": "}|%>|\\?\\?>",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.struct.cpp"
@@ -15369,10 +15369,10 @@
               ]
             },
             {
-              "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+              "begin": "(?<=}|%>|\\?\\?>)\\s*",
               "beginCaptures": {
               },
-              "end": "[\\s]*(?=;)",
+              "end": "\\s*(?=;)",
               "endCaptures": {
               },
               "name": "meta.tail.struct.cpp",
@@ -15404,11 +15404,11 @@
                               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                             }
                           },
-                          "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                          "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                           "name": "invalid.illegal.reference-type.cpp"
                         },
                         {
-                          "match": "\\&",
+                          "match": "&",
                           "name": "storage.modifier.reference.cpp"
                         }
                       ]
@@ -15465,7 +15465,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+                  "match": "(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
                 },
                 {
                   "match": ","
@@ -15477,7 +15477,7 @@
       ]
     },
     "typedef_union": {
-      "begin": "((?<!\\w)typedef(?!\\w))(?:\\s+)?(?=(?<!\\w)union(?!\\w))",
+      "begin": "((?<!\\w)typedef(?!\\w))\\s+{0,1}(?=(?<!\\w)union(?!\\w))",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.typedef.cpp"
@@ -15488,7 +15488,7 @@
       },
       "patterns": [
         {
-          "begin": "((?<!\\w)union(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+          "begin": "((?<!\\w)union(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
           "beginCaptures": {
             "0": {
               "name": "meta.head.union.cpp"
@@ -15523,7 +15523,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+                  "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
                 },
                 {
                   "captures": {
@@ -15566,14 +15566,14 @@
                       "name": "comment.block.cpp"
                     }
                   },
-                  "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+                  "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
                 },
                 {
                   "match": "DLLEXPORT",
                   "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
                 },
                 {
-                  "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+                  "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
                   "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
                 }
               ]
@@ -15653,7 +15653,7 @@
               "name": "comment.block.cpp"
             }
           },
-          "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))",
+          "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.statement.cpp"
@@ -15691,7 +15691,7 @@
               "begin": "(?<=\\{|<%|\\?\\?<)",
               "beginCaptures": {
               },
-              "end": "\\}|%>|\\?\\?>",
+              "end": "}|%>|\\?\\?>",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.union.cpp"
@@ -15717,10 +15717,10 @@
               ]
             },
             {
-              "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+              "begin": "(?<=}|%>|\\?\\?>)\\s*",
               "beginCaptures": {
               },
-              "end": "[\\s]*(?=;)",
+              "end": "\\s*(?=;)",
               "endCaptures": {
               },
               "name": "meta.tail.union.cpp",
@@ -15752,11 +15752,11 @@
                               "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                             }
                           },
-                          "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+                          "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
                           "name": "invalid.illegal.reference-type.cpp"
                         },
                         {
-                          "match": "\\&",
+                          "match": "&",
                           "name": "storage.modifier.reference.cpp"
                         }
                       ]
@@ -15813,7 +15813,7 @@
                       "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                     }
                   },
-                  "match": "(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))"
+                  "match": "(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))"
                 },
                 {
                   "match": ","
@@ -15825,7 +15825,7 @@
       ]
     },
     "typeid_operator": {
-      "begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
+      "begin": "((?<!\\w)typeid(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
@@ -15889,7 +15889,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -15900,7 +15900,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.type.cpp"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+              "match": "(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)",
               "name": "entity.name.scope-resolution.type.cpp"
             },
             {
@@ -15938,7 +15938,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -15965,7 +15965,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -15990,7 +15990,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -16002,7 +16002,7 @@
               "name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
             },
             {
-              "match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+              "match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
               "name": "storage.type.$0.cpp"
             },
             {
@@ -16044,7 +16044,7 @@
               ]
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.type.cpp"
             }
           ]
@@ -16080,12 +16080,12 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?<!\\w)typename(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<17>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<17>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))"
+      "match": "(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?<!\\w)typename(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<17>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<17>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))"
     },
     "undef": {
       "captures": {
@@ -16113,7 +16113,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -16141,7 +16141,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -16149,11 +16149,11 @@
           "name": "entity.name.function.preprocessor.cpp"
         }
       },
-      "match": "(^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?undef\\b)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+      "match": "(^((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(#)\\s+{0,1}undef\\b)((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))",
       "name": "meta.preprocessor.undef.cpp"
     },
     "union_block": {
-      "begin": "((?<!\\w)union(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?={)|(?:((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:(?!:)))?)",
+      "begin": "((?<!\\w)union(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?=\\{)|(?:((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*+)?(?:((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(:(?!:)))?)",
       "beginCaptures": {
         "0": {
           "name": "meta.head.union.cpp"
@@ -16188,7 +16188,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))"
+              "match": "((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))"
             },
             {
               "captures": {
@@ -16231,14 +16231,14 @@
                   "name": "comment.block.cpp"
                 }
               },
-              "match": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=:|{|$)"
+              "match": "((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:((?<!\\w)final(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?=[:{]|$)"
             },
             {
               "match": "DLLEXPORT",
               "name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
             },
             {
-              "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+              "match": "(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*",
               "name": "entity.name.other.preprocessor.macro.predefined.probably.$0.cpp"
             }
           ]
@@ -16318,7 +16318,7 @@
           "name": "comment.block.cpp"
         }
       },
-      "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))",
+      "end": "(?:(?:(?<=}|%>|\\?\\?>)\\s+{0,1}(;)|(;))|(?=[;>\\[\\]=]))",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.cpp"
@@ -16356,7 +16356,7 @@
           "begin": "(?<=\\{|<%|\\?\\?<)",
           "beginCaptures": {
           },
-          "end": "\\}|%>|\\?\\?>",
+          "end": "}|%>|\\?\\?>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.union.cpp"
@@ -16382,10 +16382,10 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+          "begin": "(?<=}|%>|\\?\\?>)\\s*",
           "beginCaptures": {
           },
-          "end": "[\\s]*(?=;)",
+          "end": "\\s*(?=;)",
           "endCaptures": {
           },
           "name": "meta.tail.union.cpp",
@@ -16423,7 +16423,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -16451,7 +16451,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -16476,7 +16476,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -16508,11 +16508,11 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&",
+              "match": "(?:&((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))){2,}&",
               "name": "invalid.illegal.reference-type.cpp"
             },
             {
-              "match": "\\&",
+              "match": "&",
               "name": "storage.modifier.reference.cpp"
             }
           ]
@@ -16538,7 +16538,7 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         },
@@ -16563,12 +16563,12 @@
                   "name": "comment.block.cpp punctuation.definition.comment.end.cpp"
                 }
               },
-              "match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+"
+              "match": "\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+"
             }
           ]
         }
       },
-      "match": "((?<!\\w)union(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
+      "match": "((?<!\\w)union(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))((?:((?:\\s*+/\\*(?:[^*]++|\\*+(?!/))*+\\*/\\s*+)+)|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=\\S)(?![:{a-zA-Z])"
     },
     "using_name": {
       "captures": {
@@ -16579,7 +16579,7 @@
       "match": "(using)\\s+(?!namespace\\b)"
     },
     "using_namespace": {
-      "begin": "(?<!\\w)(using)\\s+(namespace)\\s+((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<6>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?=;|\\n)",
+      "begin": "(?<!\\w)(using)\\s+(namespace)\\s+((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<6>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*\\s*+)?((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w))(?=[;\\n])",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.using.directive.cpp"
@@ -16625,7 +16625,7 @@
     "wordlike_operators": {
       "patterns": [
         {
-          "match": "(?<!\\w)(?:(?:noexcept)|(?:xor_eq)|(?:and_eq)|(?:delete)|(?:not_eq)|(?:bitand)|(?:bitor)|(?:compl)|(?:or_eq)|(?:not)|(?:xor)|(?:new)|(?:and)|(?:or))(?!\\w)",
+          "match": "(?<!\\w)(?:noexcept|xor_eq|and_eq|delete|not_eq|bitand|bitor|compl|or_eq|not|xor|new|and|or)(?!\\w)",
           "name": "keyword.operator.wordlike.cpp keyword.operator.$0.cpp"
         }
       ]
diff --git a/resources/languages/crystal.json b/resources/languages/crystal.json
index 5b140b3..ef223f5 100644
--- a/resources/languages/crystal.json
+++ b/resources/languages/crystal.json
@@ -4,8 +4,8 @@
     "cr"
   ],
   "firstLineMatch": "^#!/.*\\bcrystal",
-  "foldingStartMarker": "^(\\s*+(annotation|module|class|struct|union|enum|def(?!.*\\bend\\s*$)|unless|if|case|begin|for|while|until|^=begin|(\"(\\\\.|[^\"])*+\"|'(\\\\.|[^'])*+'|[^#\"'])*(\\s(do|begin|case)|(?<!\\$)[-+=&|*/~%^<>~]\\s*+(if|unless)))\\b(?![^;]*+;.*?\\bend\\b)|(\"(\\\\.|[^\"])*+\"|'(\\\\.|[^'])*+'|[^#\"'])*(\\{(?![^}]*+\\})|\\[(?![^\\]]*+\\]))).*$|[#].*?\\(fold\\)\\s*+$",
-  "foldingStopMarker": "((^|;)\\s*+end\\s*+([#].*)?$|(^|;)\\s*+end\\..*$|^\\s*+[}\\]],?\\s*+([#].*)?$|[#].*?\\(end\\)\\s*+$|^=end)",
+  "foldingStartMarker": "^(\\s*+(annotation|module|class|struct|union|enum|def(?!.*\\bend\\s*$)|unless|if|case|begin|for|while|until|^=begin|(\"(\\\\.|[^\"])*+\"|'(\\\\.|[^'])*+'|[^#\"'])*(\\s(do|begin|case)|(?<!\\$)[-+=\\&|*/~%^<>]\\s*+(if|unless)))\\b(?![^;]*+;.*?\\bend\\b)|(\"(\\\\.|[^\"])*+\"|'(\\\\.|[^'])*+'|[^#\"'])*(\\{(?![^}]*+})|\\[(?![^\\]]*+]))).*$|#.*?\\(fold\\)\\s*+$",
+  "foldingStopMarker": "((^|;)\\s*+end\\s*+(#.*)?$|(^|;)\\s*+end\\..*$|^\\s*+[}\\]],?\\s*+(#.*)?$|#.*?\\(end\\)\\s*+$|^=end)",
   "name": "crystal",
   "patterns": [
     {
@@ -119,38 +119,31 @@
           "name": "entity.name.lib.type.value.crystal"
         }
       },
-      "comment": "type in lib",
       "match": "(?<!\\.)\\b(type)\\s+([A-Z]\\w+)\\s*(=)\\s*(.+)",
       "name": "meta.lib.type.crystal"
     },
     {
-      "comment": "everything being a reserved word, not a value, and needing a 'end' is a..",
       "match": "(?<!\\.)\\b(fun|begin|case|class|else|elsif|end|ensure|enum|for|if|macro|module|rescue|struct|then|union|unless|until|when|while)\\b(?![?!:])",
       "name": "keyword.control.crystal"
     },
     {
-      "comment": "everything being a reserved word, not a value, and not needing a 'end' is a..",
       "match": "(?<!\\.)\\b(abstract|alias|asm|break|extend|in|include|next|of|private|protected|struct|return|select|super|with|yield)\\b(?![?!:])",
       "name": "keyword.control.primary.crystal"
     },
     {
-      "comment": "everything being a spec keyword, not a value, and needing a block is a..",
       "match": "(?<!\\.)\\b(describe|context|it|expect_raises)\\b(?![?!:])",
       "name": "keyword.control.crystal"
     },
     {
-      "comment": "contextual smart pair support for block parameters",
       "match": "(?<!\\.)\\bdo\\b\\s*",
       "name": "keyword.control.start-block.crystal"
     },
     {
-      "comment": "contextual smart pair support",
       "match": "(?<=\\{)(\\s+)",
       "name": "meta.syntax.crystal.start-block"
     },
     {
-      "comment": "Just as above but being not a logical operation",
-      "match": "(?<!\\.)\\b(pointerof|typeof|sizeof|instance_sizeof|offsetof|previous_def|forall|out|uninitialized)\\b(?![?!:])|\\.(is_a\\?|nil\\?|responds_to\\?|as\\?|as\b)",
+      "match": "(?<!\\.)\\b(pointerof|typeof|sizeof|instance_sizeof|offsetof|previous_def|forall|out|uninitialized)\\b(?![?!:])|\\.(is_a\\?|nil\\?|responds_to\\?|as\\?|as\\x08)",
       "name": "keyword.control.pseudo-method.crystal"
     },
     {
@@ -170,7 +163,6 @@
       "name": "variable.language.self.crystal"
     },
     {
-      "comment": "https://crystal-lang.org/api/0.36.1/Object.html#macro-summary",
       "match": "(?<!\\.)\\b(((class_)?((getter|property)\\b[!?]?|setter\\b))|(def_(clone|equals|equals_and_hash|hash)|delegate|forward_missing_to)\\b)(?![?!:])",
       "name": "support.function.kernel.crystal"
     },
@@ -222,7 +214,7 @@
           "name": "punctuation.definition.variable.crystal"
         }
       },
-      "match": "(?!%[Qxrqwi]?[\\(\\[\\{\\<\\|])%([a-zA-Z_]\\w*\\.)*[a-zA-Z_]\\w*",
+      "match": "(?!%[Qxrqwi]?[(\\[{<|])%([a-zA-Z_]\\w*\\.)*[a-zA-Z_]\\w*",
       "name": "variable.other.readwrite.fresh.crystal"
     },
     {
@@ -231,7 +223,7 @@
           "name": "punctuation.definition.variable.crystal"
         }
       },
-      "match": "(\\$)(!|@|&|`|'|\\+|\\d+|~|=|/|\\\\|,|;|\\.|<|>|_|\\*|\\$|\\?|:|\"|-[0adFiIlpv])",
+      "match": "(\\$)([!@\\&`'+]|\\d+|[~=/\\\\,;.<>_*$?:\"]|-[0adFiIlpv])",
       "name": "variable.other.readwrite.global.pre-defined.crystal"
     },
     {
@@ -241,7 +233,7 @@
           "name": "variable.other.constant.crystal"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "name": "meta.environment-variable.crystal",
       "patterns": [
         {
@@ -250,22 +242,19 @@
       ]
     },
     {
-      "comment": "Literals name of Crystal",
       "match": "\\b[A-Z\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*",
       "name": "support.class.crystal"
     },
     {
-      "comment": "Fetch from https://crystal-lang.org/api/0.36.1/toplevel.html",
       "match": "(?<!\\.)\\b(abort|at_exit|caller|exit|gets|loop|main|p|pp|print|printf|puts|raise|rand|read_line|sleep|spawn|sprintf|system|debugger|record|spawn)\\b(?![?!:])",
       "name": "support.function.kernel.crystal"
     },
     {
-      "comment": "Constant name in any where",
       "match": "\\b[_A-Z]+\\b",
       "name": "variable.other.constant.crystal"
     },
     {
-      "begin": "(?=def\\b)(?<=^|\\s)(def)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|\\^|===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[][?=]?|\\[]=?))\\s*(\\()",
+      "begin": "(?=def\\b)(?<=^|\\s)(def)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|\\^|===?|!=|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[][?=]?|\\[]=?))\\s*(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.def.crystal"
@@ -277,7 +266,6 @@
           "name": "punctuation.definition.parameters.crystal"
         }
       },
-      "comment": "The method pattern comes from the symbol pattern. See there for an explanation.",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -305,7 +293,7 @@
                   "name": "variable.parameter.function.crystal"
                 }
               },
-              "match": "\\G([&*]?)(?:([_a-zA-Z]\\w*(:))|([_a-zA-Z]\\w*))"
+              "match": "\\G([\\&*]?)(?:([_a-zA-Z]\\w*(:))|([_a-zA-Z]\\w*))"
             },
             {
               "include": "$self"
@@ -323,42 +311,34 @@
           "name": "entity.name.function.crystal"
         }
       },
-      "comment": " the optional name is just to catch the def also without a method-name",
-      "match": "(?=def\\b)(?<=^|\\s)(def)\\b(\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|\\^|===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[][?=]?|\\[]=?)))?",
+      "match": "(?=def\\b)(?<=^|\\s)(def)\\b(\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|\\^|===?|!=|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[][?=]?|\\[]=?)))?",
       "name": "meta.function.method.without-arguments.crystal"
     },
     {
-      "comment": "Floating point literal (fraction)",
-      "match": "\\b[0-9][0-9_]*\\.[0-9][0-9_]*([eE][+-]?[0-9_]+)?(f32|f64)?\\b",
+      "match": "\\b[0-9][0-9_]*\\.[0-9][0-9_]*([eE][+-]?[0-9_]+)?(f(?:32|64))?\\b",
       "name": "constant.numeric.float.crystal"
     },
     {
-      "comment": "Floating point literal (exponent)",
-      "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?[eE][+-]?[0-9_]+(f32|f64)?\\b",
+      "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?[eE][+-]?[0-9_]+(f(?:32|64))?\\b",
       "name": "constant.numeric.float.crystal"
     },
     {
-      "comment": "Floating point literal (typed)",
-      "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?([eE][+-]?[0-9_]+)?(f32|f64)\\b",
+      "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?([eE][+-]?[0-9_]+)?(f(?:32|64))\\b",
       "name": "constant.numeric.float.crystal"
     },
     {
-      "comment": "Integer literal (decimal)",
       "match": "\\b(?!0[0-9])[0-9][0-9_]*([ui](8|16|32|64|128))?\\b",
       "name": "constant.numeric.integer.decimal.crystal"
     },
     {
-      "comment": "Integer literal (hexadecimal)",
-      "match": "\\b0x[a-fA-F0-9_]+([ui](8|16|32|64|128))?\\b",
+      "match": "\\b0x[_\\h]+([ui](8|16|32|64|128))?\\b",
       "name": "constant.numeric.integer.hexadecimal.crystal"
     },
     {
-      "comment": "Integer literal (octal)",
       "match": "\\b0o[0-7_]+([ui](8|16|32|64|128))?\\b",
       "name": "constant.numeric.integer.octal.crystal"
     },
     {
-      "comment": "Integer literal (binary)",
       "match": "\\b0b[01_]+([ui](8|16|32|64|128))?\\b",
       "name": "constant.numeric.integer.binary.crystal"
     },
@@ -369,7 +349,6 @@
           "name": "punctuation.definition.symbol.begin.crystal"
         }
       },
-      "comment": "symbol literal with '' delimiter",
       "end": "'",
       "endCaptures": {
         "0": {
@@ -391,7 +370,6 @@
           "name": "punctuation.section.symbol.begin.crystal"
         }
       },
-      "comment": "symbol literal with \"\" delimiter",
       "end": "\"",
       "endCaptures": {
         "0": {
@@ -409,7 +387,6 @@
       ]
     },
     {
-      "comment": "Needs higher precedence than regular expressions.",
       "match": "(?<!\\()/=",
       "name": "keyword.operator.assignment.augmented.crystal"
     },
@@ -420,7 +397,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "string literal with '' delimiter",
       "end": "'",
       "endCaptures": {
         "0": {
@@ -430,7 +406,7 @@
       "name": "string.quoted.single.crystal",
       "patterns": [
         {
-          "match": "\\\\'|\\\\\\\\",
+          "match": "\\\\['\\\\]",
           "name": "constant.character.escape.crystal"
         }
       ]
@@ -442,7 +418,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "string literal with interpolation and \"\" delimiter",
       "end": "\"",
       "endCaptures": {
         "0": {
@@ -466,7 +441,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "execute string (allows for interpolation)",
       "end": "`",
       "endCaptures": {
         "0": {
@@ -490,8 +464,7 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "execute string (allow for interpolation)",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -517,8 +490,7 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "execute string (allow for interpolation)",
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -538,14 +510,13 @@
       ]
     },
     {
-      "begin": "%x\\<",
+      "begin": "%x<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "execute string (allow for interpolation)",
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -571,7 +542,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "execute string (allow for interpolation)",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -598,7 +568,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "execute string (allow for interpolation)",
       "end": "\\|",
       "endCaptures": {
         "0": {
@@ -616,7 +585,7 @@
       ]
     },
     {
-      "begin": "(?:^|(?<=[=>~(?:\\[,|&;]|[\\s;]if\\s|[\\s;]elsif\\s|[\\s;]while\\s|[\\s;]unless\\s|[\\s;]when\\s|[\\s;]assert_match\\s|[\\s;]or\\s|[\\s;]and\\s|[\\s;]not\\s|[\\s.]index\\s|[\\s.]scan\\s|[\\s.]sub\\s|[\\s.]sub!\\s|[\\s.]gsub\\s|[\\s.]gsub!\\s|[\\s.]match\\s)|(?<=^when\\s|^if\\s|^elsif\\s|^while\\s|^unless\\s))\\s*((/))(?![*+{}?])",
+      "begin": "(?:^|(?<=[=>~(?:\\[,|\\&;]|[\\s;]if\\s|[\\s;]elsif\\s|[\\s;]while\\s|[\\s;]unless\\s|[\\s;]when\\s|[\\s;]assert_match\\s|[\\s;]or\\s|[\\s;]and\\s|[\\s;]not\\s|[\\s.]index\\s|[\\s.]scan\\s|[\\s.]sub\\s|[\\s.]sub!\\s|[\\s.]gsub\\s|[\\s.]gsub!\\s|[\\s.]match\\s)|(?<=^(?:when\\s|if\\s|elsif\\s|while\\s|unless\\s)))\\s*((/))(?![*+{}?])",
       "captures": {
         "1": {
           "name": "string.regexp.classic.crystal"
@@ -625,7 +594,6 @@
           "name": "punctuation.definition.string.crystal"
         }
       },
-      "comment": "regular expressions (normal) we only start a regexp if the character before it (excluding whitespace) is what we think is before a regexp",
       "contentName": "string.regexp.classic.crystal",
       "end": "((/[imsx]*))",
       "patterns": [
@@ -641,8 +609,7 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "regular expressions (literal)",
-      "end": "\\}[imsx]*",
+      "end": "}[imsx]*",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -665,8 +632,7 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "regular expressions (literal)",
-      "end": "\\][imsx]*",
+      "end": "][imsx]*",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -689,7 +655,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "regular expressions (literal)",
       "end": "\\)[imsx]*",
       "endCaptures": {
         "0": {
@@ -707,14 +672,13 @@
       ]
     },
     {
-      "begin": "%r\\<",
+      "begin": "%r<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "regular expressions (literal)",
-      "end": "\\>[imsx]*",
+      "end": ">[imsx]*",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -737,7 +701,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "regular expressions (literal)",
       "end": "\\|[imsx]*",
       "endCaptures": {
         "0": {
@@ -758,7 +721,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal capable of interpolation ()",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -785,8 +747,7 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal capable of interpolation []",
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -806,14 +767,13 @@
       ]
     },
     {
-      "begin": "%Q?\\<",
+      "begin": "%Q?<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal capable of interpolation <>",
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -839,8 +799,7 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal capable of interpolation -- {}",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -866,7 +825,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal capable of interpolation -- ||",
       "end": "\\|",
       "endCaptures": {
         "0": {
@@ -890,7 +848,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal incapable of interpolation -- ()",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -900,7 +857,7 @@
       "name": "string.quoted.other.literal.lower.crystal",
       "patterns": [
         {
-          "match": "\\\\\\)|\\\\\\\\",
+          "match": "\\\\[)\\\\]",
           "name": "constant.character.escape.crystal"
         },
         {
@@ -909,14 +866,13 @@
       ]
     },
     {
-      "begin": "%[qwi]\\<",
+      "begin": "%[qwi]<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal incapable of interpolation -- <>",
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -925,7 +881,7 @@
       "name": "string.quoted.other.literal.lower.crystal",
       "patterns": [
         {
-          "match": "\\\\\\>|\\\\\\\\",
+          "match": "\\\\[>\\\\]",
           "name": "constant.character.escape.crystal"
         },
         {
@@ -940,8 +896,7 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal incapable of interpolation -- []",
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -950,7 +905,7 @@
       "name": "string.quoted.other.literal.lower.crystal",
       "patterns": [
         {
-          "match": "\\\\\\]|\\\\\\\\",
+          "match": "\\\\[\\]\\\\]",
           "name": "constant.character.escape.crystal"
         },
         {
@@ -965,8 +920,7 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal incapable of interpolation -- {}",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.crystal"
@@ -975,7 +929,7 @@
       "name": "string.quoted.other.literal.lower.crystal",
       "patterns": [
         {
-          "match": "\\\\\\}|\\\\\\\\",
+          "match": "\\\\[}\\\\]",
           "name": "constant.character.escape.crystal"
         },
         {
@@ -990,7 +944,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "literal incapable of interpolation -- ||",
       "end": "\\|",
       "endCaptures": {
         "0": {
@@ -1000,7 +953,6 @@
       "name": "string.quoted.other.literal.lower.crystal",
       "patterns": [
         {
-          "comment": "Cant be named because its not necessarily an escape.",
           "match": "\\\\."
         }
       ]
@@ -1011,8 +963,7 @@
           "name": "punctuation.definition.constant.crystal"
         }
       },
-      "comment": "symbols",
-      "match": "(?<!:)(:)(?>[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\][?=]?|@@?[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*)",
+      "match": "(?<!:)(:)(?>[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[][?=]?|@@?[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*)",
       "name": "constant.other.symbol.crystal"
     },
     {
@@ -1021,8 +972,7 @@
           "name": "punctuation.definition.constant.crystal"
         }
       },
-      "comment": "symbols",
-      "match": "(?>[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*(?>[?!])?)(:)(?!:)",
+      "match": "(?>[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*[?!]?)(:)(?!:)",
       "name": "constant.other.symbol.crystal.19syntax"
     },
     {
@@ -1035,7 +985,7 @@
       "name": "comment.line.number-sign.crystal"
     },
     {
-      "match": "(?<!}})\\b_([\\w]+[?!]?)\\b(?!\\()",
+      "match": "(?<!}})\\b_(\\w+[?!]?)\\b(?!\\()",
       "name": "comment.unused.crystal"
     },
     {
@@ -1045,7 +995,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with embedded HTML and indented terminator",
       "contentName": "text.html.embedded.crystal",
       "end": "\\s*\\2\\b",
       "endCaptures": {
@@ -1076,7 +1025,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with embedded SQL and indented terminator",
       "contentName": "text.sql.embedded.crystal",
       "end": "\\s*\\2\\b",
       "endCaptures": {
@@ -1107,7 +1055,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with embedded css and intented terminator",
       "contentName": "text.css.embedded.crystal",
       "end": "\\s*\\2\\b",
       "endCaptures": {
@@ -1138,7 +1085,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with embedded c++ and intented terminator",
       "contentName": "text.c++.embedded.crystal",
       "end": "\\s*\\2\\b",
       "endCaptures": {
@@ -1169,7 +1115,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with embedded c++ and intented terminator",
       "contentName": "text.c.embedded.crystal",
       "end": "\\s*\\2\\b",
       "endCaptures": {
@@ -1194,13 +1139,12 @@
       ]
     },
     {
-      "begin": "(?><<-('?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1)",
+      "begin": "(?><<-('?)((?:[_\\w]+_|)J(?:S|AVASCRIPT))\\b\\1)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with embedded javascript and intented terminator",
       "contentName": "text.js.embedded.crystal",
       "end": "\\s*\\2\\b",
       "endCaptures": {
@@ -1231,7 +1175,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with embedded javascript and intented terminator",
       "contentName": "text.js.jquery.embedded.crystal",
       "end": "\\s*\\2\\b",
       "endCaptures": {
@@ -1256,13 +1199,12 @@
       ]
     },
     {
-      "begin": "(?><<-('?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1)",
+      "begin": "(?><<-('?)((?:[_\\w]+_|)SH(?:|ELL))\\b\\1)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with embedded shell and intented terminator",
       "contentName": "text.shell.embedded.crystal",
       "end": "\\s*\\2\\b",
       "endCaptures": {
@@ -1293,7 +1235,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with embedded crystal and intented terminator",
       "contentName": "text.crystal.embedded.crystal",
       "end": "\\s*\\2\\b",
       "endCaptures": {
@@ -1324,7 +1265,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with indented terminator",
       "end": "\\s*\\1\\b",
       "endCaptures": {
         "0": {
@@ -1348,7 +1288,6 @@
           "name": "punctuation.definition.string.begin.crystal"
         }
       },
-      "comment": "heredoc with indented terminator",
       "end": "\\s*\\1\\b",
       "endCaptures": {
         "0": {
@@ -1369,7 +1308,7 @@
       ]
     },
     {
-      "begin": "(?<={|{\\s|[^A-Za-z0-9_]do|^do|[^A-Za-z0-9_]do\\s|^do\\s)(\\|)",
+      "begin": "(?<=\\{|\\{\\s|[^A-Za-z0-9_]do|^do|[^A-Za-z0-9_]do\\s|^do\\s)(\\|)",
       "captures": {
         "1": {
           "name": "punctuation.separator.variable.crystal"
@@ -1403,7 +1342,7 @@
       "name": "keyword.operator.assignment.augmented.crystal"
     },
     {
-      "match": "<=>|<(?!<|=)|>(?!<|=|>)|<=|>=|===|==|=~|!=|!~|(?<=[ \\t])\\?",
+      "match": "<=>|<(?![<=])|>(?![<=>])|<=|>=|===|==|=~|!=|!~|(?<=[ \\t])\\?",
       "name": "keyword.operator.comparison.crystal"
     },
     {
@@ -1411,7 +1350,7 @@
       "name": "keyword.operator.logical.crystal"
     },
     {
-      "match": "(\\{\\%|\\%\\}|\\{\\{|\\}\\})",
+      "match": "(\\{%|%}|\\{\\{|}})",
       "name": "keyword.operator.macro.crystal"
     },
     {
@@ -1420,11 +1359,10 @@
           "name": "punctuation.separator.method.crystal"
         }
       },
-      "comment": "Safe navigation operator",
       "match": "(&\\.)\\s*(?![A-Z])"
     },
     {
-      "match": "(%|&|\\*\\*|\\*|\\+|\\-|/)",
+      "match": "([%\\&]|\\*\\*|[*+\\-/])",
       "name": "keyword.operator.arithmetic.crystal"
     },
     {
@@ -1432,7 +1370,7 @@
       "name": "keyword.operator.assignment.crystal"
     },
     {
-      "match": "\\||~|>>",
+      "match": "[|~]|>>",
       "name": "keyword.operator.other.crystal"
     },
     {
@@ -1440,7 +1378,7 @@
       "name": "punctuation.separator.other.crystal"
     },
     {
-      "match": "\\;",
+      "match": ";",
       "name": "punctuation.separator.statement.crystal"
     },
     {
@@ -1452,15 +1390,15 @@
       "name": "punctuation.separator.method.crystal"
     },
     {
-      "match": "\\{|\\}",
+      "match": "[{}]",
       "name": "punctuation.section.scope.crystal"
     },
     {
-      "match": "\\[|\\]",
+      "match": "[\\[\\]]",
       "name": "punctuation.section.array.crystal"
     },
     {
-      "match": "\\(|\\)",
+      "match": "[()]",
       "name": "punctuation.section.function.crystal"
     },
     {
@@ -1478,15 +1416,13 @@
       ]
     },
     {
-      "comment": "This is kindof experimental. There really is no way to perfectly match all regular variables, but you can pretty well assume that any normal word in certain curcumstances that havnt already been scoped as something else are probably variables, and the advantages beat the potential errors",
-      "match": "((?<=\\W)\\b|^)\\w+\\b(?=\\s*([\\]\\)\\}\\=\\+\\-\\*\\/\\^\\$\\,\\.]|<\\s|<<[\\s|\\.]))",
+      "match": "((?<=\\W)\\b|^)\\w+\\b(?=\\s*([\\])}=+\\-*/^$,.]|<\\s|<<[\\s|.]))",
       "name": "variable.other.crystal"
     }
   ],
   "repository": {
     "escaped_char": {
-      "comment": "https://crystal-lang.org/reference/syntax_and_semantics/literals/string.html",
-      "match": "\\\\(?:[0-7]{1,3}|x[a-fA-F0-9]{2}|u[a-fA-F0-9]{4}|u\\{[a-fA-F0-9 ]+\\}|.)",
+      "match": "\\\\(?:[0-7]{1,3}|x\\h{2}|u\\h{4}|u\\{[ \\h]+}|.)",
       "name": "constant.character.escape.crystal"
     },
     "heredoc": {
@@ -1508,7 +1444,7 @@
             }
           },
           "contentName": "source.crystal",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.crystal"
@@ -1536,7 +1472,7 @@
                       "name": "punctuation.section.scope.crystal"
                     }
                   },
-                  "end": "\\}",
+                  "end": "}",
                   "patterns": [
                     {
                       "include": "#nest_curly_and_self"
@@ -1586,7 +1522,7 @@
           "name": "punctuation.section.scope.crystal"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#nest_brackets"
@@ -1600,7 +1536,7 @@
           "name": "punctuation.section.scope.crystal"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#interpolated_crystal"
@@ -1620,7 +1556,7 @@
           "name": "punctuation.section.scope.crystal"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#regex_sub"
@@ -1637,7 +1573,7 @@
           "name": "punctuation.section.scope.crystal"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#nest_curly"
@@ -1653,7 +1589,7 @@
               "name": "punctuation.section.scope.crystal"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#nest_curly_and_self"
@@ -1672,7 +1608,7 @@
           "name": "punctuation.section.scope.crystal"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#interpolated_crystal"
@@ -1692,7 +1628,7 @@
           "name": "punctuation.section.scope.crystal"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#regex_sub"
@@ -1703,13 +1639,13 @@
       ]
     },
     "nest_ltgt": {
-      "begin": "\\<",
+      "begin": "<",
       "captures": {
         "0": {
           "name": "punctuation.section.scope.crystal"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "patterns": [
         {
           "include": "#nest_ltgt"
@@ -1717,13 +1653,13 @@
       ]
     },
     "nest_ltgt_i": {
-      "begin": "\\<",
+      "begin": "<",
       "captures": {
         "0": {
           "name": "punctuation.section.scope.crystal"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "patterns": [
         {
           "include": "#interpolated_crystal"
@@ -1737,13 +1673,13 @@
       ]
     },
     "nest_ltgt_r": {
-      "begin": "\\<",
+      "begin": "<",
       "captures": {
         "0": {
           "name": "punctuation.section.scope.crystal"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "patterns": [
         {
           "include": "#regex_sub"
@@ -1821,7 +1757,7 @@
               "name": "punctuation.definition.arbitrary-repetition.crystal"
             }
           },
-          "match": "({)\\d+(,\\d+)?(})",
+          "match": "(\\{)\\d+(,\\d+)?(})",
           "name": "string.regexp.arbitrary-repetition.crystal"
         },
         {
@@ -1860,8 +1796,7 @@
               "name": "punctuation.definition.comment.crystal"
             }
           },
-          "comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
-          "match": "(?<=^|\\s)(#)\\s[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$",
+          "match": "(?<=^|\\s)(#)\\s[a-zA-Z0-9,. \\t?!\\-[^\\x00-\\x7F]]*$",
           "name": "comment.line.number-sign.crystal"
         }
       ]
diff --git a/resources/languages/csharp.json b/resources/languages/csharp.json
index dbf9c00..f494a9c 100644
--- a/resources/languages/csharp.json
+++ b/resources/languages/csharp.json
@@ -29,7 +29,7 @@
             }
           },
           "contentName": "meta.accessor.getter.cs",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -57,7 +57,7 @@
         }
       },
       "contentName": "meta.accessor.getter.cs",
-      "end": "(?=;|\\})",
+      "end": "(?=[;}])",
       "patterns": [
         {
           "include": "#ref-modifier"
@@ -77,7 +77,7 @@
             }
           },
           "contentName": "meta.accessor.setter.cs",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -97,7 +97,7 @@
             }
           },
           "contentName": "meta.accessor.setter.cs",
-          "end": "(?=;|\\})",
+          "end": "(?=[;}])",
           "patterns": [
             {
               "include": "#ref-modifier"
@@ -163,7 +163,7 @@
               "include": "#intrusive"
             },
             {
-              "begin": "(?={)",
+              "begin": "(?=\\{)",
               "end": "(?=[,;)}])",
               "patterns": [
                 {
@@ -249,7 +249,7 @@
           "name": "keyword.operator.expression.new.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -272,7 +272,7 @@
               "name": "storage.modifier.out.cs"
             }
           },
-          "end": "(?=,|\\)|\\])",
+          "end": "(?=[,)\\]])",
           "patterns": [
             {
               "include": "#declaration-expression-local"
@@ -313,7 +313,7 @@
       ]
     },
     "array-creation-expression": {
-      "begin": "\\b(new|stackalloc)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))?\\s*(?=\\[)",
+      "begin": "\\b(new|stackalloc)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)?\\s*(?=\\[)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.$1.cs"
@@ -326,7 +326,7 @@
           ]
         }
       },
-      "end": "(?<=\\])",
+      "end": "(?<=])",
       "patterns": [
         {
           "include": "#bracketed-argument-list"
@@ -346,10 +346,10 @@
           ]
         }
       },
-      "match": "(?<!\\.)\\b(as)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?(?!\\?))?(?:\\s*\\[\\s*(?:,\\s*)*\\](?:\\s*\\?(?!\\?))?)*))?"
+      "match": "(?<!\\.)\\b(as)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?(?!\\?))?(?:\\s*\\[\\s*(?:,\\s*)*](?:\\s*\\?(?!\\?))?)*)?"
     },
     "assignment-expression": {
-      "begin": "(?:\\*|/|%|\\+|-|\\?\\?|\\&|\\^|<<|>>>?|\\|)?=(?!=|>)",
+      "begin": "(?:[*/%+-]|\\?\\?|[\\&^]|<<|>>>?|\\|)?=(?![=>])",
       "beginCaptures": {
         "0": {
           "patterns": [
@@ -359,7 +359,7 @@
           ]
         }
       },
-      "end": "(?=[,\\)\\];}])",
+      "end": "(?=[,)\\];}])",
       "patterns": [
         {
           "include": "#ref-modifier"
@@ -376,11 +376,11 @@
           "name": "keyword.operator.assignment.compound.cs"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>>?=|\\|=",
+          "match": "&=|\\^=|<<=|>>>?=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.cs"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.cs"
         }
       ]
@@ -430,7 +430,7 @@
           "name": "entity.name.variable.property.cs"
         }
       },
-      "end": "(?=(,|\\)))",
+      "end": "(?=([,)]))",
       "patterns": [
         {
           "include": "#operator-assignment"
@@ -441,7 +441,7 @@
       ]
     },
     "attribute-section": {
-      "begin": "(\\[)(assembly|module|field|event|method|param|property|return|type)?(\\:)?",
+      "begin": "(\\[)(assembly|module|field|event|method|param|property|return|type)?(:)?",
       "beginCaptures": {
         "1": {
           "name": "punctuation.squarebracket.open.cs"
@@ -453,7 +453,7 @@
           "name": "punctuation.separator.colon.cs"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.squarebracket.close.cs"
@@ -482,7 +482,7 @@
           "name": "keyword.operator.expression.await.cs"
         }
       },
-      "end": "(?<=})|(?=;|})",
+      "end": "(?<=})|(?=[;}])",
       "patterns": [
         {
           "include": "#foreach-statement"
@@ -522,7 +522,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -553,7 +553,7 @@
           "name": "punctuation.squarebracket.open.cs"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.cs"
@@ -578,7 +578,7 @@
           "name": "punctuation.squarebracket.open.cs"
         }
       },
-      "end": "(?=(\\]))",
+      "end": "(?=(]))",
       "endCaptures": {
         "1": {
           "name": "punctuation.squarebracket.close.cs"
@@ -587,7 +587,7 @@
       "patterns": [
         {
           "begin": "(?<=\\[)",
-          "end": "(?=\\])",
+          "end": "(?=])",
           "patterns": [
             {
               "include": "#comment"
@@ -638,7 +638,7 @@
           "name": "punctuation.parenthesis.close.cs"
         }
       },
-      "match": "(\\()\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*(\\))(?=\\s*-*!*@?[_[:alnum:]\\(])"
+      "match": "(\\()\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*(\\))(?=\\s*-*!*@?[_[:alnum:](])"
     },
     "casted-constant-pattern": {
       "begin": "(\\()([\\s.:@_[:alnum:]]+)(\\))(?=[\\s+\\-!~]*@?[_[:alnum:]('\"]+)",
@@ -660,7 +660,7 @@
           "name": "punctuation.parenthesis.close.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "include": "#casted-constant-pattern"
@@ -696,7 +696,7 @@
               "name": "punctuation.separator.coloncolon.cs"
             }
           },
-          "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\:\\:)"
+          "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(::)"
         },
         {
           "captures": {
@@ -710,7 +710,7 @@
           "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\.)"
         },
         {
-          "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+          "match": "@?[_[:alpha:]][_[:alnum:]]*",
           "name": "variable.other.constant.cs"
         }
       ]
@@ -722,7 +722,7 @@
           "name": "keyword.control.exception.catch.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "\\(",
@@ -751,7 +751,7 @@
                   "name": "entity.name.variable.local.cs"
                 }
               },
-              "match": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*(?:(\\g<identifier>)\\b)?"
+              "match": "(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*(?:(\\g<identifier>)\\b)?"
             }
           ]
         },
@@ -767,7 +767,7 @@
       ]
     },
     "char-character-escape": {
-      "match": "\\\\(x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4}|.)",
+      "match": "\\\\(x\\h{1,4}|u\\h{4}|.)",
       "name": "constant.character.escape.cs"
     },
     "char-literal": {
@@ -777,7 +777,7 @@
           "name": "punctuation.definition.char.begin.cs"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.char.end.cs"
@@ -795,7 +795,7 @@
     },
     "class-declaration": {
       "begin": "(?=(\\brecord\\b\\s+)?\\bclass\\b)",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(\\b(record)\\b\\s+)?\\b(class)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*",
@@ -836,7 +836,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -1043,7 +1043,7 @@
     },
     "constructor-declaration": {
       "begin": "(?=@?[_[:alpha:]][_[:alnum:]]*\\s*\\()",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "captures": {
@@ -1116,7 +1116,7 @@
       "name": "keyword.control.context.$1.cs"
     },
     "conversion-operator-declaration": {
-      "begin": "(?<explicit_or_implicit_keyword>(?:\\b(?:explicit|implicit)))\\s*(?<operator_keyword>(?:\\b(?:operator)))\\s*(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*(?=\\()",
+      "begin": "(?<explicit_or_implicit_keyword>\\b(?:explicit|implicit))\\s*(?<operator_keyword>\\boperator)\\s*(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1149,7 +1149,7 @@
           ]
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1181,7 +1181,7 @@
           "name": "entity.name.variable.local.cs"
         }
       },
-      "match": "(?:\\b(var)\\b|(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))\\s+(\\g<identifier>)\\b\\s*(?=[,)\\]])"
+      "match": "(?:\\b(var)\\b|(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\b\\s*(?=[,)\\]])"
     },
     "declaration-expression-tuple": {
       "captures": {
@@ -1199,7 +1199,7 @@
           "name": "entity.name.variable.tuple-element.cs"
         }
       },
-      "match": "(?:\\b(var)\\b|(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))\\s+(\\g<identifier>)\\b\\s*(?=[,)])"
+      "match": "(?:\\b(var)\\b|(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\b\\s*(?=[,)])"
     },
     "declarations": {
       "patterns": [
@@ -1221,7 +1221,7 @@
           "name": "keyword.operator.assignment.cs"
         }
       },
-      "end": "(?=,|\\))",
+      "end": "(?=[,)])",
       "patterns": [
         {
           "include": "#expression"
@@ -1237,7 +1237,7 @@
       "match": "\\b(default)\\b"
     },
     "delegate-declaration": {
-      "begin": "(?:\\b(delegate)\\b)\\s+(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
+      "begin": "\\b(delegate)\\b\\s+(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.delegate.cs"
@@ -1315,7 +1315,7 @@
           "name": "entity.name.function.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1358,7 +1358,7 @@
           "name": "keyword.control.loop.do.cs"
         }
       },
-      "end": "(?=;|})",
+      "end": "(?=[;}])",
       "patterns": [
         {
           "include": "#statement"
@@ -1366,7 +1366,7 @@
       ]
     },
     "double-raw-interpolation": {
-      "begin": "(?<=[^\\{][^\\{]|^)((?:\\{)*)(\\{\\{)(?=[^\\{])",
+      "begin": "(?<=[^{][^{]|^)(\\{*)(\\{\\{)(?=[^{])",
       "beginCaptures": {
         "1": {
           "name": "string.quoted.double.cs"
@@ -1375,7 +1375,7 @@
           "name": "punctuation.definition.interpolation.begin.cs"
         }
       },
-      "end": "\\}\\}",
+      "end": "}}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.interpolation.end.cs"
@@ -1407,7 +1407,7 @@
           "name": "keyword.operator.null-conditional.cs"
         }
       },
-      "end": "(?<=\\])(?!\\s*\\[)",
+      "end": "(?<=])(?!\\s*\\[)",
       "patterns": [
         {
           "include": "#bracketed-argument-list"
@@ -1430,11 +1430,11 @@
     },
     "enum-declaration": {
       "begin": "(?=\\benum\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(?=enum)",
-          "end": "(?=\\{)",
+          "end": "(?=\\{)|(?=;)",
           "patterns": [
             {
               "include": "#comment"
@@ -1473,7 +1473,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -1499,7 +1499,7 @@
                   "name": "entity.name.variable.enum-member.cs"
                 }
               },
-              "end": "(?=(,|\\}))",
+              "end": "(?=([,}]))",
               "patterns": [
                 {
                   "include": "#comment"
@@ -1526,7 +1526,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -1540,13 +1540,13 @@
           "include": "#attribute-section"
         },
         {
-          "begin": "\\b(add|remove)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
+          "begin": "\\b(add|remove)\\b\\s*(?=[{;]|=>|//|/\\*|$)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.accessor.$1.cs"
             }
           },
-          "end": "(?<=\\}|;)|(?=\\})",
+          "end": "(?<=[};])|(?=})",
           "patterns": [
             {
               "include": "#accessor-setter"
@@ -1556,7 +1556,7 @@
       ]
     },
     "event-declaration": {
-      "begin": "\\b(event)\\b\\s*(?<return_type>(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(?=\\{|;|,|=|//|/\\*|$)",
+      "begin": "\\b(event)\\b\\s*(?<return_type>(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(?=[{;,=]|//|/\\*|$)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.event.cs"
@@ -1582,7 +1582,7 @@
           "name": "entity.name.variable.event.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1632,7 +1632,7 @@
           "name": "entity.name.variable.parameter.cs"
         }
       },
-      "match": "(?:\\b(ref|params|out|in)\\b\\s*)?(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args><(?:[^<>]|\\g<type_args>)*>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)*\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*\\b(\\g<identifier>)\\b"
+      "match": "(?:\\b(ref|params|out|in)\\b\\s*)?(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args><(?:[^<>]|\\g<type_args>)*>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)*\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*\\b(\\g<identifier>)\\b"
     },
     "expression": {
       "patterns": [
@@ -1744,7 +1744,7 @@
           "name": "keyword.operator.arrow.cs"
         }
       },
-      "end": "(?=[,\\);}])",
+      "end": "(?=[,);}])",
       "patterns": [
         {
           "include": "#ref-modifier"
@@ -1787,15 +1787,15 @@
           "name": "keyword.operator.comparison.cs"
         },
         {
-          "match": "<=|>=|<|>",
+          "match": "<=|>=|[<>]",
           "name": "keyword.operator.relational.cs"
         },
         {
-          "match": "\\!|&&|\\|\\|",
+          "match": "!|&&|\\|\\|",
           "name": "keyword.operator.logical.cs"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.cs"
         },
         {
@@ -1807,7 +1807,7 @@
           "name": "keyword.operator.increment.cs"
         },
         {
-          "match": "\\+|-(?!>)|\\*|/|%",
+          "match": "\\+|-(?!>)|[*/%]",
           "name": "keyword.operator.arithmetic.cs"
         },
         {
@@ -1833,13 +1833,13 @@
       "end": "(?=;)",
       "patterns": [
         {
-          "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+          "match": "@?[_[:alpha:]][_[:alnum:]]*",
           "name": "variable.other.alias.cs"
         }
       ]
     },
     "field-declaration": {
-      "begin": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+(\\g<identifier>)\\s*(?!=>|==)(?=,|;|=|$)",
+      "begin": "(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+(\\g<identifier>)\\s*(?!=[>=])(?=[,;=]|$)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1879,7 +1879,7 @@
           "name": "keyword.control.exception.finally.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -1896,7 +1896,7 @@
           "name": "keyword.control.context.fixed.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "include": "#intrusive"
@@ -1932,7 +1932,7 @@
           "name": "keyword.control.loop.for.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "begin": "\\(",
@@ -1949,8 +1949,8 @@
           },
           "patterns": [
             {
-              "begin": "(?=[^;\\)])",
-              "end": "(?=;|\\))",
+              "begin": "(?=[^;)])",
+              "end": "(?=[;)])",
               "patterns": [
                 {
                   "include": "#intrusive"
@@ -1989,7 +1989,7 @@
           "name": "keyword.control.loop.foreach.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "include": "#intrusive"
@@ -2033,7 +2033,7 @@
                   "name": "keyword.control.loop.in.cs"
                 }
               },
-              "match": "(?:(?:(\\bref)\\s+)?(\\bvar\\b)|(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))\\s+(\\g<identifier>)\\s+\\b(in)\\b"
+              "match": "(?:(?:(\\bref)\\s+)?(\\bvar\\b)|(?<type_name>(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\s+\\b(in)\\b"
             },
             {
               "captures": {
@@ -2051,7 +2051,7 @@
                   "name": "keyword.control.loop.in.cs"
                 }
               },
-              "match": "(?:\\b(var)\\b\\s*)?(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s+\\b(in)\\b"
+              "match": "(?:\\b(var)\\b\\s*)?(?<tuple>\\((?:[^()]|\\g<tuple>)+\\))\\s+\\b(in)\\b"
             },
             {
               "include": "#expression"
@@ -2172,7 +2172,7 @@
           "name": "keyword.operator.expression.query.group.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#group-by"
@@ -2237,11 +2237,11 @@
       ]
     },
     "implicit-anonymous-function-parameter": {
-      "match": "\\@?[_[:alpha:]][_[:alnum:]]*\\b",
+      "match": "@?[_[:alpha:]][_[:alnum:]]*\\b",
       "name": "entity.name.variable.parameter.cs"
     },
     "indexer-declaration": {
-      "begin": "(?<return_type>(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
+      "begin": "(?<return_type>(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -2264,7 +2264,7 @@
           "name": "variable.language.this.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -2290,7 +2290,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -2307,7 +2307,7 @@
     },
     "interface-declaration": {
       "begin": "(?=\\binterface\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(interface)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -2319,7 +2319,7 @@
               "name": "entity.name.type.interface.cs"
             }
           },
-          "end": "(?=\\{)",
+          "end": "(?=\\{)|(?=;)",
           "patterns": [
             {
               "include": "#comment"
@@ -2342,7 +2342,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -2403,7 +2403,7 @@
           "name": "punctuation.definition.string.begin.cs"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.cs"
@@ -2423,7 +2423,7 @@
       ]
     },
     "interpolation": {
-      "begin": "(?<=[^\\{]|^)((?:\\{\\{)*)(\\{)(?=[^\\{])",
+      "begin": "(?<=[^{]|^)((?:\\{\\{)*)(\\{)(?=[^{])",
       "beginCaptures": {
         "1": {
           "name": "string.quoted.double.cs"
@@ -2432,7 +2432,7 @@
           "name": "punctuation.definition.interpolation.begin.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.interpolation.end.cs"
@@ -2456,7 +2456,7 @@
       ]
     },
     "invocation-expression": {
-      "begin": "(?:(?:(\\?)\\s*)?(\\.)\\s*|(->)\\s*)?(@?[_[:alpha:]][_[:alnum:]]*)\\s*(<(?<type_args>[^<>()]++|<\\g<type_args>*+>|\\(\\g<type_args>*+\\))*+>\\s*)?(?=\\()",
+      "begin": "(?:(?:(\\?)\\s*)?(\\.)\\s*|(->)\\s*)?(@?[_[:alpha:]][_[:alnum:]]*)\\s*(<(?<type_args>[^<>()]|\\((?:[^<>()]|<[^<>()]*>|\\([^<>()]*\\))*\\)|<\\g<type_args>*>)*>\\s*)?(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.null-conditional.cs"
@@ -2492,7 +2492,7 @@
           "name": "keyword.operator.expression.pattern.is.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=&|^]|!=)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=)",
       "patterns": [
         {
           "include": "#pattern"
@@ -2500,7 +2500,7 @@
       ]
     },
     "join-clause": {
-      "begin": "\\b(join)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))?\\s+(\\g<identifier>)\\b\\s*\\b(in)\\b\\s*",
+      "begin": "\\b(join)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)?\\s+(\\g<identifier>)\\b\\s*\\b(in)\\b\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.query.join.cs"
@@ -2519,7 +2519,7 @@
           "name": "keyword.operator.expression.query.in.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#join-on"
@@ -2601,7 +2601,7 @@
           "name": "keyword.operator.assignment.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#query-body"
@@ -2613,7 +2613,7 @@
     },
     "list-pattern": {
       "begin": "(?=\\[)",
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\[",
@@ -2622,7 +2622,7 @@
               "name": "punctuation.squarebracket.open.cs"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.squarebracket.close.cs"
@@ -2638,8 +2638,8 @@
           ]
         },
         {
-          "begin": "(?<=\\])",
-          "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "begin": "(?<=])",
+          "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -2680,7 +2680,7 @@
       ]
     },
     "local-constant-declaration": {
-      "begin": "(?<const_keyword>\\b(?:const)\\b)\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+(\\g<identifier>)\\s*(?=,|;|=)",
+      "begin": "(?<const_keyword>\\bconst\\b)\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+(\\g<identifier>)\\s*(?=[,;=])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.const.cs"
@@ -2730,7 +2730,7 @@
       ]
     },
     "local-function-declaration": {
-      "begin": "\\b((?:(?:async|unsafe|static|extern)\\s+)*)(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?)?(?:\\s*\\[\\s*(?:,\\s*)*\\](?:\\s*\\?)?)*)\\s+(\\g<identifier>)\\s*(<[^<>]+>)?\\s*(?=\\()",
+      "begin": "\\b((?:(?:async|unsafe|static|extern)\\s+)*)(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?)?(?:\\s*\\[\\s*(?:,\\s*)*](?:\\s*\\?)?)*)\\s+(\\g<identifier>)\\s*(<[^<>]+>)?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -2757,7 +2757,7 @@
           ]
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -2777,7 +2777,7 @@
       ]
     },
     "local-tuple-var-deconstruction": {
-      "begin": "(?:\\b(var)\\b\\s*)(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*(?=;|=|\\))",
+      "begin": "\\b(var)\\b\\s*(?<tuple>\\((?:[^()]|\\g<tuple>)+\\))\\s*(?=[;=)])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.var.cs"
@@ -2790,7 +2790,7 @@
           ]
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#comment"
@@ -2801,7 +2801,7 @@
       ]
     },
     "local-variable-declaration": {
-      "begin": "(?:(?:(\\bref)\\s+(?:(\\breadonly)\\s+)?)?(\\bvar\\b)|(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*[?*]\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))\\s+(\\g<identifier>)\\s*(?!=>)(?=,|;|=|\\))",
+      "begin": "(?:(?:(\\bref)\\s+(?:(\\breadonly)\\s+)?)?(\\bvar\\b)|(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*[?*]\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\s*(?!=>)(?=[,;=)])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ref.cs"
@@ -2847,7 +2847,7 @@
           "name": "keyword.control.context.lock.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "include": "#intrusive"
@@ -2893,7 +2893,7 @@
               "name": "variable.other.object.property.cs"
             }
           },
-          "match": "(?:(?:(\\?)\\s*)?(\\.)\\s*|(->)\\s*)(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?![_[:alnum:]]|\\(|(\\?)?\\[|<)"
+          "match": "(?:(?:(\\?)\\s*)?(\\.)\\s*|(->)\\s*)(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?![_[:alnum:](]|(\\?)?\\[|<)"
         },
         {
           "captures": {
@@ -2924,7 +2924,7 @@
       ]
     },
     "method-declaration": {
-      "begin": "(?<return_type>(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
+      "begin": "(?<return_type>(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -2954,7 +2954,7 @@
           ]
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -2983,7 +2983,7 @@
           "name": "punctuation.separator.colon.cs"
         }
       },
-      "end": "(?=(,|\\)|\\]))",
+      "end": "(?=([,)\\]]))",
       "patterns": [
         {
           "include": "#argument"
@@ -2997,7 +2997,7 @@
           "name": "storage.type.namespace.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -3016,7 +3016,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -3057,7 +3057,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3069,7 +3069,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3084,7 +3084,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3099,7 +3099,7 @@
                       "name": "keyword.operator.arithmetic.cs"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)?((?<!_)([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)))?([fFdDmM](?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)?((?:(?<=[0-9])|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)?((?<!_)([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*))?([fFdDmM](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -3110,7 +3110,7 @@
                       "name": "constant.numeric.binary.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3122,7 +3122,7 @@
                       "name": "constant.numeric.other.suffix.cs"
                     }
                   },
-                  "match": "(\\G0[bB])([01_](?:[01_]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
+                  "match": "(\\G0[bB])([01_](?:[01_]|((?<=\\h)_(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -3133,7 +3133,7 @@
                       "name": "constant.numeric.hex.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3145,7 +3145,7 @@
                       "name": "constant.numeric.other.suffix.cs"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)_(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -3153,7 +3153,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3174,7 +3174,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3183,10 +3183,10 @@
                       "name": "constant.numeric.other.suffix.cs"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?<!_)([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)((?<!_)([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*))?((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
                 },
                 {
-                  "match": "(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)+",
+                  "match": "(?:[0-9a-zA-Z_]|(?<=[eE])[+-]|\\.\\d)+",
                   "name": "invalid.illegal.constant.numeric.cs"
                 }
               ]
@@ -3194,7 +3194,7 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_]|(?<=[eE])[+-]|\\.\\d)*"
     },
     "object-creation-expression": {
       "patterns": [
@@ -3219,10 +3219,10 @@
           ]
         }
       },
-      "match": "(new)\\s+(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*(?=\\{|//|/\\*|$)"
+      "match": "(new)\\s+(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*(?=\\{|//|/\\*|$)"
     },
     "object-creation-expression-with-parameters": {
-      "begin": "(new)(?:\\s+(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))?\\s*(?=\\()",
+      "begin": "(new)(?:\\s+(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.new.cs"
@@ -3243,11 +3243,11 @@
       ]
     },
     "operator-assignment": {
-      "match": "(?<!=|!)(=)(?!=)",
+      "match": "(?<![=!])(=)(?!=)",
       "name": "keyword.operator.assignment.cs"
     },
     "operator-declaration": {
-      "begin": "(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*\\b(?<operator_keyword>operator)\\b\\s*(?<operator>[+\\-*/%&|\\^!=~<>]+|true|false)\\s*(?=\\()",
+      "begin": "(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*\\b(?<operator_keyword>operator)\\b\\s*(?<operator>[+\\-*/%\\&|^!=~<>]+|true|false)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3263,7 +3263,7 @@
           "name": "entity.name.function.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -3286,7 +3286,7 @@
           "name": "keyword.operator.expression.query.orderby.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#ordering-direction"
@@ -3326,7 +3326,7 @@
           "name": "entity.name.variable.parameter.cs"
         }
       },
-      "match": "(?:(?:\\b(ref|params|out|in|this)\\b)\\s+)?(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+(\\g<identifier>)"
+      "match": "(?:\\b(ref|params|out|in|this)\\b\\s+)?(?<type_name>(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+(\\g<identifier>)"
     },
     "parenthesized-expression": {
       "begin": "\\(",
@@ -3417,7 +3417,7 @@
     },
     "positional-pattern": {
       "begin": "(?=\\()",
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\(",
@@ -3443,7 +3443,7 @@
         },
         {
           "begin": "(?<=\\))",
-          "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -3459,7 +3459,7 @@
       ]
     },
     "preprocessor": {
-      "begin": "^\\s*(\\#)\\s*",
+      "begin": "^\\s*(#)\\s*",
       "beginCaptures": {
         "1": {
           "name": "punctuation.separator.hash.cs"
@@ -3583,7 +3583,7 @@
               "name": "keyword.operator.logical.cs"
             }
           },
-          "match": "(==|!=)|(\\!|&&|\\|\\|)"
+          "match": "(==|!=)|(!|&&|\\|\\|)"
         }
       ]
     },
@@ -3625,7 +3625,7 @@
               "name": "keyword.preprocessor.hidden.cs"
             }
           },
-          "match": "\\b(?:(default|hidden))"
+          "match": "\\b(default|hidden)"
         },
         {
           "captures": {
@@ -3641,7 +3641,7 @@
               "name": "string.quoted.double.cs"
             }
           },
-          "match": "\\\"[^\"]*\\\""
+          "match": "\"[^\"]*\""
         }
       ]
     },
@@ -3660,7 +3660,7 @@
               "name": "string.quoted.double.cs"
             }
           },
-          "match": "\\\"[^\"]*\\\""
+          "match": "\"[^\"]*\""
         }
       ]
     },
@@ -3682,7 +3682,7 @@
           "name": "string.quoted.double.cs"
         }
       },
-      "match": "\\b(pragma)\\b\\s*\\b(checksum)\\b\\s*(\\\"[^\"]*\\\")\\s*(\\\"[^\"]*\\\")\\s*(\\\"[^\"]*\\\")"
+      "match": "\\b(pragma)\\b\\s*\\b(checksum)\\b\\s*(\"[^\"]*\")\\s*(\"[^\"]*\")\\s*(\"[^\"]*\")"
     },
     "preprocessor-pragma-warning": {
       "captures": {
@@ -3731,7 +3731,7 @@
               "name": "string.quoted.double.cs"
             }
           },
-          "match": "\\\"[^\"]*\\\""
+          "match": "\"[^\"]*\""
         }
       ]
     },
@@ -3767,7 +3767,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -3785,13 +3785,13 @@
           "name": "storage.modifier.$1.cs"
         },
         {
-          "begin": "\\b(get)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
+          "begin": "\\b(get)\\b\\s*(?=[{;]|=>|//|/\\*|$)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.accessor.$1.cs"
             }
           },
-          "end": "(?<=\\}|;)|(?=\\})",
+          "end": "(?<=[};])|(?=})",
           "patterns": [
             {
               "include": "#accessor-getter"
@@ -3799,13 +3799,13 @@
           ]
         },
         {
-          "begin": "\\b(set|init)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
+          "begin": "\\b(set|init)\\b\\s*(?=[{;]|=>|//|/\\*|$)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.accessor.$1.cs"
             }
           },
-          "end": "(?<=\\}|;)|(?=\\})",
+          "end": "(?<=[};])|(?=})",
           "patterns": [
             {
               "include": "#accessor-setter"
@@ -3815,7 +3815,7 @@
       ]
     },
     "property-declaration": {
-      "begin": "(?![[:word:][:space:]]*\\b(?:class|interface|struct|enum|event)\\b)(?<return_type>(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<property_name>\\g<identifier>)\\s*(?=\\{|=>|//|/\\*|$)",
+      "begin": "(?![[:word:]\\s]*\\b(?:class|interface|struct|enum|event)\\b)(?<return_type>(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<property_name>\\g<identifier>)\\s*(?=\\{|=>|//|/\\*|$)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3838,7 +3838,7 @@
           "name": "entity.name.variable.property.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -3858,8 +3858,8 @@
       ]
     },
     "property-pattern": {
-      "begin": "(?={)",
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "begin": "(?=\\{)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\{",
@@ -3868,7 +3868,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -3884,8 +3884,8 @@
           ]
         },
         {
-          "begin": "(?<=\\})",
-          "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "begin": "(?<=})",
+          "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -3932,7 +3932,7 @@
       ]
     },
     "query-expression": {
-      "begin": "\\b(from)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))?\\s+(\\g<identifier>)\\b\\s*\\b(in)\\b\\s*",
+      "begin": "\\b(from)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)?\\s+(\\g<identifier>)\\b\\s*\\b(in)\\b\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.query.from.cs"
@@ -3951,7 +3951,7 @@
           "name": "keyword.operator.expression.query.in.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#query-body"
@@ -4094,7 +4094,7 @@
       ]
     },
     "raw-interpolation": {
-      "begin": "(?<=[^\\{]|^)((?:\\{)*)(\\{)(?=[^\\{])",
+      "begin": "(?<=[^{]|^)(\\{*)(\\{)(?=[^{])",
       "beginCaptures": {
         "1": {
           "name": "string.quoted.double.cs"
@@ -4103,7 +4103,7 @@
           "name": "punctuation.definition.interpolation.begin.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.interpolation.end.cs"
@@ -4180,7 +4180,7 @@
     },
     "record-declaration": {
       "begin": "(?=\\brecord\\b)",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(record)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -4218,7 +4218,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -4249,7 +4249,7 @@
           "name": "keyword.operator.relational.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "include": "#expression"
@@ -4293,7 +4293,7 @@
           "name": "keyword.operator.expression.query.select.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#query-body"
@@ -4405,7 +4405,7 @@
       "name": "storage.modifier.$1.cs"
     },
     "string-character-escape": {
-      "match": "\\\\(x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4}|.)",
+      "match": "\\\\(x\\h{1,4}|U\\h{8}|u\\h{4}|.)",
       "name": "constant.character.escape.cs"
     },
     "string-literal": {
@@ -4415,7 +4415,7 @@
           "name": "punctuation.definition.string.begin.cs"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.cs"
@@ -4433,7 +4433,7 @@
     },
     "struct-declaration": {
       "begin": "(?=(\\brecord\\b\\s+)?\\bstruct\\b)",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(\\b(record)\\b\\s+)?(struct)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -4474,7 +4474,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -4501,7 +4501,7 @@
             "1": {
               "patterns": [
                 {
-                  "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+                  "match": "@?[_[:alpha:]][_[:alnum:]]*",
                   "name": "variable.other.object.property.cs"
                 },
                 {
@@ -4527,7 +4527,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -4544,7 +4544,7 @@
               "name": "keyword.operator.arrow.cs"
             }
           },
-          "end": "(?=,|})",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#expression"
@@ -4558,7 +4558,7 @@
               "name": "keyword.control.conditional.when.cs"
             }
           },
-          "end": "(?==>|,|})",
+          "end": "(?==>|[,}])",
           "patterns": [
             {
               "include": "#case-guard"
@@ -4567,7 +4567,7 @@
         },
         {
           "begin": "(?!\\s)",
-          "end": "(?=\\bwhen\\b|=>|,|})",
+          "end": "(?=\\bwhen\\b|=>|[,}])",
           "patterns": [
             {
               "include": "#pattern"
@@ -4597,7 +4597,7 @@
               "name": "keyword.control.conditional.when.cs"
             }
           },
-          "end": "(?=:|})",
+          "end": "(?=[:}])",
           "patterns": [
             {
               "include": "#case-guard"
@@ -4606,7 +4606,7 @@
         },
         {
           "begin": "(?!\\s)",
-          "end": "(?=\\bwhen\\b|:|})",
+          "end": "(?=\\bwhen\\b|[:}])",
           "patterns": [
             {
               "include": "#pattern"
@@ -4646,7 +4646,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -4677,7 +4677,7 @@
         },
         {
           "begin": "(?=\\()",
-          "end": "(?<=\\})|(?=\\})",
+          "end": "(?<=})|(?=})",
           "patterns": [
             {
               "include": "#switch-statement"
@@ -4686,7 +4686,7 @@
         },
         {
           "begin": "(?=\\{)",
-          "end": "(?<=\\})|(?=\\})",
+          "end": "(?<=})|(?=})",
           "patterns": [
             {
               "include": "#switch-expression"
@@ -4724,7 +4724,7 @@
           "name": "keyword.control.exception.try.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -4793,7 +4793,7 @@
           ]
         }
       },
-      "match": "(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*(?!=>|==)(?==)"
+      "match": "(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\))\\s*(?!=[>=])(?==)"
     },
     "tuple-deconstruction-element-list": {
       "begin": "\\(",
@@ -4844,7 +4844,7 @@
           "name": "entity.name.variable.tuple-element.cs"
         }
       },
-      "match": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))(?:(?<tuple_name>\\g<identifier>)\\b)?"
+      "match": "(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)(?:(?<tuple_name>\\g<identifier>)\\b)?"
     },
     "tuple-literal": {
       "begin": "(\\()(?=.*[:,])",
@@ -4973,7 +4973,7 @@
           "name": "punctuation.squarebracket.open.cs"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.cs"
@@ -5044,7 +5044,7 @@
               "name": "punctuation.separator.coloncolon.cs"
             }
           },
-          "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\:\\:)"
+          "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(::)"
         },
         {
           "captures": {
@@ -5101,13 +5101,13 @@
       ]
     },
     "type-parameter-list": {
-      "begin": "\\<",
+      "begin": "<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.begin.cs"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.end.cs"
@@ -5135,11 +5135,11 @@
     },
     "type-pattern": {
       "begin": "(?=@?[_[:alpha:]][_[:alnum:]]*)",
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\G",
-          "end": "(?!\\G[@_[:alpha:]])(?=[\\({@_[:alpha:])}\\],;:=&|^]|(?:\\s|^)\\?|!=|\\b(and|or|when)\\b)",
+          "end": "(?!\\G[@_[:alpha:]])(?=[({@_[:alpha:])}\\],;:=\\&|^]|(?:\\s|^)\\?|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -5150,8 +5150,8 @@
           ]
         },
         {
-          "begin": "(?=[\\({@_[:alpha:]])",
-          "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "begin": "(?=[({@_[:alpha:]])",
+          "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -5188,19 +5188,19 @@
               "name": "punctuation.separator.coloncolon.cs"
             }
           },
-          "end": "(?<=[_[:alnum:]])|(?=[.<\\[\\({)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?<=[_[:alnum:]])|(?=[.<\\[({)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
             },
             {
-              "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+              "match": "@?[_[:alpha:]][_[:alnum:]]*",
               "name": "entity.name.type.cs"
             }
           ]
         },
         {
-          "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+          "match": "@?[_[:alpha:]][_[:alnum:]]*",
           "name": "entity.name.type.cs"
         },
         {
@@ -5210,13 +5210,13 @@
               "name": "punctuation.accessor.cs"
             }
           },
-          "end": "(?<=[_[:alnum:]])|(?=[<\\[\\({)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?<=[_[:alnum:]])|(?=[<\\[({)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
             },
             {
-              "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+              "match": "@?[_[:alpha:]][_[:alnum:]]*",
               "name": "entity.name.type.cs"
             }
           ]
@@ -5303,7 +5303,7 @@
               "include": "#comment"
             },
             {
-              "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+              "match": "@?[_[:alpha:]][_[:alnum:]]*",
               "name": "entity.name.type.namespace.cs"
             },
             {
@@ -5323,7 +5323,7 @@
           "name": "keyword.control.context.using.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "include": "#intrusive"
@@ -5368,7 +5368,7 @@
           "name": "storage.type.var.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "include": "#designation-pattern"
@@ -5376,13 +5376,13 @@
       ]
     },
     "variable-initializer": {
-      "begin": "(?<!=|!)(=)(?!=|>)",
+      "begin": "(?<![=!])(=)(?![=>])",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.assignment.cs"
         }
       },
-      "end": "(?=[,\\)\\];}])",
+      "end": "(?=[,)\\];}])",
       "patterns": [
         {
           "include": "#ref-modifier"
@@ -5471,7 +5471,7 @@
           "name": "keyword.operator.expression.query.where.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#query-body"
@@ -5488,7 +5488,7 @@
           "name": "keyword.control.loop.while.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "\\(",
@@ -5521,7 +5521,7 @@
           "name": "keyword.operator.expression.with.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -5565,7 +5565,7 @@
           "name": "punctuation.definition.string.begin.cs"
         }
       },
-      "end": "\\]\\]>",
+      "end": "]]>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.cs"
@@ -5584,7 +5584,7 @@
               "name": "punctuation.definition.constant.cs"
             }
           },
-          "match": "(&)((?:[[:alpha:]:_][[:alnum:]:_.-]*)|(?:\\#[[:digit:]]+)|(?:\\#x[[:xdigit:]]+))(;)",
+          "match": "(&)([[:alpha:]:_][[:alnum:]:_.-]*|#\\d+|#x\\h+)(;)",
           "name": "constant.character.entity.cs"
         },
         {
@@ -5627,13 +5627,13 @@
     "xml-string": {
       "patterns": [
         {
-          "begin": "\\'",
+          "begin": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cs"
             }
           },
-          "end": "\\'",
+          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cs"
@@ -5647,13 +5647,13 @@
           ]
         },
         {
-          "begin": "\\\"",
+          "begin": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cs"
             }
           },
-          "end": "\\\"",
+          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cs"
diff --git a/resources/languages/css.json b/resources/languages/css.json
index 7959500..c14f13e 100644
--- a/resources/languages/css.json
+++ b/resources/languages/css.json
@@ -25,7 +25,7 @@
     "at-rules": {
       "patterns": [
         {
-          "begin": "\\A(?:\\xEF\\xBB\\xBF)?(?i:(?=\\s*@charset\\b))",
+          "begin": "\\A\\uFEFF?(?i:(?=\\s*@charset\\b))",
           "end": ";|(?=$)",
           "endCaptures": {
             "0": {
@@ -58,7 +58,7 @@
                   "name": "invalid.illegal.unexpected-characters.charset.css"
                 }
               },
-              "match": "\\G((?!@charset)@\\w+)|\\G(\\s+)|(@charset\\S[^;]*)|(?<=@charset)(\\x20{2,}|\\t+)|(?<=@charset\\x20)([^\";]+)|(\"[^\"]+$)|(?<=\")([^;]+)"
+              "match": "\\G((?!@charset)@\\w+)|\\G(\\s+)|(@charset\\S[^;]*)|(?<=@charset)( {2,}|\\t+)|(?<=@charset )([^\";]+)|(\"[^\"]+$)|(?<=\")([^;]+)"
             },
             {
               "captures": {
@@ -87,7 +87,7 @@
               "name": "string.quoted.double.css",
               "patterns": [
                 {
-                  "begin": "(?:\\G|^)(?=(?:[^\"])+$)",
+                  "begin": "(?:\\G|^)(?=[^\"]+$)",
                   "end": "$",
                   "name": "invalid.illegal.unclosed.string.css"
                 }
@@ -134,7 +134,7 @@
           ]
         },
         {
-          "begin": "(?i)((@)font-face)(?=\\s*|{|/\\*|$)",
+          "begin": "(?i)((@)font-face)(?=\\s*|\\{|/\\*|$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.at-rule.font-face.css"
@@ -176,7 +176,7 @@
           ]
         },
         {
-          "begin": "(?i)(?=@media(\\s|\\(|/\\*|$))",
+          "begin": "(?i)(?=@media([\\s(]|/\\*|$))",
           "end": "(?<=})(?!\\G)",
           "patterns": [
             {
@@ -198,7 +198,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.media.begin.bracket.curly.css"
@@ -233,7 +233,7 @@
                   "name": "punctuation.definition.keyword.css"
                 }
               },
-              "end": "(?=\\s*{)",
+              "end": "(?=\\s*\\{)",
               "name": "meta.at-rule.counter-style.header.css",
               "patterns": [
                 {
@@ -252,13 +252,13 @@
                       ]
                     }
                   },
-                  "match": "(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+                  "match": "[-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
                   "name": "variable.parameter.style-name.css"
                 }
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.property-list.begin.bracket.curly.css"
@@ -350,7 +350,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.document.begin.bracket.curly.css"
@@ -385,7 +385,7 @@
                   "name": "punctuation.definition.keyword.css"
                 }
               },
-              "end": "(?=\\s*{)",
+              "end": "(?=\\s*\\{)",
               "name": "meta.at-rule.keyframes.header.css",
               "patterns": [
                 {
@@ -404,13 +404,13 @@
                       ]
                     }
                   },
-                  "match": "(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+                  "match": "[-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
                   "name": "variable.parameter.keyframe-list.css"
                 }
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.keyframes.begin.bracket.curly.css"
@@ -439,7 +439,7 @@
                       "name": "entity.other.keyframe-offset.percentage.css"
                     }
                   },
-                  "match": "(?xi)\n(?<![\\w-]) (from|to) (?![\\w-])         # Keywords for 0% | 100%\n|\n([-+]?(?:\\d+(?:\\.\\d+)?|\\.\\d+)%)     # Percentile value"
+                  "match": "(?i)(?<![\\w-])(from|to)(?![\\w-])|([-+]?(?:\\d+(?:\\.\\d+)?|\\.\\d+)%)"
                 },
                 {
                   "include": "#rule-list"
@@ -449,7 +449,7 @@
           ]
         },
         {
-          "begin": "(?i)(?=@supports(\\s|\\(|/\\*|$))",
+          "begin": "(?i)(?=@supports([\\s(]|/\\*|$))",
           "end": "(?<=})(?!\\G)|(?=;)",
           "patterns": [
             {
@@ -480,7 +480,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.supports.begin.bracket.curly.css"
@@ -586,7 +586,7 @@
                   ]
                 }
               },
-              "match": "(?xi)\n(?:\\G|^|(?<=\\s))\n(?=\n  (?<=\\s|^)                             # Starts with whitespace\n  (?:[-a-zA-Z_]|[^\\x00-\\x7F])          # Then a valid identifier character\n  |\n  \\s*                                   # Possible adjoining whitespace\n  /\\*(?:[^*]|\\*[^/])*\\*/              # Injected comment\n)\n(.*?)                                    # Grouped to embed #comment-block\n(\n  (?:[-a-zA-Z_]    | [^\\x00-\\x7F])     # First letter\n  (?:[-a-zA-Z0-9_] | [^\\x00-\\x7F]      # Remainder of identifier\n    |\\\\(?:[0-9a-fA-F]{1,6}|.)\n  )*\n)"
+              "match": "(?i)(?:\\G|^|(?<=\\s))(?=(?<=\\s|^)[-a-zA-Z_[^\\x00-\\x7F]]|\\s*/\\*(?:[^*]|\\*[^/])*\\*/)(.*?)([-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*)"
             },
             {
               "include": "#comment-block"
@@ -624,7 +624,7 @@
           ]
         },
         {
-          "begin": "(?i)(?=@[\\w-]+(\\s|\\(|{|/\\*|$))",
+          "begin": "(?i)(?=@[\\w-]+([\\s({]|/\\*|$))",
           "end": "(?<=})(?!\\G)",
           "patterns": [
             {
@@ -641,7 +641,7 @@
               "name": "meta.at-rule.header.css"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.begin.bracket.curly.css"
@@ -671,7 +671,7 @@
           "name": "support.constant.color.w3c-standard-color-name.css"
         },
         {
-          "match": "(?xi) (?<![\\w-])\n(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood\n|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan\n|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange\n|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise\n|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen\n|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki\n|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow\n|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray\n|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue\n|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise\n|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered\n|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum\n|powderblue|rebeccapurple|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell\n|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato\n|transparent|turquoise|violet|wheat|whitesmoke|yellowgreen)\n(?![\\w-])",
+          "match": "(?i)(?<![\\w-])(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|rebeccapurple|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato|transparent|turquoise|violet|wheat|whitesmoke|yellowgreen)(?![\\w-])",
           "name": "support.constant.color.w3c-extended-color-name.css"
         },
         {
@@ -679,7 +679,7 @@
           "name": "support.constant.color.current.css"
         },
         {
-          "match": "(?xi) (?<![\\w-])\n(ActiveBorder|ActiveCaption|AppWorkspace|Background|ButtonFace|ButtonHighlight|ButtonShadow\n|ButtonText|CaptionText|GrayText|Highlight|HighlightText|InactiveBorder|InactiveCaption\n|InactiveCaptionText|InfoBackground|InfoText|Menu|MenuText|Scrollbar|ThreeDDarkShadow\n|ThreeDFace|ThreeDHighlight|ThreeDLightShadow|ThreeDShadow|Window|WindowFrame|WindowText)\n(?![\\w-])",
+          "match": "(?i)(?<![\\w-])(ActiveBorder|ActiveCaption|AppWorkspace|Background|ButtonFace|ButtonHighlight|ButtonShadow|ButtonText|CaptionText|GrayText|Highlight|HighlightText|InactiveBorder|InactiveCaption|InactiveCaptionText|InfoBackground|InfoText|Menu|MenuText|Scrollbar|ThreeDDarkShadow|ThreeDFace|ThreeDHighlight|ThreeDLightShadow|ThreeDShadow|Window|WindowFrame|WindowText)(?![\\w-])",
           "name": "invalid.deprecated.color.system.css"
         }
       ]
@@ -691,7 +691,7 @@
           "name": "invalid.deprecated.combinator.css"
         },
         {
-          "match": ">>|>|\\+|~",
+          "match": ">>|[>+~]",
           "name": "keyword.operator.combinator.css"
         }
       ]
@@ -718,7 +718,7 @@
     "escapes": {
       "patterns": [
         {
-          "match": "\\\\[0-9a-fA-F]{1,6}",
+          "match": "\\\\\\h{1,6}",
           "name": "constant.character.escape.codepoint.css"
         },
         {
@@ -767,7 +767,7 @@
       ]
     },
     "font-features": {
-      "begin": "(?xi)\n((@)(annotation|character-variant|ornaments|styleset|stylistic|swash))\n(?=[\\s@'\"{;]|/\\*|$)",
+      "begin": "(?i)((@)(annotation|character-variant|ornaments|styleset|stylistic|swash))(?=[\\s@'\"{;]|/\\*|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.at-rule.${3:/downcase}.css"
@@ -780,7 +780,7 @@
       "name": "meta.at-rule.${3:/downcase}.css",
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.property-list.begin.bracket.curly.css"
@@ -804,7 +804,7 @@
                   ]
                 }
               },
-              "match": "(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+              "match": "[-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
               "name": "variable.font-feature.css"
             },
             {
@@ -872,7 +872,7 @@
           },
           "patterns": [
             {
-              "match": "(?<=[(,\\s])[a-zA-Z]+(-[a-zA-Z0-9]*|\\\\(?:[0-9a-fA-F]{1,6}|.))*(?=[),\\s])",
+              "match": "(?<=[(,\\s])[a-zA-Z]+(-[a-zA-Z0-9]*|\\\\(?:\\h{1,6}|.))*(?=[),\\s])",
               "name": "support.constant.language-range.css"
             },
             {
@@ -1038,7 +1038,7 @@
           ]
         },
         {
-          "begin": "(?xi) (?<![\\w-])\n(\n  (?:-webkit-|-moz-|-o-)?    # Accept prefixed/historical variants\n  (?:repeating-)?            # \"Repeating\"-type gradient\n  (?:linear|radial|conic)    # Shape\n  -gradient\n)\n(\\()",
+          "begin": "(?i)(?<![\\w-])((?:-(?:webkit-|moz-|o-))?(?:repeating-)?(?:linear|radial|conic)-gradient)(\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.gradient.css"
@@ -1110,7 +1110,7 @@
           ]
         },
         {
-          "begin": "(?xi) (?<![\\w-])\n(annotation|attr|blur|brightness|character-variant|clamp|contrast|counters?\n|cross-fade|drop-shadow|element|fit-content|format|grayscale|hue-rotate|color-mix\n|image-set|invert|local|max|min|minmax|opacity|ornaments|repeat|saturate|sepia\n|styleset|stylistic|swash|symbols\n|cos|sin|tan|acos|asin|atan|atan2|hypot|sqrt|pow|log|exp|abs|sign)\n(\\()",
+          "begin": "(?i)(?<![\\w-])(annotation|attr|blur|brightness|character-variant|clamp|contrast|counters?|cross-fade|drop-shadow|element|fit-content|format|grayscale|hue-rotate|color-mix|image-set|invert|local|max|min|minmax|opacity|ornaments|repeat|saturate|sepia|styleset|stylistic|swash|symbols|cos|sin|tan|acos|asin|atan|atan2|hypot|sqrt|pow|log|exp|abs|sign)(\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.misc.css"
@@ -1195,7 +1195,7 @@
           ]
         },
         {
-          "begin": "(?xi) (?<![\\w-])\n( (?:translate|scale|rotate)(?:[XYZ]|3D)?\n| matrix(?:3D)?\n| skew[XY]?\n| perspective\n)\n(\\()",
+          "begin": "(?i)(?<![\\w-])((?:translate|scale|rotate)(?:[XYZ]|3D)?|matrix(?:3D)?|skew[XY]?|perspective)(\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.transform.css"
@@ -1238,7 +1238,7 @@
           "name": "meta.function.variable.css",
           "patterns": [
             {
-              "match": "--(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+              "match": "--[-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
               "name": "variable.argument.css"
             },
             {
@@ -1249,7 +1249,7 @@
       ]
     },
     "media-feature-keywords": {
-      "match": "(?xi)\n(?<=^|\\s|:|\\*/)\n(?: portrait                  # Orientation\n  | landscape\n  | progressive               # Scan types\n  | interlace\n  | fullscreen                # Display modes\n  | standalone\n  | minimal-ui\n  | browser\n  | hover\n)\n(?=\\s|\\)|$)",
+      "match": "(?i)(?<=^|[\\s:]|\\*/)(?:portrait|landscape|progressive|interlace|fullscreen|standalone|minimal-ui|browser|hover)(?=[\\s)]|$)",
       "name": "support.constant.property-value.css"
     },
     "media-features": {
@@ -1264,7 +1264,7 @@
           "name": "support.type.vendored.property-name.media.css"
         }
       },
-      "match": "(?xi)\n(?<=^|\\s|\\(|\\*/)           # Preceded by whitespace, bracket or comment\n(?:\n  # Standardised features\n  (\n    (?:min-|max-)?            # Range features\n    (?: height\n      | width\n      | aspect-ratio\n      | color\n      | color-index\n      | monochrome\n      | resolution\n    )\n    | grid                    # Discrete features\n    | scan\n    | orientation\n    | display-mode\n    | hover\n  )\n  |\n  # Deprecated features\n  (\n    (?:min-|max-)?            # Deprecated in Media Queries 4\n    device-\n    (?: height\n      | width\n      | aspect-ratio\n    )\n  )\n  |\n  # Vendor extensions\n  (\n    (?:\n      # Spec-compliant syntax\n      [-_]\n      (?: webkit              # Webkit/Blink\n        | apple|khtml         # Webkit aliases\n        | epub                # ePub3\n        | moz                 # Gecko\n        | ms                  # Microsoft\n        | o                   # Presto (pre-Opera 15)\n        | xv|ah|rim|atsc|     # Less common vendors\n          hp|tc|wap|ro\n      )\n      |\n      # Non-standard prefixes\n      (?: mso                 # Microsoft Office\n        | prince              # YesLogic\n      )\n    )\n    -\n    [\\w-]+                   # Feature name\n    (?=                       # Terminates correctly\n      \\s*                    # Possible whitespace\n      (?:                     # Possible injected comment\n        /\\*\n        (?:[^*]|\\*[^/])*\n        \\*/\n      )?\n      \\s*\n      [:)]                    # Ends with a colon or closed bracket\n    )\n  )\n)\n(?=\\s|$|[><:=]|\\)|/\\*)     # Terminates cleanly"
+      "match": "(?i)(?<=^|[\\s(]|\\*/)(?:((?:m(?:in-|ax-))?(?:height|width|aspect-ratio|color|color-index|monochrome|resolution)|grid|scan|orientation|display-mode|hover)|((?:m(?:in-|ax-))?device-(?:height|width|aspect-ratio))|((?:[-_](?:webkit|apple|khtml|epub|moz|ms|o|xv|ah|rim|atsc|hp|tc|wap|ro)|(?:mso|prince))-[\\w-]+(?=\\s*(?:/\\*(?:[^*]|\\*[^/])*\\*/)?\\s*[:)])))(?=\\s|$|[><:=)]|/\\*)"
     },
     "media-query": {
       "begin": "\\G",
@@ -1280,7 +1280,7 @@
           "include": "#media-types"
         },
         {
-          "match": "(?i)(?<=\\s|^|,|\\*/)(only|not)(?=\\s|{|/\\*|$)",
+          "match": "(?i)(?<=\\s|^|,|\\*/)(only|not)(?=[\\s{]|/\\*|$)",
           "name": "keyword.operator.logical.$1.media.css"
         },
         {
@@ -1319,7 +1319,7 @@
               "name": "punctuation.separator.key-value.css"
             },
             {
-              "match": ">=|<=|=|<|>",
+              "match": ">=|<=|[=<>]",
               "name": "keyword.operator.comparison.css"
             },
             {
@@ -1365,7 +1365,7 @@
           "name": "invalid.deprecated.constant.media.css"
         }
       },
-      "match": "(?xi)\n(?<=^|\\s|,|\\*/)\n(?:\n  # Valid media types\n  (all|print|screen|speech)\n  |\n  # Deprecated in Media Queries 4: http://dev.w3.org/csswg/mediaqueries/#media-types\n  (aural|braille|embossed|handheld|projection|tty|tv)\n)\n(?=$|[{,\\s;]|/\\*)"
+      "match": "(?i)(?<=^|[\\s,]|\\*/)(?:(all|print|screen|speech)|(aural|braille|embossed|handheld|projection|tty|tv))(?=$|[{,\\s;]|/\\*)"
     },
     "numeric-values": {
       "patterns": [
@@ -1375,7 +1375,7 @@
               "name": "punctuation.definition.constant.css"
             }
           },
-          "match": "(#)(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})\\b",
+          "match": "(#)(?:\\h{3,4}|\\h{6}|\\h{8})\\b",
           "name": "constant.other.color.rgb-value.hex.css"
         },
         {
@@ -1387,7 +1387,7 @@
               "name": "keyword.other.unit.${2:/downcase}.css"
             }
           },
-          "match": "(?xi) (?<![\\w-])\n[-+]?                               # Sign indicator\n\n(?:                                 # Numerals\n    [0-9]+ (?:\\.[0-9]+)?           # Integer/float with leading digits\n  | \\.[0-9]+                       # Float without leading digits\n)\n\n(?:                                 # Scientific notation\n  (?<=[0-9])                        # Exponent must follow a digit\n  E                                 # Exponent indicator\n  [-+]?                             # Possible sign indicator\n  [0-9]+                            # Exponent value\n)?\n\n(?:                                 # Possible unit for data-type:\n  (%)                               # - Percentage\n  | ( deg|grad|rad|turn             # - Angle\n    | Hz|kHz                        # - Frequency\n    | ch|cm|em|ex|fr|in|mm|mozmm|   # - Length\n      pc|pt|px|q|rem|rch|rex|rlh|\n      ic|ric|rcap|vh|vw|vb|vi|svh|\n      svw|svb|svi|dvh|dvw|dvb|dvi|\n      lvh|lvw|lvb|lvi|vmax|vmin|\n      cqw|cqi|cqh|cqb|cqmin|cqmax\n    | dpi|dpcm|dppx                 # - Resolution\n    | s|ms                          # - Time\n    )\n  \\b                               # Boundary checking intentionally lax to\n)?                                  # facilitate embedding in CSS-like grammars",
+          "match": "(?i)(?<![\\w-])[-+]?(?:[0-9]+(?:\\.[0-9]+)?|\\.[0-9]+)(?:(?<=[0-9])E[-+]?[0-9]+)?(?:(%)|(deg|grad|rad|turn|Hz|kHz|ch|cm|em|ex|fr|in|mm|mozmm|pc|pt|px|q|rem|rch|rex|rlh|ic|ric|rcap|vh|vw|vb|vi|svh|svw|svb|svi|dvh|dvw|dvb|dvi|lvh|lvw|lvb|lvi|vmax|vmin|cqw|cqi|cqh|cqb|cqmin|cqmax|dpi|dpcm|dppx|s|ms)\\b)?",
           "name": "constant.numeric.css"
         }
       ]
@@ -1395,11 +1395,11 @@
     "property-keywords": {
       "patterns": [
         {
-          "match": "(?xi) (?<![\\w-])\n(above|absolute|active|add|additive|after-edge|alias|all|all-petite-caps|all-scroll|all-small-caps|alpha|alphabetic|alternate|alternate-reverse\n|always|antialiased|auto|auto-fill|auto-fit|auto-pos|available|avoid|avoid-column|avoid-page|avoid-region|backwards|balance|baseline|before-edge|below|bevel\n|bidi-override|blink|block|block-axis|block-start|block-end|bold|bolder|border|border-box|both|bottom|bottom-outside|break-all|break-word|bullets\n|butt|capitalize|caption|cell|center|central|char|circle|clip|clone|close-quote|closest-corner|closest-side|col-resize|collapse|color|color-burn\n|color-dodge|column|column-reverse|common-ligatures|compact|condensed|contain|content|content-box|contents|context-menu|contextual|copy|cover\n|crisp-edges|crispEdges|crosshair|cyclic|dark|darken|dashed|decimal|default|dense|diagonal-fractions|difference|digits|disabled|disc|discretionary-ligatures\n|distribute|distribute-all-lines|distribute-letter|distribute-space|dot|dotted|double|double-circle|downleft|downright|e-resize|each-line|ease|ease-in\n|ease-in-out|ease-out|economy|ellipse|ellipsis|embed|end|evenodd|ew-resize|exact|exclude|exclusion|expanded|extends|extra-condensed|extra-expanded\n|fallback|farthest-corner|farthest-side|fill|fill-available|fill-box|filled|fit-content|fixed|flat|flex|flex-end|flex-start|flip|flow-root|forwards|freeze\n|from-image|full-width|geometricPrecision|georgian|grab|grabbing|grayscale|grid|groove|hand|hanging|hard-light|help|hidden|hide\n|historical-forms|historical-ligatures|horizontal|horizontal-tb|hue|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space\n|ideographic|inactive|infinite|inherit|initial|inline|inline-axis|inline-block|inline-end|inline-flex|inline-grid|inline-list-item|inline-start\n|inline-table|inset|inside|inter-character|inter-ideograph|inter-word|intersect|invert|isolate|isolate-override|italic|jis04|jis78|jis83\n|jis90|justify|justify-all|kannada|keep-all|landscape|large|larger|left|light|lighten|lighter|line|line-edge|line-through|linear|linearRGB\n|lining-nums|list-item|local|loose|lowercase|lr|lr-tb|ltr|luminance|luminosity|main-size|mandatory|manipulation|manual|margin-box|match-parent\n|match-source|mathematical|max-content|medium|menu|message-box|middle|min-content|miter|mixed|move|multiply|n-resize|narrower|ne-resize\n|nearest-neighbor|nesw-resize|newspaper|no-change|no-clip|no-close-quote|no-common-ligatures|no-contextual|no-discretionary-ligatures\n|no-drop|no-historical-ligatures|no-open-quote|no-repeat|none|nonzero|normal|not-allowed|nowrap|ns-resize|numbers|numeric|nw-resize|nwse-resize\n|oblique|oldstyle-nums|open|open-quote|optimizeLegibility|optimizeQuality|optimizeSpeed|optional|ordinal|outset|outside|over|overlay|overline|padding\n|padding-box|page|painted|pan-down|pan-left|pan-right|pan-up|pan-x|pan-y|paused|petite-caps|pixelated|plaintext|pointer|portrait|pre|pre-line\n|pre-wrap|preserve-3d|progress|progressive|proportional-nums|proportional-width|proximity|radial|recto|region|relative|remove|repeat|repeat-[xy]\n|reset-size|reverse|revert|ridge|right|rl|rl-tb|round|row|row-resize|row-reverse|row-severse|rtl|ruby|ruby-base|ruby-base-container|ruby-text\n|ruby-text-container|run-in|running|s-resize|saturation|scale-down|screen|scroll|scroll-position|se-resize|semi-condensed|semi-expanded|separate\n|sesame|show|sideways|sideways-left|sideways-lr|sideways-right|sideways-rl|simplified|slashed-zero|slice|small|small-caps|small-caption|smaller\n|smooth|soft-light|solid|space|space-around|space-between|space-evenly|spell-out|square|sRGB|stacked-fractions|start|static|status-bar|swap\n|step-end|step-start|sticky|stretch|strict|stroke|stroke-box|style|sub|subgrid|subpixel-antialiased|subtract|super|sw-resize|symbolic|table\n|table-caption|table-cell|table-column|table-column-group|table-footer-group|table-header-group|table-row|table-row-group|tabular-nums|tb|tb-rl\n|text|text-after-edge|text-before-edge|text-bottom|text-top|thick|thin|titling-caps|top|top-outside|touch|traditional|transparent|triangle\n|ultra-condensed|ultra-expanded|under|underline|unicase|unset|upleft|uppercase|upright|use-glyph-orientation|use-script|verso|vertical\n|vertical-ideographic|vertical-lr|vertical-rl|vertical-text|view-box|visible|visibleFill|visiblePainted|visibleStroke|w-resize|wait|wavy\n|weight|whitespace|wider|words|wrap|wrap-reverse|x|x-large|x-small|xx-large|xx-small|y|zero|zoom-in|zoom-out)\n(?![\\w-])",
+          "match": "(?i)(?<![\\w-])(above|absolute|active|add|additive|after-edge|alias|all|all-petite-caps|all-scroll|all-small-caps|alpha|alphabetic|alternate|alternate-reverse|always|antialiased|auto|auto-fill|auto-fit|auto-pos|available|avoid|avoid-column|avoid-page|avoid-region|backwards|balance|baseline|before-edge|below|bevel|bidi-override|blink|block|block-axis|block-start|block-end|bold|bolder|border|border-box|both|bottom|bottom-outside|break-all|break-word|bullets|butt|capitalize|caption|cell|center|central|char|circle|clip|clone|close-quote|closest-corner|closest-side|col-resize|collapse|color|color-burn|color-dodge|column|column-reverse|common-ligatures|compact|condensed|contain|content|content-box|contents|context-menu|contextual|copy|cover|crisp-edges|crispEdges|crosshair|cyclic|dark|darken|dashed|decimal|default|dense|diagonal-fractions|difference|digits|disabled|disc|discretionary-ligatures|distribute|distribute-all-lines|distribute-letter|distribute-space|dot|dotted|double|double-circle|downleft|downright|e-resize|each-line|ease|ease-in|ease-in-out|ease-out|economy|ellipse|ellipsis|embed|end|evenodd|ew-resize|exact|exclude|exclusion|expanded|extends|extra-condensed|extra-expanded|fallback|farthest-corner|farthest-side|fill|fill-available|fill-box|filled|fit-content|fixed|flat|flex|flex-end|flex-start|flip|flow-root|forwards|freeze|from-image|full-width|geometricPrecision|georgian|grab|grabbing|grayscale|grid|groove|hand|hanging|hard-light|help|hidden|hide|historical-forms|historical-ligatures|horizontal|horizontal-tb|hue|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|infinite|inherit|initial|inline|inline-axis|inline-block|inline-end|inline-flex|inline-grid|inline-list-item|inline-start|inline-table|inset|inside|inter-character|inter-ideograph|inter-word|intersect|invert|isolate|isolate-override|italic|jis04|jis78|jis83|jis90|justify|justify-all|kannada|keep-all|landscape|large|larger|left|light|lighten|lighter|line|line-edge|line-through|linear|linearRGB|lining-nums|list-item|local|loose|lowercase|lr|lr-tb|ltr|luminance|luminosity|main-size|mandatory|manipulation|manual|margin-box|match-parent|match-source|mathematical|max-content|medium|menu|message-box|middle|min-content|miter|mixed|move|multiply|n-resize|narrower|ne-resize|nearest-neighbor|nesw-resize|newspaper|no-change|no-clip|no-close-quote|no-common-ligatures|no-contextual|no-discretionary-ligatures|no-drop|no-historical-ligatures|no-open-quote|no-repeat|none|nonzero|normal|not-allowed|nowrap|ns-resize|numbers|numeric|nw-resize|nwse-resize|oblique|oldstyle-nums|open|open-quote|optimizeLegibility|optimizeQuality|optimizeSpeed|optional|ordinal|outset|outside|over|overlay|overline|padding|padding-box|page|painted|pan-down|pan-left|pan-right|pan-up|pan-x|pan-y|paused|petite-caps|pixelated|plaintext|pointer|portrait|pre|pre-line|pre-wrap|preserve-3d|progress|progressive|proportional-nums|proportional-width|proximity|radial|recto|region|relative|remove|repeat|repeat-[xy]|reset-size|reverse|revert|ridge|right|rl|rl-tb|round|row|row-resize|row-reverse|row-severse|rtl|ruby|ruby-base|ruby-base-container|ruby-text|ruby-text-container|run-in|running|s-resize|saturation|scale-down|screen|scroll|scroll-position|se-resize|semi-condensed|semi-expanded|separate|sesame|show|sideways|sideways-left|sideways-lr|sideways-right|sideways-rl|simplified|slashed-zero|slice|small|small-caps|small-caption|smaller|smooth|soft-light|solid|space|space-around|space-between|space-evenly|spell-out|square|sRGB|stacked-fractions|start|static|status-bar|swap|step-end|step-start|sticky|stretch|strict|stroke|stroke-box|style|sub|subgrid|subpixel-antialiased|subtract|super|sw-resize|symbolic|table|table-caption|table-cell|table-column|table-column-group|table-footer-group|table-header-group|table-row|table-row-group|tabular-nums|tb|tb-rl|text|text-after-edge|text-before-edge|text-bottom|text-top|thick|thin|titling-caps|top|top-outside|touch|traditional|transparent|triangle|ultra-condensed|ultra-expanded|under|underline|unicase|unset|upleft|uppercase|upright|use-glyph-orientation|use-script|verso|vertical|vertical-ideographic|vertical-lr|vertical-rl|vertical-text|view-box|visible|visibleFill|visiblePainted|visibleStroke|w-resize|wait|wavy|weight|whitespace|wider|words|wrap|wrap-reverse|x|x-large|x-small|xx-large|xx-small|y|zero|zoom-in|zoom-out)(?![\\w-])",
           "name": "support.constant.property-value.css"
         },
         {
-          "match": "(?xi) (?<![\\w-])\n(arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|cjk-ideographic\n|decimal|decimal-leading-zero|devanagari|disc|disclosure-closed|disclosure-open|ethiopic-halehame-am\n|ethiopic-halehame-ti-e[rt]|ethiopic-numeric|georgian|gujarati|gurmukhi|hangul|hangul-consonant|hebrew\n|hiragana|hiragana-iroha|japanese-formal|japanese-informal|kannada|katakana|katakana-iroha|khmer\n|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek\n|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal\n|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian\n|upper-latin|upper-roman|urdu)\n(?![\\w-])",
+          "match": "(?i)(?<![\\w-])(arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|cjk-ideographic|decimal|decimal-leading-zero|devanagari|disc|disclosure-closed|disclosure-open|ethiopic-halehame-am|ethiopic-halehame-ti-e[rt]|ethiopic-numeric|georgian|gujarati|gurmukhi|hangul|hangul-consonant|hebrew|hiragana|hiragana-iroha|japanese-formal|japanese-informal|kannada|katakana|katakana-iroha|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman|urdu)(?![\\w-])",
           "name": "support.constant.property-value.list-style-type.css"
         },
         {
@@ -1415,7 +1415,7 @@
     "property-names": {
       "patterns": [
         {
-          "match": "(?xi) (?<![\\w-])\n(?:\n  # Standard CSS\n  accent-color|additive-symbols|align-content|align-items|align-self|all|animation|animation-delay|animation-direction|animation-duration\n  | animation-fill-mode|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|aspect-ratio|backdrop-filter\n  | backface-visibility|background|background-attachment|background-blend-mode|background-clip|background-color|background-image\n  | background-origin|background-position|background-position-[xy]|background-repeat|background-size|bleed|block-size|border\n  | border-block-end|border-block-end-color|border-block-end-style|border-block-end-width|border-block-start|border-block-start-color\n  | border-block-start-style|border-block-start-width|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius\n  | border-bottom-style|border-bottom-width|border-collapse|border-color|border-end-end-radius|border-end-start-radius|border-image\n  | border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-inline-end\n  | border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-start|border-inline-start-color\n  | border-inline-start-style|border-inline-start-width|border-left|border-left-color|border-left-style|border-left-width\n  | border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-start-end-radius\n  | border-start-start-radius|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style\n  | border-top-width|border-width|bottom|box-decoration-break|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side\n  | caret-color|clear|clip|clip-path|clip-rule|color|color-adjust|color-interpolation-filters|color-scheme|column-count|column-fill|column-gap\n  | column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|contain|container|container-name|container-type|content|counter-increment\n  | counter-reset|cursor|direction|display|empty-cells|enable-background|fallback|fill|fill-opacity|fill-rule|filter|flex|flex-basis\n  | flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|float|flood-color|flood-opacity|font|font-display|font-family\n  | font-feature-settings|font-kerning|font-language-override|font-optical-sizing|font-size|font-size-adjust|font-stretch\n  | font-style|font-synthesis|font-variant|font-variant-alternates|font-variant-caps|font-variant-east-asian|font-variant-ligatures\n  | font-variant-numeric|font-variant-position|font-variation-settings|font-weight|gap|glyph-orientation-horizontal|glyph-orientation-vertical\n  | grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-gap|grid-column-start\n  | grid-gap|grid-row|grid-row-end|grid-row-gap|grid-row-start|grid-template|grid-template-areas|grid-template-columns|grid-template-rows\n  | hanging-punctuation|height|hyphens|image-orientation|image-rendering|image-resolution|ime-mode|initial-letter|initial-letter-align\n  | inline-size|inset|inset-block|inset-block-end|inset-block-start|inset-inline|inset-inline-end|inset-inline-start|isolation\n  | justify-content|justify-items|justify-self|kerning|left|letter-spacing|lighting-color|line-break|line-clamp|line-height|list-style\n  | list-style-image|list-style-position|list-style-type|margin|margin-block|margin-block-end|margin-block-start|margin-bottom|margin-inline|margin-inline-end|margin-inline-start\n  | margin-left|margin-right|margin-top|marker-end|marker-mid|marker-start|marks|mask|mask-border|mask-border-mode|mask-border-outset\n  | mask-border-repeat|mask-border-slice|mask-border-source|mask-border-width|mask-clip|mask-composite|mask-image|mask-mode\n  | mask-origin|mask-position|mask-repeat|mask-size|mask-type|max-block-size|max-height|max-inline-size|max-lines|max-width\n  | max-zoom|min-block-size|min-height|min-inline-size|min-width|min-zoom|mix-blend-mode|negative|object-fit|object-position\n  | offset|offset-anchor|offset-distance|offset-path|offset-position|offset-rotation|opacity|order|orientation|orphans\n  | outline|outline-color|outline-offset|outline-style|outline-width|overflow|overflow-anchor|overflow-block|overflow-inline\n  | overflow-wrap|overflow-[xy]|overscroll-behavior|overscroll-behavior-block|overscroll-behavior-inline|overscroll-behavior-[xy]\n  | pad|padding|padding-block|padding-block-end|padding-block-start|padding-bottom|padding-inline|padding-inline-end|padding-inline-start|padding-left\n  | padding-right|padding-top|page-break-after|page-break-before|page-break-inside|paint-order|perspective|perspective-origin\n  | place-content|place-items|place-self|pointer-events|position|prefix|quotes|range|resize|right|rotate|row-gap|ruby-align\n  | ruby-merge|ruby-position|scale|scroll-behavior|scroll-margin|scroll-margin-block|scroll-margin-block-end|scroll-margin-block-start\n  | scroll-margin-bottom|scroll-margin-inline|scroll-margin-inline-end|scroll-margin-inline-start|scroll-margin-left|scroll-margin-right\n  | scroll-margin-top|scroll-padding|scroll-padding-block|scroll-padding-block-end|scroll-padding-block-start|scroll-padding-bottom\n  | scroll-padding-inline|scroll-padding-inline-end|scroll-padding-inline-start|scroll-padding-left|scroll-padding-right\n  | scroll-padding-top|scroll-snap-align|scroll-snap-coordinate|scroll-snap-destination|scroll-snap-stop|scroll-snap-type\n  | scrollbar-color|scrollbar-gutter|scrollbar-width|shape-image-threshold|shape-margin|shape-outside|shape-rendering|size\n  | speak-as|src|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap|stroke-linejoin|stroke-miterlimit\n  | stroke-opacity|stroke-width|suffix|symbols|system|tab-size|table-layout|text-align|text-align-last|text-anchor|text-combine-upright\n  | text-decoration|text-decoration-color|text-decoration-line|text-decoration-skip|text-decoration-skip-ink|text-decoration-style|text-decoration-thickness\n  | text-emphasis|text-emphasis-color|text-emphasis-position|text-emphasis-style|text-indent|text-justify|text-orientation\n  | text-overflow|text-rendering|text-shadow|text-size-adjust|text-transform|text-underline-offset|text-underline-position|top|touch-action|transform\n  | transform-box|transform-origin|transform-style|transition|transition-delay|transition-duration|transition-property|transition-timing-function\n  | translate|unicode-bidi|unicode-range|user-select|user-zoom|vertical-align|visibility|white-space|widows|width|will-change\n  | word-break|word-spacing|word-wrap|writing-mode|z-index|zoom\n\n  # SVG attributes\n  | alignment-baseline|baseline-shift|clip-rule|color-interpolation|color-interpolation-filters|color-profile\n  | color-rendering|cx|cy|dominant-baseline|enable-background|fill|fill-opacity|fill-rule|flood-color|flood-opacity\n  | glyph-orientation-horizontal|glyph-orientation-vertical|height|kerning|lighting-color|marker-end|marker-mid\n  | marker-start|r|rx|ry|shape-rendering|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap\n  | stroke-linejoin|stroke-miterlimit|stroke-opacity|stroke-width|text-anchor|width|x|y\n\n  # Not listed on MDN; presumably deprecated\n  | adjust|after|align|align-last|alignment|alignment-adjust|appearance|attachment|azimuth|background-break\n  | balance|baseline|before|bidi|binding|bookmark|bookmark-label|bookmark-level|bookmark-target|border-length\n  | bottom-color|bottom-left-radius|bottom-right-radius|bottom-style|bottom-width|box|box-align|box-direction\n  | box-flex|box-flex-group|box-lines|box-ordinal-group|box-orient|box-pack|break|character|collapse|column\n  | column-break-after|column-break-before|count|counter|crop|cue|cue-after|cue-before|decoration|decoration-break\n  | delay|display-model|display-role|down|drop|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust\n  | drop-initial-before-align|drop-initial-size|drop-initial-value|duration|elevation|emphasis|family|fit|fit-position\n  | flex-group|float-offset|gap|grid-columns|grid-rows|hanging-punctuation|header|hyphenate|hyphenate-after|hyphenate-before\n  | hyphenate-character|hyphenate-lines|hyphenate-resource|icon|image|increment|indent|index|initial-after-adjust\n  | initial-after-align|initial-before-adjust|initial-before-align|initial-size|initial-value|inline-box-align|iteration-count\n  | justify|label|left-color|left-style|left-width|length|level|line|line-stacking|line-stacking-ruby|line-stacking-shift\n  | line-stacking-strategy|lines|list|mark|mark-after|mark-before|marks|marquee|marquee-direction|marquee-play-count|marquee-speed\n  | marquee-style|max|min|model|move-to|name|nav|nav-down|nav-index|nav-left|nav-right|nav-up|new|numeral|offset|ordinal-group\n  | orient|origin|overflow-style|overhang|pack|page|page-policy|pause|pause-after|pause-before|phonemes|pitch|pitch-range\n  | play-count|play-during|play-state|point|presentation|presentation-level|profile|property|punctuation|punctuation-trim\n  | radius|rate|rendering-intent|repeat|replace|reset|resolution|resource|respond-to|rest|rest-after|rest-before|richness\n  | right-color|right-style|right-width|role|rotation|rotation-point|rows|ruby|ruby-overhang|ruby-span|rule|rule-color\n  | rule-style|rule-width|shadow|size|size-adjust|sizing|space|space-collapse|spacing|span|speak|speak-header|speak-numeral\n  | speak-punctuation|speech|speech-rate|speed|stacking|stacking-ruby|stacking-shift|stacking-strategy|stress|stretch\n  | string-set|style|style-image|style-position|style-type|target|target-name|target-new|target-position|text|text-height\n  | text-justify|text-outline|text-replace|text-wrap|timing-function|top-color|top-left-radius|top-right-radius|top-style\n  | top-width|trim|unicode|up|user-select|variant|voice|voice-balance|voice-duration|voice-family|voice-pitch|voice-pitch-range\n  | voice-rate|voice-stress|voice-volume|volume|weight|white|white-space-collapse|word|wrap\n)\n(?![\\w-])",
+          "match": "(?i)(?<![\\w-])(?:accent-color|additive-symbols|align-content|align-items|align-self|all|animation|animation-delay|animation-direction|animation-duration|animation-fill-mode|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|aspect-ratio|backdrop-filter|backface-visibility|background|background-attachment|background-blend-mode|background-clip|background-color|background-image|background-origin|background-position|background-position-[xy]|background-repeat|background-size|bleed|block-size|border|border-block-end|border-block-end-color|border-block-end-style|border-block-end-width|border-block-start|border-block-start-color|border-block-start-style|border-block-start-width|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-end-end-radius|border-end-start-radius|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-inline-end|border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-start|border-inline-start-color|border-inline-start-style|border-inline-start-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-start-end-radius|border-start-start-radius|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|bottom|box-decoration-break|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|caret-color|clear|clip|clip-path|clip-rule|color|color-adjust|color-interpolation-filters|color-scheme|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|contain|container|container-name|container-type|content|counter-increment|counter-reset|cursor|direction|display|empty-cells|enable-background|fallback|fill|fill-opacity|fill-rule|filter|flex|flex-basis|flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|float|flood-color|flood-opacity|font|font-display|font-family|font-feature-settings|font-kerning|font-language-override|font-optical-sizing|font-size|font-size-adjust|font-stretch|font-style|font-synthesis|font-variant|font-variant-alternates|font-variant-caps|font-variant-east-asian|font-variant-ligatures|font-variant-numeric|font-variant-position|font-variation-settings|font-weight|gap|glyph-orientation-horizontal|glyph-orientation-vertical|grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-gap|grid-column-start|grid-gap|grid-row|grid-row-end|grid-row-gap|grid-row-start|grid-template|grid-template-areas|grid-template-columns|grid-template-rows|hanging-punctuation|height|hyphens|image-orientation|image-rendering|image-resolution|ime-mode|initial-letter|initial-letter-align|inline-size|inset|inset-block|inset-block-end|inset-block-start|inset-inline|inset-inline-end|inset-inline-start|isolation|justify-content|justify-items|justify-self|kerning|left|letter-spacing|lighting-color|line-break|line-clamp|line-height|list-style|list-style-image|list-style-position|list-style-type|margin|margin-block|margin-block-end|margin-block-start|margin-bottom|margin-inline|margin-inline-end|margin-inline-start|margin-left|margin-right|margin-top|marker-end|marker-mid|marker-start|marks|mask|mask-border|mask-border-mode|mask-border-outset|mask-border-repeat|mask-border-slice|mask-border-source|mask-border-width|mask-clip|mask-composite|mask-image|mask-mode|mask-origin|mask-position|mask-repeat|mask-size|mask-type|max-block-size|max-height|max-inline-size|max-lines|max-width|max-zoom|min-block-size|min-height|min-inline-size|min-width|min-zoom|mix-blend-mode|negative|object-fit|object-position|offset|offset-anchor|offset-distance|offset-path|offset-position|offset-rotation|opacity|order|orientation|orphans|outline|outline-color|outline-offset|outline-style|outline-width|overflow|overflow-anchor|overflow-block|overflow-inline|overflow-wrap|overflow-[xy]|overscroll-behavior|overscroll-behavior-block|overscroll-behavior-inline|overscroll-behavior-[xy]|pad|padding|padding-block|padding-block-end|padding-block-start|padding-bottom|padding-inline|padding-inline-end|padding-inline-start|padding-left|padding-right|padding-top|page-break-after|page-break-before|page-break-inside|paint-order|perspective|perspective-origin|place-content|place-items|place-self|pointer-events|position|prefix|quotes|range|resize|right|rotate|row-gap|ruby-align|ruby-merge|ruby-position|scale|scroll-behavior|scroll-margin|scroll-margin-block|scroll-margin-block-end|scroll-margin-block-start|scroll-margin-bottom|scroll-margin-inline|scroll-margin-inline-end|scroll-margin-inline-start|scroll-margin-left|scroll-margin-right|scroll-margin-top|scroll-padding|scroll-padding-block|scroll-padding-block-end|scroll-padding-block-start|scroll-padding-bottom|scroll-padding-inline|scroll-padding-inline-end|scroll-padding-inline-start|scroll-padding-left|scroll-padding-right|scroll-padding-top|scroll-snap-align|scroll-snap-coordinate|scroll-snap-destination|scroll-snap-stop|scroll-snap-type|scrollbar-color|scrollbar-gutter|scrollbar-width|shape-image-threshold|shape-margin|shape-outside|shape-rendering|size|speak-as|src|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap|stroke-linejoin|stroke-miterlimit|stroke-opacity|stroke-width|suffix|symbols|system|tab-size|table-layout|text-align|text-align-last|text-anchor|text-combine-upright|text-decoration|text-decoration-color|text-decoration-line|text-decoration-skip|text-decoration-skip-ink|text-decoration-style|text-decoration-thickness|text-emphasis|text-emphasis-color|text-emphasis-position|text-emphasis-style|text-indent|text-justify|text-orientation|text-overflow|text-rendering|text-shadow|text-size-adjust|text-transform|text-underline-offset|text-underline-position|top|touch-action|transform|transform-box|transform-origin|transform-style|transition|transition-delay|transition-duration|transition-property|transition-timing-function|translate|unicode-bidi|unicode-range|user-select|user-zoom|vertical-align|visibility|white-space|widows|width|will-change|word-break|word-spacing|word-wrap|writing-mode|z-index|zoom|alignment-baseline|baseline-shift|clip-rule|color-interpolation|color-interpolation-filters|color-profile|color-rendering|cx|cy|dominant-baseline|enable-background|fill|fill-opacity|fill-rule|flood-color|flood-opacity|glyph-orientation-horizontal|glyph-orientation-vertical|height|kerning|lighting-color|marker-end|marker-mid|marker-start|r|rx|ry|shape-rendering|stop-color|stop-opacity|stroke|stroke-dasharray|stroke-dashoffset|stroke-linecap|stroke-linejoin|stroke-miterlimit|stroke-opacity|stroke-width|text-anchor|width|[xy]|adjust|after|align|align-last|alignment|alignment-adjust|appearance|attachment|azimuth|background-break|balance|baseline|before|bidi|binding|bookmark|bookmark-label|bookmark-level|bookmark-target|border-length|bottom-color|bottom-left-radius|bottom-right-radius|bottom-style|bottom-width|box|box-align|box-direction|box-flex|box-flex-group|box-lines|box-ordinal-group|box-orient|box-pack|break|character|collapse|column|column-break-after|column-break-before|count|counter|crop|cue|cue-after|cue-before|decoration|decoration-break|delay|display-model|display-role|down|drop|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|duration|elevation|emphasis|family|fit|fit-position|flex-group|float-offset|gap|grid-columns|grid-rows|hanging-punctuation|header|hyphenate|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|icon|image|increment|indent|index|initial-after-adjust|initial-after-align|initial-before-adjust|initial-before-align|initial-size|initial-value|inline-box-align|iteration-count|justify|label|left-color|left-style|left-width|length|level|line|line-stacking|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|lines|list|mark|mark-after|mark-before|marks|marquee|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max|min|model|move-to|name|nav|nav-down|nav-index|nav-left|nav-right|nav-up|new|numeral|offset|ordinal-group|orient|origin|overflow-style|overhang|pack|page|page-policy|pause|pause-after|pause-before|phonemes|pitch|pitch-range|play-count|play-during|play-state|point|presentation|presentation-level|profile|property|punctuation|punctuation-trim|radius|rate|rendering-intent|repeat|replace|reset|resolution|resource|respond-to|rest|rest-after|rest-before|richness|right-color|right-style|right-width|role|rotation|rotation-point|rows|ruby|ruby-overhang|ruby-span|rule|rule-color|rule-style|rule-width|shadow|size|size-adjust|sizing|space|space-collapse|spacing|span|speak|speak-header|speak-numeral|speak-punctuation|speech|speech-rate|speed|stacking|stacking-ruby|stacking-shift|stacking-strategy|stress|stretch|string-set|style|style-image|style-position|style-type|target|target-name|target-new|target-position|text|text-height|text-justify|text-outline|text-replace|text-wrap|timing-function|top-color|top-left-radius|top-right-radius|top-style|top-width|trim|unicode|up|user-select|variant|voice|voice-balance|voice-duration|voice-family|voice-pitch|voice-pitch-range|voice-rate|voice-stress|voice-volume|volume|weight|white|white-space-collapse|word|wrap)(?![\\w-])",
           "name": "support.type.property-name.css"
         },
         {
@@ -1468,7 +1468,7 @@
           "name": "invalid.illegal.colon.css"
         }
       },
-      "match": "(?xi)\n(:)(:*)\n(?: active|any-link|checked|default|disabled|empty|enabled|first\n  | (?:first|last|only)-(?:child|of-type)|focus|focus-visible|focus-within|fullscreen|host|hover\n  | in-range|indeterminate|invalid|left|link|optional|out-of-range\n  | read-only|read-write|required|right|root|scope|target|unresolved\n  | valid|visited\n)(?![\\w-]|\\s*[;}])",
+      "match": "(?i)(:)(:*)(?:active|any-link|checked|default|disabled|empty|enabled|first|(?:first|last|only)-(?:child|of-type)|focus|focus-visible|focus-within|fullscreen|host|hover|in-range|indeterminate|invalid|left|link|optional|out-of-range|read-only|read-write|required|right|root|scope|target|unresolved|valid|visited)(?![\\w-]|\\s*[;}])",
       "name": "entity.other.attribute-name.pseudo-class.css"
     },
     "pseudo-elements": {
@@ -1480,11 +1480,11 @@
           "name": "punctuation.definition.entity.css"
         }
       },
-      "match": "(?xi)\n(?:\n  (::?)                       # Elements using both : and :: notation\n  (?: after\n    | before\n    | first-letter\n    | first-line\n    | (?:-(?:ah|apple|atsc|epub|hp|khtml|moz\n            |ms|o|rim|ro|tc|wap|webkit|xv)\n        | (?:mso|prince))\n      -[a-z-]+\n  )\n  |\n  (::)                        # Double-colon only\n  (?: backdrop\n    | content\n    | grammar-error\n    | marker\n    | placeholder\n    | selection\n    | shadow\n    | spelling-error\n  )\n)\n(?![\\w-]|\\s*[;}])",
+      "match": "(?i)(?:(::?)(?:after|before|first-letter|first-line|(?:-(?:ah|apple|atsc|epub|hp|khtml|moz|ms|o|rim|ro|tc|wap|webkit|xv)|(?:mso|prince))-[a-z-]+)|(::)(?:backdrop|content|grammar-error|marker|placeholder|selection|shadow|spelling-error))(?![\\w-]|\\s*[;}])",
       "name": "entity.other.attribute-name.pseudo-element.css"
     },
     "rule-list": {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.property-list.begin.bracket.curly.css"
@@ -1515,7 +1515,7 @@
           "include": "#font-features"
         },
         {
-          "match": "(?<![\\w-])--(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+          "match": "(?<![\\w-])--[-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
           "name": "variable.css"
         },
         {
@@ -1536,7 +1536,7 @@
             }
           },
           "contentName": "meta.property-value.css",
-          "end": "\\s*(;)|\\s*(?=}|\\))",
+          "end": "\\s*(;)|\\s*(?=[})])",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.rule.css"
@@ -1558,7 +1558,7 @@
       ]
     },
     "selector": {
-      "begin": "(?=(?:\\|)?(?:[-\\[:.*\\#a-zA-Z_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.)))",
+      "begin": "(?=\\|?(?:[-\\[:.*#a-zA-Z_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)))",
       "end": "(?=\\s*[/@{)])",
       "name": "meta.selector.css",
       "patterns": [
@@ -1590,7 +1590,7 @@
               "name": "punctuation.separator.css"
             }
           },
-          "match": "(?:^|(?<=[\\s,(};]))(?![-\\w*]+\\|(?![-\\[:.*\\#a-zA-Z_]|[^\\x00-\\x7F]))((?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*|\\*)?(\\|)"
+          "match": "(?:^|(?<=[\\s,(};]))(?![-\\w*]+\\|(?![-\\[:.*#a-zA-Z_[^\\x00-\\x7F]]))([-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*|\\*)?(\\|)"
         },
         {
           "include": "#tag-names"
@@ -1612,7 +1612,7 @@
               ]
             }
           },
-          "match": "(?<![@\\w-])([.\\#])((?:-?[0-9]|-(?=$|[\\s,.\\#)\\[:{>+~|]|/\\*)|(?:[-a-zA-Z_0-9]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*(?:[!\"'%&(*;<?@^`|\\]}]|/(?!\\*))+)(?:[-a-zA-Z_0-9]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*)",
+          "match": "(?<![@\\w-])([.#])((?:-?[0-9]|-(?=$|[\\s,.#)\\[:{>+~|]|/\\*)|(?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*(?:[!\"'%\\&(*;<?@^`|\\]}]|/(?!\\*))+)(?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*)",
           "name": "invalid.illegal.bad-identifier.css"
         },
         {
@@ -1628,7 +1628,7 @@
               ]
             }
           },
-          "match": "(\\.)((?:[-a-zA-Z_0-9]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))+)(?=$|[\\s,.\\#)\\[:{>+~|]|/\\*)",
+          "match": "(\\.)((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))+)(?=$|[\\s,.#)\\[:{>+~|]|/\\*)",
           "name": "entity.other.attribute-name.class.css"
         },
         {
@@ -1644,7 +1644,7 @@
               ]
             }
           },
-          "match": "(\\#)(-?(?![0-9])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))+)(?=$|[\\s,.\\#)\\[:{>+~|]|/\\*)",
+          "match": "(#)(-?(?![0-9])(?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))+)(?=$|[\\s,.#)\\[:{>+~|]|/\\*)",
           "name": "entity.other.attribute-name.id.css"
         },
         {
@@ -1654,7 +1654,7 @@
               "name": "punctuation.definition.entity.begin.bracket.square.css"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.entity.end.bracket.square.css"
@@ -1711,7 +1711,7 @@
                   ]
                 }
               },
-              "match": "(-?(?!\\d)(?:[\\w-]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))+|\\*)(?=\\|(?!\\s|=|$|\\])(?:-?(?!\\d)|[\\\\\\w-]|[^\\x00-\\x7F]))"
+              "match": "(-?(?!\\d)(?:[\\w\\-[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))+|\\*)(?=\\|(?![\\s=]|$|])(?:-?(?!\\d)|[\\\\\\w\\-[^\\x00-\\x7F]]))"
             },
             {
               "captures": {
@@ -1724,7 +1724,7 @@
                   ]
                 }
               },
-              "match": "(-?(?!\\d)(?>[\\w-]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))+)\\s*(?=[~|^\\]$*=]|/\\*)"
+              "match": "(-?(?!\\d)(?>[\\w\\-[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))+)\\s*(?=[~|^\\]$*=]|/\\*)"
             }
           ]
         },
@@ -1808,7 +1808,7 @@
       ]
     },
     "tag-names": {
-      "match": "(?xi) (?<![\\w:-])\n(?:\n    # HTML\n    a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdi|bdo|bgsound\n  | big|blink|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command\n  | content|data|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|element|em|embed|fieldset\n  | figcaption|figure|font|footer|form|frame|frameset|h[1-6]|head|header|hgroup|hr|html|i\n  | iframe|image|img|input|ins|isindex|kbd|keygen|label|legend|li|link|listing|main|map|mark\n  | marquee|math|menu|menuitem|meta|meter|multicol|nav|nextid|nobr|noembed|noframes|noscript\n  | object|ol|optgroup|option|output|p|param|picture|plaintext|pre|progress|q|rb|rp|rt|rtc\n  | ruby|s|samp|script|section|select|shadow|slot|small|source|spacer|span|strike|strong\n  | style|sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr\n  | track|tt|u|ul|var|video|wbr|xmp\n\n  # SVG\n  | altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|animateMotion|animateTransform\n  | circle|clipPath|color-profile|cursor|defs|desc|discard|ellipse|feBlend|feColorMatrix\n  | feComponentTransfer|feComposite|feConvolveMatrix|feDiffuseLighting|feDisplacementMap\n  | feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur\n  | feImage|feMerge|feMergeNode|feMorphology|feOffset|fePointLight|feSpecularLighting\n  | feSpotLight|feTile|feTurbulence|filter|font-face|font-face-format|font-face-name\n  | font-face-src|font-face-uri|foreignObject|g|glyph|glyphRef|hatch|hatchpath|hkern\n  | line|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|metadata\n  | missing-glyph|mpath|path|pattern|polygon|polyline|radialGradient|rect|set|solidcolor\n  | stop|svg|switch|symbol|text|textPath|tref|tspan|use|view|vkern\n\n  # MathML\n  | annotation|annotation-xml|maction|maligngroup|malignmark|math|menclose|merror|mfenced\n  | mfrac|mglyph|mi|mlabeledtr|mlongdiv|mmultiscripts|mn|mo|mover|mpadded|mphantom|mroot\n  | mrow|ms|mscarries|mscarry|msgroup|msline|mspace|msqrt|msrow|mstack|mstyle|msub|msubsup\n  | msup|mtable|mtd|mtext|mtr|munder|munderover|semantics\n)\n(?=[+~>\\s,.\\#|){:\\[]|/\\*|$)",
+      "match": "(?i)(?<![\\w:-])(?:a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdi|bdo|bgsound|big|blink|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command|content|data|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|element|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|h[1-6]|head|header|hgroup|hr|html|i|iframe|image|img|input|ins|isindex|kbd|keygen|label|legend|li|link|listing|main|map|mark|marquee|math|menu|menuitem|meta|meter|multicol|nav|nextid|nobr|noembed|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|plaintext|pre|progress|q|rb|rp|rt|rtc|ruby|s|samp|script|section|select|shadow|slot|small|source|spacer|span|strike|strong|style|sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video|wbr|xmp|altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|animateMotion|animateTransform|circle|clipPath|color-profile|cursor|defs|desc|discard|ellipse|feBlend|feColorMatrix|feComponentTransfer|feComposite|feConvolveMatrix|feDiffuseLighting|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|feMergeNode|feMorphology|feOffset|fePointLight|feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|foreignObject|g|glyph|glyphRef|hatch|hatchpath|hkern|line|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|metadata|missing-glyph|mpath|path|pattern|polygon|polyline|radialGradient|rect|set|solidcolor|stop|svg|switch|symbol|text|textPath|tref|tspan|use|view|vkern|annotation|annotation-xml|maction|maligngroup|malignmark|math|menclose|merror|mfenced|mfrac|mglyph|mi|mlabeledtr|mlongdiv|mmultiscripts|mn|mo|mover|mpadded|mphantom|mroot|mrow|ms|mscarries|mscarry|msgroup|msline|mspace|msqrt|msrow|mstack|mstyle|msub|msubsup|msup|mtable|mtd|mtext|mtr|munder|munderover|semantics)(?=[+~>\\s,.#|){:\\[]|/\\*|$)",
       "name": "entity.name.tag.css"
     },
     "unicode-range": {
@@ -1820,7 +1820,7 @@
           "name": "punctuation.separator.dash.unicode-range.css"
         }
       },
-      "match": "(?<![\\w-])[Uu]\\+[0-9A-Fa-f?]{1,6}(?:(-)[0-9A-Fa-f]{1,6})?(?![\\w-])"
+      "match": "(?<![\\w-])[Uu]\\+[?\\h]{1,6}(?:(-)\\h{1,6})?(?![\\w-])"
     },
     "url": {
       "begin": "(?i)(?<![\\w@-])(url)(\\()",
diff --git a/resources/languages/csv.json b/resources/languages/csv.json
index ed27b2a..398930b 100644
--- a/resources/languages/csv.json
+++ b/resources/languages/csv.json
@@ -38,7 +38,7 @@
           "name": "markup.bold.rainbow9"
         }
       },
-      "match": "((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?",
+      "match": "( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?",
       "name": "rainbowgroup"
     }
   ],
diff --git a/resources/languages/cue.json b/resources/languages/cue.json
index 467af8b..aac4b0e 100644
--- a/resources/languages/cue.json
+++ b/resources/languages/cue.json
@@ -20,12 +20,12 @@
           "name": "entity.name.namespace"
         }
       },
-      "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(package)[ \\t]+([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*)(?![\\p{L}\\p{Nd}_\\$\\#])"
+      "match": "(?<![\\p{L}\\d_$#])(package)[ \\t]+([\\p{L}$#][\\p{L}\\d_$#]*)(?![\\p{L}\\d_$#])"
     },
     {
       "patterns": [
         {
-          "begin": "(?<![\\p{L}\\p{Nd}_\\$\\#])(import)[ \\t]+(\\()",
+          "begin": "(?<![\\p{L}\\d_$#])(import)[ \\t]+(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.import"
@@ -69,7 +69,7 @@
                   "name": "punctuation.definition.string.end"
                 }
               },
-              "match": "(?:([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*)[ \\t]+)?(\")([^:\"]+)(?:(:)([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*))?(\")",
+              "match": "(?:([\\p{L}$#][\\p{L}\\d_$#]*)[ \\t]+)?(\")([^:\"]+)(?:(:)([\\p{L}$#][\\p{L}\\d_$#]*))?(\")",
               "name": "meta.import-spec"
             },
             {
@@ -105,7 +105,7 @@
               "name": "punctuation.definition.string.end"
             }
           },
-          "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(import)[ \\t]+(?:([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*)[ \\t]+)?(\")([^:\"]+)(?:(:)([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*))?(\")",
+          "match": "(?<![\\p{L}\\d_$#])(import)[ \\t]+(?:([\\p{L}$#][\\p{L}\\d_$#]*)[ \\t]+)?(\")([^:\"]+)(?:(:)([\\p{L}$#][\\p{L}\\d_$#]*))?(\")",
           "name": "meta.import"
         }
       ]
@@ -124,7 +124,7 @@
     "attribute_element": {
       "patterns": [
         {
-          "begin": "([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(=)",
+          "begin": "([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(=)",
           "beginCaptures": {
             "1": {
               "name": "variable.other"
@@ -133,7 +133,7 @@
               "name": "punctuation.bind"
             }
           },
-          "end": "(?=[,\\)])",
+          "end": "(?=[,)])",
           "patterns": [
             {
               "include": "#attribute_string"
@@ -141,7 +141,7 @@
           ]
         },
         {
-          "begin": "([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(\\()",
+          "begin": "([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.other"
@@ -176,11 +176,11 @@
           "include": "#string"
         },
         {
-          "match": "[^\\n,\"'#=\\(\\)]+",
+          "match": "[^\\n,\"'#=()]+",
           "name": "string.unquoted"
         },
         {
-          "match": "[^,\\)]+",
+          "match": "[^,)]+",
           "name": "invalid"
         }
       ]
@@ -211,7 +211,7 @@
     "declaration": {
       "patterns": [
         {
-          "begin": "(@)([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(\\()",
+          "begin": "(@)([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(\\()",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.annotation"
@@ -285,10 +285,10 @@
                   "name": "keyword.control.in"
                 }
               },
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(for)[ \\t]+([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(?:[ \\t]*(,)[ \\t]*([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+))?[ \\t]+(in)(?![\\p{L}\\p{Nd}_\\$\\#])"
+              "match": "(?<![\\p{L}\\d_$#])(for)[ \\t]+([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(?:[ \\t]*(,)[ \\t]*([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+))?[ \\t]+(in)(?![\\p{L}\\d_$#])"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])if(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])if(?![\\p{L}\\d_$#])",
               "name": "keyword.control.conditional"
             },
             {
@@ -303,22 +303,22 @@
                   "name": "punctuation.bind"
                 }
               },
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(let)[ \\t]+([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)[ \\t]*(=)(?![=])"
+              "match": "(?<![\\p{L}\\d_$#])(let)[ \\t]+([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)[ \\t]*(=)(?!=)"
             }
           ]
         },
         {
           "patterns": [
             {
-              "match": "[\\+\\-\\*]|/(?![/*])",
+              "match": "[+\\-*]|/(?![/*])",
               "name": "keyword.operator"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(?:div|mod|quo|rem)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])(?:div|mod|quo|rem)(?![\\p{L}\\d_$#])",
               "name": "keyword.operator.word"
             },
             {
-              "match": "=[=~]|![=~]|<=|>=|[<](?![-=])|[>](?![=])",
+              "match": "=[=~]|![=~]|<=|>=|<(?![-=])|>(?!=)",
               "name": "keyword.operator.comparison"
             },
             {
@@ -340,24 +340,24 @@
               "name": "variable.other.member"
             }
           },
-          "match": "(?<!\\.)(\\.)([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(?![\\p{L}\\p{Nd}_\\$\\#])"
+          "match": "(?<!\\.)(\\.)([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(?![\\p{L}\\d_$#])"
         },
         {
           "patterns": [
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])_(?!\\|)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])_(?!\\|)(?![\\p{L}\\d_$#])",
               "name": "constant.language.top"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])_\\|_(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])_\\|_(?![\\p{L}\\d_$#])",
               "name": "constant.language.bottom"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])null(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])null(?![\\p{L}\\d_$#])",
               "name": "constant.language.null"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(?:true|false)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])(?:true|false)(?![\\p{L}\\d_$#])",
               "name": "constant.language.bool"
             },
             {
@@ -365,15 +365,15 @@
                 {
                   "patterns": [
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])[0-9](?:_?[0-9])*\\.(?:[0-9](?:_?[0-9])*)?(?:[eE][\\+\\-]?[0-9](?:_?[0-9])*)?(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])[0-9](?:_?[0-9])*\\.(?:[0-9](?:_?[0-9])*)?(?:[eE][+-]?[0-9](?:_?[0-9])*)?(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.float.decimal"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])[0-9](?:_?[0-9])*[eE][\\+\\-]?[0-9](?:_?[0-9])*(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])[0-9](?:_?[0-9])*[eE][+-]?[0-9](?:_?[0-9])*(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.float.decimal"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])\\.[0-9](?:_?[0-9])*(?:[eE][\\+\\-]?[0-9](?:_?[0-9])*)?(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])\\.[0-9](?:_?[0-9])*(?:[eE][+-]?[0-9](?:_?[0-9])*)?(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.float.decimal"
                     }
                   ]
@@ -383,29 +383,29 @@
                     {
                       "patterns": [
                         {
-                          "match": "(?<![\\p{L}\\p{Nd}_\\.])(?:0|[1-9](?:_?[0-9])*)(?:\\.[0-9](?:_?[0-9])*)?(?:[KMGTPEYZ]i?)(?![\\p{L}\\p{Nd}_\\.])",
+                          "match": "(?<![\\p{L}\\d_.])(?:0|[1-9](?:_?[0-9])*)(?:\\.[0-9](?:_?[0-9])*)?[KMGTPEYZ]i?(?![\\p{L}\\d_.])",
                           "name": "constant.numeric.integer.other"
                         },
                         {
-                          "match": "(?<![\\p{L}\\p{Nd}_\\.])\\.[0-9](?:_?[0-9])*(?:[KMGTPEYZ]i?)(?![\\p{L}\\p{Nd}_\\.])",
+                          "match": "(?<![\\p{L}\\d_.])\\.[0-9](?:_?[0-9])*[KMGTPEYZ]i?(?![\\p{L}\\d_.])",
                           "name": "constant.numeric.integer.other"
                         }
                       ]
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])(?:0|[1-9](?:_?[0-9])*)(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])(?:0|[1-9](?:_?[0-9])*)(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.integer.decimal"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])0b[0-1](?:_?[0-1])*(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])0b[0-1](?:_?[0-1])*(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.integer.binary"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])0[xX][0-9a-fA-F](?:_?[0-9a-fA-F])*(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])0[xX]\\h(?:_?\\h)*(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.integer.hexadecimal"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])0o?[0-7](?:_?[0-7])*(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])0o?[0-7](?:_?[0-7])*(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.integer.octal"
                     }
                   ]
@@ -416,13 +416,13 @@
               "include": "#string"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(?:bool|u?int(?:8|16|32|64|128)?|float(?:32|64)?|string|bytes|number|rune)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])(?:bool|u?int(?:8|16|32|64|128)?|float(?:32|64)?|string|bytes|number|rune)(?![\\p{L}\\d_$#])",
               "name": "support.type"
             },
             {
               "patterns": [
                 {
-                  "begin": "(?<![\\p{L}\\p{Nd}_\\$\\#])(len|close|and|or)(\\()",
+                  "begin": "(?<![\\p{L}\\d_$#])(len|close|and|or)(\\()",
                   "beginCaptures": {
                     "1": {
                       "name": "support.function"
@@ -457,7 +457,7 @@
                   ]
                 },
                 {
-                  "begin": "(?<![\\p{L}\\p{Nd}_\\$\\#])([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*)(\\.)(\\p{Lu}[\\p{L}\\p{Nd}_\\$\\#]*)(\\()",
+                  "begin": "(?<![\\p{L}\\d_$#])([\\p{L}$#][\\p{L}\\d_$#]*)(\\.)(\\p{Lu}[\\p{L}\\d_$#]*)(\\()",
                   "beginCaptures": {
                     "1": {
                       "name": "support.module"
@@ -500,7 +500,7 @@
               ]
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(?:[\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])(?:[\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(?![\\p{L}\\d_$#])",
               "name": "variable.other"
             },
             {
@@ -510,7 +510,7 @@
                   "name": "punctuation.definition.struct.begin"
                 }
               },
-              "end": "\\}",
+              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.struct.end"
@@ -545,7 +545,7 @@
                   "name": "punctuation.section.brackets.begin"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.brackets.end"
@@ -577,7 +577,7 @@
                       "name": "punctuation.alias"
                     }
                   },
-                  "match": "([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)[ \\t]*(=)"
+                  "match": "([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)[ \\t]*(=)"
                 },
                 {
                   "include": "#expression"
@@ -625,11 +625,11 @@
       ]
     },
     "invalid_in_braces": {
-      "match": "[^\\}]+",
+      "match": "[^}]+",
       "name": "invalid"
     },
     "invalid_in_parens": {
-      "match": "[^\\)]+",
+      "match": "[^)]+",
       "name": "invalid"
     },
     "punctuation_colon": {
@@ -663,11 +663,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\#(?:\"\"\"|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\#(?:\"\"\"|[/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\#(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\#(?:[0-7]{3}|x\\h{2})",
               "name": "invalid.illegal"
             },
             {
@@ -720,11 +720,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\#(?:\"|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\#(?:[\"/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\#(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\#(?:[0-7]{3}|x\\h{2})",
               "name": "invalid.illegal"
             },
             {
@@ -777,11 +777,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\#(?:'''|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\#(?:'''|[/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\#(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\#(?:[0-7]{3}|x\\h{2})",
               "name": "constant.character.escape"
             },
             {
@@ -834,11 +834,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\#(?:'|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\#(?:['/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\#(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\#(?:[0-7]{3}|x\\h{2})",
               "name": "constant.character.escape"
             },
             {
@@ -891,11 +891,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\(?:\"\"\"|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:\"\"\"|[/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\(?:[0-7]{3}|x\\h{2})",
               "name": "invalid.illegal"
             },
             {
@@ -948,11 +948,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\(?:\"|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:[\"/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\(?:[0-7]{3}|x\\h{2})",
               "name": "invalid.illegal"
             },
             {
@@ -1005,11 +1005,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\(?:'''|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:'''|[/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\(?:[0-7]{3}|x\\h{2})",
               "name": "constant.character.escape"
             },
             {
@@ -1062,11 +1062,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\(?:'|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:['/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\(?:[0-7]{3}|x\\h{2})",
               "name": "constant.character.escape"
             },
             {
diff --git a/resources/languages/cypher.json b/resources/languages/cypher.json
index d1cf562..45536b5 100644
--- a/resources/languages/cypher.json
+++ b/resources/languages/cypher.json
@@ -62,37 +62,30 @@
     "functions": {
       "patterns": [
         {
-          "comment": "List of Cypher built-in functions from http://docs.neo4j.org/chunked/milestone/query-function.html",
           "match": "(?i)\\b((NOT)(?=\\s*\\()|IS\\s+NULL|IS\\s+NOT\\s+NULL)",
           "name": "keyword.control.function.boolean.cypher"
         },
         {
-          "comment": "List of Cypher built-in functions from http://docs.neo4j.org/chunked/milestone/query-function.html",
           "match": "(?i)\\b(ALL|ANY|NONE|SINGLE)(?=\\s*\\()",
           "name": "support.function.predicate.cypher"
         },
         {
-          "comment": "List of Cypher built-in functions from http://docs.neo4j.org/chunked/milestone/query-function.html",
           "match": "(?i)\\b(LENGTH|TYPE|ID|COALESCE|HEAD|LAST|TIMESTAMP|STARTNODE|ENDNODE|TOINT|TOFLOAT)(?=\\s*\\()",
           "name": "support.function.scalar.cypher"
         },
         {
-          "comment": "List of Cypher built-in functions from http://docs.neo4j.org/chunked/milestone/query-function.html",
           "match": "(?i)\\b(NODES|RELATIONSHIPS|LABELS|EXTRACT|FILTER|TAIL|RANGE|REDUCE)(?=\\s*\\()",
           "name": "support.function.collection.cypher"
         },
         {
-          "comment": "List of Cypher built-in functions from http://docs.neo4j.org/chunked/milestone/query-function.html",
           "match": "(?i)\\b(ABS|ACOS|ASIN|ATAN|ATAN2|COS|COT|DEGREES|E|EXP|FLOOR|HAVERSIN|LOG|LOG10|PI|RADIANS|RAND|ROUND|SIGN|SIN|SQRT|TAN)(?=\\s*\\()",
           "name": "support.function.math.cypher"
         },
         {
-          "comment": "List of Cypher built-in functions from http://docs.neo4j.org/chunked/milestone/query-function.html",
           "match": "(?i)\\b(COUNT|sum|avg|max|min|stdev|stdevp|percentileDisc|percentileCont|collect)(?=\\s*\\()",
           "name": "support.function.aggregation.cypher"
         },
         {
-          "comment": "List of Cypher built-in functions from http://docs.neo4j.org/chunked/milestone/query-function.html",
           "match": "(?i)\\b(STR|REPLACE|SUBSTRING|LEFT|RIGHT|LTRIM|RTRIM|TRIM|LOWER|UPPER|SPLIT)(?=\\s*\\()",
           "name": "support.function.string.cypher"
         }
@@ -156,7 +149,7 @@
           "name": "source.starting-functions.cypher",
           "patterns": [
             {
-              "match": "((?:`.+?`)|(?:[\\p{L}_][\\p{L}0-9_]*))",
+              "match": "(`.+?`|[\\p{L}_][\\p{L}0-9_]*)",
               "name": "variable.parameter.relationship-name.cypher"
             },
             {
@@ -187,11 +180,11 @@
     "operators": {
       "patterns": [
         {
-          "match": "(\\+|\\-|\\/|\\*|\\%|\\?|!)",
+          "match": "([+\\-/*%?!])",
           "name": "keyword.operator.math.cypher"
         },
         {
-          "match": "(<=|=>|<>|<|>|=~|=)",
+          "match": "(<=|=>|<>|[<>]|=~|=)",
           "name": "keyword.operator.compare.cypher"
         },
         {
@@ -220,7 +213,7 @@
               "name": "keyword.operator.relationship-pattern-start.cypher"
             }
           },
-          "end": "(])(->|-)",
+          "end": "(])(-(?:>|))",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.relationship-pattern-end.cypher"
@@ -243,7 +236,7 @@
                   "name": "entity.name.class.relationship.type.cypher"
                 }
               },
-              "match": "(:)((?:`.+?`)|(?:[\\p{L}_][\\p{L}0-9_]*))",
+              "match": "(:)(`.+?`|[\\p{L}_][\\p{L}0-9_]*)",
               "name": "entity.name.class.relationship-type.cypher"
             },
             {
@@ -255,11 +248,11 @@
                   "name": "entity.name.class.relationship.type-or.cypher"
                 }
               },
-              "match": "(\\|)(\\s*)((?:`.+?`)|(?:[\\p{L}_][\\p{L}0-9_]*))",
+              "match": "(\\|)(\\s*)(`.+?`|[\\p{L}_][\\p{L}0-9_]*)",
               "name": "entity.name.class.relationship-type-ored.cypher"
             },
             {
-              "match": "(?:\\?\\*|\\?|\\*)\\s*(?:\\d+\\s*(?:\\.\\.\\s*\\d+)?)?",
+              "match": "(?:\\?\\*|[?*])\\s*(?:\\d+\\s*(?:\\.\\.\\s*\\d+)?)?",
               "name": "support.function.relationship-pattern.quant.cypher"
             },
             {
@@ -272,7 +265,7 @@
     "properties_literal": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "keyword.control.properties_literal.cypher"
@@ -287,7 +280,7 @@
           "name": "source.cypher",
           "patterns": [
             {
-              "match": ":|,",
+              "match": "[:,]",
               "name": "keyword.control.properties_literal.seperator.cypher"
             },
             {
@@ -321,7 +314,7 @@
           "name": "string.quoted.double.cypher"
         }
       },
-      "match": "(\\\\\\\\|\\\\[tbnrf])|(\\\\'|\\\\\")",
+      "match": "(\\\\[\\\\tbnrf])|(\\\\['\"])",
       "name": "constant.character.escape.cypher"
     },
     "strings": {
diff --git a/resources/languages/d.json b/resources/languages/d.json
index 6dd004c..5d43b92 100644
--- a/resources/languages/d.json
+++ b/resources/languages/d.json
@@ -119,7 +119,7 @@
     "arithmetic-expression": {
       "patterns": [
         {
-          "match": "\\^\\^|\\+\\+|--|(?<!/)\\+(?!/)|-|~|(?<!/)\\*(?!/)|(?<![+*/])/(?![+*/])|%",
+          "match": "\\^\\^|\\+\\+|--|(?<!/)\\+(?!/)|[-~]|(?<!/)\\*(?!/)|(?<![+*/])/(?![+*/])|%",
           "name": "keyword.operator.numeric.d"
         }
       ]
@@ -176,7 +176,7 @@
               "name": "keyword.control.switch.d"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "begin": "\\{",
@@ -186,7 +186,7 @@
                 }
               },
               "contentName": "gfm.markup.raw.assembly.d",
-              "end": "\\}",
+              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "keyword.control.asm.end.d"
@@ -288,7 +288,7 @@
     "binary-integer": {
       "patterns": [
         {
-          "match": "\\b(0b|0B)[0-1_]+(Lu|LU|uL|UL|L|u|U)?\\b",
+          "match": "\\b(0[bB])[0-1_]+(Lu|LU|uL|UL|[LuU])?\\b",
           "name": "constant.numeric.integer.binary.d"
         }
       ]
@@ -296,7 +296,7 @@
     "bitwise-expression": {
       "patterns": [
         {
-          "match": "\\||\\^|&",
+          "match": "[|^\\&]",
           "name": "keyword.operator.bitwise.d"
         }
       ]
@@ -550,7 +550,7 @@
     "conditional-expression": {
       "patterns": [
         {
-          "match": "\\s(\\?|:)\\s",
+          "match": "\\s([?:])\\s",
           "name": "keyword.operator.ternary.d"
         }
       ]
@@ -626,7 +626,7 @@
     "decimal-float": {
       "patterns": [
         {
-          "match": "\\b((\\.[0-9])|(0\\.)|(([1-9]|(0[1-9_]))[0-9_]*\\.))[0-9_]*((e-|E-|e\\+|E\\+|e|E)[0-9][0-9_]*)?[LfF]?i?\\b",
+          "match": "\\b((\\.[0-9])|(0\\.)|(([1-9]|(0[1-9_]))[0-9_]*\\.))[0-9_]*((e-|E-|e\\+|E\\+|[eE])[0-9][0-9_]*)?[LfF]?i?\\b",
           "name": "constant.numeric.float.decimal.d"
         }
       ]
@@ -634,7 +634,7 @@
     "decimal-integer": {
       "patterns": [
         {
-          "match": "\\b(0(?=[^\\dxXbB]))|([1-9][0-9_]*)(Lu|LU|uL|UL|L|u|U)?\\b",
+          "match": "\\b(0(?=[^\\dxXbB]))|([1-9][0-9_]*)(Lu|LU|uL|UL|[LuU])?\\b",
           "name": "constant.numeric.integer.decimal.d"
         }
       ]
@@ -731,7 +731,7 @@
       "patterns": [
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "name": "constant.character.delimited.braces.d",
           "patterns": [
             {
@@ -745,7 +745,7 @@
       "patterns": [
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "name": "constant.characters.delimited.brackets.d",
           "patterns": [
             {
@@ -862,7 +862,7 @@
               "name": "storage.type.enum.d"
             }
           },
-          "end": "([A-Za-z_][\\w_\\d]*)\\s*(?=;|=|\\()(;)?",
+          "end": "([A-Za-z_][\\w_\\d]*)\\s*(?=[;=(])(;)?",
           "endCaptures": {
             "1": {
               "name": "entity.name.type.enum.d"
@@ -915,11 +915,11 @@
           "name": "constant.character.escape-sequence.entity.d"
         },
         {
-          "match": "(\\\\x[0-9a-fA-F_]{2}|\\\\u[0-9a-fA-F_]{4}|\\\\U[0-9a-fA-F_]{8}|\\\\[0-7]{1,3})",
+          "match": "(\\\\(?:x[_\\h]{2}|u[_\\h]{4}|U[_\\h]{8}|[0-7]{1,3}))",
           "name": "constant.character.escape-sequence.number.d"
         },
         {
-          "match": "(\\\\t|\\\\'|\\\\\"|\\\\\\?|\\\\0|\\\\a|\\\\b|\\\\f|\\\\n|\\\\r|\\\\v|\\\\\\\\)",
+          "match": "(\\\\[t'\"?0abfnrv\\\\])",
           "name": "constant.character.escape-sequence.d"
         }
       ]
@@ -1029,7 +1029,7 @@
               "name": "storage.type.array.expression.begin.d"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "storage.type.array.expression.end.d"
@@ -1216,7 +1216,7 @@
               "name": "meta.lexical.token.symbolic.d"
             }
           },
-          "end": "(?=[\\);,\\]}])",
+          "end": "(?=[);,\\]}])",
           "patterns": [
             {
               "include": "source.d"
@@ -1224,7 +1224,7 @@
           ]
         },
         {
-          "begin": "(?<=\\)|\\()(\\s*)({)",
+          "begin": "(?<=[)(])(\\s*)(\\{)",
           "beginCaptures": {
             "1": {
               "name": "source.d"
@@ -1245,7 +1245,7 @@
     "function-prelude": {
       "patterns": [
         {
-          "match": "(?!typeof|typeid)((\\.\\s*)?[_\\w][_\\d\\w]*)(\\s*\\.\\s*[_\\w][_\\d\\w]*)*\\s*(?=\\()",
+          "match": "(?!type(?:of|id))((\\.\\s*)?[_\\w][_\\d\\w]*)(\\s*\\.\\s*[_\\w][_\\d\\w]*)*\\s*(?=\\()",
           "name": "entity.name.function.d"
         }
       ]
@@ -1284,7 +1284,7 @@
           "name": "string.hex-string.d",
           "patterns": [
             {
-              "match": "[a-fA-F0-9_s]+",
+              "match": "[_s\\h]+",
               "name": "constant.character.hex-string.d"
             }
           ]
@@ -1294,7 +1294,7 @@
     "hexadecimal-float": {
       "patterns": [
         {
-          "match": "\\b0[xX][0-9a-fA-F_]*(\\.[0-9a-fA-F_]*)?(p-|P-|p\\+|P\\+|p|P)[0-9][0-9_]*[LfF]?i?\\b",
+          "match": "\\b0[xX][_\\h]*(\\.[_\\h]*)?(p-|P-|p\\+|P\\+|[pP])[0-9][0-9_]*[LfF]?i?\\b",
           "name": "constant.numeric.float.hexadecimal.d"
         }
       ]
@@ -1302,7 +1302,7 @@
     "hexadecimal-integer": {
       "patterns": [
         {
-          "match": "\\b(0x|0X)([0-9a-fA-F][0-9a-fA-F_]*)(Lu|LU|uL|UL|L|u|U)?\\b",
+          "match": "\\b(0[xX])(\\h[_\\h]*)(Lu|LU|uL|UL|[LuU])?\\b",
           "name": "constant.numeric.integer.hexadecimal.d"
         }
       ]
@@ -1334,6 +1334,68 @@
         }
       ]
     },
+    "ies-string": {
+      "patterns": [
+        {
+          "begin": "i\"",
+          "end": "\"[cwd]?",
+          "name": "string.ies-string.d",
+          "patterns": [
+            {
+              "include": "#interpolation-escape"
+            },
+            {
+              "include": "#interpolation-sequence"
+            },
+            {
+              "include": "#double-quoted-characters"
+            }
+          ]
+        }
+      ]
+    },
+    "ies-token-string": {
+      "begin": "iq\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "string.quoted.token.d"
+        }
+      },
+      "end": "}[cdw]?",
+      "endCaptures": {
+        "0": {
+          "name": "string.quoted.token.d"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#interpolation-sequence"
+        },
+        {
+          "include": "#token-string-content"
+        }
+      ]
+    },
+    "ies-wysiwyg-string": {
+      "patterns": [
+        {
+          "begin": "i`",
+          "end": "`[cwd]?",
+          "name": "string.ies-wysiwyg-string.d",
+          "patterns": [
+            {
+              "include": "#interpolation-escape"
+            },
+            {
+              "include": "#interpolation-sequence"
+            },
+            {
+              "include": "#wysiwyg-characters"
+            }
+          ]
+        }
+      ]
+    },
     "if-statement": {
       "patterns": [
         {
@@ -1454,7 +1516,7 @@
       "patterns": [
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "patterns": [
             {
               "match": "\\.\\.|\\$",
@@ -1495,6 +1557,30 @@
         }
       ]
     },
+    "interpolation-escape": {
+      "match": "\\\\\\$",
+      "name": "constant.character.escape-sequence.d"
+    },
+    "interpolation-sequence": {
+      "begin": "\\$\\(",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.template-expression.begin.d"
+        }
+      },
+      "end": "\\)",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.template-expression.end.d"
+        }
+      },
+      "name": "meta.interpolation.expression.d",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ]
+    },
     "invariant": {
       "patterns": [
         {
@@ -2376,15 +2462,15 @@
     "operands": {
       "patterns": [
         {
-          "match": "\\?|:",
+          "match": "[?:]",
           "name": "keyword.operator.ternary.assembly.d"
         },
         {
-          "match": "\\]|\\[",
+          "match": "[\\]\\[]",
           "name": "keyword.operator.bracket.assembly.d"
         },
         {
-          "match": ">>>|\\|\\||&&|==|!=|<=|>=|<<|>>|\\||\\^|&|<|>|\\+|-|\\*|/|%|~|!",
+          "match": ">>>|\\|\\||&&|==|!=|<=|>=|<<|>>|[|^\\&<>+\\-*/%~!]",
           "name": "keyword.operator.assembly.d"
         }
       ]
@@ -2504,7 +2590,7 @@
     "rel-expression": {
       "patterns": [
         {
-          "match": "!<>=|!<>|<>=|!>=|!<=|<=|>=|<>|!>|!<|<|>",
+          "match": "!<>=|!<>|<>=|!>=|!<=|<=|>=|<>|!>|!<|[<>]",
           "name": "keyword.operator.rel.d"
         }
       ]
@@ -2566,7 +2652,7 @@
     "special-keyword": {
       "patterns": [
         {
-          "match": "\\b(__FILE__|__FILE_FULL_PATH__|__MODULE__|__LINE__|__FUNCTION__|__PRETTY_FUNCTION__)\\b",
+          "match": "\\b(__(?:FILE__|FILE_FULL_PATH__|MODULE__|LINE__|FUNCTION__|PRETTY_FUNCTION__))\\b",
           "name": "constant.language.special-keyword.d"
         }
       ]
@@ -2582,7 +2668,7 @@
     "special-tokens": {
       "patterns": [
         {
-          "match": "\\b(__DATE__|__TIME__|__TIMESTAMP__|__VENDOR__|__VERSION__)\\b",
+          "match": "\\b(__(?:DATE__|TIME__|TIMESTAMP__|VENDOR__|VERSION__))\\b",
           "name": "gfm.markup.raw.special-tokens.d"
         }
       ]
@@ -2741,6 +2827,15 @@
         },
         {
           "include": "#token-string"
+        },
+        {
+          "include": "#ies-string"
+        },
+        {
+          "include": "#ies-wysiwyg-string"
+        },
+        {
+          "include": "#ies-token-string"
         }
       ]
     },
@@ -2837,7 +2932,7 @@
           "name": "string.quoted.token.d"
         }
       },
-      "end": "\\}[cdw]?",
+      "end": "}[cdw]?",
       "endCaptures": {
         "0": {
           "name": "string.quoted.token.d"
@@ -2852,7 +2947,7 @@
     "token-string-content": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}",
           "patterns": [
             {
@@ -2886,7 +2981,7 @@
           "include": "#keyword"
         },
         {
-          "match": "~=|~|>>>|>>=|>>|>=|>|=>|==|=|<>|<=|<<|<|%=|%|#|&=|&&|&|\\$|\\|=|\\|\\||\\||\\+=|\\+\\+|\\+|\\^=|\\^\\^=|\\^\\^|\\^|\\*=|\\*|\\}|\\{|\\]|\\[|\\)|\\(|\\.\\.\\.|\\.\\.|\\.|\\?|\\!>=|\\!>|\\!=|\\!<>=|\\!<>|\\!<=|\\!<|\\!|/=|/|@|:|;|,|-=|--|-",
+          "match": "~=|~|>>>|>>=|>>|>=|>|=>|==|=|<>|<=|<<|<|%=|[%#]|&=|&&|[\\&$]|\\|=|\\|\\||\\||\\+=|\\+\\+|\\+|\\^=|\\^\\^=|\\^\\^|\\^|\\*=|[*}{\\]\\[)(]|\\.\\.\\.|\\.\\.|[.?]|!>=|!>|!=|!<>=|!<>|!<=|!<|!|/=|[/@:;,]|-=|--|-",
           "name": "meta.lexical.token.symbolic.d"
         },
         {
@@ -3169,8 +3264,8 @@
     "wysiwyg-string": {
       "patterns": [
         {
-          "begin": "r\\\"",
-          "end": "\\\"[cwd]?",
+          "begin": "r\"",
+          "end": "\"[cwd]?",
           "name": "string.wysiwyg-string.d",
           "patterns": [
             {
diff --git a/resources/languages/dart.json b/resources/languages/dart.json
index 0d04141..409611a 100644
--- a/resources/languages/dart.json
+++ b/resources/languages/dart.json
@@ -190,7 +190,7 @@
           "name": "variable.language.dart"
         },
         {
-          "match": "(?<!\\$)\\b((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(([0-9][0-9_]*\\.?[0-9_]*)|(\\.[0-9][0-9_]*))((e|E)(\\+|-)?[0-9][0-9_]*)?)\\b(?!\\$)",
+          "match": "(?<!\\$)\\b((0([xX])\\h[_\\h]*)|(([0-9][0-9_]*\\.?[0-9_]*)|(\\.[0-9][0-9_]*))(([eE])([+-])?[0-9][0-9_]*)?)\\b(?!\\$)",
           "name": "constant.numeric.dart"
         },
         {
@@ -209,11 +209,11 @@
               "name": "variable.name.source.dart"
             }
           },
-          "match": "(\\[.*?\\])"
+          "match": "(\\[.*?])"
         },
         {
           "begin": "^\\s*///\\s*(```)",
-          "end": "^\\s*///\\s*(```)|^(?!\\s*///)",
+          "end": "^(?:\\s*///\\s*(```)|(?!\\s*///))",
           "patterns": [
             {
               "include": "#dartdoc-codeblock-triple"
@@ -222,7 +222,7 @@
         },
         {
           "begin": "^\\s*\\*\\s*(```)",
-          "end": "^\\s*\\*\\s*(```)|^(?=\\s*\\*/)",
+          "end": "^(?:\\s*\\*\\s*(```)|(?=\\s*\\*/))",
           "patterns": [
             {
               "include": "#dartdoc-codeblock-block"
@@ -230,7 +230,7 @@
           ]
         },
         {
-          "match": "`[^`\n]+`",
+          "match": "`[^`\\n]+`",
           "name": "variable.other.source.dart"
         },
         {
@@ -239,19 +239,19 @@
               "name": "variable.other.source.dart"
             }
           },
-          "match": "(?:\\*|\\/\\/)\\s{4,}(.*?)(?=($|\\*\\/))"
+          "match": "(?:\\*|//)\\s{4,}(.*?)(?=($|\\*/))"
         }
       ]
     },
     "dartdoc-codeblock-block": {
       "begin": "^\\s*\\*\\s*(?!(\\s*```|/))",
       "contentName": "variable.other.source.dart",
-      "end": "\n"
+      "end": "\\n"
     },
     "dartdoc-codeblock-triple": {
       "begin": "^\\s*///\\s*(?!\\s*```)",
       "contentName": "variable.other.source.dart",
-      "end": "\n"
+      "end": "\\n"
     },
     "expression": {
       "patterns": [
@@ -267,7 +267,7 @@
         },
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#expression"
@@ -334,7 +334,7 @@
           "name": "storage.modifier.dart"
         },
         {
-          "match": "(?<!\\$)\\b(?:void|var)\\b(?!\\$)",
+          "match": "(?<!\\$)\\bv(?:oid|ar)\\b(?!\\$)",
           "name": "storage.type.primitive.dart"
         }
       ]
@@ -342,19 +342,19 @@
     "operators": {
       "patterns": [
         {
-          "match": "(?<!\\$)\\b(is\\!?)\\b(?!\\$)",
+          "match": "(?<!\\$)\\b(is!?)\\b(?!\\$)",
           "name": "keyword.operator.dart"
         },
         {
-          "match": "\\?|:",
+          "match": "[?:]",
           "name": "keyword.operator.ternary.dart"
         },
         {
-          "match": "(<<|>>>?|~|\\^|\\||&)",
+          "match": "(<<|>>>?|[~^|\\&])",
           "name": "keyword.operator.bitwise.dart"
         },
         {
-          "match": "((&|\\^|\\||<<|>>>?)=)",
+          "match": "(([\\&^|]|<<|>>>?)=)",
           "name": "keyword.operator.assignment.bitwise.dart"
         },
         {
@@ -366,7 +366,7 @@
           "name": "keyword.operator.comparison.dart"
         },
         {
-          "match": "(([+*/%-]|\\~)=)",
+          "match": "(([+*/%\\-~])=)",
           "name": "keyword.operator.assignment.arithmetic.dart"
         },
         {
@@ -374,11 +374,11 @@
           "name": "keyword.operator.assignment.dart"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
+          "match": "(--|\\+\\+)",
           "name": "keyword.operator.increment-decrement.dart"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|\\~\\/|%)",
+          "match": "([-+*/]|~/|%)",
           "name": "keyword.operator.arithmetic.dart"
         },
         {
@@ -416,7 +416,7 @@
         },
         {
           "begin": "\\$\\{",
-          "end": "\\}",
+          "end": "}",
           "name": "meta.embedded.expression.dart",
           "patterns": [
             {
diff --git a/resources/languages/dax.json b/resources/languages/dax.json
index d8f8e62..fdf4e6e 100644
--- a/resources/languages/dax.json
+++ b/resources/languages/dax.json
@@ -31,7 +31,7 @@
               "name": "punctuation.definition.comment.dax"
             }
           },
-          "end": "\n",
+          "end": "\\n",
           "name": "comment.line.dax"
         },
         {
@@ -41,7 +41,7 @@
               "name": "punctuation.definition.comment.dax"
             }
           },
-          "end": "\n",
+          "end": "\\n",
           "name": "comment.line.dax"
         },
         {
@@ -67,11 +67,11 @@
           "name": "keyword.control.dax"
         },
         {
-          "match": "{|}",
+          "match": "[{}]",
           "name": "keyword.array.constructor.dax"
         },
         {
-          "match": ">|<|>=|<=|=(?!==)",
+          "match": "[><]|>=|<=|=(?!==)",
           "name": "keyword.operator.comparison.dax"
         },
         {
@@ -79,12 +79,12 @@
           "name": "keyword.operator.logical.dax"
         },
         {
-          "match": "\\+|\\-|\\*|\\/",
+          "match": "[+\\-*/]",
           "name": "keyword.arithmetic.operator.dax"
         },
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "name": "support.function.dax"
         },
         {
@@ -93,8 +93,8 @@
           "name": "string.quoted.double.dax"
         },
         {
-          "begin": "\\'",
-          "end": "\\'",
+          "begin": "'",
+          "end": "'",
           "name": "support.class.dax"
         }
       ]
@@ -148,7 +148,6 @@
               "name": "variable.other.readwrite.dax"
             }
           },
-          "comment": "build out variable assignment",
           "end": "=",
           "endCaptures": {
             "0": {
diff --git a/resources/languages/desktop.json b/resources/languages/desktop.json
index c4d6273..0abb144 100644
--- a/resources/languages/desktop.json
+++ b/resources/languages/desktop.json
@@ -34,7 +34,7 @@
           "name": "variable.parameter"
         },
         {
-          "match": "\\s\\%[fFuUick]\\s",
+          "match": "(?<=^Exec.*)\\s%[fFuUick]\\s",
           "name": "variable.language"
         },
         {
@@ -46,19 +46,19 @@
     "keywords": {
       "patterns": [
         {
-          "match": "^Type\\b|^Version\\b|^Name\\b|^GenericName\\b|^NoDisplay\\b|^Comment\\b|^Icon\\b|^Hidden\\b|^OnlyShowIn\\b|^NotShowIn\\b|^DBusActivatable\\b|^TryExec\\b|^Exec\\b|^Path\\b|^Terminal\\b|^Actions\\b|^MimeType\\b|^Categories\\b|^Implements\\b|^Keywords\\b|^StartupNotify\\b|^StartupWMClass\\b|^URL\\b|^PrefersNonDefaultGPU\\b|^Encoding\\b",
+          "match": "^(?:Type\\b|Version\\b|Name\\b|GenericName\\b|NoDisplay\\b|Comment\\b|Icon\\b|Hidden\\b|OnlyShowIn\\b|NotShowIn\\b|DBusActivatable\\b|TryExec\\b|Exec\\b|Path\\b|Terminal\\b|Actions\\b|MimeType\\b|Categories\\b|Implements\\b|Keywords\\b|StartupNotify\\b|StartupWMClass\\b|URL\\b|PrefersNonDefaultGPU\\b|Encoding\\b)",
           "name": "keyword"
         },
         {
-          "match": "^X-[A-z 0-9 -]*",
+          "match": "^X-[A-z 0-9-]*",
           "name": "keyword.other"
         },
         {
-          "match": "(?<!^)\\[.+\\]",
+          "match": "(?<!^)\\[.+]",
           "name": "constant.language"
         },
         {
-          "match": "^GtkTheme\\b|^MetacityTheme\\b|^IconTheme\\b|^CursorTheme\\b|^ButtonLayout\\b|^ApplicationFont\\b",
+          "match": "^(?:GtkTheme\\b|MetacityTheme\\b|IconTheme\\b|CursorTheme\\b|ButtonLayout\\b|ApplicationFont\\b)",
           "name": "keyword"
         }
       ]
@@ -67,12 +67,12 @@
       "patterns": [
         {
           "begin": "^\\[Desktop",
-          "end": "\\]",
+          "end": "]",
           "name": "markup.heading"
         },
         {
           "begin": "^\\[X-\\w*",
-          "end": "\\]",
+          "end": "]",
           "name": "markup.heading"
         },
         {
@@ -92,11 +92,11 @@
           "name": "keyword.operator"
         },
         {
-          "match": "\\btrue\\b|\\bfalse\\b",
+          "match": "\\b(?:true\\b|false\\b)",
           "name": "variable.other"
         },
         {
-          "match": "\\d+(\\.{0,1}\\d*)",
+          "match": "(?<=^Version.*)\\d+(\\.?\\d*)",
           "name": "variable.other"
         }
       ]
diff --git a/resources/languages/diff.json b/resources/languages/diff.json
index 9bb804f..57e5992 100644
--- a/resources/languages/diff.json
+++ b/resources/languages/diff.json
@@ -12,7 +12,7 @@
       "name": "meta.separator.diff"
     },
     {
-      "match": "^\\d+(,\\d+)*(a|d|c)\\d+(,\\d+)*$\\n?",
+      "match": "^\\d+(,\\d+)*([adc])\\d+(,\\d+)*$\\n?",
       "name": "meta.diff.range.normal"
     },
     {
@@ -45,7 +45,7 @@
           "name": "punctuation.definition.range.diff"
         }
       },
-      "match": "^(((\\-{3}) .+ (\\-{4}))|((\\*{3}) .+ (\\*{4})))$\\n?",
+      "match": "^(((-{3}) .+ (-{4}))|((\\*{3}) .+ (\\*{4})))$\\n?",
       "name": "meta.diff.range.context"
     },
     {
@@ -68,7 +68,7 @@
           "name": "punctuation.definition.from-file.diff"
         }
       },
-      "match": "(^(((-{3}) .+)|((\\*{3}) .+))$\\n?|^(={4}) .+(?= - ))",
+      "match": "(^(?:(((-{3}) .+)|((\\*{3}) .+))$\\n?|(={4}) .+(?= - )))",
       "name": "meta.diff.header.from-file"
     },
     {
@@ -126,7 +126,6 @@
           "name": "punctuation.definition.comment.diff"
         }
       },
-      "comment": "Git produces unified diffs with embedded comments\"",
       "end": "\\n",
       "name": "comment.line.number-sign.diff"
     },
diff --git a/resources/languages/docker.json b/resources/languages/docker.json
index 10fe3fb..6759e78 100644
--- a/resources/languages/docker.json
+++ b/resources/languages/docker.json
@@ -90,7 +90,6 @@
           "name": "punctuation.definition.comment.dockerfile"
         }
       },
-      "comment": "comment.line",
       "match": "^(\\s*)((#).*$\\n?)"
     }
   ],
diff --git a/resources/languages/dotenv.json b/resources/languages/dotenv.json
index 5810878..e15252a 100644
--- a/resources/languages/dotenv.json
+++ b/resources/languages/dotenv.json
@@ -12,7 +12,6 @@
           ]
         }
       },
-      "comment": "Full Line Comment",
       "match": "^\\s?(#.*$)\\n"
     },
     {
@@ -45,8 +44,7 @@
           ]
         }
       },
-      "comment": "ENV entry",
-      "match": "^\\s?(.*?)\\s?(\\=)(.*)$"
+      "match": "^\\s?(.*?)\\s?(=)(.*)$"
     }
   ],
   "repository": {
@@ -63,13 +61,11 @@
           ]
         }
       },
-      "comment": "Double Quoted String",
       "match": "\"(.*)\"",
       "name": "string.quoted.double.dotenv"
     },
     "escape-characters": {
-      "comment": "Escape characters",
-      "match": "\\\\[nrtfb\"'\\\\]|\\\\u[0123456789ABCDEF]{4}",
+      "match": "\\\\(?:[nrtfb\"'\\\\]|u[0123456789ABCDEF]{4})",
       "name": "constant.character.escape.dotenv"
     },
     "interpolation": {
@@ -84,8 +80,7 @@
           "name": "keyword.interpolation.end.dotenv"
         }
       },
-      "comment": "Interpolation (variable substitution)",
-      "match": "(\\$\\{)(.*)(\\})"
+      "match": "(\\$\\{)(.*)(})"
     },
     "key": {
       "captures": {
@@ -101,21 +96,17 @@
           ]
         }
       },
-      "comment": "Key",
       "match": "(export\\s)?(.*)"
     },
     "line-comment": {
-      "comment": "Comment",
       "match": "#.*$",
       "name": "comment.line.dotenv"
     },
     "single-quoted-string": {
-      "comment": "Single Quoted String",
       "match": "'(.*)'",
       "name": "string.quoted.single.dotenv"
     },
     "variable": {
-      "comment": "env variable",
       "match": "[a-zA-Z_]+[a-zA-Z0-9_]*"
     }
   },
diff --git a/resources/languages/dream-maker.json b/resources/languages/dream-maker.json
index 41ef0f3..20e1482 100644
--- a/resources/languages/dream-maker.json
+++ b/resources/languages/dream-maker.json
@@ -5,7 +5,7 @@
     "dme"
   ],
   "foldingStartMarker": "/\\*\\*(?!\\*)|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))",
-  "foldingStopMarker": "(?<!\\*)\\*\\*/|^\\s*\\}",
+  "foldingStopMarker": "(?<!\\*)\\*\\*/|^\\s*}",
   "name": "dream-maker",
   "patterns": [
     {
@@ -35,11 +35,11 @@
           "name": "variable.other.dm"
         }
       },
-      "match": "(var)[\\/ ](?:(static|global|tmp|const)\\/)?(?:(datum|atom(?:\\/movable)?|obj|mob|turf|area|savefile|list|client|sound|image|database|matrix|regex|exception)\\/)?(?:([a-zA-Z0-9_\\-$]*)\\/)*([A-Za-z0-9_$]*)\\b",
+      "match": "(var)[/ ](?:(static|global|tmp|const)/)?(?:(datum|atom(?:/movable)?|obj|mob|turf|area|savefile|list|client|sound|image|database|matrix|regex|exception)/)?(?:([a-zA-Z0-9_\\-$]*)/)*([A-Za-z0-9_$]*)\\b",
       "name": "meta.initialization.dm"
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
+      "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)\\b",
       "name": "constant.numeric.dm"
     },
     {
@@ -63,7 +63,7 @@
       "name": "variable.language.dm"
     },
     {
-      "match": "(\\?|(>|<)(=)?|\\.|:|/(=)?|~|\\+(\\+|=)?|-(-|=)?|\\*(\\*|=)?|%|>>|<<|=(=)?|!(=)?|<>|&|&&|\\^|\\||\\|\\||\\bto\\b|\\bin\\b|\\bstep\\b)",
+      "match": "(\\?|([><])(=)?|[.:]|/(=)?|~|\\+([+=])?|-([-=])?|\\*([*=])?|%|>>|<<|=(=)?|!(=)?|<>|&|&&|[\\^|]|\\|\\||\\bto\\b|\\bin\\b|\\bstep\\b)",
       "name": "keyword.operator.dm"
     },
     {
@@ -75,7 +75,7 @@
       "name": "constant.language.dm"
     },
     {
-      "begin": "{\"",
+      "begin": "\\{\"",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.dm"
@@ -141,7 +141,7 @@
       ]
     },
     {
-      "begin": "^\\s*((\\#)\\s*define)\\s+((?<id>[a-zA-Z_][a-zA-Z0-9_]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))",
+      "begin": "^\\s*((#)\\s*define)\\s+((?<id>[a-zA-Z_][a-zA-Z0-9_]*))(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.define.dm"
@@ -165,7 +165,7 @@
           "name": "punctuation.definition.parameters.end.dm"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.macro.dm",
       "patterns": [
         {
@@ -174,7 +174,7 @@
       ]
     },
     {
-      "begin": "^\\s*((\\#)\\s*define)\\s+((?<id>[a-zA-Z_][a-zA-Z0-9_]*))",
+      "begin": "^\\s*((#)\\s*define)\\s+((?<id>[a-zA-Z_][a-zA-Z0-9_]*))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.define.dm"
@@ -186,7 +186,7 @@
           "name": "variable.other.preprocessor.dm"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.macro.dm",
       "patterns": [
         {
@@ -226,7 +226,7 @@
           "name": "punctuation.definition.directive.dm"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.dm",
       "patterns": [
         {
@@ -239,7 +239,7 @@
       "include": "#block"
     },
     {
-      "begin": "(?:^|(?:(?=\\s)(?<!else|new|return)(?<=\\w)|(?=\\s*[A-Za-z_])(?<!&&)(?<=[*&>])))(\\s*)(?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(?=\\()",
+      "begin": "(?:^|(?:(?=\\s)(?<!else|new|return)(?<=\\w)|(?=\\s*[A-Za-z_])(?<!&&)(?<=[*\\&>])))(\\s*)(?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "punctuation.whitespace.function.leading.dm"
@@ -251,7 +251,7 @@
           "name": "punctuation.definition.parameters.dm"
         }
       },
-      "end": "(?<=\\})|(?=#)|(;)?",
+      "end": "(?<=})|(?=#)|(;)?",
       "name": "meta.function.dm",
       "patterns": [
         {
@@ -277,7 +277,7 @@
     },
     "block": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "name": "meta.block.dm",
       "patterns": [
         {
@@ -381,7 +381,6 @@
     },
     "disabled": {
       "begin": "^\\s*#\\s*if(n?def)?\\b.*$",
-      "comment": "eat nested preprocessor if(def)s",
       "end": "^\\s*#\\s*endif\\b.*$",
       "patterns": [
         {
@@ -433,7 +432,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*$)",
           "name": "comment.block.preprocessor.if-branch",
           "patterns": [
             {
@@ -477,7 +476,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*$)",
           "name": "comment.block.preprocessor.if-branch.in-block",
           "patterns": [
             {
@@ -522,7 +521,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*$)",
           "patterns": [
             {
               "include": "$base"
@@ -566,7 +565,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*$)",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*$)",
           "patterns": [
             {
               "include": "#block_innards"
@@ -576,7 +575,7 @@
       ]
     },
     "preprocessor-rule-other": {
-      "begin": "^\\s*((#\\s*(if(n?def)?))\\b.*?(?:(?=(?://|/\\*))|$))",
+      "begin": "^\\s*((#\\s*(if(n?def)?))\\b.*?(?:(?=/[/*])|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.dm"
@@ -593,7 +592,7 @@
       ]
     },
     "preprocessor-rule-other-block": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=/[/*])|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.dm"
@@ -613,7 +612,7 @@
       "patterns": [
         {
           "begin": "(?<!\\\\)\\[",
-          "end": "\\]",
+          "end": "]",
           "name": "string.interpolated.dm",
           "patterns": [
             {
diff --git a/resources/languages/edge.json b/resources/languages/edge.json
index d6540e3..16f9ab9 100644
--- a/resources/languages/edge.json
+++ b/resources/languages/edge.json
@@ -35,13 +35,13 @@
   ],
   "repository": {
     "comment": {
-      "begin": "\\{{--",
+      "begin": "\\{\\{--",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.begin.edge"
         }
       },
-      "end": "\\--}}",
+      "end": "--}}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.edge"
@@ -50,13 +50,13 @@
       "name": "comment.block"
     },
     "escapedMustache": {
-      "begin": "\\@{{",
+      "begin": "@\\{\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.begin.edge"
         }
       },
-      "end": "\\}}",
+      "end": "}}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.edge"
@@ -65,13 +65,13 @@
       "name": "comment.block"
     },
     "mustache": {
-      "begin": "\\{{",
+      "begin": "\\{\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.mustache.begin"
         }
       },
-      "end": "\\}}",
+      "end": "}}",
       "endCaptures": {
         "0": {
           "name": "punctuation.mustache.end"
@@ -99,13 +99,13 @@
       ]
     },
     "safeMustache": {
-      "begin": "\\{{{",
+      "begin": "\\{\\{\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.mustache.begin"
         }
       },
-      "end": "\\}}}",
+      "end": "}}}",
       "endCaptures": {
         "0": {
           "name": "punctuation.mustache.end"
diff --git a/resources/languages/elixir.json b/resources/languages/elixir.json
index 954436d..b07099f 100644
--- a/resources/languages/elixir.json
+++ b/resources/languages/elixir.json
@@ -5,8 +5,8 @@
     "exs"
   ],
   "firstLineMatch": "^#!/.*\\belixir",
-  "foldingStartMarker": "(after|else|catch|rescue|\\-\\>|\\{|\\[|do)\\s*$",
-  "foldingStopMarker": "^\\s*((\\}|\\]|after|else|catch|rescue)\\s*$|end\\b)",
+  "foldingStartMarker": "(after|else|catch|rescue|->|[{\\[]|do)\\s*$",
+  "foldingStopMarker": "^\\s*(([}\\]]|after|else|catch|rescue)\\s*$|end\\b)",
   "name": "elixir",
   "patterns": [
     {
@@ -49,7 +49,7 @@
           "name": "entity.name.function.elixir"
         }
       },
-      "match": "(\\:\\w+)\\s*(\\.)\\s*([_]?\\w*[!?]?)"
+      "match": "(:\\w+)\\s*(\\.)\\s*(_?\\w*[!?]?)"
     },
     {
       "captures": {
@@ -60,7 +60,7 @@
           "name": "entity.name.function.elixir"
         }
       },
-      "match": "(\\|\\>)\\s*([a-z_]\\w*[!?]?)"
+      "match": "(\\|>)\\s*([a-z_]\\w*[!?]?)"
     },
     {
       "match": "\\b[a-z_]\\w*[!?]?(?=\\s*\\.?\\s*\\()",
@@ -95,7 +95,7 @@
       "include": "#core_syntax"
     },
     {
-      "begin": "^(?=.*->)((?![^\"']*(\"|')[^\"']*->)|(?=.*->[^\"']*(\"|')[^\"']*->))((?!.*\\([^\\)]*->)|(?=[^\\(\\)]*->)|(?=\\s*\\(.*\\).*->))((?!.*\\b(fn)\\b)|(?=.*->.*\\bfn\\b))",
+      "begin": "^(?=.*->)((?![^\"']*([\"'])[^\"']*->)|(?=.*->[^\"']*([\"'])[^\"']*->))((?!.*\\([^)]*->)|(?=[^()]*->)|(?=\\s*\\(.*\\).*->))((?!.*\\b(fn)\\b)|(?=.*->.*\\bfn\\b))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.elixir"
@@ -191,7 +191,7 @@
           ]
         },
         {
-          "begin": "^\\s*(def|defmacro|defdelegate|defguard)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]=?))((\\()|\\s*)",
+          "begin": "^\\s*(def(?:|macro|delegate|guard))\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[]=?))((\\()|\\s*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.module.elixir"
@@ -203,7 +203,7 @@
               "name": "punctuation.section.function.elixir"
             }
           },
-          "end": "(\\bdo:)|(\\bdo\\b)|(?=\\s+(def|defn|defmacro|defdelegate|defguard)\\b)",
+          "end": "(\\bdo:)|(\\bdo\\b)|(?=\\s+(def(?:|n|macro|delegate|guard))\\b)",
           "endCaptures": {
             "1": {
               "name": "constant.other.keywords.elixir"
@@ -224,7 +224,7 @@
                   "name": "keyword.operator.other.elixir"
                 }
               },
-              "end": ",|\\)|$",
+              "end": "[,)]|$",
               "patterns": [
                 {
                   "include": "$self"
@@ -238,7 +238,7 @@
           ]
         },
         {
-          "begin": "^\\s*(defp|defnp|defmacrop|defguardp)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]=?))((\\()|\\s*)",
+          "begin": "^\\s*(def(?:p|np|macrop|guardp))\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[]=?))((\\()|\\s*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.module.elixir"
@@ -250,7 +250,7 @@
               "name": "punctuation.section.function.elixir"
             }
           },
-          "end": "(\\bdo:)|(\\bdo\\b)|(?=\\s+(defp|defmacrop|defguardp)\\b)",
+          "end": "(\\bdo:)|(\\bdo\\b)|(?=\\s+(def(?:p|macrop|guardp))\\b)",
           "endCaptures": {
             "1": {
               "name": "constant.other.keywords.elixir"
@@ -271,7 +271,7 @@
                   "name": "keyword.operator.other.elixir"
                 }
               },
-              "end": ",|\\)|$",
+              "end": "[,)]|$",
               "patterns": [
                 {
                   "include": "$self"
@@ -286,7 +286,6 @@
         },
         {
           "begin": "\\s*~L\"\"\"",
-          "comment": "Leex Sigil",
           "end": "\\s*\"\"\"",
           "name": "sigil.leex",
           "patterns": [
@@ -300,7 +299,6 @@
         },
         {
           "begin": "\\s*~H\"\"\"",
-          "comment": "HEEx Sigil",
           "end": "\\s*\"\"\"",
           "name": "sigil.heex",
           "patterns": [
@@ -314,7 +312,6 @@
         },
         {
           "begin": "@(module|type)?doc (~[a-z])?\"\"\"",
-          "comment": "@doc with heredocs is treated as documentation",
           "end": "\\s*\"\"\"",
           "name": "comment.block.documentation.heredoc",
           "patterns": [
@@ -328,13 +325,11 @@
         },
         {
           "begin": "@(module|type)?doc ~[A-Z]\"\"\"",
-          "comment": "@doc with heredocs is treated as documentation",
           "end": "\\s*\"\"\"",
           "name": "comment.block.documentation.heredoc"
         },
         {
           "begin": "@(module|type)?doc (~[a-z])?'''",
-          "comment": "@doc with heredocs is treated as documentation",
           "end": "\\s*'''",
           "name": "comment.block.documentation.heredoc",
           "patterns": [
@@ -348,18 +343,15 @@
         },
         {
           "begin": "@(module|type)?doc ~[A-Z]'''",
-          "comment": "@doc with heredocs is treated as documentation",
           "end": "\\s*'''",
           "name": "comment.block.documentation.heredoc"
         },
         {
-          "comment": "@doc false is treated as documentation",
           "match": "@(module|type)?doc false",
           "name": "comment.block.documentation.false"
         },
         {
           "begin": "@(module|type)?doc \"",
-          "comment": "@doc with string is treated as documentation",
           "end": "\"",
           "name": "comment.block.documentation.string",
           "patterns": [
@@ -376,7 +368,6 @@
           "name": "keyword.control.elixir"
         },
         {
-          "comment": " as above, just doesn't need a 'end' and does a logic operation",
           "match": "(?<!\\.)\\b(and|not|or|when|xor|in)\\b",
           "name": "keyword.operator.elixir"
         },
@@ -411,7 +402,7 @@
           "name": "variable.other.anonymous.elixir"
         },
         {
-          "match": "&(?![&])",
+          "match": "&(?!&)",
           "name": "variable.other.anonymous.elixir"
         },
         {
@@ -424,11 +415,11 @@
           "name": "variable.other.capture.elixir"
         },
         {
-          "match": "\\b0x[0-9A-Fa-f](?>_?[0-9A-Fa-f])*\\b",
+          "match": "\\b0x\\h(?>_?\\h)*\\b",
           "name": "constant.numeric.hex.elixir"
         },
         {
-          "match": "\\b\\d(?>_?\\d)*(\\.(?![^[:space:][:digit:]])(?>_?\\d)+)([eE][-+]?\\d(?>_?\\d)*)?\\b",
+          "match": "\\b\\d(?>_?\\d)*(\\.(?![^\\s\\d])(?>_?\\d)+)([eE][-+]?\\d(?>_?\\d)*)?\\b",
           "name": "constant.numeric.float.elixir"
         },
         {
@@ -480,13 +471,12 @@
           ]
         },
         {
-          "begin": "(?>''')",
+          "begin": "'''",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "Single-quoted heredocs",
           "end": "^\\s*'''",
           "endCaptures": {
             "0": {
@@ -510,7 +500,6 @@
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "single quoted string (allows for interpolation)",
           "end": "'",
           "endCaptures": {
             "0": {
@@ -528,13 +517,12 @@
           ]
         },
         {
-          "begin": "(?>\"\"\")",
+          "begin": "\"\"\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "Double-quoted heredocs",
           "end": "^\\s*\"\"\"",
           "endCaptures": {
             "0": {
@@ -558,7 +546,6 @@
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "double quoted string (allows for interpolation)",
           "end": "\"",
           "endCaptures": {
             "0": {
@@ -576,13 +563,12 @@
           ]
         },
         {
-          "begin": "~[a-z](?>\"\"\")",
+          "begin": "~[a-z]\"\"\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "Double-quoted heredocs sigils",
           "end": "^\\s*\"\"\"",
           "endCaptures": {
             "0": {
@@ -606,8 +592,7 @@
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
-          "end": "\\}[a-z]*",
+          "end": "}[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
@@ -630,8 +615,7 @@
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
-          "end": "\\][a-z]*",
+          "end": "][a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
@@ -648,14 +632,13 @@
           ]
         },
         {
-          "begin": "~[a-z]\\<",
+          "begin": "~[a-z]<",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
-          "end": "\\>[a-z]*",
+          "end": ">[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
@@ -678,7 +661,6 @@
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
           "end": "\\)[a-z]*",
           "endCaptures": {
             "0": {
@@ -696,13 +678,12 @@
           ]
         },
         {
-          "begin": "~[a-z]([^\\w])",
+          "begin": "~[a-z](\\W)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
           "end": "\\1[a-z]*",
           "endCaptures": {
             "0": {
@@ -720,13 +701,12 @@
           ]
         },
         {
-          "begin": "~[A-Z](?>\"\"\")",
+          "begin": "~[A-Z]\"\"\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "Double-quoted heredocs sigils",
           "end": "^\\s*\"\"\"",
           "endCaptures": {
             "0": {
@@ -742,8 +722,7 @@
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
-          "end": "\\}[a-z]*",
+          "end": "}[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
@@ -758,8 +737,7 @@
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
-          "end": "\\][a-z]*",
+          "end": "][a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
@@ -768,14 +746,13 @@
           "name": "string.quoted.other.sigil.literal.elixir"
         },
         {
-          "begin": "~[A-Z]\\<",
+          "begin": "~[A-Z]<",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
-          "end": "\\>[a-z]*",
+          "end": ">[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
@@ -790,7 +767,6 @@
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
           "end": "\\)[a-z]*",
           "endCaptures": {
             "0": {
@@ -800,13 +776,12 @@
           "name": "string.quoted.other.sigil.literal.elixir"
         },
         {
-          "begin": "~[A-Z]([^\\w])",
+          "begin": "~[A-Z](\\W)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
           "end": "\\1[a-z]*",
           "endCaptures": {
             "0": {
@@ -821,8 +796,7 @@
               "name": "punctuation.definition.constant.elixir"
             }
           },
-          "comment": "symbols",
-          "match": "(?<!:)(:)(?>[a-zA-Z_][\\w@]*(?>[?!]|=(?![>=]))?|\\<\\>|===?|!==?|<<>>|<<<|>>>|~~~|::|<\\-|\\|>|=>|=~|=|/|\\\\\\\\|\\*\\*?|\\.\\.?\\.?|\\.\\.//|>=?|<=?|&&?&?|\\+\\+?|\\-\\-?|\\|\\|?\\|?|\\!|@|\\%?\\{\\}|%|\\[\\]|\\^(\\^\\^)?)",
+          "match": "(?<!:)(:)(?>[a-zA-Z_][\\w@]*(?>[?!]|=(?![>=]))?|<>|===?|!==?|<<>>|<<<|>>>|~~~|::|<-|\\|>|=>|=~|[=/]|\\\\\\\\|\\*\\*?|\\.\\.?\\.?|\\.\\.//|>=?|<=?|&&?&?|\\+\\+?|--?|\\|\\|?\\|?|[!@]|%?\\{}|%|\\[]|\\^(\\^\\^)?)",
           "name": "constant.other.symbol.elixir"
         },
         {
@@ -831,8 +805,7 @@
               "name": "punctuation.definition.constant.elixir"
             }
           },
-          "comment": "symbols",
-          "match": "(?>[a-zA-Z_][\\w@]*(?>[?!])?)(:)(?!:)",
+          "match": "(?>[a-zA-Z_][\\w@]*[?!]?)(:)(?!:)",
           "name": "constant.other.keywords.elixir"
         },
         {
@@ -878,7 +851,7 @@
           ]
         },
         {
-          "match": "\\b_([^_][\\w]+[?!]?)",
+          "match": "\\b_([^_]\\w+[?!]?)",
           "name": "comment.unused.elixir"
         },
         {
@@ -886,24 +859,23 @@
           "name": "comment.wildcard.elixir"
         },
         {
-          "comment": "\n\t\t\tmatches questionmark-letters.\n\n\t\t\texamples (1st alternation = hex):\n\t\t\t?\\x1     ?\\x61\n\n\t\t\texamples (2rd alternation = escaped):\n\t\t\t?\\n      ?\\b\n\n\t\t\texamples (3rd alternation = normal):\n\t\t\t?a       ?A       ?0\n\t\t\t?*       ?\"       ?(\n\t\t\t?.       ?#\n\n\t\t\tthe negative lookbehind prevents against matching\n\t\t\tp(42.tainted?)\n\t\t\t",
-          "match": "(?<!\\w)\\?(\\\\(x[0-9A-Fa-f]{1,2}(?![0-9A-Fa-f])\\b|[^xMC])|[^\\s\\\\])",
+          "match": "(?<!\\w)\\?(\\\\(x\\h{1,2}(?!\\h)\\b|[^xMC])|[^\\s\\\\])",
           "name": "constant.numeric.elixir"
         },
         {
-          "match": "\\+\\+|\\-\\-|<\\|>",
+          "match": "\\+\\+|--|<\\|>",
           "name": "keyword.operator.concatenation.elixir"
         },
         {
-          "match": "\\|\\>|<~>|<>|<<<|>>>|~>>|<<~|~>|<~|<\\|>",
+          "match": "\\|>|<~>|<>|<<<|>>>|~>>|<<~|~>|<~|<\\|>",
           "name": "keyword.operator.sigils_1.elixir"
         },
         {
-          "match": "&&&|&&",
+          "match": "&&(?:&|)",
           "name": "keyword.operator.sigils_2.elixir"
         },
         {
-          "match": "<\\-|\\\\\\\\",
+          "match": "<-|\\\\\\\\",
           "name": "keyword.operator.sigils_3.elixir"
         },
         {
@@ -919,11 +891,11 @@
           "name": "keyword.operator.logical.elixir"
         },
         {
-          "match": "(\\*|\\+|\\-|/)",
+          "match": "([*+\\-/])",
           "name": "keyword.operator.arithmetic.elixir"
         },
         {
-          "match": "\\||\\+\\+|\\-\\-|\\*\\*|\\\\\\\\|\\<\\-|\\<\\>|\\<\\<|\\>\\>|\\:\\:|\\.\\.|//|\\|>|~|=>|&",
+          "match": "\\||\\+\\+|--|\\*\\*|\\\\\\\\|<-|<>|<<|>>|::|\\.\\.|//|\\|>|~|=>|&",
           "name": "keyword.operator.other.elixir"
         },
         {
@@ -935,7 +907,7 @@
           "name": "punctuation.separator.other.elixir"
         },
         {
-          "match": "\\;",
+          "match": ";",
           "name": "punctuation.separator.statement.elixir"
         },
         {
@@ -947,15 +919,15 @@
           "name": "punctuation.separator.method.elixir"
         },
         {
-          "match": "\\{|\\}",
+          "match": "[{}]",
           "name": "punctuation.section.scope.elixir"
         },
         {
-          "match": "\\[|\\]",
+          "match": "[\\[\\]]",
           "name": "punctuation.section.array.elixir"
         },
         {
-          "match": "\\(|\\)",
+          "match": "[()]",
           "name": "punctuation.section.function.elixir"
         }
       ]
@@ -972,7 +944,7 @@
         }
       },
       "contentName": "source.elixir",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.embedded.end.elixir"
@@ -997,7 +969,7 @@
               "name": "punctuation.section.scope.elixir"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#nest_curly_and_self"
diff --git a/resources/languages/elm.json b/resources/languages/elm.json
index 8359f2e..dccec3d 100644
--- a/resources/languages/elm.json
+++ b/resources/languages/elm.json
@@ -40,7 +40,6 @@
       "include": "#char"
     },
     {
-      "comment": "Floats are always decimal",
       "match": "\\b([0-9]+\\.[0-9]+([eE][+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+)\\b",
       "name": "constant.numeric.float.elm"
     },
@@ -49,7 +48,7 @@
       "name": "constant.numeric.elm"
     },
     {
-      "match": "\\b(0x[0-9a-fA-F]+)\\b",
+      "match": "\\b(0x\\h+)\\b",
       "name": "constant.numeric.elm"
     },
     {
@@ -94,7 +93,7 @@
           "name": "keyword.operator.assignment.elm"
         }
       },
-      "match": "(\\|)\\s+([a-z][a-zA-Z0-9_]*)\\s+(\\=)",
+      "match": "(\\|)\\s+([a-z][a-zA-Z0-9_]*)\\s+(=)",
       "name": "meta.record.field.update.elm"
     },
     {
@@ -121,7 +120,7 @@
           "name": "keyword.operator.assignment.elm"
         }
       },
-      "match": "(\\{)\\s+([a-z][a-zA-Z0-9_]*)\\s+(\\=)",
+      "match": "(\\{)\\s+([a-z][a-zA-Z0-9_]*)\\s+(=)",
       "name": "meta.record.field.elm"
     },
     {
@@ -136,11 +135,11 @@
           "name": "keyword.operator.assignment.elm"
         }
       },
-      "match": "(,)\\s+([a-z][a-zA-Z0-9_]*)\\s+(\\=)",
+      "match": "(,)\\s+([a-z][a-zA-Z0-9_]*)\\s+(=)",
       "name": "meta.record.field.elm"
     },
     {
-      "match": "(\\}|\\{)",
+      "match": "([}{])",
       "name": "punctuation.bracket.elm"
     },
     {
@@ -160,7 +159,7 @@
       "include": "#infix_op"
     },
     {
-      "match": "(\\=|\\:|\\||\\\\)",
+      "match": "([=:|\\\\])",
       "name": "keyword.other.elm"
     },
     {
@@ -196,7 +195,7 @@
           "name": "punctuation.definition.comment.elm"
         }
       },
-      "end": "-\\}",
+      "end": "-}",
       "name": "comment.block.elm",
       "patterns": [
         {
@@ -220,11 +219,11 @@
       "name": "string.quoted.single.elm",
       "patterns": [
         {
-          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&]|x[0-9a-fA-F]{1,5})",
+          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\"'\\&]|x\\h{1,5})",
           "name": "constant.character.escape.elm"
         },
         {
-          "match": "\\^[A-Z@\\[\\]\\\\\\^_]",
+          "match": "\\^[A-Z@\\[\\]\\\\^_]",
           "name": "constant.character.escape.control.elm"
         }
       ]
@@ -271,7 +270,7 @@
           "name": "entity.glsl.bracket.elm"
         }
       },
-      "end": "(\\|\\])",
+      "end": "(\\|])",
       "endCaptures": {
         "1": {
           "name": "entity.glsl.bracket.elm"
@@ -314,7 +313,7 @@
       ]
     },
     "infix_op": {
-      "match": "(</>|<\\?>|<\\||<=|\\|\\||&&|>=|\\|>|\\|=|\\|\\.|\\+\\+|::|/=|==|//|>>|<<|<|>|\\^|\\+|-|/|\\*)",
+      "match": "(</>|<\\?>|<\\||<=|\\|\\||&&|>=|\\|>|\\|=|\\|\\.|\\+\\+|::|/=|==|//|>>|<<|[<>^+\\-/*])",
       "name": "keyword.operator.elm"
     },
     "module": {
@@ -397,7 +396,6 @@
           "include": "#infix_op"
         },
         {
-          "comment": "So named because I don't know what to call this.",
           "match": "\\(.*?\\)",
           "name": "meta.other.unknown.elm"
         }
@@ -420,11 +418,11 @@
       "name": "support.module.elm"
     },
     "parens": {
-      "match": "(\\(|\\))",
+      "match": "([()])",
       "name": "punctuation.parens.elm"
     },
     "period": {
-      "match": "[.]",
+      "match": "\\.",
       "name": "keyword.other.period.elm"
     },
     "record-accessor": {
@@ -474,11 +472,11 @@
       "name": "string.quoted.double.elm",
       "patterns": [
         {
-          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&]|x[0-9a-fA-F]{1,5})",
+          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\"'\\&]|x\\h{1,5})",
           "name": "constant.character.escape.elm"
         },
         {
-          "match": "\\^[A-Z@\\[\\]\\\\\\^_]",
+          "match": "\\^[A-Z@\\[\\]\\\\^_]",
           "name": "constant.character.escape.control.elm"
         }
       ]
@@ -499,11 +497,11 @@
       "name": "string.quoted.triple.elm",
       "patterns": [
         {
-          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&]|x[0-9a-fA-F]{1,5})",
+          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\"'\\&]|x\\h{1,5})",
           "name": "constant.character.escape.elm"
         },
         {
-          "match": "\\^[A-Z@\\[\\]\\\\\\^_]",
+          "match": "\\^[A-Z@\\[\\]\\\\^_]",
           "name": "constant.character.escape.control.elm"
         }
       ]
@@ -533,7 +531,7 @@
           "name": "punctuation.spaces.elm"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.elm"
         },
         {
@@ -590,15 +588,15 @@
               "name": "constant.type-constructor.elm"
             }
           },
-          "match": "(\\=|\\|)\\s+([A-Z][a-zA-Z0-9_]*)\\b",
+          "match": "([=|])\\s+([A-Z][a-zA-Z0-9_]*)\\b",
           "name": "meta.record.field.elm"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.elm"
         },
         {
-          "match": "\\-\\>",
+          "match": "->",
           "name": "keyword.operator.arrow.elm"
         },
         {
@@ -627,7 +625,7 @@
           "name": "punctuation.section.braces.begin"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.braces.end"
@@ -652,11 +650,11 @@
               "name": "keyword.other.elm"
             }
           },
-          "match": "([a-z][a-zA-Z0-9_]*)\\s+(\\:)",
+          "match": "([a-z][a-zA-Z0-9_]*)\\s+(:)",
           "name": "meta.record.field.elm"
         },
         {
-          "match": "\\,",
+          "match": ",",
           "name": "punctuation.separator.comma.elm"
         },
         {
@@ -679,7 +677,7 @@
       ]
     },
     "type-signature": {
-      "begin": "^(port\\s+)?([a-z_][a-zA-Z0-9_']*)\\s+(\\:)",
+      "begin": "^(port\\s+)?([a-z_][a-zA-Z0-9_']*)\\s+(:)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.port.elm"
diff --git a/resources/languages/emacs-lisp.json b/resources/languages/emacs-lisp.json
index 9e67d4f..f1a6e40 100644
--- a/resources/languages/emacs-lisp.json
+++ b/resources/languages/emacs-lisp.json
@@ -14,7 +14,7 @@
     "gnus",
     "viper"
   ],
-  "firstLineMatch": "^\\#!.*(?:\\s|\\/|(?<=!)\\b)emacs(?:$|\\s)|(?:-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)(?i:emacs-lisp)(?=[ \\t;]|(?<![-*])-\\*-).*?-\\*-|(?:(?:^|[ \\t])(?:vi|Vi(?=m))(?:m[<=>]?[0-9]+|m)?|[ \\t]ex)(?=:(?=[ \\t]*set?[ \\t][^\\r\\n:]+:)|:(?![ \\t]*set?[ \\t]))(?:(?:[ \\t]*:[ \\t]*|[ \\t])\\w*(?:[ \\t]*=(?:[^\\\\\\s]|\\\\.)*)?)*[ \\t:](?:filetype|ft|syntax)[ \\t]*=(?i:emacs-lisp|elisp)(?=$|\\s|:))",
+  "firstLineMatch": "^#!.*(?:[\\s/]|(?<=!)\\b)emacs(?:$|\\s)|(?:-\\*-(?i:[ \\t]*(?=[^:;\\s]+[ \\t]*-\\*-)|(?:.*?[ \\t;]|(?<=-\\*-))[ \\t]*mode[ \\t]*:[ \\t]*)(?i:emacs-lisp)(?=[ \\t;]|(?<![-*])-\\*-).*?-\\*-|(?:(?:^|[ \\t])(?:vi|Vi(?=m))(?:m(?:[<=>]?[0-9]+|))?|[ \\t]ex)(?=:(?:(?=[ \\t]*set?[ \\t][^\\r\\n:]+:)|(?![ \\t]*set?[ \\t])))(?:(?:[ \\t]*:[ \\t]*|[ \\t])\\w*(?:[ \\t]*=(?:[^\\\\\\s]|\\\\.)*)?)*[ \\t:](?:filetype|ft|syntax)[ \\t]*=(?i:e(?:macs-lisp|lisp))(?=$|[\\s:]))",
   "name": "emacs-lisp",
   "patterns": [
     {
@@ -43,7 +43,7 @@
     "arg-values": {
       "patterns": [
         {
-          "match": "&(optional|rest)(?=\\s|\\))",
+          "match": "&(optional|rest)(?=[\\s)])",
           "name": "constant.language.$1.arguments.emacs.lisp"
         }
       ]
@@ -103,7 +103,7 @@
     "definition": {
       "patterns": [
         {
-          "begin": "(\\()(?:(cl-(defun|defmacro|defsubst))|(defun|defmacro|defsubst))(?!-)\\b(?:\\s*(?![-+\\d])([-+=*/\\w~!@$%^&:<>{}?]+))?",
+          "begin": "(\\()(?:(cl-(def(?:un|macro|subst)))|(def(?:un|macro|subst)))(?!-)\\b(?:\\s*(?![-+\\d])([-+=*/\\w~!@$%^\\&:<>{}?]+))?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.expression.begin.emacs.lisp"
@@ -136,7 +136,7 @@
           "name": "storage.type.function.emacs.lisp"
         },
         {
-          "begin": "(?<=\\s|^)(\\()(def(advice|class|const|custom|face|image|group|package|struct|subst|theme|type|var))(?:\\s+([-+=*/\\w~!@$%^&:<>{}?]+))?(?=[\\s()]|$)",
+          "begin": "(?<=\\s|^)(\\()(def(advice|class|const|custom|face|image|group|package|struct|subst|theme|type|var))(?:\\s+([-+=*/\\w~!@$%^\\&:<>{}?]+))?(?=[\\s()]|$)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.expression.begin.emacs.lisp"
@@ -188,7 +188,7 @@
               "include": "#arg-keywords"
             },
             {
-              "match": "(?![-+\\d:&'#])([-+=*/\\w~!@$%^&:<>{}?]+)",
+              "match": "(?![-+\\d:\\&'#])([-+=*/\\w~!@$%^\\&:<>{}?]+)",
               "name": "variable.parameter.emacs.lisp"
             },
             {
@@ -204,11 +204,11 @@
     "docesc": {
       "patterns": [
         {
-          "match": "\\x5C{2}=",
+          "match": "\\\\{2}=",
           "name": "constant.escape.character.key-sequence.emacs.lisp"
         },
         {
-          "match": "\\x5C{2}+",
+          "match": "\\\\{2}+",
           "name": "constant.escape.character.suppress-link.emacs.lisp"
         }
       ]
@@ -225,7 +225,7 @@
           "name": "punctuation.definition.reference.end.emacs.lisp"
         }
       },
-      "match": "(\\x5C{2}\\[)((?:[^\\s\\\\]|\\\\.)+)(\\])",
+      "match": "(\\\\{2}\\[)((?:[^\\s\\\\]|\\\\.)+)(])",
       "name": "variable.other.reference.key-sequence.emacs.lisp"
     },
     "docmap": {
@@ -242,7 +242,7 @@
               "name": "punctuation.definition.reference.end.emacs.lisp"
             }
           },
-          "match": "(\\x5C{2}{)((?:[^\\s\\\\]|\\\\.)+)(})",
+          "match": "(\\\\{2}\\{)((?:[^\\s\\\\]|\\\\.)+)(})",
           "name": "meta.keymap.summary.emacs.lisp"
         },
         {
@@ -257,7 +257,7 @@
               "name": "punctuation.definition.reference.end.emacs.lisp"
             }
           },
-          "match": "(\\x5C{2}<)((?:[^\\s\\\\]|\\\\.)+)(>)",
+          "match": "(\\\\{2}<)((?:[^\\s\\\\]|\\\\.)+)(>)",
           "name": "meta.keymap.specifier.emacs.lisp"
         }
       ]
@@ -301,7 +301,7 @@
               "name": "punctuation.definition.codepoint.emacs.lisp"
             }
           },
-          "match": "(\\?)\\\\u[A-Fa-f0-9]{4}|(\\?)\\\\U00[A-Fa-f0-9]{6}",
+          "match": "(\\?)\\\\u\\h{4}|(\\?)\\\\U00\\h{6}",
           "name": "constant.character.escape.hex.emacs.lisp"
         },
         {
@@ -310,7 +310,7 @@
               "name": "punctuation.definition.codepoint.emacs.lisp"
             }
           },
-          "match": "(\\?)\\\\x[A-Fa-f0-9]+",
+          "match": "(\\?)\\\\x\\h+",
           "name": "constant.character.escape.hex.emacs.lisp"
         },
         {
@@ -368,7 +368,7 @@
           ]
         },
         {
-          "begin": "(\\')(\\()",
+          "begin": "(')(\\()",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.symbol.emacs.lisp"
@@ -391,7 +391,7 @@
           ]
         },
         {
-          "begin": "(\\`)(\\()",
+          "begin": "(`)(\\()",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.symbol.emacs.lisp"
@@ -520,7 +520,7 @@
       ]
     },
     "faces": {
-      "match": "\\b(?<=[\\s()\\[]|^)(?:Buffer-menu-buffer|Info-quoted|Info-title-1-face|Info-title-2-face|Info-title-3-face|Info-title-4-face|Man-overstrike|Man-reverse|Man-underline|antlr-default|antlr-font-lock-default-face|antlr-font-lock-keyword-face|antlr-font-lock-literal-face|antlr-font-lock-ruledef-face|antlr-font-lock-ruleref-face|antlr-font-lock-syntax-face|antlr-font-lock-tokendef-face|antlr-font-lock-tokenref-face|antlr-keyword|antlr-literal|antlr-ruledef|antlr-ruleref|antlr-syntax|antlr-tokendef|antlr-tokenref|apropos-keybinding|apropos-property|apropos-symbol|bat-label-face|bg:erc-color-face0|bg:erc-color-face1|bg:erc-color-face10|bg:erc-color-face11|bg:erc-color-face12|bg:erc-color-face13|bg:erc-color-face14|bg:erc-color-face15|bg:erc-color-face2|bg:erc-color-face3|bg:erc-color-face4|bg:erc-color-face5|bg:erc-color-face6|bg:erc-color-face7|bg:erc-color-face8|bg:erc-color-face9|bold-italic|bold|bookmark-menu-bookmark|bookmark-menu-heading|border|breakpoint-disabled|breakpoint-enabled|buffer-menu-buffer|button|c-annotation-face|calc-nonselected-face|calc-selected-face|calendar-month-header|calendar-today|calendar-weekday-header|calendar-weekend-header|change-log-acknowledgement-face|change-log-acknowledgement|change-log-acknowledgment|change-log-conditionals-face|change-log-conditionals|change-log-date-face|change-log-date|change-log-email-face|change-log-email|change-log-file-face|change-log-file|change-log-function-face|change-log-function|change-log-list-face|change-log-list|change-log-name-face|change-log-name|comint-highlight-input|comint-highlight-prompt|compare-windows|compilation-column-number|compilation-error|compilation-info|compilation-line-number|compilation-mode-line-exit|compilation-mode-line-fail|compilation-mode-line-run|compilation-warning|completions-annotations|completions-common-part|completions-first-difference|cperl-array-face|cperl-hash-face|cperl-nonoverridable-face|css-property|css-selector|cua-global-mark|cua-rectangle-noselect|cua-rectangle|cursor|custom-button-mouse|custom-button-pressed-unraised|custom-button-pressed|custom-button-unraised|custom-button|custom-changed|custom-comment-tag|custom-comment|custom-documentation|custom-face-tag|custom-group-subtitle|custom-group-tag-1|custom-group-tag|custom-invalid|custom-link|custom-modified|custom-rogue|custom-saved|custom-set|custom-state|custom-themed|custom-variable-button|custom-variable-tag|custom-visibility|cvs-filename-face|cvs-filename|cvs-handled-face|cvs-handled|cvs-header-face|cvs-header|cvs-marked-face|cvs-marked|cvs-msg-face|cvs-msg|cvs-need-action-face|cvs-need-action|cvs-unknown-face|cvs-unknown|default|diary-anniversary|diary-button|diary-time|diary|diff-added-face|diff-added|diff-changed-face|diff-changed|diff-context-face|diff-context|diff-file-header-face|diff-file-header|diff-function-face|diff-function|diff-header-face|diff-header|diff-hunk-header-face|diff-hunk-header|diff-index-face|diff-index|diff-indicator-added|diff-indicator-changed|diff-indicator-removed|diff-nonexistent-face|diff-nonexistent|diff-refine-added|diff-refine-change|diff-refine-changed|diff-refine-removed|diff-removed-face|diff-removed|dired-directory|dired-flagged|dired-header|dired-ignored|dired-mark|dired-marked|dired-perm-write|dired-symlink|dired-warning|ebrowse-default|ebrowse-file-name|ebrowse-member-attribute|ebrowse-member-class|ebrowse-progress|ebrowse-root-class|ebrowse-tree-mark|ediff-current-diff-A|ediff-current-diff-Ancestor|ediff-current-diff-B|ediff-current-diff-C|ediff-even-diff-A|ediff-even-diff-Ancestor|ediff-even-diff-B|ediff-even-diff-C|ediff-fine-diff-A|ediff-fine-diff-Ancestor|ediff-fine-diff-B|ediff-fine-diff-C|ediff-odd-diff-A|ediff-odd-diff-Ancestor|ediff-odd-diff-B|ediff-odd-diff-C|eieio-custom-slot-tag-face|eldoc-highlight-function-argument|epa-field-body|epa-field-name|epa-mark|epa-string|epa-validity-disabled|epa-validity-high|epa-validity-low|epa-validity-medium|erc-action-face|erc-bold-face|erc-button|erc-command-indicator-face|erc-current-nick-face|erc-dangerous-host-face|erc-default-face|erc-direct-msg-face|erc-error-face|erc-fool-face|erc-header-line|erc-input-face|erc-inverse-face|erc-keyword-face|erc-my-nick-face|erc-my-nick-prefix-face|erc-nick-default-face|erc-nick-msg-face|erc-nick-prefix-face|erc-notice-face|erc-pal-face|erc-prompt-face|erc-timestamp-face|erc-underline-face|error|ert-test-result-expected|ert-test-result-unexpected|escape-glyph|eww-form-checkbox|eww-form-file|eww-form-select|eww-form-submit|eww-form-text|eww-form-textarea|eww-invalid-certificate|eww-valid-certificate|excerpt|ffap|fg:erc-color-face0|fg:erc-color-face1|fg:erc-color-face10|fg:erc-color-face11|fg:erc-color-face12|fg:erc-color-face13|fg:erc-color-face14|fg:erc-color-face15|fg:erc-color-face2|fg:erc-color-face3|fg:erc-color-face4|fg:erc-color-face5|fg:erc-color-face6|fg:erc-color-face7|fg:erc-color-face8|fg:erc-color-face9|file-name-shadow|fixed-pitch|fixed|flymake-errline|flymake-warnline|flyspell-duplicate|flyspell-incorrect|font-lock-builtin-face|font-lock-comment-delimiter-face|font-lock-comment-face|font-lock-constant-face|font-lock-doc-face|font-lock-function-name-face|font-lock-keyword-face|font-lock-negation-char-face|font-lock-preprocessor-face|font-lock-regexp-grouping-backslash|font-lock-regexp-grouping-construct|font-lock-string-face|font-lock-type-face|font-lock-variable-name-face|font-lock-warning-face|fringe|glyphless-char|gnus-button|gnus-cite-1|gnus-cite-10|gnus-cite-11|gnus-cite-2|gnus-cite-3|gnus-cite-4|gnus-cite-5|gnus-cite-6|gnus-cite-7|gnus-cite-8|gnus-cite-9|gnus-cite-attribution-face|gnus-cite-attribution|gnus-cite-face-1|gnus-cite-face-10|gnus-cite-face-11|gnus-cite-face-2|gnus-cite-face-3|gnus-cite-face-4|gnus-cite-face-5|gnus-cite-face-6|gnus-cite-face-7|gnus-cite-face-8|gnus-cite-face-9|gnus-emphasis-bold-italic|gnus-emphasis-bold|gnus-emphasis-highlight-words|gnus-emphasis-italic|gnus-emphasis-strikethru|gnus-emphasis-underline-bold-italic|gnus-emphasis-underline-bold|gnus-emphasis-underline-italic|gnus-emphasis-underline|gnus-group-mail-1-empty-face|gnus-group-mail-1-empty|gnus-group-mail-1-face|gnus-group-mail-1|gnus-group-mail-2-empty-face|gnus-group-mail-2-empty|gnus-group-mail-2-face|gnus-group-mail-2|gnus-group-mail-3-empty-face|gnus-group-mail-3-empty|gnus-group-mail-3-face|gnus-group-mail-3|gnus-group-mail-low-empty-face|gnus-group-mail-low-empty|gnus-group-mail-low-face|gnus-group-mail-low|gnus-group-news-1-empty-face|gnus-group-news-1-empty|gnus-group-news-1-face|gnus-group-news-1|gnus-group-news-2-empty-face|gnus-group-news-2-empty|gnus-group-news-2-face|gnus-group-news-2|gnus-group-news-3-empty-face|gnus-group-news-3-empty|gnus-group-news-3-face|gnus-group-news-3|gnus-group-news-4-empty-face|gnus-group-news-4-empty|gnus-group-news-4-face|gnus-group-news-4|gnus-group-news-5-empty-face|gnus-group-news-5-empty|gnus-group-news-5-face|gnus-group-news-5|gnus-group-news-6-empty-face|gnus-group-news-6-empty|gnus-group-news-6-face|gnus-group-news-6|gnus-group-news-low-empty-face|gnus-group-news-low-empty|gnus-group-news-low-face|gnus-group-news-low|gnus-header-content-face|gnus-header-content|gnus-header-from-face|gnus-header-from|gnus-header-name-face|gnus-header-name|gnus-header-newsgroups-face|gnus-header-newsgroups|gnus-header-subject-face|gnus-header-subject|gnus-signature-face|gnus-signature|gnus-splash-face|gnus-splash|gnus-summary-cancelled-face|gnus-summary-cancelled|gnus-summary-high-ancient-face|gnus-summary-high-ancient|gnus-summary-high-read-face|gnus-summary-high-read|gnus-summary-high-ticked-face|gnus-summary-high-ticked|gnus-summary-high-undownloaded-face|gnus-summary-high-undownloaded|gnus-summary-high-unread-face|gnus-summary-high-unread|gnus-summary-low-ancient-face|gnus-summary-low-ancient|gnus-summary-low-read-face|gnus-summary-low-read|gnus-summary-low-ticked-face|gnus-summary-low-ticked|gnus-summary-low-undownloaded-face|gnus-summary-low-undownloaded|gnus-summary-low-unread-face|gnus-summary-low-unread|gnus-summary-normal-ancient-face|gnus-summary-normal-ancient|gnus-summary-normal-read-face|gnus-summary-normal-read|gnus-summary-normal-ticked-face|gnus-summary-normal-ticked|gnus-summary-normal-undownloaded-face|gnus-summary-normal-undownloaded|gnus-summary-normal-unread-face|gnus-summary-normal-unread|gnus-summary-selected-face|gnus-summary-selected|gomoku-O|gomoku-X|header-line|help-argument-name|hexl-address-region|hexl-ascii-region|hi-black-b|hi-black-hb|hi-blue-b|hi-blue|hi-green-b|hi-green|hi-pink|hi-red-b|hi-yellow|hide-ifdef-shadow|highlight-changes-delete-face|highlight-changes-delete|highlight-changes-face|highlight-changes|highlight|hl-line|holiday|icomplete-first-match|idlwave-help-link|idlwave-shell-bp|idlwave-shell-disabled-bp|idlwave-shell-electric-stop-line|idlwave-shell-pending-electric-stop|idlwave-shell-pending-stop|ido-first-match|ido-incomplete-regexp|ido-indicator|ido-only-match|ido-subdir|ido-virtual|info-header-node|info-header-xref|info-index-match|info-menu-5|info-menu-header|info-menu-star|info-node|info-title-1|info-title-2|info-title-3|info-title-4|info-xref|isearch-fail|isearch-lazy-highlight-face|isearch|iswitchb-current-match|iswitchb-invalid-regexp|iswitchb-single-match|iswitchb-virtual-matches|italic|landmark-font-lock-face-O|landmark-font-lock-face-X|lazy-highlight|ld-script-location-counter|link-visited|link|log-edit-header|log-edit-summary|log-edit-unknown-header|log-view-file-face|log-view-file|log-view-message-face|log-view-message|makefile-makepp-perl|makefile-shell|makefile-space-face|makefile-space|makefile-targets|match|menu|message-cited-text-face|message-cited-text|message-header-cc-face|message-header-cc|message-header-name-face|message-header-name|message-header-newsgroups-face|message-header-newsgroups|message-header-other-face|message-header-other|message-header-subject-face|message-header-subject|message-header-to-face|message-header-to|message-header-xheader-face|message-header-xheader|message-mml-face|message-mml|message-separator-face|message-separator|mh-folder-address|mh-folder-blacklisted|mh-folder-body|mh-folder-cur-msg-number|mh-folder-date|mh-folder-deleted|mh-folder-followup|mh-folder-msg-number|mh-folder-refiled|mh-folder-sent-to-me-hint|mh-folder-sent-to-me-sender|mh-folder-subject|mh-folder-tick|mh-folder-to|mh-folder-whitelisted|mh-letter-header-field|mh-search-folder|mh-show-cc|mh-show-date|mh-show-from|mh-show-header|mh-show-pgg-bad|mh-show-pgg-good|mh-show-pgg-unknown|mh-show-signature|mh-show-subject|mh-show-to|mh-speedbar-folder-with-unseen-messages|mh-speedbar-folder|mh-speedbar-selected-folder-with-unseen-messages|mh-speedbar-selected-folder|minibuffer-prompt|mm-command-output|mm-uu-extract|mode-line-buffer-id|mode-line-emphasis|mode-line-highlight|mode-line-inactive|mode-line|modeline-buffer-id|modeline-highlight|modeline-inactive|mouse|mpuz-solved|mpuz-text|mpuz-trivial|mpuz-unsolved|newsticker-date-face|newsticker-default-face|newsticker-enclosure-face|newsticker-extra-face|newsticker-feed-face|newsticker-immortal-item-face|newsticker-new-item-face|newsticker-obsolete-item-face|newsticker-old-item-face|newsticker-statistics-face|newsticker-treeview-face|newsticker-treeview-immortal-face|newsticker-treeview-new-face|newsticker-treeview-obsolete-face|newsticker-treeview-old-face|newsticker-treeview-selection-face|next-error|nobreak-space|nxml-attribute-colon|nxml-attribute-local-name|nxml-attribute-prefix|nxml-attribute-value-delimiter|nxml-attribute-value|nxml-cdata-section-CDATA|nxml-cdata-section-content|nxml-cdata-section-delimiter|nxml-char-ref-delimiter|nxml-char-ref-number|nxml-comment-content|nxml-comment-delimiter|nxml-delimited-data|nxml-delimiter|nxml-element-colon|nxml-element-local-name|nxml-element-prefix|nxml-entity-ref-delimiter|nxml-entity-ref-name|nxml-glyph|nxml-hash|nxml-heading|nxml-markup-declaration-delimiter|nxml-name|nxml-namespace-attribute-colon|nxml-namespace-attribute-prefix|nxml-namespace-attribute-value-delimiter|nxml-namespace-attribute-value|nxml-namespace-attribute-xmlns|nxml-outline-active-indicator|nxml-outline-ellipsis|nxml-outline-indicator|nxml-processing-instruction-content|nxml-processing-instruction-delimiter|nxml-processing-instruction-target|nxml-prolog-keyword|nxml-prolog-literal-content|nxml-prolog-literal-delimiter|nxml-ref|nxml-tag-delimiter|nxml-tag-slash|nxml-text|octave-function-comment-block|org-agenda-calendar-event|org-agenda-calendar-sexp|org-agenda-clocking|org-agenda-column-dateline|org-agenda-current-time|org-agenda-date-today|org-agenda-date-weekend|org-agenda-date|org-agenda-diary|org-agenda-dimmed-todo-face|org-agenda-done|org-agenda-filter-category|org-agenda-filter-regexp|org-agenda-filter-tags|org-agenda-restriction-lock|org-agenda-structure|org-archived|org-block-background|org-block-begin-line|org-block-end-line|org-block|org-checkbox-statistics-done|org-checkbox-statistics-todo|org-checkbox|org-clock-overlay|org-code|org-column-title|org-column|org-date-selected|org-date|org-default|org-document-info-keyword|org-document-info|org-document-title|org-done|org-drawer|org-ellipsis|org-footnote|org-formula|org-headline-done|org-hide|org-latex-and-related|org-level-1|org-level-2|org-level-3|org-level-4|org-level-5|org-level-6|org-level-7|org-level-8|org-link|org-list-dt|org-macro|org-meta-line|org-mode-line-clock-overrun|org-mode-line-clock|org-priority|org-property-value|org-quote|org-scheduled-previously|org-scheduled-today|org-scheduled|org-sexp-date|org-special-keyword|org-table|org-tag-group|org-tag|org-target|org-time-grid|org-todo|org-upcoming-deadline|org-verbatim|org-verse|org-warning|outline-1|outline-2|outline-3|outline-4|outline-5|outline-6|outline-7|outline-8|proced-mark|proced-marked|proced-sort-header|pulse-highlight-face|pulse-highlight-start-face|query-replace|rcirc-bright-nick|rcirc-dim-nick|rcirc-keyword|rcirc-my-nick|rcirc-nick-in-message-full-line|rcirc-nick-in-message|rcirc-other-nick|rcirc-prompt|rcirc-server-prefix|rcirc-server|rcirc-timestamp|rcirc-track-keyword|rcirc-track-nick|rcirc-url|reb-match-0|reb-match-1|reb-match-2|reb-match-3|rectangle-preview-face|region|rmail-header-name|rmail-highlight|rng-error|rst-adornment|rst-block|rst-comment|rst-definition|rst-directive|rst-emphasis1|rst-emphasis2|rst-external|rst-level-1|rst-level-2|rst-level-3|rst-level-4|rst-level-5|rst-level-6|rst-literal|rst-reference|rst-transition|ruler-mode-column-number|ruler-mode-comment-column|ruler-mode-current-column|ruler-mode-default|ruler-mode-fill-column|ruler-mode-fringes|ruler-mode-goal-column|ruler-mode-margins|ruler-mode-pad|ruler-mode-tab-stop|scroll-bar|secondary-selection|semantic-highlight-edits-face|semantic-highlight-func-current-tag-face|semantic-unmatched-syntax-face|senator-momentary-highlight-face|sgml-namespace|sh-escaped-newline|sh-heredoc-face|sh-heredoc|sh-quoted-exec|shadow|show-paren-match-face|show-paren-match|show-paren-mismatch-face|show-paren-mismatch|shr-link|shr-strike-through|smerge-base-face|smerge-base|smerge-markers-face|smerge-markers|smerge-mine-face|smerge-mine|smerge-other-face|smerge-other|smerge-refined-added|smerge-refined-change|smerge-refined-changed|smerge-refined-removed|speedbar-button-face|speedbar-directory-face|speedbar-file-face|speedbar-highlight-face|speedbar-selected-face|speedbar-separator-face|speedbar-tag-face|srecode-separator-face|strokes-char|subscript|success|superscript|table-cell|tcl-escaped-newline|term-bold|term-color-black|term-color-blue|term-color-cyan|term-color-green|term-color-magenta|term-color-red|term-color-white|term-color-yellow|term-underline|term|testcover-1value|testcover-nohits|tex-math-face|tex-math|tex-verbatim-face|tex-verbatim|texinfo-heading-face|texinfo-heading|tmm-inactive|todo-archived-only|todo-button|todo-category-string|todo-comment|todo-date|todo-diary-expired|todo-done-sep|todo-done|todo-key-prompt|todo-mark|todo-nondiary|todo-prefix-string|todo-search|todo-sorted-column|todo-time|todo-top-priority|tool-bar|tooltip|trailing-whitespace|tty-menu-disabled-face|tty-menu-enabled-face|tty-menu-selected-face|underline|variable-pitch|vc-conflict-state|vc-edited-state|vc-locally-added-state|vc-locked-state|vc-missing-state|vc-needs-update-state|vc-removed-state|vc-state-base-face|vc-up-to-date-state|vcursor|vera-font-lock-function|vera-font-lock-interface|vera-font-lock-number|verilog-font-lock-ams-face|verilog-font-lock-grouping-keywords-face|verilog-font-lock-p1800-face|verilog-font-lock-translate-off-face|vertical-border|vhdl-font-lock-attribute-face|vhdl-font-lock-directive-face|vhdl-font-lock-enumvalue-face|vhdl-font-lock-function-face|vhdl-font-lock-generic-\\/constant-face|vhdl-font-lock-prompt-face|vhdl-font-lock-reserved-words-face|vhdl-font-lock-translate-off-face|vhdl-font-lock-type-face|vhdl-font-lock-variable-face|vhdl-speedbar-architecture-face|vhdl-speedbar-architecture-selected-face|vhdl-speedbar-configuration-face|vhdl-speedbar-configuration-selected-face|vhdl-speedbar-entity-face|vhdl-speedbar-entity-selected-face|vhdl-speedbar-instantiation-face|vhdl-speedbar-instantiation-selected-face|vhdl-speedbar-library-face|vhdl-speedbar-package-face|vhdl-speedbar-package-selected-face|vhdl-speedbar-subprogram-face|viper-minibuffer-emacs|viper-minibuffer-insert|viper-minibuffer-vi|viper-replace-overlay|viper-search|warning|which-func|whitespace-big-indent|whitespace-empty|whitespace-hspace|whitespace-indentation|whitespace-line|whitespace-newline|whitespace-space-after-tab|whitespace-space-before-tab|whitespace-space|whitespace-tab|whitespace-trailing|widget-button-face|widget-button-pressed-face|widget-button-pressed|widget-button|widget-documentation-face|widget-documentation|widget-field-face|widget-field|widget-inactive-face|widget-inactive|widget-single-line-field-face|widget-single-line-field|window-divider-first-pixel|window-divider-last-pixel|window-divider|woman-addition-face|woman-addition|woman-bold-face|woman-bold|woman-italic-face|woman-italic|woman-unknown-face|woman-unknown)(?=[\\s()]|$)\\b",
+      "match": "\\b(?<=[\\s()\\[]|^)(?:Buffer-menu-buffer|Info-quoted|Info-title-1-face|Info-title-2-face|Info-title-3-face|Info-title-4-face|Man-overstrike|Man-reverse|Man-underline|antlr-default|antlr-font-lock-default-face|antlr-font-lock-keyword-face|antlr-font-lock-literal-face|antlr-font-lock-ruledef-face|antlr-font-lock-ruleref-face|antlr-font-lock-syntax-face|antlr-font-lock-tokendef-face|antlr-font-lock-tokenref-face|antlr-keyword|antlr-literal|antlr-ruledef|antlr-ruleref|antlr-syntax|antlr-tokendef|antlr-tokenref|apropos-keybinding|apropos-property|apropos-symbol|bat-label-face|bg:erc-color-face0|bg:erc-color-face1|bg:erc-color-face10|bg:erc-color-face11|bg:erc-color-face12|bg:erc-color-face13|bg:erc-color-face14|bg:erc-color-face15|bg:erc-color-face2|bg:erc-color-face3|bg:erc-color-face4|bg:erc-color-face5|bg:erc-color-face6|bg:erc-color-face7|bg:erc-color-face8|bg:erc-color-face9|bold-italic|bold|bookmark-menu-bookmark|bookmark-menu-heading|border|breakpoint-disabled|breakpoint-enabled|buffer-menu-buffer|button|c-annotation-face|calc-nonselected-face|calc-selected-face|calendar-month-header|calendar-today|calendar-weekday-header|calendar-weekend-header|change-log-acknowledgement-face|change-log-acknowledgement|change-log-acknowledgment|change-log-conditionals-face|change-log-conditionals|change-log-date-face|change-log-date|change-log-email-face|change-log-email|change-log-file-face|change-log-file|change-log-function-face|change-log-function|change-log-list-face|change-log-list|change-log-name-face|change-log-name|comint-highlight-input|comint-highlight-prompt|compare-windows|compilation-column-number|compilation-error|compilation-info|compilation-line-number|compilation-mode-line-exit|compilation-mode-line-fail|compilation-mode-line-run|compilation-warning|completions-annotations|completions-common-part|completions-first-difference|cperl-array-face|cperl-hash-face|cperl-nonoverridable-face|css-property|css-selector|cua-global-mark|cua-rectangle-noselect|cua-rectangle|cursor|custom-button-mouse|custom-button-pressed-unraised|custom-button-pressed|custom-button-unraised|custom-button|custom-changed|custom-comment-tag|custom-comment|custom-documentation|custom-face-tag|custom-group-subtitle|custom-group-tag-1|custom-group-tag|custom-invalid|custom-link|custom-modified|custom-rogue|custom-saved|custom-set|custom-state|custom-themed|custom-variable-button|custom-variable-tag|custom-visibility|cvs-filename-face|cvs-filename|cvs-handled-face|cvs-handled|cvs-header-face|cvs-header|cvs-marked-face|cvs-marked|cvs-msg-face|cvs-msg|cvs-need-action-face|cvs-need-action|cvs-unknown-face|cvs-unknown|default|diary-anniversary|diary-button|diary-time|diary|diff-added-face|diff-added|diff-changed-face|diff-changed|diff-context-face|diff-context|diff-file-header-face|diff-file-header|diff-function-face|diff-function|diff-header-face|diff-header|diff-hunk-header-face|diff-hunk-header|diff-index-face|diff-index|diff-indicator-added|diff-indicator-changed|diff-indicator-removed|diff-nonexistent-face|diff-nonexistent|diff-refine-added|diff-refine-change|diff-refine-changed|diff-refine-removed|diff-removed-face|diff-removed|dired-directory|dired-flagged|dired-header|dired-ignored|dired-mark|dired-marked|dired-perm-write|dired-symlink|dired-warning|ebrowse-default|ebrowse-file-name|ebrowse-member-attribute|ebrowse-member-class|ebrowse-progress|ebrowse-root-class|ebrowse-tree-mark|ediff-current-diff-A|ediff-current-diff-Ancestor|ediff-current-diff-B|ediff-current-diff-C|ediff-even-diff-A|ediff-even-diff-Ancestor|ediff-even-diff-B|ediff-even-diff-C|ediff-fine-diff-A|ediff-fine-diff-Ancestor|ediff-fine-diff-B|ediff-fine-diff-C|ediff-odd-diff-A|ediff-odd-diff-Ancestor|ediff-odd-diff-B|ediff-odd-diff-C|eieio-custom-slot-tag-face|eldoc-highlight-function-argument|epa-field-body|epa-field-name|epa-mark|epa-string|epa-validity-disabled|epa-validity-high|epa-validity-low|epa-validity-medium|erc-action-face|erc-bold-face|erc-button|erc-command-indicator-face|erc-current-nick-face|erc-dangerous-host-face|erc-default-face|erc-direct-msg-face|erc-error-face|erc-fool-face|erc-header-line|erc-input-face|erc-inverse-face|erc-keyword-face|erc-my-nick-face|erc-my-nick-prefix-face|erc-nick-default-face|erc-nick-msg-face|erc-nick-prefix-face|erc-notice-face|erc-pal-face|erc-prompt-face|erc-timestamp-face|erc-underline-face|error|ert-test-result-expected|ert-test-result-unexpected|escape-glyph|eww-form-checkbox|eww-form-file|eww-form-select|eww-form-submit|eww-form-text|eww-form-textarea|eww-invalid-certificate|eww-valid-certificate|excerpt|ffap|fg:erc-color-face0|fg:erc-color-face1|fg:erc-color-face10|fg:erc-color-face11|fg:erc-color-face12|fg:erc-color-face13|fg:erc-color-face14|fg:erc-color-face15|fg:erc-color-face2|fg:erc-color-face3|fg:erc-color-face4|fg:erc-color-face5|fg:erc-color-face6|fg:erc-color-face7|fg:erc-color-face8|fg:erc-color-face9|file-name-shadow|fixed-pitch|fixed|flymake-errline|flymake-warnline|flyspell-duplicate|flyspell-incorrect|font-lock-builtin-face|font-lock-comment-delimiter-face|font-lock-comment-face|font-lock-constant-face|font-lock-doc-face|font-lock-function-name-face|font-lock-keyword-face|font-lock-negation-char-face|font-lock-preprocessor-face|font-lock-regexp-grouping-backslash|font-lock-regexp-grouping-construct|font-lock-string-face|font-lock-type-face|font-lock-variable-name-face|font-lock-warning-face|fringe|glyphless-char|gnus-button|gnus-cite-1|gnus-cite-10|gnus-cite-11|gnus-cite-2|gnus-cite-3|gnus-cite-4|gnus-cite-5|gnus-cite-6|gnus-cite-7|gnus-cite-8|gnus-cite-9|gnus-cite-attribution-face|gnus-cite-attribution|gnus-cite-face-1|gnus-cite-face-10|gnus-cite-face-11|gnus-cite-face-2|gnus-cite-face-3|gnus-cite-face-4|gnus-cite-face-5|gnus-cite-face-6|gnus-cite-face-7|gnus-cite-face-8|gnus-cite-face-9|gnus-emphasis-bold-italic|gnus-emphasis-bold|gnus-emphasis-highlight-words|gnus-emphasis-italic|gnus-emphasis-strikethru|gnus-emphasis-underline-bold-italic|gnus-emphasis-underline-bold|gnus-emphasis-underline-italic|gnus-emphasis-underline|gnus-group-mail-1-empty-face|gnus-group-mail-1-empty|gnus-group-mail-1-face|gnus-group-mail-1|gnus-group-mail-2-empty-face|gnus-group-mail-2-empty|gnus-group-mail-2-face|gnus-group-mail-2|gnus-group-mail-3-empty-face|gnus-group-mail-3-empty|gnus-group-mail-3-face|gnus-group-mail-3|gnus-group-mail-low-empty-face|gnus-group-mail-low-empty|gnus-group-mail-low-face|gnus-group-mail-low|gnus-group-news-1-empty-face|gnus-group-news-1-empty|gnus-group-news-1-face|gnus-group-news-1|gnus-group-news-2-empty-face|gnus-group-news-2-empty|gnus-group-news-2-face|gnus-group-news-2|gnus-group-news-3-empty-face|gnus-group-news-3-empty|gnus-group-news-3-face|gnus-group-news-3|gnus-group-news-4-empty-face|gnus-group-news-4-empty|gnus-group-news-4-face|gnus-group-news-4|gnus-group-news-5-empty-face|gnus-group-news-5-empty|gnus-group-news-5-face|gnus-group-news-5|gnus-group-news-6-empty-face|gnus-group-news-6-empty|gnus-group-news-6-face|gnus-group-news-6|gnus-group-news-low-empty-face|gnus-group-news-low-empty|gnus-group-news-low-face|gnus-group-news-low|gnus-header-content-face|gnus-header-content|gnus-header-from-face|gnus-header-from|gnus-header-name-face|gnus-header-name|gnus-header-newsgroups-face|gnus-header-newsgroups|gnus-header-subject-face|gnus-header-subject|gnus-signature-face|gnus-signature|gnus-splash-face|gnus-splash|gnus-summary-cancelled-face|gnus-summary-cancelled|gnus-summary-high-ancient-face|gnus-summary-high-ancient|gnus-summary-high-read-face|gnus-summary-high-read|gnus-summary-high-ticked-face|gnus-summary-high-ticked|gnus-summary-high-undownloaded-face|gnus-summary-high-undownloaded|gnus-summary-high-unread-face|gnus-summary-high-unread|gnus-summary-low-ancient-face|gnus-summary-low-ancient|gnus-summary-low-read-face|gnus-summary-low-read|gnus-summary-low-ticked-face|gnus-summary-low-ticked|gnus-summary-low-undownloaded-face|gnus-summary-low-undownloaded|gnus-summary-low-unread-face|gnus-summary-low-unread|gnus-summary-normal-ancient-face|gnus-summary-normal-ancient|gnus-summary-normal-read-face|gnus-summary-normal-read|gnus-summary-normal-ticked-face|gnus-summary-normal-ticked|gnus-summary-normal-undownloaded-face|gnus-summary-normal-undownloaded|gnus-summary-normal-unread-face|gnus-summary-normal-unread|gnus-summary-selected-face|gnus-summary-selected|gomoku-O|gomoku-X|header-line|help-argument-name|hexl-address-region|hexl-ascii-region|hi-black-b|hi-black-hb|hi-blue-b|hi-blue|hi-green-b|hi-green|hi-pink|hi-red-b|hi-yellow|hide-ifdef-shadow|highlight-changes-delete-face|highlight-changes-delete|highlight-changes-face|highlight-changes|highlight|hl-line|holiday|icomplete-first-match|idlwave-help-link|idlwave-shell-bp|idlwave-shell-disabled-bp|idlwave-shell-electric-stop-line|idlwave-shell-pending-electric-stop|idlwave-shell-pending-stop|ido-first-match|ido-incomplete-regexp|ido-indicator|ido-only-match|ido-subdir|ido-virtual|info-header-node|info-header-xref|info-index-match|info-menu-5|info-menu-header|info-menu-star|info-node|info-title-1|info-title-2|info-title-3|info-title-4|info-xref|isearch-fail|isearch-lazy-highlight-face|isearch|iswitchb-current-match|iswitchb-invalid-regexp|iswitchb-single-match|iswitchb-virtual-matches|italic|landmark-font-lock-face-O|landmark-font-lock-face-X|lazy-highlight|ld-script-location-counter|link-visited|link|log-edit-header|log-edit-summary|log-edit-unknown-header|log-view-file-face|log-view-file|log-view-message-face|log-view-message|makefile-makepp-perl|makefile-shell|makefile-space-face|makefile-space|makefile-targets|match|menu|message-cited-text-face|message-cited-text|message-header-cc-face|message-header-cc|message-header-name-face|message-header-name|message-header-newsgroups-face|message-header-newsgroups|message-header-other-face|message-header-other|message-header-subject-face|message-header-subject|message-header-to-face|message-header-to|message-header-xheader-face|message-header-xheader|message-mml-face|message-mml|message-separator-face|message-separator|mh-folder-address|mh-folder-blacklisted|mh-folder-body|mh-folder-cur-msg-number|mh-folder-date|mh-folder-deleted|mh-folder-followup|mh-folder-msg-number|mh-folder-refiled|mh-folder-sent-to-me-hint|mh-folder-sent-to-me-sender|mh-folder-subject|mh-folder-tick|mh-folder-to|mh-folder-whitelisted|mh-letter-header-field|mh-search-folder|mh-show-cc|mh-show-date|mh-show-from|mh-show-header|mh-show-pgg-bad|mh-show-pgg-good|mh-show-pgg-unknown|mh-show-signature|mh-show-subject|mh-show-to|mh-speedbar-folder-with-unseen-messages|mh-speedbar-folder|mh-speedbar-selected-folder-with-unseen-messages|mh-speedbar-selected-folder|minibuffer-prompt|mm-command-output|mm-uu-extract|mode-line-buffer-id|mode-line-emphasis|mode-line-highlight|mode-line-inactive|mode-line|modeline-buffer-id|modeline-highlight|modeline-inactive|mouse|mpuz-solved|mpuz-text|mpuz-trivial|mpuz-unsolved|newsticker-date-face|newsticker-default-face|newsticker-enclosure-face|newsticker-extra-face|newsticker-feed-face|newsticker-immortal-item-face|newsticker-new-item-face|newsticker-obsolete-item-face|newsticker-old-item-face|newsticker-statistics-face|newsticker-treeview-face|newsticker-treeview-immortal-face|newsticker-treeview-new-face|newsticker-treeview-obsolete-face|newsticker-treeview-old-face|newsticker-treeview-selection-face|next-error|nobreak-space|nxml-attribute-colon|nxml-attribute-local-name|nxml-attribute-prefix|nxml-attribute-value-delimiter|nxml-attribute-value|nxml-cdata-section-CDATA|nxml-cdata-section-content|nxml-cdata-section-delimiter|nxml-char-ref-delimiter|nxml-char-ref-number|nxml-comment-content|nxml-comment-delimiter|nxml-delimited-data|nxml-delimiter|nxml-element-colon|nxml-element-local-name|nxml-element-prefix|nxml-entity-ref-delimiter|nxml-entity-ref-name|nxml-glyph|nxml-hash|nxml-heading|nxml-markup-declaration-delimiter|nxml-name|nxml-namespace-attribute-colon|nxml-namespace-attribute-prefix|nxml-namespace-attribute-value-delimiter|nxml-namespace-attribute-value|nxml-namespace-attribute-xmlns|nxml-outline-active-indicator|nxml-outline-ellipsis|nxml-outline-indicator|nxml-processing-instruction-content|nxml-processing-instruction-delimiter|nxml-processing-instruction-target|nxml-prolog-keyword|nxml-prolog-literal-content|nxml-prolog-literal-delimiter|nxml-ref|nxml-tag-delimiter|nxml-tag-slash|nxml-text|octave-function-comment-block|org-agenda-calendar-event|org-agenda-calendar-sexp|org-agenda-clocking|org-agenda-column-dateline|org-agenda-current-time|org-agenda-date-today|org-agenda-date-weekend|org-agenda-date|org-agenda-diary|org-agenda-dimmed-todo-face|org-agenda-done|org-agenda-filter-category|org-agenda-filter-regexp|org-agenda-filter-tags|org-agenda-restriction-lock|org-agenda-structure|org-archived|org-block-background|org-block-begin-line|org-block-end-line|org-block|org-checkbox-statistics-done|org-checkbox-statistics-todo|org-checkbox|org-clock-overlay|org-code|org-column-title|org-column|org-date-selected|org-date|org-default|org-document-info-keyword|org-document-info|org-document-title|org-done|org-drawer|org-ellipsis|org-footnote|org-formula|org-headline-done|org-hide|org-latex-and-related|org-level-1|org-level-2|org-level-3|org-level-4|org-level-5|org-level-6|org-level-7|org-level-8|org-link|org-list-dt|org-macro|org-meta-line|org-mode-line-clock-overrun|org-mode-line-clock|org-priority|org-property-value|org-quote|org-scheduled-previously|org-scheduled-today|org-scheduled|org-sexp-date|org-special-keyword|org-table|org-tag-group|org-tag|org-target|org-time-grid|org-todo|org-upcoming-deadline|org-verbatim|org-verse|org-warning|outline-1|outline-2|outline-3|outline-4|outline-5|outline-6|outline-7|outline-8|proced-mark|proced-marked|proced-sort-header|pulse-highlight-face|pulse-highlight-start-face|query-replace|rcirc-bright-nick|rcirc-dim-nick|rcirc-keyword|rcirc-my-nick|rcirc-nick-in-message-full-line|rcirc-nick-in-message|rcirc-other-nick|rcirc-prompt|rcirc-server-prefix|rcirc-server|rcirc-timestamp|rcirc-track-keyword|rcirc-track-nick|rcirc-url|reb-match-0|reb-match-1|reb-match-2|reb-match-3|rectangle-preview-face|region|rmail-header-name|rmail-highlight|rng-error|rst-adornment|rst-block|rst-comment|rst-definition|rst-directive|rst-emphasis1|rst-emphasis2|rst-external|rst-level-1|rst-level-2|rst-level-3|rst-level-4|rst-level-5|rst-level-6|rst-literal|rst-reference|rst-transition|ruler-mode-column-number|ruler-mode-comment-column|ruler-mode-current-column|ruler-mode-default|ruler-mode-fill-column|ruler-mode-fringes|ruler-mode-goal-column|ruler-mode-margins|ruler-mode-pad|ruler-mode-tab-stop|scroll-bar|secondary-selection|semantic-highlight-edits-face|semantic-highlight-func-current-tag-face|semantic-unmatched-syntax-face|senator-momentary-highlight-face|sgml-namespace|sh-escaped-newline|sh-heredoc-face|sh-heredoc|sh-quoted-exec|shadow|show-paren-match-face|show-paren-match|show-paren-mismatch-face|show-paren-mismatch|shr-link|shr-strike-through|smerge-base-face|smerge-base|smerge-markers-face|smerge-markers|smerge-mine-face|smerge-mine|smerge-other-face|smerge-other|smerge-refined-added|smerge-refined-change|smerge-refined-changed|smerge-refined-removed|speedbar-button-face|speedbar-directory-face|speedbar-file-face|speedbar-highlight-face|speedbar-selected-face|speedbar-separator-face|speedbar-tag-face|srecode-separator-face|strokes-char|subscript|success|superscript|table-cell|tcl-escaped-newline|term-bold|term-color-black|term-color-blue|term-color-cyan|term-color-green|term-color-magenta|term-color-red|term-color-white|term-color-yellow|term-underline|term|testcover-1value|testcover-nohits|tex-math-face|tex-math|tex-verbatim-face|tex-verbatim|texinfo-heading-face|texinfo-heading|tmm-inactive|todo-archived-only|todo-button|todo-category-string|todo-comment|todo-date|todo-diary-expired|todo-done-sep|todo-done|todo-key-prompt|todo-mark|todo-nondiary|todo-prefix-string|todo-search|todo-sorted-column|todo-time|todo-top-priority|tool-bar|tooltip|trailing-whitespace|tty-menu-disabled-face|tty-menu-enabled-face|tty-menu-selected-face|underline|variable-pitch|vc-conflict-state|vc-edited-state|vc-locally-added-state|vc-locked-state|vc-missing-state|vc-needs-update-state|vc-removed-state|vc-state-base-face|vc-up-to-date-state|vcursor|vera-font-lock-function|vera-font-lock-interface|vera-font-lock-number|verilog-font-lock-ams-face|verilog-font-lock-grouping-keywords-face|verilog-font-lock-p1800-face|verilog-font-lock-translate-off-face|vertical-border|vhdl-font-lock-attribute-face|vhdl-font-lock-directive-face|vhdl-font-lock-enumvalue-face|vhdl-font-lock-function-face|vhdl-font-lock-generic-/constant-face|vhdl-font-lock-prompt-face|vhdl-font-lock-reserved-words-face|vhdl-font-lock-translate-off-face|vhdl-font-lock-type-face|vhdl-font-lock-variable-face|vhdl-speedbar-architecture-face|vhdl-speedbar-architecture-selected-face|vhdl-speedbar-configuration-face|vhdl-speedbar-configuration-selected-face|vhdl-speedbar-entity-face|vhdl-speedbar-entity-selected-face|vhdl-speedbar-instantiation-face|vhdl-speedbar-instantiation-selected-face|vhdl-speedbar-library-face|vhdl-speedbar-package-face|vhdl-speedbar-package-selected-face|vhdl-speedbar-subprogram-face|viper-minibuffer-emacs|viper-minibuffer-insert|viper-minibuffer-vi|viper-replace-overlay|viper-search|warning|which-func|whitespace-big-indent|whitespace-empty|whitespace-hspace|whitespace-indentation|whitespace-line|whitespace-newline|whitespace-space-after-tab|whitespace-space-before-tab|whitespace-space|whitespace-tab|whitespace-trailing|widget-button-face|widget-button-pressed-face|widget-button-pressed|widget-button|widget-documentation-face|widget-documentation|widget-field-face|widget-field|widget-inactive-face|widget-inactive|widget-single-line-field-face|widget-single-line-field|window-divider-first-pixel|window-divider-last-pixel|window-divider|woman-addition-face|woman-addition|woman-bold-face|woman-bold|woman-italic-face|woman-italic|woman-unknown-face|woman-unknown)(?=[\\s()]|$)\\b",
       "name": "support.constant.face.emacs.lisp"
     },
     "format": {
@@ -666,7 +666,7 @@
               "name": "keyword.operator.arithmetic.multiply.emacs.lisp"
             }
           },
-          "match": "([0-9]+)(\\*)(?=[\\S])",
+          "match": "([0-9]+)(\\*)(?=\\S)",
           "name": "meta.key-repetition.emacs.lisp"
         },
         {
@@ -762,7 +762,7 @@
           "name": "punctuation.definition.keyword.emacs.lisp"
         }
       },
-      "match": "(?<=[\\s()\\[]|^)(:)[-+=*/\\w~!@$%^&:<>{}?]+",
+      "match": "(?<=[\\s()\\[]|^)(:)[-+=*/\\w~!@$%^\\&:<>{}?]+",
       "name": "constant.keyword.emacs.lisp"
     },
     "lambda": {
@@ -807,7 +807,7 @@
       "name": "meta.cl-lib.loop.emacs.lisp",
       "patterns": [
         {
-          "match": "(?<=[\\s()\\[]|^)(above|across|across-ref|always|and|append|as|below|by|collect|concat|count|do|each|finally|for|from|if|in|in-ref|initially|into|maximize|minimize|named|nconc|never|of|of-ref|on|repeat|return|sum|then|thereis|sum|to|unless|until|using|vconcat|when|while|with|(?:being\\s+(?:the)?\\s+(?:element|hash-key|hash-value|key-code|key-binding|key-seq|overlay|interval|symbols|frame|window|buffer)s?))(?=[\\s()]|$)",
+          "match": "(?<=[\\s()\\[]|^)(above|across|across-ref|always|and|append|as|below|by|collect|concat|count|do|each|finally|for|from|if|in|in-ref|initially|into|maximize|minimize|named|nconc|never|of|of-ref|on|repeat|return|sum|then|thereis|sum|to|unless|until|using|vconcat|when|while|with|being\\s+(?:the)?\\s+(?:element|hash-key|hash-value|key-code|key-binding|key-seq|overlay|interval|symbols|frame|window|buffer)s?)(?=[\\s()]|$)",
           "name": "keyword.control.emacs.lisp"
         },
         {
@@ -962,7 +962,7 @@
               "name": "punctuation.definition.hex.emacs.lisp"
             }
           },
-          "match": "(?<=[\\s()\\[]|^)(#)[Xx][0-9A-Fa-f]+",
+          "match": "(?<=[\\s()\\[]|^)(#)[Xx]\\h+",
           "name": "constant.numeric.integer.hex.viml"
         },
         {
@@ -982,15 +982,15 @@
           "name": "keyword.control.$1.emacs.lisp"
         },
         {
-          "match": "(?<=\\(|\\s|^)(interactive)(?=\\s|\\(|\\))",
+          "match": "(?<=[(\\s]|^)(interactive)(?=[\\s()])",
           "name": "storage.modifier.interactive.function.emacs.lisp"
         },
         {
-          "match": "(?<=\\(|\\s|^)[-*+/%](?=\\s|\\)|$)",
+          "match": "(?<=[(\\s]|^)[-*+/%](?=[\\s)]|$)",
           "name": "keyword.operator.numeric.emacs.lisp"
         },
         {
-          "match": "(?<=\\(|\\s|^)[/<>]=|[=<>](?=\\s|\\)|$)",
+          "match": "(?<=[(\\s]|^)[/<>]=|[=<>](?=[\\s)]|$)",
           "name": "keyword.operator.comparison.emacs.lisp"
         },
         {
@@ -1014,7 +1014,7 @@
               ]
             }
           },
-          "match": "(')([-+=*/\\w~!@$%^&:<>{}?]+)",
+          "match": "(')([-+=*/\\w~!@$%^\\&:<>{}?]+)",
           "name": "constant.other.symbol.emacs.lisp"
         }
       ]
@@ -1030,15 +1030,15 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(eieio--class-parents--cmacro|eieio--class-parents|eieio--class-precedence-bfs|eieio--class-precedence-c3|eieio--class-precedence-dfs|eieio--class-precedence-list|eieio--class-print-name|eieio--class-p|eieio--class-slot-initarg|eieio--class-slot-name-index|eieio--class-slots--cmacro|eieio--class-slots|eieio--class\\/struct-parents|eieio--generic-subclass-specializers|eieio--initarg-to-attribute|eieio--object-class-tag|eieio--pcase-macroexpander|eieio--perform-slot-validation-for-default|eieio--perform-slot-validation|eieio--slot-name-index|eieio--slot-override|eieio--validate-class-slot-value|eieio--validate-slot-value|eieio-change-class|eieio-class-slots|eieio-default-superclass--eieio-childp|eieio-defclass-internal|eieio-make-child-predicate|eieio-make-class-predicate|eieio-oref--anon-cmacro|eieio-pcase-slot-index-from-index-table|eieio-pcase-slot-index-table|eieio-slot-descriptor-name|eldoc--supported-p|eldoc-docstring-format-sym-doc|eldoc-mode-set-explicitly|electric-pair--balance-info|electric-pair--insert|electric-pair--inside-string-p|electric-pair--skip-whitespace|electric-pair--syntax-ppss|electric-pair--unbalanced-strings-p|electric-pair--with-uncached-syntax|electric-pair-conservative-inhibit|electric-pair-default-inhibit|electric-pair-default-skip-self|electric-pair-delete-pair|electric-pair-inhibit-if-helps-balance|electric-pair-local-mode|electric-pair-post-self-insert-function|electric-pair-skip-if-helps-balance|electric-pair-syntax-info|electric-pair-will-use-region|electric-quote-local-mode|electric-quote-mode|electric-quote-post-self-insert-function|elisp--font-lock-backslash|elisp--font-lock-flush-elisp-buffers|elisp--xref-backend|elisp--xref-make-xref|elisp-flymake--batch-compile-for-flymake|elisp-flymake--byte-compile-done|elisp-flymake-byte-compile|elisp-flymake-checkdoc|elisp-function-argstring|elisp-get-fnsym-args-string|elisp-get-var-docstring|elisp-load-path-roots|emacs-repository-version-git|enh-ruby-mode|epg-config--make-gpg-configuration|epg-config--make-gpgsm-configuration|epg-context-error-buffer--cmacro|epg-context-error-buffer|epg-find-configuration|erlang-compile|erlang-edoc-mode|erlang-find-tag-other-window|erlang-find-tag|erlang-mode|erlang-shell|erldoc-apropos|erldoc-browse-topic|erldoc-browse|erldoc-eldoc-function|etags--xref-backend|eval-expression-get-print-arguments|event-line-count|face-list-p|facemenu-set-charset|faces--attribute-at-point|faceup-clean-buffer|faceup-defexplainer|faceup-render-view-buffer|faceup-view-buffer|faceup-write-file|fic-mode|file-attribute-access-time|file-attribute-collect|file-attribute-device-number|file-attribute-group-id|file-attribute-inode-number|file-attribute-link-number|file-attribute-modes|file-attribute-modification-time|file-attribute-size|file-attribute-status-change-time|file-attribute-type|file-attribute-user-id|file-local-name|file-name-case-insensitive-p|file-name-quoted-p|file-name-quote|file-name-unquote|file-system-info|filepos-to-bufferpos--dos|filepos-to-bufferpos|files--ask-user-about-large-file|files--ensure-directory|files--force|files--make-magic-temp-file|files--message|files--name-absolute-system-p|files--splice-dirname-file|fill-polish-nobreak-p|find-function-on-key-other-frame|find-function-on-key-other-window|find-library-other-frame|find-library-other-window|fixnump|flymake-cc|flymake-diag-region|flymake-diagnostics|flymake-make-diagnostic|follow-scroll-down-window|follow-scroll-up-window|font-lock--remove-face-from-text-property|form-feed-mode|format-message|forth-block-mode|forth-eval-defun|forth-eval-last-expression-display-output|forth-eval-last-expression|forth-eval-region|forth-eval|forth-interaction-send|forth-kill|forth-load-file|forth-mode|forth-restart|forth-see|forth-switch-to-output-buffer|forth-switch-to-source-buffer|forth-words|fortune-message|forward-to-word|forward-word-strictly|frame--size-history|frame-after-make-frame|frame-ancestor-p|frame-creation-function|frame-edges|frame-focus-state|frame-geometry|frame-inner-height|frame-inner-width|frame-internal-border-width|frame-list-z-order|frame-monitor-attribute|frame-monitor-geometry|frame-monitor-workarea|frame-native-height|frame-native-width|frame-outer-height|frame-outer-width|frame-parent|frame-position|frame-restack|frame-size-changed-p|func-arity|generic--normalize-comments|generic-bracket-support|generic-mode-set-comments|generic-set-comment-syntax|generic-set-comment-vars|get-variable-watchers|gfm-mode|gfm-view-mode|ghc-core-create-core|ghc-core-mode|ghci-script-mode|git-commit--save-and-exit|git-commit-ack|git-commit-cc|git-commit-committer-email|git-commit-committer-name|git-commit-commit|git-commit-find-pseudo-header-position|git-commit-first-env-var|git-commit-font-lock-diff|git-commit-git-config-var|git-commit-insert-header-as-self|git-commit-insert-header|git-commit-mode|git-commit-reported|git-commit-review|git-commit-signoff|git-commit-test|git-define-git-commit-self|git-define-git-commit|gitattributes-mode--highlight-1st-field|gitattributes-mode-backward-field|gitattributes-mode-eldoc|gitattributes-mode-forward-field|gitattributes-mode-help|gitattributes-mode-menu|gitattributes-mode|gitconfig-indent-line|gitconfig-indentation-string|gitconfig-line-indented-p|gitconfig-mode|gitconfig-point-in-indentation-p|gitignore-mode|global-aggressive-indent-mode-check-buffers|global-aggressive-indent-mode-cmhh|global-aggressive-indent-mode-enable-in-buffers|global-aggressive-indent-mode|global-display-line-numbers-mode|global-eldoc-mode-check-buffers|global-eldoc-mode-cmhh|global-eldoc-mode-enable-in-buffers|glsl-mode|gnutls-asynchronous-parameters|gnutls-ciphers|gnutls-digests|gnutls-hash-digest|gnutls-hash-mac|gnutls-macs|gnutls-symmetric-decrypt|gnutls-symmetric-encrypt|go-download-play|go-mode|godoc|gofmt-before-save|gui-backend-get-selection|gui-backend-selection-exists-p|gui-backend-selection-owner-p|gui-backend-set-selection|gv-delay-error|gv-setter|gv-synthetic-place|hack-connection-local-variables-apply|handle-args-function|handle-move-frame|hash-table-empty-p|haskell-align-imports|haskell-c2hs-mode|haskell-cabal-get-dir|haskell-cabal-get-field|haskell-cabal-mode|haskell-cabal-visit-file|haskell-collapse-mode|haskell-compile|haskell-completions-completion-at-point|haskell-decl-scan-mode|haskell-describe|haskell-doc-current-info|haskell-doc-mode|haskell-doc-show-type|haskell-ds-create-imenu-index|haskell-forward-sexp|haskell-hayoo|haskell-hoogle-lookup-from-local|haskell-hoogle|haskell-indent-mode|haskell-indentation-mode|haskell-interactive-bring|haskell-interactive-kill|haskell-interactive-mode-echo|haskell-interactive-mode-reset-error|haskell-interactive-mode-return|haskell-interactive-mode-visit-error|haskell-interactive-switch|haskell-kill-session-process|haskell-menu|haskell-mode-after-save-handler|haskell-mode-find-uses|haskell-mode-generate-tags|haskell-mode-goto-loc|haskell-mode-jump-to-def-or-tag|haskell-mode-jump-to-def|haskell-mode-jump-to-tag|haskell-mode-show-type-at)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(eieio--class-parents--cmacro|eieio--class-parents|eieio--class-precedence-bfs|eieio--class-precedence-c3|eieio--class-precedence-dfs|eieio--class-precedence-list|eieio--class-print-name|eieio--class-p|eieio--class-slot-initarg|eieio--class-slot-name-index|eieio--class-slots--cmacro|eieio--class-slots|eieio--class/struct-parents|eieio--generic-subclass-specializers|eieio--initarg-to-attribute|eieio--object-class-tag|eieio--pcase-macroexpander|eieio--perform-slot-validation-for-default|eieio--perform-slot-validation|eieio--slot-name-index|eieio--slot-override|eieio--validate-class-slot-value|eieio--validate-slot-value|eieio-change-class|eieio-class-slots|eieio-default-superclass--eieio-childp|eieio-defclass-internal|eieio-make-child-predicate|eieio-make-class-predicate|eieio-oref--anon-cmacro|eieio-pcase-slot-index-from-index-table|eieio-pcase-slot-index-table|eieio-slot-descriptor-name|eldoc--supported-p|eldoc-docstring-format-sym-doc|eldoc-mode-set-explicitly|electric-pair--balance-info|electric-pair--insert|electric-pair--inside-string-p|electric-pair--skip-whitespace|electric-pair--syntax-ppss|electric-pair--unbalanced-strings-p|electric-pair--with-uncached-syntax|electric-pair-conservative-inhibit|electric-pair-default-inhibit|electric-pair-default-skip-self|electric-pair-delete-pair|electric-pair-inhibit-if-helps-balance|electric-pair-local-mode|electric-pair-post-self-insert-function|electric-pair-skip-if-helps-balance|electric-pair-syntax-info|electric-pair-will-use-region|electric-quote-local-mode|electric-quote-mode|electric-quote-post-self-insert-function|elisp--font-lock-backslash|elisp--font-lock-flush-elisp-buffers|elisp--xref-backend|elisp--xref-make-xref|elisp-flymake--batch-compile-for-flymake|elisp-flymake--byte-compile-done|elisp-flymake-byte-compile|elisp-flymake-checkdoc|elisp-function-argstring|elisp-get-fnsym-args-string|elisp-get-var-docstring|elisp-load-path-roots|emacs-repository-version-git|enh-ruby-mode|epg-config--make-gpg-configuration|epg-config--make-gpgsm-configuration|epg-context-error-buffer--cmacro|epg-context-error-buffer|epg-find-configuration|erlang-compile|erlang-edoc-mode|erlang-find-tag-other-window|erlang-find-tag|erlang-mode|erlang-shell|erldoc-apropos|erldoc-browse-topic|erldoc-browse|erldoc-eldoc-function|etags--xref-backend|eval-expression-get-print-arguments|event-line-count|face-list-p|facemenu-set-charset|faces--attribute-at-point|faceup-clean-buffer|faceup-defexplainer|faceup-render-view-buffer|faceup-view-buffer|faceup-write-file|fic-mode|file-attribute-access-time|file-attribute-collect|file-attribute-device-number|file-attribute-group-id|file-attribute-inode-number|file-attribute-link-number|file-attribute-modes|file-attribute-modification-time|file-attribute-size|file-attribute-status-change-time|file-attribute-type|file-attribute-user-id|file-local-name|file-name-case-insensitive-p|file-name-quoted-p|file-name-quote|file-name-unquote|file-system-info|filepos-to-bufferpos--dos|filepos-to-bufferpos|files--ask-user-about-large-file|files--ensure-directory|files--force|files--make-magic-temp-file|files--message|files--name-absolute-system-p|files--splice-dirname-file|fill-polish-nobreak-p|find-function-on-key-other-frame|find-function-on-key-other-window|find-library-other-frame|find-library-other-window|fixnump|flymake-cc|flymake-diag-region|flymake-diagnostics|flymake-make-diagnostic|follow-scroll-down-window|follow-scroll-up-window|font-lock--remove-face-from-text-property|form-feed-mode|format-message|forth-block-mode|forth-eval-defun|forth-eval-last-expression-display-output|forth-eval-last-expression|forth-eval-region|forth-eval|forth-interaction-send|forth-kill|forth-load-file|forth-mode|forth-restart|forth-see|forth-switch-to-output-buffer|forth-switch-to-source-buffer|forth-words|fortune-message|forward-to-word|forward-word-strictly|frame--size-history|frame-after-make-frame|frame-ancestor-p|frame-creation-function|frame-edges|frame-focus-state|frame-geometry|frame-inner-height|frame-inner-width|frame-internal-border-width|frame-list-z-order|frame-monitor-attribute|frame-monitor-geometry|frame-monitor-workarea|frame-native-height|frame-native-width|frame-outer-height|frame-outer-width|frame-parent|frame-position|frame-restack|frame-size-changed-p|func-arity|generic--normalize-comments|generic-bracket-support|generic-mode-set-comments|generic-set-comment-syntax|generic-set-comment-vars|get-variable-watchers|gfm-mode|gfm-view-mode|ghc-core-create-core|ghc-core-mode|ghci-script-mode|git-commit--save-and-exit|git-commit-ack|git-commit-cc|git-commit-committer-email|git-commit-committer-name|git-commit-commit|git-commit-find-pseudo-header-position|git-commit-first-env-var|git-commit-font-lock-diff|git-commit-git-config-var|git-commit-insert-header-as-self|git-commit-insert-header|git-commit-mode|git-commit-reported|git-commit-review|git-commit-signoff|git-commit-test|git-define-git-commit-self|git-define-git-commit|gitattributes-mode--highlight-1st-field|gitattributes-mode-backward-field|gitattributes-mode-eldoc|gitattributes-mode-forward-field|gitattributes-mode-help|gitattributes-mode-menu|gitattributes-mode|gitconfig-indent-line|gitconfig-indentation-string|gitconfig-line-indented-p|gitconfig-mode|gitconfig-point-in-indentation-p|gitignore-mode|global-aggressive-indent-mode-check-buffers|global-aggressive-indent-mode-cmhh|global-aggressive-indent-mode-enable-in-buffers|global-aggressive-indent-mode|global-display-line-numbers-mode|global-eldoc-mode-check-buffers|global-eldoc-mode-cmhh|global-eldoc-mode-enable-in-buffers|glsl-mode|gnutls-asynchronous-parameters|gnutls-ciphers|gnutls-digests|gnutls-hash-digest|gnutls-hash-mac|gnutls-macs|gnutls-symmetric-decrypt|gnutls-symmetric-encrypt|go-download-play|go-mode|godoc|gofmt-before-save|gui-backend-get-selection|gui-backend-selection-exists-p|gui-backend-selection-owner-p|gui-backend-set-selection|gv-delay-error|gv-setter|gv-synthetic-place|hack-connection-local-variables-apply|handle-args-function|handle-move-frame|hash-table-empty-p|haskell-align-imports|haskell-c2hs-mode|haskell-cabal-get-dir|haskell-cabal-get-field|haskell-cabal-mode|haskell-cabal-visit-file|haskell-collapse-mode|haskell-compile|haskell-completions-completion-at-point|haskell-decl-scan-mode|haskell-describe|haskell-doc-current-info|haskell-doc-mode|haskell-doc-show-type|haskell-ds-create-imenu-index|haskell-forward-sexp|haskell-hayoo|haskell-hoogle-lookup-from-local|haskell-hoogle|haskell-indent-mode|haskell-indentation-mode|haskell-interactive-bring|haskell-interactive-kill|haskell-interactive-mode-echo|haskell-interactive-mode-reset-error|haskell-interactive-mode-return|haskell-interactive-mode-visit-error|haskell-interactive-switch|haskell-kill-session-process|haskell-menu|haskell-mode-after-save-handler|haskell-mode-find-uses|haskell-mode-generate-tags|haskell-mode-goto-loc|haskell-mode-jump-to-def-or-tag|haskell-mode-jump-to-def|haskell-mode-jump-to-tag|haskell-mode-show-type-at)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(haskell-mode-stylish-buffer|haskell-mode-tag-find|haskell-mode-view-news|haskell-mode|haskell-move-nested-left|haskell-move-nested-right|haskell-move-nested|haskell-navigate-imports-go|haskell-navigate-imports-return|haskell-navigate-imports|haskell-process-cabal-build|haskell-process-cabal-macros|haskell-process-cabal|haskell-process-cd|haskell-process-clear|haskell-process-do-info|haskell-process-do-type|haskell-process-interrupt|haskell-process-load-file|haskell-process-load-or-reload|haskell-process-minimal-imports|haskell-process-reload-devel-main|haskell-process-reload-file|haskell-process-reload|haskell-process-restart|haskell-process-show-repl-response|haskell-process-unignore|haskell-rgrep|haskell-session-all-modules|haskell-session-change-target|haskell-session-change|haskell-session-installed-modules|haskell-session-kill|haskell-session-maybe|haskell-session-process|haskell-session-project-modules|haskell-session|haskell-sort-imports|haskell-tab-indent-mode|haskell-version|hayoo|help--analyze-key|help--binding-undefined-p|help--docstring-quote|help--filter-info-list|help--load-prefixes|help--loaded-p|help--make-usage-docstring|help--make-usage|help--read-key-sequence|help--symbol-completion-table|help-definition-prefixes|help-fns--analyze-function|help-fns-function-description-header|help-fns-short-filename|highlight-uses-mode|hoogle|hyperspec-lookup|ibuffer-jump|ido-dired-other-frame|ido-dired-other-window|ido-display-buffer-other-frame|ido-find-alternate-file-other-window|if-let\\*|image-dired-minor-mode|image-mode-to-text|indent--default-inside-comment|indent--funcall-widened|indent-region-line-by-line|indent-relative-first-indent-point|inferior-erlang|inferior-lfe-mode|inferior-lfe|ini-mode|insert-directory-clean|insert-directory-wildcard-in-dir-p|interactive-haskell-mode|internal--compiler-macro-cXXr|internal--syntax-propertize|internal-auto-fill|internal-default-interrupt-process|internal-echo-keystrokes-prefix|internal-handle-focus-in|isearch--describe-regexp-mode|isearch--describe-word-mode|isearch--lax-regexp-function-p|isearch--momentary-message|isearch--yank-char-or-syntax|isearch-define-mode-toggle|isearch-lazy-highlight-start|isearch-string-propertize|isearch-toggle-char-fold|isearch-update-from-string-properties|isearch-xterm-paste|isearch-yank-symbol-or-char|jison-mode|jit-lock--run-functions|js-jsx-mode|js2-highlight-unused-variables-mode|js2-imenu-extras-mode|js2-imenu-extras-setup|js2-jsx-mode|js2-minor-mode|js2-mode|json--check-position|json--decode-utf-16-surrogates|json--plist-reverse|json--plist-to-alist|json--record-path|json-advance--inliner|json-path-to-position|json-peek--inliner|json-pop--inliner|json-pretty-print-buffer-ordered|json-pretty-print-ordered|json-readtable-dispatch|json-skip-whitespace--inliner|kill-current-buffer|kmacro-keyboard-macro-p|kmacro-p|kqueue-add-watch|kqueue-rm-watch|kqueue-valid-p|langdoc-call-fun|langdoc-define-help-mode|langdoc-if-let|langdoc-insert-link|langdoc-matched-strings|langdoc-while-let|lcms-cam02-ucs|lcms-cie-de2000|lcms-jab->jch|lcms-jch->jab|lcms-jch->xyz|lcms-temp->white-point|lcms-xyz->jch|lcms2-available-p|less-css-mode|let-when-compile|lfe-indent-function|lfe-mode|lgstring-remove-glyph|libxml-available-p|line-number-display-width|lisp--el-match-keyword|lisp--el-non-funcall-position-p|lisp-adaptive-fill|lisp-indent-calc-next|lisp-indent-initial-state|lisp-indent-region|lisp-indent-state-p--cmacro|lisp-indent-state-ppss--cmacro|lisp-indent-state-ppss-point--cmacro|lisp-indent-state-ppss-point|lisp-indent-state-ppss|lisp-indent-state-p|lisp-indent-state-stack--cmacro|lisp-indent-state-stack|lisp-ppss|list-timers|literate-haskell-mode|load-user-init-file|loadhist-unload-element|logcount|lread--substitute-object-in-subtree|macroexp-macroexpand|macroexp-parse-body|macrostep-c-mode-hook|macrostep-expand|macrostep-mode|major-mode-restore|major-mode-suspend|make-condition-variable|make-empty-file|make-finalizer|make-mutex|make-nearby-temp-file|make-pipe-process|make-process|make-record|make-temp-file-internal|make-thread|make-xref-elisp-location--cmacro|make-xref-elisp-location|make-yas--exit--cmacro|make-yas--exit|make-yas--field--cmacro|make-yas--field|make-yas--mirror--cmacro|make-yas--mirror|make-yas--snippet--cmacro|make-yas--snippet|make-yas--table--cmacro|make-yas--table|map--apply-alist|map--apply-array|map--apply-hash-table|map--do-alist|map--do-array|map--into-hash-table|map--make-pcase-bindings|map--make-pcase-patterns|map--pcase-macroexpander|map--put|map-apply|map-contains-key|map-copy|map-delete|map-do|map-elt|map-empty-p|map-every-p|map-filter|map-into|map-keys-apply|map-keys|map-length|map-let|map-merge-with|map-merge|map-nested-elt|map-pairs|map-put|map-remove|map-some|map-values-apply|map-values|mapbacktrace|mapp|mark-beginning-of-buffer|mark-end-of-buffer|markdown-live-preview-mode|markdown-mode|markdown-view-mode|mc-hide-unmatched-lines-mode|mc\\/add-cursor-on-click|mc\\/edit-beginnings-of-lines|mc\\/edit-ends-of-lines|mc\\/edit-lines|mc\\/insert-letters|mc\\/insert-numbers|mc\\/mark-all-dwim|mc\\/mark-all-in-region-regexp|mc\\/mark-all-in-region|mc\\/mark-all-like-this-dwim|mc\\/mark-all-like-this-in-defun|mc\\/mark-all-like-this|mc\\/mark-all-symbols-like-this-in-defun|mc\\/mark-all-symbols-like-this|mc\\/mark-all-words-like-this-in-defun|mc\\/mark-all-words-like-this|mc\\/mark-more-like-this-extended|mc\\/mark-next-like-this-word|mc\\/mark-next-like-this|mc\\/mark-next-lines|mc\\/mark-next-symbol-like-this|mc\\/mark-next-word-like-this|mc\\/mark-pop|mc\\/mark-previous-like-this-word|mc\\/mark-previous-like-this|mc\\/mark-previous-lines|mc\\/mark-previous-symbol-like-this|mc\\/mark-previous-word-like-this|mc\\/mark-sgml-tag-pair|mc\\/reverse-regions|mc\\/skip-to-next-like-this|mc\\/skip-to-previous-like-this|mc\\/sort-regions|mc\\/toggle-cursor-on-click|mc\\/unmark-next-like-this|mc\\/unmark-previous-like-this|mc\\/vertical-align-with-space|mc\\/vertical-align|menu-bar-bottom-and-right-window-divider|menu-bar-bottom-window-divider|menu-bar-display-line-numbers-mode|menu-bar-goto-uses-etags-p|menu-bar-no-window-divider|menu-bar-right-window-divider|menu-bar-window-divider-customize|mhtml-mode|midnight-mode|minibuffer-maybe-quote-filename|minibuffer-prompt-properties--setter|mm-images-in-region-p|mocha--get-callsite-name|mocha-attach-indium|mocha-check-debugger|mocha-compilation-filter|mocha-debug-at-point|mocha-debug-file|mocha-debug-project|mocha-debugger-get|mocha-debugger-name-p|mocha-debug|mocha-find-current-test|mocha-find-project-root|mocha-generate-command|mocha-list-of-strings-p|mocha-make-imenu-alist|mocha-opts-file|mocha-realgud:nodejs-attach|mocha-run|mocha-test-at-point|mocha-test-file|mocha-test-project|mocha-toggle-imenu-function|mocha-walk-up-to-it|mode-line-default-help-echo|module-function-p|module-load|mouse--click-1-maybe-follows-link|mouse-absolute-pixel-position|mouse-drag-and-drop-region|mouse-drag-bottom-edge|mouse-drag-bottom-left-corner|mouse-drag-bottom-right-corner|mouse-drag-frame|mouse-drag-left-edge|mouse-drag-right-edge|mouse-drag-top-edge|mouse-drag-top-left-corner|mouse-drag-top-right-corner|mouse-resize-frame|move-text--at-first-line-p)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(haskell-mode-stylish-buffer|haskell-mode-tag-find|haskell-mode-view-news|haskell-mode|haskell-move-nested-left|haskell-move-nested-right|haskell-move-nested|haskell-navigate-imports-go|haskell-navigate-imports-return|haskell-navigate-imports|haskell-process-cabal-build|haskell-process-cabal-macros|haskell-process-cabal|haskell-process-cd|haskell-process-clear|haskell-process-do-info|haskell-process-do-type|haskell-process-interrupt|haskell-process-load-file|haskell-process-load-or-reload|haskell-process-minimal-imports|haskell-process-reload-devel-main|haskell-process-reload-file|haskell-process-reload|haskell-process-restart|haskell-process-show-repl-response|haskell-process-unignore|haskell-rgrep|haskell-session-all-modules|haskell-session-change-target|haskell-session-change|haskell-session-installed-modules|haskell-session-kill|haskell-session-maybe|haskell-session-process|haskell-session-project-modules|haskell-session|haskell-sort-imports|haskell-tab-indent-mode|haskell-version|hayoo|help--analyze-key|help--binding-undefined-p|help--docstring-quote|help--filter-info-list|help--load-prefixes|help--loaded-p|help--make-usage-docstring|help--make-usage|help--read-key-sequence|help--symbol-completion-table|help-definition-prefixes|help-fns--analyze-function|help-fns-function-description-header|help-fns-short-filename|highlight-uses-mode|hoogle|hyperspec-lookup|ibuffer-jump|ido-dired-other-frame|ido-dired-other-window|ido-display-buffer-other-frame|ido-find-alternate-file-other-window|if-let\\*|image-dired-minor-mode|image-mode-to-text|indent--default-inside-comment|indent--funcall-widened|indent-region-line-by-line|indent-relative-first-indent-point|inferior-erlang|inferior-lfe-mode|inferior-lfe|ini-mode|insert-directory-clean|insert-directory-wildcard-in-dir-p|interactive-haskell-mode|internal--compiler-macro-cXXr|internal--syntax-propertize|internal-auto-fill|internal-default-interrupt-process|internal-echo-keystrokes-prefix|internal-handle-focus-in|isearch--describe-regexp-mode|isearch--describe-word-mode|isearch--lax-regexp-function-p|isearch--momentary-message|isearch--yank-char-or-syntax|isearch-define-mode-toggle|isearch-lazy-highlight-start|isearch-string-propertize|isearch-toggle-char-fold|isearch-update-from-string-properties|isearch-xterm-paste|isearch-yank-symbol-or-char|jison-mode|jit-lock--run-functions|js-jsx-mode|js2-highlight-unused-variables-mode|js2-imenu-extras-mode|js2-imenu-extras-setup|js2-jsx-mode|js2-minor-mode|js2-mode|json--check-position|json--decode-utf-16-surrogates|json--plist-reverse|json--plist-to-alist|json--record-path|json-advance--inliner|json-path-to-position|json-peek--inliner|json-pop--inliner|json-pretty-print-buffer-ordered|json-pretty-print-ordered|json-readtable-dispatch|json-skip-whitespace--inliner|kill-current-buffer|kmacro-keyboard-macro-p|kmacro-p|kqueue-add-watch|kqueue-rm-watch|kqueue-valid-p|langdoc-call-fun|langdoc-define-help-mode|langdoc-if-let|langdoc-insert-link|langdoc-matched-strings|langdoc-while-let|lcms-cam02-ucs|lcms-cie-de2000|lcms-jab->jch|lcms-jch->jab|lcms-jch->xyz|lcms-temp->white-point|lcms-xyz->jch|lcms2-available-p|less-css-mode|let-when-compile|lfe-indent-function|lfe-mode|lgstring-remove-glyph|libxml-available-p|line-number-display-width|lisp--el-match-keyword|lisp--el-non-funcall-position-p|lisp-adaptive-fill|lisp-indent-calc-next|lisp-indent-initial-state|lisp-indent-region|lisp-indent-state-p--cmacro|lisp-indent-state-ppss--cmacro|lisp-indent-state-ppss-point--cmacro|lisp-indent-state-ppss-point|lisp-indent-state-ppss|lisp-indent-state-p|lisp-indent-state-stack--cmacro|lisp-indent-state-stack|lisp-ppss|list-timers|literate-haskell-mode|load-user-init-file|loadhist-unload-element|logcount|lread--substitute-object-in-subtree|macroexp-macroexpand|macroexp-parse-body|macrostep-c-mode-hook|macrostep-expand|macrostep-mode|major-mode-restore|major-mode-suspend|make-condition-variable|make-empty-file|make-finalizer|make-mutex|make-nearby-temp-file|make-pipe-process|make-process|make-record|make-temp-file-internal|make-thread|make-xref-elisp-location--cmacro|make-xref-elisp-location|make-yas--exit--cmacro|make-yas--exit|make-yas--field--cmacro|make-yas--field|make-yas--mirror--cmacro|make-yas--mirror|make-yas--snippet--cmacro|make-yas--snippet|make-yas--table--cmacro|make-yas--table|map--apply-alist|map--apply-array|map--apply-hash-table|map--do-alist|map--do-array|map--into-hash-table|map--make-pcase-bindings|map--make-pcase-patterns|map--pcase-macroexpander|map--put|map-apply|map-contains-key|map-copy|map-delete|map-do|map-elt|map-empty-p|map-every-p|map-filter|map-into|map-keys-apply|map-keys|map-length|map-let|map-merge-with|map-merge|map-nested-elt|map-pairs|map-put|map-remove|map-some|map-values-apply|map-values|mapbacktrace|mapp|mark-beginning-of-buffer|mark-end-of-buffer|markdown-live-preview-mode|markdown-mode|markdown-view-mode|mc-hide-unmatched-lines-mode|mc/add-cursor-on-click|mc/edit-beginnings-of-lines|mc/edit-ends-of-lines|mc/edit-lines|mc/insert-letters|mc/insert-numbers|mc/mark-all-dwim|mc/mark-all-in-region-regexp|mc/mark-all-in-region|mc/mark-all-like-this-dwim|mc/mark-all-like-this-in-defun|mc/mark-all-like-this|mc/mark-all-symbols-like-this-in-defun|mc/mark-all-symbols-like-this|mc/mark-all-words-like-this-in-defun|mc/mark-all-words-like-this|mc/mark-more-like-this-extended|mc/mark-next-like-this-word|mc/mark-next-like-this|mc/mark-next-lines|mc/mark-next-symbol-like-this|mc/mark-next-word-like-this|mc/mark-pop|mc/mark-previous-like-this-word|mc/mark-previous-like-this|mc/mark-previous-lines|mc/mark-previous-symbol-like-this|mc/mark-previous-word-like-this|mc/mark-sgml-tag-pair|mc/reverse-regions|mc/skip-to-next-like-this|mc/skip-to-previous-like-this|mc/sort-regions|mc/toggle-cursor-on-click|mc/unmark-next-like-this|mc/unmark-previous-like-this|mc/vertical-align-with-space|mc/vertical-align|menu-bar-bottom-and-right-window-divider|menu-bar-bottom-window-divider|menu-bar-display-line-numbers-mode|menu-bar-goto-uses-etags-p|menu-bar-no-window-divider|menu-bar-right-window-divider|menu-bar-window-divider-customize|mhtml-mode|midnight-mode|minibuffer-maybe-quote-filename|minibuffer-prompt-properties--setter|mm-images-in-region-p|mocha--get-callsite-name|mocha-attach-indium|mocha-check-debugger|mocha-compilation-filter|mocha-debug-at-point|mocha-debug-file|mocha-debug-project|mocha-debugger-get|mocha-debugger-name-p|mocha-debug|mocha-find-current-test|mocha-find-project-root|mocha-generate-command|mocha-list-of-strings-p|mocha-make-imenu-alist|mocha-opts-file|mocha-realgud:nodejs-attach|mocha-run|mocha-test-at-point|mocha-test-file|mocha-test-project|mocha-toggle-imenu-function|mocha-walk-up-to-it|mode-line-default-help-echo|module-function-p|module-load|mouse--click-1-maybe-follows-link|mouse-absolute-pixel-position|mouse-drag-and-drop-region|mouse-drag-bottom-edge|mouse-drag-bottom-left-corner|mouse-drag-bottom-right-corner|mouse-drag-frame|mouse-drag-left-edge|mouse-drag-right-edge|mouse-drag-top-edge|mouse-drag-top-left-corner|mouse-drag-top-right-corner|mouse-resize-frame|move-text--at-first-line-p)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(move-text--at-last-line-p|move-text--at-penultimate-line-p|move-text--last-line-is-just-newline|move-text--total-lines|move-text-default-bindings|move-text-down|move-text-line-down|move-text-line-up|move-text-region-down|move-text-region-up|move-text-region|move-text-up|move-to-window-group-line|mule--ucs-names-annotation|multiple-cursors-mode|mutex-lock|mutex-name|mutex-unlock|mutexp|nasm-mode|newlisp-mode|newlisp-show-repl|next-error-buffer-on-selected-frame|next-error-found|next-error-select-buffer|ninja-mode|obarray-get|obarray-make|obarray-map|obarray-put|obarray-remove|obarray-size|obarrayp|occur-regexp-descr|org-columns-insert-dblock|org-duration-from-minutes|org-duration-h:mm-only-p|org-duration-p|org-duration-set-regexps|org-duration-to-minutes|org-lint|package--activate-autoloads-and-load-path|package--add-to-compatibility-table|package--append-to-alist|package--autoloads-file-name|package--build-compatibility-table|package--check-signature-content|package--download-and-read-archives|package--find-non-dependencies|package--get-deps|package--incompatible-p|package--load-files-for-activation|package--newest-p|package--prettify-quick-help-key|package--print-help-section|package--quickstart-maybe-refresh|package--read-pkg-desc|package--removable-packages|package--remove-hidden|package--save-selected-packages|package--sort-by-dependence|package--sort-deps-in-alist|package--update-downloads-in-progress|package--update-selected-packages|package--used-elsewhere-p|package--user-installed-p|package--user-selected-p|package--with-response-buffer|package-activate-all|package-archive-priority|package-autoremove|package-delete-button-action|package-desc-priority-version|package-desc-priority|package-dir-info|package-install-selected-packages|package-menu--find-and-notify-upgrades|package-menu--list-to-prompt|package-menu--mark-or-notify-upgrades|package-menu--mark-upgrades-1|package-menu--partition-transaction|package-menu--perform-transaction|package-menu--populate-new-package-list|package-menu--post-refresh|package-menu--print-info-simple|package-menu--prompt-transaction-p|package-menu-hide-package|package-menu-mode-menu|package-menu-toggle-hiding|package-quickstart-refresh|package-reinstall|pcase--edebug-match-macro|pcase--make-docstring|pcase-lambda|pcomplete\\/find|perl-flymake|picolisp-mode|picolisp-repl-mode|picolisp-repl|pixel-scroll-mode|pos-visible-in-window-group-p|pov-mode|powershell-mode|powershell|prefix-command-preserve-state|prefix-command-update|prettify-symbols--post-command-hook|prettify-symbols-default-compose-p|print--preprocess|process-thread|prog-first-column|project-current|project-find-file|project-find-regexp|project-or-external-find-file|project-or-external-find-regexp|proper-list-p|provided-mode-derived-p|pulse-momentary-highlight-one-line|pulse-momentary-highlight-region|quelpa|query-replace--split-string|radix-tree--insert|radix-tree--lookup|radix-tree--prefixes|radix-tree--remove|radix-tree--subtree|radix-tree-count|radix-tree-from-map|radix-tree-insert|radix-tree-iter-mappings|radix-tree-iter-subtrees|radix-tree-leaf--pcase-macroexpander|radix-tree-lookup|radix-tree-prefixes|radix-tree-subtree|read-answer|read-multiple-choice|readable-foreground-color|recenter-window-group|recentf-mode|recode-file-name|recode-region|record-window-buffer|recordp|record|recover-file|recover-session-finish|recover-session|recover-this-file|rectangle-mark-mode|rectangle-number-lines|rectangular-region-mode|redirect-debugging-output|redisplay--pre-redisplay-functions|redisplay--update-region-highlight|redraw-modeline|refill-mode|reftex-all-document-files|reftex-citation|reftex-index-phrases-mode|reftex-isearch-minor-mode|reftex-mode|reftex-reset-scanning-information|regexp-builder|regexp-opt-group|region-active-p|region-bounds|region-modifiable-p|region-noncontiguous-p|register-ccl-program|register-code-conversion-map|register-definition-prefixes|register-describe-oneline|register-input-method|register-preview-default|register-preview|register-swap-out|register-to-point|register-val-describe|register-val-insert|register-val-jump-to|registerv--make--cmacro|registerv--make|registerv-data--cmacro|registerv-data|registerv-insert-func--cmacro|registerv-insert-func|registerv-jump-func--cmacro|registerv-jump-func|registerv-make|registerv-p--cmacro|registerv-print-func--cmacro|registerv-print-func|registerv-p|remember-clipboard|remember-diary-extract-entries|remember-notes|remember-other-frame|remember|remove-variable-watcher|remove-yank-excluded-properties|rename-uniquely|repeat-complex-command|repeat-matching-complex-command|repeat|replace--push-stack|replace-buffer-contents|replace-dehighlight|replace-eval-replacement|replace-highlight|replace-loop-through-replacements|replace-match-data|replace-match-maybe-edit|replace-match-string-symbols|replace-quote|replace-rectangle|replace-regexp|replace-search|replace-string|report-emacs-bug|report-errors|reporter-submit-bug-report|reposition-window|repunctuate-sentences|reset-language-environment|reset-this-command-lengths|resize-mini-window-internal|resize-temp-buffer-window|reveal-mode|reverse-region|revert-buffer--default|revert-buffer-insert-file-contents--default-function|revert-buffer-with-coding-system|rfc2104-hash|rfc822-goto-eoh|rfn-eshadow-setup-minibuffer|rfn-eshadow-sifn-equal|rfn-eshadow-update-overlay|rgrep|right-char|right-word|rlogin|rmail-input|rmail-mode|rmail-movemail-variant-p|rmail-output-as-seen|run-erlang|run-forth|run-haskell|run-lfe|run-newlisp|run-sml|rust-mode|rx--pcase-macroexpander|save-mark-and-excursion--restore|save-mark-and-excursion--save|save-mark-and-excursion|save-place-local-mode|save-place-mode|scad-mode|search-forward-help-for-help|secondary-selection-exist-p|secondary-selection-from-region|secondary-selection-to-region|secure-hash-algorithms|sed-mode|selected-window-group|seq--activate-font-lock-keywords|seq--elt-safe|seq--into-list|seq--into-string|seq--into-vector|seq--make-pcase-bindings|seq--make-pcase-patterns|seq--pcase-macroexpander|seq-contains|seq-difference|seq-do-indexed|seq-find|seq-group-by|seq-intersection|seq-into-sequence|seq-into|seq-let|seq-map-indexed|seq-mapcat|seq-mapn|seq-max|seq-min|seq-partition|seq-position|seq-random-elt|seq-set-equal-p|seq-some|seq-sort-by|seqp|set--this-command-keys|set-binary-mode|set-buffer-redisplay|set-mouse-absolute-pixel-position|set-process-thread|set-rectangular-region-anchor|set-window-group-start|shell-command--save-pos-or-erase|shell-command--set-point-after-cmd|shift-number-down|shift-number-up|slime-connect|slime-lisp-mode-hook|slime-mode|slime-scheme-mode-hook|slime-selector|slime-setup|slime|smerge-refine-regions|sml-cm-mode|sml-lex-mode|sml-mode|sml-run|sml-yacc-mode|snippet-mode|spice-mode|split-window-no-error|sql-mariadb|ssh-authorized-keys-mode|ssh-config-mode|ssh-known-hosts-mode|startup--setup-quote-display|string-distance|string-greaterp|string-version-lessp|string>|subr--with-wrapper-hook-no-warnings|switch-to-haskell|sxhash-eql|sxhash-equal|sxhash-eq|syntax-ppss--data)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(move-text--at-last-line-p|move-text--at-penultimate-line-p|move-text--last-line-is-just-newline|move-text--total-lines|move-text-default-bindings|move-text-down|move-text-line-down|move-text-line-up|move-text-region-down|move-text-region-up|move-text-region|move-text-up|move-to-window-group-line|mule--ucs-names-annotation|multiple-cursors-mode|mutex-lock|mutex-name|mutex-unlock|mutexp|nasm-mode|newlisp-mode|newlisp-show-repl|next-error-buffer-on-selected-frame|next-error-found|next-error-select-buffer|ninja-mode|obarray-get|obarray-make|obarray-map|obarray-put|obarray-remove|obarray-size|obarrayp|occur-regexp-descr|org-columns-insert-dblock|org-duration-from-minutes|org-duration-h:mm-only-p|org-duration-p|org-duration-set-regexps|org-duration-to-minutes|org-lint|package--activate-autoloads-and-load-path|package--add-to-compatibility-table|package--append-to-alist|package--autoloads-file-name|package--build-compatibility-table|package--check-signature-content|package--download-and-read-archives|package--find-non-dependencies|package--get-deps|package--incompatible-p|package--load-files-for-activation|package--newest-p|package--prettify-quick-help-key|package--print-help-section|package--quickstart-maybe-refresh|package--read-pkg-desc|package--removable-packages|package--remove-hidden|package--save-selected-packages|package--sort-by-dependence|package--sort-deps-in-alist|package--update-downloads-in-progress|package--update-selected-packages|package--used-elsewhere-p|package--user-installed-p|package--user-selected-p|package--with-response-buffer|package-activate-all|package-archive-priority|package-autoremove|package-delete-button-action|package-desc-priority-version|package-desc-priority|package-dir-info|package-install-selected-packages|package-menu--find-and-notify-upgrades|package-menu--list-to-prompt|package-menu--mark-or-notify-upgrades|package-menu--mark-upgrades-1|package-menu--partition-transaction|package-menu--perform-transaction|package-menu--populate-new-package-list|package-menu--post-refresh|package-menu--print-info-simple|package-menu--prompt-transaction-p|package-menu-hide-package|package-menu-mode-menu|package-menu-toggle-hiding|package-quickstart-refresh|package-reinstall|pcase--edebug-match-macro|pcase--make-docstring|pcase-lambda|pcomplete/find|perl-flymake|picolisp-mode|picolisp-repl-mode|picolisp-repl|pixel-scroll-mode|pos-visible-in-window-group-p|pov-mode|powershell-mode|powershell|prefix-command-preserve-state|prefix-command-update|prettify-symbols--post-command-hook|prettify-symbols-default-compose-p|print--preprocess|process-thread|prog-first-column|project-current|project-find-file|project-find-regexp|project-or-external-find-file|project-or-external-find-regexp|proper-list-p|provided-mode-derived-p|pulse-momentary-highlight-one-line|pulse-momentary-highlight-region|quelpa|query-replace--split-string|radix-tree--insert|radix-tree--lookup|radix-tree--prefixes|radix-tree--remove|radix-tree--subtree|radix-tree-count|radix-tree-from-map|radix-tree-insert|radix-tree-iter-mappings|radix-tree-iter-subtrees|radix-tree-leaf--pcase-macroexpander|radix-tree-lookup|radix-tree-prefixes|radix-tree-subtree|read-answer|read-multiple-choice|readable-foreground-color|recenter-window-group|recentf-mode|recode-file-name|recode-region|record-window-buffer|recordp|record|recover-file|recover-session-finish|recover-session|recover-this-file|rectangle-mark-mode|rectangle-number-lines|rectangular-region-mode|redirect-debugging-output|redisplay--pre-redisplay-functions|redisplay--update-region-highlight|redraw-modeline|refill-mode|reftex-all-document-files|reftex-citation|reftex-index-phrases-mode|reftex-isearch-minor-mode|reftex-mode|reftex-reset-scanning-information|regexp-builder|regexp-opt-group|region-active-p|region-bounds|region-modifiable-p|region-noncontiguous-p|register-ccl-program|register-code-conversion-map|register-definition-prefixes|register-describe-oneline|register-input-method|register-preview-default|register-preview|register-swap-out|register-to-point|register-val-describe|register-val-insert|register-val-jump-to|registerv--make--cmacro|registerv--make|registerv-data--cmacro|registerv-data|registerv-insert-func--cmacro|registerv-insert-func|registerv-jump-func--cmacro|registerv-jump-func|registerv-make|registerv-p--cmacro|registerv-print-func--cmacro|registerv-print-func|registerv-p|remember-clipboard|remember-diary-extract-entries|remember-notes|remember-other-frame|remember|remove-variable-watcher|remove-yank-excluded-properties|rename-uniquely|repeat-complex-command|repeat-matching-complex-command|repeat|replace--push-stack|replace-buffer-contents|replace-dehighlight|replace-eval-replacement|replace-highlight|replace-loop-through-replacements|replace-match-data|replace-match-maybe-edit|replace-match-string-symbols|replace-quote|replace-rectangle|replace-regexp|replace-search|replace-string|report-emacs-bug|report-errors|reporter-submit-bug-report|reposition-window|repunctuate-sentences|reset-language-environment|reset-this-command-lengths|resize-mini-window-internal|resize-temp-buffer-window|reveal-mode|reverse-region|revert-buffer--default|revert-buffer-insert-file-contents--default-function|revert-buffer-with-coding-system|rfc2104-hash|rfc822-goto-eoh|rfn-eshadow-setup-minibuffer|rfn-eshadow-sifn-equal|rfn-eshadow-update-overlay|rgrep|right-char|right-word|rlogin|rmail-input|rmail-mode|rmail-movemail-variant-p|rmail-output-as-seen|run-erlang|run-forth|run-haskell|run-lfe|run-newlisp|run-sml|rust-mode|rx--pcase-macroexpander|save-mark-and-excursion--restore|save-mark-and-excursion--save|save-mark-and-excursion|save-place-local-mode|save-place-mode|scad-mode|search-forward-help-for-help|secondary-selection-exist-p|secondary-selection-from-region|secondary-selection-to-region|secure-hash-algorithms|sed-mode|selected-window-group|seq--activate-font-lock-keywords|seq--elt-safe|seq--into-list|seq--into-string|seq--into-vector|seq--make-pcase-bindings|seq--make-pcase-patterns|seq--pcase-macroexpander|seq-contains|seq-difference|seq-do-indexed|seq-find|seq-group-by|seq-intersection|seq-into-sequence|seq-into|seq-let|seq-map-indexed|seq-mapcat|seq-mapn|seq-max|seq-min|seq-partition|seq-position|seq-random-elt|seq-set-equal-p|seq-some|seq-sort-by|seqp|set--this-command-keys|set-binary-mode|set-buffer-redisplay|set-mouse-absolute-pixel-position|set-process-thread|set-rectangular-region-anchor|set-window-group-start|shell-command--save-pos-or-erase|shell-command--set-point-after-cmd|shift-number-down|shift-number-up|slime-connect|slime-lisp-mode-hook|slime-mode|slime-scheme-mode-hook|slime-selector|slime-setup|slime|smerge-refine-regions|sml-cm-mode|sml-lex-mode|sml-mode|sml-run|sml-yacc-mode|snippet-mode|spice-mode|split-window-no-error|sql-mariadb|ssh-authorized-keys-mode|ssh-config-mode|ssh-known-hosts-mode|startup--setup-quote-display|string-distance|string-greaterp|string-version-lessp|string>|subr--with-wrapper-hook-no-warnings|switch-to-haskell|sxhash-eql|sxhash-equal|sxhash-eq|syntax-ppss--data)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1046,7 +1046,7 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(yas--mark-this-and-children-modified|yas--markers-to-points|yas--maybe-clear-field-filter|yas--maybe-expand-from-keymap-filter|yas--maybe-expand-key-filter|yas--maybe-move-to-active-field|yas--menu-keymap-get-create|yas--message|yas--minor-mode-menu|yas--mirror-depth--cmacro|yas--mirror-depth|yas--mirror-end--cmacro|yas--mirror-end|yas--mirror-next--cmacro|yas--mirror-next|yas--mirror-p--cmacro|yas--mirror-parent-field--cmacro|yas--mirror-parent-field|yas--mirror-p|yas--mirror-start--cmacro|yas--mirror-start|yas--mirror-transform--cmacro|yas--mirror-transform|yas--mirror-update-display|yas--modes-to-activate|yas--move-to-field|yas--namehash-templates-alist|yas--on-buffer-kill|yas--on-field-overlay-modification|yas--on-protection-overlay-modification|yas--parse-template|yas--place-overlays|yas--points-to-markers|yas--post-command-handler|yas--prepare-snippets-for-move|yas--prompt-for-keys|yas--prompt-for-table|yas--prompt-for-template|yas--protect-escapes|yas--read-keybinding|yas--read-lisp|yas--read-table|yas--remove-misc-free-from-undo|yas--remove-template-by-uuid|yas--replace-all|yas--require-template-specific-condition-p|yas--restore-backquotes|yas--restore-escapes|yas--restore-marker-location|yas--restore-overlay-line-location|yas--restore-overlay-location|yas--safely-call-fun|yas--safely-run-hook|yas--save-backquotes|yas--save-restriction-and-widen|yas--scan-sexps|yas--schedule-jit|yas--show-menu-p|yas--simple-fom-create|yas--skip-and-clear-field-p|yas--skip-and-clear|yas--snapshot-marker-location|yas--snapshot-overlay-line-location|yas--snapshot-overlay-location|yas--snippet-active-field--cmacro|yas--snippet-active-field|yas--snippet-control-overlay--cmacro|yas--snippet-control-overlay|yas--snippet-create|yas--snippet-description-finish-runonce|yas--snippet-exit--cmacro|yas--snippet-exit|yas--snippet-expand-env--cmacro|yas--snippet-expand-env|yas--snippet-field-compare|yas--snippet-fields--cmacro|yas--snippet-fields|yas--snippet-find-field|yas--snippet-force-exit--cmacro|yas--snippet-force-exit|yas--snippet-id--cmacro|yas--snippet-id|yas--snippet-live-p|yas--snippet-map-markers|yas--snippet-next-id|yas--snippet-p--cmacro|yas--snippet-parse-create|yas--snippet-previous-active-field--cmacro|yas--snippet-previous-active-field|yas--snippet-p|yas--snippet-revive|yas--snippet-sort-fields|yas--snippets-at-point|yas--subdirs|yas--table-all-keys|yas--table-direct-keymap--cmacro|yas--table-direct-keymap|yas--table-get-create|yas--table-hash--cmacro|yas--table-hash|yas--table-mode|yas--table-name--cmacro|yas--table-name|yas--table-p--cmacro|yas--table-parents--cmacro|yas--table-parents|yas--table-p|yas--table-templates|yas--table-uuidhash--cmacro|yas--table-uuidhash|yas--take-care-of-redo|yas--template-can-expand-p|yas--template-condition--cmacro|yas--template-condition|yas--template-content--cmacro|yas--template-content|yas--template-expand-env--cmacro|yas--template-expand-env|yas--template-fine-group|yas--template-get-file|yas--template-group--cmacro|yas--template-group|yas--template-key--cmacro|yas--template-keybinding--cmacro|yas--template-keybinding|yas--template-key|yas--template-load-file--cmacro|yas--template-load-file|yas--template-menu-binding-pair--cmacro|yas--template-menu-binding-pair-get-create|yas--template-menu-binding-pair|yas--template-menu-managed-by-yas-define-menu|yas--template-name--cmacro|yas--template-name|yas--template-p--cmacro|yas--template-perm-group--cmacro|yas--template-perm-group|yas--template-pretty-list|yas--template-p|yas--template-save-file--cmacro|yas--template-save-file|yas--template-table--cmacro|yas--template-table|yas--template-uuid--cmacro|yas--template-uuid|yas--templates-for-key-at-point|yas--transform-mirror-parse-create|yas--undo-in-progress|yas--update-mirrors|yas--update-template-menu|yas--update-template|yas--visit-snippet-file-1|yas--warning|yas--watch-auto-fill|yas-abort-snippet|yas-about|yas-activate-extra-mode|yas-active-keys|yas-active-snippets|yas-auto-next|yas-choose-value|yas-compile-directory|yas-completing-prompt|yas-current-field|yas-deactivate-extra-mode|yas-default-from-field|yas-define-condition-cache|yas-define-menu|yas-define-snippets|yas-describe-table-by-namehash|yas-describe-tables|yas-direct-keymaps-reload|yas-dropdown-prompt|yas-escape-text|yas-exit-all-snippets|yas-exit-snippet|yas-expand-from-keymap|yas-expand-from-trigger-key|yas-expand-snippet|yas-expand|yas-field-value|yas-global-mode-check-buffers|yas-global-mode-cmhh|yas-global-mode-enable-in-buffers|yas-global-mode|yas-hippie-try-expand|yas-ido-prompt|yas-initialize|yas-insert-snippet|yas-inside-string|yas-key-to-value|yas-load-directory|yas-load-snippet-buffer-and-close|yas-load-snippet-buffer|yas-longest-key-from-whitespace|yas-lookup-snippet|yas-maybe-ido-prompt|yas-maybe-load-snippet-buffer|yas-minor-mode-on|yas-minor-mode-set-explicitly|yas-minor-mode|yas-new-snippet|yas-next-field-or-maybe-expand|yas-next-field-will-exit-p|yas-next-field|yas-no-prompt|yas-prev-field|yas-recompile-all|yas-reload-all|yas-selected-text|yas-shortest-key-until-whitespace|yas-skip-and-clear-field|yas-skip-and-clear-or-delete-char|yas-snippet-dirs|yas-snippet-mode-buffer-p|yas-substr|yas-text|yas-throw|yas-try-key-from-whitespace|yas-tryout-snippet|yas-unimplemented|yas-verify-value|yas-visit-snippet-file|yas-x-prompt|yas\\/abort-snippet|yas\\/about|yas\\/choose-value|yas\\/compile-directory|yas\\/completing-prompt|yas\\/default-from-field|yas\\/define-condition-cache|yas\\/define-menu|yas\\/define-snippets|yas\\/describe-tables|yas\\/direct-keymaps-reload|yas\\/dropdown-prompt|yas\\/exit-all-snippets|yas\\/exit-snippet|yas\\/expand-from-keymap|yas\\/expand-from-trigger-key|yas\\/expand-snippet|yas\\/expand|yas\\/field-value|yas\\/global-mode|yas\\/hippie-try-expand|yas\\/ido-prompt|yas\\/initialize|yas\\/insert-snippet|yas\\/inside-string|yas\\/key-to-value|yas\\/load-directory|yas\\/load-snippet-buffer|yas\\/minor-mode-on|yas\\/minor-mode|yas\\/new-snippet|yas\\/next-field-or-maybe-expand|yas\\/next-field|yas\\/no-prompt|yas\\/prev-field|yas\\/recompile-all|yas\\/reload-all|yas\\/selected-text|yas\\/skip-and-clear-or-delete-char|yas\\/snippet-dirs|yas\\/substr|yas\\/text|yas\\/throw|yas\\/tryout-snippet|yas\\/unimplemented|yas\\/verify-value|yas\\/visit-snippet-file|yas\\/x-prompt|yasnippet-unload-function|zap-up-to-char)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(yas--mark-this-and-children-modified|yas--markers-to-points|yas--maybe-clear-field-filter|yas--maybe-expand-from-keymap-filter|yas--maybe-expand-key-filter|yas--maybe-move-to-active-field|yas--menu-keymap-get-create|yas--message|yas--minor-mode-menu|yas--mirror-depth--cmacro|yas--mirror-depth|yas--mirror-end--cmacro|yas--mirror-end|yas--mirror-next--cmacro|yas--mirror-next|yas--mirror-p--cmacro|yas--mirror-parent-field--cmacro|yas--mirror-parent-field|yas--mirror-p|yas--mirror-start--cmacro|yas--mirror-start|yas--mirror-transform--cmacro|yas--mirror-transform|yas--mirror-update-display|yas--modes-to-activate|yas--move-to-field|yas--namehash-templates-alist|yas--on-buffer-kill|yas--on-field-overlay-modification|yas--on-protection-overlay-modification|yas--parse-template|yas--place-overlays|yas--points-to-markers|yas--post-command-handler|yas--prepare-snippets-for-move|yas--prompt-for-keys|yas--prompt-for-table|yas--prompt-for-template|yas--protect-escapes|yas--read-keybinding|yas--read-lisp|yas--read-table|yas--remove-misc-free-from-undo|yas--remove-template-by-uuid|yas--replace-all|yas--require-template-specific-condition-p|yas--restore-backquotes|yas--restore-escapes|yas--restore-marker-location|yas--restore-overlay-line-location|yas--restore-overlay-location|yas--safely-call-fun|yas--safely-run-hook|yas--save-backquotes|yas--save-restriction-and-widen|yas--scan-sexps|yas--schedule-jit|yas--show-menu-p|yas--simple-fom-create|yas--skip-and-clear-field-p|yas--skip-and-clear|yas--snapshot-marker-location|yas--snapshot-overlay-line-location|yas--snapshot-overlay-location|yas--snippet-active-field--cmacro|yas--snippet-active-field|yas--snippet-control-overlay--cmacro|yas--snippet-control-overlay|yas--snippet-create|yas--snippet-description-finish-runonce|yas--snippet-exit--cmacro|yas--snippet-exit|yas--snippet-expand-env--cmacro|yas--snippet-expand-env|yas--snippet-field-compare|yas--snippet-fields--cmacro|yas--snippet-fields|yas--snippet-find-field|yas--snippet-force-exit--cmacro|yas--snippet-force-exit|yas--snippet-id--cmacro|yas--snippet-id|yas--snippet-live-p|yas--snippet-map-markers|yas--snippet-next-id|yas--snippet-p--cmacro|yas--snippet-parse-create|yas--snippet-previous-active-field--cmacro|yas--snippet-previous-active-field|yas--snippet-p|yas--snippet-revive|yas--snippet-sort-fields|yas--snippets-at-point|yas--subdirs|yas--table-all-keys|yas--table-direct-keymap--cmacro|yas--table-direct-keymap|yas--table-get-create|yas--table-hash--cmacro|yas--table-hash|yas--table-mode|yas--table-name--cmacro|yas--table-name|yas--table-p--cmacro|yas--table-parents--cmacro|yas--table-parents|yas--table-p|yas--table-templates|yas--table-uuidhash--cmacro|yas--table-uuidhash|yas--take-care-of-redo|yas--template-can-expand-p|yas--template-condition--cmacro|yas--template-condition|yas--template-content--cmacro|yas--template-content|yas--template-expand-env--cmacro|yas--template-expand-env|yas--template-fine-group|yas--template-get-file|yas--template-group--cmacro|yas--template-group|yas--template-key--cmacro|yas--template-keybinding--cmacro|yas--template-keybinding|yas--template-key|yas--template-load-file--cmacro|yas--template-load-file|yas--template-menu-binding-pair--cmacro|yas--template-menu-binding-pair-get-create|yas--template-menu-binding-pair|yas--template-menu-managed-by-yas-define-menu|yas--template-name--cmacro|yas--template-name|yas--template-p--cmacro|yas--template-perm-group--cmacro|yas--template-perm-group|yas--template-pretty-list|yas--template-p|yas--template-save-file--cmacro|yas--template-save-file|yas--template-table--cmacro|yas--template-table|yas--template-uuid--cmacro|yas--template-uuid|yas--templates-for-key-at-point|yas--transform-mirror-parse-create|yas--undo-in-progress|yas--update-mirrors|yas--update-template-menu|yas--update-template|yas--visit-snippet-file-1|yas--warning|yas--watch-auto-fill|yas-abort-snippet|yas-about|yas-activate-extra-mode|yas-active-keys|yas-active-snippets|yas-auto-next|yas-choose-value|yas-compile-directory|yas-completing-prompt|yas-current-field|yas-deactivate-extra-mode|yas-default-from-field|yas-define-condition-cache|yas-define-menu|yas-define-snippets|yas-describe-table-by-namehash|yas-describe-tables|yas-direct-keymaps-reload|yas-dropdown-prompt|yas-escape-text|yas-exit-all-snippets|yas-exit-snippet|yas-expand-from-keymap|yas-expand-from-trigger-key|yas-expand-snippet|yas-expand|yas-field-value|yas-global-mode-check-buffers|yas-global-mode-cmhh|yas-global-mode-enable-in-buffers|yas-global-mode|yas-hippie-try-expand|yas-ido-prompt|yas-initialize|yas-insert-snippet|yas-inside-string|yas-key-to-value|yas-load-directory|yas-load-snippet-buffer-and-close|yas-load-snippet-buffer|yas-longest-key-from-whitespace|yas-lookup-snippet|yas-maybe-ido-prompt|yas-maybe-load-snippet-buffer|yas-minor-mode-on|yas-minor-mode-set-explicitly|yas-minor-mode|yas-new-snippet|yas-next-field-or-maybe-expand|yas-next-field-will-exit-p|yas-next-field|yas-no-prompt|yas-prev-field|yas-recompile-all|yas-reload-all|yas-selected-text|yas-shortest-key-until-whitespace|yas-skip-and-clear-field|yas-skip-and-clear-or-delete-char|yas-snippet-dirs|yas-snippet-mode-buffer-p|yas-substr|yas-text|yas-throw|yas-try-key-from-whitespace|yas-tryout-snippet|yas-unimplemented|yas-verify-value|yas-visit-snippet-file|yas-x-prompt|yas/abort-snippet|yas/about|yas/choose-value|yas/compile-directory|yas/completing-prompt|yas/default-from-field|yas/define-condition-cache|yas/define-menu|yas/define-snippets|yas/describe-tables|yas/direct-keymaps-reload|yas/dropdown-prompt|yas/exit-all-snippets|yas/exit-snippet|yas/expand-from-keymap|yas/expand-from-trigger-key|yas/expand-snippet|yas/expand|yas/field-value|yas/global-mode|yas/hippie-try-expand|yas/ido-prompt|yas/initialize|yas/insert-snippet|yas/inside-string|yas/key-to-value|yas/load-directory|yas/load-snippet-buffer|yas/minor-mode-on|yas/minor-mode|yas/new-snippet|yas/next-field-or-maybe-expand|yas/next-field|yas/no-prompt|yas/prev-field|yas/recompile-all|yas/reload-all|yas/selected-text|yas/skip-and-clear-or-delete-char|yas/snippet-dirs|yas/substr|yas/text|yas/throw|yas/tryout-snippet|yas/unimplemented|yas/verify-value|yas/visit-snippet-file|yas/x-prompt|yasnippet-unload-function|zap-up-to-char)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1078,10 +1078,10 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:ada-case-read-exceptions|ada-case|ada-change-prj|ada-check-current|ada-check-defun-name|ada-check-matching-start|ada-compile-application|ada-compile-current|ada-compile-goto-error|ada-compile-mouse-goto-error|ada-complete-identifier|ada-contextual-menu|ada-create-case-exception-substring|ada-create-case-exception|ada-create-keymap|ada-create-menu|ada-customize|ada-declare-block|ada-else|ada-elsif|ada-exception-block|ada-exception|ada-exit|ada-ff-other-window|ada-fill-comment-paragraph-justify|ada-fill-comment-paragraph-postfix|ada-fill-comment-paragraph|ada-find-any-references|ada-find-file|ada-find-local-references|ada-find-references|ada-find-src-file-in-dir|ada-for-loop|ada-format-paramlist|ada-function-spec|ada-gdb-application|ada-gen-treat-proc|ada-get-body-name|ada-get-current-indent|ada-get-indent-block-label|ada-get-indent-block-start|ada-get-indent-case|ada-get-indent-end|ada-get-indent-goto-label|ada-get-indent-if|ada-get-indent-loop|ada-get-indent-nochange|ada-get-indent-noindent|ada-get-indent-open-paren|ada-get-indent-paramlist|ada-get-indent-subprog|ada-get-indent-type|ada-get-indent-when|ada-gnat-style|ada-goto-decl-start|ada-goto-declaration-other-frame|ada-goto-declaration|ada-goto-matching-end|ada-goto-matching-start|ada-goto-next-non-ws|ada-goto-next-word|ada-goto-parent|ada-goto-previous-word|ada-goto-stmt-end|ada-goto-stmt-start|ada-header|ada-if|ada-in-comment-p|ada-in-decl-p|ada-in-numeric-literal-p|ada-in-open-paren-p|ada-in-paramlist-p|ada-in-string-or-comment-p|ada-in-string-p|ada-indent-current-function|ada-indent-current|ada-indent-newline-indent-conditional|ada-indent-newline-indent|ada-indent-on-previous-lines|ada-indent-region|ada-insert-paramlist|ada-justified-indent-current|ada-looking-at-semi-or|ada-looking-at-semi-private|ada-loop|ada-loose-case-word|ada-make-body-gnatstub|ada-make-body|ada-make-filename-from-adaname|ada-make-subprogram-body|ada-mode-menu|ada-mode-version|ada-mode|ada-move-to-end|ada-move-to-start|ada-narrow-to-defun|ada-next-package|ada-next-procedure|ada-no-auto-case|ada-other-file-name|ada-outline-level|ada-package-body|ada-package-spec|ada-point-and-xref|ada-popup-menu|ada-previous-package|ada-previous-procedure|ada-private|ada-prj-edit|ada-prj-new|ada-prj-save|ada-procedure-spec|ada-record|ada-region-selected|ada-remove-trailing-spaces|ada-reread-prj-file|ada-run-application|ada-save-exceptions-to-file|ada-scan-paramlist|ada-search-ignore-complex-boolean|ada-search-ignore-string-comment|ada-search-prev-end-stmt|ada-set-default-project-file|ada-set-main-compile-application|ada-set-point-accordingly|ada-show-current-main|ada-subprogram-body|ada-subtype|ada-tab-hard|ada-tab|ada-tabsize|ada-task-body|ada-task-spec|ada-type|ada-uncomment-region|ada-untab-hard|ada-untab|ada-use|ada-when|ada-which-function-are-we-in|ada-which-function|ada-while-loop|ada-with|ada-xref-goto-previous-reference|add-abbrev|add-change-log-entry-other-window|add-change-log-entry|add-completion-to-head|add-completion-to-tail-if-new|add-completion|add-completions-from-buffer|add-completions-from-c-buffer|add-completions-from-file|add-completions-from-lisp-buffer|add-completions-from-tags-table|add-dir-local-variable|add-file-local-variable-prop-line|add-file-local-variable|add-global-abbrev|add-log-current-defun|add-log-edit-next-comment|add-log-edit-prev-comment|add-log-file-name|add-log-iso8601-time-string|add-log-iso8601-time-zone|add-log-tcl-defun|add-minor-mode|add-mode-abbrev|add-new-page|add-permanent-completion|add-submenu|add-timeout|add-to-coding-system-list|add-to-list--anon-cmacro|addbib|adjoin|advertised-undo|advertised-widget-backward|advertised-xscheme-send-previous-expression|advice--add-function|advice--buffer-local|advice--called-interactively-skip|advice--car|advice--cd\\*r|advice--cdr|advice--defalias-fset|advice--interactive-form|advice--make-1|advice--make-docstring|advice--make-interactive-form|advice--make|advice--member-p|advice--normalize-place|advice--normalize|advice--p|advice--props|advice--remove-function|advice--set-buffer-local|advice--strip-macro|advice--subst-main|advice--symbol-function|advice--tweak|after-insert-file-set-coding|align--set-marker|align-adjust-col-for-rule|align-areas|align-column|align-current|align-entire|align-highlight-rule|align-match-tex-pattern|align-new-section-p|align-newline-and-indent|align-regexp|align-region|align-regions|align-set-vhdl-rules|align-unhighlight-rule|align|alist-get|allout-aberrant-container-p|allout-add-resumptions|allout-adjust-file-variable|allout-after-saves-handler|allout-annotate-hidden|allout-ascend-to-depth|allout-ascend|allout-auto-activation-helper|allout-auto-fill|allout-back-to-current-heading|allout-back-to-heading|allout-back-to-visible-text|allout-backward-current-level|allout-before-change-handler|allout-beginning-of-current-entry|allout-beginning-of-current-line|allout-beginning-of-level|allout-beginning-of-line|allout-body-modification-handler|allout-bullet-for-depth|allout-bullet-isearch|allout-called-interactively-p|allout-chart-exposure-contour-by-icon|allout-chart-siblings|allout-chart-subtree|allout-chart-to-reveal|allout-compose-and-institute-keymap|allout-copy-exposed-to-buffer|allout-copy-line-as-kill|allout-copy-topic-as-kill|allout-current-bullet-pos|allout-current-bullet|allout-current-decorated-p|allout-current-depth|allout-current-topic-collapsed-p|allout-deannotate-hidden|allout-decorate-item-and-context|allout-decorate-item-body|allout-decorate-item-cue|allout-decorate-item-guides|allout-decorate-item-icon|allout-decorate-item-span|allout-depth|allout-descend-to-depth|allout-distinctive-bullet|allout-do-doublecheck|allout-do-resumptions|allout-e-o-prefix-p|allout-elapsed-time-seconds|allout-encrypt-decrypted|allout-encrypt-string|allout-encrypted-topic-p|allout-encrypted-type-prefix|allout-end-of-current-heading|allout-end-of-current-line|allout-end-of-current-subtree|allout-end-of-entry|allout-end-of-heading|allout-end-of-level|allout-end-of-line|allout-end-of-prefix|allout-end-of-subtree|allout-expose-topic|allout-fetch-icon-image|allout-file-vars-section-data|allout-find-file-hook|allout-find-image|allout-flag-current-subtree|allout-flag-region|allout-flatten-exposed-to-buffer|allout-flatten|allout-format-quote|allout-forward-current-level|allout-frame-property|allout-get-body-text|allout-get-bullet|allout-get-configvar-values|allout-get-current-prefix|allout-get-invisibility-overlay|allout-get-item-widget|allout-get-or-create-item-widget|allout-get-or-create-parent-widget|allout-get-prefix-bullet|allout-goto-prefix-doublechecked|allout-goto-prefix|allout-graphics-modification-handler|allout-hidden-p|allout-hide-bodies|allout-hide-by-annotation|allout-hide-current-entry|allout-hide-current-leaves|allout-hide-current-subtree|allout-hide-region-body|allout-hotspot-key-handler|allout-indented-exposed-to-buffer|allout-infer-body-reindent|allout-infer-header-lead-and-primary-bullet|allout-infer-header-lead|allout-inhibit-auto-save-info-for-decryption|allout-init|allout-insert-latex-header|allout-insert-latex-trailer|allout-insert-listified|allout-institute-keymap|allout-isearch-end-handler|allout-item-actual-position|allout-item-element-span-is|allout-item-icon-key-handler|allout-item-location|allout-item-span|allout-kill-line|allout-kill-topic|allout-latex-verb-quote|allout-latex-verbatim-quote-curr-line|allout-latexify-exposed|allout-latexify-one-item|allout-lead-with-comment-string|allout-listify-exposed|allout-make-topic-prefix|allout-mark-active-p|allout-mark-marker|allout-mark-topic|allout-maybe-resume-auto-save-info-after-encryption|allout-minor-mode|allout-mode-map|allout-mode-p|allout-mode|allout-new-exposure|allout-new-item-widget|allout-next-heading|allout-next-sibling-leap|allout-next-sibling|allout-next-single-char-property-change|allout-next-topic-pending-encryption|allout-next-visible-heading|allout-number-siblings|allout-numbered-type-prefix|allout-old-expose-topic|allout-on-current-heading-p|allout-on-heading-p|allout-open-sibtopic|allout-open-subtopic|allout-open-supertopic|allout-open-topic|allout-overlay-insert-in-front-handler|allout-overlay-interior-modification-handler|allout-overlay-preparations|allout-parse-item-at-point|allout-post-command-business|allout-pre-command-business|allout-pre-next-prefix|allout-prefix-data|allout-previous-heading|allout-previous-sibling|allout-previous-single-char-property-change|allout-previous-visible-heading|allout-process-exposed|allout-range-overlaps|allout-rebullet-current-heading|allout-rebullet-heading|allout-rebullet-topic-grunt|allout-rebullet-topic|allout-recent-bullet|allout-recent-depth|allout-recent-prefix|allout-redecorate-item|allout-redecorate-visible-subtree|allout-region-active-p|allout-reindent-body|allout-renumber-to-depth|allout-reset-header-lead|allout-resolve-xref|allout-run-unit-tests|allout-select-safe-coding-system|allout-set-boundary-marker|allout-setup-menubar|allout-setup-text-properties|allout-setup|allout-shift-in|allout-shift-out|allout-show-all|allout-show-children|allout-show-current-branches|allout-show-current-entry|allout-show-current-subtree|allout-show-entry|allout-show-to-offshoot|allout-sibling-index|allout-snug-back|allout-solicit-alternate-bullet|allout-stringify-flat-index-indented|allout-stringify-flat-index-plain|allout-stringify-flat-index|allout-substring-no-properties|allout-test-range-overlaps|allout-test-resumptions|allout-tests-obliterate-variable|allout-this-or-next-heading|allout-toggle-current-subtree-encryption|allout-toggle-current-subtree-exposure|allout-toggle-subtree-encryption|allout-topic-flat-index|allout-unload-function|allout-unprotected|allout-up-current-level|allout-version|allout-widgetize-buffer|allout-widgets-additions-processor|allout-widgets-additions-recorder|allout-widgets-adjusting-message|allout-widgets-after-change-handler|allout-widgets-after-copy-or-kill-function|allout-widgets-after-undo-function|allout-widgets-before-change-handler|allout-widgets-changes-dispatcher|allout-widgets-copy-list|allout-widgets-count-buttons-in-region|allout-widgets-deletions-processor|allout-widgets-deletions-recorder|allout-widgets-exposure-change-processor|allout-widgets-exposure-change-recorder|allout-widgets-exposure-undo-processor|allout-widgets-exposure-undo-recorder|allout-widgets-hook-error-handler|allout-widgets-mode-disable|allout-widgets-mode-enable|allout-widgets-mode-off|allout-widgets-mode-on|allout-widgets-mode|allout-widgets-post-command-business|allout-widgets-pre-command-business|allout-widgets-prepopulate-buffer|allout-widgets-run-unit-tests|allout-widgets-setup|allout-widgets-shifts-processor|allout-widgets-shifts-recorder|allout-widgets-tally-string|allout-widgets-undecorate-item|allout-widgets-undecorate-region|allout-widgets-undecorate-text|allout-widgets-version|allout-write-contents-hook-handler|allout-yank-pop|allout-yank-processing|allout-yank|alter-text-property|ange-ftp-abbreviate-filename|ange-ftp-add-bs2000-host|ange-ftp-add-bs2000-posix-host|ange-ftp-add-cms-host|ange-ftp-add-dl-dir|ange-ftp-add-dumb-unix-host|ange-ftp-add-file-entry|ange-ftp-add-mts-host|ange-ftp-add-vms-host|ange-ftp-allow-child-lookup|ange-ftp-barf-if-not-directory|ange-ftp-barf-or-query-if-file-exists|ange-ftp-binary-file|ange-ftp-bs2000-cd-to-posix|ange-ftp-bs2000-host|ange-ftp-bs2000-posix-host|ange-ftp-call-chmod|ange-ftp-call-cont|ange-ftp-canonize-filename|ange-ftp-cd|ange-ftp-cf1|ange-ftp-cf2|ange-ftp-chase-symlinks|ange-ftp-cms-host|ange-ftp-cms-make-compressed-filename|ange-ftp-completion-hook-function|ange-ftp-compress|ange-ftp-copy-file-internal|ange-ftp-copy-file|ange-ftp-copy-files-async|ange-ftp-del-tmp-name|ange-ftp-delete-directory|ange-ftp-delete-file-entry|ange-ftp-delete-file|ange-ftp-directory-file-name|ange-ftp-directory-files-and-attributes|ange-ftp-directory-files|ange-ftp-dired-compress-file|ange-ftp-dired-uncache|ange-ftp-dl-parser|ange-ftp-dumb-unix-host|ange-ftp-error|ange-ftp-expand-dir|ange-ftp-expand-file-name|ange-ftp-expand-symlink|ange-ftp-file-attributes|ange-ftp-file-directory-p|ange-ftp-file-entry-not-ignored-p|ange-ftp-file-entry-p|ange-ftp-file-executable-p|ange-ftp-file-exists-p|ange-ftp-file-local-copy|ange-ftp-file-modtime|ange-ftp-file-name-all-completions|ange-ftp-file-name-as-directory|ange-ftp-file-name-completion-1|ange-ftp-file-name-completion|ange-ftp-file-name-directory|ange-ftp-file-name-nondirectory|ange-ftp-file-name-sans-versions)(?=[\\s()]|$)"
+          "match": "(?<=[()]|^)a(?:da-case-read-exceptions|da-case|da-change-prj|da-check-current|da-check-defun-name|da-check-matching-start|da-compile-application|da-compile-current|da-compile-goto-error|da-compile-mouse-goto-error|da-complete-identifier|da-contextual-menu|da-create-case-exception-substring|da-create-case-exception|da-create-keymap|da-create-menu|da-customize|da-declare-block|da-else|da-elsif|da-exception-block|da-exception|da-exit|da-ff-other-window|da-fill-comment-paragraph-justify|da-fill-comment-paragraph-postfix|da-fill-comment-paragraph|da-find-any-references|da-find-file|da-find-local-references|da-find-references|da-find-src-file-in-dir|da-for-loop|da-format-paramlist|da-function-spec|da-gdb-application|da-gen-treat-proc|da-get-body-name|da-get-current-indent|da-get-indent-block-label|da-get-indent-block-start|da-get-indent-case|da-get-indent-end|da-get-indent-goto-label|da-get-indent-if|da-get-indent-loop|da-get-indent-nochange|da-get-indent-noindent|da-get-indent-open-paren|da-get-indent-paramlist|da-get-indent-subprog|da-get-indent-type|da-get-indent-when|da-gnat-style|da-goto-decl-start|da-goto-declaration-other-frame|da-goto-declaration|da-goto-matching-end|da-goto-matching-start|da-goto-next-non-ws|da-goto-next-word|da-goto-parent|da-goto-previous-word|da-goto-stmt-end|da-goto-stmt-start|da-header|da-if|da-in-comment-p|da-in-decl-p|da-in-numeric-literal-p|da-in-open-paren-p|da-in-paramlist-p|da-in-string-or-comment-p|da-in-string-p|da-indent-current-function|da-indent-current|da-indent-newline-indent-conditional|da-indent-newline-indent|da-indent-on-previous-lines|da-indent-region|da-insert-paramlist|da-justified-indent-current|da-looking-at-semi-or|da-looking-at-semi-private|da-loop|da-loose-case-word|da-make-body-gnatstub|da-make-body|da-make-filename-from-adaname|da-make-subprogram-body|da-mode-menu|da-mode-version|da-mode|da-move-to-end|da-move-to-start|da-narrow-to-defun|da-next-package|da-next-procedure|da-no-auto-case|da-other-file-name|da-outline-level|da-package-body|da-package-spec|da-point-and-xref|da-popup-menu|da-previous-package|da-previous-procedure|da-private|da-prj-edit|da-prj-new|da-prj-save|da-procedure-spec|da-record|da-region-selected|da-remove-trailing-spaces|da-reread-prj-file|da-run-application|da-save-exceptions-to-file|da-scan-paramlist|da-search-ignore-complex-boolean|da-search-ignore-string-comment|da-search-prev-end-stmt|da-set-default-project-file|da-set-main-compile-application|da-set-point-accordingly|da-show-current-main|da-subprogram-body|da-subtype|da-tab-hard|da-tab|da-tabsize|da-task-body|da-task-spec|da-type|da-uncomment-region|da-untab-hard|da-untab|da-use|da-when|da-which-function-are-we-in|da-which-function|da-while-loop|da-with|da-xref-goto-previous-reference|dd-abbrev|dd-change-log-entry-other-window|dd-change-log-entry|dd-completion-to-head|dd-completion-to-tail-if-new|dd-completion|dd-completions-from-buffer|dd-completions-from-c-buffer|dd-completions-from-file|dd-completions-from-lisp-buffer|dd-completions-from-tags-table|dd-dir-local-variable|dd-file-local-variable-prop-line|dd-file-local-variable|dd-global-abbrev|dd-log-current-defun|dd-log-edit-next-comment|dd-log-edit-prev-comment|dd-log-file-name|dd-log-iso8601-time-string|dd-log-iso8601-time-zone|dd-log-tcl-defun|dd-minor-mode|dd-mode-abbrev|dd-new-page|dd-permanent-completion|dd-submenu|dd-timeout|dd-to-coding-system-list|dd-to-list--anon-cmacro|ddbib|djoin|dvertised-undo|dvertised-widget-backward|dvertised-xscheme-send-previous-expression|dvice--add-function|dvice--buffer-local|dvice--called-interactively-skip|dvice--car|dvice--cd\\*r|dvice--cdr|dvice--defalias-fset|dvice--interactive-form|dvice--make-1|dvice--make-docstring|dvice--make-interactive-form|dvice--make|dvice--member-p|dvice--normalize-place|dvice--normalize|dvice--p|dvice--props|dvice--remove-function|dvice--set-buffer-local|dvice--strip-macro|dvice--subst-main|dvice--symbol-function|dvice--tweak|fter-insert-file-set-coding|lign--set-marker|lign-adjust-col-for-rule|lign-areas|lign-column|lign-current|lign-entire|lign-highlight-rule|lign-match-tex-pattern|lign-new-section-p|lign-newline-and-indent|lign-regexp|lign-region|lign-regions|lign-set-vhdl-rules|lign-unhighlight-rule|lign|list-get|llout-aberrant-container-p|llout-add-resumptions|llout-adjust-file-variable|llout-after-saves-handler|llout-annotate-hidden|llout-ascend-to-depth|llout-ascend|llout-auto-activation-helper|llout-auto-fill|llout-back-to-current-heading|llout-back-to-heading|llout-back-to-visible-text|llout-backward-current-level|llout-before-change-handler|llout-beginning-of-current-entry|llout-beginning-of-current-line|llout-beginning-of-level|llout-beginning-of-line|llout-body-modification-handler|llout-bullet-for-depth|llout-bullet-isearch|llout-called-interactively-p|llout-chart-exposure-contour-by-icon|llout-chart-siblings|llout-chart-subtree|llout-chart-to-reveal|llout-compose-and-institute-keymap|llout-copy-exposed-to-buffer|llout-copy-line-as-kill|llout-copy-topic-as-kill|llout-current-bullet-pos|llout-current-bullet|llout-current-decorated-p|llout-current-depth|llout-current-topic-collapsed-p|llout-deannotate-hidden|llout-decorate-item-and-context|llout-decorate-item-body|llout-decorate-item-cue|llout-decorate-item-guides|llout-decorate-item-icon|llout-decorate-item-span|llout-depth|llout-descend-to-depth|llout-distinctive-bullet|llout-do-doublecheck|llout-do-resumptions|llout-e-o-prefix-p|llout-elapsed-time-seconds|llout-encrypt-decrypted|llout-encrypt-string|llout-encrypted-topic-p|llout-encrypted-type-prefix|llout-end-of-current-heading|llout-end-of-current-line|llout-end-of-current-subtree|llout-end-of-entry|llout-end-of-heading|llout-end-of-level|llout-end-of-line|llout-end-of-prefix|llout-end-of-subtree|llout-expose-topic|llout-fetch-icon-image|llout-file-vars-section-data|llout-find-file-hook|llout-find-image|llout-flag-current-subtree|llout-flag-region|llout-flatten-exposed-to-buffer|llout-flatten|llout-format-quote|llout-forward-current-level|llout-frame-property|llout-get-body-text|llout-get-bullet|llout-get-configvar-values|llout-get-current-prefix|llout-get-invisibility-overlay|llout-get-item-widget|llout-get-or-create-item-widget|llout-get-or-create-parent-widget|llout-get-prefix-bullet|llout-goto-prefix-doublechecked|llout-goto-prefix|llout-graphics-modification-handler|llout-hidden-p|llout-hide-bodies|llout-hide-by-annotation|llout-hide-current-entry|llout-hide-current-leaves|llout-hide-current-subtree|llout-hide-region-body|llout-hotspot-key-handler|llout-indented-exposed-to-buffer|llout-infer-body-reindent|llout-infer-header-lead-and-primary-bullet|llout-infer-header-lead|llout-inhibit-auto-save-info-for-decryption|llout-init|llout-insert-latex-header|llout-insert-latex-trailer|llout-insert-listified|llout-institute-keymap|llout-isearch-end-handler|llout-item-actual-position|llout-item-element-span-is|llout-item-icon-key-handler|llout-item-location|llout-item-span|llout-kill-line|llout-kill-topic|llout-latex-verb-quote|llout-latex-verbatim-quote-curr-line|llout-latexify-exposed|llout-latexify-one-item|llout-lead-with-comment-string|llout-listify-exposed|llout-make-topic-prefix|llout-mark-active-p|llout-mark-marker|llout-mark-topic|llout-maybe-resume-auto-save-info-after-encryption|llout-minor-mode|llout-mode-map|llout-mode-p|llout-mode|llout-new-exposure|llout-new-item-widget|llout-next-heading|llout-next-sibling-leap|llout-next-sibling|llout-next-single-char-property-change|llout-next-topic-pending-encryption|llout-next-visible-heading|llout-number-siblings|llout-numbered-type-prefix|llout-old-expose-topic|llout-on-current-heading-p|llout-on-heading-p|llout-open-sibtopic|llout-open-subtopic|llout-open-supertopic|llout-open-topic|llout-overlay-insert-in-front-handler|llout-overlay-interior-modification-handler|llout-overlay-preparations|llout-parse-item-at-point|llout-post-command-business|llout-pre-command-business|llout-pre-next-prefix|llout-prefix-data|llout-previous-heading|llout-previous-sibling|llout-previous-single-char-property-change|llout-previous-visible-heading|llout-process-exposed|llout-range-overlaps|llout-rebullet-current-heading|llout-rebullet-heading|llout-rebullet-topic-grunt|llout-rebullet-topic|llout-recent-bullet|llout-recent-depth|llout-recent-prefix|llout-redecorate-item|llout-redecorate-visible-subtree|llout-region-active-p|llout-reindent-body|llout-renumber-to-depth|llout-reset-header-lead|llout-resolve-xref|llout-run-unit-tests|llout-select-safe-coding-system|llout-set-boundary-marker|llout-setup-menubar|llout-setup-text-properties|llout-setup|llout-shift-in|llout-shift-out|llout-show-all|llout-show-children|llout-show-current-branches|llout-show-current-entry|llout-show-current-subtree|llout-show-entry|llout-show-to-offshoot|llout-sibling-index|llout-snug-back|llout-solicit-alternate-bullet|llout-stringify-flat-index-indented|llout-stringify-flat-index-plain|llout-stringify-flat-index|llout-substring-no-properties|llout-test-range-overlaps|llout-test-resumptions|llout-tests-obliterate-variable|llout-this-or-next-heading|llout-toggle-current-subtree-encryption|llout-toggle-current-subtree-exposure|llout-toggle-subtree-encryption|llout-topic-flat-index|llout-unload-function|llout-unprotected|llout-up-current-level|llout-version|llout-widgetize-buffer|llout-widgets-additions-processor|llout-widgets-additions-recorder|llout-widgets-adjusting-message|llout-widgets-after-change-handler|llout-widgets-after-copy-or-kill-function|llout-widgets-after-undo-function|llout-widgets-before-change-handler|llout-widgets-changes-dispatcher|llout-widgets-copy-list|llout-widgets-count-buttons-in-region|llout-widgets-deletions-processor|llout-widgets-deletions-recorder|llout-widgets-exposure-change-processor|llout-widgets-exposure-change-recorder|llout-widgets-exposure-undo-processor|llout-widgets-exposure-undo-recorder|llout-widgets-hook-error-handler|llout-widgets-mode-disable|llout-widgets-mode-enable|llout-widgets-mode-off|llout-widgets-mode-on|llout-widgets-mode|llout-widgets-post-command-business|llout-widgets-pre-command-business|llout-widgets-prepopulate-buffer|llout-widgets-run-unit-tests|llout-widgets-setup|llout-widgets-shifts-processor|llout-widgets-shifts-recorder|llout-widgets-tally-string|llout-widgets-undecorate-item|llout-widgets-undecorate-region|llout-widgets-undecorate-text|llout-widgets-version|llout-write-contents-hook-handler|llout-yank-pop|llout-yank-processing|llout-yank|lter-text-property|nge-ftp-abbreviate-filename|nge-ftp-add-bs2000-host|nge-ftp-add-bs2000-posix-host|nge-ftp-add-cms-host|nge-ftp-add-dl-dir|nge-ftp-add-dumb-unix-host|nge-ftp-add-file-entry|nge-ftp-add-mts-host|nge-ftp-add-vms-host|nge-ftp-allow-child-lookup|nge-ftp-barf-if-not-directory|nge-ftp-barf-or-query-if-file-exists|nge-ftp-binary-file|nge-ftp-bs2000-cd-to-posix|nge-ftp-bs2000-host|nge-ftp-bs2000-posix-host|nge-ftp-call-chmod|nge-ftp-call-cont|nge-ftp-canonize-filename|nge-ftp-cd|nge-ftp-cf1|nge-ftp-cf2|nge-ftp-chase-symlinks|nge-ftp-cms-host|nge-ftp-cms-make-compressed-filename|nge-ftp-completion-hook-function|nge-ftp-compress|nge-ftp-copy-file-internal|nge-ftp-copy-file|nge-ftp-copy-files-async|nge-ftp-del-tmp-name|nge-ftp-delete-directory|nge-ftp-delete-file-entry|nge-ftp-delete-file|nge-ftp-directory-file-name|nge-ftp-directory-files-and-attributes|nge-ftp-directory-files|nge-ftp-dired-compress-file|nge-ftp-dired-uncache|nge-ftp-dl-parser|nge-ftp-dumb-unix-host|nge-ftp-error|nge-ftp-expand-dir|nge-ftp-expand-file-name|nge-ftp-expand-symlink|nge-ftp-file-attributes|nge-ftp-file-directory-p|nge-ftp-file-entry-not-ignored-p|nge-ftp-file-entry-p|nge-ftp-file-executable-p|nge-ftp-file-exists-p|nge-ftp-file-local-copy|nge-ftp-file-modtime|nge-ftp-file-name-all-completions|nge-ftp-file-name-as-directory|nge-ftp-file-name-completion-1|nge-ftp-file-name-completion|nge-ftp-file-name-directory|nge-ftp-file-name-nondirectory|nge-ftp-file-name-sans-versions)(?=[\\s()]|$)"
         },
         {
-          "match": "(?<=[()]|^)(?:ange-ftp-file-newer-than-file-p|ange-ftp-file-readable-p|ange-ftp-file-remote-p|ange-ftp-file-size|ange-ftp-file-symlink-p|ange-ftp-file-writable-p|ange-ftp-find-backup-file-name|ange-ftp-fix-dir-name-for-bs2000|ange-ftp-fix-dir-name-for-cms|ange-ftp-fix-dir-name-for-mts|ange-ftp-fix-dir-name-for-vms|ange-ftp-fix-name-for-bs2000|ange-ftp-fix-name-for-cms|ange-ftp-fix-name-for-mts|ange-ftp-fix-name-for-vms|ange-ftp-ftp-name-component|ange-ftp-ftp-name|ange-ftp-ftp-process-buffer|ange-ftp-generate-passwd-key|ange-ftp-generate-root-prefixes|ange-ftp-get-account|ange-ftp-get-file-entry|ange-ftp-get-file-part|ange-ftp-get-files|ange-ftp-get-host-with-passwd|ange-ftp-get-passwd|ange-ftp-get-process|ange-ftp-get-pwd|ange-ftp-get-user|ange-ftp-guess-hash-mark-size|ange-ftp-guess-host-type|ange-ftp-gwp-filter|ange-ftp-gwp-sentinel|ange-ftp-gwp-start|ange-ftp-hash-entry-exists-p|ange-ftp-hash-table-keys|ange-ftp-hook-function|ange-ftp-host-type|ange-ftp-ignore-errors-if-non-essential|ange-ftp-insert-directory|ange-ftp-insert-file-contents|ange-ftp-internal-add-file-entry|ange-ftp-internal-delete-file-entry|ange-ftp-kill-ftp-process|ange-ftp-load|ange-ftp-lookup-passwd|ange-ftp-ls-parser|ange-ftp-ls|ange-ftp-make-directory|ange-ftp-make-tmp-name|ange-ftp-message|ange-ftp-mts-host|ange-ftp-normal-login|ange-ftp-nslookup-host|ange-ftp-parse-bs2000-filename|ange-ftp-parse-bs2000-listing|ange-ftp-parse-cms-listing|ange-ftp-parse-dired-listing|ange-ftp-parse-filename|ange-ftp-parse-mts-listing|ange-ftp-parse-netrc-group|ange-ftp-parse-netrc-token|ange-ftp-parse-netrc|ange-ftp-parse-vms-filename|ange-ftp-parse-vms-listing|ange-ftp-passive-mode|ange-ftp-process-file|ange-ftp-process-filter|ange-ftp-process-handle-hash|ange-ftp-process-handle-line|ange-ftp-process-sentinel|ange-ftp-quote-string|ange-ftp-raw-send-cmd|ange-ftp-re-read-dir|ange-ftp-real-backup-buffer|ange-ftp-real-copy-file|ange-ftp-real-delete-directory|ange-ftp-real-delete-file|ange-ftp-real-directory-file-name|ange-ftp-real-directory-files-and-attributes|ange-ftp-real-directory-files|ange-ftp-real-expand-file-name|ange-ftp-real-file-attributes|ange-ftp-real-file-directory-p|ange-ftp-real-file-executable-p|ange-ftp-real-file-exists-p|ange-ftp-real-file-name-all-completions|ange-ftp-real-file-name-as-directory|ange-ftp-real-file-name-completion|ange-ftp-real-file-name-directory|ange-ftp-real-file-name-nondirectory|ange-ftp-real-file-name-sans-versions|ange-ftp-real-file-newer-than-file-p|ange-ftp-real-file-readable-p|ange-ftp-real-file-symlink-p|ange-ftp-real-file-writable-p|ange-ftp-real-find-backup-file-name|ange-ftp-real-insert-directory|ange-ftp-real-insert-file-contents|ange-ftp-real-load|ange-ftp-real-make-directory|ange-ftp-real-rename-file|ange-ftp-real-shell-command|ange-ftp-real-verify-visited-file-modtime|ange-ftp-real-write-region|ange-ftp-rename-file|ange-ftp-rename-local-to-remote|ange-ftp-rename-remote-to-local|ange-ftp-rename-remote-to-remote|ange-ftp-repaint-minibuffer|ange-ftp-replace-name-component|ange-ftp-reread-dir|ange-ftp-root-dir-p|ange-ftp-run-real-handler-orig|ange-ftp-run-real-handler|ange-ftp-send-cmd|ange-ftp-set-account|ange-ftp-set-ascii-mode|ange-ftp-set-binary-mode|ange-ftp-set-buffer-mode|ange-ftp-set-file-modes|ange-ftp-set-files|ange-ftp-set-passwd|ange-ftp-set-user|ange-ftp-set-xfer-size|ange-ftp-shell-command|ange-ftp-smart-login|ange-ftp-start-process|ange-ftp-switches-ok|ange-ftp-uncompress|ange-ftp-unhandled-file-name-directory|ange-ftp-use-gateway-p|ange-ftp-use-smart-gateway-p|ange-ftp-verify-visited-file-modtime|ange-ftp-vms-add-file-entry|ange-ftp-vms-delete-file-entry|ange-ftp-vms-file-name-as-directory|ange-ftp-vms-host|ange-ftp-vms-make-compressed-filename|ange-ftp-vms-sans-version|ange-ftp-wait-not-busy|ange-ftp-wipe-file-entries|ange-ftp-write-region|animate-birthday-present|animate-initialize|animate-place-char|animate-sequence|animate-step|animate-string|another-calc|ansi-color--find-face|ansi-color-apply-on-region|ansi-color-apply-overlay-face|ansi-color-apply-sequence|ansi-color-apply|ansi-color-filter-apply|ansi-color-filter-region|ansi-color-for-comint-mode-filter|ansi-color-for-comint-mode-off|ansi-color-for-comint-mode-on|ansi-color-freeze-overlay|ansi-color-get-face-1|ansi-color-make-color-map|ansi-color-make-extent|ansi-color-make-face|ansi-color-map-update|ansi-color-parse-sequence|ansi-color-process-output|ansi-color-set-extent-face|ansi-color-unfontify-region|ansi-term|antlr-beginning-of-body|antlr-beginning-of-rule|antlr-c\\+\\+-mode-extra|antlr-c-forward-sws|antlr-c-init-language-vars|antlr-default-directory|antlr-directory-dependencies|antlr-downcase-literals|antlr-electric-character|antlr-end-of-body|antlr-end-of-rule|antlr-file-dependencies|antlr-font-lock-keywords|antlr-grammar-tokens|antlr-hide-actions|antlr-imenu-create-index-function|antlr-indent-command|antlr-indent-line|antlr-insert-makefile-rules|antlr-insert-option-area|antlr-insert-option-do|antlr-insert-option-existing|antlr-insert-option-interactive|antlr-insert-option-space|antlr-insert-option|antlr-inside-rule-p|antlr-invalidate-context-cache|antlr-language-option-extra|antlr-language-option|antlr-makefile-insert-variable|antlr-mode-menu|antlr-mode|antlr-next-rule|antlr-option-kind|antlr-option-level|antlr-option-location|antlr-option-spec|antlr-options-menu-filter|antlr-outside-rule-p|antlr-re-search-forward|antlr-read-boolean|antlr-read-shell-command|antlr-read-value|antlr-run-tool-interactive|antlr-run-tool|antlr-search-backward|antlr-search-forward|antlr-set-tabs|antlr-show-makefile-rules|antlr-skip-exception-part|antlr-skip-file-prelude|antlr-skip-sexps|antlr-superclasses-glibs|antlr-syntactic-context|antlr-syntactic-grammar-depth|antlr-upcase-literals|antlr-upcase-p|antlr-version-string|antlr-with-displaying-help-buffer|antlr-with-syntax-table|append-next-kill|append-to-buffer|append-to-register|apply-macro-to-region-lines|apply-on-rectangle|appt-activate|appt-add|apropos-command|apropos-documentation-property|apropos-documentation|apropos-internal|apropos-library|apropos-read-pattern|apropos-user-option|apropos-value|apropos-variable|archive-\\*-expunge|archive-\\*-extract|archive-\\*-write-file-member|archive-7z-extract|archive-7z-summarize|archive-7z-write-file-member|archive-add-new-member|archive-alternate-display|archive-ar-extract|archive-ar-summarize|archive-arc-rename-entry|archive-arc-summarize|archive-calc-mode|archive-chgrp-entry|archive-chmod-entry|archive-chown-entry|archive-delete-local|archive-desummarize|archive-display-other-window|archive-dosdate|archive-dostime|archive-expunge|archive-extract-by-file|archive-extract-by-stdout|archive-extract-other-window|archive-extract|archive-file-name-handler|archive-find-type|archive-flag-deleted|archive-get-descr|archive-get-lineno|archive-get-marked|archive-int-to-mode|archive-l-e|archive-lzh-chgrp-entry|archive-lzh-chmod-entry|archive-lzh-chown-entry|archive-lzh-exe-extract|archive-lzh-exe-summarize|archive-lzh-extract|archive-lzh-ogm|archive-lzh-rename-entry|archive-lzh-resum|archive-lzh-summarize|archive-mark|archive-maybe-copy|archive-maybe-update|archive-mode-revert|archive-mode|archive-mouse-extract|archive-name|archive-next-line|archive-previous-line|archive-rar-exe-extract|archive-rar-exe-summarize|archive-rar-extract|archive-rar-summarize|archive-rename-entry|archive-resummarize|archive-set-buffer-as-visiting-file|archive-summarize-files|archive-summarize|archive-try-jka-compr|archive-undo|archive-unflag-backwards|archive-unflag|archive-unique-fname|archive-unixdate|archive-unixtime|archive-unmark-all-files|archive-view|archive-write-file-member|archive-write-file|archive-zip-chmod-entry|archive-zip-extract|archive-zip-summarize|archive-zip-write-file-member|archive-zoo-extract|archive-zoo-summarize|arp|array-backward-column|array-beginning-of-field|array-copy-backward|array-copy-column-backward|array-copy-column-forward|array-copy-down|array-copy-forward|array-copy-once-horizontally|array-copy-once-vertically|array-copy-row-down|array-copy-row-up|array-copy-to-cell|array-copy-to-column|array-copy-to-row|array-copy-up|array-current-column|array-current-row|array-cursor-in-array-range|array-display-local-variables|array-end-of-field|array-expand-rows|array-field-string|array-fill-rectangle|array-forward-column|array-goto-cell|array-make-template|array-maybe-scroll-horizontally|array-mode|array-move-one-column|array-move-one-row|array-move-to-cell|array-move-to-column|array-move-to-row|array-next-row|array-normalize-cursor|array-previous-row|array-reconfigure-rows|array-update-array-position|array-update-buffer-position|array-what-position|artist-2point-get-endpoint1|artist-2point-get-endpoint2|artist-2point-get-shapeinfo|artist-arrow-point-get-direction|artist-arrow-point-get-marker|artist-arrow-point-get-orig-char|artist-arrow-point-get-state|artist-arrow-point-set-state|artist-arrows|artist-backward-char|artist-calculate-new-char|artist-calculate-new-chars|artist-charlist-to-string|artist-clear-arrow-points|artist-clear-buffer|artist-compute-key-compl-table|artist-compute-line-char|artist-compute-popup-menu-table-sub|artist-compute-popup-menu-table|artist-compute-up-event-key|artist-coord-add-new-char|artist-coord-add-saved-char|artist-coord-get-new-char|artist-coord-get-saved-char|artist-coord-get-x|artist-coord-get-y|artist-coord-set-new-char|artist-coord-set-x|artist-coord-set-y|artist-coord-win-to-buf|artist-copy-generic|artist-copy-rect|artist-copy-square|artist-current-column|artist-current-line|artist-cut-rect|artist-cut-square|artist-direction-char|artist-direction-step-x|artist-direction-step-y|artist-do-nothing|artist-down-mouse-1|artist-down-mouse-3|artist-draw-circle|artist-draw-ellipse-general|artist-draw-ellipse-with-0-height|artist-draw-ellipse|artist-draw-line|artist-draw-rect|artist-draw-region-reset|artist-draw-region-trim-line-endings|artist-draw-sline|artist-draw-square|artist-eight-point|artist-ellipse-compute-fill-info|artist-ellipse-fill-info-add-center|artist-ellipse-generate-quadrant|artist-ellipse-mirror-quadrant|artist-ellipse-point-list-add-center|artist-ellipse-remove-0-fills|artist-endpoint-get-x|artist-endpoint-get-y|artist-erase-char|artist-erase-rect|artist-event-is-shifted|artist-fc-get-fn-from-symbol|artist-fc-get-fn|artist-fc-get-keyword|artist-fc-get-symbol|artist-fc-retrieve-from-symbol-sub|artist-fc-retrieve-from-symbol|artist-ff-get-rightmost-from-xy|artist-ff-is-bottommost-line|artist-ff-is-topmost-line|artist-ff-too-far-right|artist-figlet-choose-font|artist-figlet-get-extra-args|artist-figlet-get-font-list|artist-figlet-run|artist-figlet|artist-file-to-string|artist-fill-circle|artist-fill-ellipse|artist-fill-item-get-width|artist-fill-item-get-x|artist-fill-item-get-y|artist-fill-item-set-width|artist-fill-item-set-x|artist-fill-item-set-y|artist-fill-rect|artist-fill-square|artist-find-direction|artist-find-octant|artist-flood-fill|artist-forward-char|artist-funcall|artist-get-buffer-contents-at-xy|artist-get-char-at-xy-conv|artist-get-char-at-xy|artist-get-dfdx-init-coeff|artist-get-dfdy-init-coeff|artist-get-first-non-nil-op|artist-get-last-non-nil-op|artist-get-replacement-char|artist-get-x-step-q<0|artist-get-x-step-q>=0|artist-get-y-step-q<0|artist-get-y-step-q>=0|artist-go-get-arrow-pred-from-symbol|artist-go-get-arrow-pred|artist-go-get-arrow-set-fn-from-symbol|artist-go-get-arrow-set-fn|artist-go-get-desc|artist-go-get-draw-fn-from-symbol|artist-go-get-draw-fn|artist-go-get-draw-how-from-symbol|artist-go-get-draw-how|artist-go-get-exit-fn-from-symbol|artist-go-get-exit-fn|artist-go-get-fill-fn-from-symbol|artist-go-get-fill-fn|artist-go-get-fill-pred-from-symbol|artist-go-get-fill-pred|artist-go-get-init-fn-from-symbol|artist-go-get-init-fn|artist-go-get-interval-fn-from-symbol|artist-go-get-interval-fn|artist-go-get-keyword-from-symbol|artist-go-get-keyword|artist-go-get-mode-line-from-symbol|artist-go-get-mode-line|artist-go-get-prep-fill-fn-from-symbol|artist-go-get-prep-fill-fn|artist-go-get-shifted|artist-go-get-symbol-shift-sub|artist-go-get-symbol-shift|artist-go-get-symbol|artist-go-get-undraw-fn-from-symbol|artist-go-get-undraw-fn|artist-go-get-unshifted|artist-go-retrieve-from-symbol-sub|artist-go-retrieve-from-symbol|artist-intersection-char|artist-is-in-op-list-p|artist-key-do-continously-1point|artist-key-do-continously-2points|artist-key-do-continously-common)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)a(?:nge-ftp-file-newer-than-file-p|nge-ftp-file-readable-p|nge-ftp-file-remote-p|nge-ftp-file-size|nge-ftp-file-symlink-p|nge-ftp-file-writable-p|nge-ftp-find-backup-file-name|nge-ftp-fix-dir-name-for-bs2000|nge-ftp-fix-dir-name-for-cms|nge-ftp-fix-dir-name-for-mts|nge-ftp-fix-dir-name-for-vms|nge-ftp-fix-name-for-bs2000|nge-ftp-fix-name-for-cms|nge-ftp-fix-name-for-mts|nge-ftp-fix-name-for-vms|nge-ftp-ftp-name-component|nge-ftp-ftp-name|nge-ftp-ftp-process-buffer|nge-ftp-generate-passwd-key|nge-ftp-generate-root-prefixes|nge-ftp-get-account|nge-ftp-get-file-entry|nge-ftp-get-file-part|nge-ftp-get-files|nge-ftp-get-host-with-passwd|nge-ftp-get-passwd|nge-ftp-get-process|nge-ftp-get-pwd|nge-ftp-get-user|nge-ftp-guess-hash-mark-size|nge-ftp-guess-host-type|nge-ftp-gwp-filter|nge-ftp-gwp-sentinel|nge-ftp-gwp-start|nge-ftp-hash-entry-exists-p|nge-ftp-hash-table-keys|nge-ftp-hook-function|nge-ftp-host-type|nge-ftp-ignore-errors-if-non-essential|nge-ftp-insert-directory|nge-ftp-insert-file-contents|nge-ftp-internal-add-file-entry|nge-ftp-internal-delete-file-entry|nge-ftp-kill-ftp-process|nge-ftp-load|nge-ftp-lookup-passwd|nge-ftp-ls-parser|nge-ftp-ls|nge-ftp-make-directory|nge-ftp-make-tmp-name|nge-ftp-message|nge-ftp-mts-host|nge-ftp-normal-login|nge-ftp-nslookup-host|nge-ftp-parse-bs2000-filename|nge-ftp-parse-bs2000-listing|nge-ftp-parse-cms-listing|nge-ftp-parse-dired-listing|nge-ftp-parse-filename|nge-ftp-parse-mts-listing|nge-ftp-parse-netrc-group|nge-ftp-parse-netrc-token|nge-ftp-parse-netrc|nge-ftp-parse-vms-filename|nge-ftp-parse-vms-listing|nge-ftp-passive-mode|nge-ftp-process-file|nge-ftp-process-filter|nge-ftp-process-handle-hash|nge-ftp-process-handle-line|nge-ftp-process-sentinel|nge-ftp-quote-string|nge-ftp-raw-send-cmd|nge-ftp-re-read-dir|nge-ftp-real-backup-buffer|nge-ftp-real-copy-file|nge-ftp-real-delete-directory|nge-ftp-real-delete-file|nge-ftp-real-directory-file-name|nge-ftp-real-directory-files-and-attributes|nge-ftp-real-directory-files|nge-ftp-real-expand-file-name|nge-ftp-real-file-attributes|nge-ftp-real-file-directory-p|nge-ftp-real-file-executable-p|nge-ftp-real-file-exists-p|nge-ftp-real-file-name-all-completions|nge-ftp-real-file-name-as-directory|nge-ftp-real-file-name-completion|nge-ftp-real-file-name-directory|nge-ftp-real-file-name-nondirectory|nge-ftp-real-file-name-sans-versions|nge-ftp-real-file-newer-than-file-p|nge-ftp-real-file-readable-p|nge-ftp-real-file-symlink-p|nge-ftp-real-file-writable-p|nge-ftp-real-find-backup-file-name|nge-ftp-real-insert-directory|nge-ftp-real-insert-file-contents|nge-ftp-real-load|nge-ftp-real-make-directory|nge-ftp-real-rename-file|nge-ftp-real-shell-command|nge-ftp-real-verify-visited-file-modtime|nge-ftp-real-write-region|nge-ftp-rename-file|nge-ftp-rename-local-to-remote|nge-ftp-rename-remote-to-local|nge-ftp-rename-remote-to-remote|nge-ftp-repaint-minibuffer|nge-ftp-replace-name-component|nge-ftp-reread-dir|nge-ftp-root-dir-p|nge-ftp-run-real-handler-orig|nge-ftp-run-real-handler|nge-ftp-send-cmd|nge-ftp-set-account|nge-ftp-set-ascii-mode|nge-ftp-set-binary-mode|nge-ftp-set-buffer-mode|nge-ftp-set-file-modes|nge-ftp-set-files|nge-ftp-set-passwd|nge-ftp-set-user|nge-ftp-set-xfer-size|nge-ftp-shell-command|nge-ftp-smart-login|nge-ftp-start-process|nge-ftp-switches-ok|nge-ftp-uncompress|nge-ftp-unhandled-file-name-directory|nge-ftp-use-gateway-p|nge-ftp-use-smart-gateway-p|nge-ftp-verify-visited-file-modtime|nge-ftp-vms-add-file-entry|nge-ftp-vms-delete-file-entry|nge-ftp-vms-file-name-as-directory|nge-ftp-vms-host|nge-ftp-vms-make-compressed-filename|nge-ftp-vms-sans-version|nge-ftp-wait-not-busy|nge-ftp-wipe-file-entries|nge-ftp-write-region|nimate-birthday-present|nimate-initialize|nimate-place-char|nimate-sequence|nimate-step|nimate-string|nother-calc|nsi-color--find-face|nsi-color-apply-on-region|nsi-color-apply-overlay-face|nsi-color-apply-sequence|nsi-color-apply|nsi-color-filter-apply|nsi-color-filter-region|nsi-color-for-comint-mode-filter|nsi-color-for-comint-mode-off|nsi-color-for-comint-mode-on|nsi-color-freeze-overlay|nsi-color-get-face-1|nsi-color-make-color-map|nsi-color-make-extent|nsi-color-make-face|nsi-color-map-update|nsi-color-parse-sequence|nsi-color-process-output|nsi-color-set-extent-face|nsi-color-unfontify-region|nsi-term|ntlr-beginning-of-body|ntlr-beginning-of-rule|ntlr-c\\+\\+-mode-extra|ntlr-c-forward-sws|ntlr-c-init-language-vars|ntlr-default-directory|ntlr-directory-dependencies|ntlr-downcase-literals|ntlr-electric-character|ntlr-end-of-body|ntlr-end-of-rule|ntlr-file-dependencies|ntlr-font-lock-keywords|ntlr-grammar-tokens|ntlr-hide-actions|ntlr-imenu-create-index-function|ntlr-indent-command|ntlr-indent-line|ntlr-insert-makefile-rules|ntlr-insert-option-area|ntlr-insert-option-do|ntlr-insert-option-existing|ntlr-insert-option-interactive|ntlr-insert-option-space|ntlr-insert-option|ntlr-inside-rule-p|ntlr-invalidate-context-cache|ntlr-language-option-extra|ntlr-language-option|ntlr-makefile-insert-variable|ntlr-mode-menu|ntlr-mode|ntlr-next-rule|ntlr-option-kind|ntlr-option-level|ntlr-option-location|ntlr-option-spec|ntlr-options-menu-filter|ntlr-outside-rule-p|ntlr-re-search-forward|ntlr-read-boolean|ntlr-read-shell-command|ntlr-read-value|ntlr-run-tool-interactive|ntlr-run-tool|ntlr-search-backward|ntlr-search-forward|ntlr-set-tabs|ntlr-show-makefile-rules|ntlr-skip-exception-part|ntlr-skip-file-prelude|ntlr-skip-sexps|ntlr-superclasses-glibs|ntlr-syntactic-context|ntlr-syntactic-grammar-depth|ntlr-upcase-literals|ntlr-upcase-p|ntlr-version-string|ntlr-with-displaying-help-buffer|ntlr-with-syntax-table|ppend-next-kill|ppend-to-buffer|ppend-to-register|pply-macro-to-region-lines|pply-on-rectangle|ppt-activate|ppt-add|propos-command|propos-documentation-property|propos-documentation|propos-internal|propos-library|propos-read-pattern|propos-user-option|propos-value|propos-variable|rchive-\\*-expunge|rchive-\\*-extract|rchive-\\*-write-file-member|rchive-7z-extract|rchive-7z-summarize|rchive-7z-write-file-member|rchive-add-new-member|rchive-alternate-display|rchive-ar-extract|rchive-ar-summarize|rchive-arc-rename-entry|rchive-arc-summarize|rchive-calc-mode|rchive-chgrp-entry|rchive-chmod-entry|rchive-chown-entry|rchive-delete-local|rchive-desummarize|rchive-display-other-window|rchive-dosdate|rchive-dostime|rchive-expunge|rchive-extract-by-file|rchive-extract-by-stdout|rchive-extract-other-window|rchive-extract|rchive-file-name-handler|rchive-find-type|rchive-flag-deleted|rchive-get-descr|rchive-get-lineno|rchive-get-marked|rchive-int-to-mode|rchive-l-e|rchive-lzh-chgrp-entry|rchive-lzh-chmod-entry|rchive-lzh-chown-entry|rchive-lzh-exe-extract|rchive-lzh-exe-summarize|rchive-lzh-extract|rchive-lzh-ogm|rchive-lzh-rename-entry|rchive-lzh-resum|rchive-lzh-summarize|rchive-mark|rchive-maybe-copy|rchive-maybe-update|rchive-mode-revert|rchive-mode|rchive-mouse-extract|rchive-name|rchive-next-line|rchive-previous-line|rchive-rar-exe-extract|rchive-rar-exe-summarize|rchive-rar-extract|rchive-rar-summarize|rchive-rename-entry|rchive-resummarize|rchive-set-buffer-as-visiting-file|rchive-summarize-files|rchive-summarize|rchive-try-jka-compr|rchive-undo|rchive-unflag-backwards|rchive-unflag|rchive-unique-fname|rchive-unixdate|rchive-unixtime|rchive-unmark-all-files|rchive-view|rchive-write-file-member|rchive-write-file|rchive-zip-chmod-entry|rchive-zip-extract|rchive-zip-summarize|rchive-zip-write-file-member|rchive-zoo-extract|rchive-zoo-summarize|rp|rray-backward-column|rray-beginning-of-field|rray-copy-backward|rray-copy-column-backward|rray-copy-column-forward|rray-copy-down|rray-copy-forward|rray-copy-once-horizontally|rray-copy-once-vertically|rray-copy-row-down|rray-copy-row-up|rray-copy-to-cell|rray-copy-to-column|rray-copy-to-row|rray-copy-up|rray-current-column|rray-current-row|rray-cursor-in-array-range|rray-display-local-variables|rray-end-of-field|rray-expand-rows|rray-field-string|rray-fill-rectangle|rray-forward-column|rray-goto-cell|rray-make-template|rray-maybe-scroll-horizontally|rray-mode|rray-move-one-column|rray-move-one-row|rray-move-to-cell|rray-move-to-column|rray-move-to-row|rray-next-row|rray-normalize-cursor|rray-previous-row|rray-reconfigure-rows|rray-update-array-position|rray-update-buffer-position|rray-what-position|rtist-2point-get-endpoint1|rtist-2point-get-endpoint2|rtist-2point-get-shapeinfo|rtist-arrow-point-get-direction|rtist-arrow-point-get-marker|rtist-arrow-point-get-orig-char|rtist-arrow-point-get-state|rtist-arrow-point-set-state|rtist-arrows|rtist-backward-char|rtist-calculate-new-char|rtist-calculate-new-chars|rtist-charlist-to-string|rtist-clear-arrow-points|rtist-clear-buffer|rtist-compute-key-compl-table|rtist-compute-line-char|rtist-compute-popup-menu-table-sub|rtist-compute-popup-menu-table|rtist-compute-up-event-key|rtist-coord-add-new-char|rtist-coord-add-saved-char|rtist-coord-get-new-char|rtist-coord-get-saved-char|rtist-coord-get-x|rtist-coord-get-y|rtist-coord-set-new-char|rtist-coord-set-x|rtist-coord-set-y|rtist-coord-win-to-buf|rtist-copy-generic|rtist-copy-rect|rtist-copy-square|rtist-current-column|rtist-current-line|rtist-cut-rect|rtist-cut-square|rtist-direction-char|rtist-direction-step-x|rtist-direction-step-y|rtist-do-nothing|rtist-down-mouse-1|rtist-down-mouse-3|rtist-draw-circle|rtist-draw-ellipse-general|rtist-draw-ellipse-with-0-height|rtist-draw-ellipse|rtist-draw-line|rtist-draw-rect|rtist-draw-region-reset|rtist-draw-region-trim-line-endings|rtist-draw-sline|rtist-draw-square|rtist-eight-point|rtist-ellipse-compute-fill-info|rtist-ellipse-fill-info-add-center|rtist-ellipse-generate-quadrant|rtist-ellipse-mirror-quadrant|rtist-ellipse-point-list-add-center|rtist-ellipse-remove-0-fills|rtist-endpoint-get-x|rtist-endpoint-get-y|rtist-erase-char|rtist-erase-rect|rtist-event-is-shifted|rtist-fc-get-fn-from-symbol|rtist-fc-get-fn|rtist-fc-get-keyword|rtist-fc-get-symbol|rtist-fc-retrieve-from-symbol-sub|rtist-fc-retrieve-from-symbol|rtist-ff-get-rightmost-from-xy|rtist-ff-is-bottommost-line|rtist-ff-is-topmost-line|rtist-ff-too-far-right|rtist-figlet-choose-font|rtist-figlet-get-extra-args|rtist-figlet-get-font-list|rtist-figlet-run|rtist-figlet|rtist-file-to-string|rtist-fill-circle|rtist-fill-ellipse|rtist-fill-item-get-width|rtist-fill-item-get-x|rtist-fill-item-get-y|rtist-fill-item-set-width|rtist-fill-item-set-x|rtist-fill-item-set-y|rtist-fill-rect|rtist-fill-square|rtist-find-direction|rtist-find-octant|rtist-flood-fill|rtist-forward-char|rtist-funcall|rtist-get-buffer-contents-at-xy|rtist-get-char-at-xy-conv|rtist-get-char-at-xy|rtist-get-dfdx-init-coeff|rtist-get-dfdy-init-coeff|rtist-get-first-non-nil-op|rtist-get-last-non-nil-op|rtist-get-replacement-char|rtist-get-x-step-q<0|rtist-get-x-step-q>=0|rtist-get-y-step-q<0|rtist-get-y-step-q>=0|rtist-go-get-arrow-pred-from-symbol|rtist-go-get-arrow-pred|rtist-go-get-arrow-set-fn-from-symbol|rtist-go-get-arrow-set-fn|rtist-go-get-desc|rtist-go-get-draw-fn-from-symbol|rtist-go-get-draw-fn|rtist-go-get-draw-how-from-symbol|rtist-go-get-draw-how|rtist-go-get-exit-fn-from-symbol|rtist-go-get-exit-fn|rtist-go-get-fill-fn-from-symbol|rtist-go-get-fill-fn|rtist-go-get-fill-pred-from-symbol|rtist-go-get-fill-pred|rtist-go-get-init-fn-from-symbol|rtist-go-get-init-fn|rtist-go-get-interval-fn-from-symbol|rtist-go-get-interval-fn|rtist-go-get-keyword-from-symbol|rtist-go-get-keyword|rtist-go-get-mode-line-from-symbol|rtist-go-get-mode-line|rtist-go-get-prep-fill-fn-from-symbol|rtist-go-get-prep-fill-fn|rtist-go-get-shifted|rtist-go-get-symbol-shift-sub|rtist-go-get-symbol-shift|rtist-go-get-symbol|rtist-go-get-undraw-fn-from-symbol|rtist-go-get-undraw-fn|rtist-go-get-unshifted|rtist-go-retrieve-from-symbol-sub|rtist-go-retrieve-from-symbol|rtist-intersection-char|rtist-is-in-op-list-p|rtist-key-do-continously-1point|rtist-key-do-continously-2points|rtist-key-do-continously-common)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1089,23 +1089,23 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:bidi-resolved-levels|binary-overwrite-mode|bindat--length-group|bindat--pack-group|bindat--pack-item|bindat--pack-u16|bindat--pack-u16r|bindat--pack-u24|bindat--pack-u24r|bindat--pack-u32|bindat--pack-u32r|bindat--pack-u8|bindat--unpack-group|bindat--unpack-item|bindat--unpack-u16|bindat--unpack-u16r|bindat--unpack-u24|bindat--unpack-u24r|bindat--unpack-u32|bindat--unpack-u32r|bindat--unpack-u8|bindat-format-vector|bindat-vector-to-dec|bindat-vector-to-hex|bindings--define-key|binhex-char-int|binhex-char-map|binhex-decode-region-external|binhex-decode-region-internal|binhex-decode-region|binhex-header|binhex-insert-char|binhex-push-char|binhex-string-big-endian|binhex-string-little-endian|binhex-update-crc|binhex-verify-crc|blackbox-mode|blackbox-redefine-key|blackbox|blink-cursor-check|blink-cursor-end|blink-cursor-mode|blink-cursor-start|blink-cursor-suspend|blink-cursor-timer-function|blink-matching-check-mismatch|blink-paren-post-self-insert-function|block|bookmark--jump-via|bookmark-alist-from-buffer|bookmark-all-names|bookmark-bmenu-1-window|bookmark-bmenu-2-window|bookmark-bmenu-any-marks|bookmark-bmenu-backup-unmark|bookmark-bmenu-bookmark|bookmark-bmenu-delete-backwards|bookmark-bmenu-delete|bookmark-bmenu-edit-annotation|bookmark-bmenu-ensure-position|bookmark-bmenu-execute-deletions|bookmark-bmenu-filter-alist-by-regexp|bookmark-bmenu-goto-bookmark|bookmark-bmenu-hide-filenames|bookmark-bmenu-list|bookmark-bmenu-load|bookmark-bmenu-locate|bookmark-bmenu-mark|bookmark-bmenu-mode|bookmark-bmenu-other-window-with-mouse|bookmark-bmenu-other-window|bookmark-bmenu-relocate|bookmark-bmenu-rename|bookmark-bmenu-save|bookmark-bmenu-search|bookmark-bmenu-select|bookmark-bmenu-set-header|bookmark-bmenu-show-all-annotations|bookmark-bmenu-show-annotation|bookmark-bmenu-show-filenames|bookmark-bmenu-surreptitiously-rebuild-list|bookmark-bmenu-switch-other-window|bookmark-bmenu-this-window|bookmark-bmenu-toggle-filenames|bookmark-bmenu-unmark|bookmark-buffer-file-name|bookmark-buffer-name|bookmark-completing-read|bookmark-default-annotation-text|bookmark-default-handler|bookmark-delete|bookmark-edit-annotation-mode|bookmark-edit-annotation|bookmark-exit-hook-internal|bookmark-get-annotation|bookmark-get-bookmark-record|bookmark-get-bookmark|bookmark-get-filename|bookmark-get-front-context-string|bookmark-get-handler|bookmark-get-position|bookmark-get-rear-context-string|bookmark-grok-file-format-version|bookmark-handle-bookmark|bookmark-import-new-list|bookmark-insert-annotation|bookmark-insert-file-format-version-stamp|bookmark-insert-location|bookmark-insert|bookmark-jump-noselect|bookmark-jump-other-window|bookmark-jump|bookmark-kill-line|bookmark-load|bookmark-locate|bookmark-location|bookmark-make-record-default|bookmark-make-record|bookmark-map|bookmark-maybe-historicize-string|bookmark-maybe-load-default-file|bookmark-maybe-message|bookmark-maybe-rename|bookmark-maybe-sort-alist|bookmark-maybe-upgrade-file-format|bookmark-menu-popup-paned-menu|bookmark-name-from-full-record|bookmark-prop-get|bookmark-prop-set|bookmark-relocate|bookmark-rename|bookmark-save|bookmark-send-edited-annotation|bookmark-set-annotation|bookmark-set-filename|bookmark-set-front-context-string|bookmark-set-name|bookmark-set-position|bookmark-set-rear-context-string|bookmark-set|bookmark-show-all-annotations|bookmark-show-annotation|bookmark-store|bookmark-time-to-save-p|bookmark-unload-function|bookmark-upgrade-file-format-from-0|bookmark-upgrade-version-0-alist|bookmark-write-file|bookmark-write|bookmark-yank-word|bool-vector|bound-and-true-p|bounds-of-thing-at-point|bovinate|bovine-grammar-mode|browse-url-at-mouse|browse-url-at-point|browse-url-can-use-xdg-open|browse-url-cci|browse-url-chromium|browse-url-default-browser|browse-url-default-macosx-browser|browse-url-default-windows-browser|browse-url-delete-temp-file|browse-url-elinks-new-window|browse-url-elinks-sentinel|browse-url-elinks|browse-url-emacs-display|browse-url-emacs|browse-url-encode-url|browse-url-epiphany-sentinel|browse-url-epiphany|browse-url-file-url|browse-url-firefox-sentinel|browse-url-firefox|browse-url-galeon-sentinel|browse-url-galeon|browse-url-generic|browse-url-gnome-moz|browse-url-interactive-arg|browse-url-kde|browse-url-mail|browse-url-maybe-new-window|browse-url-mosaic|browse-url-mozilla-sentinel|browse-url-mozilla|browse-url-netscape-reload|browse-url-netscape-send|browse-url-netscape-sentinel|browse-url-netscape|browse-url-of-buffer|browse-url-of-dired-file|browse-url-of-file|browse-url-of-region|browse-url-process-environment|browse-url-text-emacs|browse-url-text-xterm|browse-url-url-at-point|browse-url-url-encode-chars|browse-url-w3-gnudoit|browse-url-w3|browse-url-xdg-open|browse-url|browse-web|bs--configuration-name-for-prefix-arg|bs--create-header-line|bs--current-buffer|bs--current-config-message|bs--down|bs--format-aux|bs--get-file-name|bs--get-marked-string|bs--get-mode-name|bs--get-modified-string|bs--get-name-length|bs--get-name|bs--get-readonly-string|bs--get-size-string|bs--get-value|bs--goto-current-buffer|bs--insert-one-entry|bs--make-header-match-string|bs--mark-unmark|bs--nth-wrapper|bs--redisplay|bs--remove-hooks|bs--restore-window-config|bs--set-toggle-to-show|bs--set-window-height|bs--show-config-message|bs--show-header|bs--show-with-configuration|bs--sort-by-filename|bs--sort-by-mode|bs--sort-by-name|bs--sort-by-size|bs--track-window-changes|bs--up|bs--update-current-line|bs-abort|bs-apply-sort-faces|bs-buffer-list|bs-buffer-sort|bs-bury-buffer|bs-clear-modified|bs-config--all-intern-last|bs-config--all|bs-config--files-and-scratch|bs-config--only-files|bs-config-clear|bs-customize|bs-cycle-next|bs-cycle-previous|bs-define-sort-function|bs-delete-backward|bs-delete|bs-down|bs-help|bs-kill|bs-mark-current|bs-message-without-log|bs-mode|bs-mouse-select-other-frame|bs-mouse-select|bs-next-buffer|bs-next-config-aux|bs-next-config|bs-previous-buffer|bs-refresh|bs-save|bs-select-in-one-window|bs-select-next-configuration|bs-select-other-frame|bs-select-other-window|bs-select|bs-set-configuration-and-refresh|bs-set-configuration|bs-set-current-buffer-to-show-always|bs-set-current-buffer-to-show-never|bs-show-in-buffer|bs-show-sorted|bs-show|bs-sort-buffer-interns-are-last|bs-tmp-select-other-window|bs-toggle-current-to-show|bs-toggle-readonly|bs-toggle-show-all|bs-unload-function|bs-unmark-current|bs-up|bs-view|bs-visit-tags-table|bs-visits-non-file|bubbles--char-at|bubbles--col|bubbles--colors|bubbles--compute-offsets|bubbles--count|bubbles--empty-char|bubbles--game-over|bubbles--goto|bubbles--grid-height|bubbles--grid-width|bubbles--initialize-faces|bubbles--initialize-images|bubbles--initialize|bubbles--mark-direct-neighbors|bubbles--mark-neighborhood|bubbles--neighborhood-available|bubbles--remove-overlays|bubbles--reset-score|bubbles--row|bubbles--set-faces|bubbles--shift-mode|bubbles--shift|bubbles--show-images|bubbles--show-scores|bubbles--update-faces-or-images|bubbles--update-neighborhood-score|bubbles--update-score|bubbles-customize|bubbles-mode|bubbles-plop|bubbles-quit|bubbles-save-settings|bubbles-set-game-difficult|bubbles-set-game-easy|bubbles-set-game-hard|bubbles-set-game-medium|bubbles-set-game-userdefined|bubbles-set-graphics-theme-ascii|bubbles-set-graphics-theme-balls|bubbles-set-graphics-theme-circles|bubbles-set-graphics-theme-diamonds|bubbles-set-graphics-theme-emacs|bubbles-set-graphics-theme-squares|bubbles-undo|bubbles|buffer-face-mode-invoke|buffer-face-mode|buffer-face-set|buffer-face-toggle|buffer-has-markers-at|buffer-menu-open|buffer-menu-other-window|buffer-menu|buffer-stale--default-function|buffer-substring--filter|buffer-substring-with-bidi-context|bug-reference-fontify|bug-reference-mode|bug-reference-prog-mode|bug-reference-push-button|bug-reference-set-overlay-properties|bug-reference-unfontify|build-mail-abbrevs|build-mail-aliases|bury-buffer-internal|butterfly|button--area-button-p|button--area-button-string|button-category-symbol|byte-code|byte-compile--declare-var|byte-compile--reify-function|byte-compile-abbreviate-file|byte-compile-and-folded|byte-compile-and-recursion|byte-compile-and|byte-compile-annotate-call-tree|byte-compile-arglist-signature-string|byte-compile-arglist-signature|byte-compile-arglist-signatures-congruent-p|byte-compile-arglist-vars|byte-compile-arglist-warn|byte-compile-associative|byte-compile-autoload|byte-compile-backward-char|byte-compile-backward-word|byte-compile-bind|byte-compile-body-do-effect|byte-compile-body|byte-compile-butlast|byte-compile-callargs-warn|byte-compile-catch|byte-compile-char-before|byte-compile-check-lambda-list|byte-compile-check-variable|byte-compile-cl-file-p|byte-compile-cl-warn|byte-compile-close-variables|byte-compile-concat|byte-compile-cond|byte-compile-condition-case--new|byte-compile-condition-case--old|byte-compile-condition-case|byte-compile-constant|byte-compile-constants-vector|byte-compile-defvar|byte-compile-delete-first|byte-compile-dest-file|byte-compile-disable-warning|byte-compile-discard|byte-compile-dynamic-variable-bind|byte-compile-dynamic-variable-op|byte-compile-enable-warning|byte-compile-eval-before-compile|byte-compile-eval|byte-compile-fdefinition|byte-compile-file-form-autoload|byte-compile-file-form-custom-declare-variable|byte-compile-file-form-defalias|byte-compile-file-form-define-abbrev-table|byte-compile-file-form-defmumble|byte-compile-file-form-defvar|byte-compile-file-form-eval|byte-compile-file-form-progn|byte-compile-file-form-require|byte-compile-file-form-with-no-warnings|byte-compile-file-form|byte-compile-find-bound-condition|byte-compile-find-cl-functions|byte-compile-fix-header|byte-compile-flush-pending|byte-compile-form-do-effect|byte-compile-form-make-variable-buffer-local|byte-compile-form|byte-compile-format-warn|byte-compile-from-buffer|byte-compile-fset|byte-compile-funcall|byte-compile-function-form|byte-compile-function-warn|byte-compile-get-closed-var|byte-compile-get-constant|byte-compile-goto-if|byte-compile-goto|byte-compile-if|byte-compile-indent-to|byte-compile-inline-expand|byte-compile-inline-lapcode|byte-compile-insert-header|byte-compile-insert|byte-compile-keep-pending|byte-compile-lambda-form|byte-compile-lambda|byte-compile-lapcode|byte-compile-let|byte-compile-list|byte-compile-log-1|byte-compile-log-file|byte-compile-log-lap-1|byte-compile-log-lap|byte-compile-log-warning|byte-compile-log|byte-compile-macroexpand-declare-function|byte-compile-make-args-desc|byte-compile-make-closure|byte-compile-make-lambda-lexenv|byte-compile-make-obsolete-variable|byte-compile-make-tag|byte-compile-make-variable-buffer-local|byte-compile-maybe-guarded|byte-compile-minus|byte-compile-nconc|byte-compile-negated|byte-compile-negation-optimizer|byte-compile-nilconstp|byte-compile-no-args|byte-compile-no-warnings|byte-compile-nogroup-warn|byte-compile-noop|byte-compile-normal-call|byte-compile-not-lexical-var-p|byte-compile-one-arg|byte-compile-one-or-two-args|byte-compile-or-recursion|byte-compile-or|byte-compile-out-tag|byte-compile-out-toplevel|byte-compile-out|byte-compile-output-as-comment|byte-compile-output-docform|byte-compile-output-file-form|byte-compile-preprocess|byte-compile-print-syms|byte-compile-prog1|byte-compile-prog2|byte-compile-progn|byte-compile-push-binding-init|byte-compile-push-bytecode-const2|byte-compile-push-bytecodes|byte-compile-push-constant|byte-compile-quo|byte-compile-quote|byte-compile-recurse-toplevel|byte-compile-refresh-preloaded|byte-compile-report-error|byte-compile-report-ops|byte-compile-save-current-buffer|byte-compile-save-excursion|byte-compile-save-restriction|byte-compile-set-default|byte-compile-set-symbol-position|byte-compile-setq-default|byte-compile-setq|byte-compile-sexp|byte-compile-stack-adjustment|byte-compile-stack-ref|byte-compile-stack-set|byte-compile-subr-wrong-args|byte-compile-three-args|byte-compile-top-level-body|byte-compile-top-level|byte-compile-toplevel-file-form|byte-compile-trueconstp|byte-compile-two-args|byte-compile-two-or-three-args|byte-compile-unbind|byte-compile-unfold-bcf|byte-compile-unfold-lambda|byte-compile-unwind-protect|byte-compile-variable-ref)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)b(?:idi-resolved-levels|inary-overwrite-mode|indat--length-group|indat--pack-group|indat--pack-item|indat--pack-u16|indat--pack-u16r|indat--pack-u24|indat--pack-u24r|indat--pack-u32|indat--pack-u32r|indat--pack-u8|indat--unpack-group|indat--unpack-item|indat--unpack-u16|indat--unpack-u16r|indat--unpack-u24|indat--unpack-u24r|indat--unpack-u32|indat--unpack-u32r|indat--unpack-u8|indat-format-vector|indat-vector-to-dec|indat-vector-to-hex|indings--define-key|inhex-char-int|inhex-char-map|inhex-decode-region-external|inhex-decode-region-internal|inhex-decode-region|inhex-header|inhex-insert-char|inhex-push-char|inhex-string-big-endian|inhex-string-little-endian|inhex-update-crc|inhex-verify-crc|lackbox-mode|lackbox-redefine-key|lackbox|link-cursor-check|link-cursor-end|link-cursor-mode|link-cursor-start|link-cursor-suspend|link-cursor-timer-function|link-matching-check-mismatch|link-paren-post-self-insert-function|lock|ookmark--jump-via|ookmark-alist-from-buffer|ookmark-all-names|ookmark-bmenu-1-window|ookmark-bmenu-2-window|ookmark-bmenu-any-marks|ookmark-bmenu-backup-unmark|ookmark-bmenu-bookmark|ookmark-bmenu-delete-backwards|ookmark-bmenu-delete|ookmark-bmenu-edit-annotation|ookmark-bmenu-ensure-position|ookmark-bmenu-execute-deletions|ookmark-bmenu-filter-alist-by-regexp|ookmark-bmenu-goto-bookmark|ookmark-bmenu-hide-filenames|ookmark-bmenu-list|ookmark-bmenu-load|ookmark-bmenu-locate|ookmark-bmenu-mark|ookmark-bmenu-mode|ookmark-bmenu-other-window-with-mouse|ookmark-bmenu-other-window|ookmark-bmenu-relocate|ookmark-bmenu-rename|ookmark-bmenu-save|ookmark-bmenu-search|ookmark-bmenu-select|ookmark-bmenu-set-header|ookmark-bmenu-show-all-annotations|ookmark-bmenu-show-annotation|ookmark-bmenu-show-filenames|ookmark-bmenu-surreptitiously-rebuild-list|ookmark-bmenu-switch-other-window|ookmark-bmenu-this-window|ookmark-bmenu-toggle-filenames|ookmark-bmenu-unmark|ookmark-buffer-file-name|ookmark-buffer-name|ookmark-completing-read|ookmark-default-annotation-text|ookmark-default-handler|ookmark-delete|ookmark-edit-annotation-mode|ookmark-edit-annotation|ookmark-exit-hook-internal|ookmark-get-annotation|ookmark-get-bookmark-record|ookmark-get-bookmark|ookmark-get-filename|ookmark-get-front-context-string|ookmark-get-handler|ookmark-get-position|ookmark-get-rear-context-string|ookmark-grok-file-format-version|ookmark-handle-bookmark|ookmark-import-new-list|ookmark-insert-annotation|ookmark-insert-file-format-version-stamp|ookmark-insert-location|ookmark-insert|ookmark-jump-noselect|ookmark-jump-other-window|ookmark-jump|ookmark-kill-line|ookmark-load|ookmark-locate|ookmark-location|ookmark-make-record-default|ookmark-make-record|ookmark-map|ookmark-maybe-historicize-string|ookmark-maybe-load-default-file|ookmark-maybe-message|ookmark-maybe-rename|ookmark-maybe-sort-alist|ookmark-maybe-upgrade-file-format|ookmark-menu-popup-paned-menu|ookmark-name-from-full-record|ookmark-prop-get|ookmark-prop-set|ookmark-relocate|ookmark-rename|ookmark-save|ookmark-send-edited-annotation|ookmark-set-annotation|ookmark-set-filename|ookmark-set-front-context-string|ookmark-set-name|ookmark-set-position|ookmark-set-rear-context-string|ookmark-set|ookmark-show-all-annotations|ookmark-show-annotation|ookmark-store|ookmark-time-to-save-p|ookmark-unload-function|ookmark-upgrade-file-format-from-0|ookmark-upgrade-version-0-alist|ookmark-write-file|ookmark-write|ookmark-yank-word|ool-vector|ound-and-true-p|ounds-of-thing-at-point|ovinate|ovine-grammar-mode|rowse-url-at-mouse|rowse-url-at-point|rowse-url-can-use-xdg-open|rowse-url-cci|rowse-url-chromium|rowse-url-default-browser|rowse-url-default-macosx-browser|rowse-url-default-windows-browser|rowse-url-delete-temp-file|rowse-url-elinks-new-window|rowse-url-elinks-sentinel|rowse-url-elinks|rowse-url-emacs-display|rowse-url-emacs|rowse-url-encode-url|rowse-url-epiphany-sentinel|rowse-url-epiphany|rowse-url-file-url|rowse-url-firefox-sentinel|rowse-url-firefox|rowse-url-galeon-sentinel|rowse-url-galeon|rowse-url-generic|rowse-url-gnome-moz|rowse-url-interactive-arg|rowse-url-kde|rowse-url-mail|rowse-url-maybe-new-window|rowse-url-mosaic|rowse-url-mozilla-sentinel|rowse-url-mozilla|rowse-url-netscape-reload|rowse-url-netscape-send|rowse-url-netscape-sentinel|rowse-url-netscape|rowse-url-of-buffer|rowse-url-of-dired-file|rowse-url-of-file|rowse-url-of-region|rowse-url-process-environment|rowse-url-text-emacs|rowse-url-text-xterm|rowse-url-url-at-point|rowse-url-url-encode-chars|rowse-url-w3-gnudoit|rowse-url-w3|rowse-url-xdg-open|rowse-url|rowse-web|s--configuration-name-for-prefix-arg|s--create-header-line|s--current-buffer|s--current-config-message|s--down|s--format-aux|s--get-file-name|s--get-marked-string|s--get-mode-name|s--get-modified-string|s--get-name-length|s--get-name|s--get-readonly-string|s--get-size-string|s--get-value|s--goto-current-buffer|s--insert-one-entry|s--make-header-match-string|s--mark-unmark|s--nth-wrapper|s--redisplay|s--remove-hooks|s--restore-window-config|s--set-toggle-to-show|s--set-window-height|s--show-config-message|s--show-header|s--show-with-configuration|s--sort-by-filename|s--sort-by-mode|s--sort-by-name|s--sort-by-size|s--track-window-changes|s--up|s--update-current-line|s-abort|s-apply-sort-faces|s-buffer-list|s-buffer-sort|s-bury-buffer|s-clear-modified|s-config--all-intern-last|s-config--all|s-config--files-and-scratch|s-config--only-files|s-config-clear|s-customize|s-cycle-next|s-cycle-previous|s-define-sort-function|s-delete-backward|s-delete|s-down|s-help|s-kill|s-mark-current|s-message-without-log|s-mode|s-mouse-select-other-frame|s-mouse-select|s-next-buffer|s-next-config-aux|s-next-config|s-previous-buffer|s-refresh|s-save|s-select-in-one-window|s-select-next-configuration|s-select-other-frame|s-select-other-window|s-select|s-set-configuration-and-refresh|s-set-configuration|s-set-current-buffer-to-show-always|s-set-current-buffer-to-show-never|s-show-in-buffer|s-show-sorted|s-show|s-sort-buffer-interns-are-last|s-tmp-select-other-window|s-toggle-current-to-show|s-toggle-readonly|s-toggle-show-all|s-unload-function|s-unmark-current|s-up|s-view|s-visit-tags-table|s-visits-non-file|ubbles--char-at|ubbles--col|ubbles--colors|ubbles--compute-offsets|ubbles--count|ubbles--empty-char|ubbles--game-over|ubbles--goto|ubbles--grid-height|ubbles--grid-width|ubbles--initialize-faces|ubbles--initialize-images|ubbles--initialize|ubbles--mark-direct-neighbors|ubbles--mark-neighborhood|ubbles--neighborhood-available|ubbles--remove-overlays|ubbles--reset-score|ubbles--row|ubbles--set-faces|ubbles--shift-mode|ubbles--shift|ubbles--show-images|ubbles--show-scores|ubbles--update-faces-or-images|ubbles--update-neighborhood-score|ubbles--update-score|ubbles-customize|ubbles-mode|ubbles-plop|ubbles-quit|ubbles-save-settings|ubbles-set-game-difficult|ubbles-set-game-easy|ubbles-set-game-hard|ubbles-set-game-medium|ubbles-set-game-userdefined|ubbles-set-graphics-theme-ascii|ubbles-set-graphics-theme-balls|ubbles-set-graphics-theme-circles|ubbles-set-graphics-theme-diamonds|ubbles-set-graphics-theme-emacs|ubbles-set-graphics-theme-squares|ubbles-undo|ubbles|uffer-face-mode-invoke|uffer-face-mode|uffer-face-set|uffer-face-toggle|uffer-has-markers-at|uffer-menu-open|uffer-menu-other-window|uffer-menu|uffer-stale--default-function|uffer-substring--filter|uffer-substring-with-bidi-context|ug-reference-fontify|ug-reference-mode|ug-reference-prog-mode|ug-reference-push-button|ug-reference-set-overlay-properties|ug-reference-unfontify|uild-mail-abbrevs|uild-mail-aliases|ury-buffer-internal|utterfly|utton--area-button-p|utton--area-button-string|utton-category-symbol|yte-code|yte-compile--declare-var|yte-compile--reify-function|yte-compile-abbreviate-file|yte-compile-and-folded|yte-compile-and-recursion|yte-compile-and|yte-compile-annotate-call-tree|yte-compile-arglist-signature-string|yte-compile-arglist-signature|yte-compile-arglist-signatures-congruent-p|yte-compile-arglist-vars|yte-compile-arglist-warn|yte-compile-associative|yte-compile-autoload|yte-compile-backward-char|yte-compile-backward-word|yte-compile-bind|yte-compile-body-do-effect|yte-compile-body|yte-compile-butlast|yte-compile-callargs-warn|yte-compile-catch|yte-compile-char-before|yte-compile-check-lambda-list|yte-compile-check-variable|yte-compile-cl-file-p|yte-compile-cl-warn|yte-compile-close-variables|yte-compile-concat|yte-compile-cond|yte-compile-condition-case--new|yte-compile-condition-case--old|yte-compile-condition-case|yte-compile-constant|yte-compile-constants-vector|yte-compile-defvar|yte-compile-delete-first|yte-compile-dest-file|yte-compile-disable-warning|yte-compile-discard|yte-compile-dynamic-variable-bind|yte-compile-dynamic-variable-op|yte-compile-enable-warning|yte-compile-eval-before-compile|yte-compile-eval|yte-compile-fdefinition|yte-compile-file-form-autoload|yte-compile-file-form-custom-declare-variable|yte-compile-file-form-defalias|yte-compile-file-form-define-abbrev-table|yte-compile-file-form-defmumble|yte-compile-file-form-defvar|yte-compile-file-form-eval|yte-compile-file-form-progn|yte-compile-file-form-require|yte-compile-file-form-with-no-warnings|yte-compile-file-form|yte-compile-find-bound-condition|yte-compile-find-cl-functions|yte-compile-fix-header|yte-compile-flush-pending|yte-compile-form-do-effect|yte-compile-form-make-variable-buffer-local|yte-compile-form|yte-compile-format-warn|yte-compile-from-buffer|yte-compile-fset|yte-compile-funcall|yte-compile-function-form|yte-compile-function-warn|yte-compile-get-closed-var|yte-compile-get-constant|yte-compile-goto-if|yte-compile-goto|yte-compile-if|yte-compile-indent-to|yte-compile-inline-expand|yte-compile-inline-lapcode|yte-compile-insert-header|yte-compile-insert|yte-compile-keep-pending|yte-compile-lambda-form|yte-compile-lambda|yte-compile-lapcode|yte-compile-let|yte-compile-list|yte-compile-log-1|yte-compile-log-file|yte-compile-log-lap-1|yte-compile-log-lap|yte-compile-log-warning|yte-compile-log|yte-compile-macroexpand-declare-function|yte-compile-make-args-desc|yte-compile-make-closure|yte-compile-make-lambda-lexenv|yte-compile-make-obsolete-variable|yte-compile-make-tag|yte-compile-make-variable-buffer-local|yte-compile-maybe-guarded|yte-compile-minus|yte-compile-nconc|yte-compile-negated|yte-compile-negation-optimizer|yte-compile-nilconstp|yte-compile-no-args|yte-compile-no-warnings|yte-compile-nogroup-warn|yte-compile-noop|yte-compile-normal-call|yte-compile-not-lexical-var-p|yte-compile-one-arg|yte-compile-one-or-two-args|yte-compile-or-recursion|yte-compile-or|yte-compile-out-tag|yte-compile-out-toplevel|yte-compile-out|yte-compile-output-as-comment|yte-compile-output-docform|yte-compile-output-file-form|yte-compile-preprocess|yte-compile-print-syms|yte-compile-prog1|yte-compile-prog2|yte-compile-progn|yte-compile-push-binding-init|yte-compile-push-bytecode-const2|yte-compile-push-bytecodes|yte-compile-push-constant|yte-compile-quo|yte-compile-quote|yte-compile-recurse-toplevel|yte-compile-refresh-preloaded|yte-compile-report-error|yte-compile-report-ops|yte-compile-save-current-buffer|yte-compile-save-excursion|yte-compile-save-restriction|yte-compile-set-default|yte-compile-set-symbol-position|yte-compile-setq-default|yte-compile-setq|yte-compile-sexp|yte-compile-stack-adjustment|yte-compile-stack-ref|yte-compile-stack-set|yte-compile-subr-wrong-args|yte-compile-three-args|yte-compile-top-level-body|yte-compile-top-level|yte-compile-toplevel-file-form|yte-compile-trueconstp|yte-compile-two-args|yte-compile-two-or-three-args|yte-compile-unbind|yte-compile-unfold-bcf|yte-compile-unfold-lambda|yte-compile-unwind-protect|yte-compile-variable-ref)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:byte-compile-variable-set|byte-compile-warn-about-unresolved-functions|byte-compile-warn-obsolete|byte-compile-warn|byte-compile-warning-enabled-p|byte-compile-warning-prefix|byte-compile-warning-series|byte-compile-while|byte-compile-zero-or-one-arg|byte-compiler-base-file-name|byte-decompile-bytecode-1|byte-decompile-bytecode|byte-defop-compiler-1|byte-defop-compiler|byte-defop|byte-extrude-byte-code-vectors|byte-force-recompile|byte-optimize-all-constp|byte-optimize-and|byte-optimize-apply|byte-optimize-approx-equal|byte-optimize-associative-math|byte-optimize-binary-predicate|byte-optimize-body|byte-optimize-cond|byte-optimize-delay-constants-math|byte-optimize-divide|byte-optimize-form-code-walker|byte-optimize-form|byte-optimize-funcall|byte-optimize-identity|byte-optimize-if|byte-optimize-inline-handler|byte-optimize-lapcode|byte-optimize-letX|byte-optimize-logmumble|byte-optimize-minus|byte-optimize-multiply|byte-optimize-nonassociative-math|byte-optimize-nth|byte-optimize-nthcdr|byte-optimize-or|byte-optimize-plus|byte-optimize-predicate|byte-optimize-quote|byte-optimize-set|byte-optimize-while|byte-recompile-file|byteorder|c\\+\\+-font-lock-keywords-2|c\\+\\+-font-lock-keywords-3|c\\+\\+-font-lock-keywords|c\\+\\+-mode|c--macroexpand-all|c-add-class-syntax|c-add-language|c-add-stmt-syntax|c-add-style|c-add-syntax|c-add-type|c-advise-fl-for-region|c-after-change-check-<>-operators|c-after-change|c-after-conditional|c-after-font-lock-init|c-after-special-operator-id|c-after-statement-terminator-p|c-append-backslashes-forward|c-append-lower-brace-pair-to-state-cache|c-append-syntax|c-append-to-state-cache|c-ascertain-following-literal|c-ascertain-preceding-literal|c-at-expression-start-p|c-at-macro-vsemi-p|c-at-statement-start-p|c-at-toplevel-p|c-at-vsemi-p|c-awk-menu|c-back-over-illiterals|c-back-over-member-initializer-braces|c-back-over-member-initializers|c-backslash-region|c-backward-<>-arglist|c-backward-colon-prefixed-type|c-backward-comments|c-backward-conditional|c-backward-into-nomenclature|c-backward-over-enum-header|c-backward-sexp|c-backward-single-comment|c-backward-sws|c-backward-syntactic-ws|c-backward-to-block-anchor|c-backward-to-decl-anchor|c-backward-to-nth-BOF-\\{|c-backward-token-1|c-backward-token-2|c-basic-common-init|c-before-change-check-<>-operators|c-before-change|c-before-hack-hook|c-beginning-of-current-token|c-beginning-of-decl-1|c-beginning-of-defun-1|c-beginning-of-defun|c-beginning-of-inheritance-list|c-beginning-of-macro|c-beginning-of-sentence-in-comment|c-beginning-of-sentence-in-string|c-beginning-of-statement-1|c-beginning-of-statement|c-beginning-of-syntax|c-benign-error|c-bind-special-erase-keys|c-block-in-arglist-dwim|c-bos-pop-state-and-retry|c-bos-pop-state|c-bos-push-state|c-bos-report-error|c-bos-restore-pos|c-bos-save-error-info|c-bos-save-pos|c-brace-anchor-point|c-brace-newlines|c-c\\+\\+-menu|c-c-menu|c-calc-comment-indent|c-calc-offset|c-calculate-state|c-change-set-fl-decl-start|c-cheap-inside-bracelist-p|c-check-type|c-clear-<-pair-props-if-match-after|c-clear-<-pair-props|c-clear-<>-pair-props|c-clear->-pair-props-if-match-before|c-clear->-pair-props|c-clear-c-type-property|c-clear-char-properties|c-clear-char-property-with-value-function|c-clear-char-property-with-value|c-clear-char-property|c-clear-cpp-delimiters|c-clear-found-types|c-collect-line-comments|c-comment-indent|c-comment-line-break-function|c-comment-out-cpps|c-common-init|c-compose-keywords-list|c-concat-separated|c-constant-symbol|c-context-line-break|c-context-open-line|c-context-set-fl-decl-start|c-count-cfss|c-cpp-define-name|c-crosses-statement-barrier-p|c-debug-add-face|c-debug-parse-state-double-cons|c-debug-parse-state|c-debug-put-decl-spot-faces|c-debug-remove-decl-spot-faces|c-debug-remove-face|c-debug-sws-msg|c-declaration-limits|c-declare-lang-variables|c-default-value-sentence-end|c-define-abbrev-table|c-define-lang-constant|c-defun-name|c-delete-and-extract-region|c-delete-backslashes-forward|c-delete-overlay|c-determine-\\+ve-limit|c-determine-limit-get-base|c-determine-limit|c-do-auto-fill|c-down-conditional-with-else|c-down-conditional|c-down-list-backward|c-down-list-forward|c-echo-parsing-error|c-electric-backspace|c-electric-brace|c-electric-colon|c-electric-continued-statement|c-electric-delete-forward|c-electric-delete|c-electric-indent-local-mode-hook|c-electric-indent-mode-hook|c-electric-lt-gt|c-electric-paren|c-electric-pound|c-electric-semi&comma|c-electric-slash|c-electric-star|c-end-of-current-token|c-end-of-decl-1|c-end-of-defun-1|c-end-of-defun|c-end-of-macro|c-end-of-sentence-in-comment|c-end-of-sentence-in-string|c-end-of-statement|c-evaluate-offset|c-extend-after-change-region|c-extend-font-lock-region-for-macros|c-extend-region-for-CPP|c-face-name-p|c-fdoc-shift-type-backward|c-fill-paragraph|c-find-assignment-for-mode|c-find-decl-prefix-search|c-find-decl-spots|c-find-invalid-doc-markup|c-fn-region-is-active-p|c-font-lock-<>-arglists|c-font-lock-c\\+\\+-new|c-font-lock-complex-decl-prepare|c-font-lock-declarations|c-font-lock-declarators|c-font-lock-doc-comments|c-font-lock-enclosing-decls|c-font-lock-enum-tail|c-font-lock-fontify-region|c-font-lock-init|c-font-lock-invalid-string|c-font-lock-keywords-2|c-font-lock-keywords-3|c-font-lock-keywords|c-font-lock-labels|c-font-lock-objc-method|c-font-lock-objc-methods|c-fontify-recorded-types-and-refs|c-fontify-types-and-refs|c-forward-<>-arglist-recur|c-forward-<>-arglist|c-forward-annotation|c-forward-comments|c-forward-conditional|c-forward-decl-or-cast-1|c-forward-id-comma-list|c-forward-into-nomenclature|c-forward-keyword-clause|c-forward-keyword-prefixed-id|c-forward-label|c-forward-name|c-forward-objc-directive|c-forward-over-cpp-define-id|c-forward-over-illiterals|c-forward-sexp|c-forward-single-comment|c-forward-sws|c-forward-syntactic-ws|c-forward-to-cpp-define-body|c-forward-to-nth-EOF-\\}|c-forward-token-1|c-forward-token-2|c-forward-type|c-get-cache-scan-pos|c-get-char-property|c-get-current-file|c-get-lang-constant|c-get-offset|c-get-style-variables|c-get-syntactic-indentation|c-gnu-impose-minimum|c-go-down-list-backward|c-go-down-list-forward|c-go-list-backward|c-go-list-forward|c-go-up-list-backward|c-go-up-list-forward|c-got-face-at|c-guess-accumulate-offset|c-guess-accumulate|c-guess-basic-syntax|c-guess-buffer-no-install|c-guess-buffer|c-guess-continued-construct|c-guess-current-offset|c-guess-dump-accumulator|c-guess-dump-guessed-style|c-guess-dump-guessed-values|c-guess-empty-line-p|c-guess-examine|c-guess-fill-prefix|c-guess-guess|c-guess-guessed-syntactic-symbols|c-guess-install|c-guess-make-basic-offset|c-guess-make-offsets-alist|c-guess-make-style|c-guess-merge-offsets-alists|c-guess-no-install|c-guess-region-no-install|c-guess-region|c-guess-reset-accumulator|c-guess-sort-accumulator|c-guess-style-name|c-guess-symbolize-integer|c-guess-symbolize-offsets-alist|c-guess-view-mark-guessed-entries|c-guess-view-reorder-offsets-alist-in-style|c-guess-view|c-guess|c-hungry-backspace|c-hungry-delete-backwards|c-hungry-delete-forward|c-hungry-delete|c-idl-menu|c-in-comment-line-prefix-p|c-in-function-trailer-p|c-in-gcc-asm-p|c-in-knr-argdecl|c-in-literal|c-in-method-def-p|c-indent-command|c-indent-defun|c-indent-exp|c-indent-line-or-region|c-indent-line|c-indent-multi-line-block|c-indent-new-comment-line|c-indent-one-line-block|c-indent-region|c-init-language-vars-for|c-initialize-builtin-style|c-initialize-cc-mode|c-inside-bracelist-p|c-int-to-char|c-intersect-lists|c-invalidate-find-decl-cache|c-invalidate-macro-cache|c-invalidate-state-cache-1|c-invalidate-state-cache|c-invalidate-sws-region-after|c-java-menu|c-just-after-func-arglist-p|c-keep-region-active|c-keyword-member|c-keyword-sym|c-lang-const|c-lang-defconst-eval-immediately|c-lang-defconst|c-lang-major-mode-is|c-langelem-2nd-pos|c-langelem-col|c-langelem-pos|c-langelem-sym|c-last-command-char|c-least-enclosing-brace|c-leave-cc-mode-mode|c-lineup-C-comments|c-lineup-ObjC-method-args-2|c-lineup-ObjC-method-args|c-lineup-ObjC-method-call-colons|c-lineup-ObjC-method-call|c-lineup-after-whitesmith-blocks|c-lineup-argcont-scan|c-lineup-argcont|c-lineup-arglist-close-under-paren|c-lineup-arglist-intro-after-paren|c-lineup-arglist-operators|c-lineup-arglist|c-lineup-assignments|c-lineup-cascaded-calls|c-lineup-close-paren|c-lineup-comment|c-lineup-cpp-define|c-lineup-dont-change|c-lineup-gcc-asm-reg|c-lineup-gnu-DEFUN-intro-cont|c-lineup-inexpr-block|c-lineup-java-inher|c-lineup-java-throws|c-lineup-knr-region-comment|c-lineup-math|c-lineup-multi-inher|c-lineup-respect-col-0|c-lineup-runin-statements|c-lineup-streamop|c-lineup-string-cont|c-lineup-template-args|c-lineup-topmost-intro-cont|c-lineup-whitesmith-in-block|c-list-found-types|c-literal-limits-fast|c-literal-limits|c-literal-type|c-looking-at-bos|c-looking-at-decl-block|c-looking-at-inexpr-block-backward|c-looking-at-inexpr-block|c-looking-at-non-alphnumspace|c-looking-at-special-brace-list|c-lookup-lists|c-macro-display-buffer|c-macro-expand|c-macro-expansion|c-macro-is-genuine-p|c-macro-vsemi-status-unknown-p|c-major-mode-is|c-make-bare-char-alt|c-make-font-lock-BO-decl-search-function|c-make-font-lock-context-search-function|c-make-font-lock-extra-types-blurb|c-make-font-lock-search-form|c-make-font-lock-search-function|c-make-inherited-keymap|c-make-inverse-face|c-make-keywords-re|c-make-macro-with-semi-re|c-make-styles-buffer-local|c-make-syntactic-matcher|c-mark-<-as-paren|c-mark->-as-paren|c-mark-function|c-mask-paragraph|c-mode-menu|c-mode-symbol|c-mode-var|c-mode|c-most-enclosing-brace|c-most-enclosing-decl-block|c-narrow-to-comment-innards|c-narrow-to-most-enclosing-decl-block|c-neutralize-CPP-line|c-neutralize-syntax-in-and-mark-CPP|c-newline-and-indent|c-next-single-property-change|c-objc-menu|c-on-identifier|c-one-line-string-p|c-outline-level|c-override-default-keywords|c-parse-state-1|c-parse-state-get-strategy|c-parse-state|c-partial-ws-p|c-pike-menu|c-point-syntax|c-point|c-populate-syntax-table|c-postprocess-file-styles|c-progress-fini|c-progress-init|c-progress-update|c-pull-open-brace|c-punctuation-in|c-put-c-type-property|c-put-char-property-fun|c-put-char-property|c-put-font-lock-face|c-put-font-lock-string-face|c-put-in-sws|c-put-is-sws|c-put-overlay|c-query-and-set-macro-start|c-query-macro-start|c-read-offset|c-real-parse-state|c-record-parse-state-state|c-record-ref-id|c-record-type-id|c-regexp-opt-depth|c-regexp-opt|c-region-is-active-p|c-remove-any-local-eval-or-mode-variables|c-remove-font-lock-face|c-remove-in-sws|c-remove-is-and-in-sws|c-remove-is-sws|c-remove-stale-state-cache-backwards|c-remove-stale-state-cache|c-renarrow-state-cache|c-replay-parse-state-state|c-restore-<->-as-parens|c-run-mode-hooks|c-safe-position|c-safe-scan-lists|c-safe|c-save-buffer-state|c-sc-parse-partial-sexp-no-category|c-sc-parse-partial-sexp|c-sc-scan-lists-no-category\\+1\\+1|c-sc-scan-lists-no-category\\+1-1|c-sc-scan-lists-no-category-1\\+1|c-sc-scan-lists-no-category-1-1|c-sc-scan-lists|c-scan-conditionals|c-scope-operator|c-search-backward-char-property|c-search-decl-header-end|c-search-forward-char-property|c-search-uplist-for-classkey|c-semi&comma-inside-parenlist|c-semi&comma-no-newlines-before-nonblanks|c-semi&comma-no-newlines-for-oneline-inliners|c-sentence-end|c-set-cpp-delimiters|c-set-fl-decl-start|c-set-offset|c-set-region-active|c-set-style-1|c-set-style|c-set-stylevar-fallback|c-setup-doc-comment-style|c-setup-filladapt|c-setup-paragraph-variables|c-shift-line-indentation|c-show-syntactic-information|c-simple-skip-symbol-backward|c-skip-comments-and-strings|c-skip-conditional|c-skip-ws-backward|c-skip-ws-forward|c-snug-1line-defun-close|c-snug-do-while|c-ssb-lit-begin|c-state-balance-parens-backwards|c-state-cache-after-top-paren|c-state-cache-init|c-state-cache-non-literal-place|c-state-cache-top-lparen|c-state-cache-top-paren|c-state-get-min-scan-pos|c-state-lit-beg|c-state-literal-at|c-state-mark-point-min-literal|c-state-maybe-marker|c-state-pp-to-literal|c-state-push-any-brace-pair|c-state-safe-place|c-state-semi-safe-place|c-submit-bug-report|c-subword-mode|c-suppress-<->-as-parens|c-syntactic-content|c-syntactic-end-of-macro|c-syntactic-information-on-region|c-syntactic-re-search-forward|c-syntactic-skip-backward|c-tentative-buffer-changes|c-tnt-chng-cleanup)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(?:byte-compile-variable-set|byte-compile-warn-about-unresolved-functions|byte-compile-warn-obsolete|byte-compile-warn|byte-compile-warning-enabled-p|byte-compile-warning-prefix|byte-compile-warning-series|byte-compile-while|byte-compile-zero-or-one-arg|byte-compiler-base-file-name|byte-decompile-bytecode-1|byte-decompile-bytecode|byte-defop-compiler-1|byte-defop-compiler|byte-defop|byte-extrude-byte-code-vectors|byte-force-recompile|byte-optimize-all-constp|byte-optimize-and|byte-optimize-apply|byte-optimize-approx-equal|byte-optimize-associative-math|byte-optimize-binary-predicate|byte-optimize-body|byte-optimize-cond|byte-optimize-delay-constants-math|byte-optimize-divide|byte-optimize-form-code-walker|byte-optimize-form|byte-optimize-funcall|byte-optimize-identity|byte-optimize-if|byte-optimize-inline-handler|byte-optimize-lapcode|byte-optimize-letX|byte-optimize-logmumble|byte-optimize-minus|byte-optimize-multiply|byte-optimize-nonassociative-math|byte-optimize-nth|byte-optimize-nthcdr|byte-optimize-or|byte-optimize-plus|byte-optimize-predicate|byte-optimize-quote|byte-optimize-set|byte-optimize-while|byte-recompile-file|byteorder|c\\+\\+-font-lock-keywords-2|c\\+\\+-font-lock-keywords-3|c\\+\\+-font-lock-keywords|c\\+\\+-mode|c--macroexpand-all|c-add-class-syntax|c-add-language|c-add-stmt-syntax|c-add-style|c-add-syntax|c-add-type|c-advise-fl-for-region|c-after-change-check-<>-operators|c-after-change|c-after-conditional|c-after-font-lock-init|c-after-special-operator-id|c-after-statement-terminator-p|c-append-backslashes-forward|c-append-lower-brace-pair-to-state-cache|c-append-syntax|c-append-to-state-cache|c-ascertain-following-literal|c-ascertain-preceding-literal|c-at-expression-start-p|c-at-macro-vsemi-p|c-at-statement-start-p|c-at-toplevel-p|c-at-vsemi-p|c-awk-menu|c-back-over-illiterals|c-back-over-member-initializer-braces|c-back-over-member-initializers|c-backslash-region|c-backward-<>-arglist|c-backward-colon-prefixed-type|c-backward-comments|c-backward-conditional|c-backward-into-nomenclature|c-backward-over-enum-header|c-backward-sexp|c-backward-single-comment|c-backward-sws|c-backward-syntactic-ws|c-backward-to-block-anchor|c-backward-to-decl-anchor|c-backward-to-nth-BOF-\\{|c-backward-token-1|c-backward-token-2|c-basic-common-init|c-before-change-check-<>-operators|c-before-change|c-before-hack-hook|c-beginning-of-current-token|c-beginning-of-decl-1|c-beginning-of-defun-1|c-beginning-of-defun|c-beginning-of-inheritance-list|c-beginning-of-macro|c-beginning-of-sentence-in-comment|c-beginning-of-sentence-in-string|c-beginning-of-statement-1|c-beginning-of-statement|c-beginning-of-syntax|c-benign-error|c-bind-special-erase-keys|c-block-in-arglist-dwim|c-bos-pop-state-and-retry|c-bos-pop-state|c-bos-push-state|c-bos-report-error|c-bos-restore-pos|c-bos-save-error-info|c-bos-save-pos|c-brace-anchor-point|c-brace-newlines|c-c\\+\\+-menu|c-c-menu|c-calc-comment-indent|c-calc-offset|c-calculate-state|c-change-set-fl-decl-start|c-cheap-inside-bracelist-p|c-check-type|c-clear-<-pair-props-if-match-after|c-clear-<-pair-props|c-clear-<>-pair-props|c-clear->-pair-props-if-match-before|c-clear->-pair-props|c-clear-c-type-property|c-clear-char-properties|c-clear-char-property-with-value-function|c-clear-char-property-with-value|c-clear-char-property|c-clear-cpp-delimiters|c-clear-found-types|c-collect-line-comments|c-comment-indent|c-comment-line-break-function|c-comment-out-cpps|c-common-init|c-compose-keywords-list|c-concat-separated|c-constant-symbol|c-context-line-break|c-context-open-line|c-context-set-fl-decl-start|c-count-cfss|c-cpp-define-name|c-crosses-statement-barrier-p|c-debug-add-face|c-debug-parse-state-double-cons|c-debug-parse-state|c-debug-put-decl-spot-faces|c-debug-remove-decl-spot-faces|c-debug-remove-face|c-debug-sws-msg|c-declaration-limits|c-declare-lang-variables|c-default-value-sentence-end|c-define-abbrev-table|c-define-lang-constant|c-defun-name|c-delete-and-extract-region|c-delete-backslashes-forward|c-delete-overlay|c-determine-\\+ve-limit|c-determine-limit-get-base|c-determine-limit|c-do-auto-fill|c-down-conditional-with-else|c-down-conditional|c-down-list-backward|c-down-list-forward|c-echo-parsing-error|c-electric-backspace|c-electric-brace|c-electric-colon|c-electric-continued-statement|c-electric-delete-forward|c-electric-delete|c-electric-indent-local-mode-hook|c-electric-indent-mode-hook|c-electric-lt-gt|c-electric-paren|c-electric-pound|c-electric-semi&comma|c-electric-slash|c-electric-star|c-end-of-current-token|c-end-of-decl-1|c-end-of-defun-1|c-end-of-defun|c-end-of-macro|c-end-of-sentence-in-comment|c-end-of-sentence-in-string|c-end-of-statement|c-evaluate-offset|c-extend-after-change-region|c-extend-font-lock-region-for-macros|c-extend-region-for-CPP|c-face-name-p|c-fdoc-shift-type-backward|c-fill-paragraph|c-find-assignment-for-mode|c-find-decl-prefix-search|c-find-decl-spots|c-find-invalid-doc-markup|c-fn-region-is-active-p|c-font-lock-<>-arglists|c-font-lock-c\\+\\+-new|c-font-lock-complex-decl-prepare|c-font-lock-declarations|c-font-lock-declarators|c-font-lock-doc-comments|c-font-lock-enclosing-decls|c-font-lock-enum-tail|c-font-lock-fontify-region|c-font-lock-init|c-font-lock-invalid-string|c-font-lock-keywords-2|c-font-lock-keywords-3|c-font-lock-keywords|c-font-lock-labels|c-font-lock-objc-method|c-font-lock-objc-methods|c-fontify-recorded-types-and-refs|c-fontify-types-and-refs|c-forward-<>-arglist-recur|c-forward-<>-arglist|c-forward-annotation|c-forward-comments|c-forward-conditional|c-forward-decl-or-cast-1|c-forward-id-comma-list|c-forward-into-nomenclature|c-forward-keyword-clause|c-forward-keyword-prefixed-id|c-forward-label|c-forward-name|c-forward-objc-directive|c-forward-over-cpp-define-id|c-forward-over-illiterals|c-forward-sexp|c-forward-single-comment|c-forward-sws|c-forward-syntactic-ws|c-forward-to-cpp-define-body|c-forward-to-nth-EOF-}|c-forward-token-1|c-forward-token-2|c-forward-type|c-get-cache-scan-pos|c-get-char-property|c-get-current-file|c-get-lang-constant|c-get-offset|c-get-style-variables|c-get-syntactic-indentation|c-gnu-impose-minimum|c-go-down-list-backward|c-go-down-list-forward|c-go-list-backward|c-go-list-forward|c-go-up-list-backward|c-go-up-list-forward|c-got-face-at|c-guess-accumulate-offset|c-guess-accumulate|c-guess-basic-syntax|c-guess-buffer-no-install|c-guess-buffer|c-guess-continued-construct|c-guess-current-offset|c-guess-dump-accumulator|c-guess-dump-guessed-style|c-guess-dump-guessed-values|c-guess-empty-line-p|c-guess-examine|c-guess-fill-prefix|c-guess-guess|c-guess-guessed-syntactic-symbols|c-guess-install|c-guess-make-basic-offset|c-guess-make-offsets-alist|c-guess-make-style|c-guess-merge-offsets-alists|c-guess-no-install|c-guess-region-no-install|c-guess-region|c-guess-reset-accumulator|c-guess-sort-accumulator|c-guess-style-name|c-guess-symbolize-integer|c-guess-symbolize-offsets-alist|c-guess-view-mark-guessed-entries|c-guess-view-reorder-offsets-alist-in-style|c-guess-view|c-guess|c-hungry-backspace|c-hungry-delete-backwards|c-hungry-delete-forward|c-hungry-delete|c-idl-menu|c-in-comment-line-prefix-p|c-in-function-trailer-p|c-in-gcc-asm-p|c-in-knr-argdecl|c-in-literal|c-in-method-def-p|c-indent-command|c-indent-defun|c-indent-exp|c-indent-line-or-region|c-indent-line|c-indent-multi-line-block|c-indent-new-comment-line|c-indent-one-line-block|c-indent-region|c-init-language-vars-for|c-initialize-builtin-style|c-initialize-cc-mode|c-inside-bracelist-p|c-int-to-char|c-intersect-lists|c-invalidate-find-decl-cache|c-invalidate-macro-cache|c-invalidate-state-cache-1|c-invalidate-state-cache|c-invalidate-sws-region-after|c-java-menu|c-just-after-func-arglist-p|c-keep-region-active|c-keyword-member|c-keyword-sym|c-lang-const|c-lang-defconst-eval-immediately|c-lang-defconst|c-lang-major-mode-is|c-langelem-2nd-pos|c-langelem-col|c-langelem-pos|c-langelem-sym|c-last-command-char|c-least-enclosing-brace|c-leave-cc-mode-mode|c-lineup-C-comments|c-lineup-ObjC-method-args-2|c-lineup-ObjC-method-args|c-lineup-ObjC-method-call-colons|c-lineup-ObjC-method-call|c-lineup-after-whitesmith-blocks|c-lineup-argcont-scan|c-lineup-argcont|c-lineup-arglist-close-under-paren|c-lineup-arglist-intro-after-paren|c-lineup-arglist-operators|c-lineup-arglist|c-lineup-assignments|c-lineup-cascaded-calls|c-lineup-close-paren|c-lineup-comment|c-lineup-cpp-define|c-lineup-dont-change|c-lineup-gcc-asm-reg|c-lineup-gnu-DEFUN-intro-cont|c-lineup-inexpr-block|c-lineup-java-inher|c-lineup-java-throws|c-lineup-knr-region-comment|c-lineup-math|c-lineup-multi-inher|c-lineup-respect-col-0|c-lineup-runin-statements|c-lineup-streamop|c-lineup-string-cont|c-lineup-template-args|c-lineup-topmost-intro-cont|c-lineup-whitesmith-in-block|c-list-found-types|c-literal-limits-fast|c-literal-limits|c-literal-type|c-looking-at-bos|c-looking-at-decl-block|c-looking-at-inexpr-block-backward|c-looking-at-inexpr-block|c-looking-at-non-alphnumspace|c-looking-at-special-brace-list|c-lookup-lists|c-macro-display-buffer|c-macro-expand|c-macro-expansion|c-macro-is-genuine-p|c-macro-vsemi-status-unknown-p|c-major-mode-is|c-make-bare-char-alt|c-make-font-lock-BO-decl-search-function|c-make-font-lock-context-search-function|c-make-font-lock-extra-types-blurb|c-make-font-lock-search-form|c-make-font-lock-search-function|c-make-inherited-keymap|c-make-inverse-face|c-make-keywords-re|c-make-macro-with-semi-re|c-make-styles-buffer-local|c-make-syntactic-matcher|c-mark-<-as-paren|c-mark->-as-paren|c-mark-function|c-mask-paragraph|c-mode-menu|c-mode-symbol|c-mode-var|c-mode|c-most-enclosing-brace|c-most-enclosing-decl-block|c-narrow-to-comment-innards|c-narrow-to-most-enclosing-decl-block|c-neutralize-CPP-line|c-neutralize-syntax-in-and-mark-CPP|c-newline-and-indent|c-next-single-property-change|c-objc-menu|c-on-identifier|c-one-line-string-p|c-outline-level|c-override-default-keywords|c-parse-state-1|c-parse-state-get-strategy|c-parse-state|c-partial-ws-p|c-pike-menu|c-point-syntax|c-point|c-populate-syntax-table|c-postprocess-file-styles|c-progress-fini|c-progress-init|c-progress-update|c-pull-open-brace|c-punctuation-in|c-put-c-type-property|c-put-char-property-fun|c-put-char-property|c-put-font-lock-face|c-put-font-lock-string-face|c-put-in-sws|c-put-is-sws|c-put-overlay|c-query-and-set-macro-start|c-query-macro-start|c-read-offset|c-real-parse-state|c-record-parse-state-state|c-record-ref-id|c-record-type-id|c-regexp-opt-depth|c-regexp-opt|c-region-is-active-p|c-remove-any-local-eval-or-mode-variables|c-remove-font-lock-face|c-remove-in-sws|c-remove-is-and-in-sws|c-remove-is-sws|c-remove-stale-state-cache-backwards|c-remove-stale-state-cache|c-renarrow-state-cache|c-replay-parse-state-state|c-restore-<->-as-parens|c-run-mode-hooks|c-safe-position|c-safe-scan-lists|c-safe|c-save-buffer-state|c-sc-parse-partial-sexp-no-category|c-sc-parse-partial-sexp|c-sc-scan-lists-no-category\\+1\\+1|c-sc-scan-lists-no-category\\+1-1|c-sc-scan-lists-no-category-1\\+1|c-sc-scan-lists-no-category-1-1|c-sc-scan-lists|c-scan-conditionals|c-scope-operator|c-search-backward-char-property|c-search-decl-header-end|c-search-forward-char-property|c-search-uplist-for-classkey|c-semi&comma-inside-parenlist|c-semi&comma-no-newlines-before-nonblanks|c-semi&comma-no-newlines-for-oneline-inliners|c-sentence-end|c-set-cpp-delimiters|c-set-fl-decl-start|c-set-offset|c-set-region-active|c-set-style-1|c-set-style|c-set-stylevar-fallback|c-setup-doc-comment-style|c-setup-filladapt|c-setup-paragraph-variables|c-shift-line-indentation|c-show-syntactic-information|c-simple-skip-symbol-backward|c-skip-comments-and-strings|c-skip-conditional|c-skip-ws-backward|c-skip-ws-forward|c-snug-1line-defun-close|c-snug-do-while|c-ssb-lit-begin|c-state-balance-parens-backwards|c-state-cache-after-top-paren|c-state-cache-init|c-state-cache-non-literal-place|c-state-cache-top-lparen|c-state-cache-top-paren|c-state-get-min-scan-pos|c-state-lit-beg|c-state-literal-at|c-state-mark-point-min-literal|c-state-maybe-marker|c-state-pp-to-literal|c-state-push-any-brace-pair|c-state-safe-place|c-state-semi-safe-place|c-submit-bug-report|c-subword-mode|c-suppress-<->-as-parens|c-syntactic-content|c-syntactic-end-of-macro|c-syntactic-information-on-region|c-syntactic-re-search-forward|c-syntactic-skip-backward|c-tentative-buffer-changes|c-tnt-chng-cleanup)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:c-tnt-chng-record-state|c-toggle-auto-hungry-state|c-toggle-auto-newline|c-toggle-auto-state|c-toggle-electric-state|c-toggle-hungry-state|c-toggle-parse-state-debug|c-toggle-syntactic-indentation|c-trim-found-types|c-try-one-liner|c-uncomment-out-cpps|c-unfind-coalesced-tokens|c-unfind-enclosing-token|c-unfind-type|c-unmark-<->-as-paren|c-up-conditional-with-else|c-up-conditional|c-up-list-backward|c-up-list-forward|c-update-modeline|c-valid-offset|c-version|c-vsemi-status-unknown-p|c-whack-state-after|c-whack-state-before|c-where-wrt-brace-construct|c-while-widening-to-decl-block|c-widen-to-enclosing-decl-scope|c-with-<->-as-parens-suppressed|c-with-all-but-one-cpps-commented-out|c-with-cpps-commented-out|c-with-syntax-table|caaaar|caaadr|caaar|caadar|caaddr|caadr|cadaar|cadadr|cadar|caddar|cadddr|caddr|cal-html-cursor-month|cal-html-cursor-year|cal-menu-context-mouse-menu|cal-menu-global-mouse-menu|cal-menu-holiday-window-suffix|cal-menu-set-date-title|cal-menu-x-popup-menu|cal-tex-cursor-day|cal-tex-cursor-filofax-2week|cal-tex-cursor-filofax-daily|cal-tex-cursor-filofax-week|cal-tex-cursor-filofax-year|cal-tex-cursor-month-landscape|cal-tex-cursor-month|cal-tex-cursor-week-iso|cal-tex-cursor-week-monday|cal-tex-cursor-week|cal-tex-cursor-week2-summary|cal-tex-cursor-week2|cal-tex-cursor-year-landscape|cal-tex-cursor-year|calc-alg-digit-entry|calc-alg-entry|calc-algebraic-entry|calc-align-stack-window|calc-auto-algebraic-entry|calc-big-or-small|calc-binary-op|calc-change-sign|calc-check-defines|calc-check-stack|calc-check-trail-aligned|calc-check-user-syntax|calc-clear-unread-commands|calc-count-lines|calc-create-buffer|calc-cursor-stack-index|calc-dispatch-help|calc-dispatch|calc-divide|calc-do-alg-entry|calc-do-calc-eval|calc-do-dispatch|calc-do-embedded-activate|calc-do-handle-whys|calc-do-quick-calc|calc-do-refresh|calc-do|calc-embedded-activate|calc-embedded|calc-enter-result|calc-enter|calc-eval|calc-get-stack-element|calc-grab-rectangle|calc-grab-region|calc-grab-sum-across|calc-grab-sum-down|calc-handle-whys|calc-help|calc-info-goto-node|calc-info-summary|calc-info|calc-inv|calc-keypad|calc-kill-stack-buffer|calc-last-args-stub|calc-left-divide|calc-match-user-syntax|calc-minibuffer-contains|calc-minibuffer-size|calc-minus|calc-missing-key|calc-mod|calc-mode-var-list-restore-default-values|calc-mode-var-list-restore-saved-values|calc-normalize|calc-num-prefix-name|calc-other-window|calc-over|calc-percent|calc-plus|calc-pop-above|calc-pop-push-list|calc-pop-push-record-list|calc-pop-stack|calc-pop|calc-power|calc-push-list|calc-quit|calc-read-key-sequence|calc-read-key|calc-record-list|calc-record-undo|calc-record-why|calc-record|calc-refresh|calc-renumber-stack|calc-report-bug|calc-roll-down-stack|calc-roll-down|calc-roll-up-stack|calc-roll-up|calc-same-interface|calc-select-buffer|calc-set-command-flag|calc-set-mode-line|calc-shift-Y-prefix-help|calc-slow-wrapper|calc-stack-size|calc-substack-height|calc-temp-minibuffer-message|calc-times|calc-top-list-n|calc-top-list|calc-top-n|calc-top|calc-trail-buffer|calc-trail-display|calc-trail-here|calc-transpose-lines|calc-tutorial|calc-unary-op|calc-undo|calc-unread-command|calc-user-invocation|calc-window-width|calc-with-default-simplification|calc-with-trail-buffer|calc-wrapper|calc-yank|calc|calcDigit-algebraic|calcDigit-backspace|calcDigit-edit|calcDigit-key|calcDigit-letter|calcDigit-nondigit|calcDigit-start|calcFunc-floor|calcFunc-inv|calcFunc-trunc|calculate-icon-indent|calculate-lisp-indent|calculate-tcl-indent|calculator-add-operators|calculator-backspace|calculator-clear-fragile|calculator-clear-saved|calculator-clear|calculator-close-paren|calculator-copy|calculator-dec\\/deg-mode|calculator-decimal|calculator-digit|calculator-displayer-next|calculator-displayer-prev|calculator-eng-display|calculator-enter|calculator-exp|calculator-expt|calculator-fact|calculator-funcall|calculator-get-display|calculator-get-register|calculator-groupize-number|calculator-help|calculator-last-input|calculator-menu|calculator-message|calculator-mode|calculator-need-3-lines|calculator-number-to-string|calculator-op-arity|calculator-op-or-exp|calculator-op-prec|calculator-op|calculator-open-paren|calculator-paste|calculator-push-curnum|calculator-put-value|calculator-quit|calculator-radix-input-mode|calculator-radix-mode|calculator-radix-output-mode|calculator-reduce-stack-once|calculator-reduce-stack|calculator-remove-zeros|calculator-repL|calculator-repR|calculator-reset|calculator-rotate-displayer-back|calculator-rotate-displayer|calculator-save-and-quit|calculator-save-on-list|calculator-saved-down|calculator-saved-move|calculator-saved-up|calculator-set-register|calculator-standard-displayer|calculator-string-to-number|calculator-truncate|calculator-update-display|calculator|calendar-abbrev-construct|calendar-absolute-from-gregorian|calendar-astro-date-string|calendar-astro-from-absolute|calendar-astro-goto-day-number|calendar-astro-print-day-number|calendar-astro-to-absolute|calendar-backward-day|calendar-backward-month|calendar-backward-week|calendar-backward-year|calendar-bahai-date-string|calendar-bahai-goto-date|calendar-bahai-mark-date-pattern|calendar-bahai-print-date|calendar-basic-setup|calendar-beginning-of-month|calendar-beginning-of-week|calendar-beginning-of-year|calendar-buffer-list|calendar-check-holidays|calendar-chinese-date-string|calendar-chinese-goto-date|calendar-chinese-print-date|calendar-column-to-segment|calendar-coptic-date-string|calendar-coptic-goto-date|calendar-coptic-print-date|calendar-count-days-region|calendar-current-date|calendar-cursor-holidays|calendar-cursor-to-date|calendar-cursor-to-nearest-date|calendar-cursor-to-visible-date|calendar-customized-p|calendar-date-compare|calendar-date-equal|calendar-date-is-valid-p|calendar-date-is-visible-p|calendar-date-string|calendar-day-header-construct|calendar-day-name|calendar-day-number|calendar-day-of-week|calendar-day-of-year-string|calendar-dayname-on-or-before|calendar-end-of-month|calendar-end-of-week|calendar-end-of-year|calendar-ensure-newline|calendar-ethiopic-date-string|calendar-ethiopic-goto-date|calendar-ethiopic-print-date|calendar-exchange-point-and-mark|calendar-exit|calendar-extract-day|calendar-extract-month|calendar-extract-year|calendar-forward-day|calendar-forward-month|calendar-forward-week|calendar-forward-year|calendar-frame-setup|calendar-french-date-string|calendar-french-goto-date|calendar-french-print-date|calendar-generate-month|calendar-generate-window|calendar-generate|calendar-goto-date|calendar-goto-day-of-year|calendar-goto-info-node|calendar-goto-today|calendar-gregorian-from-absolute|calendar-hebrew-date-string|calendar-hebrew-goto-date|calendar-hebrew-list-yahrzeits|calendar-hebrew-mark-date-pattern|calendar-hebrew-print-date|calendar-holiday-list|calendar-in-read-only-buffer|calendar-increment-month-cons|calendar-increment-month|calendar-insert-at-column|calendar-interval|calendar-islamic-date-string|calendar-islamic-goto-date|calendar-islamic-mark-date-pattern|calendar-islamic-print-date|calendar-iso-date-string|calendar-iso-from-absolute|calendar-iso-goto-date|calendar-iso-goto-week|calendar-iso-print-date|calendar-julian-date-string|calendar-julian-from-absolute|calendar-julian-goto-date|calendar-julian-print-date|calendar-last-day-of-month|calendar-leap-year-p|calendar-list-holidays|calendar-lunar-phases|calendar-make-alist|calendar-make-temp-face|calendar-mark-1|calendar-mark-complex|calendar-mark-date-pattern|calendar-mark-days-named|calendar-mark-holidays|calendar-mark-month|calendar-mark-today|calendar-mark-visible-date|calendar-mayan-date-string|calendar-mayan-goto-long-count-date|calendar-mayan-next-haab-date|calendar-mayan-next-round-date|calendar-mayan-next-tzolkin-date|calendar-mayan-previous-haab-date|calendar-mayan-previous-round-date|calendar-mayan-previous-tzolkin-date|calendar-mayan-print-date|calendar-mode-line-entry|calendar-mode|calendar-month-edges|calendar-month-name|calendar-mouse-view-diary-entries|calendar-mouse-view-other-diary-entries|calendar-move-to-column|calendar-nongregorian-visible-p|calendar-not-implemented|calendar-nth-named-absday|calendar-nth-named-day|calendar-other-dates|calendar-other-month|calendar-persian-date-string|calendar-persian-goto-date|calendar-persian-print-date|calendar-print-day-of-year|calendar-print-other-dates|calendar-read-date|calendar-read|calendar-recompute-layout-variables|calendar-redraw|calendar-scroll-left-three-months|calendar-scroll-left|calendar-scroll-right-three-months|calendar-scroll-right|calendar-scroll-toolkit-scroll|calendar-set-date-style|calendar-set-layout-variable|calendar-set-mark|calendar-set-mode-line|calendar-star-date|calendar-string-spread|calendar-sum|calendar-sunrise-sunset-month|calendar-sunrise-sunset|calendar-unmark|calendar-update-mode-line|calendar-week-end-day|calendar|call-last-kbd-macro|call-next-method|callf|callf2|cancel-edebug-on-entry|cancel-function-timers|cancel-kbd-macro-events|cancel-timer-internal|canlock-insert-header|canlock-verify|canonicalize-coding-system-name|canonically-space-region|capitalized-words-mode|car-less-than-car|case-table-get-table|case|cc-choose-style-for-mode|cc-eval-when-compile|cc-imenu-init|cc-imenu-java-build-type-args-regex|cc-imenu-objc-function|cc-imenu-objc-method-to-selector|cc-imenu-objc-remove-white-space|ccl-compile|ccl-dump|ccl-execute-on-string|ccl-execute-with-args|ccl-execute|ccl-program-p|cconv--analyze-function|cconv--analyze-use|cconv--convert-function|cconv--map-diff-elem|cconv--map-diff-set|cconv--map-diff|cconv--set-diff-map|cconv--set-diff|cconv-analyse-form|cconv-analyze-form|cconv-closure-convert|cconv-convert|cconv-warnings-only|cd-absolute|cd|cdaaar|cdaadr|cdaar|cdadar|cdaddr|cdadr|cddaar|cddadr|cddar|cdddar|cddddr|cdddr|cdl-get-file|cdl-put-region|cedet-version|ceiling\\*|center-line|center-paragraph|center-region|cfengine-auto-mode|cfengine-common-settings|cfengine-common-syntax|cfengine-fill-paragraph|cfengine-mode|cfengine2-beginning-of-defun|cfengine2-end-of-defun|cfengine2-indent-line|cfengine2-mode|cfengine2-outline-level|cfengine3--current-function|cfengine3-beginning-of-defun|cfengine3-clear-syntax-cache|cfengine3-completion-function|cfengine3-create-imenu-index|cfengine3-current-defun|cfengine3-documentation-function|cfengine3-end-of-defun|cfengine3-format-function-docstring|cfengine3-indent-line|cfengine3-make-syntax-cache|cfengine3-mode|change-class|change-log-beginning-of-defun|change-log-end-of-defun|change-log-fill-forward-paragraph|change-log-fill-parenthesized-list|change-log-find-file|change-log-get-method-definition-1|change-log-get-method-definition|change-log-goto-source-1|change-log-goto-source|change-log-indent|change-log-merge|change-log-mode|change-log-name|change-log-next-buffer|change-log-next-error|change-log-resolve-conflict|change-log-search-file-name|change-log-search-tag-name-1|change-log-search-tag-name|change-log-sortable-date-at|change-log-version-number-search|char-resolve-modifiers|char-valid-p|charset-bytes|charset-chars|charset-description|charset-dimension|charset-id-internal|charset-id|charset-info|charset-iso-final-char|charset-long-name|charset-short-name|chart-add-sequence|chart-axis-child-p|chart-axis-draw|chart-axis-list-p|chart-axis-names-child-p|chart-axis-names-list-p|chart-axis-names-p|chart-axis-names|chart-axis-p|chart-axis-range-child-p|chart-axis-range-list-p|chart-axis-range-p|chart-axis-range|chart-axis|chart-bar-child-p|chart-bar-list-p|chart-bar-p|chart-bar-quickie|chart-bar|chart-child-p|chart-deface-rectangle|chart-display-label|chart-draw-axis|chart-draw-data|chart-draw-line|chart-draw-title|chart-draw|chart-emacs-lists|chart-emacs-storage|chart-file-count|chart-goto-xy|chart-list-p|chart-mode|chart-new-buffer|chart-p|chart-rmail-from|chart-sequece-child-p|chart-sequece-list-p|chart-sequece-p|chart-sequece|chart-size-in-dir|chart-sort-matchlist|chart-sort|chart-space-usage|chart-test-it-all|chart-translate-namezone|chart-translate-xpos|chart-translate-ypos|chart-trim|chart-zap-chars|chart|check-ccl-program|check-completion-length|check-declare-directory|check-declare-errmsg|check-declare-file|check-declare-files|check-declare-locate|check-declare-scan|check-declare-sort|check-declare-verify|check-declare-warn)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)c(?:-tnt-chng-record-state|-toggle-auto-hungry-state|-toggle-auto-newline|-toggle-auto-state|-toggle-electric-state|-toggle-hungry-state|-toggle-parse-state-debug|-toggle-syntactic-indentation|-trim-found-types|-try-one-liner|-uncomment-out-cpps|-unfind-coalesced-tokens|-unfind-enclosing-token|-unfind-type|-unmark-<->-as-paren|-up-conditional-with-else|-up-conditional|-up-list-backward|-up-list-forward|-update-modeline|-valid-offset|-version|-vsemi-status-unknown-p|-whack-state-after|-whack-state-before|-where-wrt-brace-construct|-while-widening-to-decl-block|-widen-to-enclosing-decl-scope|-with-<->-as-parens-suppressed|-with-all-but-one-cpps-commented-out|-with-cpps-commented-out|-with-syntax-table|aaaar|aaadr|aaar|aadar|aaddr|aadr|adaar|adadr|adar|addar|adddr|addr|al-html-cursor-month|al-html-cursor-year|al-menu-context-mouse-menu|al-menu-global-mouse-menu|al-menu-holiday-window-suffix|al-menu-set-date-title|al-menu-x-popup-menu|al-tex-cursor-day|al-tex-cursor-filofax-2week|al-tex-cursor-filofax-daily|al-tex-cursor-filofax-week|al-tex-cursor-filofax-year|al-tex-cursor-month-landscape|al-tex-cursor-month|al-tex-cursor-week-iso|al-tex-cursor-week-monday|al-tex-cursor-week|al-tex-cursor-week2-summary|al-tex-cursor-week2|al-tex-cursor-year-landscape|al-tex-cursor-year|alc-alg-digit-entry|alc-alg-entry|alc-algebraic-entry|alc-align-stack-window|alc-auto-algebraic-entry|alc-big-or-small|alc-binary-op|alc-change-sign|alc-check-defines|alc-check-stack|alc-check-trail-aligned|alc-check-user-syntax|alc-clear-unread-commands|alc-count-lines|alc-create-buffer|alc-cursor-stack-index|alc-dispatch-help|alc-dispatch|alc-divide|alc-do-alg-entry|alc-do-calc-eval|alc-do-dispatch|alc-do-embedded-activate|alc-do-handle-whys|alc-do-quick-calc|alc-do-refresh|alc-do|alc-embedded-activate|alc-embedded|alc-enter-result|alc-enter|alc-eval|alc-get-stack-element|alc-grab-rectangle|alc-grab-region|alc-grab-sum-across|alc-grab-sum-down|alc-handle-whys|alc-help|alc-info-goto-node|alc-info-summary|alc-info|alc-inv|alc-keypad|alc-kill-stack-buffer|alc-last-args-stub|alc-left-divide|alc-match-user-syntax|alc-minibuffer-contains|alc-minibuffer-size|alc-minus|alc-missing-key|alc-mod|alc-mode-var-list-restore-default-values|alc-mode-var-list-restore-saved-values|alc-normalize|alc-num-prefix-name|alc-other-window|alc-over|alc-percent|alc-plus|alc-pop-above|alc-pop-push-list|alc-pop-push-record-list|alc-pop-stack|alc-pop|alc-power|alc-push-list|alc-quit|alc-read-key-sequence|alc-read-key|alc-record-list|alc-record-undo|alc-record-why|alc-record|alc-refresh|alc-renumber-stack|alc-report-bug|alc-roll-down-stack|alc-roll-down|alc-roll-up-stack|alc-roll-up|alc-same-interface|alc-select-buffer|alc-set-command-flag|alc-set-mode-line|alc-shift-Y-prefix-help|alc-slow-wrapper|alc-stack-size|alc-substack-height|alc-temp-minibuffer-message|alc-times|alc-top-list-n|alc-top-list|alc-top-n|alc-top|alc-trail-buffer|alc-trail-display|alc-trail-here|alc-transpose-lines|alc-tutorial|alc-unary-op|alc-undo|alc-unread-command|alc-user-invocation|alc-window-width|alc-with-default-simplification|alc-with-trail-buffer|alc-wrapper|alc-yank|alc|alcDigit-algebraic|alcDigit-backspace|alcDigit-edit|alcDigit-key|alcDigit-letter|alcDigit-nondigit|alcDigit-start|alcFunc-floor|alcFunc-inv|alcFunc-trunc|alculate-icon-indent|alculate-lisp-indent|alculate-tcl-indent|alculator-add-operators|alculator-backspace|alculator-clear-fragile|alculator-clear-saved|alculator-clear|alculator-close-paren|alculator-copy|alculator-dec/deg-mode|alculator-decimal|alculator-digit|alculator-displayer-next|alculator-displayer-prev|alculator-eng-display|alculator-enter|alculator-exp|alculator-expt|alculator-fact|alculator-funcall|alculator-get-display|alculator-get-register|alculator-groupize-number|alculator-help|alculator-last-input|alculator-menu|alculator-message|alculator-mode|alculator-need-3-lines|alculator-number-to-string|alculator-op-arity|alculator-op-or-exp|alculator-op-prec|alculator-op|alculator-open-paren|alculator-paste|alculator-push-curnum|alculator-put-value|alculator-quit|alculator-radix-input-mode|alculator-radix-mode|alculator-radix-output-mode|alculator-reduce-stack-once|alculator-reduce-stack|alculator-remove-zeros|alculator-repL|alculator-repR|alculator-reset|alculator-rotate-displayer-back|alculator-rotate-displayer|alculator-save-and-quit|alculator-save-on-list|alculator-saved-down|alculator-saved-move|alculator-saved-up|alculator-set-register|alculator-standard-displayer|alculator-string-to-number|alculator-truncate|alculator-update-display|alculator|alendar-abbrev-construct|alendar-absolute-from-gregorian|alendar-astro-date-string|alendar-astro-from-absolute|alendar-astro-goto-day-number|alendar-astro-print-day-number|alendar-astro-to-absolute|alendar-backward-day|alendar-backward-month|alendar-backward-week|alendar-backward-year|alendar-bahai-date-string|alendar-bahai-goto-date|alendar-bahai-mark-date-pattern|alendar-bahai-print-date|alendar-basic-setup|alendar-beginning-of-month|alendar-beginning-of-week|alendar-beginning-of-year|alendar-buffer-list|alendar-check-holidays|alendar-chinese-date-string|alendar-chinese-goto-date|alendar-chinese-print-date|alendar-column-to-segment|alendar-coptic-date-string|alendar-coptic-goto-date|alendar-coptic-print-date|alendar-count-days-region|alendar-current-date|alendar-cursor-holidays|alendar-cursor-to-date|alendar-cursor-to-nearest-date|alendar-cursor-to-visible-date|alendar-customized-p|alendar-date-compare|alendar-date-equal|alendar-date-is-valid-p|alendar-date-is-visible-p|alendar-date-string|alendar-day-header-construct|alendar-day-name|alendar-day-number|alendar-day-of-week|alendar-day-of-year-string|alendar-dayname-on-or-before|alendar-end-of-month|alendar-end-of-week|alendar-end-of-year|alendar-ensure-newline|alendar-ethiopic-date-string|alendar-ethiopic-goto-date|alendar-ethiopic-print-date|alendar-exchange-point-and-mark|alendar-exit|alendar-extract-day|alendar-extract-month|alendar-extract-year|alendar-forward-day|alendar-forward-month|alendar-forward-week|alendar-forward-year|alendar-frame-setup|alendar-french-date-string|alendar-french-goto-date|alendar-french-print-date|alendar-generate-month|alendar-generate-window|alendar-generate|alendar-goto-date|alendar-goto-day-of-year|alendar-goto-info-node|alendar-goto-today|alendar-gregorian-from-absolute|alendar-hebrew-date-string|alendar-hebrew-goto-date|alendar-hebrew-list-yahrzeits|alendar-hebrew-mark-date-pattern|alendar-hebrew-print-date|alendar-holiday-list|alendar-in-read-only-buffer|alendar-increment-month-cons|alendar-increment-month|alendar-insert-at-column|alendar-interval|alendar-islamic-date-string|alendar-islamic-goto-date|alendar-islamic-mark-date-pattern|alendar-islamic-print-date|alendar-iso-date-string|alendar-iso-from-absolute|alendar-iso-goto-date|alendar-iso-goto-week|alendar-iso-print-date|alendar-julian-date-string|alendar-julian-from-absolute|alendar-julian-goto-date|alendar-julian-print-date|alendar-last-day-of-month|alendar-leap-year-p|alendar-list-holidays|alendar-lunar-phases|alendar-make-alist|alendar-make-temp-face|alendar-mark-1|alendar-mark-complex|alendar-mark-date-pattern|alendar-mark-days-named|alendar-mark-holidays|alendar-mark-month|alendar-mark-today|alendar-mark-visible-date|alendar-mayan-date-string|alendar-mayan-goto-long-count-date|alendar-mayan-next-haab-date|alendar-mayan-next-round-date|alendar-mayan-next-tzolkin-date|alendar-mayan-previous-haab-date|alendar-mayan-previous-round-date|alendar-mayan-previous-tzolkin-date|alendar-mayan-print-date|alendar-mode-line-entry|alendar-mode|alendar-month-edges|alendar-month-name|alendar-mouse-view-diary-entries|alendar-mouse-view-other-diary-entries|alendar-move-to-column|alendar-nongregorian-visible-p|alendar-not-implemented|alendar-nth-named-absday|alendar-nth-named-day|alendar-other-dates|alendar-other-month|alendar-persian-date-string|alendar-persian-goto-date|alendar-persian-print-date|alendar-print-day-of-year|alendar-print-other-dates|alendar-read-date|alendar-read|alendar-recompute-layout-variables|alendar-redraw|alendar-scroll-left-three-months|alendar-scroll-left|alendar-scroll-right-three-months|alendar-scroll-right|alendar-scroll-toolkit-scroll|alendar-set-date-style|alendar-set-layout-variable|alendar-set-mark|alendar-set-mode-line|alendar-star-date|alendar-string-spread|alendar-sum|alendar-sunrise-sunset-month|alendar-sunrise-sunset|alendar-unmark|alendar-update-mode-line|alendar-week-end-day|alendar|all-last-kbd-macro|all-next-method|allf|allf2|ancel-edebug-on-entry|ancel-function-timers|ancel-kbd-macro-events|ancel-timer-internal|anlock-insert-header|anlock-verify|anonicalize-coding-system-name|anonically-space-region|apitalized-words-mode|ar-less-than-car|ase-table-get-table|ase|c-choose-style-for-mode|c-eval-when-compile|c-imenu-init|c-imenu-java-build-type-args-regex|c-imenu-objc-function|c-imenu-objc-method-to-selector|c-imenu-objc-remove-white-space|cl-compile|cl-dump|cl-execute-on-string|cl-execute-with-args|cl-execute|cl-program-p|conv--analyze-function|conv--analyze-use|conv--convert-function|conv--map-diff-elem|conv--map-diff-set|conv--map-diff|conv--set-diff-map|conv--set-diff|conv-analyse-form|conv-analyze-form|conv-closure-convert|conv-convert|conv-warnings-only|d-absolute|d|daaar|daadr|daar|dadar|daddr|dadr|ddaar|ddadr|ddar|dddar|ddddr|dddr|dl-get-file|dl-put-region|edet-version|eiling\\*|enter-line|enter-paragraph|enter-region|fengine-auto-mode|fengine-common-settings|fengine-common-syntax|fengine-fill-paragraph|fengine-mode|fengine2-beginning-of-defun|fengine2-end-of-defun|fengine2-indent-line|fengine2-mode|fengine2-outline-level|fengine3--current-function|fengine3-beginning-of-defun|fengine3-clear-syntax-cache|fengine3-completion-function|fengine3-create-imenu-index|fengine3-current-defun|fengine3-documentation-function|fengine3-end-of-defun|fengine3-format-function-docstring|fengine3-indent-line|fengine3-make-syntax-cache|fengine3-mode|hange-class|hange-log-beginning-of-defun|hange-log-end-of-defun|hange-log-fill-forward-paragraph|hange-log-fill-parenthesized-list|hange-log-find-file|hange-log-get-method-definition-1|hange-log-get-method-definition|hange-log-goto-source-1|hange-log-goto-source|hange-log-indent|hange-log-merge|hange-log-mode|hange-log-name|hange-log-next-buffer|hange-log-next-error|hange-log-resolve-conflict|hange-log-search-file-name|hange-log-search-tag-name-1|hange-log-search-tag-name|hange-log-sortable-date-at|hange-log-version-number-search|har-resolve-modifiers|har-valid-p|harset-bytes|harset-chars|harset-description|harset-dimension|harset-id-internal|harset-id|harset-info|harset-iso-final-char|harset-long-name|harset-short-name|hart-add-sequence|hart-axis-child-p|hart-axis-draw|hart-axis-list-p|hart-axis-names-child-p|hart-axis-names-list-p|hart-axis-names-p|hart-axis-names|hart-axis-p|hart-axis-range-child-p|hart-axis-range-list-p|hart-axis-range-p|hart-axis-range|hart-axis|hart-bar-child-p|hart-bar-list-p|hart-bar-p|hart-bar-quickie|hart-bar|hart-child-p|hart-deface-rectangle|hart-display-label|hart-draw-axis|hart-draw-data|hart-draw-line|hart-draw-title|hart-draw|hart-emacs-lists|hart-emacs-storage|hart-file-count|hart-goto-xy|hart-list-p|hart-mode|hart-new-buffer|hart-p|hart-rmail-from|hart-sequece-child-p|hart-sequece-list-p|hart-sequece-p|hart-sequece|hart-size-in-dir|hart-sort-matchlist|hart-sort|hart-space-usage|hart-test-it-all|hart-translate-namezone|hart-translate-xpos|hart-translate-ypos|hart-trim|hart-zap-chars|hart|heck-ccl-program|heck-completion-length|heck-declare-directory|heck-declare-errmsg|heck-declare-file|heck-declare-files|heck-declare-locate|heck-declare-scan|heck-declare-sort|heck-declare-verify|heck-declare-warn)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:check-face|check-ispell-version|check-parens|check-type|checkdoc-autofix-ask-replace|checkdoc-buffer-label|checkdoc-char=|checkdoc-comments|checkdoc-continue|checkdoc-create-common-verbs-regexp|checkdoc-create-error|checkdoc-current-buffer|checkdoc-defun-info|checkdoc-defun|checkdoc-delete-overlay|checkdoc-display-status-buffer|checkdoc-error-end|checkdoc-error-start|checkdoc-error-text|checkdoc-error-unfixable|checkdoc-error|checkdoc-eval-current-buffer|checkdoc-eval-defun|checkdoc-file-comments-engine|checkdoc-in-example-string-p|checkdoc-in-sample-code-p|checkdoc-interactive-ispell-loop|checkdoc-interactive-loop|checkdoc-interactive|checkdoc-ispell-comments|checkdoc-ispell-continue|checkdoc-ispell-current-buffer|checkdoc-ispell-defun|checkdoc-ispell-docstring-engine|checkdoc-ispell-init|checkdoc-ispell-interactive|checkdoc-ispell-message-interactive|checkdoc-ispell-message-text|checkdoc-ispell-start|checkdoc-ispell|checkdoc-list-of-strings-p|checkdoc-make-overlay|checkdoc-message-interactive-ispell-loop|checkdoc-message-interactive|checkdoc-message-text-engine|checkdoc-message-text-next-string|checkdoc-message-text-search|checkdoc-message-text|checkdoc-mode-line-update|checkdoc-next-docstring|checkdoc-next-error|checkdoc-next-message-error|checkdoc-output-mode|checkdoc-outside-major-sexp|checkdoc-overlay-end|checkdoc-overlay-put|checkdoc-overlay-start|checkdoc-proper-noun-region-engine|checkdoc-recursive-edit|checkdoc-rogue-space-check-engine|checkdoc-rogue-spaces|checkdoc-run-hooks|checkdoc-sentencespace-region-engine|checkdoc-show-diagnostics|checkdoc-start-section|checkdoc-start|checkdoc-this-string-valid-engine|checkdoc-this-string-valid|checkdoc-y-or-n-p|checkdoc|child-of-class-p|chmod|choose-completion-delete-max-match|choose-completion-guess-base-position|choose-completion-string|choose-completion|cl--adjoin|cl--arglist-args|cl--block-throw--cmacro|cl--block-throw|cl--block-wrapper--cmacro|cl--block-wrapper|cl--check-key|cl--check-match|cl--check-test-nokey|cl--check-test|cl--compile-time-too|cl--compiler-macro-adjoin|cl--compiler-macro-assoc|cl--compiler-macro-cXXr|cl--compiler-macro-get|cl--compiler-macro-list\\*|cl--compiler-macro-member|cl--compiler-macro-typep|cl--compiling-file|cl--const-expr-p|cl--const-expr-val|cl--defalias|cl--defsubst-expand|cl--delete-duplicates|cl--do-arglist|cl--do-prettyprint|cl--do-proclaim|cl--do-remf|cl--do-subst|cl--expand-do-loop|cl--expr-contains-any|cl--expr-contains|cl--expr-depends-p|cl--finite-do|cl--function-convert|cl--gv-adapt|cl--labels-convert|cl--letf|cl--loop-build-ands|cl--loop-handle-accum|cl--loop-let|cl--loop-set-iterator-function|cl--macroexp-fboundp|cl--make-type-test|cl--make-usage-args|cl--make-usage-var|cl--map-intervals|cl--map-keymap-recursively|cl--map-overlays|cl--mapcar-many|cl--nsublis-rec|cl--parse-loop-clause|cl--parsing-keywords|cl--pass-args-to-cl-declare|cl--pop2|cl--position|cl--random-time|cl--safe-expr-p|cl--set-buffer-substring|cl--set-frame-visible-p|cl--set-getf|cl--set-substring|cl--simple-expr-p|cl--simple-exprs-p|cl--sm-macroexpand|cl--struct-epg-context-p--cmacro|cl--struct-epg-context-p|cl--struct-epg-data-p--cmacro|cl--struct-epg-data-p|cl--struct-epg-import-result-p--cmacro|cl--struct-epg-import-result-p|cl--struct-epg-import-status-p--cmacro|cl--struct-epg-import-status-p|cl--struct-epg-key-p--cmacro|cl--struct-epg-key-p|cl--struct-epg-key-signature-p--cmacro|cl--struct-epg-key-signature-p|cl--struct-epg-new-signature-p--cmacro|cl--struct-epg-new-signature-p|cl--struct-epg-sig-notation-p--cmacro|cl--struct-epg-sig-notation-p|cl--struct-epg-signature-p--cmacro|cl--struct-epg-signature-p|cl--struct-epg-sub-key-p--cmacro|cl--struct-epg-sub-key-p|cl--struct-epg-user-id-p--cmacro|cl--struct-epg-user-id-p|cl--sublis-rec|cl--sublis|cl--transform-lambda|cl--tree-equal-rec|cl--unused-var-p|cl--wrap-in-nil-block|cl-caaaar|cl-caaadr|cl-caaar|cl-caadar|cl-caaddr|cl-caadr|cl-cadaar|cl-cadadr|cl-cadar|cl-caddar|cl-cadddr|cl-cdaaar|cl-cdaadr|cl-cdaar|cl-cdadar|cl-cdaddr|cl-cdadr|cl-cddaar|cl-cddadr|cl-cddar|cl-cdddar|cl-cddddr|cl-cdddr|cl-clrhash|cl-copy-seq|cl-copy-tree|cl-digit-char-p|cl-eighth|cl-fifth|cl-flet\\*|cl-floatp-safe|cl-fourth|cl-fresh-line|cl-gethash|cl-hash-table-count|cl-hash-table-p|cl-maclisp-member|cl-macroexpand-all|cl-macroexpand|cl-make-hash-table|cl-map-extents|cl-map-intervals|cl-map-keymap-recursively|cl-map-keymap|cl-maphash|cl-multiple-value-apply|cl-multiple-value-call|cl-multiple-value-list|cl-ninth|cl-not-hash-table|cl-nreconc|cl-nth-value|cl-parse-integer|cl-prettyprint|cl-puthash|cl-remhash|cl-revappend|cl-second|cl-set-getf|cl-seventh|cl-signum|cl-sixth|cl-struct-sequence-type|cl-struct-setf-expander|cl-struct-slot-info|cl-struct-slot-offset|cl-struct-slot-value--cmacro|cl-struct-slot-value|cl-svref|cl-tenth|cl-third|cl-unload-function|cl-values-list|cl-values|class-abstract-p|class-children|class-constructor|class-direct-subclasses|class-direct-superclasses|class-method-invocation-order|class-name|class-of|class-option-assoc|class-option|class-p|class-parent|class-parents|class-precedence-list|class-slot-initarg|class-v|clean-buffer-list-delay|clean-buffer-list|clear-all-completions|clear-buffer-auto-save-failure|clear-charset-maps|clear-face-cache|clear-font-cache|clear-rectangle-line|clear-rectangle|clipboard-kill-region|clipboard-kill-ring-save|clipboard-yank|clone-buffer|clone-indirect-buffer-other-window|clone-process|clone|close-display-connection|close-font|close-rectangle|cmpl-coerce-string-case|cmpl-hours-since-origin|cmpl-merge-string-cases|cmpl-prefix-entry-head|cmpl-prefix-entry-tail|cmpl-string-case-type|coding-system-base|coding-system-category|coding-system-doc-string|coding-system-eol-type-mnemonic|coding-system-equal|coding-system-from-name|coding-system-lessp|coding-system-mnemonic|coding-system-plist|coding-system-post-read-conversion|coding-system-pre-write-conversion|coding-system-put|coding-system-translation-table-for-decode|coding-system-translation-table-for-encode|coding-system-type|coerce|color-cie-de2000|color-clamp|color-complement-hex|color-complement|color-darken-hsl|color-darken-name|color-desaturate-hsl|color-desaturate-name|color-distance|color-gradient|color-hsl-to-rgb|color-hue-to-rgb|color-lab-to-srgb|color-lab-to-xyz|color-lighten-hsl|color-lighten-name|color-name-to-rgb|color-rgb-to-hex|color-rgb-to-hsl|color-rgb-to-hsv|color-saturate-hsl|color-saturate-name|color-srgb-to-lab|color-srgb-to-xyz|color-xyz-to-lab|color-xyz-to-srgb|column-number-mode|combine-after-change-execute|comint--complete-file-name-data|comint--match-partial-filename|comint--requote-argument|comint--unquote&expand-filename|comint--unquote&requote-argument|comint--unquote-argument|comint-accumulate|comint-add-to-input-history|comint-adjust-point|comint-adjust-window-point|comint-after-pmark-p|comint-append-output-to-file|comint-args|comint-arguments|comint-backward-matching-input|comint-bol-or-process-mark|comint-bol|comint-c-a-p-replace-by-expanded-history|comint-carriage-motion|comint-check-proc|comint-check-source|comint-completion-at-point|comint-completion-file-name-table|comint-continue-subjob|comint-copy-old-input|comint-delchar-or-maybe-eof|comint-delete-input|comint-delete-output|comint-delim-arg|comint-directory|comint-dynamic-complete-as-filename|comint-dynamic-complete-filename|comint-dynamic-complete|comint-dynamic-list-completions|comint-dynamic-list-filename-completions|comint-dynamic-list-input-ring-select|comint-dynamic-list-input-ring|comint-dynamic-simple-complete|comint-exec-1|comint-exec|comint-extract-string|comint-filename-completion|comint-forward-matching-input|comint-get-next-from-history|comint-get-old-input-default|comint-get-source|comint-goto-input|comint-goto-process-mark|comint-history-isearch-backward-regexp|comint-history-isearch-backward|comint-history-isearch-end|comint-history-isearch-message|comint-history-isearch-pop-state|comint-history-isearch-push-state|comint-history-isearch-search|comint-history-isearch-setup|comint-history-isearch-wrap|comint-how-many-region|comint-insert-input|comint-insert-previous-argument|comint-interrupt-subjob|comint-kill-input|comint-kill-region|comint-kill-subjob|comint-kill-whole-line|comint-line-beginning-position|comint-magic-space|comint-match-partial-filename|comint-mode|comint-next-input|comint-next-matching-input-from-input|comint-next-matching-input|comint-next-prompt|comint-output-filter|comint-postoutput-scroll-to-bottom|comint-preinput-scroll-to-bottom|comint-previous-input-string|comint-previous-input|comint-previous-matching-input-from-input|comint-previous-matching-input-string-position|comint-previous-matching-input-string|comint-previous-matching-input|comint-previous-prompt|comint-proc-query|comint-quit-subjob|comint-quote-filename|comint-read-input-ring|comint-read-noecho|comint-redirect-cleanup|comint-redirect-filter|comint-redirect-preoutput-filter|comint-redirect-remove-redirection|comint-redirect-results-list-from-process|comint-redirect-results-list|comint-redirect-send-command-to-process|comint-redirect-send-command|comint-redirect-setup|comint-regexp-arg|comint-replace-by-expanded-filename|comint-replace-by-expanded-history-before-point|comint-replace-by-expanded-history|comint-restore-input|comint-run|comint-search-arg|comint-search-start|comint-send-eof|comint-send-input|comint-send-region|comint-send-string|comint-set-process-mark|comint-show-maximum-output|comint-show-output|comint-simple-send|comint-skip-input|comint-skip-prompt|comint-snapshot-last-prompt|comint-source-default|comint-stop-subjob|comint-strip-ctrl-m|comint-substitute-in-file-name|comint-truncate-buffer|comint-unquote-filename|comint-update-fence|comint-watch-for-password-prompt|comint-within-quotes|comint-word|comint-write-input-ring|comint-write-output|command-apropos|command-error-default-function|command-history-mode|command-history-repeat|command-line-1|command-line-normalize-file-name|comment-add|comment-beginning|comment-box|comment-choose-indent|comment-dwim|comment-enter-backward|comment-forward|comment-indent-default|comment-indent-new-line|comment-indent|comment-kill|comment-make-extra-lines|comment-normalize-vars|comment-only-p|comment-or-uncomment-region|comment-padleft|comment-padright|comment-quote-nested|comment-quote-re|comment-region-default|comment-region-internal|comment-region|comment-search-backward|comment-search-forward|comment-set-column|comment-string-reverse|comment-string-strip|comment-valid-prefix-p|comment-with-narrowing|common-lisp-indent-function|common-lisp-mode|compare-windows-dehighlight|compare-windows-get-next-window|compare-windows-get-recent-window|compare-windows-highlight|compare-windows-skip-whitespace|compare-windows-sync-default-function|compare-windows-sync-regexp|compare-windows|compilation--compat-error-properties|compilation--compat-parse-errors|compilation--ensure-parse|compilation--file-struct->file-spec|compilation--file-struct->formats|compilation--file-struct->loc-tree|compilation--flush-directory-cache|compilation--flush-file-structure|compilation--flush-parse|compilation--loc->col|compilation--loc->file-struct|compilation--loc->line|compilation--loc->marker|compilation--loc->visited|compilation--make-cdrloc|compilation--make-file-struct|compilation--make-message--cmacro|compilation--make-message|compilation--message->end-loc--cmacro|compilation--message->end-loc|compilation--message->loc--cmacro|compilation--message->loc|compilation--message->type--cmacro|compilation--message->type|compilation--message-p--cmacro|compilation--message-p|compilation--parse-region|compilation--previous-directory|compilation--put-prop|compilation--remove-properties|compilation--unsetup|compilation-auto-jump|compilation-buffer-internal-p|compilation-buffer-name|compilation-buffer-p|compilation-button-map|compilation-directory-properties|compilation-display-error|compilation-error-properties|compilation-face|compilation-fake-loc|compilation-filter|compilation-find-buffer|compilation-find-file|compilation-forget-errors|compilation-get-file-structure|compilation-goto-locus-delete-o|compilation-goto-locus|compilation-handle-exit|compilation-internal-error-properties|compilation-loop|compilation-minor-mode|compilation-mode-font-lock-keywords|compilation-mode|compilation-move-to-column|compilation-next-error-function|compilation-next-error|compilation-next-file|compilation-next-single-property-change)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)c(?:heck-face|heck-ispell-version|heck-parens|heck-type|heckdoc-autofix-ask-replace|heckdoc-buffer-label|heckdoc-char=|heckdoc-comments|heckdoc-continue|heckdoc-create-common-verbs-regexp|heckdoc-create-error|heckdoc-current-buffer|heckdoc-defun-info|heckdoc-defun|heckdoc-delete-overlay|heckdoc-display-status-buffer|heckdoc-error-end|heckdoc-error-start|heckdoc-error-text|heckdoc-error-unfixable|heckdoc-error|heckdoc-eval-current-buffer|heckdoc-eval-defun|heckdoc-file-comments-engine|heckdoc-in-example-string-p|heckdoc-in-sample-code-p|heckdoc-interactive-ispell-loop|heckdoc-interactive-loop|heckdoc-interactive|heckdoc-ispell-comments|heckdoc-ispell-continue|heckdoc-ispell-current-buffer|heckdoc-ispell-defun|heckdoc-ispell-docstring-engine|heckdoc-ispell-init|heckdoc-ispell-interactive|heckdoc-ispell-message-interactive|heckdoc-ispell-message-text|heckdoc-ispell-start|heckdoc-ispell|heckdoc-list-of-strings-p|heckdoc-make-overlay|heckdoc-message-interactive-ispell-loop|heckdoc-message-interactive|heckdoc-message-text-engine|heckdoc-message-text-next-string|heckdoc-message-text-search|heckdoc-message-text|heckdoc-mode-line-update|heckdoc-next-docstring|heckdoc-next-error|heckdoc-next-message-error|heckdoc-output-mode|heckdoc-outside-major-sexp|heckdoc-overlay-end|heckdoc-overlay-put|heckdoc-overlay-start|heckdoc-proper-noun-region-engine|heckdoc-recursive-edit|heckdoc-rogue-space-check-engine|heckdoc-rogue-spaces|heckdoc-run-hooks|heckdoc-sentencespace-region-engine|heckdoc-show-diagnostics|heckdoc-start-section|heckdoc-start|heckdoc-this-string-valid-engine|heckdoc-this-string-valid|heckdoc-y-or-n-p|heckdoc|hild-of-class-p|hmod|hoose-completion-delete-max-match|hoose-completion-guess-base-position|hoose-completion-string|hoose-completion|l--adjoin|l--arglist-args|l--block-throw--cmacro|l--block-throw|l--block-wrapper--cmacro|l--block-wrapper|l--check-key|l--check-match|l--check-test-nokey|l--check-test|l--compile-time-too|l--compiler-macro-adjoin|l--compiler-macro-assoc|l--compiler-macro-cXXr|l--compiler-macro-get|l--compiler-macro-list\\*|l--compiler-macro-member|l--compiler-macro-typep|l--compiling-file|l--const-expr-p|l--const-expr-val|l--defalias|l--defsubst-expand|l--delete-duplicates|l--do-arglist|l--do-prettyprint|l--do-proclaim|l--do-remf|l--do-subst|l--expand-do-loop|l--expr-contains-any|l--expr-contains|l--expr-depends-p|l--finite-do|l--function-convert|l--gv-adapt|l--labels-convert|l--letf|l--loop-build-ands|l--loop-handle-accum|l--loop-let|l--loop-set-iterator-function|l--macroexp-fboundp|l--make-type-test|l--make-usage-args|l--make-usage-var|l--map-intervals|l--map-keymap-recursively|l--map-overlays|l--mapcar-many|l--nsublis-rec|l--parse-loop-clause|l--parsing-keywords|l--pass-args-to-cl-declare|l--pop2|l--position|l--random-time|l--safe-expr-p|l--set-buffer-substring|l--set-frame-visible-p|l--set-getf|l--set-substring|l--simple-expr-p|l--simple-exprs-p|l--sm-macroexpand|l--struct-epg-context-p--cmacro|l--struct-epg-context-p|l--struct-epg-data-p--cmacro|l--struct-epg-data-p|l--struct-epg-import-result-p--cmacro|l--struct-epg-import-result-p|l--struct-epg-import-status-p--cmacro|l--struct-epg-import-status-p|l--struct-epg-key-p--cmacro|l--struct-epg-key-p|l--struct-epg-key-signature-p--cmacro|l--struct-epg-key-signature-p|l--struct-epg-new-signature-p--cmacro|l--struct-epg-new-signature-p|l--struct-epg-sig-notation-p--cmacro|l--struct-epg-sig-notation-p|l--struct-epg-signature-p--cmacro|l--struct-epg-signature-p|l--struct-epg-sub-key-p--cmacro|l--struct-epg-sub-key-p|l--struct-epg-user-id-p--cmacro|l--struct-epg-user-id-p|l--sublis-rec|l--sublis|l--transform-lambda|l--tree-equal-rec|l--unused-var-p|l--wrap-in-nil-block|l-caaaar|l-caaadr|l-caaar|l-caadar|l-caaddr|l-caadr|l-cadaar|l-cadadr|l-cadar|l-caddar|l-cadddr|l-cdaaar|l-cdaadr|l-cdaar|l-cdadar|l-cdaddr|l-cdadr|l-cddaar|l-cddadr|l-cddar|l-cdddar|l-cddddr|l-cdddr|l-clrhash|l-copy-seq|l-copy-tree|l-digit-char-p|l-eighth|l-fifth|l-flet\\*|l-floatp-safe|l-fourth|l-fresh-line|l-gethash|l-hash-table-count|l-hash-table-p|l-maclisp-member|l-macroexpand-all|l-macroexpand|l-make-hash-table|l-map-extents|l-map-intervals|l-map-keymap-recursively|l-map-keymap|l-maphash|l-multiple-value-apply|l-multiple-value-call|l-multiple-value-list|l-ninth|l-not-hash-table|l-nreconc|l-nth-value|l-parse-integer|l-prettyprint|l-puthash|l-remhash|l-revappend|l-second|l-set-getf|l-seventh|l-signum|l-sixth|l-struct-sequence-type|l-struct-setf-expander|l-struct-slot-info|l-struct-slot-offset|l-struct-slot-value--cmacro|l-struct-slot-value|l-svref|l-tenth|l-third|l-unload-function|l-values-list|l-values|lass-abstract-p|lass-children|lass-constructor|lass-direct-subclasses|lass-direct-superclasses|lass-method-invocation-order|lass-name|lass-of|lass-option-assoc|lass-option|lass-p|lass-parent|lass-parents|lass-precedence-list|lass-slot-initarg|lass-v|lean-buffer-list-delay|lean-buffer-list|lear-all-completions|lear-buffer-auto-save-failure|lear-charset-maps|lear-face-cache|lear-font-cache|lear-rectangle-line|lear-rectangle|lipboard-kill-region|lipboard-kill-ring-save|lipboard-yank|lone-buffer|lone-indirect-buffer-other-window|lone-process|lone|lose-display-connection|lose-font|lose-rectangle|mpl-coerce-string-case|mpl-hours-since-origin|mpl-merge-string-cases|mpl-prefix-entry-head|mpl-prefix-entry-tail|mpl-string-case-type|oding-system-base|oding-system-category|oding-system-doc-string|oding-system-eol-type-mnemonic|oding-system-equal|oding-system-from-name|oding-system-lessp|oding-system-mnemonic|oding-system-plist|oding-system-post-read-conversion|oding-system-pre-write-conversion|oding-system-put|oding-system-translation-table-for-decode|oding-system-translation-table-for-encode|oding-system-type|oerce|olor-cie-de2000|olor-clamp|olor-complement-hex|olor-complement|olor-darken-hsl|olor-darken-name|olor-desaturate-hsl|olor-desaturate-name|olor-distance|olor-gradient|olor-hsl-to-rgb|olor-hue-to-rgb|olor-lab-to-srgb|olor-lab-to-xyz|olor-lighten-hsl|olor-lighten-name|olor-name-to-rgb|olor-rgb-to-hex|olor-rgb-to-hsl|olor-rgb-to-hsv|olor-saturate-hsl|olor-saturate-name|olor-srgb-to-lab|olor-srgb-to-xyz|olor-xyz-to-lab|olor-xyz-to-srgb|olumn-number-mode|ombine-after-change-execute|omint--complete-file-name-data|omint--match-partial-filename|omint--requote-argument|omint--unquote&expand-filename|omint--unquote&requote-argument|omint--unquote-argument|omint-accumulate|omint-add-to-input-history|omint-adjust-point|omint-adjust-window-point|omint-after-pmark-p|omint-append-output-to-file|omint-args|omint-arguments|omint-backward-matching-input|omint-bol-or-process-mark|omint-bol|omint-c-a-p-replace-by-expanded-history|omint-carriage-motion|omint-check-proc|omint-check-source|omint-completion-at-point|omint-completion-file-name-table|omint-continue-subjob|omint-copy-old-input|omint-delchar-or-maybe-eof|omint-delete-input|omint-delete-output|omint-delim-arg|omint-directory|omint-dynamic-complete-as-filename|omint-dynamic-complete-filename|omint-dynamic-complete|omint-dynamic-list-completions|omint-dynamic-list-filename-completions|omint-dynamic-list-input-ring-select|omint-dynamic-list-input-ring|omint-dynamic-simple-complete|omint-exec-1|omint-exec|omint-extract-string|omint-filename-completion|omint-forward-matching-input|omint-get-next-from-history|omint-get-old-input-default|omint-get-source|omint-goto-input|omint-goto-process-mark|omint-history-isearch-backward-regexp|omint-history-isearch-backward|omint-history-isearch-end|omint-history-isearch-message|omint-history-isearch-pop-state|omint-history-isearch-push-state|omint-history-isearch-search|omint-history-isearch-setup|omint-history-isearch-wrap|omint-how-many-region|omint-insert-input|omint-insert-previous-argument|omint-interrupt-subjob|omint-kill-input|omint-kill-region|omint-kill-subjob|omint-kill-whole-line|omint-line-beginning-position|omint-magic-space|omint-match-partial-filename|omint-mode|omint-next-input|omint-next-matching-input-from-input|omint-next-matching-input|omint-next-prompt|omint-output-filter|omint-postoutput-scroll-to-bottom|omint-preinput-scroll-to-bottom|omint-previous-input-string|omint-previous-input|omint-previous-matching-input-from-input|omint-previous-matching-input-string-position|omint-previous-matching-input-string|omint-previous-matching-input|omint-previous-prompt|omint-proc-query|omint-quit-subjob|omint-quote-filename|omint-read-input-ring|omint-read-noecho|omint-redirect-cleanup|omint-redirect-filter|omint-redirect-preoutput-filter|omint-redirect-remove-redirection|omint-redirect-results-list-from-process|omint-redirect-results-list|omint-redirect-send-command-to-process|omint-redirect-send-command|omint-redirect-setup|omint-regexp-arg|omint-replace-by-expanded-filename|omint-replace-by-expanded-history-before-point|omint-replace-by-expanded-history|omint-restore-input|omint-run|omint-search-arg|omint-search-start|omint-send-eof|omint-send-input|omint-send-region|omint-send-string|omint-set-process-mark|omint-show-maximum-output|omint-show-output|omint-simple-send|omint-skip-input|omint-skip-prompt|omint-snapshot-last-prompt|omint-source-default|omint-stop-subjob|omint-strip-ctrl-m|omint-substitute-in-file-name|omint-truncate-buffer|omint-unquote-filename|omint-update-fence|omint-watch-for-password-prompt|omint-within-quotes|omint-word|omint-write-input-ring|omint-write-output|ommand-apropos|ommand-error-default-function|ommand-history-mode|ommand-history-repeat|ommand-line-1|ommand-line-normalize-file-name|omment-add|omment-beginning|omment-box|omment-choose-indent|omment-dwim|omment-enter-backward|omment-forward|omment-indent-default|omment-indent-new-line|omment-indent|omment-kill|omment-make-extra-lines|omment-normalize-vars|omment-only-p|omment-or-uncomment-region|omment-padleft|omment-padright|omment-quote-nested|omment-quote-re|omment-region-default|omment-region-internal|omment-region|omment-search-backward|omment-search-forward|omment-set-column|omment-string-reverse|omment-string-strip|omment-valid-prefix-p|omment-with-narrowing|ommon-lisp-indent-function|ommon-lisp-mode|ompare-windows-dehighlight|ompare-windows-get-next-window|ompare-windows-get-recent-window|ompare-windows-highlight|ompare-windows-skip-whitespace|ompare-windows-sync-default-function|ompare-windows-sync-regexp|ompare-windows|ompilation--compat-error-properties|ompilation--compat-parse-errors|ompilation--ensure-parse|ompilation--file-struct->file-spec|ompilation--file-struct->formats|ompilation--file-struct->loc-tree|ompilation--flush-directory-cache|ompilation--flush-file-structure|ompilation--flush-parse|ompilation--loc->col|ompilation--loc->file-struct|ompilation--loc->line|ompilation--loc->marker|ompilation--loc->visited|ompilation--make-cdrloc|ompilation--make-file-struct|ompilation--make-message--cmacro|ompilation--make-message|ompilation--message->end-loc--cmacro|ompilation--message->end-loc|ompilation--message->loc--cmacro|ompilation--message->loc|ompilation--message->type--cmacro|ompilation--message->type|ompilation--message-p--cmacro|ompilation--message-p|ompilation--parse-region|ompilation--previous-directory|ompilation--put-prop|ompilation--remove-properties|ompilation--unsetup|ompilation-auto-jump|ompilation-buffer-internal-p|ompilation-buffer-name|ompilation-buffer-p|ompilation-button-map|ompilation-directory-properties|ompilation-display-error|ompilation-error-properties|ompilation-face|ompilation-fake-loc|ompilation-filter|ompilation-find-buffer|ompilation-find-file|ompilation-forget-errors|ompilation-get-file-structure|ompilation-goto-locus-delete-o|ompilation-goto-locus|ompilation-handle-exit|ompilation-internal-error-properties|ompilation-loop|ompilation-minor-mode|ompilation-mode-font-lock-keywords|ompilation-mode|ompilation-move-to-column|ompilation-next-error-function|ompilation-next-error|ompilation-next-file|ompilation-next-single-property-change)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:compilation-parse-errors|compilation-previous-error|compilation-previous-file|compilation-read-command|compilation-revert-buffer|compilation-sentinel|compilation-set-skip-threshold|compilation-set-window-height|compilation-set-window|compilation-setup|compilation-shell-minor-mode|compilation-start|compile-goto-error|compile-mouse-goto-error|compile|compiler-macroexpand|complete-in-turn|complete-symbol|complete-tag|complete-with-action|complete|completing-read-default|completing-read-multiple|completion--cache-all-sorted-completions|completion--capf-wrapper|completion--common-suffix|completion--complete-and-exit|completion--cycle-threshold|completion--do-completion|completion--done|completion--embedded-envvar-table|completion--field-metadata|completion--file-name-table|completion--flush-all-sorted-completions|completion--in-region-1|completion--in-region|completion--insert-strings|completion--make-envvar-table|completion--merge-suffix|completion--message|completion--metadata|completion--nth-completion|completion--post-self-insert|completion--replace|completion--sifn-requote|completion--some|completion--string-equal-p|completion--styles|completion--try-word-completion|completion--twq-all|completion--twq-try|completion-all-completions|completion-all-sorted-completions|completion-backup-filename|completion-basic--pattern|completion-basic-all-completions|completion-basic-try-completion|completion-before-command|completion-c-mode-hook|completion-complete-and-exit|completion-def-wrapper|completion-emacs21-all-completions|completion-emacs21-try-completion|completion-emacs22-all-completions|completion-emacs22-try-completion|completion-file-name-table|completion-find-file-hook|completion-help-at-point|completion-hilit-commonality|completion-in-region--postch|completion-in-region--single-word|completion-in-region-mode|completion-initialize|completion-initials-all-completions|completion-initials-expand|completion-initials-try-completion|completion-kill-region|completion-last-use-time|completion-lisp-mode-hook|completion-list-mode-finish|completion-list-mode|completion-metadata-get|completion-metadata|completion-mode|completion-num-uses|completion-pcm--all-completions|completion-pcm--filename-try-filter|completion-pcm--find-all-completions|completion-pcm--hilit-commonality|completion-pcm--merge-completions|completion-pcm--merge-try|completion-pcm--optimize-pattern|completion-pcm--pattern->regex|completion-pcm--pattern->string|completion-pcm--pattern-trivial-p|completion-pcm--prepare-delim-re|completion-pcm--string->pattern|completion-pcm-all-completions|completion-pcm-try-completion|completion-search-next|completion-search-peek|completion-search-reset-1|completion-search-reset|completion-setup-fortran-mode|completion-setup-function|completion-source|completion-string|completion-substring--all-completions|completion-substring-all-completions|completion-substring-try-completion|completion-table-with-context|completion-try-completion|compose-chars-after|compose-chars|compose-glyph-string-relative|compose-glyph-string|compose-gstring-for-dotted-circle|compose-gstring-for-graphic|compose-gstring-for-terminal|compose-gstring-for-variation-glyph|compose-last-chars|compose-mail-other-frame|compose-mail-other-window|compose-mail|compose-region-internal|compose-region|compose-string-internal|compose-string|composition-get-gstring|concatenate|condition-case-no-debug|conf-align-assignments|conf-colon-mode|conf-javaprop-mode|conf-mode-initialize|conf-mode-maybe|conf-mode|conf-outline-level|conf-ppd-mode|conf-quote-normal|conf-space-keywords|conf-space-mode-internal|conf-space-mode|conf-unix-mode|conf-windows-mode|conf-xdefaults-mode|confirm-nonexistent-file-or-buffer|constructor|convert-define-charset-argument|cookie-apropos|cookie-check-file|cookie-doctor|cookie-insert|cookie-read|cookie-shuffle-vector|cookie-snarf|cookie|cookie1|copy-case-table|copy-cvs-flags|copy-cvs-tag|copy-dir-locals-to-file-locals-prop-line|copy-dir-locals-to-file-locals|copy-ebrowse-bs|copy-ebrowse-cs|copy-ebrowse-hs|copy-ebrowse-ms|copy-ebrowse-position|copy-ebrowse-ts|copy-erc-channel-user|copy-erc-response|copy-erc-server-user|copy-ert--ewoc-entry|copy-ert--stats|copy-ert--test-execution-info|copy-ert-test-aborted-with-non-local-exit|copy-ert-test-failed|copy-ert-test-passed|copy-ert-test-quit|copy-ert-test-result-with-condition|copy-ert-test-result|copy-ert-test-skipped|copy-ert-test|copy-ewoc--node|copy-ewoc|copy-face|copy-file-locals-to-dir-locals|copy-flymake-ler|copy-gdb-handler|copy-gdb-table|copy-htmlize-fstruct|copy-js--js-handle|copy-js--pitem|copy-list|copy-package--bi-desc|copy-package-desc|copy-profiler-calltree|copy-profiler-profile|copy-rectangle-as-kill|copy-rectangle-to-register|copy-seq|copy-ses--locprn|copy-sgml-tag|copy-soap-array-type|copy-soap-basic-type|copy-soap-binding|copy-soap-bound-operation|copy-soap-element|copy-soap-message|copy-soap-namespace-link|copy-soap-namespace|copy-soap-operation|copy-soap-port-type|copy-soap-port|copy-soap-sequence-element|copy-soap-sequence-type|copy-soap-simple-type|copy-soap-wsdl|copy-tar-header|copy-to-buffer|copy-to-register|copy-url-queue|copyright-find-copyright|copyright-find-end|copyright-fix-years|copyright-limit|copyright-offset-too-large-p|copyright-re-search|copyright-start-point|copyright-update-directory|copyright-update-year|copyright-update|copyright|count-if-not|count-if|count-lines-page|count-lines-region|count-matches|count-text-lines|count-trailing-whitespace-region|count-windows|count-words--buffer-message|count-words--message|count-words-region|count|cperl-1\\+|cperl-1-|cperl-add-tags-recurse-noxs-fullpath|cperl-add-tags-recurse-noxs|cperl-add-tags-recurse|cperl-after-block-and-statement-beg|cperl-after-block-p|cperl-after-change-function|cperl-after-expr-p|cperl-after-label|cperl-after-sub-regexp|cperl-at-end-of-expr|cperl-backward-to-noncomment|cperl-backward-to-start-of-continued-exp|cperl-backward-to-start-of-expr|cperl-beautify-level|cperl-beautify-regexp-piece|cperl-beautify-regexp|cperl-beginning-of-property|cperl-block-p|cperl-build-manpage|cperl-cached-syntax-table|cperl-calculate-indent-within-comment|cperl-calculate-indent|cperl-check-syntax|cperl-choose-color|cperl-comment-indent|cperl-comment-region|cperl-commentify|cperl-contract-level|cperl-contract-levels|cperl-db|cperl-define-key|cperl-delay-update-hook|cperl-describe-perl-symbol|cperl-do-auto-fill|cperl-electric-backspace|cperl-electric-brace|cperl-electric-else|cperl-electric-keyword|cperl-electric-lbrace|cperl-electric-paren|cperl-electric-pod|cperl-electric-rparen|cperl-electric-semi|cperl-electric-terminator|cperl-emulate-lazy-lock|cperl-enable-font-lock|cperl-ensure-newlines|cperl-etags|cperl-facemenu-add-face-function|cperl-fill-paragraph|cperl-find-bad-style|cperl-find-pods-heres-region|cperl-find-pods-heres|cperl-find-sub-attrs|cperl-find-tags|cperl-fix-line-spacing|cperl-font-lock-fontify-region-function|cperl-font-lock-unfontify-region-function|cperl-fontify-syntaxically|cperl-fontify-update-bad|cperl-fontify-update|cperl-forward-group-in-re|cperl-forward-re|cperl-forward-to-end-of-expr|cperl-get-help-defer|cperl-get-help|cperl-get-here-doc-region|cperl-get-state|cperl-here-doc-spell|cperl-highlight-charclass|cperl-imenu--create-perl-index|cperl-imenu-addback|cperl-imenu-info-imenu-name|cperl-imenu-info-imenu-search|cperl-imenu-name-and-position|cperl-imenu-on-info|cperl-indent-command|cperl-indent-exp|cperl-indent-for-comment|cperl-indent-line|cperl-indent-region|cperl-info-buffer|cperl-info-on-command|cperl-info-on-current-command|cperl-init-faces-weak|cperl-init-faces|cperl-inside-parens-p|cperl-invert-if-unless-modifiers|cperl-invert-if-unless|cperl-lazy-hook|cperl-lazy-install|cperl-lazy-unstall|cperl-linefeed|cperl-lineup|cperl-list-fold|cperl-load-font-lock-keywords-1|cperl-load-font-lock-keywords-2|cperl-load-font-lock-keywords|cperl-look-at-leading-count|cperl-make-indent|cperl-make-regexp-x|cperl-map-pods-heres|cperl-mark-active|cperl-menu-to-keymap|cperl-menu|cperl-mode|cperl-modify-syntax-type|cperl-msb-fix|cperl-narrow-to-here-doc|cperl-next-bad-style|cperl-next-interpolated-REx-0|cperl-next-interpolated-REx-1|cperl-next-interpolated-REx|cperl-outline-level|cperl-perldoc-at-point|cperl-perldoc|cperl-pod-spell|cperl-pod-to-manpage|cperl-pod2man-build-command|cperl-postpone-fontification|cperl-protect-defun-start|cperl-ps-print-init|cperl-ps-print|cperl-put-do-not-fontify|cperl-putback-char|cperl-regext-to-level-start|cperl-select-this-pod-or-here-doc|cperl-set-style-back|cperl-set-style|cperl-setup-tmp-buf|cperl-sniff-for-indent|cperl-switch-to-doc-buffer|cperl-tags-hier-fill|cperl-tags-hier-init|cperl-tags-treeify|cperl-time-fontification|cperl-to-comment-or-eol|cperl-toggle-abbrev|cperl-toggle-auto-newline|cperl-toggle-autohelp|cperl-toggle-construct-fix|cperl-toggle-electric|cperl-toggle-set-debug-unwind|cperl-uncomment-region|cperl-unwind-to-safe|cperl-update-syntaxification|cperl-use-region-p|cperl-val|cperl-windowed-init|cperl-word-at-point-hard|cperl-word-at-point|cperl-write-tags|cperl-xsub-scan|cpp-choose-branch|cpp-choose-default-face|cpp-choose-face|cpp-choose-symbol|cpp-create-bg-face|cpp-edit-apply|cpp-edit-background|cpp-edit-false|cpp-edit-home|cpp-edit-known|cpp-edit-list-entry-get-or-create|cpp-edit-load|cpp-edit-mode|cpp-edit-reset|cpp-edit-save|cpp-edit-toggle-known|cpp-edit-toggle-unknown|cpp-edit-true|cpp-edit-unknown|cpp-edit-write|cpp-face-name|cpp-grow-overlay|cpp-highlight-buffer|cpp-make-button|cpp-make-known-overlay|cpp-make-overlay-hidden|cpp-make-overlay-read-only|cpp-make-overlay-sticky|cpp-make-unknown-overlay|cpp-parse-close|cpp-parse-edit|cpp-parse-error|cpp-parse-open|cpp-parse-reset|cpp-progress-message|cpp-push-button|cpp-signal-read-only|create-default-fontset|create-fontset-from-ascii-font|create-fontset-from-x-resource|create-glyph|crm--choose-completion-string|crm--collection-fn|crm--completion-command|crm--current-element|crm-complete-and-exit|crm-complete-word|crm-complete|crm-completion-help|crm-minibuffer-complete-and-exit|crm-minibuffer-complete|crm-minibuffer-completion-help|css--font-lock-keywords|css-current-defun-name|css-extract-keyword-list|css-extract-parse-val-grammar|css-extract-props-and-vals|css-fill-paragraph|css-mode|css-smie--backward-token|css-smie--forward-token|css-smie-rules|ctext-non-standard-encodings-table|ctext-post-read-conversion|ctext-pre-write-conversion|ctl-x-4-prefix|ctl-x-5-prefix|ctl-x-ctl-p-prefix|cua--M\\/H-key|cua--deactivate|cua--fallback|cua--filter-buffer-noprops|cua--init-keymaps|cua--keep-active|cua--post-command-handler-1|cua--post-command-handler|cua--pre-command-handler-1|cua--pre-command-handler|cua--prefix-arg|cua--prefix-copy-handler|cua--prefix-cut-handler|cua--prefix-override-handler|cua--prefix-override-replay|cua--prefix-override-timeout|cua--prefix-repeat-handler|cua--select-keymaps|cua--self-insert-char-p|cua--shift-control-c-prefix|cua--shift-control-prefix|cua--shift-control-x-prefix|cua--update-indications|cua-cancel|cua-copy-region|cua-cut-region|cua-debug|cua-delete-region|cua-exchange-point-and-mark|cua-help-for-region|cua-mode|cua-paste-pop|cua-paste|cua-pop-to-last-change|cua-rectangle-mark-mode|cua-scroll-down|cua-scroll-up|cua-selection-mode|cua-set-mark|cua-set-rectangle-mark|cua-toggle-global-mark|current-line|custom--frame-color-default|custom--initialize-widget-variables|custom--sort-vars-1|custom--sort-vars|custom-add-dependencies|custom-add-link|custom-add-load|custom-add-option|custom-add-package-version|custom-add-parent-links|custom-add-see-also|custom-add-to-group|custom-add-version|custom-autoload|custom-available-themes|custom-browse-face-tag-action|custom-browse-group-tag-action|custom-browse-insert-prefix|custom-browse-variable-tag-action|custom-browse-visibility-action|custom-buffer-create-internal|custom-buffer-create-other-window|custom-buffer-create|custom-check-theme|custom-command-apply|custom-comment-create|custom-comment-hide|custom-comment-invisible-p|custom-comment-show|custom-convert-widget|custom-current-group|custom-declare-face|custom-declare-group|custom-declare-theme|custom-declare-variable|custom-face-action|custom-face-attributes-get|custom-face-edit-activate|custom-face-edit-all|custom-face-edit-attribute-tag|custom-face-edit-convert-widget)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)c(?:ompilation-parse-errors|ompilation-previous-error|ompilation-previous-file|ompilation-read-command|ompilation-revert-buffer|ompilation-sentinel|ompilation-set-skip-threshold|ompilation-set-window-height|ompilation-set-window|ompilation-setup|ompilation-shell-minor-mode|ompilation-start|ompile-goto-error|ompile-mouse-goto-error|ompile|ompiler-macroexpand|omplete-in-turn|omplete-symbol|omplete-tag|omplete-with-action|omplete|ompleting-read-default|ompleting-read-multiple|ompletion--cache-all-sorted-completions|ompletion--capf-wrapper|ompletion--common-suffix|ompletion--complete-and-exit|ompletion--cycle-threshold|ompletion--do-completion|ompletion--done|ompletion--embedded-envvar-table|ompletion--field-metadata|ompletion--file-name-table|ompletion--flush-all-sorted-completions|ompletion--in-region-1|ompletion--in-region|ompletion--insert-strings|ompletion--make-envvar-table|ompletion--merge-suffix|ompletion--message|ompletion--metadata|ompletion--nth-completion|ompletion--post-self-insert|ompletion--replace|ompletion--sifn-requote|ompletion--some|ompletion--string-equal-p|ompletion--styles|ompletion--try-word-completion|ompletion--twq-all|ompletion--twq-try|ompletion-all-completions|ompletion-all-sorted-completions|ompletion-backup-filename|ompletion-basic--pattern|ompletion-basic-all-completions|ompletion-basic-try-completion|ompletion-before-command|ompletion-c-mode-hook|ompletion-complete-and-exit|ompletion-def-wrapper|ompletion-emacs21-all-completions|ompletion-emacs21-try-completion|ompletion-emacs22-all-completions|ompletion-emacs22-try-completion|ompletion-file-name-table|ompletion-find-file-hook|ompletion-help-at-point|ompletion-hilit-commonality|ompletion-in-region--postch|ompletion-in-region--single-word|ompletion-in-region-mode|ompletion-initialize|ompletion-initials-all-completions|ompletion-initials-expand|ompletion-initials-try-completion|ompletion-kill-region|ompletion-last-use-time|ompletion-lisp-mode-hook|ompletion-list-mode-finish|ompletion-list-mode|ompletion-metadata-get|ompletion-metadata|ompletion-mode|ompletion-num-uses|ompletion-pcm--all-completions|ompletion-pcm--filename-try-filter|ompletion-pcm--find-all-completions|ompletion-pcm--hilit-commonality|ompletion-pcm--merge-completions|ompletion-pcm--merge-try|ompletion-pcm--optimize-pattern|ompletion-pcm--pattern->regex|ompletion-pcm--pattern->string|ompletion-pcm--pattern-trivial-p|ompletion-pcm--prepare-delim-re|ompletion-pcm--string->pattern|ompletion-pcm-all-completions|ompletion-pcm-try-completion|ompletion-search-next|ompletion-search-peek|ompletion-search-reset-1|ompletion-search-reset|ompletion-setup-fortran-mode|ompletion-setup-function|ompletion-source|ompletion-string|ompletion-substring--all-completions|ompletion-substring-all-completions|ompletion-substring-try-completion|ompletion-table-with-context|ompletion-try-completion|ompose-chars-after|ompose-chars|ompose-glyph-string-relative|ompose-glyph-string|ompose-gstring-for-dotted-circle|ompose-gstring-for-graphic|ompose-gstring-for-terminal|ompose-gstring-for-variation-glyph|ompose-last-chars|ompose-mail-other-frame|ompose-mail-other-window|ompose-mail|ompose-region-internal|ompose-region|ompose-string-internal|ompose-string|omposition-get-gstring|oncatenate|ondition-case-no-debug|onf-align-assignments|onf-colon-mode|onf-javaprop-mode|onf-mode-initialize|onf-mode-maybe|onf-mode|onf-outline-level|onf-ppd-mode|onf-quote-normal|onf-space-keywords|onf-space-mode-internal|onf-space-mode|onf-unix-mode|onf-windows-mode|onf-xdefaults-mode|onfirm-nonexistent-file-or-buffer|onstructor|onvert-define-charset-argument|ookie-apropos|ookie-check-file|ookie-doctor|ookie-insert|ookie-read|ookie-shuffle-vector|ookie-snarf|ookie|ookie1|opy-case-table|opy-cvs-flags|opy-cvs-tag|opy-dir-locals-to-file-locals-prop-line|opy-dir-locals-to-file-locals|opy-ebrowse-bs|opy-ebrowse-cs|opy-ebrowse-hs|opy-ebrowse-ms|opy-ebrowse-position|opy-ebrowse-ts|opy-erc-channel-user|opy-erc-response|opy-erc-server-user|opy-ert--ewoc-entry|opy-ert--stats|opy-ert--test-execution-info|opy-ert-test-aborted-with-non-local-exit|opy-ert-test-failed|opy-ert-test-passed|opy-ert-test-quit|opy-ert-test-result-with-condition|opy-ert-test-result|opy-ert-test-skipped|opy-ert-test|opy-ewoc--node|opy-ewoc|opy-face|opy-file-locals-to-dir-locals|opy-flymake-ler|opy-gdb-handler|opy-gdb-table|opy-htmlize-fstruct|opy-js--js-handle|opy-js--pitem|opy-list|opy-package--bi-desc|opy-package-desc|opy-profiler-calltree|opy-profiler-profile|opy-rectangle-as-kill|opy-rectangle-to-register|opy-seq|opy-ses--locprn|opy-sgml-tag|opy-soap-array-type|opy-soap-basic-type|opy-soap-binding|opy-soap-bound-operation|opy-soap-element|opy-soap-message|opy-soap-namespace-link|opy-soap-namespace|opy-soap-operation|opy-soap-port-type|opy-soap-port|opy-soap-sequence-element|opy-soap-sequence-type|opy-soap-simple-type|opy-soap-wsdl|opy-tar-header|opy-to-buffer|opy-to-register|opy-url-queue|opyright-find-copyright|opyright-find-end|opyright-fix-years|opyright-limit|opyright-offset-too-large-p|opyright-re-search|opyright-start-point|opyright-update-directory|opyright-update-year|opyright-update|opyright|ount-if-not|ount-if|ount-lines-page|ount-lines-region|ount-matches|ount-text-lines|ount-trailing-whitespace-region|ount-windows|ount-words--buffer-message|ount-words--message|ount-words-region|ount|perl-1\\+|perl-1-|perl-add-tags-recurse-noxs-fullpath|perl-add-tags-recurse-noxs|perl-add-tags-recurse|perl-after-block-and-statement-beg|perl-after-block-p|perl-after-change-function|perl-after-expr-p|perl-after-label|perl-after-sub-regexp|perl-at-end-of-expr|perl-backward-to-noncomment|perl-backward-to-start-of-continued-exp|perl-backward-to-start-of-expr|perl-beautify-level|perl-beautify-regexp-piece|perl-beautify-regexp|perl-beginning-of-property|perl-block-p|perl-build-manpage|perl-cached-syntax-table|perl-calculate-indent-within-comment|perl-calculate-indent|perl-check-syntax|perl-choose-color|perl-comment-indent|perl-comment-region|perl-commentify|perl-contract-level|perl-contract-levels|perl-db|perl-define-key|perl-delay-update-hook|perl-describe-perl-symbol|perl-do-auto-fill|perl-electric-backspace|perl-electric-brace|perl-electric-else|perl-electric-keyword|perl-electric-lbrace|perl-electric-paren|perl-electric-pod|perl-electric-rparen|perl-electric-semi|perl-electric-terminator|perl-emulate-lazy-lock|perl-enable-font-lock|perl-ensure-newlines|perl-etags|perl-facemenu-add-face-function|perl-fill-paragraph|perl-find-bad-style|perl-find-pods-heres-region|perl-find-pods-heres|perl-find-sub-attrs|perl-find-tags|perl-fix-line-spacing|perl-font-lock-fontify-region-function|perl-font-lock-unfontify-region-function|perl-fontify-syntaxically|perl-fontify-update-bad|perl-fontify-update|perl-forward-group-in-re|perl-forward-re|perl-forward-to-end-of-expr|perl-get-help-defer|perl-get-help|perl-get-here-doc-region|perl-get-state|perl-here-doc-spell|perl-highlight-charclass|perl-imenu--create-perl-index|perl-imenu-addback|perl-imenu-info-imenu-name|perl-imenu-info-imenu-search|perl-imenu-name-and-position|perl-imenu-on-info|perl-indent-command|perl-indent-exp|perl-indent-for-comment|perl-indent-line|perl-indent-region|perl-info-buffer|perl-info-on-command|perl-info-on-current-command|perl-init-faces-weak|perl-init-faces|perl-inside-parens-p|perl-invert-if-unless-modifiers|perl-invert-if-unless|perl-lazy-hook|perl-lazy-install|perl-lazy-unstall|perl-linefeed|perl-lineup|perl-list-fold|perl-load-font-lock-keywords-1|perl-load-font-lock-keywords-2|perl-load-font-lock-keywords|perl-look-at-leading-count|perl-make-indent|perl-make-regexp-x|perl-map-pods-heres|perl-mark-active|perl-menu-to-keymap|perl-menu|perl-mode|perl-modify-syntax-type|perl-msb-fix|perl-narrow-to-here-doc|perl-next-bad-style|perl-next-interpolated-REx-0|perl-next-interpolated-REx-1|perl-next-interpolated-REx|perl-outline-level|perl-perldoc-at-point|perl-perldoc|perl-pod-spell|perl-pod-to-manpage|perl-pod2man-build-command|perl-postpone-fontification|perl-protect-defun-start|perl-ps-print-init|perl-ps-print|perl-put-do-not-fontify|perl-putback-char|perl-regext-to-level-start|perl-select-this-pod-or-here-doc|perl-set-style-back|perl-set-style|perl-setup-tmp-buf|perl-sniff-for-indent|perl-switch-to-doc-buffer|perl-tags-hier-fill|perl-tags-hier-init|perl-tags-treeify|perl-time-fontification|perl-to-comment-or-eol|perl-toggle-abbrev|perl-toggle-auto-newline|perl-toggle-autohelp|perl-toggle-construct-fix|perl-toggle-electric|perl-toggle-set-debug-unwind|perl-uncomment-region|perl-unwind-to-safe|perl-update-syntaxification|perl-use-region-p|perl-val|perl-windowed-init|perl-word-at-point-hard|perl-word-at-point|perl-write-tags|perl-xsub-scan|pp-choose-branch|pp-choose-default-face|pp-choose-face|pp-choose-symbol|pp-create-bg-face|pp-edit-apply|pp-edit-background|pp-edit-false|pp-edit-home|pp-edit-known|pp-edit-list-entry-get-or-create|pp-edit-load|pp-edit-mode|pp-edit-reset|pp-edit-save|pp-edit-toggle-known|pp-edit-toggle-unknown|pp-edit-true|pp-edit-unknown|pp-edit-write|pp-face-name|pp-grow-overlay|pp-highlight-buffer|pp-make-button|pp-make-known-overlay|pp-make-overlay-hidden|pp-make-overlay-read-only|pp-make-overlay-sticky|pp-make-unknown-overlay|pp-parse-close|pp-parse-edit|pp-parse-error|pp-parse-open|pp-parse-reset|pp-progress-message|pp-push-button|pp-signal-read-only|reate-default-fontset|reate-fontset-from-ascii-font|reate-fontset-from-x-resource|reate-glyph|rm--choose-completion-string|rm--collection-fn|rm--completion-command|rm--current-element|rm-complete-and-exit|rm-complete-word|rm-complete|rm-completion-help|rm-minibuffer-complete-and-exit|rm-minibuffer-complete|rm-minibuffer-completion-help|ss--font-lock-keywords|ss-current-defun-name|ss-extract-keyword-list|ss-extract-parse-val-grammar|ss-extract-props-and-vals|ss-fill-paragraph|ss-mode|ss-smie--backward-token|ss-smie--forward-token|ss-smie-rules|text-non-standard-encodings-table|text-post-read-conversion|text-pre-write-conversion|tl-x-4-prefix|tl-x-5-prefix|tl-x-ctl-p-prefix|ua--M/H-key|ua--deactivate|ua--fallback|ua--filter-buffer-noprops|ua--init-keymaps|ua--keep-active|ua--post-command-handler-1|ua--post-command-handler|ua--pre-command-handler-1|ua--pre-command-handler|ua--prefix-arg|ua--prefix-copy-handler|ua--prefix-cut-handler|ua--prefix-override-handler|ua--prefix-override-replay|ua--prefix-override-timeout|ua--prefix-repeat-handler|ua--select-keymaps|ua--self-insert-char-p|ua--shift-control-c-prefix|ua--shift-control-prefix|ua--shift-control-x-prefix|ua--update-indications|ua-cancel|ua-copy-region|ua-cut-region|ua-debug|ua-delete-region|ua-exchange-point-and-mark|ua-help-for-region|ua-mode|ua-paste-pop|ua-paste|ua-pop-to-last-change|ua-rectangle-mark-mode|ua-scroll-down|ua-scroll-up|ua-selection-mode|ua-set-mark|ua-set-rectangle-mark|ua-toggle-global-mark|urrent-line|ustom--frame-color-default|ustom--initialize-widget-variables|ustom--sort-vars-1|ustom--sort-vars|ustom-add-dependencies|ustom-add-link|ustom-add-load|ustom-add-option|ustom-add-package-version|ustom-add-parent-links|ustom-add-see-also|ustom-add-to-group|ustom-add-version|ustom-autoload|ustom-available-themes|ustom-browse-face-tag-action|ustom-browse-group-tag-action|ustom-browse-insert-prefix|ustom-browse-variable-tag-action|ustom-browse-visibility-action|ustom-buffer-create-internal|ustom-buffer-create-other-window|ustom-buffer-create|ustom-check-theme|ustom-command-apply|ustom-comment-create|ustom-comment-hide|ustom-comment-invisible-p|ustom-comment-show|ustom-convert-widget|ustom-current-group|ustom-declare-face|ustom-declare-group|ustom-declare-theme|ustom-declare-variable|ustom-face-action|ustom-face-attributes-get|ustom-face-edit-activate|ustom-face-edit-all|ustom-face-edit-attribute-tag|ustom-face-edit-convert-widget)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1113,39 +1113,39 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:debugger-continue|debugger-env-macro|debugger-eval-expression|debugger-frame-clear|debugger-frame-number|debugger-frame|debugger-jump|debugger-list-functions|debugger-make-xrefs|debugger-mode|debugger-record-expression|debugger-reenable|debugger-return-value|debugger-setup-buffer|debugger-step-through|debugger-toggle-locals|decf|decipher--analyze|decipher--digram-counts|decipher--digram-total|decipher-add-undo|decipher-adjacency-list|decipher-alphabet-keypress|decipher-analyze-buffer|decipher-analyze|decipher-complete-alphabet|decipher-copy-cons|decipher-digram-list|decipher-display-range|decipher-display-regexp|decipher-display-stats-buffer|decipher-frequency-count|decipher-get-undo|decipher-insert-frequency-counts|decipher-insert|decipher-keypress|decipher-last-command-char|decipher-loop-no-breaks|decipher-loop-with-breaks|decipher-make-checkpoint|decipher-mode|decipher-read-alphabet|decipher-restore-checkpoint|decipher-resync|decipher-set-map|decipher-show-alphabet|decipher-stats-buffer|decipher-stats-mode|decipher-undo|decipher|declaim|declare-ccl-program|declare-equiv-charset|decode-big5-char|decode-composition-components|decode-composition-rule|decode-hex-string|decode-hz-buffer|decode-hz-region|decode-sjis-char|decompose-region|decompose-string|decrease-left-margin|decrease-right-margin|def-gdb-auto-update-handler|def-gdb-auto-update-trigger|def-gdb-memory-format|def-gdb-memory-show-page|def-gdb-memory-unit|def-gdb-preempt-display-buffer|def-gdb-set-positive-number|def-gdb-thread-buffer-command|def-gdb-thread-buffer-gud-command|def-gdb-thread-buffer-simple-command|def-gdb-trigger-and-handler|default-command-history-filter|default-font-height|default-indent-new-line|default-line-height|default-toplevel-value|defcalcmodevar|defconst-mode-local|defcustom-c-stylevar|defcustom-mh|defezimage|defface-mh|defgeneric|defgroup-mh|defimage-speedbar|define-abbrevs|define-advice|define-auto-insert|define-ccl-program|define-char-code-property|define-charset-alias|define-charset-internal|define-charset|define-child-mode|define-coding-system-alias|define-coding-system-internal|define-coding-system|define-compilation-mode|define-compiler-macro|define-erc-module|define-erc-response-handler|define-global-abbrev|define-global-minor-mode|define-hmac-function|define-ibuffer-column|define-ibuffer-filter|define-ibuffer-op|define-ibuffer-sorter|define-inline|define-lex-analyzer|define-lex-block-analyzer|define-lex-block-type-analyzer|define-lex-keyword-type-analyzer|define-lex-regex-analyzer|define-lex-regex-type-analyzer|define-lex-sexp-type-analyzer|define-lex-simple-regex-analyzer|define-lex-string-type-analyzer|define-lex|define-mail-abbrev|define-mail-alias|define-mail-user-agent|define-mode-abbrev|define-mode-local-override|define-mode-overload-implementation|define-overload|define-overloadable-function|define-setf-expander|define-skeleton|define-translation-hash-table|define-translation-table|define-widget-keywords|defmacro-mh|defmath|defmethod|defun-cvs-mode|defun-gmm|defun-mh|defun-rcirc-command|defvar-mode-local|degrees-to-radians|dehexlify-buffer|delay-warning|delete\\*|delete-active-region|delete-all-overlays|delete-completion-window|delete-completion|delete-consecutive-dups|delete-dir-local-variable|delete-directory-internal|delete-duplicate-lines|delete-duplicates|delete-extract-rectangle-line|delete-extract-rectangle|delete-file-local-variable-prop-line|delete-file-local-variable|delete-forward-char|delete-frame-enabled-p|delete-if-not|delete-if|delete-instance|delete-matching-lines|delete-non-matching-lines|delete-other-frames|delete-other-windows-internal|delete-other-windows-vertically|delete-pair|delete-rectangle-line|delete-rectangle|delete-selection-helper|delete-selection-mode|delete-selection-pre-hook|delete-selection-repeat-replace-region|delete-side-window|delete-whitespace-rectangle-line|delete-whitespace-rectangle|delete-window-internal|delimit-columns-customize|delimit-columns-format|delimit-columns-rectangle-line|delimit-columns-rectangle-max|delimit-columns-rectangle|delimit-columns-region|delimit-columns-str|delphi-mode|delsel-unload-function|denato-region|derived-mode-abbrev-table-name|derived-mode-class|derived-mode-hook-name|derived-mode-init-mode-variables|derived-mode-make-docstring|derived-mode-map-name|derived-mode-merge-abbrev-tables|derived-mode-merge-keymaps|derived-mode-merge-syntax-tables|derived-mode-run-hooks|derived-mode-set-abbrev-table|derived-mode-set-keymap|derived-mode-set-syntax-table|derived-mode-setup-function-name|derived-mode-syntax-table-name|describe-bindings-internal|describe-buffer-bindings|describe-char-after|describe-char-categories|describe-char-display|describe-char-padded-string|describe-char-unicode-data|describe-char|describe-character-set|describe-chinese-environment-map|describe-coding-system|describe-copying|describe-current-coding-system-briefly|describe-current-coding-system|describe-current-input-method|describe-cyrillic-environment-map|describe-distribution|describe-european-environment-map|describe-face|describe-font|describe-fontset|describe-function-1|describe-function|describe-gnu-project|describe-indian-environment-map|describe-input-method|describe-key-briefly|describe-key|describe-language-environment|describe-minor-mode-completion-table-for-indicator|describe-minor-mode-completion-table-for-symbol|describe-minor-mode-from-indicator|describe-minor-mode-from-symbol|describe-minor-mode|describe-mode-local-bindings-in-mode|describe-mode-local-bindings|describe-no-warranty|describe-package-1|describe-package|describe-project|describe-property-list|describe-register-1|describe-specified-language-support|describe-text-category|describe-text-properties-1|describe-text-properties|describe-text-sexp|describe-text-widget|describe-theme|describe-variable-custom-version-info|describe-variable|describe-vector|desktop--check-dont-save|desktop--v2s|desktop-append-buffer-args|desktop-auto-save-cancel-timer|desktop-auto-save-disable|desktop-auto-save-enable|desktop-auto-save-set-timer|desktop-auto-save|desktop-buffer-info|desktop-buffer|desktop-change-dir|desktop-claim-lock|desktop-clear|desktop-create-buffer|desktop-file-name|desktop-full-file-name|desktop-full-lock-name|desktop-idle-create-buffers|desktop-kill|desktop-lazy-abort|desktop-lazy-complete|desktop-lazy-create-buffer|desktop-list\\*|desktop-load-default|desktop-load-file|desktop-outvar|desktop-owner|desktop-read|desktop-release-lock|desktop-remove|desktop-restore-file-buffer|desktop-restore-frameset|desktop-restoring-frameset-p|desktop-revert|desktop-save-buffer-p|desktop-save-frameset|desktop-save-in-desktop-dir|desktop-save-mode-off|desktop-save-mode|desktop-save|desktop-truncate|desktop-value-to-string|destructor|destructuring-bind|detect-coding-with-language-environment|detect-coding-with-priority|dframe-attached-frame|dframe-click|dframe-close-frame|dframe-current-frame|dframe-detach|dframe-double-click|dframe-frame-mode|dframe-frame-parameter|dframe-get-focus|dframe-hack-buffer-menu|dframe-handle-delete-frame|dframe-handle-iconify-frame|dframe-handle-make-frame-visible|dframe-help-echo|dframe-live-p|dframe-maybee-jump-to-attached-frame|dframe-message|dframe-mouse-event-p|dframe-mouse-hscroll|dframe-mouse-set-point|dframe-needed-height|dframe-popup-kludge|dframe-power-click|dframe-quick-mouse|dframe-reposition-frame-emacs|dframe-reposition-frame-xemacs|dframe-reposition-frame|dframe-select-attached-frame|dframe-set-timer-internal|dframe-set-timer|dframe-switch-buffer-attached-frame|dframe-temp-buffer-show-function|dframe-timer-fn|dframe-track-mouse-xemacs|dframe-track-mouse|dframe-update-keymap|dframe-with-attached-buffer|dframe-y-or-n-p|diary-add-to-list|diary-anniversary|diary-astro-day-number|diary-attrtype-convert|diary-bahai-date|diary-bahai-insert-entry|diary-bahai-insert-monthly-entry|diary-bahai-insert-yearly-entry|diary-bahai-list-entries|diary-bahai-mark-entries|diary-block|diary-check-diary-file|diary-chinese-anniversary|diary-chinese-date|diary-chinese-insert-anniversary-entry|diary-chinese-insert-entry|diary-chinese-insert-monthly-entry|diary-chinese-insert-yearly-entry|diary-chinese-list-entries|diary-chinese-mark-entries|diary-coptic-date|diary-cyclic|diary-date-display-form|diary-date|diary-day-of-year|diary-display-no-entries|diary-entry-compare|diary-entry-time|diary-ethiopic-date|diary-fancy-date-matcher|diary-fancy-date-pattern|diary-fancy-display-mode|diary-fancy-display|diary-fancy-font-lock-fontify-region-function|diary-float|diary-font-lock-date-forms|diary-font-lock-keywords-1|diary-font-lock-keywords|diary-font-lock-sexps|diary-french-date|diary-from-outlook-gnus|diary-from-outlook-internal|diary-from-outlook-rmail|diary-from-outlook|diary-goto-entry|diary-hebrew-birthday|diary-hebrew-date|diary-hebrew-insert-entry|diary-hebrew-insert-monthly-entry|diary-hebrew-insert-yearly-entry|diary-hebrew-list-entries|diary-hebrew-mark-entries|diary-hebrew-omer|diary-hebrew-parasha|diary-hebrew-rosh-hodesh|diary-hebrew-sabbath-candles|diary-hebrew-yahrzeit|diary-include-files|diary-include-other-diary-files|diary-insert-anniversary-entry|diary-insert-block-entry|diary-insert-cyclic-entry|diary-insert-entry-1|diary-insert-entry|diary-insert-monthly-entry|diary-insert-weekly-entry|diary-insert-yearly-entry|diary-islamic-date|diary-islamic-insert-entry|diary-islamic-insert-monthly-entry|diary-islamic-insert-yearly-entry|diary-islamic-list-entries|diary-islamic-mark-entries|diary-iso-date|diary-julian-date|diary-list-entries-1|diary-list-entries-2|diary-list-entries|diary-list-sexp-entries|diary-live-p|diary-lunar-phases|diary-mail-entries|diary-make-date|diary-make-entry|diary-mark-entries-1|diary-mark-entries|diary-mark-included-diary-files|diary-mark-sexp-entries|diary-mayan-date|diary-mode|diary-name-pattern|diary-ordinal-suffix|diary-outlook-format-1|diary-persian-date|diary-print-entries|diary-pull-attrs|diary-redraw-calendar|diary-remind|diary-set-header|diary-set-maybe-redraw|diary-sexp-entry|diary-show-all-entries|diary-simple-display|diary-sort-entries|diary-sunrise-sunset|diary-unhide-everything|diary-view-entries|diary-view-other-diary-entries|diary|diff-add-change-log-entries-other-window|diff-after-change-function|diff-apply-hunk|diff-auto-refine-mode|diff-backup|diff-beginning-of-file-and-junk|diff-beginning-of-file|diff-beginning-of-hunk|diff-bounds-of-file|diff-bounds-of-hunk|diff-buffer-with-file|diff-context->unified|diff-count-matches|diff-current-defun|diff-delete-empty-files|diff-delete-if-empty|diff-delete-trailing-whitespace|diff-ediff-patch|diff-end-of-file|diff-end-of-hunk|diff-file-kill|diff-file-local-copy|diff-file-next|diff-file-prev|diff-filename-drop-dir|diff-find-approx-text|diff-find-file-name|diff-find-source-location|diff-find-text|diff-fixup-modifs|diff-goto-source|diff-hunk-file-names|diff-hunk-kill|diff-hunk-next|diff-hunk-prev|diff-hunk-status-msg|diff-hunk-style|diff-hunk-text|diff-ignore-whitespace-hunk|diff-kill-applied-hunks|diff-kill-junk|diff-latest-backup-file|diff-make-unified|diff-merge-strings|diff-minor-mode|diff-mode-menu|diff-mode|diff-mouse-goto-source|diff-next-complex-hunk|diff-next-error|diff-no-select|diff-post-command-hook|diff-process-filter|diff-refine-hunk|diff-refine-preproc|diff-restrict-view|diff-reverse-direction|diff-sanity-check-context-hunk-half|diff-sanity-check-hunk|diff-sentinel|diff-setup-whitespace|diff-split-hunk|diff-splittable-p|diff-switches|diff-tell-file-name|diff-test-hunk|diff-undo|diff-unified->context|diff-unified-hunk-p|diff-write-contents-hooks|diff-xor|diff-yank-function|diff|dig-exit|dig-extract-rr|dig-invoke|dig-mode|dig-rr-get-pkix-cert|dig|digest-md5-challenge|digest-md5-digest-response|digest-md5-digest-uri|digest-md5-parse-digest-challenge|dir-locals-collect-mode-variables|dir-locals-collect-variables|dir-locals-find-file|dir-locals-get-class-variables|dir-locals-read-from-file|directory-files-recursively|directory-name-p|dired-add-file|dired-advertise|dired-advertised-find-file|dired-align-file|dired-alist-add-1|dired-at-point-prompter|dired-at-point|dired-backup-diff|dired-between-files|dired-buffer-stale-p|dired-buffers-for-dir|dired-build-subdir-alist|dired-change-marks|dired-check-switches|dired-clean-directory|dired-clean-up-after-deletion|dired-clear-alist|dired-compare-directories|dired-compress-file|dired-copy-file|dired-copy-filename-as-kill|dired-create-directory)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)d(?:ebugger-continue|ebugger-env-macro|ebugger-eval-expression|ebugger-frame-clear|ebugger-frame-number|ebugger-frame|ebugger-jump|ebugger-list-functions|ebugger-make-xrefs|ebugger-mode|ebugger-record-expression|ebugger-reenable|ebugger-return-value|ebugger-setup-buffer|ebugger-step-through|ebugger-toggle-locals|ecf|ecipher--analyze|ecipher--digram-counts|ecipher--digram-total|ecipher-add-undo|ecipher-adjacency-list|ecipher-alphabet-keypress|ecipher-analyze-buffer|ecipher-analyze|ecipher-complete-alphabet|ecipher-copy-cons|ecipher-digram-list|ecipher-display-range|ecipher-display-regexp|ecipher-display-stats-buffer|ecipher-frequency-count|ecipher-get-undo|ecipher-insert-frequency-counts|ecipher-insert|ecipher-keypress|ecipher-last-command-char|ecipher-loop-no-breaks|ecipher-loop-with-breaks|ecipher-make-checkpoint|ecipher-mode|ecipher-read-alphabet|ecipher-restore-checkpoint|ecipher-resync|ecipher-set-map|ecipher-show-alphabet|ecipher-stats-buffer|ecipher-stats-mode|ecipher-undo|ecipher|eclaim|eclare-ccl-program|eclare-equiv-charset|ecode-big5-char|ecode-composition-components|ecode-composition-rule|ecode-hex-string|ecode-hz-buffer|ecode-hz-region|ecode-sjis-char|ecompose-region|ecompose-string|ecrease-left-margin|ecrease-right-margin|ef-gdb-auto-update-handler|ef-gdb-auto-update-trigger|ef-gdb-memory-format|ef-gdb-memory-show-page|ef-gdb-memory-unit|ef-gdb-preempt-display-buffer|ef-gdb-set-positive-number|ef-gdb-thread-buffer-command|ef-gdb-thread-buffer-gud-command|ef-gdb-thread-buffer-simple-command|ef-gdb-trigger-and-handler|efault-command-history-filter|efault-font-height|efault-indent-new-line|efault-line-height|efault-toplevel-value|efcalcmodevar|efconst-mode-local|efcustom-c-stylevar|efcustom-mh|efezimage|efface-mh|efgeneric|efgroup-mh|efimage-speedbar|efine-abbrevs|efine-advice|efine-auto-insert|efine-ccl-program|efine-char-code-property|efine-charset-alias|efine-charset-internal|efine-charset|efine-child-mode|efine-coding-system-alias|efine-coding-system-internal|efine-coding-system|efine-compilation-mode|efine-compiler-macro|efine-erc-module|efine-erc-response-handler|efine-global-abbrev|efine-global-minor-mode|efine-hmac-function|efine-ibuffer-column|efine-ibuffer-filter|efine-ibuffer-op|efine-ibuffer-sorter|efine-inline|efine-lex-analyzer|efine-lex-block-analyzer|efine-lex-block-type-analyzer|efine-lex-keyword-type-analyzer|efine-lex-regex-analyzer|efine-lex-regex-type-analyzer|efine-lex-sexp-type-analyzer|efine-lex-simple-regex-analyzer|efine-lex-string-type-analyzer|efine-lex|efine-mail-abbrev|efine-mail-alias|efine-mail-user-agent|efine-mode-abbrev|efine-mode-local-override|efine-mode-overload-implementation|efine-overload|efine-overloadable-function|efine-setf-expander|efine-skeleton|efine-translation-hash-table|efine-translation-table|efine-widget-keywords|efmacro-mh|efmath|efmethod|efun-cvs-mode|efun-gmm|efun-mh|efun-rcirc-command|efvar-mode-local|egrees-to-radians|ehexlify-buffer|elay-warning|elete\\*|elete-active-region|elete-all-overlays|elete-completion-window|elete-completion|elete-consecutive-dups|elete-dir-local-variable|elete-directory-internal|elete-duplicate-lines|elete-duplicates|elete-extract-rectangle-line|elete-extract-rectangle|elete-file-local-variable-prop-line|elete-file-local-variable|elete-forward-char|elete-frame-enabled-p|elete-if-not|elete-if|elete-instance|elete-matching-lines|elete-non-matching-lines|elete-other-frames|elete-other-windows-internal|elete-other-windows-vertically|elete-pair|elete-rectangle-line|elete-rectangle|elete-selection-helper|elete-selection-mode|elete-selection-pre-hook|elete-selection-repeat-replace-region|elete-side-window|elete-whitespace-rectangle-line|elete-whitespace-rectangle|elete-window-internal|elimit-columns-customize|elimit-columns-format|elimit-columns-rectangle-line|elimit-columns-rectangle-max|elimit-columns-rectangle|elimit-columns-region|elimit-columns-str|elphi-mode|elsel-unload-function|enato-region|erived-mode-abbrev-table-name|erived-mode-class|erived-mode-hook-name|erived-mode-init-mode-variables|erived-mode-make-docstring|erived-mode-map-name|erived-mode-merge-abbrev-tables|erived-mode-merge-keymaps|erived-mode-merge-syntax-tables|erived-mode-run-hooks|erived-mode-set-abbrev-table|erived-mode-set-keymap|erived-mode-set-syntax-table|erived-mode-setup-function-name|erived-mode-syntax-table-name|escribe-bindings-internal|escribe-buffer-bindings|escribe-char-after|escribe-char-categories|escribe-char-display|escribe-char-padded-string|escribe-char-unicode-data|escribe-char|escribe-character-set|escribe-chinese-environment-map|escribe-coding-system|escribe-copying|escribe-current-coding-system-briefly|escribe-current-coding-system|escribe-current-input-method|escribe-cyrillic-environment-map|escribe-distribution|escribe-european-environment-map|escribe-face|escribe-font|escribe-fontset|escribe-function-1|escribe-function|escribe-gnu-project|escribe-indian-environment-map|escribe-input-method|escribe-key-briefly|escribe-key|escribe-language-environment|escribe-minor-mode-completion-table-for-indicator|escribe-minor-mode-completion-table-for-symbol|escribe-minor-mode-from-indicator|escribe-minor-mode-from-symbol|escribe-minor-mode|escribe-mode-local-bindings-in-mode|escribe-mode-local-bindings|escribe-no-warranty|escribe-package-1|escribe-package|escribe-project|escribe-property-list|escribe-register-1|escribe-specified-language-support|escribe-text-category|escribe-text-properties-1|escribe-text-properties|escribe-text-sexp|escribe-text-widget|escribe-theme|escribe-variable-custom-version-info|escribe-variable|escribe-vector|esktop--check-dont-save|esktop--v2s|esktop-append-buffer-args|esktop-auto-save-cancel-timer|esktop-auto-save-disable|esktop-auto-save-enable|esktop-auto-save-set-timer|esktop-auto-save|esktop-buffer-info|esktop-buffer|esktop-change-dir|esktop-claim-lock|esktop-clear|esktop-create-buffer|esktop-file-name|esktop-full-file-name|esktop-full-lock-name|esktop-idle-create-buffers|esktop-kill|esktop-lazy-abort|esktop-lazy-complete|esktop-lazy-create-buffer|esktop-list\\*|esktop-load-default|esktop-load-file|esktop-outvar|esktop-owner|esktop-read|esktop-release-lock|esktop-remove|esktop-restore-file-buffer|esktop-restore-frameset|esktop-restoring-frameset-p|esktop-revert|esktop-save-buffer-p|esktop-save-frameset|esktop-save-in-desktop-dir|esktop-save-mode-off|esktop-save-mode|esktop-save|esktop-truncate|esktop-value-to-string|estructor|estructuring-bind|etect-coding-with-language-environment|etect-coding-with-priority|frame-attached-frame|frame-click|frame-close-frame|frame-current-frame|frame-detach|frame-double-click|frame-frame-mode|frame-frame-parameter|frame-get-focus|frame-hack-buffer-menu|frame-handle-delete-frame|frame-handle-iconify-frame|frame-handle-make-frame-visible|frame-help-echo|frame-live-p|frame-maybee-jump-to-attached-frame|frame-message|frame-mouse-event-p|frame-mouse-hscroll|frame-mouse-set-point|frame-needed-height|frame-popup-kludge|frame-power-click|frame-quick-mouse|frame-reposition-frame-emacs|frame-reposition-frame-xemacs|frame-reposition-frame|frame-select-attached-frame|frame-set-timer-internal|frame-set-timer|frame-switch-buffer-attached-frame|frame-temp-buffer-show-function|frame-timer-fn|frame-track-mouse-xemacs|frame-track-mouse|frame-update-keymap|frame-with-attached-buffer|frame-y-or-n-p|iary-add-to-list|iary-anniversary|iary-astro-day-number|iary-attrtype-convert|iary-bahai-date|iary-bahai-insert-entry|iary-bahai-insert-monthly-entry|iary-bahai-insert-yearly-entry|iary-bahai-list-entries|iary-bahai-mark-entries|iary-block|iary-check-diary-file|iary-chinese-anniversary|iary-chinese-date|iary-chinese-insert-anniversary-entry|iary-chinese-insert-entry|iary-chinese-insert-monthly-entry|iary-chinese-insert-yearly-entry|iary-chinese-list-entries|iary-chinese-mark-entries|iary-coptic-date|iary-cyclic|iary-date-display-form|iary-date|iary-day-of-year|iary-display-no-entries|iary-entry-compare|iary-entry-time|iary-ethiopic-date|iary-fancy-date-matcher|iary-fancy-date-pattern|iary-fancy-display-mode|iary-fancy-display|iary-fancy-font-lock-fontify-region-function|iary-float|iary-font-lock-date-forms|iary-font-lock-keywords-1|iary-font-lock-keywords|iary-font-lock-sexps|iary-french-date|iary-from-outlook-gnus|iary-from-outlook-internal|iary-from-outlook-rmail|iary-from-outlook|iary-goto-entry|iary-hebrew-birthday|iary-hebrew-date|iary-hebrew-insert-entry|iary-hebrew-insert-monthly-entry|iary-hebrew-insert-yearly-entry|iary-hebrew-list-entries|iary-hebrew-mark-entries|iary-hebrew-omer|iary-hebrew-parasha|iary-hebrew-rosh-hodesh|iary-hebrew-sabbath-candles|iary-hebrew-yahrzeit|iary-include-files|iary-include-other-diary-files|iary-insert-anniversary-entry|iary-insert-block-entry|iary-insert-cyclic-entry|iary-insert-entry-1|iary-insert-entry|iary-insert-monthly-entry|iary-insert-weekly-entry|iary-insert-yearly-entry|iary-islamic-date|iary-islamic-insert-entry|iary-islamic-insert-monthly-entry|iary-islamic-insert-yearly-entry|iary-islamic-list-entries|iary-islamic-mark-entries|iary-iso-date|iary-julian-date|iary-list-entries-1|iary-list-entries-2|iary-list-entries|iary-list-sexp-entries|iary-live-p|iary-lunar-phases|iary-mail-entries|iary-make-date|iary-make-entry|iary-mark-entries-1|iary-mark-entries|iary-mark-included-diary-files|iary-mark-sexp-entries|iary-mayan-date|iary-mode|iary-name-pattern|iary-ordinal-suffix|iary-outlook-format-1|iary-persian-date|iary-print-entries|iary-pull-attrs|iary-redraw-calendar|iary-remind|iary-set-header|iary-set-maybe-redraw|iary-sexp-entry|iary-show-all-entries|iary-simple-display|iary-sort-entries|iary-sunrise-sunset|iary-unhide-everything|iary-view-entries|iary-view-other-diary-entries|iary|iff-add-change-log-entries-other-window|iff-after-change-function|iff-apply-hunk|iff-auto-refine-mode|iff-backup|iff-beginning-of-file-and-junk|iff-beginning-of-file|iff-beginning-of-hunk|iff-bounds-of-file|iff-bounds-of-hunk|iff-buffer-with-file|iff-context->unified|iff-count-matches|iff-current-defun|iff-delete-empty-files|iff-delete-if-empty|iff-delete-trailing-whitespace|iff-ediff-patch|iff-end-of-file|iff-end-of-hunk|iff-file-kill|iff-file-local-copy|iff-file-next|iff-file-prev|iff-filename-drop-dir|iff-find-approx-text|iff-find-file-name|iff-find-source-location|iff-find-text|iff-fixup-modifs|iff-goto-source|iff-hunk-file-names|iff-hunk-kill|iff-hunk-next|iff-hunk-prev|iff-hunk-status-msg|iff-hunk-style|iff-hunk-text|iff-ignore-whitespace-hunk|iff-kill-applied-hunks|iff-kill-junk|iff-latest-backup-file|iff-make-unified|iff-merge-strings|iff-minor-mode|iff-mode-menu|iff-mode|iff-mouse-goto-source|iff-next-complex-hunk|iff-next-error|iff-no-select|iff-post-command-hook|iff-process-filter|iff-refine-hunk|iff-refine-preproc|iff-restrict-view|iff-reverse-direction|iff-sanity-check-context-hunk-half|iff-sanity-check-hunk|iff-sentinel|iff-setup-whitespace|iff-split-hunk|iff-splittable-p|iff-switches|iff-tell-file-name|iff-test-hunk|iff-undo|iff-unified->context|iff-unified-hunk-p|iff-write-contents-hooks|iff-xor|iff-yank-function|iff|ig-exit|ig-extract-rr|ig-invoke|ig-mode|ig-rr-get-pkix-cert|ig|igest-md5-challenge|igest-md5-digest-response|igest-md5-digest-uri|igest-md5-parse-digest-challenge|ir-locals-collect-mode-variables|ir-locals-collect-variables|ir-locals-find-file|ir-locals-get-class-variables|ir-locals-read-from-file|irectory-files-recursively|irectory-name-p|ired-add-file|ired-advertise|ired-advertised-find-file|ired-align-file|ired-alist-add-1|ired-at-point-prompter|ired-at-point|ired-backup-diff|ired-between-files|ired-buffer-stale-p|ired-buffers-for-dir|ired-build-subdir-alist|ired-change-marks|ired-check-switches|ired-clean-directory|ired-clean-up-after-deletion|ired-clear-alist|ired-compare-directories|ired-compress-file|ired-copy-file|ired-copy-filename-as-kill|ired-create-directory)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:dired-current-directory|dired-delete-entry|dired-delete-file|dired-desktop-buffer-misc-data|dired-diff|dired-directory-changed-p|dired-display-file|dired-dnd-do-ask-action|dired-dnd-handle-file|dired-dnd-handle-local-file|dired-dnd-popup-notice|dired-do-async-shell-command|dired-do-byte-compile|dired-do-chgrp|dired-do-chmod|dired-do-chown|dired-do-compress|dired-do-copy-regexp|dired-do-copy|dired-do-create-files-regexp|dired-do-delete|dired-do-flagged-delete|dired-do-hardlink-regexp|dired-do-hardlink|dired-do-isearch-regexp|dired-do-isearch|dired-do-kill-lines|dired-do-load|dired-do-print|dired-do-query-replace-regexp|dired-do-redisplay|dired-do-relsymlink|dired-do-rename-regexp|dired-do-rename|dired-do-search|dired-do-shell-command|dired-do-symlink-regexp|dired-do-symlink|dired-do-touch|dired-downcase|dired-file-marker|dired-file-name-at-point|dired-find-alternate-file|dired-find-buffer-nocreate|dired-find-file-other-window|dired-find-file|dired-flag-auto-save-files|dired-flag-backup-files|dired-flag-file-deletion|dired-flag-files-regexp|dired-flag-garbage-files|dired-format-columns-of-files|dired-fun-in-all-buffers|dired-get-file-for-visit|dired-get-filename|dired-get-marked-files|dired-get-subdir-max|dired-get-subdir-min|dired-get-subdir|dired-glob-regexp|dired-goto-file-1|dired-goto-file|dired-goto-next-file|dired-goto-next-nontrivial-file|dired-goto-subdir|dired-hide-all|dired-hide-details-mode|dired-hide-details-update-invisibility-spec|dired-hide-subdir|dired-in-this-tree|dired-initial-position|dired-insert-directory|dired-insert-old-subdirs|dired-insert-set-properties|dired-insert-subdir|dired-internal-do-deletions|dired-internal-noselect|dired-isearch-filenames-regexp|dired-isearch-filenames-setup|dired-isearch-filenames|dired-jump-other-window|dired-jump|dired-kill-subdir|dired-log-summary|dired-log|dired-make-absolute|dired-make-relative|dired-map-over-marks|dired-mark-directories|dired-mark-executables|dired-mark-files-containing-regexp|dired-mark-files-in-region|dired-mark-files-regexp|dired-mark-if|dired-mark-pop-up|dired-mark-prompt|dired-mark-remembered|dired-mark-subdir-files|dired-mark-symlinks|dired-mark|dired-marker-regexp|dired-maybe-insert-subdir|dired-mode|dired-mouse-find-file-other-window|dired-move-to-end-of-filename|dired-move-to-filename|dired-next-dirline|dired-next-line|dired-next-marked-file|dired-next-subdir|dired-normalize-subdir|dired-noselect|dired-other-frame|dired-other-window|dired-plural-s|dired-pop-to-buffer|dired-prev-dirline|dired-prev-marked-file|dired-prev-subdir|dired-previous-line|dired-query|dired-read-dir-and-switches|dired-read-regexp|dired-readin-insert|dired-readin|dired-relist-file|dired-remember-hidden|dired-remember-marks|dired-remove-file|dired-rename-file|dired-repeat-over-lines|dired-replace-in-string|dired-restore-desktop-buffer|dired-restore-positions|dired-revert|dired-run-shell-command|dired-safe-switches-p|dired-save-positions|dired-show-file-type|dired-sort-R-check|dired-sort-other|dired-sort-set-mode-line|dired-sort-set-modeline|dired-sort-toggle-or-edit|dired-sort-toggle|dired-string-replace-match|dired-subdir-index|dired-subdir-max|dired-summary|dired-switches-escape-p|dired-switches-recursive-p|dired-toggle-marks|dired-toggle-read-only|dired-tree-down|dired-tree-up|dired-unadvertise|dired-uncache|dired-undo|dired-unmark-all-files|dired-unmark-all-marks|dired-unmark-backward|dired-unmark|dired-up-directory|dired-upcase|dired-view-file|dired-why|dired|dirs|dirtrack-cygwin-directory-function|dirtrack-debug-message|dirtrack-debug-mode|dirtrack-debug-toggle|dirtrack-mode|dirtrack-toggle|dirtrack-windows-directory-function|dirtrack|disable-timeout|disassemble-1|disassemble-internal|disassemble-offset|display-about-screen|display-battery-mode|display-buffer--maybe-pop-up-frame-or-window|display-buffer--maybe-same-window|display-buffer--special-action|display-buffer-assq-regexp|display-buffer-in-atom-window|display-buffer-in-major-side-window|display-buffer-in-side-window|display-buffer-other-frame|display-buffer-record-window|display-call-tree|display-local-help|display-multi-font-p|display-multi-frame-p|display-splash-screen|display-startup-echo-area-message|display-startup-screen|display-table-print-array|display-time-mode|display-time-world|display-time|displaying-byte-compile-warnings|dissociated-press|dnd-get-local-file-name|dnd-get-local-file-uri|dnd-handle-one-url|dnd-insert-text|dnd-open-file|dnd-open-local-file|dnd-open-remote-url|dnd-unescape-uri|dns-get-txt-answer|dns-get|dns-inverse-get|dns-lookup-host|dns-make-network-process|dns-mode-menu|dns-mode-soa-increment-serial|dns-mode-soa-maybe-increment-serial|dns-mode|dns-query-cached|dns-query|dns-read-bytes|dns-read-int32|dns-read-name|dns-read-string-name|dns-read-txt|dns-read-type|dns-read|dns-servers-up-to-date-p|dns-set-servers|dns-write-bytes|dns-write-name|dns-write|dnsDomainIs|dnsResolve|do\\*|do-after-load-evaluation|do-all-symbols|do-auto-fill|do-symbols|do|doc\\$|doc\\/\\/|doc-file-to-info|doc-file-to-man|doc-view--current-cache-dir|doc-view-active-pages|doc-view-already-converted-p|doc-view-bookmark-jump|doc-view-bookmark-make-record|doc-view-buffer-message|doc-view-clear-cache|doc-view-clone-buffer-hook|doc-view-convert-current-doc|doc-view-current-cache-doc-pdf|doc-view-current-image|doc-view-current-info|doc-view-current-overlay|doc-view-current-page|doc-view-current-slice|doc-view-desktop-save-buffer|doc-view-dired-cache|doc-view-display|doc-view-djvu->tiff-converter-ddjvu|doc-view-doc->txt|doc-view-document->bitmap|doc-view-dvi->pdf|doc-view-enlarge|doc-view-fallback-mode|doc-view-first-page|doc-view-fit-height-to-window|doc-view-fit-page-to-window|doc-view-fit-width-to-window|doc-view-get-bounding-box|doc-view-goto-page|doc-view-guess-paper-size|doc-view-initiate-display|doc-view-insert-image|doc-view-intersection|doc-view-kill-proc-and-buffer|doc-view-kill-proc|doc-view-last-page-number|doc-view-last-page|doc-view-make-safe-dir|doc-view-menu|doc-view-minor-mode|doc-view-mode-maybe|doc-view-mode-p|doc-view-mode|doc-view-new-window-function|doc-view-next-line-or-next-page|doc-view-next-page|doc-view-odf->pdf-converter-soffice|doc-view-odf->pdf-converter-unoconv|doc-view-open-text|doc-view-pdf\\/ps->png|doc-view-pdf->png-converter-ghostscript|doc-view-pdf->png-converter-mupdf|doc-view-pdf->txt|doc-view-previous-line-or-previous-page|doc-view-previous-page|doc-view-ps->pdf|doc-view-ps->png-converter-ghostscript|doc-view-reconvert-doc|doc-view-reset-slice|doc-view-restore-desktop-buffer|doc-view-revert-buffer|doc-view-scale-adjust|doc-view-scale-bounding-box|doc-view-scale-reset|doc-view-scroll-down-or-previous-page|doc-view-scroll-up-or-next-page|doc-view-search-backward|doc-view-search-internal|doc-view-search-next-match|doc-view-search-no-of-matches|doc-view-search-previous-match|doc-view-search|doc-view-sentinel|doc-view-set-doc-type|doc-view-set-slice-from-bounding-box|doc-view-set-slice-using-mouse|doc-view-set-slice|doc-view-set-up-single-converter|doc-view-show-tooltip|doc-view-shrink|doc-view-sort|doc-view-start-process|doc-view-toggle-display|doctex-font-lock-\\^\\^A|doctex-font-lock-syntactic-face-function|doctex-mode|doctor-\\$|doctor-adjectivep|doctor-adverbp|doctor-alcohol|doctor-articlep|doctor-assm|doctor-build|doctor-chat|doctor-colorp|doctor-concat|doctor-conj|doctor-correct-spelling|doctor-death|doctor-def|doctor-define|doctor-defq|doctor-desire|doctor-desire1|doctor-doc|doctor-drug|doctor-eliza|doctor-family|doctor-fear|doctor-fix-2|doctor-fixup|doctor-forget|doctor-foul|doctor-getnoun|doctor-go|doctor-hate|doctor-hates|doctor-hates1|doctor-howdy|doctor-huh|doctor-love|doctor-loves|doctor-mach|doctor-make-string|doctor-math|doctor-meaning|doctor-mode|doctor-modifierp|doctor-mood|doctor-nmbrp|doctor-nounp|doctor-othermodifierp|doctor-plural|doctor-possess|doctor-possessivepronounp|doctor-prepp|doctor-pronounp|doctor-put-meaning|doctor-qloves|doctor-query|doctor-read-print|doctor-read-token|doctor-readin|doctor-remem|doctor-remember|doctor-replace|doctor-ret-or-read|doctor-rms|doctor-rthing|doctor-school|doctor-setprep|doctor-sexnoun|doctor-sexverb|doctor-short|doctor-shorten|doctor-sizep|doctor-sports|doctor-state|doctor-subjsearch|doctor-svo|doctor-symptoms|doctor-toke|doctor-txtype|doctor-type-symbol|doctor-type|doctor-verbp|doctor-vowelp|doctor-when|doctor-wherego|doctor-zippy|doctor|dom-add-child-before|dom-append-child|dom-attr|dom-attributes|dom-by-class|dom-by-id|dom-by-style|dom-by-tag|dom-child-by-tag|dom-children|dom-elements|dom-ensure-node|dom-node|dom-non-text-children|dom-parent|dom-pp|dom-set-attribute|dom-set-attributes|dom-tag|dom-text|dom-texts|dont-compile|double-column|double-mode|double-read-event|double-translate-key|down-ifdef|dsssl-mode|dunnet|dynamic-completion-mode|dynamic-completion-table|dynamic-setting-handle-config-changed-event|easy-menu-add-item|easy-menu-add|easy-menu-always-true-p|easy-menu-binding|easy-menu-change|easy-menu-convert-item-1|easy-menu-convert-item|easy-menu-create-menu|easy-menu-define-key|easy-menu-do-define|easy-menu-filter-return|easy-menu-get-map|easy-menu-intern|easy-menu-item-present-p|easy-menu-lookup-name|easy-menu-make-symbol|easy-menu-name-match|easy-menu-remove-item|easy-menu-remove|easy-menu-return-item|easy-mmode-define-global-mode|easy-mmode-define-keymap|easy-mmode-define-navigation|easy-mmode-define-syntax|easy-mmode-defmap|easy-mmode-defsyntax|easy-mmode-pretty-mode-name|easy-mmode-set-keymap-parents|ebnf-abn-initialize|ebnf-abn-parser|ebnf-adjust-empty|ebnf-adjust-width|ebnf-alternative-dimension|ebnf-alternative-width|ebnf-apply-style|ebnf-apply-style1|ebnf-begin-file|ebnf-begin-job|ebnf-begin-line|ebnf-bnf-initialize|ebnf-bnf-parser|ebnf-boolean|ebnf-buffer-substring|ebnf-check-style-values|ebnf-customize|ebnf-delete-style|ebnf-despool|ebnf-dimensions|ebnf-directory|ebnf-dtd-initialize|ebnf-dtd-parser|ebnf-dup-list|ebnf-ebx-initialize|ebnf-ebx-parser|ebnf-element-width|ebnf-eliminate-empty-rules|ebnf-empty-alternative|ebnf-end-of-string|ebnf-entry|ebnf-eop-horizontal|ebnf-eop-vertical|ebnf-eps-add-context|ebnf-eps-add-production|ebnf-eps-buffer|ebnf-eps-directory|ebnf-eps-file|ebnf-eps-filename|ebnf-eps-finish-and-write|ebnf-eps-footer-comment|ebnf-eps-footer|ebnf-eps-header-comment|ebnf-eps-header-footer-comment|ebnf-eps-header-footer-file|ebnf-eps-header-footer-p|ebnf-eps-header-footer-set|ebnf-eps-header-footer|ebnf-eps-header|ebnf-eps-output|ebnf-eps-production-list|ebnf-eps-region|ebnf-eps-remove-context|ebnf-eps-string|ebnf-eps-write-kill-temp|ebnf-except-dimension|ebnf-file|ebnf-find-style|ebnf-font-attributes|ebnf-font-background|ebnf-font-foreground|ebnf-font-height|ebnf-font-list|ebnf-font-name-select|ebnf-font-name|ebnf-font-select|ebnf-font-size|ebnf-font-width|ebnf-format-color|ebnf-format-float|ebnf-gen-terminal|ebnf-generate-alternative|ebnf-generate-empty|ebnf-generate-eps|ebnf-generate-except|ebnf-generate-non-terminal|ebnf-generate-one-or-more|ebnf-generate-optional|ebnf-generate-postscript|ebnf-generate-production|ebnf-generate-region|ebnf-generate-repeat|ebnf-generate-sequence|ebnf-generate-special|ebnf-generate-terminal|ebnf-generate-with-max-height|ebnf-generate-without-max-height|ebnf-generate-zero-or-more|ebnf-generate|ebnf-get-string|ebnf-horizontal-movement|ebnf-insert-ebnf-prologue|ebnf-insert-style|ebnf-iso-initialize|ebnf-iso-parser|ebnf-justify-list|ebnf-justify|ebnf-log-header|ebnf-log|ebnf-make-alternative|ebnf-make-dup-sequence|ebnf-make-empty|ebnf-make-except|ebnf-make-non-terminal|ebnf-make-one-or-more|ebnf-make-optional|ebnf-make-or-more1|ebnf-make-production|ebnf-make-repeat|ebnf-make-sequence|ebnf-make-special|ebnf-make-terminal|ebnf-make-terminal1|ebnf-make-zero-or-more|ebnf-max-width|ebnf-merge-style|ebnf-message-float|ebnf-message-info|ebnf-new-page|ebnf-newline|ebnf-node-action|ebnf-node-default|ebnf-node-dimension-func|ebnf-node-entry|ebnf-node-generation|ebnf-node-height|ebnf-node-kind|ebnf-node-list|ebnf-node-name|ebnf-node-production|ebnf-node-separator|ebnf-node-width-func|ebnf-node-width|ebnf-non-terminal-dimension|ebnf-one-or-more-dimension|ebnf-optimize|ebnf-optional-dimension|ebnf-otz-initialize|ebnf-parse-and-sort|ebnf-pop-style|ebnf-print-buffer|ebnf-print-directory|ebnf-print-file|ebnf-print-region|ebnf-production-dimension|ebnf-push-style|ebnf-range-regexp|ebnf-repeat-dimension|ebnf-reset-style|ebnf-sequence-dimension|ebnf-sequence-width)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(?:dired-current-directory|dired-delete-entry|dired-delete-file|dired-desktop-buffer-misc-data|dired-diff|dired-directory-changed-p|dired-display-file|dired-dnd-do-ask-action|dired-dnd-handle-file|dired-dnd-handle-local-file|dired-dnd-popup-notice|dired-do-async-shell-command|dired-do-byte-compile|dired-do-chgrp|dired-do-chmod|dired-do-chown|dired-do-compress|dired-do-copy-regexp|dired-do-copy|dired-do-create-files-regexp|dired-do-delete|dired-do-flagged-delete|dired-do-hardlink-regexp|dired-do-hardlink|dired-do-isearch-regexp|dired-do-isearch|dired-do-kill-lines|dired-do-load|dired-do-print|dired-do-query-replace-regexp|dired-do-redisplay|dired-do-relsymlink|dired-do-rename-regexp|dired-do-rename|dired-do-search|dired-do-shell-command|dired-do-symlink-regexp|dired-do-symlink|dired-do-touch|dired-downcase|dired-file-marker|dired-file-name-at-point|dired-find-alternate-file|dired-find-buffer-nocreate|dired-find-file-other-window|dired-find-file|dired-flag-auto-save-files|dired-flag-backup-files|dired-flag-file-deletion|dired-flag-files-regexp|dired-flag-garbage-files|dired-format-columns-of-files|dired-fun-in-all-buffers|dired-get-file-for-visit|dired-get-filename|dired-get-marked-files|dired-get-subdir-max|dired-get-subdir-min|dired-get-subdir|dired-glob-regexp|dired-goto-file-1|dired-goto-file|dired-goto-next-file|dired-goto-next-nontrivial-file|dired-goto-subdir|dired-hide-all|dired-hide-details-mode|dired-hide-details-update-invisibility-spec|dired-hide-subdir|dired-in-this-tree|dired-initial-position|dired-insert-directory|dired-insert-old-subdirs|dired-insert-set-properties|dired-insert-subdir|dired-internal-do-deletions|dired-internal-noselect|dired-isearch-filenames-regexp|dired-isearch-filenames-setup|dired-isearch-filenames|dired-jump-other-window|dired-jump|dired-kill-subdir|dired-log-summary|dired-log|dired-make-absolute|dired-make-relative|dired-map-over-marks|dired-mark-directories|dired-mark-executables|dired-mark-files-containing-regexp|dired-mark-files-in-region|dired-mark-files-regexp|dired-mark-if|dired-mark-pop-up|dired-mark-prompt|dired-mark-remembered|dired-mark-subdir-files|dired-mark-symlinks|dired-mark|dired-marker-regexp|dired-maybe-insert-subdir|dired-mode|dired-mouse-find-file-other-window|dired-move-to-end-of-filename|dired-move-to-filename|dired-next-dirline|dired-next-line|dired-next-marked-file|dired-next-subdir|dired-normalize-subdir|dired-noselect|dired-other-frame|dired-other-window|dired-plural-s|dired-pop-to-buffer|dired-prev-dirline|dired-prev-marked-file|dired-prev-subdir|dired-previous-line|dired-query|dired-read-dir-and-switches|dired-read-regexp|dired-readin-insert|dired-readin|dired-relist-file|dired-remember-hidden|dired-remember-marks|dired-remove-file|dired-rename-file|dired-repeat-over-lines|dired-replace-in-string|dired-restore-desktop-buffer|dired-restore-positions|dired-revert|dired-run-shell-command|dired-safe-switches-p|dired-save-positions|dired-show-file-type|dired-sort-R-check|dired-sort-other|dired-sort-set-mode-line|dired-sort-set-modeline|dired-sort-toggle-or-edit|dired-sort-toggle|dired-string-replace-match|dired-subdir-index|dired-subdir-max|dired-summary|dired-switches-escape-p|dired-switches-recursive-p|dired-toggle-marks|dired-toggle-read-only|dired-tree-down|dired-tree-up|dired-unadvertise|dired-uncache|dired-undo|dired-unmark-all-files|dired-unmark-all-marks|dired-unmark-backward|dired-unmark|dired-up-directory|dired-upcase|dired-view-file|dired-why|dired|dirs|dirtrack-cygwin-directory-function|dirtrack-debug-message|dirtrack-debug-mode|dirtrack-debug-toggle|dirtrack-mode|dirtrack-toggle|dirtrack-windows-directory-function|dirtrack|disable-timeout|disassemble-1|disassemble-internal|disassemble-offset|display-about-screen|display-battery-mode|display-buffer--maybe-pop-up-frame-or-window|display-buffer--maybe-same-window|display-buffer--special-action|display-buffer-assq-regexp|display-buffer-in-atom-window|display-buffer-in-major-side-window|display-buffer-in-side-window|display-buffer-other-frame|display-buffer-record-window|display-call-tree|display-local-help|display-multi-font-p|display-multi-frame-p|display-splash-screen|display-startup-echo-area-message|display-startup-screen|display-table-print-array|display-time-mode|display-time-world|display-time|displaying-byte-compile-warnings|dissociated-press|dnd-get-local-file-name|dnd-get-local-file-uri|dnd-handle-one-url|dnd-insert-text|dnd-open-file|dnd-open-local-file|dnd-open-remote-url|dnd-unescape-uri|dns-get-txt-answer|dns-get|dns-inverse-get|dns-lookup-host|dns-make-network-process|dns-mode-menu|dns-mode-soa-increment-serial|dns-mode-soa-maybe-increment-serial|dns-mode|dns-query-cached|dns-query|dns-read-bytes|dns-read-int32|dns-read-name|dns-read-string-name|dns-read-txt|dns-read-type|dns-read|dns-servers-up-to-date-p|dns-set-servers|dns-write-bytes|dns-write-name|dns-write|dnsDomainIs|dnsResolve|do\\*|do-after-load-evaluation|do-all-symbols|do-auto-fill|do-symbols|do|doc\\$|doc//|doc-file-to-info|doc-file-to-man|doc-view--current-cache-dir|doc-view-active-pages|doc-view-already-converted-p|doc-view-bookmark-jump|doc-view-bookmark-make-record|doc-view-buffer-message|doc-view-clear-cache|doc-view-clone-buffer-hook|doc-view-convert-current-doc|doc-view-current-cache-doc-pdf|doc-view-current-image|doc-view-current-info|doc-view-current-overlay|doc-view-current-page|doc-view-current-slice|doc-view-desktop-save-buffer|doc-view-dired-cache|doc-view-display|doc-view-djvu->tiff-converter-ddjvu|doc-view-doc->txt|doc-view-document->bitmap|doc-view-dvi->pdf|doc-view-enlarge|doc-view-fallback-mode|doc-view-first-page|doc-view-fit-height-to-window|doc-view-fit-page-to-window|doc-view-fit-width-to-window|doc-view-get-bounding-box|doc-view-goto-page|doc-view-guess-paper-size|doc-view-initiate-display|doc-view-insert-image|doc-view-intersection|doc-view-kill-proc-and-buffer|doc-view-kill-proc|doc-view-last-page-number|doc-view-last-page|doc-view-make-safe-dir|doc-view-menu|doc-view-minor-mode|doc-view-mode-maybe|doc-view-mode-p|doc-view-mode|doc-view-new-window-function|doc-view-next-line-or-next-page|doc-view-next-page|doc-view-odf->pdf-converter-soffice|doc-view-odf->pdf-converter-unoconv|doc-view-open-text|doc-view-pdf/ps->png|doc-view-pdf->png-converter-ghostscript|doc-view-pdf->png-converter-mupdf|doc-view-pdf->txt|doc-view-previous-line-or-previous-page|doc-view-previous-page|doc-view-ps->pdf|doc-view-ps->png-converter-ghostscript|doc-view-reconvert-doc|doc-view-reset-slice|doc-view-restore-desktop-buffer|doc-view-revert-buffer|doc-view-scale-adjust|doc-view-scale-bounding-box|doc-view-scale-reset|doc-view-scroll-down-or-previous-page|doc-view-scroll-up-or-next-page|doc-view-search-backward|doc-view-search-internal|doc-view-search-next-match|doc-view-search-no-of-matches|doc-view-search-previous-match|doc-view-search|doc-view-sentinel|doc-view-set-doc-type|doc-view-set-slice-from-bounding-box|doc-view-set-slice-using-mouse|doc-view-set-slice|doc-view-set-up-single-converter|doc-view-show-tooltip|doc-view-shrink|doc-view-sort|doc-view-start-process|doc-view-toggle-display|doctex-font-lock-\\^\\^A|doctex-font-lock-syntactic-face-function|doctex-mode|doctor-\\$|doctor-adjectivep|doctor-adverbp|doctor-alcohol|doctor-articlep|doctor-assm|doctor-build|doctor-chat|doctor-colorp|doctor-concat|doctor-conj|doctor-correct-spelling|doctor-death|doctor-def|doctor-define|doctor-defq|doctor-desire|doctor-desire1|doctor-doc|doctor-drug|doctor-eliza|doctor-family|doctor-fear|doctor-fix-2|doctor-fixup|doctor-forget|doctor-foul|doctor-getnoun|doctor-go|doctor-hate|doctor-hates|doctor-hates1|doctor-howdy|doctor-huh|doctor-love|doctor-loves|doctor-mach|doctor-make-string|doctor-math|doctor-meaning|doctor-mode|doctor-modifierp|doctor-mood|doctor-nmbrp|doctor-nounp|doctor-othermodifierp|doctor-plural|doctor-possess|doctor-possessivepronounp|doctor-prepp|doctor-pronounp|doctor-put-meaning|doctor-qloves|doctor-query|doctor-read-print|doctor-read-token|doctor-readin|doctor-remem|doctor-remember|doctor-replace|doctor-ret-or-read|doctor-rms|doctor-rthing|doctor-school|doctor-setprep|doctor-sexnoun|doctor-sexverb|doctor-short|doctor-shorten|doctor-sizep|doctor-sports|doctor-state|doctor-subjsearch|doctor-svo|doctor-symptoms|doctor-toke|doctor-txtype|doctor-type-symbol|doctor-type|doctor-verbp|doctor-vowelp|doctor-when|doctor-wherego|doctor-zippy|doctor|dom-add-child-before|dom-append-child|dom-attr|dom-attributes|dom-by-class|dom-by-id|dom-by-style|dom-by-tag|dom-child-by-tag|dom-children|dom-elements|dom-ensure-node|dom-node|dom-non-text-children|dom-parent|dom-pp|dom-set-attribute|dom-set-attributes|dom-tag|dom-text|dom-texts|dont-compile|double-column|double-mode|double-read-event|double-translate-key|down-ifdef|dsssl-mode|dunnet|dynamic-completion-mode|dynamic-completion-table|dynamic-setting-handle-config-changed-event|easy-menu-add-item|easy-menu-add|easy-menu-always-true-p|easy-menu-binding|easy-menu-change|easy-menu-convert-item-1|easy-menu-convert-item|easy-menu-create-menu|easy-menu-define-key|easy-menu-do-define|easy-menu-filter-return|easy-menu-get-map|easy-menu-intern|easy-menu-item-present-p|easy-menu-lookup-name|easy-menu-make-symbol|easy-menu-name-match|easy-menu-remove-item|easy-menu-remove|easy-menu-return-item|easy-mmode-define-global-mode|easy-mmode-define-keymap|easy-mmode-define-navigation|easy-mmode-define-syntax|easy-mmode-defmap|easy-mmode-defsyntax|easy-mmode-pretty-mode-name|easy-mmode-set-keymap-parents|ebnf-abn-initialize|ebnf-abn-parser|ebnf-adjust-empty|ebnf-adjust-width|ebnf-alternative-dimension|ebnf-alternative-width|ebnf-apply-style|ebnf-apply-style1|ebnf-begin-file|ebnf-begin-job|ebnf-begin-line|ebnf-bnf-initialize|ebnf-bnf-parser|ebnf-boolean|ebnf-buffer-substring|ebnf-check-style-values|ebnf-customize|ebnf-delete-style|ebnf-despool|ebnf-dimensions|ebnf-directory|ebnf-dtd-initialize|ebnf-dtd-parser|ebnf-dup-list|ebnf-ebx-initialize|ebnf-ebx-parser|ebnf-element-width|ebnf-eliminate-empty-rules|ebnf-empty-alternative|ebnf-end-of-string|ebnf-entry|ebnf-eop-horizontal|ebnf-eop-vertical|ebnf-eps-add-context|ebnf-eps-add-production|ebnf-eps-buffer|ebnf-eps-directory|ebnf-eps-file|ebnf-eps-filename|ebnf-eps-finish-and-write|ebnf-eps-footer-comment|ebnf-eps-footer|ebnf-eps-header-comment|ebnf-eps-header-footer-comment|ebnf-eps-header-footer-file|ebnf-eps-header-footer-p|ebnf-eps-header-footer-set|ebnf-eps-header-footer|ebnf-eps-header|ebnf-eps-output|ebnf-eps-production-list|ebnf-eps-region|ebnf-eps-remove-context|ebnf-eps-string|ebnf-eps-write-kill-temp|ebnf-except-dimension|ebnf-file|ebnf-find-style|ebnf-font-attributes|ebnf-font-background|ebnf-font-foreground|ebnf-font-height|ebnf-font-list|ebnf-font-name-select|ebnf-font-name|ebnf-font-select|ebnf-font-size|ebnf-font-width|ebnf-format-color|ebnf-format-float|ebnf-gen-terminal|ebnf-generate-alternative|ebnf-generate-empty|ebnf-generate-eps|ebnf-generate-except|ebnf-generate-non-terminal|ebnf-generate-one-or-more|ebnf-generate-optional|ebnf-generate-postscript|ebnf-generate-production|ebnf-generate-region|ebnf-generate-repeat|ebnf-generate-sequence|ebnf-generate-special|ebnf-generate-terminal|ebnf-generate-with-max-height|ebnf-generate-without-max-height|ebnf-generate-zero-or-more|ebnf-generate|ebnf-get-string|ebnf-horizontal-movement|ebnf-insert-ebnf-prologue|ebnf-insert-style|ebnf-iso-initialize|ebnf-iso-parser|ebnf-justify-list|ebnf-justify|ebnf-log-header|ebnf-log|ebnf-make-alternative|ebnf-make-dup-sequence|ebnf-make-empty|ebnf-make-except|ebnf-make-non-terminal|ebnf-make-one-or-more|ebnf-make-optional|ebnf-make-or-more1|ebnf-make-production|ebnf-make-repeat|ebnf-make-sequence|ebnf-make-special|ebnf-make-terminal|ebnf-make-terminal1|ebnf-make-zero-or-more|ebnf-max-width|ebnf-merge-style|ebnf-message-float|ebnf-message-info|ebnf-new-page|ebnf-newline|ebnf-node-action|ebnf-node-default|ebnf-node-dimension-func|ebnf-node-entry|ebnf-node-generation|ebnf-node-height|ebnf-node-kind|ebnf-node-list|ebnf-node-name|ebnf-node-production|ebnf-node-separator|ebnf-node-width-func|ebnf-node-width|ebnf-non-terminal-dimension|ebnf-one-or-more-dimension|ebnf-optimize|ebnf-optional-dimension|ebnf-otz-initialize|ebnf-parse-and-sort|ebnf-pop-style|ebnf-print-buffer|ebnf-print-directory|ebnf-print-file|ebnf-print-region|ebnf-production-dimension|ebnf-push-style|ebnf-range-regexp|ebnf-repeat-dimension|ebnf-reset-style|ebnf-sequence-dimension|ebnf-sequence-width)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:ebnf-setup|ebnf-shape-value|ebnf-sorter-ascending|ebnf-sorter-descending|ebnf-special-dimension|ebnf-spool-buffer|ebnf-spool-directory|ebnf-spool-file|ebnf-spool-region|ebnf-string|ebnf-syntax-buffer|ebnf-syntax-directory|ebnf-syntax-file|ebnf-syntax-region|ebnf-terminal-dimension|ebnf-terminal-dimension1|ebnf-token-alternative|ebnf-token-except|ebnf-token-optional|ebnf-token-repeat|ebnf-token-sequence|ebnf-trim-right|ebnf-vertical-movement|ebnf-yac-initialize|ebnf-yac-parser|ebnf-zero-or-more-dimension|ebrowse-back-in-position-stack|ebrowse-base-classes|ebrowse-browser-buffer-list|ebrowse-bs-file--cmacro|ebrowse-bs-file|ebrowse-bs-flags--cmacro|ebrowse-bs-flags|ebrowse-bs-name--cmacro|ebrowse-bs-name|ebrowse-bs-p--cmacro|ebrowse-bs-p|ebrowse-bs-pattern--cmacro|ebrowse-bs-pattern|ebrowse-bs-point--cmacro|ebrowse-bs-point|ebrowse-bs-scope--cmacro|ebrowse-bs-scope|ebrowse-buffer-p|ebrowse-build-tree-obarray|ebrowse-choose-from-browser-buffers|ebrowse-choose-tree|ebrowse-class-alist-for-member|ebrowse-class-declaration-regexp|ebrowse-class-in-tree|ebrowse-class-name-displayed-in-member-buffer|ebrowse-collapse-branch|ebrowse-collapse-fn|ebrowse-completing-read-value|ebrowse-const-p|ebrowse-create-tree-buffer|ebrowse-cs-file--cmacro|ebrowse-cs-file|ebrowse-cs-flags--cmacro|ebrowse-cs-flags|ebrowse-cs-name--cmacro|ebrowse-cs-name|ebrowse-cs-p--cmacro|ebrowse-cs-p|ebrowse-cs-pattern--cmacro|ebrowse-cs-pattern|ebrowse-cs-point--cmacro|ebrowse-cs-point|ebrowse-cs-scope--cmacro|ebrowse-cs-scope|ebrowse-cs-source-file--cmacro|ebrowse-cs-source-file|ebrowse-cyclic-display-next\\/previous-member-list|ebrowse-cyclic-successor-in-string-list|ebrowse-define-p|ebrowse-direct-base-classes|ebrowse-display-friends-member-list|ebrowse-display-function-member-list|ebrowse-display-member-buffer|ebrowse-display-member-list-for-accessor|ebrowse-display-next-member-list|ebrowse-display-previous-member-list|ebrowse-display-static-functions-member-list|ebrowse-display-static-variables-member-list|ebrowse-display-types-member-list|ebrowse-display-variables-member-list|ebrowse-displaying-friends|ebrowse-displaying-functions|ebrowse-displaying-static-functions|ebrowse-displaying-static-variables|ebrowse-displaying-types|ebrowse-displaying-variables|ebrowse-draw-file-member-info|ebrowse-draw-marks-fn|ebrowse-draw-member-attributes|ebrowse-draw-member-buffer-class-line|ebrowse-draw-member-long-fn|ebrowse-draw-member-regexp|ebrowse-draw-member-short-fn|ebrowse-draw-position-buffer|ebrowse-draw-tree-fn|ebrowse-electric-buffer-list|ebrowse-electric-choose-tree|ebrowse-electric-find-position|ebrowse-electric-get-buffer|ebrowse-electric-list-looper|ebrowse-electric-list-mode|ebrowse-electric-list-quit|ebrowse-electric-list-select|ebrowse-electric-list-undefined|ebrowse-electric-position-looper|ebrowse-electric-position-menu|ebrowse-electric-position-mode|ebrowse-electric-position-quit|ebrowse-electric-position-undefined|ebrowse-electric-select-position|ebrowse-electric-view-buffer|ebrowse-electric-view-position|ebrowse-every|ebrowse-expand-all|ebrowse-expand-branch|ebrowse-explicit-p|ebrowse-extern-c-p|ebrowse-files-list|ebrowse-files-table|ebrowse-fill-member-table|ebrowse-find-class-declaration|ebrowse-find-member-declaration|ebrowse-find-member-definition|ebrowse-find-pattern|ebrowse-find-source-file|ebrowse-for-all-trees|ebrowse-forward-in-position-stack|ebrowse-freeze-member-buffer|ebrowse-frozen-tree-buffer-name|ebrowse-function-declaration\\/definition-regexp|ebrowse-gather-statistics|ebrowse-globals-tree-p|ebrowse-goto-visible-member\\/all-member-lists|ebrowse-goto-visible-member|ebrowse-hack-electric-buffer-menu|ebrowse-hide-line|ebrowse-hs-command-line-options--cmacro|ebrowse-hs-command-line-options|ebrowse-hs-member-table--cmacro|ebrowse-hs-member-table|ebrowse-hs-p--cmacro|ebrowse-hs-p|ebrowse-hs-unused--cmacro|ebrowse-hs-unused|ebrowse-hs-version--cmacro|ebrowse-hs-version|ebrowse-ignoring-completion-case|ebrowse-inline-p|ebrowse-insert-supers|ebrowse-install-1-to-9-keys|ebrowse-kill-member-buffers-displaying|ebrowse-known-class-trees-buffer-list|ebrowse-list-of-matching-members|ebrowse-list-tree-buffers|ebrowse-mark-all-classes|ebrowse-marked-classes-p|ebrowse-member-bit-set-p|ebrowse-member-buffer-list|ebrowse-member-buffer-object-menu|ebrowse-member-buffer-p|ebrowse-member-class-name-object-menu|ebrowse-member-display-p|ebrowse-member-info-from-point|ebrowse-member-list-name|ebrowse-member-mode|ebrowse-member-mouse-2|ebrowse-member-mouse-3|ebrowse-member-name-object-menu|ebrowse-member-table|ebrowse-mouse-1-in-tree-buffer|ebrowse-mouse-2-in-tree-buffer|ebrowse-mouse-3-in-tree-buffer|ebrowse-mouse-find-member|ebrowse-move-in-position-stack|ebrowse-move-point-to-member|ebrowse-ms-definition-file--cmacro|ebrowse-ms-definition-file|ebrowse-ms-definition-pattern--cmacro|ebrowse-ms-definition-pattern|ebrowse-ms-definition-point--cmacro|ebrowse-ms-definition-point|ebrowse-ms-file--cmacro|ebrowse-ms-file|ebrowse-ms-flags--cmacro|ebrowse-ms-flags|ebrowse-ms-name--cmacro|ebrowse-ms-name|ebrowse-ms-p--cmacro|ebrowse-ms-p|ebrowse-ms-pattern--cmacro|ebrowse-ms-pattern|ebrowse-ms-point--cmacro|ebrowse-ms-point|ebrowse-ms-scope--cmacro|ebrowse-ms-scope|ebrowse-ms-visibility--cmacro|ebrowse-ms-visibility|ebrowse-mutable-p|ebrowse-name\\/accessor-alist-for-class-members|ebrowse-name\\/accessor-alist-for-visible-members|ebrowse-name\\/accessor-alist|ebrowse-on-class-name|ebrowse-on-member-name|ebrowse-output|ebrowse-pop\\/switch-to-member-buffer-for-same-tree|ebrowse-pop-from-member-to-tree-buffer|ebrowse-pop-to-browser-buffer|ebrowse-popup-menu|ebrowse-position-file-name--cmacro|ebrowse-position-file-name|ebrowse-position-info--cmacro|ebrowse-position-info|ebrowse-position-name|ebrowse-position-p--cmacro|ebrowse-position-p|ebrowse-position-point--cmacro|ebrowse-position-point|ebrowse-position-target--cmacro|ebrowse-position-target|ebrowse-position|ebrowse-pp-define-regexp|ebrowse-print-statistics-line|ebrowse-pure-virtual-p|ebrowse-push-position|ebrowse-qualified-class-name|ebrowse-read-class-name-and-go|ebrowse-read|ebrowse-redisplay-member-buffer|ebrowse-redraw-marks|ebrowse-redraw-tree|ebrowse-remove-all-member-filters|ebrowse-remove-class-and-kill-member-buffers|ebrowse-remove-class-at-point|ebrowse-rename-buffer|ebrowse-repeat-member-search|ebrowse-revert-tree-buffer-from-file|ebrowse-same-tree-member-buffer-list|ebrowse-save-class|ebrowse-save-selective|ebrowse-save-tree-as|ebrowse-save-tree|ebrowse-select-1st-to-9nth|ebrowse-set-face|ebrowse-set-mark-props|ebrowse-set-member-access-visibility|ebrowse-set-member-buffer-column-width|ebrowse-set-tree-indentation|ebrowse-show-displayed-class-in-tree|ebrowse-show-file-name-at-point|ebrowse-show-progress|ebrowse-some-member-table|ebrowse-some|ebrowse-sort-tree-list|ebrowse-statistics|ebrowse-switch-member-buffer-to-any-class|ebrowse-switch-member-buffer-to-base-class|ebrowse-switch-member-buffer-to-derived-class|ebrowse-switch-member-buffer-to-next-sibling-class|ebrowse-switch-member-buffer-to-other-class|ebrowse-switch-member-buffer-to-previous-sibling-class|ebrowse-switch-member-buffer-to-sibling-class|ebrowse-switch-to-next-member-buffer|ebrowse-symbol-regexp|ebrowse-tags-apropos|ebrowse-tags-choose-class|ebrowse-tags-complete-symbol|ebrowse-tags-display-member-buffer|ebrowse-tags-find-declaration-other-frame|ebrowse-tags-find-declaration-other-window|ebrowse-tags-find-declaration|ebrowse-tags-find-definition-other-frame|ebrowse-tags-find-definition-other-window|ebrowse-tags-find-definition|ebrowse-tags-list-members-in-file|ebrowse-tags-loop-continue|ebrowse-tags-next-file|ebrowse-tags-query-replace|ebrowse-tags-read-member\\+class-name|ebrowse-tags-read-name|ebrowse-tags-search-member-use|ebrowse-tags-search|ebrowse-tags-select\\/create-member-buffer|ebrowse-tags-view\\/find-member-decl\\/defn|ebrowse-tags-view-declaration-other-frame|ebrowse-tags-view-declaration-other-window|ebrowse-tags-view-declaration|ebrowse-tags-view-definition-other-frame|ebrowse-tags-view-definition-other-window|ebrowse-tags-view-definition|ebrowse-template-p|ebrowse-throw-list-p|ebrowse-toggle-base-class-display|ebrowse-toggle-const-member-filter|ebrowse-toggle-file-name-display|ebrowse-toggle-inline-member-filter|ebrowse-toggle-long-short-display|ebrowse-toggle-mark-at-point|ebrowse-toggle-member-attributes-display|ebrowse-toggle-private-member-filter|ebrowse-toggle-protected-member-filter|ebrowse-toggle-public-member-filter|ebrowse-toggle-pure-member-filter|ebrowse-toggle-regexp-display|ebrowse-toggle-virtual-member-filter|ebrowse-tree-at-point|ebrowse-tree-buffer-class-object-menu|ebrowse-tree-buffer-list|ebrowse-tree-buffer-object-menu|ebrowse-tree-buffer-p|ebrowse-tree-command:show-friends|ebrowse-tree-command:show-member-functions|ebrowse-tree-command:show-member-variables|ebrowse-tree-command:show-static-member-functions|ebrowse-tree-command:show-static-member-variables|ebrowse-tree-command:show-types|ebrowse-tree-mode|ebrowse-tree-obarray-as-alist|ebrowse-trim-string|ebrowse-ts-base-classes--cmacro|ebrowse-ts-base-classes|ebrowse-ts-class--cmacro|ebrowse-ts-class|ebrowse-ts-friends--cmacro|ebrowse-ts-friends|ebrowse-ts-mark--cmacro|ebrowse-ts-mark|ebrowse-ts-member-functions--cmacro|ebrowse-ts-member-functions|ebrowse-ts-member-variables--cmacro|ebrowse-ts-member-variables|ebrowse-ts-p--cmacro|ebrowse-ts-p|ebrowse-ts-static-functions--cmacro|ebrowse-ts-static-functions|ebrowse-ts-static-variables--cmacro|ebrowse-ts-static-variables|ebrowse-ts-subclasses--cmacro|ebrowse-ts-subclasses|ebrowse-ts-types--cmacro|ebrowse-ts-types|ebrowse-unhide-base-classes|ebrowse-update-member-buffer-mode-line|ebrowse-update-tree-buffer-mode-line|ebrowse-variable-declaration-regexp|ebrowse-view\\/find-class-declaration|ebrowse-view\\/find-file-and-search-pattern|ebrowse-view\\/find-member-declaration\\/definition|ebrowse-view\\/find-position|ebrowse-view-class-declaration|ebrowse-view-exit-fn|ebrowse-view-file-other-frame|ebrowse-view-member-declaration|ebrowse-view-member-definition|ebrowse-virtual-p|ebrowse-width-of-drawable-area|ebrowse-write-file-hook-fn|ebuffers|ebuffers3|ecase|ecomplete-display-matches|ecomplete-setup|ede--detect-ldf-predicate|ede--detect-ldf-root-predicate|ede--detect-ldf-rootonly-predicate|ede--detect-scan-directory-for-project-root|ede--detect-scan-directory-for-project|ede--detect-scan-directory-for-rootonly-project|ede--detect-stop-scan-p|ede--directory-project-add-description-to-hash|ede--directory-project-from-hash|ede--get-inode-dir-hash|ede--inode-for-dir|ede--inode-get-toplevel-open-project|ede--project-inode|ede--put-inode-dir-hash|ede-add-file|ede-add-project-autoload|ede-add-project-to-global-list|ede-add-subproject|ede-adebug-project-parent|ede-adebug-project-root|ede-adebug-project|ede-apply-object-keymap|ede-apply-preprocessor-map|ede-apply-project-local-variables|ede-apply-target-options|ede-auto-add-to-target|ede-auto-detect-in-dir|ede-auto-load-project|ede-buffer-belongs-to-project-p|ede-buffer-belongs-to-target-p|ede-buffer-documentation-files|ede-buffer-header-file|ede-buffer-mine|ede-buffer-object|ede-buffers|ede-build-forms-menu|ede-check-project-directory|ede-choose-object|ede-commit-local-variables|ede-compile-project|ede-compile-selected|ede-compile-target|ede-configuration-forms-menu|ede-convert-path|ede-cpp-root-project-child-p|ede-cpp-root-project-list-p|ede-cpp-root-project-p|ede-cpp-root-project|ede-create-tag-buttons|ede-current-project|ede-customize-current-target|ede-customize-forms-menu|ede-customize-project|ede-debug-target|ede-delete-project-from-global-list|ede-delete-target|ede-description|ede-detect-directory-for-project|ede-detect-qtest|ede-directory-get-open-project|ede-directory-get-toplevel-open-project|ede-directory-project-cons|ede-directory-project-p|ede-directory-safe-p|ede-dired-minor-mode|ede-dirmatch-installed|ede-do-dirmatch|ede-documentation-files|ede-documentation|ede-ecb-project-paths|ede-edit-file-target|ede-edit-web-page|ede-enable-generic-projects|ede-enable-locate-on-project|ede-expand-filename-impl-via-subproj|ede-expand-filename-impl|ede-expand-filename-local|ede-expand-filename|ede-file-find|ede-find-file|ede-find-nearest-file-line|ede-find-subproject-for-directory|ede-find-target|ede-flush-deleted-projects|ede-flush-directory-hash|ede-flush-project-hash|ede-get-locator-object|ede-global-list-sanity-check|ede-header-file|ede-html-documentation-files|ede-html-documentation|ede-ignore-file|ede-initialize-state-current-buffer|ede-invoke-method)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)e(?:bnf-setup|bnf-shape-value|bnf-sorter-ascending|bnf-sorter-descending|bnf-special-dimension|bnf-spool-buffer|bnf-spool-directory|bnf-spool-file|bnf-spool-region|bnf-string|bnf-syntax-buffer|bnf-syntax-directory|bnf-syntax-file|bnf-syntax-region|bnf-terminal-dimension|bnf-terminal-dimension1|bnf-token-alternative|bnf-token-except|bnf-token-optional|bnf-token-repeat|bnf-token-sequence|bnf-trim-right|bnf-vertical-movement|bnf-yac-initialize|bnf-yac-parser|bnf-zero-or-more-dimension|browse-back-in-position-stack|browse-base-classes|browse-browser-buffer-list|browse-bs-file--cmacro|browse-bs-file|browse-bs-flags--cmacro|browse-bs-flags|browse-bs-name--cmacro|browse-bs-name|browse-bs-p--cmacro|browse-bs-p|browse-bs-pattern--cmacro|browse-bs-pattern|browse-bs-point--cmacro|browse-bs-point|browse-bs-scope--cmacro|browse-bs-scope|browse-buffer-p|browse-build-tree-obarray|browse-choose-from-browser-buffers|browse-choose-tree|browse-class-alist-for-member|browse-class-declaration-regexp|browse-class-in-tree|browse-class-name-displayed-in-member-buffer|browse-collapse-branch|browse-collapse-fn|browse-completing-read-value|browse-const-p|browse-create-tree-buffer|browse-cs-file--cmacro|browse-cs-file|browse-cs-flags--cmacro|browse-cs-flags|browse-cs-name--cmacro|browse-cs-name|browse-cs-p--cmacro|browse-cs-p|browse-cs-pattern--cmacro|browse-cs-pattern|browse-cs-point--cmacro|browse-cs-point|browse-cs-scope--cmacro|browse-cs-scope|browse-cs-source-file--cmacro|browse-cs-source-file|browse-cyclic-display-next/previous-member-list|browse-cyclic-successor-in-string-list|browse-define-p|browse-direct-base-classes|browse-display-friends-member-list|browse-display-function-member-list|browse-display-member-buffer|browse-display-member-list-for-accessor|browse-display-next-member-list|browse-display-previous-member-list|browse-display-static-functions-member-list|browse-display-static-variables-member-list|browse-display-types-member-list|browse-display-variables-member-list|browse-displaying-friends|browse-displaying-functions|browse-displaying-static-functions|browse-displaying-static-variables|browse-displaying-types|browse-displaying-variables|browse-draw-file-member-info|browse-draw-marks-fn|browse-draw-member-attributes|browse-draw-member-buffer-class-line|browse-draw-member-long-fn|browse-draw-member-regexp|browse-draw-member-short-fn|browse-draw-position-buffer|browse-draw-tree-fn|browse-electric-buffer-list|browse-electric-choose-tree|browse-electric-find-position|browse-electric-get-buffer|browse-electric-list-looper|browse-electric-list-mode|browse-electric-list-quit|browse-electric-list-select|browse-electric-list-undefined|browse-electric-position-looper|browse-electric-position-menu|browse-electric-position-mode|browse-electric-position-quit|browse-electric-position-undefined|browse-electric-select-position|browse-electric-view-buffer|browse-electric-view-position|browse-every|browse-expand-all|browse-expand-branch|browse-explicit-p|browse-extern-c-p|browse-files-list|browse-files-table|browse-fill-member-table|browse-find-class-declaration|browse-find-member-declaration|browse-find-member-definition|browse-find-pattern|browse-find-source-file|browse-for-all-trees|browse-forward-in-position-stack|browse-freeze-member-buffer|browse-frozen-tree-buffer-name|browse-function-declaration/definition-regexp|browse-gather-statistics|browse-globals-tree-p|browse-goto-visible-member/all-member-lists|browse-goto-visible-member|browse-hack-electric-buffer-menu|browse-hide-line|browse-hs-command-line-options--cmacro|browse-hs-command-line-options|browse-hs-member-table--cmacro|browse-hs-member-table|browse-hs-p--cmacro|browse-hs-p|browse-hs-unused--cmacro|browse-hs-unused|browse-hs-version--cmacro|browse-hs-version|browse-ignoring-completion-case|browse-inline-p|browse-insert-supers|browse-install-1-to-9-keys|browse-kill-member-buffers-displaying|browse-known-class-trees-buffer-list|browse-list-of-matching-members|browse-list-tree-buffers|browse-mark-all-classes|browse-marked-classes-p|browse-member-bit-set-p|browse-member-buffer-list|browse-member-buffer-object-menu|browse-member-buffer-p|browse-member-class-name-object-menu|browse-member-display-p|browse-member-info-from-point|browse-member-list-name|browse-member-mode|browse-member-mouse-2|browse-member-mouse-3|browse-member-name-object-menu|browse-member-table|browse-mouse-1-in-tree-buffer|browse-mouse-2-in-tree-buffer|browse-mouse-3-in-tree-buffer|browse-mouse-find-member|browse-move-in-position-stack|browse-move-point-to-member|browse-ms-definition-file--cmacro|browse-ms-definition-file|browse-ms-definition-pattern--cmacro|browse-ms-definition-pattern|browse-ms-definition-point--cmacro|browse-ms-definition-point|browse-ms-file--cmacro|browse-ms-file|browse-ms-flags--cmacro|browse-ms-flags|browse-ms-name--cmacro|browse-ms-name|browse-ms-p--cmacro|browse-ms-p|browse-ms-pattern--cmacro|browse-ms-pattern|browse-ms-point--cmacro|browse-ms-point|browse-ms-scope--cmacro|browse-ms-scope|browse-ms-visibility--cmacro|browse-ms-visibility|browse-mutable-p|browse-name/accessor-alist-for-class-members|browse-name/accessor-alist-for-visible-members|browse-name/accessor-alist|browse-on-class-name|browse-on-member-name|browse-output|browse-pop/switch-to-member-buffer-for-same-tree|browse-pop-from-member-to-tree-buffer|browse-pop-to-browser-buffer|browse-popup-menu|browse-position-file-name--cmacro|browse-position-file-name|browse-position-info--cmacro|browse-position-info|browse-position-name|browse-position-p--cmacro|browse-position-p|browse-position-point--cmacro|browse-position-point|browse-position-target--cmacro|browse-position-target|browse-position|browse-pp-define-regexp|browse-print-statistics-line|browse-pure-virtual-p|browse-push-position|browse-qualified-class-name|browse-read-class-name-and-go|browse-read|browse-redisplay-member-buffer|browse-redraw-marks|browse-redraw-tree|browse-remove-all-member-filters|browse-remove-class-and-kill-member-buffers|browse-remove-class-at-point|browse-rename-buffer|browse-repeat-member-search|browse-revert-tree-buffer-from-file|browse-same-tree-member-buffer-list|browse-save-class|browse-save-selective|browse-save-tree-as|browse-save-tree|browse-select-1st-to-9nth|browse-set-face|browse-set-mark-props|browse-set-member-access-visibility|browse-set-member-buffer-column-width|browse-set-tree-indentation|browse-show-displayed-class-in-tree|browse-show-file-name-at-point|browse-show-progress|browse-some-member-table|browse-some|browse-sort-tree-list|browse-statistics|browse-switch-member-buffer-to-any-class|browse-switch-member-buffer-to-base-class|browse-switch-member-buffer-to-derived-class|browse-switch-member-buffer-to-next-sibling-class|browse-switch-member-buffer-to-other-class|browse-switch-member-buffer-to-previous-sibling-class|browse-switch-member-buffer-to-sibling-class|browse-switch-to-next-member-buffer|browse-symbol-regexp|browse-tags-apropos|browse-tags-choose-class|browse-tags-complete-symbol|browse-tags-display-member-buffer|browse-tags-find-declaration-other-frame|browse-tags-find-declaration-other-window|browse-tags-find-declaration|browse-tags-find-definition-other-frame|browse-tags-find-definition-other-window|browse-tags-find-definition|browse-tags-list-members-in-file|browse-tags-loop-continue|browse-tags-next-file|browse-tags-query-replace|browse-tags-read-member\\+class-name|browse-tags-read-name|browse-tags-search-member-use|browse-tags-search|browse-tags-select/create-member-buffer|browse-tags-view/find-member-decl/defn|browse-tags-view-declaration-other-frame|browse-tags-view-declaration-other-window|browse-tags-view-declaration|browse-tags-view-definition-other-frame|browse-tags-view-definition-other-window|browse-tags-view-definition|browse-template-p|browse-throw-list-p|browse-toggle-base-class-display|browse-toggle-const-member-filter|browse-toggle-file-name-display|browse-toggle-inline-member-filter|browse-toggle-long-short-display|browse-toggle-mark-at-point|browse-toggle-member-attributes-display|browse-toggle-private-member-filter|browse-toggle-protected-member-filter|browse-toggle-public-member-filter|browse-toggle-pure-member-filter|browse-toggle-regexp-display|browse-toggle-virtual-member-filter|browse-tree-at-point|browse-tree-buffer-class-object-menu|browse-tree-buffer-list|browse-tree-buffer-object-menu|browse-tree-buffer-p|browse-tree-command:show-friends|browse-tree-command:show-member-functions|browse-tree-command:show-member-variables|browse-tree-command:show-static-member-functions|browse-tree-command:show-static-member-variables|browse-tree-command:show-types|browse-tree-mode|browse-tree-obarray-as-alist|browse-trim-string|browse-ts-base-classes--cmacro|browse-ts-base-classes|browse-ts-class--cmacro|browse-ts-class|browse-ts-friends--cmacro|browse-ts-friends|browse-ts-mark--cmacro|browse-ts-mark|browse-ts-member-functions--cmacro|browse-ts-member-functions|browse-ts-member-variables--cmacro|browse-ts-member-variables|browse-ts-p--cmacro|browse-ts-p|browse-ts-static-functions--cmacro|browse-ts-static-functions|browse-ts-static-variables--cmacro|browse-ts-static-variables|browse-ts-subclasses--cmacro|browse-ts-subclasses|browse-ts-types--cmacro|browse-ts-types|browse-unhide-base-classes|browse-update-member-buffer-mode-line|browse-update-tree-buffer-mode-line|browse-variable-declaration-regexp|browse-view/find-class-declaration|browse-view/find-file-and-search-pattern|browse-view/find-member-declaration/definition|browse-view/find-position|browse-view-class-declaration|browse-view-exit-fn|browse-view-file-other-frame|browse-view-member-declaration|browse-view-member-definition|browse-virtual-p|browse-width-of-drawable-area|browse-write-file-hook-fn|buffers|buffers3|case|complete-display-matches|complete-setup|de--detect-ldf-predicate|de--detect-ldf-root-predicate|de--detect-ldf-rootonly-predicate|de--detect-scan-directory-for-project-root|de--detect-scan-directory-for-project|de--detect-scan-directory-for-rootonly-project|de--detect-stop-scan-p|de--directory-project-add-description-to-hash|de--directory-project-from-hash|de--get-inode-dir-hash|de--inode-for-dir|de--inode-get-toplevel-open-project|de--project-inode|de--put-inode-dir-hash|de-add-file|de-add-project-autoload|de-add-project-to-global-list|de-add-subproject|de-adebug-project-parent|de-adebug-project-root|de-adebug-project|de-apply-object-keymap|de-apply-preprocessor-map|de-apply-project-local-variables|de-apply-target-options|de-auto-add-to-target|de-auto-detect-in-dir|de-auto-load-project|de-buffer-belongs-to-project-p|de-buffer-belongs-to-target-p|de-buffer-documentation-files|de-buffer-header-file|de-buffer-mine|de-buffer-object|de-buffers|de-build-forms-menu|de-check-project-directory|de-choose-object|de-commit-local-variables|de-compile-project|de-compile-selected|de-compile-target|de-configuration-forms-menu|de-convert-path|de-cpp-root-project-child-p|de-cpp-root-project-list-p|de-cpp-root-project-p|de-cpp-root-project|de-create-tag-buttons|de-current-project|de-customize-current-target|de-customize-forms-menu|de-customize-project|de-debug-target|de-delete-project-from-global-list|de-delete-target|de-description|de-detect-directory-for-project|de-detect-qtest|de-directory-get-open-project|de-directory-get-toplevel-open-project|de-directory-project-cons|de-directory-project-p|de-directory-safe-p|de-dired-minor-mode|de-dirmatch-installed|de-do-dirmatch|de-documentation-files|de-documentation|de-ecb-project-paths|de-edit-file-target|de-edit-web-page|de-enable-generic-projects|de-enable-locate-on-project|de-expand-filename-impl-via-subproj|de-expand-filename-impl|de-expand-filename-local|de-expand-filename|de-file-find|de-find-file|de-find-nearest-file-line|de-find-subproject-for-directory|de-find-target|de-flush-deleted-projects|de-flush-directory-hash|de-flush-project-hash|de-get-locator-object|de-global-list-sanity-check|de-header-file|de-html-documentation-files|de-html-documentation|de-ignore-file|de-initialize-state-current-buffer|de-invoke-method)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:ede-java-classpath|ede-linux-load|ede-load-cache|ede-load-project-file|ede-make-check-version|ede-make-dist|ede-make-project-local-variable|ede-map-all-subprojects|ede-map-any-target-p|ede-map-buffers|ede-map-project-buffers|ede-map-subprojects|ede-map-target-buffers|ede-map-targets|ede-menu-items-build|ede-menu-obj-of-class-p|ede-minor-mode|ede-name|ede-new-target-custom|ede-new-target|ede-new|ede-normalize-file\\/directory|ede-object-keybindings|ede-object-menu|ede-object-sourcecode|ede-parent-project|ede-preprocessor-map|ede-project-autoload-child-p|ede-project-autoload-dirmatch-child-p|ede-project-autoload-dirmatch-list-p|ede-project-autoload-dirmatch-p|ede-project-autoload-dirmatch|ede-project-autoload-list-p|ede-project-autoload-p|ede-project-autoload|ede-project-buffers|ede-project-child-p|ede-project-configurations-set|ede-project-directory-remove-hash|ede-project-forms-menu|ede-project-list-p|ede-project-p|ede-project-placeholder-child-p|ede-project-placeholder-list-p|ede-project-placeholder-p|ede-project-placeholder|ede-project-root-directory|ede-project-root|ede-project-sort-targets|ede-project|ede-remove-file|ede-rescan-toplevel|ede-reset-all-buffers|ede-run-target|ede-save-cache|ede-set-project-local-variable|ede-set-project-variables|ede-set|ede-singular-object|ede-source-paths|ede-sourcecode-child-p|ede-sourcecode-list-p|ede-sourcecode-p|ede-sourcecode|ede-speedbar-compile-file-project|ede-speedbar-compile-line|ede-speedbar-compile-project|ede-speedbar-edit-projectfile|ede-speedbar-file-setup|ede-speedbar-get-top-project-for-line|ede-speedbar-make-distribution|ede-speedbar-make-map|ede-speedbar-remove-file-from-target|ede-speedbar-toplevel-buttons|ede-speedbar|ede-subproject-p|ede-subproject-relative-path|ede-system-include-path|ede-tag-expand|ede-tag-find|ede-target-buffer-in-sourcelist|ede-target-buffers|ede-target-child-p|ede-target-forms-menu|ede-target-in-project-p|ede-target-list-p|ede-target-name|ede-target-p|ede-target-parent|ede-target-sourcecode|ede-target|ede-toplevel-project-or-nil|ede-toplevel-project|ede-toplevel|ede-turn-on-hook|ede-up-directory|ede-update-version|ede-upload-distribution|ede-upload-html-documentation|ede-vc-project-directory|ede-version|ede-want-any-auxiliary-files-p|ede-want-any-files-p|ede-want-any-source-files-p|ede-want-file-auxiliary-p|ede-want-file-p|ede-want-file-source-p|ede-web-browse-home|ede-with-projectfile|ede|edebug-&optional-wrapper|edebug-&rest-wrapper|edebug--called-interactively-skip|edebug--display|edebug--enter-trace|edebug--form-data-begin--cmacro|edebug--form-data-begin|edebug--form-data-end--cmacro|edebug--form-data-end|edebug--form-data-name--cmacro|edebug--form-data-name|edebug--make-form-data-entry--cmacro|edebug--make-form-data-entry|edebug--read|edebug--recursive-edit|edebug--require-cl-read|edebug--update-coverage|edebug-Continue-fast-mode|edebug-Go-nonstop-mode|edebug-Trace-fast-mode|edebug-`|edebug-adjust-window|edebug-after-offset|edebug-after|edebug-all-defuns|edebug-backtrace|edebug-basic-spec|edebug-before-offset|edebug-before|edebug-bounce-point|edebug-changing-windows|edebug-clear-coverage|edebug-clear-form-data-entry|edebug-clear-frequency-count|edebug-compute-previous-result|edebug-continue-mode|edebug-copy-cursor|edebug-create-eval-buffer|edebug-current-windows|edebug-cursor-expressions|edebug-cursor-offsets|edebug-debugger|edebug-defining-form|edebug-delete-eval-item|edebug-empty-cursor|edebug-enter|edebug-eval-defun|edebug-eval-display-list|edebug-eval-display|edebug-eval-expression|edebug-eval-last-sexp|edebug-eval-mode|edebug-eval-print-last-sexp|edebug-eval-redisplay|edebug-eval-result-list|edebug-eval|edebug-fast-after|edebug-fast-before|edebug-find-stop-point|edebug-form-data-symbol|edebug-form|edebug-format|edebug-forms|edebug-forward-sexp|edebug-get-displayed-buffer-points|edebug-get-form-data-entry|edebug-go-mode|edebug-goto-here|edebug-help|edebug-ignore-offset|edebug-inc-offset|edebug-initialize-offsets|edebug-install-read-eval-functions|edebug-instrument-callee|edebug-instrument-function|edebug-interactive-p-name|edebug-kill-buffer|edebug-lambda-list-keywordp|edebug-last-sexp|edebug-list-form-args|edebug-list-form|edebug-make-after-form|edebug-make-before-and-after-form|edebug-make-enter-wrapper|edebug-make-form-wrapper|edebug-make-top-form-data-entry|edebug-mark-marker|edebug-mark|edebug-match-&define|edebug-match-&key|edebug-match-¬|edebug-match-&optional|edebug-match-&or|edebug-match-&rest|edebug-match-arg|edebug-match-body|edebug-match-colon-name|edebug-match-def-body|edebug-match-def-form|edebug-match-form|edebug-match-function|edebug-match-gate|edebug-match-lambda-expr|edebug-match-list|edebug-match-name|edebug-match-nil|edebug-match-one-spec|edebug-match-place|edebug-match-sexp|edebug-match-specs|edebug-match-string|edebug-match-sublist|edebug-match-symbol|edebug-match|edebug-menu|edebug-message|edebug-mode|edebug-modify-breakpoint|edebug-move-cursor|edebug-new-cursor|edebug-next-breakpoint|edebug-next-mode|edebug-next-token-class|edebug-no-match|edebug-on-entry|edebug-outside-excursion|edebug-overlay-arrow|edebug-pop-to-buffer|edebug-previous-result|edebug-prin1-to-string|edebug-prin1|edebug-print|edebug-read-and-maybe-wrap-form|edebug-read-and-maybe-wrap-form1|edebug-read-backquote|edebug-read-comma|edebug-read-function|edebug-read-list|edebug-read-quote|edebug-read-sexp|edebug-read-storing-offsets|edebug-read-string|edebug-read-symbol|edebug-read-top-level-form|edebug-read-vector|edebug-report-error|edebug-restore-status|edebug-run-fast|edebug-run-slow|edebug-safe-eval|edebug-safe-prin1-to-string|edebug-set-breakpoint|edebug-set-buffer-points|edebug-set-conditional-breakpoint|edebug-set-cursor|edebug-set-form-data-entry|edebug-set-mode|edebug-set-windows|edebug-sexps|edebug-signal|edebug-skip-whitespace|edebug-slow-after|edebug-slow-before|edebug-sort-alist|edebug-spec-p|edebug-step-in|edebug-step-mode|edebug-step-out|edebug-step-through-mode|edebug-stop|edebug-store-after-offset|edebug-store-before-offset|edebug-storing-offsets|edebug-syntax-error|edebug-toggle-save-all-windows|edebug-toggle-save-selected-window|edebug-toggle-save-windows|edebug-toggle|edebug-top-element-required|edebug-top-element|edebug-top-level-nonstop|edebug-top-offset|edebug-trace-display|edebug-trace-mode|edebug-uninstall-read-eval-functions|edebug-unload-function|edebug-unset-breakpoint|edebug-unwrap\\*|edebug-unwrap|edebug-update-eval-list|edebug-var-status|edebug-view-outside|edebug-visit-eval-list|edebug-where|edebug-window-list|edebug-window-live-p|edebug-wrap-def-body|ediff-3way-comparison-job|ediff-3way-job|ediff-abbrev-jobname|ediff-abbreviate-file-name|ediff-activate-mark|ediff-add-slash-if-directory|ediff-add-to-history|ediff-ancestor-metajob|ediff-append-custom-diff|ediff-arrange-autosave-in-merge-jobs|ediff-background-face|ediff-backup|ediff-barf-if-not-control-buffer|ediff-buffer-live-p|ediff-buffer-type|ediff-buffers-internal|ediff-buffers|ediff-buffers3|ediff-bury-dir-diffs-buffer|ediff-calc-command-time|ediff-change-saved-variable|ediff-char-to-buftype|ediff-check-version|ediff-choose-syntax-table|ediff-choose-window-setup-function-automatically|ediff-cleanup-mess|ediff-cleanup-meta-buffer|ediff-clear-diff-vector|ediff-clear-fine-diff-vector|ediff-clear-fine-differences-in-one-buffer|ediff-clear-fine-differences|ediff-clone-buffer-for-current-diff-comparison|ediff-clone-buffer-for-region-comparison|ediff-clone-buffer-for-window-comparison|ediff-collect-custom-diffs|ediff-collect-diffs-metajob|ediff-color-display-p|ediff-combine-diffs|ediff-comparison-metajob3|ediff-compute-custom-diffs-maybe|ediff-compute-toolbar-width|ediff-convert-diffs-to-overlays|ediff-convert-fine-diffs-to-overlays|ediff-convert-standard-filename|ediff-copy-A-to-B|ediff-copy-A-to-C|ediff-copy-B-to-A|ediff-copy-B-to-C|ediff-copy-C-to-A|ediff-copy-C-to-B|ediff-copy-diff|ediff-copy-list|ediff-copy-to-buffer|ediff-current-file|ediff-customize|ediff-deactivate-mark|ediff-debug-info|ediff-default-suspend-function|ediff-defvar-local|ediff-delete-all-matches|ediff-delete-overlay|ediff-delete-temp-files|ediff-destroy-control-frame|ediff-device-type|ediff-diff-at-point|ediff-diff-to-diff|ediff-diff3-job|ediff-dir-diff-copy-file|ediff-directories-command|ediff-directories-internal|ediff-directories|ediff-directories3-command|ediff-directories3|ediff-directory-revisions-internal|ediff-directory-revisions|ediff-display-pixel-height|ediff-display-pixel-width|ediff-dispose-of-meta-buffer|ediff-dispose-of-variant-according-to-user|ediff-do-merge|ediff-documentation|ediff-draw-dir-diffs|ediff-empty-diff-region-p|ediff-empty-overlay-p|ediff-event-buffer|ediff-event-key|ediff-event-point|ediff-exec-process|ediff-extract-diffs|ediff-extract-diffs3|ediff-file-attributes|ediff-file-checked-in-p|ediff-file-checked-out-p|ediff-file-compressed-p|ediff-file-modtime|ediff-file-remote-p|ediff-file-size|ediff-filegroup-action|ediff-filename-magic-p|ediff-files-command|ediff-files-internal|ediff-files|ediff-files3|ediff-fill-leading-zero|ediff-find-file|ediff-focus-on-regexp-matches|ediff-format-bindings-of|ediff-format-date|ediff-forward-word|ediff-frame-char-height|ediff-frame-char-width|ediff-frame-has-dedicated-windows|ediff-frame-iconified-p|ediff-frame-unsplittable-p|ediff-get-buffer|ediff-get-combined-region|ediff-get-default-directory-name|ediff-get-default-file-name|ediff-get-diff-overlay-from-diff-record|ediff-get-diff-overlay|ediff-get-diff-posn|ediff-get-diff3-group|ediff-get-difference|ediff-get-directory-files-under-revision|ediff-get-file-eqstatus|ediff-get-fine-diff-vector-from-diff-record|ediff-get-fine-diff-vector|ediff-get-group-buffer|ediff-get-group-comparison-func|ediff-get-group-merge-autostore-dir|ediff-get-group-objA|ediff-get-group-objB|ediff-get-group-objC|ediff-get-group-regexp|ediff-get-lines-to-region-end|ediff-get-lines-to-region-start|ediff-get-meta-info|ediff-get-meta-overlay-at-pos|ediff-get-next-window|ediff-get-region-contents|ediff-get-region-size-coefficient|ediff-get-selected-buffers|ediff-get-session-activity-marker|ediff-get-session-buffer|ediff-get-session-number-at-pos|ediff-get-session-objA-name|ediff-get-session-objA|ediff-get-session-objB-name|ediff-get-session-objB|ediff-get-session-objC-name|ediff-get-session-objC|ediff-get-session-status|ediff-get-state-of-ancestor|ediff-get-state-of-diff|ediff-get-state-of-merge|ediff-get-symbol-from-alist|ediff-get-value-according-to-buffer-type|ediff-get-visible-buffer-window|ediff-get-window-by-clicking|ediff-good-frame-under-mouse|ediff-goto-word|ediff-has-face-support-p|ediff-has-gutter-support-p|ediff-has-toolbar-support-p|ediff-help-for-quick-help|ediff-help-message-line-length|ediff-hide-face|ediff-hide-marked-sessions|ediff-hide-regexp-matches|ediff-highlight-diff-in-one-buffer|ediff-highlight-diff|ediff-in-control-buffer-p|ediff-indent-help-message|ediff-inferior-compare-regions|ediff-insert-dirs-in-meta-buffer|ediff-insert-session-activity-marker-in-meta-buffer|ediff-insert-session-info-in-meta-buffer|ediff-insert-session-status-in-meta-buffer|ediff-install-fine-diff-if-necessary|ediff-intersect-directories|ediff-intersection|ediff-janitor|ediff-jump-to-difference-at-point|ediff-jump-to-difference|ediff-keep-window-config|ediff-key-press-event-p|ediff-kill-bottom-toolbar|ediff-kill-buffer-carefully|ediff-last-command-char|ediff-listable-file|ediff-load-version-control|ediff-looks-like-combined-merge|ediff-make-base-title|ediff-make-bottom-toolbar|ediff-make-bullet-proof-overlay|ediff-make-cloned-buffer|ediff-make-current-diff-overlay|ediff-make-diff2-buffer|ediff-make-empty-tmp-file|ediff-make-fine-diffs|ediff-make-frame-position|ediff-make-indirect-buffer|ediff-make-narrow-control-buffer-id|ediff-make-new-meta-list-element|ediff-make-new-meta-list-header|ediff-make-or-kill-fine-diffs|ediff-make-overlay|ediff-make-temp-file|ediff-make-wide-control-buffer-id|ediff-make-wide-display|ediff-mark-diff-as-space-only|ediff-mark-for-hiding-at-pos|ediff-mark-for-operation-at-pos|ediff-mark-if-equal|ediff-mark-session-for-hiding|ediff-mark-session-for-operation|ediff-maybe-checkout|ediff-maybe-save-and-delete-merge|ediff-member|ediff-merge-buffers-with-ancestor|ediff-merge-buffers|ediff-merge-changed-from-default-p|ediff-merge-command|ediff-merge-directories-command|ediff-merge-directories-with-ancestor-command)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)ed(?:e-java-classpath|e-linux-load|e-load-cache|e-load-project-file|e-make-check-version|e-make-dist|e-make-project-local-variable|e-map-all-subprojects|e-map-any-target-p|e-map-buffers|e-map-project-buffers|e-map-subprojects|e-map-target-buffers|e-map-targets|e-menu-items-build|e-menu-obj-of-class-p|e-minor-mode|e-name|e-new-target-custom|e-new-target|e-new|e-normalize-file/directory|e-object-keybindings|e-object-menu|e-object-sourcecode|e-parent-project|e-preprocessor-map|e-project-autoload-child-p|e-project-autoload-dirmatch-child-p|e-project-autoload-dirmatch-list-p|e-project-autoload-dirmatch-p|e-project-autoload-dirmatch|e-project-autoload-list-p|e-project-autoload-p|e-project-autoload|e-project-buffers|e-project-child-p|e-project-configurations-set|e-project-directory-remove-hash|e-project-forms-menu|e-project-list-p|e-project-p|e-project-placeholder-child-p|e-project-placeholder-list-p|e-project-placeholder-p|e-project-placeholder|e-project-root-directory|e-project-root|e-project-sort-targets|e-project|e-remove-file|e-rescan-toplevel|e-reset-all-buffers|e-run-target|e-save-cache|e-set-project-local-variable|e-set-project-variables|e-set|e-singular-object|e-source-paths|e-sourcecode-child-p|e-sourcecode-list-p|e-sourcecode-p|e-sourcecode|e-speedbar-compile-file-project|e-speedbar-compile-line|e-speedbar-compile-project|e-speedbar-edit-projectfile|e-speedbar-file-setup|e-speedbar-get-top-project-for-line|e-speedbar-make-distribution|e-speedbar-make-map|e-speedbar-remove-file-from-target|e-speedbar-toplevel-buttons|e-speedbar|e-subproject-p|e-subproject-relative-path|e-system-include-path|e-tag-expand|e-tag-find|e-target-buffer-in-sourcelist|e-target-buffers|e-target-child-p|e-target-forms-menu|e-target-in-project-p|e-target-list-p|e-target-name|e-target-p|e-target-parent|e-target-sourcecode|e-target|e-toplevel-project-or-nil|e-toplevel-project|e-toplevel|e-turn-on-hook|e-up-directory|e-update-version|e-upload-distribution|e-upload-html-documentation|e-vc-project-directory|e-version|e-want-any-auxiliary-files-p|e-want-any-files-p|e-want-any-source-files-p|e-want-file-auxiliary-p|e-want-file-p|e-want-file-source-p|e-web-browse-home|e-with-projectfile|e|ebug-&optional-wrapper|ebug-&rest-wrapper|ebug--called-interactively-skip|ebug--display|ebug--enter-trace|ebug--form-data-begin--cmacro|ebug--form-data-begin|ebug--form-data-end--cmacro|ebug--form-data-end|ebug--form-data-name--cmacro|ebug--form-data-name|ebug--make-form-data-entry--cmacro|ebug--make-form-data-entry|ebug--read|ebug--recursive-edit|ebug--require-cl-read|ebug--update-coverage|ebug-Continue-fast-mode|ebug-Go-nonstop-mode|ebug-Trace-fast-mode|ebug-`|ebug-adjust-window|ebug-after-offset|ebug-after|ebug-all-defuns|ebug-backtrace|ebug-basic-spec|ebug-before-offset|ebug-before|ebug-bounce-point|ebug-changing-windows|ebug-clear-coverage|ebug-clear-form-data-entry|ebug-clear-frequency-count|ebug-compute-previous-result|ebug-continue-mode|ebug-copy-cursor|ebug-create-eval-buffer|ebug-current-windows|ebug-cursor-expressions|ebug-cursor-offsets|ebug-debugger|ebug-defining-form|ebug-delete-eval-item|ebug-empty-cursor|ebug-enter|ebug-eval-defun|ebug-eval-display-list|ebug-eval-display|ebug-eval-expression|ebug-eval-last-sexp|ebug-eval-mode|ebug-eval-print-last-sexp|ebug-eval-redisplay|ebug-eval-result-list|ebug-eval|ebug-fast-after|ebug-fast-before|ebug-find-stop-point|ebug-form-data-symbol|ebug-form|ebug-format|ebug-forms|ebug-forward-sexp|ebug-get-displayed-buffer-points|ebug-get-form-data-entry|ebug-go-mode|ebug-goto-here|ebug-help|ebug-ignore-offset|ebug-inc-offset|ebug-initialize-offsets|ebug-install-read-eval-functions|ebug-instrument-callee|ebug-instrument-function|ebug-interactive-p-name|ebug-kill-buffer|ebug-lambda-list-keywordp|ebug-last-sexp|ebug-list-form-args|ebug-list-form|ebug-make-after-form|ebug-make-before-and-after-form|ebug-make-enter-wrapper|ebug-make-form-wrapper|ebug-make-top-form-data-entry|ebug-mark-marker|ebug-mark|ebug-match-&define|ebug-match-&key|ebug-match-¬|ebug-match-&optional|ebug-match-&or|ebug-match-&rest|ebug-match-arg|ebug-match-body|ebug-match-colon-name|ebug-match-def-body|ebug-match-def-form|ebug-match-form|ebug-match-function|ebug-match-gate|ebug-match-lambda-expr|ebug-match-list|ebug-match-name|ebug-match-nil|ebug-match-one-spec|ebug-match-place|ebug-match-sexp|ebug-match-specs|ebug-match-string|ebug-match-sublist|ebug-match-symbol|ebug-match|ebug-menu|ebug-message|ebug-mode|ebug-modify-breakpoint|ebug-move-cursor|ebug-new-cursor|ebug-next-breakpoint|ebug-next-mode|ebug-next-token-class|ebug-no-match|ebug-on-entry|ebug-outside-excursion|ebug-overlay-arrow|ebug-pop-to-buffer|ebug-previous-result|ebug-prin1-to-string|ebug-prin1|ebug-print|ebug-read-and-maybe-wrap-form|ebug-read-and-maybe-wrap-form1|ebug-read-backquote|ebug-read-comma|ebug-read-function|ebug-read-list|ebug-read-quote|ebug-read-sexp|ebug-read-storing-offsets|ebug-read-string|ebug-read-symbol|ebug-read-top-level-form|ebug-read-vector|ebug-report-error|ebug-restore-status|ebug-run-fast|ebug-run-slow|ebug-safe-eval|ebug-safe-prin1-to-string|ebug-set-breakpoint|ebug-set-buffer-points|ebug-set-conditional-breakpoint|ebug-set-cursor|ebug-set-form-data-entry|ebug-set-mode|ebug-set-windows|ebug-sexps|ebug-signal|ebug-skip-whitespace|ebug-slow-after|ebug-slow-before|ebug-sort-alist|ebug-spec-p|ebug-step-in|ebug-step-mode|ebug-step-out|ebug-step-through-mode|ebug-stop|ebug-store-after-offset|ebug-store-before-offset|ebug-storing-offsets|ebug-syntax-error|ebug-toggle-save-all-windows|ebug-toggle-save-selected-window|ebug-toggle-save-windows|ebug-toggle|ebug-top-element-required|ebug-top-element|ebug-top-level-nonstop|ebug-top-offset|ebug-trace-display|ebug-trace-mode|ebug-uninstall-read-eval-functions|ebug-unload-function|ebug-unset-breakpoint|ebug-unwrap\\*|ebug-unwrap|ebug-update-eval-list|ebug-var-status|ebug-view-outside|ebug-visit-eval-list|ebug-where|ebug-window-list|ebug-window-live-p|ebug-wrap-def-body|iff-3way-comparison-job|iff-3way-job|iff-abbrev-jobname|iff-abbreviate-file-name|iff-activate-mark|iff-add-slash-if-directory|iff-add-to-history|iff-ancestor-metajob|iff-append-custom-diff|iff-arrange-autosave-in-merge-jobs|iff-background-face|iff-backup|iff-barf-if-not-control-buffer|iff-buffer-live-p|iff-buffer-type|iff-buffers-internal|iff-buffers|iff-buffers3|iff-bury-dir-diffs-buffer|iff-calc-command-time|iff-change-saved-variable|iff-char-to-buftype|iff-check-version|iff-choose-syntax-table|iff-choose-window-setup-function-automatically|iff-cleanup-mess|iff-cleanup-meta-buffer|iff-clear-diff-vector|iff-clear-fine-diff-vector|iff-clear-fine-differences-in-one-buffer|iff-clear-fine-differences|iff-clone-buffer-for-current-diff-comparison|iff-clone-buffer-for-region-comparison|iff-clone-buffer-for-window-comparison|iff-collect-custom-diffs|iff-collect-diffs-metajob|iff-color-display-p|iff-combine-diffs|iff-comparison-metajob3|iff-compute-custom-diffs-maybe|iff-compute-toolbar-width|iff-convert-diffs-to-overlays|iff-convert-fine-diffs-to-overlays|iff-convert-standard-filename|iff-copy-A-to-B|iff-copy-A-to-C|iff-copy-B-to-A|iff-copy-B-to-C|iff-copy-C-to-A|iff-copy-C-to-B|iff-copy-diff|iff-copy-list|iff-copy-to-buffer|iff-current-file|iff-customize|iff-deactivate-mark|iff-debug-info|iff-default-suspend-function|iff-defvar-local|iff-delete-all-matches|iff-delete-overlay|iff-delete-temp-files|iff-destroy-control-frame|iff-device-type|iff-diff-at-point|iff-diff-to-diff|iff-diff3-job|iff-dir-diff-copy-file|iff-directories-command|iff-directories-internal|iff-directories|iff-directories3-command|iff-directories3|iff-directory-revisions-internal|iff-directory-revisions|iff-display-pixel-height|iff-display-pixel-width|iff-dispose-of-meta-buffer|iff-dispose-of-variant-according-to-user|iff-do-merge|iff-documentation|iff-draw-dir-diffs|iff-empty-diff-region-p|iff-empty-overlay-p|iff-event-buffer|iff-event-key|iff-event-point|iff-exec-process|iff-extract-diffs|iff-extract-diffs3|iff-file-attributes|iff-file-checked-in-p|iff-file-checked-out-p|iff-file-compressed-p|iff-file-modtime|iff-file-remote-p|iff-file-size|iff-filegroup-action|iff-filename-magic-p|iff-files-command|iff-files-internal|iff-files|iff-files3|iff-fill-leading-zero|iff-find-file|iff-focus-on-regexp-matches|iff-format-bindings-of|iff-format-date|iff-forward-word|iff-frame-char-height|iff-frame-char-width|iff-frame-has-dedicated-windows|iff-frame-iconified-p|iff-frame-unsplittable-p|iff-get-buffer|iff-get-combined-region|iff-get-default-directory-name|iff-get-default-file-name|iff-get-diff-overlay-from-diff-record|iff-get-diff-overlay|iff-get-diff-posn|iff-get-diff3-group|iff-get-difference|iff-get-directory-files-under-revision|iff-get-file-eqstatus|iff-get-fine-diff-vector-from-diff-record|iff-get-fine-diff-vector|iff-get-group-buffer|iff-get-group-comparison-func|iff-get-group-merge-autostore-dir|iff-get-group-objA|iff-get-group-objB|iff-get-group-objC|iff-get-group-regexp|iff-get-lines-to-region-end|iff-get-lines-to-region-start|iff-get-meta-info|iff-get-meta-overlay-at-pos|iff-get-next-window|iff-get-region-contents|iff-get-region-size-coefficient|iff-get-selected-buffers|iff-get-session-activity-marker|iff-get-session-buffer|iff-get-session-number-at-pos|iff-get-session-objA-name|iff-get-session-objA|iff-get-session-objB-name|iff-get-session-objB|iff-get-session-objC-name|iff-get-session-objC|iff-get-session-status|iff-get-state-of-ancestor|iff-get-state-of-diff|iff-get-state-of-merge|iff-get-symbol-from-alist|iff-get-value-according-to-buffer-type|iff-get-visible-buffer-window|iff-get-window-by-clicking|iff-good-frame-under-mouse|iff-goto-word|iff-has-face-support-p|iff-has-gutter-support-p|iff-has-toolbar-support-p|iff-help-for-quick-help|iff-help-message-line-length|iff-hide-face|iff-hide-marked-sessions|iff-hide-regexp-matches|iff-highlight-diff-in-one-buffer|iff-highlight-diff|iff-in-control-buffer-p|iff-indent-help-message|iff-inferior-compare-regions|iff-insert-dirs-in-meta-buffer|iff-insert-session-activity-marker-in-meta-buffer|iff-insert-session-info-in-meta-buffer|iff-insert-session-status-in-meta-buffer|iff-install-fine-diff-if-necessary|iff-intersect-directories|iff-intersection|iff-janitor|iff-jump-to-difference-at-point|iff-jump-to-difference|iff-keep-window-config|iff-key-press-event-p|iff-kill-bottom-toolbar|iff-kill-buffer-carefully|iff-last-command-char|iff-listable-file|iff-load-version-control|iff-looks-like-combined-merge|iff-make-base-title|iff-make-bottom-toolbar|iff-make-bullet-proof-overlay|iff-make-cloned-buffer|iff-make-current-diff-overlay|iff-make-diff2-buffer|iff-make-empty-tmp-file|iff-make-fine-diffs|iff-make-frame-position|iff-make-indirect-buffer|iff-make-narrow-control-buffer-id|iff-make-new-meta-list-element|iff-make-new-meta-list-header|iff-make-or-kill-fine-diffs|iff-make-overlay|iff-make-temp-file|iff-make-wide-control-buffer-id|iff-make-wide-display|iff-mark-diff-as-space-only|iff-mark-for-hiding-at-pos|iff-mark-for-operation-at-pos|iff-mark-if-equal|iff-mark-session-for-hiding|iff-mark-session-for-operation|iff-maybe-checkout|iff-maybe-save-and-delete-merge|iff-member|iff-merge-buffers-with-ancestor|iff-merge-buffers|iff-merge-changed-from-default-p|iff-merge-command|iff-merge-directories-command|iff-merge-directories-with-ancestor-command)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:ediff-merge-directories-with-ancestor|ediff-merge-directories|ediff-merge-directory-revisions-with-ancestor|ediff-merge-directory-revisions|ediff-merge-files-with-ancestor|ediff-merge-files|ediff-merge-job|ediff-merge-metajob|ediff-merge-on-startup|ediff-merge-region-is-non-clash-to-skip|ediff-merge-region-is-non-clash|ediff-merge-revisions-with-ancestor|ediff-merge-revisions|ediff-merge-with-ancestor-command|ediff-merge-with-ancestor-job|ediff-merge-with-ancestor|ediff-merge|ediff-message-if-verbose|ediff-meta-insert-file-info1|ediff-meta-mark-equal-files|ediff-meta-mode|ediff-meta-session-p|ediff-meta-show-patch|ediff-metajob3|ediff-minibuffer-with-setup-hook|ediff-mode|ediff-mouse-event-p|ediff-move-overlay|ediff-multiframe-setup-p|ediff-narrow-control-frame-p|ediff-narrow-job|ediff-next-difference|ediff-next-meta-item|ediff-next-meta-item1|ediff-next-meta-overlay-start|ediff-no-fine-diffs-p|ediff-nonempty-string-p|ediff-nuke-selective-display|ediff-one-filegroup-metajob|ediff-operate-on-marked-sessions|ediff-operate-on-windows|ediff-other-buffer|ediff-overlay-buffer|ediff-overlay-end|ediff-overlay-get|ediff-overlay-put|ediff-overlay-start|ediff-overlayp|ediff-paint-background-regions-in-one-buffer|ediff-paint-background-regions|ediff-patch-buffer|ediff-patch-file-form-meta|ediff-patch-file-internal|ediff-patch-file|ediff-patch-job|ediff-patch-metajob|ediff-place-flags-in-buffer|ediff-place-flags-in-buffer1|ediff-pop-diff|ediff-position-region|ediff-prepare-error-list|ediff-prepare-meta-buffer|ediff-previous-difference|ediff-previous-meta-item|ediff-previous-meta-item1|ediff-previous-meta-overlay-start|ediff-print-diff-vector|ediff-problematic-session-p|ediff-process-filter|ediff-process-sentinel|ediff-profile|ediff-quit-meta-buffer|ediff-quit|ediff-re-merge|ediff-read-event|ediff-read-file-name|ediff-really-quit|ediff-recenter-ancestor|ediff-recenter-one-window|ediff-recenter|ediff-redraw-directory-group-buffer|ediff-redraw-registry-buffer|ediff-refresh-control-frame|ediff-refresh-mode-lines|ediff-region-help-echo|ediff-regions-internal|ediff-regions-linewise|ediff-regions-wordwise|ediff-registry-action|ediff-reload-keymap|ediff-remove-flags-from-buffer|ediff-replace-session-activity-marker-in-meta-buffer|ediff-replace-session-status-in-meta-buffer|ediff-reset-mouse|ediff-restore-diff-in-merge-buffer|ediff-restore-diff|ediff-restore-highlighting|ediff-restore-protected-variables|ediff-restore-variables|ediff-revert-buffers-then-recompute-diffs|ediff-revision-metajob|ediff-revision|ediff-safe-to-quit|ediff-same-contents|ediff-same-file-contents-lists|ediff-same-file-contents|ediff-save-buffer-in-file|ediff-save-buffer|ediff-save-diff-region|ediff-save-protected-variables|ediff-save-time|ediff-save-variables|ediff-scroll-horizontally|ediff-scroll-vertically|ediff-select-difference|ediff-select-lowest-window|ediff-set-actual-diff-options|ediff-set-diff-options|ediff-set-diff-overlays-in-one-buffer|ediff-set-difference|ediff-set-face-pixmap|ediff-set-file-eqstatus|ediff-set-fine-diff-properties-in-one-buffer|ediff-set-fine-diff-properties|ediff-set-fine-diff-vector|ediff-set-fine-overlays-for-combined-merge|ediff-set-fine-overlays-in-one-buffer|ediff-set-help-message|ediff-set-help-overlays|ediff-set-keys|ediff-set-merge-mode|ediff-set-meta-overlay|ediff-set-overlay-face|ediff-set-read-only-in-buf-A|ediff-set-session-status|ediff-set-state-of-all-diffs-in-all-buffers|ediff-set-state-of-diff-in-all-buffers|ediff-set-state-of-diff|ediff-set-state-of-merge|ediff-setup-control-buffer|ediff-setup-control-frame|ediff-setup-diff-regions|ediff-setup-diff-regions3|ediff-setup-fine-diff-regions|ediff-setup-keymap|ediff-setup-meta-map|ediff-setup-windows-default|ediff-setup-windows-multiframe-compare|ediff-setup-windows-multiframe-merge|ediff-setup-windows-multiframe|ediff-setup-windows-plain-compare|ediff-setup-windows-plain-merge|ediff-setup-windows-plain|ediff-setup-windows|ediff-setup|ediff-show-all-diffs|ediff-show-ancestor|ediff-show-current-session-meta-buffer|ediff-show-diff-output|ediff-show-dir-diffs|ediff-show-meta-buff-from-registry|ediff-show-meta-buffer|ediff-show-registry|ediff-shrink-window-C|ediff-skip-merge-region-if-changed-from-default-p|ediff-skip-unsuitable-frames|ediff-spy-after-mouse|ediff-status-info|ediff-strip-last-dir|ediff-strip-mode-line-format|ediff-submit-report|ediff-suspend|ediff-swap-buffers|ediff-test-save-region|ediff-toggle-autorefine|ediff-toggle-filename-truncation|ediff-toggle-help|ediff-toggle-hilit|ediff-toggle-ignore-case|ediff-toggle-multiframe|ediff-toggle-narrow-region|ediff-toggle-read-only|ediff-toggle-regexp-match|ediff-toggle-show-clashes-only|ediff-toggle-skip-changed-regions|ediff-toggle-skip-similar|ediff-toggle-split|ediff-toggle-use-toolbar|ediff-toggle-verbose-help-meta-buffer|ediff-toggle-wide-display|ediff-truncate-string-left|ediff-unhighlight-diff-in-one-buffer|ediff-unhighlight-diff|ediff-unhighlight-diffs-totally-in-one-buffer|ediff-unhighlight-diffs-totally|ediff-union|ediff-unique-buffer-name|ediff-unmark-all-for-hiding|ediff-unmark-all-for-operation|ediff-unselect-and-select-difference|ediff-unselect-difference|ediff-up-meta-hierarchy|ediff-update-diffs|ediff-update-markers-in-dir-meta-buffer|ediff-update-meta-buffer|ediff-update-registry|ediff-update-session-marker-in-dir-meta-buffer|ediff-use-toolbar-p|ediff-user-grabbed-mouse|ediff-valid-difference-p|ediff-verify-file-buffer|ediff-verify-file-merge-buffer|ediff-version|ediff-visible-region|ediff-whitespace-diff-region-p|ediff-window-display-p|ediff-window-ok-for-display|ediff-window-visible-p|ediff-windows-job|ediff-windows-linewise|ediff-windows-wordwise|ediff-windows|ediff-with-current-buffer|ediff-with-syntax-table|ediff-word-mode-job|ediff-wordify|ediff-write-merge-buffer-and-maybe-kill|ediff-xemacs-select-frame-hook|ediff|ediff3-files-command|ediff3|edir-merge-revisions-with-ancestor|edir-merge-revisions|edir-revisions|edirs-merge-with-ancestor|edirs-merge|edirs|edirs3|edit-abbrevs-mode|edit-abbrevs-redefine|edit-abbrevs|edit-bookmarks|edit-kbd-macro|edit-last-kbd-macro|edit-named-kbd-macro|edit-picture|edit-tab-stops-note-changes|edit-tab-stops|edmacro-finish-edit|edmacro-fix-menu-commands|edmacro-format-keys|edmacro-insert-key|edmacro-mode|edmacro-parse-keys|edmacro-sanitize-for-string|edt-advance|edt-append|edt-backup|edt-beginning-of-line|edt-bind-function-key-default|edt-bind-function-key|edt-bind-gold-key-default|edt-bind-gold-key|edt-bind-key-default|edt-bind-key|edt-bind-standard-key|edt-bottom-check|edt-bottom|edt-change-case|edt-change-direction|edt-character|edt-check-match|edt-check-prefix|edt-check-selection|edt-copy-rectangle|edt-copy|edt-current-line|edt-cut-or-copy|edt-cut-rectangle-insert-mode|edt-cut-rectangle-overstrike-mode|edt-cut-rectangle|edt-cut|edt-default-emulation-setup|edt-default-menu-bar-update-buffers|edt-define-key|edt-delete-character|edt-delete-entire-line|edt-delete-line|edt-delete-previous-character|edt-delete-to-beginning-of-line|edt-delete-to-beginning-of-word|edt-delete-to-end-of-line|edt-delete-word|edt-display-the-time|edt-duplicate-line|edt-duplicate-word|edt-electric-helpify|edt-electric-keypad-help|edt-electric-user-keypad-help|edt-eliminate-all-tabs|edt-emulation-off|edt-emulation-on|edt-end-of-line-backward|edt-end-of-line-forward|edt-end-of-line|edt-exit|edt-fill-region|edt-find-backward|edt-find-forward|edt-find-next-backward|edt-find-next-forward|edt-find-next|edt-find|edt-form-feed-insert|edt-goto-percentage|edt-indent-or-fill-region|edt-key-not-assigned|edt-keypad-help|edt-learn|edt-line-backward|edt-line-forward|edt-line-to-bottom-of-window|edt-line-to-middle-of-window|edt-line-to-top-of-window|edt-line|edt-load-keys|edt-lowercase|edt-mark-section-wisely|edt-match-beginning|edt-match-end|edt-next-line|edt-one-word-backward|edt-one-word-forward|edt-page-backward|edt-page-forward|edt-page|edt-paragraph-backward|edt-paragraph-forward|edt-paragraph|edt-paste-rectangle-insert-mode|edt-paste-rectangle-overstrike-mode|edt-paste-rectangle|edt-previous-line|edt-quit|edt-remember|edt-replace|edt-reset|edt-restore-key|edt-scroll-line|edt-scroll-window-backward-line|edt-scroll-window-backward|edt-scroll-window-forward-line|edt-scroll-window-forward|edt-scroll-window|edt-sect-backward|edt-sect-forward|edt-sect|edt-select-default-global-map|edt-select-mode|edt-select-user-global-map|edt-select|edt-sentence-backward|edt-sentence-forward|edt-sentence|edt-set-match|edt-set-screen-width-132|edt-set-screen-width-80|edt-set-scroll-margins|edt-setup-default-bindings|edt-show-match-markers|edt-split-window|edt-substitute|edt-switch-global-maps|edt-tab-insert|edt-toggle-capitalization-of-word|edt-toggle-select|edt-top-check|edt-top|edt-undelete-character|edt-undelete-line|edt-undelete-word|edt-unset-match|edt-uppercase|edt-user-emulation-setup|edt-user-menu-bar-update-buffers|edt-window-bottom|edt-window-top|edt-with-position|edt-word-backward|edt-word-forward|edt-word|edt-y-or-n-p|ehelp-command|eieio--check-type|eieio--class--unused-0|eieio--class-children|eieio--class-class-allocation-a|eieio--class-class-allocation-custom-group|eieio--class-class-allocation-custom-label|eieio--class-class-allocation-custom|eieio--class-class-allocation-doc|eieio--class-class-allocation-printer|eieio--class-class-allocation-protection|eieio--class-class-allocation-type|eieio--class-class-allocation-values|eieio--class-default-object-cache|eieio--class-initarg-tuples|eieio--class-options|eieio--class-parent|eieio--class-protection|eieio--class-public-a|eieio--class-public-custom-group|eieio--class-public-custom-label|eieio--class-public-custom|eieio--class-public-d|eieio--class-public-doc|eieio--class-public-printer|eieio--class-public-type|eieio--class-symbol-obarray|eieio--class-symbol|eieio--defalias|eieio--defgeneric-init-form|eieio--define-field-accessors|eieio--defmethod|eieio--object--unused-0|eieio--object-class|eieio--object-name|eieio--scoped-class|eieio--with-scoped-class|eieio-add-new-slot|eieio-attribute-to-initarg|eieio-barf-if-slot-unbound|eieio-browse|eieio-c3-candidate|eieio-c3-merge-lists|eieio-class-children-fast|eieio-class-children|eieio-class-name|eieio-class-parent|eieio-class-parents-fast|eieio-class-parents|eieio-class-precedence-bfs|eieio-class-precedence-c3|eieio-class-precedence-dfs|eieio-class-precedence-list|eieio-class-slot-name-index|eieio-class-un-autoload|eieio-copy-parents-into-subclass|eieio-custom-mode|eieio-custom-object-apply-reset|eieio-custom-toggle-hide|eieio-custom-toggle-parent|eieio-custom-widget-insert|eieio-customize-object-group|eieio-customize-object|eieio-default-eval-maybe|eieio-default-superclass-child-p|eieio-default-superclass-list-p|eieio-default-superclass-p|eieio-default-superclass|eieio-defclass-autoload|eieio-defclass|eieio-defgeneric-form-primary-only-one|eieio-defgeneric-form-primary-only|eieio-defgeneric-form|eieio-defgeneric-reset-generic-form-primary-only-one|eieio-defgeneric-reset-generic-form-primary-only|eieio-defgeneric-reset-generic-form|eieio-defgeneric|eieio-defmethod|eieio-done-customizing|eieio-edebug-prin1-to-string|eieio-eval-default-p|eieio-filter-slot-type|eieio-generic-call-primary-only|eieio-generic-call|eieio-generic-form|eieio-help-class|eieio-help-constructor|eieio-help-generic|eieio-initarg-to-attribute|eieio-instance-inheritor-child-p|eieio-instance-inheritor-list-p|eieio-instance-inheritor-p|eieio-instance-inheritor-slot-boundp|eieio-instance-inheritor|eieio-instance-tracker-child-p|eieio-instance-tracker-find|eieio-instance-tracker-list-p|eieio-instance-tracker-p|eieio-instance-tracker|eieio-list-prin1|eieio-named-child-p|eieio-named-list-p|eieio-named-p|eieio-named|eieio-object-abstract-to-value|eieio-object-class-name|eieio-object-class|eieio-object-match|eieio-object-name-string|eieio-object-name|eieio-object-p|eieio-object-set-name-string|eieio-object-value-create|eieio-object-value-get|eieio-object-value-to-abstract|eieio-oref-default|eieio-oref|eieio-oset-default|eieio-oset|eieio-override-prin1|eieio-perform-slot-validation-for-default|eieio-perform-slot-validation|eieio-persistent-child-p|eieio-persistent-convert-list-to-object|eieio-persistent-list-p|eieio-persistent-p|eieio-persistent-path-relative)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)e(?:diff-merge-directories-with-ancestor|diff-merge-directories|diff-merge-directory-revisions-with-ancestor|diff-merge-directory-revisions|diff-merge-files-with-ancestor|diff-merge-files|diff-merge-job|diff-merge-metajob|diff-merge-on-startup|diff-merge-region-is-non-clash-to-skip|diff-merge-region-is-non-clash|diff-merge-revisions-with-ancestor|diff-merge-revisions|diff-merge-with-ancestor-command|diff-merge-with-ancestor-job|diff-merge-with-ancestor|diff-merge|diff-message-if-verbose|diff-meta-insert-file-info1|diff-meta-mark-equal-files|diff-meta-mode|diff-meta-session-p|diff-meta-show-patch|diff-metajob3|diff-minibuffer-with-setup-hook|diff-mode|diff-mouse-event-p|diff-move-overlay|diff-multiframe-setup-p|diff-narrow-control-frame-p|diff-narrow-job|diff-next-difference|diff-next-meta-item|diff-next-meta-item1|diff-next-meta-overlay-start|diff-no-fine-diffs-p|diff-nonempty-string-p|diff-nuke-selective-display|diff-one-filegroup-metajob|diff-operate-on-marked-sessions|diff-operate-on-windows|diff-other-buffer|diff-overlay-buffer|diff-overlay-end|diff-overlay-get|diff-overlay-put|diff-overlay-start|diff-overlayp|diff-paint-background-regions-in-one-buffer|diff-paint-background-regions|diff-patch-buffer|diff-patch-file-form-meta|diff-patch-file-internal|diff-patch-file|diff-patch-job|diff-patch-metajob|diff-place-flags-in-buffer|diff-place-flags-in-buffer1|diff-pop-diff|diff-position-region|diff-prepare-error-list|diff-prepare-meta-buffer|diff-previous-difference|diff-previous-meta-item|diff-previous-meta-item1|diff-previous-meta-overlay-start|diff-print-diff-vector|diff-problematic-session-p|diff-process-filter|diff-process-sentinel|diff-profile|diff-quit-meta-buffer|diff-quit|diff-re-merge|diff-read-event|diff-read-file-name|diff-really-quit|diff-recenter-ancestor|diff-recenter-one-window|diff-recenter|diff-redraw-directory-group-buffer|diff-redraw-registry-buffer|diff-refresh-control-frame|diff-refresh-mode-lines|diff-region-help-echo|diff-regions-internal|diff-regions-linewise|diff-regions-wordwise|diff-registry-action|diff-reload-keymap|diff-remove-flags-from-buffer|diff-replace-session-activity-marker-in-meta-buffer|diff-replace-session-status-in-meta-buffer|diff-reset-mouse|diff-restore-diff-in-merge-buffer|diff-restore-diff|diff-restore-highlighting|diff-restore-protected-variables|diff-restore-variables|diff-revert-buffers-then-recompute-diffs|diff-revision-metajob|diff-revision|diff-safe-to-quit|diff-same-contents|diff-same-file-contents-lists|diff-same-file-contents|diff-save-buffer-in-file|diff-save-buffer|diff-save-diff-region|diff-save-protected-variables|diff-save-time|diff-save-variables|diff-scroll-horizontally|diff-scroll-vertically|diff-select-difference|diff-select-lowest-window|diff-set-actual-diff-options|diff-set-diff-options|diff-set-diff-overlays-in-one-buffer|diff-set-difference|diff-set-face-pixmap|diff-set-file-eqstatus|diff-set-fine-diff-properties-in-one-buffer|diff-set-fine-diff-properties|diff-set-fine-diff-vector|diff-set-fine-overlays-for-combined-merge|diff-set-fine-overlays-in-one-buffer|diff-set-help-message|diff-set-help-overlays|diff-set-keys|diff-set-merge-mode|diff-set-meta-overlay|diff-set-overlay-face|diff-set-read-only-in-buf-A|diff-set-session-status|diff-set-state-of-all-diffs-in-all-buffers|diff-set-state-of-diff-in-all-buffers|diff-set-state-of-diff|diff-set-state-of-merge|diff-setup-control-buffer|diff-setup-control-frame|diff-setup-diff-regions|diff-setup-diff-regions3|diff-setup-fine-diff-regions|diff-setup-keymap|diff-setup-meta-map|diff-setup-windows-default|diff-setup-windows-multiframe-compare|diff-setup-windows-multiframe-merge|diff-setup-windows-multiframe|diff-setup-windows-plain-compare|diff-setup-windows-plain-merge|diff-setup-windows-plain|diff-setup-windows|diff-setup|diff-show-all-diffs|diff-show-ancestor|diff-show-current-session-meta-buffer|diff-show-diff-output|diff-show-dir-diffs|diff-show-meta-buff-from-registry|diff-show-meta-buffer|diff-show-registry|diff-shrink-window-C|diff-skip-merge-region-if-changed-from-default-p|diff-skip-unsuitable-frames|diff-spy-after-mouse|diff-status-info|diff-strip-last-dir|diff-strip-mode-line-format|diff-submit-report|diff-suspend|diff-swap-buffers|diff-test-save-region|diff-toggle-autorefine|diff-toggle-filename-truncation|diff-toggle-help|diff-toggle-hilit|diff-toggle-ignore-case|diff-toggle-multiframe|diff-toggle-narrow-region|diff-toggle-read-only|diff-toggle-regexp-match|diff-toggle-show-clashes-only|diff-toggle-skip-changed-regions|diff-toggle-skip-similar|diff-toggle-split|diff-toggle-use-toolbar|diff-toggle-verbose-help-meta-buffer|diff-toggle-wide-display|diff-truncate-string-left|diff-unhighlight-diff-in-one-buffer|diff-unhighlight-diff|diff-unhighlight-diffs-totally-in-one-buffer|diff-unhighlight-diffs-totally|diff-union|diff-unique-buffer-name|diff-unmark-all-for-hiding|diff-unmark-all-for-operation|diff-unselect-and-select-difference|diff-unselect-difference|diff-up-meta-hierarchy|diff-update-diffs|diff-update-markers-in-dir-meta-buffer|diff-update-meta-buffer|diff-update-registry|diff-update-session-marker-in-dir-meta-buffer|diff-use-toolbar-p|diff-user-grabbed-mouse|diff-valid-difference-p|diff-verify-file-buffer|diff-verify-file-merge-buffer|diff-version|diff-visible-region|diff-whitespace-diff-region-p|diff-window-display-p|diff-window-ok-for-display|diff-window-visible-p|diff-windows-job|diff-windows-linewise|diff-windows-wordwise|diff-windows|diff-with-current-buffer|diff-with-syntax-table|diff-word-mode-job|diff-wordify|diff-write-merge-buffer-and-maybe-kill|diff-xemacs-select-frame-hook|diff|diff3-files-command|diff3|dir-merge-revisions-with-ancestor|dir-merge-revisions|dir-revisions|dirs-merge-with-ancestor|dirs-merge|dirs|dirs3|dit-abbrevs-mode|dit-abbrevs-redefine|dit-abbrevs|dit-bookmarks|dit-kbd-macro|dit-last-kbd-macro|dit-named-kbd-macro|dit-picture|dit-tab-stops-note-changes|dit-tab-stops|dmacro-finish-edit|dmacro-fix-menu-commands|dmacro-format-keys|dmacro-insert-key|dmacro-mode|dmacro-parse-keys|dmacro-sanitize-for-string|dt-advance|dt-append|dt-backup|dt-beginning-of-line|dt-bind-function-key-default|dt-bind-function-key|dt-bind-gold-key-default|dt-bind-gold-key|dt-bind-key-default|dt-bind-key|dt-bind-standard-key|dt-bottom-check|dt-bottom|dt-change-case|dt-change-direction|dt-character|dt-check-match|dt-check-prefix|dt-check-selection|dt-copy-rectangle|dt-copy|dt-current-line|dt-cut-or-copy|dt-cut-rectangle-insert-mode|dt-cut-rectangle-overstrike-mode|dt-cut-rectangle|dt-cut|dt-default-emulation-setup|dt-default-menu-bar-update-buffers|dt-define-key|dt-delete-character|dt-delete-entire-line|dt-delete-line|dt-delete-previous-character|dt-delete-to-beginning-of-line|dt-delete-to-beginning-of-word|dt-delete-to-end-of-line|dt-delete-word|dt-display-the-time|dt-duplicate-line|dt-duplicate-word|dt-electric-helpify|dt-electric-keypad-help|dt-electric-user-keypad-help|dt-eliminate-all-tabs|dt-emulation-off|dt-emulation-on|dt-end-of-line-backward|dt-end-of-line-forward|dt-end-of-line|dt-exit|dt-fill-region|dt-find-backward|dt-find-forward|dt-find-next-backward|dt-find-next-forward|dt-find-next|dt-find|dt-form-feed-insert|dt-goto-percentage|dt-indent-or-fill-region|dt-key-not-assigned|dt-keypad-help|dt-learn|dt-line-backward|dt-line-forward|dt-line-to-bottom-of-window|dt-line-to-middle-of-window|dt-line-to-top-of-window|dt-line|dt-load-keys|dt-lowercase|dt-mark-section-wisely|dt-match-beginning|dt-match-end|dt-next-line|dt-one-word-backward|dt-one-word-forward|dt-page-backward|dt-page-forward|dt-page|dt-paragraph-backward|dt-paragraph-forward|dt-paragraph|dt-paste-rectangle-insert-mode|dt-paste-rectangle-overstrike-mode|dt-paste-rectangle|dt-previous-line|dt-quit|dt-remember|dt-replace|dt-reset|dt-restore-key|dt-scroll-line|dt-scroll-window-backward-line|dt-scroll-window-backward|dt-scroll-window-forward-line|dt-scroll-window-forward|dt-scroll-window|dt-sect-backward|dt-sect-forward|dt-sect|dt-select-default-global-map|dt-select-mode|dt-select-user-global-map|dt-select|dt-sentence-backward|dt-sentence-forward|dt-sentence|dt-set-match|dt-set-screen-width-132|dt-set-screen-width-80|dt-set-scroll-margins|dt-setup-default-bindings|dt-show-match-markers|dt-split-window|dt-substitute|dt-switch-global-maps|dt-tab-insert|dt-toggle-capitalization-of-word|dt-toggle-select|dt-top-check|dt-top|dt-undelete-character|dt-undelete-line|dt-undelete-word|dt-unset-match|dt-uppercase|dt-user-emulation-setup|dt-user-menu-bar-update-buffers|dt-window-bottom|dt-window-top|dt-with-position|dt-word-backward|dt-word-forward|dt-word|dt-y-or-n-p|help-command|ieio--check-type|ieio--class--unused-0|ieio--class-children|ieio--class-class-allocation-a|ieio--class-class-allocation-custom-group|ieio--class-class-allocation-custom-label|ieio--class-class-allocation-custom|ieio--class-class-allocation-doc|ieio--class-class-allocation-printer|ieio--class-class-allocation-protection|ieio--class-class-allocation-type|ieio--class-class-allocation-values|ieio--class-default-object-cache|ieio--class-initarg-tuples|ieio--class-options|ieio--class-parent|ieio--class-protection|ieio--class-public-a|ieio--class-public-custom-group|ieio--class-public-custom-label|ieio--class-public-custom|ieio--class-public-d|ieio--class-public-doc|ieio--class-public-printer|ieio--class-public-type|ieio--class-symbol-obarray|ieio--class-symbol|ieio--defalias|ieio--defgeneric-init-form|ieio--define-field-accessors|ieio--defmethod|ieio--object--unused-0|ieio--object-class|ieio--object-name|ieio--scoped-class|ieio--with-scoped-class|ieio-add-new-slot|ieio-attribute-to-initarg|ieio-barf-if-slot-unbound|ieio-browse|ieio-c3-candidate|ieio-c3-merge-lists|ieio-class-children-fast|ieio-class-children|ieio-class-name|ieio-class-parent|ieio-class-parents-fast|ieio-class-parents|ieio-class-precedence-bfs|ieio-class-precedence-c3|ieio-class-precedence-dfs|ieio-class-precedence-list|ieio-class-slot-name-index|ieio-class-un-autoload|ieio-copy-parents-into-subclass|ieio-custom-mode|ieio-custom-object-apply-reset|ieio-custom-toggle-hide|ieio-custom-toggle-parent|ieio-custom-widget-insert|ieio-customize-object-group|ieio-customize-object|ieio-default-eval-maybe|ieio-default-superclass-child-p|ieio-default-superclass-list-p|ieio-default-superclass-p|ieio-default-superclass|ieio-defclass-autoload|ieio-defclass|ieio-defgeneric-form-primary-only-one|ieio-defgeneric-form-primary-only|ieio-defgeneric-form|ieio-defgeneric-reset-generic-form-primary-only-one|ieio-defgeneric-reset-generic-form-primary-only|ieio-defgeneric-reset-generic-form|ieio-defgeneric|ieio-defmethod|ieio-done-customizing|ieio-edebug-prin1-to-string|ieio-eval-default-p|ieio-filter-slot-type|ieio-generic-call-primary-only|ieio-generic-call|ieio-generic-form|ieio-help-class|ieio-help-constructor|ieio-help-generic|ieio-initarg-to-attribute|ieio-instance-inheritor-child-p|ieio-instance-inheritor-list-p|ieio-instance-inheritor-p|ieio-instance-inheritor-slot-boundp|ieio-instance-inheritor|ieio-instance-tracker-child-p|ieio-instance-tracker-find|ieio-instance-tracker-list-p|ieio-instance-tracker-p|ieio-instance-tracker|ieio-list-prin1|ieio-named-child-p|ieio-named-list-p|ieio-named-p|ieio-named|ieio-object-abstract-to-value|ieio-object-class-name|ieio-object-class|ieio-object-match|ieio-object-name-string|ieio-object-name|ieio-object-p|ieio-object-set-name-string|ieio-object-value-create|ieio-object-value-get|ieio-object-value-to-abstract|ieio-oref-default|ieio-oref|ieio-oset-default|ieio-oset|ieio-override-prin1|ieio-perform-slot-validation-for-default|ieio-perform-slot-validation|ieio-persistent-child-p|ieio-persistent-convert-list-to-object|ieio-persistent-list-p|ieio-persistent-p|ieio-persistent-path-relative)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:eieio-persistent-read|eieio-persistent-save-interactive|eieio-persistent-save|eieio-persistent-slot-type-is-class-p|eieio-persistent-validate\\/fix-slot-value|eieio-persistent|eieio-read-customization-group|eieio-set-defaults|eieio-singleton-child-p|eieio-singleton-list-p|eieio-singleton-p|eieio-singleton|eieio-slot-name-index|eieio-slot-originating-class-p|eieio-slot-value-create|eieio-slot-value-get|eieio-specialized-key-to-generic-key|eieio-speedbar-buttons|eieio-speedbar-child-description|eieio-speedbar-child-make-tag-lines|eieio-speedbar-child-p|eieio-speedbar-create-engine|eieio-speedbar-create|eieio-speedbar-customize-line|eieio-speedbar-derive-line-path|eieio-speedbar-description|eieio-speedbar-directory-button-child-p|eieio-speedbar-directory-button-list-p|eieio-speedbar-directory-button-p|eieio-speedbar-directory-button|eieio-speedbar-expand|eieio-speedbar-file-button-child-p|eieio-speedbar-file-button-list-p|eieio-speedbar-file-button-p|eieio-speedbar-file-button|eieio-speedbar-find-nearest-object|eieio-speedbar-handle-click|eieio-speedbar-item-info|eieio-speedbar-line-path|eieio-speedbar-list-p|eieio-speedbar-make-map|eieio-speedbar-make-tag-line|eieio-speedbar-object-buttonname|eieio-speedbar-object-children|eieio-speedbar-object-click|eieio-speedbar-object-expand|eieio-speedbar-p|eieio-speedbar|eieio-unbind-method-implementations|eieio-validate-class-slot-value|eieio-validate-slot-value|eieio-version|eieio-widget-test-class-child-p|eieio-widget-test-class-list-p|eieio-widget-test-class-p|eieio-widget-test-class|eieiomt-add|eieiomt-install|eieiomt-method-list|eieiomt-next|eieiomt-sym-optimize|eighth|eldoc--message-command-p|eldoc-add-command-completions|eldoc-add-command|eldoc-display-message-no-interference-p|eldoc-display-message-p|eldoc-edit-message-commands|eldoc-message|eldoc-minibuffer-message|eldoc-mode|eldoc-pre-command-refresh-echo-area|eldoc-print-current-symbol-info|eldoc-remove-command-completions|eldoc-remove-command|eldoc-schedule-timer|electric--after-char-pos|electric--sort-post-self-insertion-hook|electric-apropos|electric-buffer-list|electric-buffer-menu-looper|electric-buffer-menu-mode|electric-buffer-update-highlight|electric-command-apropos|electric-describe-bindings|electric-describe-function|electric-describe-key|electric-describe-mode|electric-describe-syntax|electric-describe-variable|electric-help-command-loop|electric-help-ctrl-x-prefix|electric-help-execute-extended|electric-help-exit|electric-help-help|electric-help-mode|electric-help-retain|electric-help-undefined|electric-helpify|electric-icon-brace|electric-indent-just-newline|electric-indent-local-mode|electric-indent-mode|electric-indent-post-self-insert-function|electric-layout-mode|electric-layout-post-self-insert-function|electric-newline-and-maybe-indent|electric-nroff-mode|electric-nroff-newline|electric-pair-mode|electric-pascal-colon|electric-pascal-equal|electric-pascal-hash|electric-pascal-semi-or-dot|electric-pascal-tab|electric-pascal-terminate-line|electric-perl-terminator|electric-verilog-backward-sexp|electric-verilog-colon|electric-verilog-forward-sexp|electric-verilog-semi-with-comment|electric-verilog-semi|electric-verilog-tab|electric-verilog-terminate-and-indent|electric-verilog-terminate-line|electric-verilog-tick|electric-view-lossage|el-get[-\\w]*|elide-head-show|elide-head|elint-add-required-env|elint-check-cond-form|elint-check-condition-case-form|elint-check-conditional-form|elint-check-defalias-form|elint-check-defcustom-form|elint-check-defun-form|elint-check-defvar-form|elint-check-function-form|elint-check-let-form|elint-check-macro-form|elint-check-quote-form|elint-check-setq-form|elint-clear-log|elint-current-buffer|elint-defun|elint-directory|elint-display-log|elint-env-add-env|elint-env-add-func|elint-env-add-global-var|elint-env-add-macro|elint-env-add-var|elint-env-find-func|elint-env-find-var|elint-env-macro-env|elint-env-macrop|elint-error|elint-file|elint-find-args-in-code|elint-find-autoloaded-variables|elint-find-builtin-args|elint-find-builtins|elint-find-next-top-form|elint-form|elint-forms|elint-get-args|elint-get-log-buffer|elint-get-top-forms|elint-init-env|elint-init-form|elint-initialize|elint-log-message|elint-log|elint-make-env|elint-make-top-form|elint-match-args|elint-output|elint-put-function-args|elint-scan-doc-file|elint-set-mode-line|elint-top-form-form|elint-top-form-pos|elint-top-form|elint-unbound-variable|elint-update-env|elint-warning|elisp--beginning-of-sexp|elisp--byte-code-comment|elisp--company-doc-buffer|elisp--company-doc-string|elisp--company-location|elisp--current-symbol|elisp--docstring-first-line|elisp--docstring-format-sym-doc|elisp--eval-defun-1|elisp--eval-defun|elisp--eval-last-sexp-print-value|elisp--eval-last-sexp|elisp--expect-function-p|elisp--fnsym-in-current-sexp|elisp--form-quoted-p|elisp--function-argstring|elisp--get-fnsym-args-string|elisp--get-var-docstring|elisp--highlight-function-argument|elisp--last-data-store|elisp--local-variables-1|elisp--local-variables|elisp--preceding-sexp|elisp--xref-find-apropos|elisp--xref-find-definitions|elisp--xref-identifier-completion-table|elisp--xref-identifier-file|elisp-byte-code-mode|elisp-byte-code-syntax-propertize|elisp-completion-at-point|elisp-eldoc-documentation-function|elisp-index-search|elisp-last-sexp-toggle-display|elisp-xref-find|elp--instrumented-p|elp--make-wrapper|elp-elapsed-time|elp-instrument-function|elp-instrument-list|elp-instrument-package|elp-output-insert-symname|elp-output-result|elp-pack-number|elp-profilable-p|elp-reset-all|elp-reset-function|elp-reset-list|elp-restore-all|elp-restore-function|elp-restore-list|elp-results-jump-to-definition|elp-results|elp-set-master|elp-sort-by-average-time|elp-sort-by-call-count|elp-sort-by-total-time|elp-unload-function|elp-unset-master|emacs-bzr-get-version|emacs-bzr-version-bzr|emacs-bzr-version-dirstate|emacs-index-search|emacs-lisp-byte-compile-and-load|emacs-lisp-byte-compile|emacs-lisp-macroexpand|emacs-lisp-mode|emacs-lock--can-auto-unlock|emacs-lock--exit-locked-buffer|emacs-lock--kill-buffer-query-functions|emacs-lock--kill-emacs-hook|emacs-lock--kill-emacs-query-functions|emacs-lock--set-mode|emacs-lock-live-process-p|emacs-lock-mode|emacs-lock-unload-function|emacs-repository-get-version|emacs-session-filename|emacs-session-save|emerge-abort|emerge-auto-advance|emerge-buffers-with-ancestor|emerge-buffers|emerge-combine-versions-edit|emerge-combine-versions-internal|emerge-combine-versions-register|emerge-combine-versions|emerge-command-exit|emerge-compare-buffers|emerge-convert-diffs-to-markers|emerge-copy-as-kill-A|emerge-copy-as-kill-B|emerge-copy-modes|emerge-count-matches-string|emerge-default-A|emerge-default-B|emerge-define-key-if-possible|emerge-defvar-local|emerge-edit-mode|emerge-execute-line|emerge-extract-diffs|emerge-extract-diffs3|emerge-fast-mode|emerge-file-names|emerge-files-command|emerge-files-exit|emerge-files-internal|emerge-files-remote|emerge-files-with-ancestor-command|emerge-files-with-ancestor-internal|emerge-files-with-ancestor-remote|emerge-files-with-ancestor|emerge-files|emerge-find-difference-A|emerge-find-difference-B|emerge-find-difference-merge|emerge-find-difference|emerge-find-difference1|emerge-force-define-key|emerge-get-diff3-group|emerge-goto-line|emerge-handle-local-variables|emerge-hash-string-into-string|emerge-insert-A|emerge-insert-B|emerge-join-differences|emerge-jump-to-difference|emerge-line-number-in-buf|emerge-line-numbers|emerge-make-auto-save-file-name|emerge-make-diff-list|emerge-make-diff3-list|emerge-make-temp-file|emerge-mark-difference|emerge-merge-directories|emerge-mode|emerge-new-flags|emerge-next-difference|emerge-one-line-window|emerge-operate-on-windows|emerge-place-flags-in-buffer|emerge-place-flags-in-buffer1|emerge-position-region|emerge-prepare-error-list|emerge-previous-difference|emerge-protect-metachars|emerge-query-and-call|emerge-query-save-buffer|emerge-query-write-file|emerge-quit|emerge-read-file-name|emerge-really-quit|emerge-recenter|emerge-refresh-mode-line|emerge-remember-buffer-characteristics|emerge-remote-exit|emerge-remove-flags-in-buffer|emerge-restore-buffer-characteristics|emerge-restore-variables|emerge-revision-with-ancestor-internal|emerge-revisions-internal|emerge-revisions-with-ancestor|emerge-revisions|emerge-save-variables|emerge-scroll-down|emerge-scroll-left|emerge-scroll-reset|emerge-scroll-right|emerge-scroll-up|emerge-select-A-edit|emerge-select-A|emerge-select-B-edit|emerge-select-B|emerge-select-difference|emerge-select-prefer-Bs|emerge-select-version|emerge-set-combine-template|emerge-set-combine-versions-template|emerge-set-keys|emerge-set-merge-mode|emerge-setup-fixed-keymaps|emerge-setup-windows|emerge-setup-with-ancestor|emerge-setup|emerge-show-file-name|emerge-skip-prefers|emerge-split-difference|emerge-trim-difference|emerge-unique-buffer-name|emerge-unselect-and-select-difference|emerge-unselect-difference|emerge-unslashify-name|emerge-validate-difference|emerge-verify-file-buffer|emerge-write-and-delete|en\\/disable-command|enable-flow-control-on|enable-flow-control|encode-big5-char|encode-coding-char|encode-composition-components|encode-composition-rule|encode-hex-string|encode-hz-buffer|encode-hz-region|encode-sjis-char|encode-time-value|encoded-string-description|end-kbd-macro|end-of-buffer-other-window|end-of-icon-defun|end-of-paragraph-text|end-of-sexp|end-of-thing|end-of-visible-line|end-of-visual-line|endp|enlarge-window-horizontally|enlarge-window|enriched-after-change-major-mode|enriched-before-change-major-mode|enriched-decode-background|enriched-decode-display-prop|enriched-decode-foreground|enriched-decode|enriched-encode-other-face|enriched-encode|enriched-face-ans|enriched-get-file-width|enriched-handle-display-prop|enriched-insert-indentation|enriched-make-annotation|enriched-map-property-regions|enriched-mode-map|enriched-mode|enriched-next-annotation|enriched-remove-header|epa--decode-coding-string|epa--derived-mode-p|epa--encode-coding-string|epa--find-coding-system-for-mime-charset|epa--insert-keys|epa--key-list-revert-buffer|epa--key-widget-action|epa--key-widget-button-face-get|epa--key-widget-help-echo|epa--key-widget-value-create|epa--list-keys|epa--marked-keys|epa--read-signature-type|epa--select-keys|epa--select-safe-coding-system|epa--show-key|epa-decrypt-armor-in-region|epa-decrypt-file|epa-decrypt-region|epa-delete-keys|epa-dired-do-decrypt|epa-dired-do-encrypt|epa-dired-do-sign|epa-dired-do-verify|epa-display-error|epa-display-info|epa-display-verify-result|epa-encrypt-file|epa-encrypt-region|epa-exit-buffer|epa-export-keys|epa-file--file-name-regexp-set|epa-file-disable|epa-file-enable|epa-file-find-file-hook|epa-file-handler|epa-file-name-regexp-update|epa-global-mail-mode|epa-import-armor-in-region|epa-import-keys-region|epa-import-keys|epa-info-mode|epa-insert-keys|epa-key-list-mode|epa-key-mode|epa-list-keys|epa-list-secret-keys|epa-mail-decrypt|epa-mail-encrypt|epa-mail-import-keys|epa-mail-mode|epa-mail-sign|epa-mail-verify|epa-mark-key|epa-passphrase-callback-function|epa-progress-callback-function|epa-read-file-name|epa-select-keys|epa-sign-file|epa-sign-region|epa-unmark-key|epa-verify-cleartext-in-region|epa-verify-file|epa-verify-region|epatch-buffer|epatch|epg--args-from-sig-notations|epg--check-error-for-decrypt|epg--clear-string|epg--decode-coding-string|epg--decode-hexstring|epg--decode-percent-escape|epg--decode-quotedstring|epg--encode-coding-string|epg--gv-nreverse|epg--import-keys-1|epg--list-keys-1|epg--make-sub-key-1|epg--make-temp-file|epg--process-filter|epg--prompt-GET_BOOL-untrusted_key\\.override|epg--prompt-GET_BOOL|epg--start|epg--status-\\*SIG|epg--status-BADARMOR|epg--status-BADSIG|epg--status-DECRYPTION_FAILED|epg--status-DECRYPTION_OKAY|epg--status-DELETE_PROBLEM|epg--status-ENC_TO|epg--status-ERRSIG|epg--status-EXPKEYSIG|epg--status-EXPSIG|epg--status-GET_BOOL|epg--status-GET_HIDDEN|epg--status-GET_LINE|epg--status-GOODSIG|epg--status-IMPORTED|epg--status-IMPORT_OK|epg--status-IMPORT_PROBLEM|epg--status-IMPORT_RES|epg--status-INV_RECP|epg--status-INV_SGNR|epg--status-KEYEXPIRED|epg--status-KEYREVOKED|epg--status-KEY_CREATED|epg--status-KEY_NOT_CREATED|epg--status-NEED_PASSPHRASE|epg--status-NEED_PASSPHRASE_PIN|epg--status-NEED_PASSPHRASE_SYM|epg--status-NODATA)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)e(?:ieio-persistent-read|ieio-persistent-save-interactive|ieio-persistent-save|ieio-persistent-slot-type-is-class-p|ieio-persistent-validate/fix-slot-value|ieio-persistent|ieio-read-customization-group|ieio-set-defaults|ieio-singleton-child-p|ieio-singleton-list-p|ieio-singleton-p|ieio-singleton|ieio-slot-name-index|ieio-slot-originating-class-p|ieio-slot-value-create|ieio-slot-value-get|ieio-specialized-key-to-generic-key|ieio-speedbar-buttons|ieio-speedbar-child-description|ieio-speedbar-child-make-tag-lines|ieio-speedbar-child-p|ieio-speedbar-create-engine|ieio-speedbar-create|ieio-speedbar-customize-line|ieio-speedbar-derive-line-path|ieio-speedbar-description|ieio-speedbar-directory-button-child-p|ieio-speedbar-directory-button-list-p|ieio-speedbar-directory-button-p|ieio-speedbar-directory-button|ieio-speedbar-expand|ieio-speedbar-file-button-child-p|ieio-speedbar-file-button-list-p|ieio-speedbar-file-button-p|ieio-speedbar-file-button|ieio-speedbar-find-nearest-object|ieio-speedbar-handle-click|ieio-speedbar-item-info|ieio-speedbar-line-path|ieio-speedbar-list-p|ieio-speedbar-make-map|ieio-speedbar-make-tag-line|ieio-speedbar-object-buttonname|ieio-speedbar-object-children|ieio-speedbar-object-click|ieio-speedbar-object-expand|ieio-speedbar-p|ieio-speedbar|ieio-unbind-method-implementations|ieio-validate-class-slot-value|ieio-validate-slot-value|ieio-version|ieio-widget-test-class-child-p|ieio-widget-test-class-list-p|ieio-widget-test-class-p|ieio-widget-test-class|ieiomt-add|ieiomt-install|ieiomt-method-list|ieiomt-next|ieiomt-sym-optimize|ighth|ldoc--message-command-p|ldoc-add-command-completions|ldoc-add-command|ldoc-display-message-no-interference-p|ldoc-display-message-p|ldoc-edit-message-commands|ldoc-message|ldoc-minibuffer-message|ldoc-mode|ldoc-pre-command-refresh-echo-area|ldoc-print-current-symbol-info|ldoc-remove-command-completions|ldoc-remove-command|ldoc-schedule-timer|lectric--after-char-pos|lectric--sort-post-self-insertion-hook|lectric-apropos|lectric-buffer-list|lectric-buffer-menu-looper|lectric-buffer-menu-mode|lectric-buffer-update-highlight|lectric-command-apropos|lectric-describe-bindings|lectric-describe-function|lectric-describe-key|lectric-describe-mode|lectric-describe-syntax|lectric-describe-variable|lectric-help-command-loop|lectric-help-ctrl-x-prefix|lectric-help-execute-extended|lectric-help-exit|lectric-help-help|lectric-help-mode|lectric-help-retain|lectric-help-undefined|lectric-helpify|lectric-icon-brace|lectric-indent-just-newline|lectric-indent-local-mode|lectric-indent-mode|lectric-indent-post-self-insert-function|lectric-layout-mode|lectric-layout-post-self-insert-function|lectric-newline-and-maybe-indent|lectric-nroff-mode|lectric-nroff-newline|lectric-pair-mode|lectric-pascal-colon|lectric-pascal-equal|lectric-pascal-hash|lectric-pascal-semi-or-dot|lectric-pascal-tab|lectric-pascal-terminate-line|lectric-perl-terminator|lectric-verilog-backward-sexp|lectric-verilog-colon|lectric-verilog-forward-sexp|lectric-verilog-semi-with-comment|lectric-verilog-semi|lectric-verilog-tab|lectric-verilog-terminate-and-indent|lectric-verilog-terminate-line|lectric-verilog-tick|lectric-view-lossage|l-get[-\\w]*|lide-head-show|lide-head|lint-add-required-env|lint-check-cond-form|lint-check-condition-case-form|lint-check-conditional-form|lint-check-defalias-form|lint-check-defcustom-form|lint-check-defun-form|lint-check-defvar-form|lint-check-function-form|lint-check-let-form|lint-check-macro-form|lint-check-quote-form|lint-check-setq-form|lint-clear-log|lint-current-buffer|lint-defun|lint-directory|lint-display-log|lint-env-add-env|lint-env-add-func|lint-env-add-global-var|lint-env-add-macro|lint-env-add-var|lint-env-find-func|lint-env-find-var|lint-env-macro-env|lint-env-macrop|lint-error|lint-file|lint-find-args-in-code|lint-find-autoloaded-variables|lint-find-builtin-args|lint-find-builtins|lint-find-next-top-form|lint-form|lint-forms|lint-get-args|lint-get-log-buffer|lint-get-top-forms|lint-init-env|lint-init-form|lint-initialize|lint-log-message|lint-log|lint-make-env|lint-make-top-form|lint-match-args|lint-output|lint-put-function-args|lint-scan-doc-file|lint-set-mode-line|lint-top-form-form|lint-top-form-pos|lint-top-form|lint-unbound-variable|lint-update-env|lint-warning|lisp--beginning-of-sexp|lisp--byte-code-comment|lisp--company-doc-buffer|lisp--company-doc-string|lisp--company-location|lisp--current-symbol|lisp--docstring-first-line|lisp--docstring-format-sym-doc|lisp--eval-defun-1|lisp--eval-defun|lisp--eval-last-sexp-print-value|lisp--eval-last-sexp|lisp--expect-function-p|lisp--fnsym-in-current-sexp|lisp--form-quoted-p|lisp--function-argstring|lisp--get-fnsym-args-string|lisp--get-var-docstring|lisp--highlight-function-argument|lisp--last-data-store|lisp--local-variables-1|lisp--local-variables|lisp--preceding-sexp|lisp--xref-find-apropos|lisp--xref-find-definitions|lisp--xref-identifier-completion-table|lisp--xref-identifier-file|lisp-byte-code-mode|lisp-byte-code-syntax-propertize|lisp-completion-at-point|lisp-eldoc-documentation-function|lisp-index-search|lisp-last-sexp-toggle-display|lisp-xref-find|lp--instrumented-p|lp--make-wrapper|lp-elapsed-time|lp-instrument-function|lp-instrument-list|lp-instrument-package|lp-output-insert-symname|lp-output-result|lp-pack-number|lp-profilable-p|lp-reset-all|lp-reset-function|lp-reset-list|lp-restore-all|lp-restore-function|lp-restore-list|lp-results-jump-to-definition|lp-results|lp-set-master|lp-sort-by-average-time|lp-sort-by-call-count|lp-sort-by-total-time|lp-unload-function|lp-unset-master|macs-bzr-get-version|macs-bzr-version-bzr|macs-bzr-version-dirstate|macs-index-search|macs-lisp-byte-compile-and-load|macs-lisp-byte-compile|macs-lisp-macroexpand|macs-lisp-mode|macs-lock--can-auto-unlock|macs-lock--exit-locked-buffer|macs-lock--kill-buffer-query-functions|macs-lock--kill-emacs-hook|macs-lock--kill-emacs-query-functions|macs-lock--set-mode|macs-lock-live-process-p|macs-lock-mode|macs-lock-unload-function|macs-repository-get-version|macs-session-filename|macs-session-save|merge-abort|merge-auto-advance|merge-buffers-with-ancestor|merge-buffers|merge-combine-versions-edit|merge-combine-versions-internal|merge-combine-versions-register|merge-combine-versions|merge-command-exit|merge-compare-buffers|merge-convert-diffs-to-markers|merge-copy-as-kill-A|merge-copy-as-kill-B|merge-copy-modes|merge-count-matches-string|merge-default-A|merge-default-B|merge-define-key-if-possible|merge-defvar-local|merge-edit-mode|merge-execute-line|merge-extract-diffs|merge-extract-diffs3|merge-fast-mode|merge-file-names|merge-files-command|merge-files-exit|merge-files-internal|merge-files-remote|merge-files-with-ancestor-command|merge-files-with-ancestor-internal|merge-files-with-ancestor-remote|merge-files-with-ancestor|merge-files|merge-find-difference-A|merge-find-difference-B|merge-find-difference-merge|merge-find-difference|merge-find-difference1|merge-force-define-key|merge-get-diff3-group|merge-goto-line|merge-handle-local-variables|merge-hash-string-into-string|merge-insert-A|merge-insert-B|merge-join-differences|merge-jump-to-difference|merge-line-number-in-buf|merge-line-numbers|merge-make-auto-save-file-name|merge-make-diff-list|merge-make-diff3-list|merge-make-temp-file|merge-mark-difference|merge-merge-directories|merge-mode|merge-new-flags|merge-next-difference|merge-one-line-window|merge-operate-on-windows|merge-place-flags-in-buffer|merge-place-flags-in-buffer1|merge-position-region|merge-prepare-error-list|merge-previous-difference|merge-protect-metachars|merge-query-and-call|merge-query-save-buffer|merge-query-write-file|merge-quit|merge-read-file-name|merge-really-quit|merge-recenter|merge-refresh-mode-line|merge-remember-buffer-characteristics|merge-remote-exit|merge-remove-flags-in-buffer|merge-restore-buffer-characteristics|merge-restore-variables|merge-revision-with-ancestor-internal|merge-revisions-internal|merge-revisions-with-ancestor|merge-revisions|merge-save-variables|merge-scroll-down|merge-scroll-left|merge-scroll-reset|merge-scroll-right|merge-scroll-up|merge-select-A-edit|merge-select-A|merge-select-B-edit|merge-select-B|merge-select-difference|merge-select-prefer-Bs|merge-select-version|merge-set-combine-template|merge-set-combine-versions-template|merge-set-keys|merge-set-merge-mode|merge-setup-fixed-keymaps|merge-setup-windows|merge-setup-with-ancestor|merge-setup|merge-show-file-name|merge-skip-prefers|merge-split-difference|merge-trim-difference|merge-unique-buffer-name|merge-unselect-and-select-difference|merge-unselect-difference|merge-unslashify-name|merge-validate-difference|merge-verify-file-buffer|merge-write-and-delete|n/disable-command|nable-flow-control-on|nable-flow-control|ncode-big5-char|ncode-coding-char|ncode-composition-components|ncode-composition-rule|ncode-hex-string|ncode-hz-buffer|ncode-hz-region|ncode-sjis-char|ncode-time-value|ncoded-string-description|nd-kbd-macro|nd-of-buffer-other-window|nd-of-icon-defun|nd-of-paragraph-text|nd-of-sexp|nd-of-thing|nd-of-visible-line|nd-of-visual-line|ndp|nlarge-window-horizontally|nlarge-window|nriched-after-change-major-mode|nriched-before-change-major-mode|nriched-decode-background|nriched-decode-display-prop|nriched-decode-foreground|nriched-decode|nriched-encode-other-face|nriched-encode|nriched-face-ans|nriched-get-file-width|nriched-handle-display-prop|nriched-insert-indentation|nriched-make-annotation|nriched-map-property-regions|nriched-mode-map|nriched-mode|nriched-next-annotation|nriched-remove-header|pa--decode-coding-string|pa--derived-mode-p|pa--encode-coding-string|pa--find-coding-system-for-mime-charset|pa--insert-keys|pa--key-list-revert-buffer|pa--key-widget-action|pa--key-widget-button-face-get|pa--key-widget-help-echo|pa--key-widget-value-create|pa--list-keys|pa--marked-keys|pa--read-signature-type|pa--select-keys|pa--select-safe-coding-system|pa--show-key|pa-decrypt-armor-in-region|pa-decrypt-file|pa-decrypt-region|pa-delete-keys|pa-dired-do-decrypt|pa-dired-do-encrypt|pa-dired-do-sign|pa-dired-do-verify|pa-display-error|pa-display-info|pa-display-verify-result|pa-encrypt-file|pa-encrypt-region|pa-exit-buffer|pa-export-keys|pa-file--file-name-regexp-set|pa-file-disable|pa-file-enable|pa-file-find-file-hook|pa-file-handler|pa-file-name-regexp-update|pa-global-mail-mode|pa-import-armor-in-region|pa-import-keys-region|pa-import-keys|pa-info-mode|pa-insert-keys|pa-key-list-mode|pa-key-mode|pa-list-keys|pa-list-secret-keys|pa-mail-decrypt|pa-mail-encrypt|pa-mail-import-keys|pa-mail-mode|pa-mail-sign|pa-mail-verify|pa-mark-key|pa-passphrase-callback-function|pa-progress-callback-function|pa-read-file-name|pa-select-keys|pa-sign-file|pa-sign-region|pa-unmark-key|pa-verify-cleartext-in-region|pa-verify-file|pa-verify-region|patch-buffer|patch|pg--args-from-sig-notations|pg--check-error-for-decrypt|pg--clear-string|pg--decode-coding-string|pg--decode-hexstring|pg--decode-percent-escape|pg--decode-quotedstring|pg--encode-coding-string|pg--gv-nreverse|pg--import-keys-1|pg--list-keys-1|pg--make-sub-key-1|pg--make-temp-file|pg--process-filter|pg--prompt-GET_BOOL-untrusted_key\\.override|pg--prompt-GET_BOOL|pg--start|pg--status-\\*SIG|pg--status-BADARMOR|pg--status-BADSIG|pg--status-DECRYPTION_FAILED|pg--status-DECRYPTION_OKAY|pg--status-DELETE_PROBLEM|pg--status-ENC_TO|pg--status-ERRSIG|pg--status-EXPKEYSIG|pg--status-EXPSIG|pg--status-GET_BOOL|pg--status-GET_HIDDEN|pg--status-GET_LINE|pg--status-GOODSIG|pg--status-IMPORTED|pg--status-IMPORT_OK|pg--status-IMPORT_PROBLEM|pg--status-IMPORT_RES|pg--status-INV_RECP|pg--status-INV_SGNR|pg--status-KEYEXPIRED|pg--status-KEYREVOKED|pg--status-KEY_CREATED|pg--status-KEY_NOT_CREATED|pg--status-NEED_PASSPHRASE|pg--status-NEED_PASSPHRASE_PIN|pg--status-NEED_PASSPHRASE_SYM|pg--status-NODATA)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:epg--status-NOTATION_DATA|epg--status-NOTATION_NAME|epg--status-NO_PUBKEY|epg--status-NO_RECP|epg--status-NO_SECKEY|epg--status-NO_SGNR|epg--status-POLICY_URL|epg--status-PROGRESS|epg--status-REVKEYSIG|epg--status-SIG_CREATED|epg--status-TRUST_FULLY|epg--status-TRUST_MARGINAL|epg--status-TRUST_NEVER|epg--status-TRUST_ULTIMATE|epg--status-TRUST_UNDEFINED|epg--status-UNEXPECTED|epg--status-USERID_HINT|epg--status-VALIDSIG|epg--time-from-seconds|epg-cancel|epg-check-configuration|epg-config--compare-version|epg-config--parse-version|epg-configuration|epg-context--make|epg-context-armor--cmacro|epg-context-armor|epg-context-cipher-algorithm--cmacro|epg-context-cipher-algorithm|epg-context-compress-algorithm--cmacro|epg-context-compress-algorithm|epg-context-digest-algorithm--cmacro|epg-context-digest-algorithm|epg-context-edit-callback--cmacro|epg-context-edit-callback|epg-context-error-output--cmacro|epg-context-error-output|epg-context-home-directory--cmacro|epg-context-home-directory|epg-context-include-certs--cmacro|epg-context-include-certs|epg-context-operation--cmacro|epg-context-operation|epg-context-output-file--cmacro|epg-context-output-file|epg-context-passphrase-callback--cmacro|epg-context-passphrase-callback|epg-context-pinentry-mode--cmacro|epg-context-pinentry-mode|epg-context-process--cmacro|epg-context-process|epg-context-program--cmacro|epg-context-program|epg-context-progress-callback--cmacro|epg-context-progress-callback|epg-context-protocol--cmacro|epg-context-protocol|epg-context-result--cmacro|epg-context-result-for|epg-context-result|epg-context-set-armor|epg-context-set-passphrase-callback|epg-context-set-progress-callback|epg-context-set-result-for|epg-context-set-signers|epg-context-set-textmode|epg-context-sig-notations--cmacro|epg-context-sig-notations|epg-context-signers--cmacro|epg-context-signers|epg-context-textmode--cmacro|epg-context-textmode|epg-data-file--cmacro|epg-data-file|epg-data-string--cmacro|epg-data-string|epg-decode-dn|epg-decrypt-file|epg-decrypt-string|epg-delete-keys|epg-delete-output-file|epg-dn-from-string|epg-edit-key|epg-encrypt-file|epg-encrypt-string|epg-error-to-string|epg-errors-to-string|epg-expand-group|epg-export-keys-to-file|epg-export-keys-to-string|epg-generate-key-from-file|epg-generate-key-from-string|epg-import-keys-from-file|epg-import-keys-from-server|epg-import-keys-from-string|epg-import-result-considered--cmacro|epg-import-result-considered|epg-import-result-imported--cmacro|epg-import-result-imported-rsa--cmacro|epg-import-result-imported-rsa|epg-import-result-imported|epg-import-result-imports--cmacro|epg-import-result-imports|epg-import-result-new-revocations--cmacro|epg-import-result-new-revocations|epg-import-result-new-signatures--cmacro|epg-import-result-new-signatures|epg-import-result-new-sub-keys--cmacro|epg-import-result-new-sub-keys|epg-import-result-new-user-ids--cmacro|epg-import-result-new-user-ids|epg-import-result-no-user-id--cmacro|epg-import-result-no-user-id|epg-import-result-not-imported--cmacro|epg-import-result-not-imported|epg-import-result-secret-imported--cmacro|epg-import-result-secret-imported|epg-import-result-secret-read--cmacro|epg-import-result-secret-read|epg-import-result-secret-unchanged--cmacro|epg-import-result-secret-unchanged|epg-import-result-to-string|epg-import-result-unchanged--cmacro|epg-import-result-unchanged|epg-import-status-fingerprint--cmacro|epg-import-status-fingerprint|epg-import-status-new--cmacro|epg-import-status-new|epg-import-status-reason--cmacro|epg-import-status-reason|epg-import-status-secret--cmacro|epg-import-status-secret|epg-import-status-signature--cmacro|epg-import-status-signature|epg-import-status-sub-key--cmacro|epg-import-status-sub-key|epg-import-status-user-id--cmacro|epg-import-status-user-id|epg-key-owner-trust--cmacro|epg-key-owner-trust|epg-key-signature-class--cmacro|epg-key-signature-class|epg-key-signature-creation-time--cmacro|epg-key-signature-creation-time|epg-key-signature-expiration-time--cmacro|epg-key-signature-expiration-time|epg-key-signature-exportable-p--cmacro|epg-key-signature-exportable-p|epg-key-signature-key-id--cmacro|epg-key-signature-key-id|epg-key-signature-pubkey-algorithm--cmacro|epg-key-signature-pubkey-algorithm|epg-key-signature-user-id--cmacro|epg-key-signature-user-id|epg-key-signature-validity--cmacro|epg-key-signature-validity|epg-key-sub-key-list--cmacro|epg-key-sub-key-list|epg-key-user-id-list--cmacro|epg-key-user-id-list|epg-list-keys|epg-make-context|epg-make-data-from-file--cmacro|epg-make-data-from-file|epg-make-data-from-string--cmacro|epg-make-data-from-string|epg-make-import-result--cmacro|epg-make-import-result|epg-make-import-status--cmacro|epg-make-import-status|epg-make-key--cmacro|epg-make-key-signature--cmacro|epg-make-key-signature|epg-make-key|epg-make-new-signature--cmacro|epg-make-new-signature|epg-make-sig-notation--cmacro|epg-make-sig-notation|epg-make-signature--cmacro|epg-make-signature|epg-make-sub-key--cmacro|epg-make-sub-key|epg-make-user-id--cmacro|epg-make-user-id|epg-new-signature-class--cmacro|epg-new-signature-class|epg-new-signature-creation-time--cmacro|epg-new-signature-creation-time|epg-new-signature-digest-algorithm--cmacro|epg-new-signature-digest-algorithm|epg-new-signature-fingerprint--cmacro|epg-new-signature-fingerprint|epg-new-signature-pubkey-algorithm--cmacro|epg-new-signature-pubkey-algorithm|epg-new-signature-to-string|epg-new-signature-type--cmacro|epg-new-signature-type|epg-passphrase-callback-function|epg-read-output|epg-receive-keys|epg-reset|epg-sig-notation-critical--cmacro|epg-sig-notation-critical|epg-sig-notation-human-readable--cmacro|epg-sig-notation-human-readable|epg-sig-notation-name--cmacro|epg-sig-notation-name|epg-sig-notation-value--cmacro|epg-sig-notation-value|epg-sign-file|epg-sign-keys|epg-sign-string|epg-signature-class--cmacro|epg-signature-class|epg-signature-creation-time--cmacro|epg-signature-creation-time|epg-signature-digest-algorithm--cmacro|epg-signature-digest-algorithm|epg-signature-expiration-time--cmacro|epg-signature-expiration-time|epg-signature-fingerprint--cmacro|epg-signature-fingerprint|epg-signature-key-id--cmacro|epg-signature-key-id|epg-signature-notations--cmacro|epg-signature-notations|epg-signature-pubkey-algorithm--cmacro|epg-signature-pubkey-algorithm|epg-signature-status--cmacro|epg-signature-status|epg-signature-to-string|epg-signature-validity--cmacro|epg-signature-validity|epg-signature-version--cmacro|epg-signature-version|epg-start-decrypt|epg-start-delete-keys|epg-start-edit-key|epg-start-encrypt|epg-start-export-keys|epg-start-generate-key|epg-start-import-keys|epg-start-receive-keys|epg-start-sign-keys|epg-start-sign|epg-start-verify|epg-sub-key-algorithm--cmacro|epg-sub-key-algorithm|epg-sub-key-capability--cmacro|epg-sub-key-capability|epg-sub-key-creation-time--cmacro|epg-sub-key-creation-time|epg-sub-key-expiration-time--cmacro|epg-sub-key-expiration-time|epg-sub-key-fingerprint--cmacro|epg-sub-key-fingerprint|epg-sub-key-id--cmacro|epg-sub-key-id|epg-sub-key-length--cmacro|epg-sub-key-length|epg-sub-key-secret-p--cmacro|epg-sub-key-secret-p|epg-sub-key-validity--cmacro|epg-sub-key-validity|epg-user-id-signature-list--cmacro|epg-user-id-signature-list|epg-user-id-string--cmacro|epg-user-id-string|epg-user-id-validity--cmacro|epg-user-id-validity|epg-verify-file|epg-verify-result-to-string|epg-verify-string|epg-wait-for-completion|epg-wait-for-status|equalp|erc-active-buffer|erc-add-dangerous-host|erc-add-default-channel|erc-add-entry-to-list|erc-add-fool|erc-add-keyword|erc-add-pal|erc-add-query|erc-add-scroll-to-bottom|erc-add-server-user|erc-add-timestamp|erc-add-to-input-ring|erc-all-buffer-names|erc-already-logged-in|erc-arrange-session-in-multiple-windows|erc-auto-query|erc-autoaway-mode|erc-autojoin-add|erc-autojoin-after-ident|erc-autojoin-channels-delayed|erc-autojoin-channels|erc-autojoin-disable|erc-autojoin-enable|erc-autojoin-mode|erc-autojoin-remove|erc-away-time|erc-banlist-finished|erc-banlist-store|erc-banlist-update|erc-beep-on-match|erc-beg-of-input-line|erc-bol|erc-browse-emacswiki-lisp|erc-browse-emacswiki|erc-buffer-filter|erc-buffer-list-with-nick|erc-buffer-list|erc-buffer-visible|erc-button-add-button|erc-button-add-buttons-1|erc-button-add-buttons|erc-button-add-face|erc-button-add-nickname-buttons|erc-button-beats-to-time|erc-button-click-button|erc-button-describe-symbol|erc-button-disable|erc-button-enable|erc-button-mode|erc-button-next-function|erc-button-next|erc-button-press-button|erc-button-previous|erc-button-remove-old-buttons|erc-button-setup|erc-call-hooks|erc-cancel-timer|erc-canonicalize-server-name|erc-capab-identify-mode|erc-change-user-nickname|erc-channel-begin-receiving-names|erc-channel-end-receiving-names|erc-channel-list|erc-channel-names|erc-channel-p|erc-channel-receive-names|erc-channel-user-admin--cmacro|erc-channel-user-admin-p|erc-channel-user-admin|erc-channel-user-halfop--cmacro|erc-channel-user-halfop-p|erc-channel-user-halfop|erc-channel-user-last-message-time--cmacro|erc-channel-user-last-message-time|erc-channel-user-op--cmacro|erc-channel-user-op-p|erc-channel-user-op|erc-channel-user-owner--cmacro|erc-channel-user-owner-p|erc-channel-user-owner|erc-channel-user-p--cmacro|erc-channel-user-p|erc-channel-user-voice--cmacro|erc-channel-user-voice-p|erc-channel-user-voice|erc-clear-input-ring|erc-client-info|erc-cmd-AMSG|erc-cmd-APPENDTOPIC|erc-cmd-AT|erc-cmd-AWAY|erc-cmd-BANLIST|erc-cmd-BL|erc-cmd-BYE|erc-cmd-CHANNEL|erc-cmd-CLEAR|erc-cmd-CLEARTOPIC|erc-cmd-COUNTRY|erc-cmd-CTCP|erc-cmd-DATE|erc-cmd-DCC|erc-cmd-DEOP|erc-cmd-DESCRIBE|erc-cmd-EXIT|erc-cmd-GAWAY|erc-cmd-GQ|erc-cmd-GQUIT|erc-cmd-H|erc-cmd-HELP|erc-cmd-IDLE|erc-cmd-IGNORE|erc-cmd-J|erc-cmd-JOIN|erc-cmd-KICK|erc-cmd-LASTLOG|erc-cmd-LEAVE|erc-cmd-LIST|erc-cmd-LOAD|erc-cmd-M|erc-cmd-MASSUNBAN|erc-cmd-ME'S|erc-cmd-ME|erc-cmd-MODE|erc-cmd-MSG|erc-cmd-MUB|erc-cmd-N|erc-cmd-NAMES|erc-cmd-NICK|erc-cmd-NOTICE|erc-cmd-NOTIFY|erc-cmd-OP|erc-cmd-OPS|erc-cmd-PART|erc-cmd-PING|erc-cmd-Q|erc-cmd-QUERY|erc-cmd-QUIT|erc-cmd-QUOTE|erc-cmd-RECONNECT|erc-cmd-SAY|erc-cmd-SERVER|erc-cmd-SET|erc-cmd-SIGNOFF|erc-cmd-SM|erc-cmd-SQUERY|erc-cmd-SV|erc-cmd-T|erc-cmd-TIME|erc-cmd-TOPIC|erc-cmd-UNIGNORE|erc-cmd-VAR|erc-cmd-VARIABLE|erc-cmd-WHOAMI|erc-cmd-WHOIS|erc-cmd-WHOLEFT|erc-cmd-WI|erc-cmd-WL|erc-cmd-default|erc-cmd-ezb|erc-coding-system-for-target|erc-command-indicator|erc-command-name|erc-command-no-process-p|erc-command-symbol|erc-complete-word-at-point|erc-complete-word|erc-completion-mode|erc-compute-full-name|erc-compute-nick|erc-compute-port|erc-compute-server|erc-connection-established|erc-controls-highlight|erc-controls-interpret|erc-controls-propertize|erc-controls-strip|erc-create-imenu-index|erc-ctcp-query-ACTION|erc-ctcp-query-CLIENTINFO|erc-ctcp-query-DCC|erc-ctcp-query-ECHO|erc-ctcp-query-FINGER|erc-ctcp-query-PING|erc-ctcp-query-TIME|erc-ctcp-query-USERINFO|erc-ctcp-query-VERSION|erc-ctcp-reply-CLIENTINFO|erc-ctcp-reply-ECHO|erc-ctcp-reply-FINGER|erc-ctcp-reply-PING|erc-ctcp-reply-TIME|erc-ctcp-reply-VERSION|erc-current-network|erc-current-nick-p|erc-current-nick|erc-current-time|erc-dcc-mode|erc-debug-missing-hooks|erc-decode-coding-string|erc-decode-parsed-server-response|erc-decode-string-from-target|erc-default-server-handler|erc-default-target|erc-define-catalog-entry|erc-define-catalog|erc-define-minor-mode|erc-delete-dangerous-host|erc-delete-default-channel|erc-delete-dups|erc-delete-fool|erc-delete-if|erc-delete-keyword|erc-delete-pal|erc-delete-query|erc-determine-network|erc-determine-parameters|erc-directory-writable-p|erc-display-command|erc-display-error-notice|erc-display-line-1|erc-display-line|erc-display-message-highlight|erc-display-message|erc-display-msg|erc-display-prompt|erc-display-server-message|erc-downcase|erc-echo-notice-in-active-buffer|erc-echo-notice-in-active-non-server-buffer|erc-echo-notice-in-default-buffer|erc-echo-notice-in-first-user-buffer|erc-echo-notice-in-minibuffer|erc-echo-notice-in-server-buffer|erc-echo-notice-in-target-buffer|erc-echo-notice-in-user-and-target-buffers|erc-echo-notice-in-user-buffers|erc-echo-timestamp|erc-emacs-time-to-erc-time|erc-encode-coding-string|erc-end-of-input-line|erc-ensure-channel-name|erc-error|erc-extract-command-from-line|erc-extract-nick|erc-ezb-add-session|erc-ezb-end-of-session-list|erc-ezb-get-login|erc-ezb-identify)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)e(?:pg--status-NOTATION_DATA|pg--status-NOTATION_NAME|pg--status-NO_PUBKEY|pg--status-NO_RECP|pg--status-NO_SECKEY|pg--status-NO_SGNR|pg--status-POLICY_URL|pg--status-PROGRESS|pg--status-REVKEYSIG|pg--status-SIG_CREATED|pg--status-TRUST_FULLY|pg--status-TRUST_MARGINAL|pg--status-TRUST_NEVER|pg--status-TRUST_ULTIMATE|pg--status-TRUST_UNDEFINED|pg--status-UNEXPECTED|pg--status-USERID_HINT|pg--status-VALIDSIG|pg--time-from-seconds|pg-cancel|pg-check-configuration|pg-config--compare-version|pg-config--parse-version|pg-configuration|pg-context--make|pg-context-armor--cmacro|pg-context-armor|pg-context-cipher-algorithm--cmacro|pg-context-cipher-algorithm|pg-context-compress-algorithm--cmacro|pg-context-compress-algorithm|pg-context-digest-algorithm--cmacro|pg-context-digest-algorithm|pg-context-edit-callback--cmacro|pg-context-edit-callback|pg-context-error-output--cmacro|pg-context-error-output|pg-context-home-directory--cmacro|pg-context-home-directory|pg-context-include-certs--cmacro|pg-context-include-certs|pg-context-operation--cmacro|pg-context-operation|pg-context-output-file--cmacro|pg-context-output-file|pg-context-passphrase-callback--cmacro|pg-context-passphrase-callback|pg-context-pinentry-mode--cmacro|pg-context-pinentry-mode|pg-context-process--cmacro|pg-context-process|pg-context-program--cmacro|pg-context-program|pg-context-progress-callback--cmacro|pg-context-progress-callback|pg-context-protocol--cmacro|pg-context-protocol|pg-context-result--cmacro|pg-context-result-for|pg-context-result|pg-context-set-armor|pg-context-set-passphrase-callback|pg-context-set-progress-callback|pg-context-set-result-for|pg-context-set-signers|pg-context-set-textmode|pg-context-sig-notations--cmacro|pg-context-sig-notations|pg-context-signers--cmacro|pg-context-signers|pg-context-textmode--cmacro|pg-context-textmode|pg-data-file--cmacro|pg-data-file|pg-data-string--cmacro|pg-data-string|pg-decode-dn|pg-decrypt-file|pg-decrypt-string|pg-delete-keys|pg-delete-output-file|pg-dn-from-string|pg-edit-key|pg-encrypt-file|pg-encrypt-string|pg-error-to-string|pg-errors-to-string|pg-expand-group|pg-export-keys-to-file|pg-export-keys-to-string|pg-generate-key-from-file|pg-generate-key-from-string|pg-import-keys-from-file|pg-import-keys-from-server|pg-import-keys-from-string|pg-import-result-considered--cmacro|pg-import-result-considered|pg-import-result-imported--cmacro|pg-import-result-imported-rsa--cmacro|pg-import-result-imported-rsa|pg-import-result-imported|pg-import-result-imports--cmacro|pg-import-result-imports|pg-import-result-new-revocations--cmacro|pg-import-result-new-revocations|pg-import-result-new-signatures--cmacro|pg-import-result-new-signatures|pg-import-result-new-sub-keys--cmacro|pg-import-result-new-sub-keys|pg-import-result-new-user-ids--cmacro|pg-import-result-new-user-ids|pg-import-result-no-user-id--cmacro|pg-import-result-no-user-id|pg-import-result-not-imported--cmacro|pg-import-result-not-imported|pg-import-result-secret-imported--cmacro|pg-import-result-secret-imported|pg-import-result-secret-read--cmacro|pg-import-result-secret-read|pg-import-result-secret-unchanged--cmacro|pg-import-result-secret-unchanged|pg-import-result-to-string|pg-import-result-unchanged--cmacro|pg-import-result-unchanged|pg-import-status-fingerprint--cmacro|pg-import-status-fingerprint|pg-import-status-new--cmacro|pg-import-status-new|pg-import-status-reason--cmacro|pg-import-status-reason|pg-import-status-secret--cmacro|pg-import-status-secret|pg-import-status-signature--cmacro|pg-import-status-signature|pg-import-status-sub-key--cmacro|pg-import-status-sub-key|pg-import-status-user-id--cmacro|pg-import-status-user-id|pg-key-owner-trust--cmacro|pg-key-owner-trust|pg-key-signature-class--cmacro|pg-key-signature-class|pg-key-signature-creation-time--cmacro|pg-key-signature-creation-time|pg-key-signature-expiration-time--cmacro|pg-key-signature-expiration-time|pg-key-signature-exportable-p--cmacro|pg-key-signature-exportable-p|pg-key-signature-key-id--cmacro|pg-key-signature-key-id|pg-key-signature-pubkey-algorithm--cmacro|pg-key-signature-pubkey-algorithm|pg-key-signature-user-id--cmacro|pg-key-signature-user-id|pg-key-signature-validity--cmacro|pg-key-signature-validity|pg-key-sub-key-list--cmacro|pg-key-sub-key-list|pg-key-user-id-list--cmacro|pg-key-user-id-list|pg-list-keys|pg-make-context|pg-make-data-from-file--cmacro|pg-make-data-from-file|pg-make-data-from-string--cmacro|pg-make-data-from-string|pg-make-import-result--cmacro|pg-make-import-result|pg-make-import-status--cmacro|pg-make-import-status|pg-make-key--cmacro|pg-make-key-signature--cmacro|pg-make-key-signature|pg-make-key|pg-make-new-signature--cmacro|pg-make-new-signature|pg-make-sig-notation--cmacro|pg-make-sig-notation|pg-make-signature--cmacro|pg-make-signature|pg-make-sub-key--cmacro|pg-make-sub-key|pg-make-user-id--cmacro|pg-make-user-id|pg-new-signature-class--cmacro|pg-new-signature-class|pg-new-signature-creation-time--cmacro|pg-new-signature-creation-time|pg-new-signature-digest-algorithm--cmacro|pg-new-signature-digest-algorithm|pg-new-signature-fingerprint--cmacro|pg-new-signature-fingerprint|pg-new-signature-pubkey-algorithm--cmacro|pg-new-signature-pubkey-algorithm|pg-new-signature-to-string|pg-new-signature-type--cmacro|pg-new-signature-type|pg-passphrase-callback-function|pg-read-output|pg-receive-keys|pg-reset|pg-sig-notation-critical--cmacro|pg-sig-notation-critical|pg-sig-notation-human-readable--cmacro|pg-sig-notation-human-readable|pg-sig-notation-name--cmacro|pg-sig-notation-name|pg-sig-notation-value--cmacro|pg-sig-notation-value|pg-sign-file|pg-sign-keys|pg-sign-string|pg-signature-class--cmacro|pg-signature-class|pg-signature-creation-time--cmacro|pg-signature-creation-time|pg-signature-digest-algorithm--cmacro|pg-signature-digest-algorithm|pg-signature-expiration-time--cmacro|pg-signature-expiration-time|pg-signature-fingerprint--cmacro|pg-signature-fingerprint|pg-signature-key-id--cmacro|pg-signature-key-id|pg-signature-notations--cmacro|pg-signature-notations|pg-signature-pubkey-algorithm--cmacro|pg-signature-pubkey-algorithm|pg-signature-status--cmacro|pg-signature-status|pg-signature-to-string|pg-signature-validity--cmacro|pg-signature-validity|pg-signature-version--cmacro|pg-signature-version|pg-start-decrypt|pg-start-delete-keys|pg-start-edit-key|pg-start-encrypt|pg-start-export-keys|pg-start-generate-key|pg-start-import-keys|pg-start-receive-keys|pg-start-sign-keys|pg-start-sign|pg-start-verify|pg-sub-key-algorithm--cmacro|pg-sub-key-algorithm|pg-sub-key-capability--cmacro|pg-sub-key-capability|pg-sub-key-creation-time--cmacro|pg-sub-key-creation-time|pg-sub-key-expiration-time--cmacro|pg-sub-key-expiration-time|pg-sub-key-fingerprint--cmacro|pg-sub-key-fingerprint|pg-sub-key-id--cmacro|pg-sub-key-id|pg-sub-key-length--cmacro|pg-sub-key-length|pg-sub-key-secret-p--cmacro|pg-sub-key-secret-p|pg-sub-key-validity--cmacro|pg-sub-key-validity|pg-user-id-signature-list--cmacro|pg-user-id-signature-list|pg-user-id-string--cmacro|pg-user-id-string|pg-user-id-validity--cmacro|pg-user-id-validity|pg-verify-file|pg-verify-result-to-string|pg-verify-string|pg-wait-for-completion|pg-wait-for-status|qualp|rc-active-buffer|rc-add-dangerous-host|rc-add-default-channel|rc-add-entry-to-list|rc-add-fool|rc-add-keyword|rc-add-pal|rc-add-query|rc-add-scroll-to-bottom|rc-add-server-user|rc-add-timestamp|rc-add-to-input-ring|rc-all-buffer-names|rc-already-logged-in|rc-arrange-session-in-multiple-windows|rc-auto-query|rc-autoaway-mode|rc-autojoin-add|rc-autojoin-after-ident|rc-autojoin-channels-delayed|rc-autojoin-channels|rc-autojoin-disable|rc-autojoin-enable|rc-autojoin-mode|rc-autojoin-remove|rc-away-time|rc-banlist-finished|rc-banlist-store|rc-banlist-update|rc-beep-on-match|rc-beg-of-input-line|rc-bol|rc-browse-emacswiki-lisp|rc-browse-emacswiki|rc-buffer-filter|rc-buffer-list-with-nick|rc-buffer-list|rc-buffer-visible|rc-button-add-button|rc-button-add-buttons-1|rc-button-add-buttons|rc-button-add-face|rc-button-add-nickname-buttons|rc-button-beats-to-time|rc-button-click-button|rc-button-describe-symbol|rc-button-disable|rc-button-enable|rc-button-mode|rc-button-next-function|rc-button-next|rc-button-press-button|rc-button-previous|rc-button-remove-old-buttons|rc-button-setup|rc-call-hooks|rc-cancel-timer|rc-canonicalize-server-name|rc-capab-identify-mode|rc-change-user-nickname|rc-channel-begin-receiving-names|rc-channel-end-receiving-names|rc-channel-list|rc-channel-names|rc-channel-p|rc-channel-receive-names|rc-channel-user-admin--cmacro|rc-channel-user-admin-p|rc-channel-user-admin|rc-channel-user-halfop--cmacro|rc-channel-user-halfop-p|rc-channel-user-halfop|rc-channel-user-last-message-time--cmacro|rc-channel-user-last-message-time|rc-channel-user-op--cmacro|rc-channel-user-op-p|rc-channel-user-op|rc-channel-user-owner--cmacro|rc-channel-user-owner-p|rc-channel-user-owner|rc-channel-user-p--cmacro|rc-channel-user-p|rc-channel-user-voice--cmacro|rc-channel-user-voice-p|rc-channel-user-voice|rc-clear-input-ring|rc-client-info|rc-cmd-AMSG|rc-cmd-APPENDTOPIC|rc-cmd-AT|rc-cmd-AWAY|rc-cmd-BANLIST|rc-cmd-BL|rc-cmd-BYE|rc-cmd-CHANNEL|rc-cmd-CLEAR|rc-cmd-CLEARTOPIC|rc-cmd-COUNTRY|rc-cmd-CTCP|rc-cmd-DATE|rc-cmd-DCC|rc-cmd-DEOP|rc-cmd-DESCRIBE|rc-cmd-EXIT|rc-cmd-GAWAY|rc-cmd-GQ|rc-cmd-GQUIT|rc-cmd-H|rc-cmd-HELP|rc-cmd-IDLE|rc-cmd-IGNORE|rc-cmd-J|rc-cmd-JOIN|rc-cmd-KICK|rc-cmd-LASTLOG|rc-cmd-LEAVE|rc-cmd-LIST|rc-cmd-LOAD|rc-cmd-M|rc-cmd-MASSUNBAN|rc-cmd-ME'S|rc-cmd-ME|rc-cmd-MODE|rc-cmd-MSG|rc-cmd-MUB|rc-cmd-N|rc-cmd-NAMES|rc-cmd-NICK|rc-cmd-NOTICE|rc-cmd-NOTIFY|rc-cmd-OP|rc-cmd-OPS|rc-cmd-PART|rc-cmd-PING|rc-cmd-Q|rc-cmd-QUERY|rc-cmd-QUIT|rc-cmd-QUOTE|rc-cmd-RECONNECT|rc-cmd-SAY|rc-cmd-SERVER|rc-cmd-SET|rc-cmd-SIGNOFF|rc-cmd-SM|rc-cmd-SQUERY|rc-cmd-SV|rc-cmd-T|rc-cmd-TIME|rc-cmd-TOPIC|rc-cmd-UNIGNORE|rc-cmd-VAR|rc-cmd-VARIABLE|rc-cmd-WHOAMI|rc-cmd-WHOIS|rc-cmd-WHOLEFT|rc-cmd-WI|rc-cmd-WL|rc-cmd-default|rc-cmd-ezb|rc-coding-system-for-target|rc-command-indicator|rc-command-name|rc-command-no-process-p|rc-command-symbol|rc-complete-word-at-point|rc-complete-word|rc-completion-mode|rc-compute-full-name|rc-compute-nick|rc-compute-port|rc-compute-server|rc-connection-established|rc-controls-highlight|rc-controls-interpret|rc-controls-propertize|rc-controls-strip|rc-create-imenu-index|rc-ctcp-query-ACTION|rc-ctcp-query-CLIENTINFO|rc-ctcp-query-DCC|rc-ctcp-query-ECHO|rc-ctcp-query-FINGER|rc-ctcp-query-PING|rc-ctcp-query-TIME|rc-ctcp-query-USERINFO|rc-ctcp-query-VERSION|rc-ctcp-reply-CLIENTINFO|rc-ctcp-reply-ECHO|rc-ctcp-reply-FINGER|rc-ctcp-reply-PING|rc-ctcp-reply-TIME|rc-ctcp-reply-VERSION|rc-current-network|rc-current-nick-p|rc-current-nick|rc-current-time|rc-dcc-mode|rc-debug-missing-hooks|rc-decode-coding-string|rc-decode-parsed-server-response|rc-decode-string-from-target|rc-default-server-handler|rc-default-target|rc-define-catalog-entry|rc-define-catalog|rc-define-minor-mode|rc-delete-dangerous-host|rc-delete-default-channel|rc-delete-dups|rc-delete-fool|rc-delete-if|rc-delete-keyword|rc-delete-pal|rc-delete-query|rc-determine-network|rc-determine-parameters|rc-directory-writable-p|rc-display-command|rc-display-error-notice|rc-display-line-1|rc-display-line|rc-display-message-highlight|rc-display-message|rc-display-msg|rc-display-prompt|rc-display-server-message|rc-downcase|rc-echo-notice-in-active-buffer|rc-echo-notice-in-active-non-server-buffer|rc-echo-notice-in-default-buffer|rc-echo-notice-in-first-user-buffer|rc-echo-notice-in-minibuffer|rc-echo-notice-in-server-buffer|rc-echo-notice-in-target-buffer|rc-echo-notice-in-user-and-target-buffers|rc-echo-notice-in-user-buffers|rc-echo-timestamp|rc-emacs-time-to-erc-time|rc-encode-coding-string|rc-end-of-input-line|rc-ensure-channel-name|rc-error|rc-extract-command-from-line|rc-extract-nick|rc-ezb-add-session|rc-ezb-end-of-session-list|rc-ezb-get-login|rc-ezb-identify)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:erc-ezb-init-session-list|erc-ezb-initialize|erc-ezb-lookup-action|erc-ezb-notice-autodetect|erc-ezb-select-session|erc-ezb-select|erc-faces-in|erc-fill-disable|erc-fill-enable|erc-fill-mode|erc-fill-regarding-timestamp|erc-fill-static|erc-fill-variable|erc-fill|erc-find-file|erc-find-parsed-property|erc-find-script-file|erc-format-@nick|erc-format-away-status|erc-format-channel-modes|erc-format-lag-time|erc-format-message|erc-format-my-nick|erc-format-network|erc-format-nick|erc-format-privmessage|erc-format-target-and\\/or-network|erc-format-target-and\\/or-server|erc-format-target|erc-format-timestamp|erc-function-arglist|erc-generate-new-buffer-name|erc-get-arglist|erc-get-bg-color-face|erc-get-buffer-create|erc-get-buffer|erc-get-channel-mode-from-keypress|erc-get-channel-nickname-alist|erc-get-channel-nickname-list|erc-get-channel-user-list|erc-get-channel-user|erc-get-fg-color-face|erc-get-hook|erc-get-parsed-vector-nick|erc-get-parsed-vector-type|erc-get-parsed-vector|erc-get-server-nickname-alist|erc-get-server-nickname-list|erc-get-server-user|erc-get-user-mode-prefix|erc-get|erc-go-to-log-matches-buffer|erc-grab-region|erc-group-list|erc-handle-irc-url|erc-handle-login|erc-handle-parsed-server-response|erc-handle-unknown-server-response|erc-handle-user-status-change|erc-hide-current-message-p|erc-hide-fools|erc-hide-timestamps|erc-highlight-error|erc-highlight-notice|erc-identd-mode|erc-identd-start|erc-identd-stop|erc-ignored-reply-p|erc-ignored-user-p|erc-imenu-setup|erc-initialize-log-marker|erc-input-action|erc-input-message|erc-input-ring-setup|erc-insert-aligned|erc-insert-mode-command|erc-insert-timestamp-left-and-right|erc-insert-timestamp-left|erc-insert-timestamp-right|erc-invite-only-mode|erc-irccontrols-disable|erc-irccontrols-enable|erc-irccontrols-mode|erc-is-message-ctcp-and-not-action-p|erc-is-message-ctcp-p|erc-is-valid-nick-p|erc-ison-p|erc-iswitchb|erc-join-channel|erc-keep-place-disable|erc-keep-place-enable|erc-keep-place-mode|erc-keep-place|erc-kill-buffer-function|erc-kill-channel|erc-kill-input|erc-kill-query-buffers|erc-kill-server|erc-list-button|erc-list-disable|erc-list-enable|erc-list-handle-322|erc-list-insert-item|erc-list-install-322-handler|erc-list-join|erc-list-kill|erc-list-make-string|erc-list-match|erc-list-menu-mode|erc-list-menu-sort-by-column|erc-list-mode|erc-list-revert|erc-list|erc-load-irc-script-lines|erc-load-irc-script|erc-load-script|erc-log-aux|erc-log-irc-protocol|erc-log-matches-come-back|erc-log-matches-make-buffer|erc-log-matches|erc-log-mode|erc-log|erc-logging-enabled|erc-login|erc-lurker-cleanup|erc-lurker-initialize|erc-lurker-maybe-trim|erc-lurker-p|erc-lurker-update-status|erc-make-message-variable-name|erc-make-mode-line-buffer-name|erc-make-notice|erc-make-obsolete-variable|erc-make-obsolete|erc-make-read-only|erc-match-current-nick-p|erc-match-dangerous-host-p|erc-match-directed-at-fool-p|erc-match-disable|erc-match-enable|erc-match-fool-p|erc-match-keyword-p|erc-match-message|erc-match-mode|erc-match-pal-p|erc-member-if|erc-member-ignore-case|erc-menu-add|erc-menu-disable|erc-menu-enable|erc-menu-mode|erc-menu-remove|erc-menu|erc-message-english-PART|erc-message-target|erc-message-type-member|erc-message|erc-migrate-modules|erc-mode|erc-modes|erc-modified-channels-display|erc-modified-channels-object|erc-modified-channels-remove-buffer|erc-modified-channels-update|erc-move-to-prompt-disable|erc-move-to-prompt-enable|erc-move-to-prompt-mode|erc-move-to-prompt-setup|erc-move-to-prompt|erc-munge-invisibility-spec|erc-netsplit-JOIN|erc-netsplit-MODE|erc-netsplit-QUIT|erc-netsplit-disable|erc-netsplit-enable|erc-netsplit-install-message-catalogs|erc-netsplit-mode|erc-netsplit-timer|erc-network-name|erc-network|erc-networks-disable|erc-networks-enable|erc-networks-mode|erc-next-command|erc-nick-at-point|erc-nick-equal-p|erc-nick-popup|erc-nickname-in-use|erc-nickserv-identify-mode|erc-nickserv-identify|erc-noncommands-disable|erc-noncommands-enable|erc-noncommands-mode|erc-normalize-port|erc-notifications-mode|erc-notify-mode|erc-occur|erc-once-with-server-event|erc-open-server-buffer-p|erc-open-tls-stream|erc-open|erc-page-mode|erc-parse-modes|erc-parse-prefix|erc-parse-server-response|erc-parse-user|erc-part-from-channel|erc-part-reason-normal|erc-part-reason-various|erc-part-reason-zippy|erc-pcomplete-disable|erc-pcomplete-enable|erc-pcomplete-mode|erc-pcomplete|erc-pcompletions-at-point|erc-popup-input-buffer|erc-port-equal|erc-port-to-string|erc-ports-list|erc-previous-command|erc-process-away|erc-process-ctcp-query|erc-process-ctcp-reply|erc-process-input-line|erc-process-script-line|erc-process-sentinel-1|erc-process-sentinel-2|erc-process-sentinel|erc-prompt|erc-propertize|erc-put-text-properties|erc-put-text-property|erc-query-buffer-p|erc-query|erc-quit\\/part-reason-default|erc-quit-reason-normal|erc-quit-reason-various|erc-quit-reason-zippy|erc-quit-server|erc-readonly-disable|erc-readonly-enable|erc-readonly-mode|erc-remove-channel-member|erc-remove-channel-user|erc-remove-channel-users|erc-remove-current-channel-member|erc-remove-entry-from-list|erc-remove-if-not|erc-remove-server-user|erc-remove-text-properties-region|erc-remove-user|erc-replace-current-command|erc-replace-match-subexpression-in-string|erc-replace-mode|erc-replace-regexp-in-string|erc-response-p--cmacro|erc-response-p|erc-response\\.command--cmacro|erc-response\\.command-args--cmacro|erc-response\\.command-args|erc-response\\.command|erc-response\\.contents--cmacro|erc-response\\.contents|erc-response\\.sender--cmacro|erc-response\\.sender|erc-response\\.unparsed--cmacro|erc-response\\.unparsed|erc-restore-text-properties|erc-retrieve-catalog-entry|erc-ring-disable|erc-ring-enable|erc-ring-mode|erc-save-buffer-in-logs|erc-scroll-to-bottom|erc-scrolltobottom-disable|erc-scrolltobottom-enable|erc-scrolltobottom-mode|erc-sec-to-time|erc-seconds-to-string|erc-select-read-args|erc-select-startup-file|erc-select|erc-send-action|erc-send-command|erc-send-ctcp-message|erc-send-ctcp-notice|erc-send-current-line|erc-send-distinguish-noncommands|erc-send-input-line|erc-send-input|erc-send-line|erc-send-message|erc-server-001|erc-server-002|erc-server-003|erc-server-004|erc-server-005|erc-server-221|erc-server-250|erc-server-251|erc-server-252|erc-server-253|erc-server-254|erc-server-255|erc-server-256|erc-server-257|erc-server-258|erc-server-259|erc-server-265|erc-server-266|erc-server-275|erc-server-290|erc-server-301|erc-server-303|erc-server-305|erc-server-306|erc-server-307|erc-server-311|erc-server-312|erc-server-313|erc-server-314|erc-server-315|erc-server-317|erc-server-318|erc-server-319|erc-server-320|erc-server-321-message|erc-server-321|erc-server-322-message|erc-server-322|erc-server-323|erc-server-324|erc-server-328|erc-server-329|erc-server-330|erc-server-331|erc-server-332|erc-server-333|erc-server-341|erc-server-352|erc-server-353|erc-server-366|erc-server-367|erc-server-368|erc-server-369|erc-server-371|erc-server-372|erc-server-374|erc-server-375|erc-server-376|erc-server-377|erc-server-378|erc-server-379|erc-server-391|erc-server-401|erc-server-403|erc-server-404|erc-server-405|erc-server-406|erc-server-412|erc-server-421|erc-server-422|erc-server-431|erc-server-432|erc-server-433|erc-server-437|erc-server-442|erc-server-445|erc-server-446|erc-server-451|erc-server-461|erc-server-462|erc-server-463|erc-server-464|erc-server-465|erc-server-474|erc-server-475|erc-server-477|erc-server-481|erc-server-482|erc-server-483|erc-server-484|erc-server-485|erc-server-491|erc-server-501|erc-server-502|erc-server-671|erc-server-ERROR|erc-server-INVITE|erc-server-JOIN|erc-server-KICK|erc-server-MODE|erc-server-MOTD|erc-server-NICK|erc-server-NOTICE|erc-server-PART|erc-server-PING|erc-server-PONG|erc-server-PRIVMSG|erc-server-QUIT|erc-server-TOPIC|erc-server-WALLOPS|erc-server-buffer-live-p|erc-server-buffer-p|erc-server-buffer|erc-server-connect|erc-server-filter-function|erc-server-join-channel|erc-server-process-alive|erc-server-reconnect-p|erc-server-reconnect|erc-server-select|erc-server-send-ping|erc-server-send-queue|erc-server-send|erc-server-setup-periodical-ping|erc-server-user-buffers--cmacro|erc-server-user-buffers|erc-server-user-full-name--cmacro|erc-server-user-full-name|erc-server-user-host--cmacro|erc-server-user-host|erc-server-user-info--cmacro|erc-server-user-info|erc-server-user-login--cmacro|erc-server-user-login|erc-server-user-nickname--cmacro|erc-server-user-nickname|erc-server-user-p--cmacro|erc-server-user-p|erc-services-mode|erc-set-active-buffer|erc-set-channel-key|erc-set-channel-limit|erc-set-current-nick|erc-set-initial-user-mode|erc-set-modes|erc-set-network-name|erc-set-topic|erc-set-write-file-functions|erc-setup-buffer|erc-shorten-server-name|erc-show-timestamps|erc-smiley-disable|erc-smiley-enable|erc-smiley-mode|erc-smiley|erc-sort-channel-users-alphabetically|erc-sort-channel-users-by-activity|erc-sort-strings|erc-sound-mode|erc-speedbar-browser|erc-spelling-mode|erc-split-line|erc-split-multiline-safe|erc-ssl|erc-stamp-disable|erc-stamp-enable|erc-stamp-mode|erc-string-invisible-p|erc-string-no-properties|erc-string-to-emacs-time|erc-string-to-port|erc-subseq|erc-time-diff|erc-time-gt|erc-timestamp-mode|erc-timestamp-offset|erc-tls|erc-toggle-channel-mode|erc-toggle-ctcp-autoresponse|erc-toggle-debug-irc-protocol|erc-toggle-flood-control|erc-toggle-interpret-controls|erc-toggle-timestamps|erc-track-add-to-mode-line|erc-track-disable|erc-track-enable|erc-track-face-priority|erc-track-find-face|erc-track-get-active-buffer|erc-track-get-buffer-window|erc-track-minor-mode-maybe|erc-track-minor-mode|erc-track-mode|erc-track-modified-channels|erc-track-remove-from-mode-line|erc-track-shorten-names|erc-track-sort-by-activest|erc-track-sort-by-importance|erc-track-switch-buffer|erc-trim-string|erc-truncate-buffer-to-size|erc-truncate-buffer|erc-truncate-mode|erc-unique-channel-names|erc-unique-substring-1|erc-unique-substrings|erc-unmorse-disable|erc-unmorse-enable|erc-unmorse-mode|erc-unmorse|erc-unset-network-name|erc-upcase-first-word|erc-update-channel-key|erc-update-channel-limit|erc-update-channel-member|erc-update-channel-topic|erc-update-current-channel-member|erc-update-mode-line-buffer|erc-update-mode-line|erc-update-modes|erc-update-modules|erc-update-undo-list|erc-update-user-nick|erc-update-user|erc-user-input|erc-user-is-active|erc-user-spec|erc-version|erc-view-mode-enter|erc-wash-quit-reason|erc-window-configuration-change|erc-with-all-buffers-of-server|erc-with-buffer|erc-with-selected-window|erc-with-server-buffer|erc-xdcc-add-file|erc-xdcc-mode|erc|eregistry|erevision|ert--abbreviate-string|ert--activate-font-lock-keywords|ert--button-action-position|ert--ewoc-entry-expanded-p--cmacro|ert--ewoc-entry-expanded-p|ert--ewoc-entry-extended-printer-limits-p--cmacro|ert--ewoc-entry-extended-printer-limits-p|ert--ewoc-entry-hidden-p--cmacro|ert--ewoc-entry-hidden-p|ert--ewoc-entry-p--cmacro|ert--ewoc-entry-p|ert--ewoc-entry-test--cmacro|ert--ewoc-entry-test|ert--ewoc-position|ert--expand-should-1|ert--expand-should|ert--explain-equal-including-properties|ert--explain-equal-rec|ert--explain-equal|ert--explain-format-atom|ert--force-message-log-buffer-truncation|ert--format-time-iso8601|ert--insert-human-readable-selector|ert--insert-infos|ert--make-stats|ert--make-xrefs-region|ert--parse-keys-and-body|ert--plist-difference-explanation|ert--pp-with-indentation-and-newline|ert--print-backtrace|ert--print-test-for-ewoc|ert--proper-list-p|ert--record-backtrace|ert--remove-from-list|ert--results-expand-collapse-button-action|ert--results-font-lock-function|ert--results-format-expected-unexpected|ert--results-move|ert--results-progress-bar-button-action|ert--results-test-at-point-allow-redefinition|ert--results-test-at-point-no-redefinition|ert--results-test-node-at-point|ert--results-test-node-or-null-at-point|ert--results-update-after-test-redefinition|ert--results-update-ewoc-hf|ert--results-update-stats-display-maybe|ert--results-update-stats-display|ert--run-test-debugger|ert--run-test-internal|ert--setup-results-buffer|ert--should-error-handle-error|ert--signal-should-execution|ert--significant-plist-keys|ert--skip-unless|ert--special-operator-p|ert--stats-aborted-p--cmacro|ert--stats-aborted-p|ert--stats-current-test--cmacro|ert--stats-current-test|ert--stats-end-time--cmacro)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)er(?:c-ezb-init-session-list|c-ezb-initialize|c-ezb-lookup-action|c-ezb-notice-autodetect|c-ezb-select-session|c-ezb-select|c-faces-in|c-fill-disable|c-fill-enable|c-fill-mode|c-fill-regarding-timestamp|c-fill-static|c-fill-variable|c-fill|c-find-file|c-find-parsed-property|c-find-script-file|c-format-@nick|c-format-away-status|c-format-channel-modes|c-format-lag-time|c-format-message|c-format-my-nick|c-format-network|c-format-nick|c-format-privmessage|c-format-target-and/or-network|c-format-target-and/or-server|c-format-target|c-format-timestamp|c-function-arglist|c-generate-new-buffer-name|c-get-arglist|c-get-bg-color-face|c-get-buffer-create|c-get-buffer|c-get-channel-mode-from-keypress|c-get-channel-nickname-alist|c-get-channel-nickname-list|c-get-channel-user-list|c-get-channel-user|c-get-fg-color-face|c-get-hook|c-get-parsed-vector-nick|c-get-parsed-vector-type|c-get-parsed-vector|c-get-server-nickname-alist|c-get-server-nickname-list|c-get-server-user|c-get-user-mode-prefix|c-get|c-go-to-log-matches-buffer|c-grab-region|c-group-list|c-handle-irc-url|c-handle-login|c-handle-parsed-server-response|c-handle-unknown-server-response|c-handle-user-status-change|c-hide-current-message-p|c-hide-fools|c-hide-timestamps|c-highlight-error|c-highlight-notice|c-identd-mode|c-identd-start|c-identd-stop|c-ignored-reply-p|c-ignored-user-p|c-imenu-setup|c-initialize-log-marker|c-input-action|c-input-message|c-input-ring-setup|c-insert-aligned|c-insert-mode-command|c-insert-timestamp-left-and-right|c-insert-timestamp-left|c-insert-timestamp-right|c-invite-only-mode|c-irccontrols-disable|c-irccontrols-enable|c-irccontrols-mode|c-is-message-ctcp-and-not-action-p|c-is-message-ctcp-p|c-is-valid-nick-p|c-ison-p|c-iswitchb|c-join-channel|c-keep-place-disable|c-keep-place-enable|c-keep-place-mode|c-keep-place|c-kill-buffer-function|c-kill-channel|c-kill-input|c-kill-query-buffers|c-kill-server|c-list-button|c-list-disable|c-list-enable|c-list-handle-322|c-list-insert-item|c-list-install-322-handler|c-list-join|c-list-kill|c-list-make-string|c-list-match|c-list-menu-mode|c-list-menu-sort-by-column|c-list-mode|c-list-revert|c-list|c-load-irc-script-lines|c-load-irc-script|c-load-script|c-log-aux|c-log-irc-protocol|c-log-matches-come-back|c-log-matches-make-buffer|c-log-matches|c-log-mode|c-log|c-logging-enabled|c-login|c-lurker-cleanup|c-lurker-initialize|c-lurker-maybe-trim|c-lurker-p|c-lurker-update-status|c-make-message-variable-name|c-make-mode-line-buffer-name|c-make-notice|c-make-obsolete-variable|c-make-obsolete|c-make-read-only|c-match-current-nick-p|c-match-dangerous-host-p|c-match-directed-at-fool-p|c-match-disable|c-match-enable|c-match-fool-p|c-match-keyword-p|c-match-message|c-match-mode|c-match-pal-p|c-member-if|c-member-ignore-case|c-menu-add|c-menu-disable|c-menu-enable|c-menu-mode|c-menu-remove|c-menu|c-message-english-PART|c-message-target|c-message-type-member|c-message|c-migrate-modules|c-mode|c-modes|c-modified-channels-display|c-modified-channels-object|c-modified-channels-remove-buffer|c-modified-channels-update|c-move-to-prompt-disable|c-move-to-prompt-enable|c-move-to-prompt-mode|c-move-to-prompt-setup|c-move-to-prompt|c-munge-invisibility-spec|c-netsplit-JOIN|c-netsplit-MODE|c-netsplit-QUIT|c-netsplit-disable|c-netsplit-enable|c-netsplit-install-message-catalogs|c-netsplit-mode|c-netsplit-timer|c-network-name|c-network|c-networks-disable|c-networks-enable|c-networks-mode|c-next-command|c-nick-at-point|c-nick-equal-p|c-nick-popup|c-nickname-in-use|c-nickserv-identify-mode|c-nickserv-identify|c-noncommands-disable|c-noncommands-enable|c-noncommands-mode|c-normalize-port|c-notifications-mode|c-notify-mode|c-occur|c-once-with-server-event|c-open-server-buffer-p|c-open-tls-stream|c-open|c-page-mode|c-parse-modes|c-parse-prefix|c-parse-server-response|c-parse-user|c-part-from-channel|c-part-reason-normal|c-part-reason-various|c-part-reason-zippy|c-pcomplete-disable|c-pcomplete-enable|c-pcomplete-mode|c-pcomplete|c-pcompletions-at-point|c-popup-input-buffer|c-port-equal|c-port-to-string|c-ports-list|c-previous-command|c-process-away|c-process-ctcp-query|c-process-ctcp-reply|c-process-input-line|c-process-script-line|c-process-sentinel-1|c-process-sentinel-2|c-process-sentinel|c-prompt|c-propertize|c-put-text-properties|c-put-text-property|c-query-buffer-p|c-query|c-quit/part-reason-default|c-quit-reason-normal|c-quit-reason-various|c-quit-reason-zippy|c-quit-server|c-readonly-disable|c-readonly-enable|c-readonly-mode|c-remove-channel-member|c-remove-channel-user|c-remove-channel-users|c-remove-current-channel-member|c-remove-entry-from-list|c-remove-if-not|c-remove-server-user|c-remove-text-properties-region|c-remove-user|c-replace-current-command|c-replace-match-subexpression-in-string|c-replace-mode|c-replace-regexp-in-string|c-response-p--cmacro|c-response-p|c-response\\.command--cmacro|c-response\\.command-args--cmacro|c-response\\.command-args|c-response\\.command|c-response\\.contents--cmacro|c-response\\.contents|c-response\\.sender--cmacro|c-response\\.sender|c-response\\.unparsed--cmacro|c-response\\.unparsed|c-restore-text-properties|c-retrieve-catalog-entry|c-ring-disable|c-ring-enable|c-ring-mode|c-save-buffer-in-logs|c-scroll-to-bottom|c-scrolltobottom-disable|c-scrolltobottom-enable|c-scrolltobottom-mode|c-sec-to-time|c-seconds-to-string|c-select-read-args|c-select-startup-file|c-select|c-send-action|c-send-command|c-send-ctcp-message|c-send-ctcp-notice|c-send-current-line|c-send-distinguish-noncommands|c-send-input-line|c-send-input|c-send-line|c-send-message|c-server-001|c-server-002|c-server-003|c-server-004|c-server-005|c-server-221|c-server-250|c-server-251|c-server-252|c-server-253|c-server-254|c-server-255|c-server-256|c-server-257|c-server-258|c-server-259|c-server-265|c-server-266|c-server-275|c-server-290|c-server-301|c-server-303|c-server-305|c-server-306|c-server-307|c-server-311|c-server-312|c-server-313|c-server-314|c-server-315|c-server-317|c-server-318|c-server-319|c-server-320|c-server-321-message|c-server-321|c-server-322-message|c-server-322|c-server-323|c-server-324|c-server-328|c-server-329|c-server-330|c-server-331|c-server-332|c-server-333|c-server-341|c-server-352|c-server-353|c-server-366|c-server-367|c-server-368|c-server-369|c-server-371|c-server-372|c-server-374|c-server-375|c-server-376|c-server-377|c-server-378|c-server-379|c-server-391|c-server-401|c-server-403|c-server-404|c-server-405|c-server-406|c-server-412|c-server-421|c-server-422|c-server-431|c-server-432|c-server-433|c-server-437|c-server-442|c-server-445|c-server-446|c-server-451|c-server-461|c-server-462|c-server-463|c-server-464|c-server-465|c-server-474|c-server-475|c-server-477|c-server-481|c-server-482|c-server-483|c-server-484|c-server-485|c-server-491|c-server-501|c-server-502|c-server-671|c-server-ERROR|c-server-INVITE|c-server-JOIN|c-server-KICK|c-server-MODE|c-server-MOTD|c-server-NICK|c-server-NOTICE|c-server-PART|c-server-PING|c-server-PONG|c-server-PRIVMSG|c-server-QUIT|c-server-TOPIC|c-server-WALLOPS|c-server-buffer-live-p|c-server-buffer-p|c-server-buffer|c-server-connect|c-server-filter-function|c-server-join-channel|c-server-process-alive|c-server-reconnect-p|c-server-reconnect|c-server-select|c-server-send-ping|c-server-send-queue|c-server-send|c-server-setup-periodical-ping|c-server-user-buffers--cmacro|c-server-user-buffers|c-server-user-full-name--cmacro|c-server-user-full-name|c-server-user-host--cmacro|c-server-user-host|c-server-user-info--cmacro|c-server-user-info|c-server-user-login--cmacro|c-server-user-login|c-server-user-nickname--cmacro|c-server-user-nickname|c-server-user-p--cmacro|c-server-user-p|c-services-mode|c-set-active-buffer|c-set-channel-key|c-set-channel-limit|c-set-current-nick|c-set-initial-user-mode|c-set-modes|c-set-network-name|c-set-topic|c-set-write-file-functions|c-setup-buffer|c-shorten-server-name|c-show-timestamps|c-smiley-disable|c-smiley-enable|c-smiley-mode|c-smiley|c-sort-channel-users-alphabetically|c-sort-channel-users-by-activity|c-sort-strings|c-sound-mode|c-speedbar-browser|c-spelling-mode|c-split-line|c-split-multiline-safe|c-ssl|c-stamp-disable|c-stamp-enable|c-stamp-mode|c-string-invisible-p|c-string-no-properties|c-string-to-emacs-time|c-string-to-port|c-subseq|c-time-diff|c-time-gt|c-timestamp-mode|c-timestamp-offset|c-tls|c-toggle-channel-mode|c-toggle-ctcp-autoresponse|c-toggle-debug-irc-protocol|c-toggle-flood-control|c-toggle-interpret-controls|c-toggle-timestamps|c-track-add-to-mode-line|c-track-disable|c-track-enable|c-track-face-priority|c-track-find-face|c-track-get-active-buffer|c-track-get-buffer-window|c-track-minor-mode-maybe|c-track-minor-mode|c-track-mode|c-track-modified-channels|c-track-remove-from-mode-line|c-track-shorten-names|c-track-sort-by-activest|c-track-sort-by-importance|c-track-switch-buffer|c-trim-string|c-truncate-buffer-to-size|c-truncate-buffer|c-truncate-mode|c-unique-channel-names|c-unique-substring-1|c-unique-substrings|c-unmorse-disable|c-unmorse-enable|c-unmorse-mode|c-unmorse|c-unset-network-name|c-upcase-first-word|c-update-channel-key|c-update-channel-limit|c-update-channel-member|c-update-channel-topic|c-update-current-channel-member|c-update-mode-line-buffer|c-update-mode-line|c-update-modes|c-update-modules|c-update-undo-list|c-update-user-nick|c-update-user|c-user-input|c-user-is-active|c-user-spec|c-version|c-view-mode-enter|c-wash-quit-reason|c-window-configuration-change|c-with-all-buffers-of-server|c-with-buffer|c-with-selected-window|c-with-server-buffer|c-xdcc-add-file|c-xdcc-mode|c|egistry|evision|t--abbreviate-string|t--activate-font-lock-keywords|t--button-action-position|t--ewoc-entry-expanded-p--cmacro|t--ewoc-entry-expanded-p|t--ewoc-entry-extended-printer-limits-p--cmacro|t--ewoc-entry-extended-printer-limits-p|t--ewoc-entry-hidden-p--cmacro|t--ewoc-entry-hidden-p|t--ewoc-entry-p--cmacro|t--ewoc-entry-p|t--ewoc-entry-test--cmacro|t--ewoc-entry-test|t--ewoc-position|t--expand-should-1|t--expand-should|t--explain-equal-including-properties|t--explain-equal-rec|t--explain-equal|t--explain-format-atom|t--force-message-log-buffer-truncation|t--format-time-iso8601|t--insert-human-readable-selector|t--insert-infos|t--make-stats|t--make-xrefs-region|t--parse-keys-and-body|t--plist-difference-explanation|t--pp-with-indentation-and-newline|t--print-backtrace|t--print-test-for-ewoc|t--proper-list-p|t--record-backtrace|t--remove-from-list|t--results-expand-collapse-button-action|t--results-font-lock-function|t--results-format-expected-unexpected|t--results-move|t--results-progress-bar-button-action|t--results-test-at-point-allow-redefinition|t--results-test-at-point-no-redefinition|t--results-test-node-at-point|t--results-test-node-or-null-at-point|t--results-update-after-test-redefinition|t--results-update-ewoc-hf|t--results-update-stats-display-maybe|t--results-update-stats-display|t--run-test-debugger|t--run-test-internal|t--setup-results-buffer|t--should-error-handle-error|t--signal-should-execution|t--significant-plist-keys|t--skip-unless|t--special-operator-p|t--stats-aborted-p--cmacro|t--stats-aborted-p|t--stats-current-test--cmacro|t--stats-current-test|t--stats-end-time--cmacro)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:ert--stats-end-time|ert--stats-failed-expected--cmacro|ert--stats-failed-expected|ert--stats-failed-unexpected--cmacro|ert--stats-failed-unexpected|ert--stats-next-redisplay--cmacro|ert--stats-next-redisplay|ert--stats-p--cmacro|ert--stats-p|ert--stats-passed-expected--cmacro|ert--stats-passed-expected|ert--stats-passed-unexpected--cmacro|ert--stats-passed-unexpected|ert--stats-selector--cmacro|ert--stats-selector|ert--stats-set-test-and-result|ert--stats-skipped--cmacro|ert--stats-skipped|ert--stats-start-time--cmacro|ert--stats-start-time|ert--stats-test-end-times--cmacro|ert--stats-test-end-times|ert--stats-test-key|ert--stats-test-map--cmacro|ert--stats-test-map|ert--stats-test-pos|ert--stats-test-results--cmacro|ert--stats-test-results|ert--stats-test-start-times--cmacro|ert--stats-test-start-times|ert--stats-tests--cmacro|ert--stats-tests|ert--string-first-line|ert--test-execution-info-ert-debug-on-error--cmacro|ert--test-execution-info-ert-debug-on-error|ert--test-execution-info-exit-continuation--cmacro|ert--test-execution-info-exit-continuation|ert--test-execution-info-next-debugger--cmacro|ert--test-execution-info-next-debugger|ert--test-execution-info-p--cmacro|ert--test-execution-info-p|ert--test-execution-info-result--cmacro|ert--test-execution-info-result|ert--test-execution-info-test--cmacro|ert--test-execution-info-test|ert--test-name-button-action|ert--tests-running-mode-line-indicator|ert--unload-function|ert-char-for-test-result|ert-deftest|ert-delete-all-tests|ert-delete-test|ert-describe-test|ert-equal-including-properties|ert-face-for-stats|ert-face-for-test-result|ert-fail|ert-find-test-other-window|ert-get-test|ert-info|ert-insert-test-name-button|ert-kill-all-test-buffers|ert-make-test-unbound|ert-pass|ert-read-test-name-at-point|ert-read-test-name|ert-results-describe-test-at-point|ert-results-find-test-at-point-other-window|ert-results-jump-between-summary-and-result|ert-results-mode-menu|ert-results-mode|ert-results-next-test|ert-results-pop-to-backtrace-for-test-at-point|ert-results-pop-to-messages-for-test-at-point|ert-results-pop-to-should-forms-for-test-at-point|ert-results-pop-to-timings|ert-results-previous-test|ert-results-rerun-all-tests|ert-results-rerun-test-at-point-debugging-errors|ert-results-rerun-test-at-point|ert-results-toggle-printer-limits-for-test-at-point|ert-run-or-rerun-test|ert-run-test|ert-run-tests-batch-and-exit|ert-run-tests-batch|ert-run-tests-interactively|ert-run-tests|ert-running-test|ert-select-tests|ert-set-test|ert-simple-view-mode|ert-skip|ert-stats-completed-expected|ert-stats-completed-unexpected|ert-stats-completed|ert-stats-skipped|ert-stats-total|ert-string-for-test-result|ert-summarize-tests-batch-and-exit|ert-test-aborted-with-non-local-exit-messages--cmacro|ert-test-aborted-with-non-local-exit-messages|ert-test-aborted-with-non-local-exit-p--cmacro|ert-test-aborted-with-non-local-exit-p|ert-test-aborted-with-non-local-exit-should-forms--cmacro|ert-test-aborted-with-non-local-exit-should-forms|ert-test-at-point|ert-test-body--cmacro|ert-test-body|ert-test-boundp|ert-test-documentation--cmacro|ert-test-documentation|ert-test-expected-result-type--cmacro|ert-test-expected-result-type|ert-test-failed-backtrace--cmacro|ert-test-failed-backtrace|ert-test-failed-condition--cmacro|ert-test-failed-condition|ert-test-failed-infos--cmacro|ert-test-failed-infos|ert-test-failed-messages--cmacro|ert-test-failed-messages|ert-test-failed-p--cmacro|ert-test-failed-p|ert-test-failed-should-forms--cmacro|ert-test-failed-should-forms|ert-test-most-recent-result--cmacro|ert-test-most-recent-result|ert-test-name--cmacro|ert-test-name|ert-test-p--cmacro|ert-test-p|ert-test-passed-messages--cmacro|ert-test-passed-messages|ert-test-passed-p--cmacro|ert-test-passed-p|ert-test-passed-should-forms--cmacro|ert-test-passed-should-forms|ert-test-quit-backtrace--cmacro|ert-test-quit-backtrace|ert-test-quit-condition--cmacro|ert-test-quit-condition|ert-test-quit-infos--cmacro|ert-test-quit-infos|ert-test-quit-messages--cmacro|ert-test-quit-messages|ert-test-quit-p--cmacro|ert-test-quit-p|ert-test-quit-should-forms--cmacro|ert-test-quit-should-forms|ert-test-result-expected-p|ert-test-result-messages--cmacro|ert-test-result-messages|ert-test-result-p--cmacro|ert-test-result-p|ert-test-result-should-forms--cmacro|ert-test-result-should-forms|ert-test-result-type-p|ert-test-result-with-condition-backtrace--cmacro|ert-test-result-with-condition-backtrace|ert-test-result-with-condition-condition--cmacro|ert-test-result-with-condition-condition|ert-test-result-with-condition-infos--cmacro|ert-test-result-with-condition-infos|ert-test-result-with-condition-messages--cmacro|ert-test-result-with-condition-messages|ert-test-result-with-condition-p--cmacro|ert-test-result-with-condition-p|ert-test-result-with-condition-should-forms--cmacro|ert-test-result-with-condition-should-forms|ert-test-skipped-backtrace--cmacro|ert-test-skipped-backtrace|ert-test-skipped-condition--cmacro|ert-test-skipped-condition|ert-test-skipped-infos--cmacro|ert-test-skipped-infos|ert-test-skipped-messages--cmacro|ert-test-skipped-messages|ert-test-skipped-p--cmacro|ert-test-skipped-p|ert-test-skipped-should-forms--cmacro|ert-test-skipped-should-forms|ert-test-tags--cmacro|ert-test-tags|ert|eshell\\/addpath|eshell\\/define|eshell\\/env|eshell\\/eshell-debug|eshell\\/exit|eshell\\/export|eshell\\/jobs|eshell\\/kill|eshell\\/setq|eshell\\/unset|eshell\\/wait|eshell\\/which|eshell--apply-redirections|eshell--do-opts|eshell--process-args|eshell--process-option|eshell--set-option|eshell-add-to-window-buffer-names|eshell-apply\\*|eshell-apply-indices|eshell-apply|eshell-applyn|eshell-arg-delimiter|eshell-arg-initialize|eshell-as-subcommand|eshell-backward-argument|eshell-begin-on-new-line|eshell-beginning-of-input|eshell-beginning-of-output|eshell-bol|eshell-buffered-print|eshell-clipboard-append|eshell-close-handles|eshell-close-target|eshell-cmd-initialize|eshell-command-finished|eshell-command-result|eshell-command-started|eshell-command-to-value|eshell-command|eshell-commands|eshell-complete-lisp-symbols|eshell-complete-variable-assignment|eshell-complete-variable-reference|eshell-condition-case|eshell-convert|eshell-copy-environment|eshell-copy-handles|eshell-copy-old-input|eshell-copy-tree|eshell-create-handles|eshell-current-ange-uids|eshell-debug-command|eshell-debug-show-parsed-args|eshell-directory-files-and-attributes|eshell-directory-files|eshell-do-command-to-value|eshell-do-eval|eshell-do-pipelines-synchronously|eshell-do-pipelines|eshell-do-subjob|eshell-end-of-output|eshell-environment-variables|eshell-envvar-names|eshell-error|eshell-errorn|eshell-escape-arg|eshell-eval\\*|eshell-eval-command|eshell-eval-using-options|eshell-eval|eshell-evaln|eshell-exec-lisp|eshell-execute-pipeline|eshell-exit-success-p|eshell-explicit-command|eshell-ext-initialize|eshell-external-command|eshell-file-attributes|eshell-find-alias-function|eshell-find-delimiter|eshell-find-interpreter|eshell-find-tag|eshell-finish-arg|eshell-flatten-and-stringify|eshell-flatten-list|eshell-flush|eshell-for|eshell-forward-argument|eshell-funcall\\*|eshell-funcall|eshell-funcalln|eshell-gather-process-output|eshell-get-old-input|eshell-get-target|eshell-get-variable|eshell-goto-input-start|eshell-group-id|eshell-group-name|eshell-handle-ansi-color|eshell-handle-control-codes|eshell-handle-local-variables|eshell-index-value|eshell-init-print-buffer|eshell-insert-buffer-name|eshell-insert-envvar|eshell-insert-process|eshell-insertion-filter|eshell-interactive-output-p|eshell-interactive-print|eshell-interactive-process|eshell-intercept-commands|eshell-interpolate-variable|eshell-interrupt-process|eshell-invoke-batch-file|eshell-invoke-directly|eshell-invokify-arg|eshell-io-initialize|eshell-kill-append|eshell-kill-buffer-function|eshell-kill-input|eshell-kill-new|eshell-kill-output|eshell-kill-process-function|eshell-kill-process|eshell-life-is-too-much|eshell-lisp-command\\*|eshell-lisp-command|eshell-looking-at-backslash-return|eshell-make-private-directory|eshell-manipulate|eshell-mark-output|eshell-mode|eshell-move-argument|eshell-named-command\\*|eshell-named-command|eshell-needs-pipe-p|eshell-no-command-conversion|eshell-operator|eshell-output-filter|eshell-output-object-to-target|eshell-output-object|eshell-parse-ange-ls|eshell-parse-argument|eshell-parse-arguments|eshell-parse-backslash|eshell-parse-colon-path|eshell-parse-command-input|eshell-parse-command|eshell-parse-delimiter|eshell-parse-double-quote|eshell-parse-indices|eshell-parse-lisp-argument|eshell-parse-literal-quote|eshell-parse-pipeline|eshell-parse-redirection|eshell-parse-special-reference|eshell-parse-subcommand-argument|eshell-parse-variable-ref|eshell-parse-variable|eshell-plain-command|eshell-postoutput-scroll-to-bottom|eshell-preinput-scroll-to-bottom|eshell-print|eshell-printable-size|eshell-printn|eshell-proc-initialize|eshell-process-identity|eshell-process-interact|eshell-processp|eshell-protect-handles|eshell-protect|eshell-push-command-mark|eshell-query-kill-processes|eshell-queue-input|eshell-quit-process|eshell-quote-argument|eshell-quote-backslash|eshell-read-group-names|eshell-read-host-names|eshell-read-hosts-file|eshell-read-hosts|eshell-read-passwd-file|eshell-read-passwd|eshell-read-process-name|eshell-read-user-names|eshell-record-process-object|eshell-redisplay|eshell-regexp-arg|eshell-remote-command|eshell-remove-from-window-buffer-names|eshell-remove-process-entry|eshell-repeat-argument|eshell-report-bug|eshell-reset-after-proc|eshell-reset|eshell-resolve-current-argument|eshell-resume-command|eshell-resume-eval|eshell-return-exits-minibuffer|eshell-rewrite-for-command|eshell-rewrite-if-command|eshell-rewrite-initial-subcommand|eshell-rewrite-named-command|eshell-rewrite-sexp-command|eshell-rewrite-while-command|eshell-round-robin-kill|eshell-run-output-filters|eshell-script-interpreter|eshell-search-path|eshell-self-insert-command|eshell-send-eof-to-process|eshell-send-input|eshell-send-invisible|eshell-sentinel|eshell-separate-commands|eshell-set-output-handle|eshell-show-maximum-output|eshell-show-output|eshell-show-usage|eshell-split-path|eshell-stringify-list|eshell-stringify|eshell-strip-redirections|eshell-structure-basic-command|eshell-subcommand-arg-values|eshell-subgroups|eshell-sublist|eshell-substring|eshell-to-flat-string|eshell-toggle-direct-send|eshell-trap-errors|eshell-truncate-buffer|eshell-under-windows-p|eshell-uniqify-list|eshell-unload-all-modules|eshell-unload-extension-modules|eshell-update-markers|eshell-user-id|eshell-user-name|eshell-using-module|eshell-var-initialize|eshell-variables-list|eshell-wait-for-process|eshell-watch-for-password-prompt|eshell-winnow-list|eshell-with-file-modes|eshell-with-private-file-modes|eshell|etags--xref-find-definitions|etags-file-of-tag|etags-goto-tag-location|etags-list-tags|etags-recognize-tags-table|etags-snarf-tag|etags-tags-apropos-additional|etags-tags-apropos|etags-tags-completion-table|etags-tags-included-tables|etags-tags-table-files|etags-verify-tags-table|etags-xref-find|ethio-composition-function|ethio-fidel-to-java-buffer|ethio-fidel-to-sera-buffer|ethio-fidel-to-sera-marker|ethio-fidel-to-sera-region|ethio-fidel-to-tex-buffer|ethio-find-file|ethio-input-special-character|ethio-insert-ethio-space|ethio-java-to-fidel-buffer|ethio-modify-vowel|ethio-replace-space|ethio-sera-to-fidel-buffer|ethio-sera-to-fidel-marker|ethio-sera-to-fidel-region|ethio-tex-to-fidel-buffer|ethio-write-file|etypecase|eudc-add-field-to-records|eudc-bookmark-current-server|eudc-bookmark-server|eudc-caar|eudc-cadr|eudc-cdaar|eudc-cdar|eudc-customize|eudc-default-set|eudc-display-generic-binary|eudc-display-jpeg-as-button|eudc-display-jpeg-inline|eudc-display-mail|eudc-display-records|eudc-display-sound|eudc-display-url|eudc-distribute-field-on-records|eudc-edit-hotlist|eudc-expand-inline|eudc-extract-n-word-formats|eudc-filter-duplicate-attributes|eudc-filter-partial-records|eudc-format-attribute-name-for-display|eudc-format-query|eudc-get-attribute-list|eudc-get-email|eudc-get-phone|eudc-insert-record-at-point-into-bbdb|eudc-install-menu|eudc-lax-plist-get|eudc-load-eudc|eudc-menu|eudc-mode|eudc-move-to-next-record|eudc-move-to-previous-record|eudc-plist-get|eudc-plist-member)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)e(?:rt--stats-end-time|rt--stats-failed-expected--cmacro|rt--stats-failed-expected|rt--stats-failed-unexpected--cmacro|rt--stats-failed-unexpected|rt--stats-next-redisplay--cmacro|rt--stats-next-redisplay|rt--stats-p--cmacro|rt--stats-p|rt--stats-passed-expected--cmacro|rt--stats-passed-expected|rt--stats-passed-unexpected--cmacro|rt--stats-passed-unexpected|rt--stats-selector--cmacro|rt--stats-selector|rt--stats-set-test-and-result|rt--stats-skipped--cmacro|rt--stats-skipped|rt--stats-start-time--cmacro|rt--stats-start-time|rt--stats-test-end-times--cmacro|rt--stats-test-end-times|rt--stats-test-key|rt--stats-test-map--cmacro|rt--stats-test-map|rt--stats-test-pos|rt--stats-test-results--cmacro|rt--stats-test-results|rt--stats-test-start-times--cmacro|rt--stats-test-start-times|rt--stats-tests--cmacro|rt--stats-tests|rt--string-first-line|rt--test-execution-info-ert-debug-on-error--cmacro|rt--test-execution-info-ert-debug-on-error|rt--test-execution-info-exit-continuation--cmacro|rt--test-execution-info-exit-continuation|rt--test-execution-info-next-debugger--cmacro|rt--test-execution-info-next-debugger|rt--test-execution-info-p--cmacro|rt--test-execution-info-p|rt--test-execution-info-result--cmacro|rt--test-execution-info-result|rt--test-execution-info-test--cmacro|rt--test-execution-info-test|rt--test-name-button-action|rt--tests-running-mode-line-indicator|rt--unload-function|rt-char-for-test-result|rt-deftest|rt-delete-all-tests|rt-delete-test|rt-describe-test|rt-equal-including-properties|rt-face-for-stats|rt-face-for-test-result|rt-fail|rt-find-test-other-window|rt-get-test|rt-info|rt-insert-test-name-button|rt-kill-all-test-buffers|rt-make-test-unbound|rt-pass|rt-read-test-name-at-point|rt-read-test-name|rt-results-describe-test-at-point|rt-results-find-test-at-point-other-window|rt-results-jump-between-summary-and-result|rt-results-mode-menu|rt-results-mode|rt-results-next-test|rt-results-pop-to-backtrace-for-test-at-point|rt-results-pop-to-messages-for-test-at-point|rt-results-pop-to-should-forms-for-test-at-point|rt-results-pop-to-timings|rt-results-previous-test|rt-results-rerun-all-tests|rt-results-rerun-test-at-point-debugging-errors|rt-results-rerun-test-at-point|rt-results-toggle-printer-limits-for-test-at-point|rt-run-or-rerun-test|rt-run-test|rt-run-tests-batch-and-exit|rt-run-tests-batch|rt-run-tests-interactively|rt-run-tests|rt-running-test|rt-select-tests|rt-set-test|rt-simple-view-mode|rt-skip|rt-stats-completed-expected|rt-stats-completed-unexpected|rt-stats-completed|rt-stats-skipped|rt-stats-total|rt-string-for-test-result|rt-summarize-tests-batch-and-exit|rt-test-aborted-with-non-local-exit-messages--cmacro|rt-test-aborted-with-non-local-exit-messages|rt-test-aborted-with-non-local-exit-p--cmacro|rt-test-aborted-with-non-local-exit-p|rt-test-aborted-with-non-local-exit-should-forms--cmacro|rt-test-aborted-with-non-local-exit-should-forms|rt-test-at-point|rt-test-body--cmacro|rt-test-body|rt-test-boundp|rt-test-documentation--cmacro|rt-test-documentation|rt-test-expected-result-type--cmacro|rt-test-expected-result-type|rt-test-failed-backtrace--cmacro|rt-test-failed-backtrace|rt-test-failed-condition--cmacro|rt-test-failed-condition|rt-test-failed-infos--cmacro|rt-test-failed-infos|rt-test-failed-messages--cmacro|rt-test-failed-messages|rt-test-failed-p--cmacro|rt-test-failed-p|rt-test-failed-should-forms--cmacro|rt-test-failed-should-forms|rt-test-most-recent-result--cmacro|rt-test-most-recent-result|rt-test-name--cmacro|rt-test-name|rt-test-p--cmacro|rt-test-p|rt-test-passed-messages--cmacro|rt-test-passed-messages|rt-test-passed-p--cmacro|rt-test-passed-p|rt-test-passed-should-forms--cmacro|rt-test-passed-should-forms|rt-test-quit-backtrace--cmacro|rt-test-quit-backtrace|rt-test-quit-condition--cmacro|rt-test-quit-condition|rt-test-quit-infos--cmacro|rt-test-quit-infos|rt-test-quit-messages--cmacro|rt-test-quit-messages|rt-test-quit-p--cmacro|rt-test-quit-p|rt-test-quit-should-forms--cmacro|rt-test-quit-should-forms|rt-test-result-expected-p|rt-test-result-messages--cmacro|rt-test-result-messages|rt-test-result-p--cmacro|rt-test-result-p|rt-test-result-should-forms--cmacro|rt-test-result-should-forms|rt-test-result-type-p|rt-test-result-with-condition-backtrace--cmacro|rt-test-result-with-condition-backtrace|rt-test-result-with-condition-condition--cmacro|rt-test-result-with-condition-condition|rt-test-result-with-condition-infos--cmacro|rt-test-result-with-condition-infos|rt-test-result-with-condition-messages--cmacro|rt-test-result-with-condition-messages|rt-test-result-with-condition-p--cmacro|rt-test-result-with-condition-p|rt-test-result-with-condition-should-forms--cmacro|rt-test-result-with-condition-should-forms|rt-test-skipped-backtrace--cmacro|rt-test-skipped-backtrace|rt-test-skipped-condition--cmacro|rt-test-skipped-condition|rt-test-skipped-infos--cmacro|rt-test-skipped-infos|rt-test-skipped-messages--cmacro|rt-test-skipped-messages|rt-test-skipped-p--cmacro|rt-test-skipped-p|rt-test-skipped-should-forms--cmacro|rt-test-skipped-should-forms|rt-test-tags--cmacro|rt-test-tags|rt|shell/addpath|shell/define|shell/env|shell/eshell-debug|shell/exit|shell/export|shell/jobs|shell/kill|shell/setq|shell/unset|shell/wait|shell/which|shell--apply-redirections|shell--do-opts|shell--process-args|shell--process-option|shell--set-option|shell-add-to-window-buffer-names|shell-apply\\*|shell-apply-indices|shell-apply|shell-applyn|shell-arg-delimiter|shell-arg-initialize|shell-as-subcommand|shell-backward-argument|shell-begin-on-new-line|shell-beginning-of-input|shell-beginning-of-output|shell-bol|shell-buffered-print|shell-clipboard-append|shell-close-handles|shell-close-target|shell-cmd-initialize|shell-command-finished|shell-command-result|shell-command-started|shell-command-to-value|shell-command|shell-commands|shell-complete-lisp-symbols|shell-complete-variable-assignment|shell-complete-variable-reference|shell-condition-case|shell-convert|shell-copy-environment|shell-copy-handles|shell-copy-old-input|shell-copy-tree|shell-create-handles|shell-current-ange-uids|shell-debug-command|shell-debug-show-parsed-args|shell-directory-files-and-attributes|shell-directory-files|shell-do-command-to-value|shell-do-eval|shell-do-pipelines-synchronously|shell-do-pipelines|shell-do-subjob|shell-end-of-output|shell-environment-variables|shell-envvar-names|shell-error|shell-errorn|shell-escape-arg|shell-eval\\*|shell-eval-command|shell-eval-using-options|shell-eval|shell-evaln|shell-exec-lisp|shell-execute-pipeline|shell-exit-success-p|shell-explicit-command|shell-ext-initialize|shell-external-command|shell-file-attributes|shell-find-alias-function|shell-find-delimiter|shell-find-interpreter|shell-find-tag|shell-finish-arg|shell-flatten-and-stringify|shell-flatten-list|shell-flush|shell-for|shell-forward-argument|shell-funcall\\*|shell-funcall|shell-funcalln|shell-gather-process-output|shell-get-old-input|shell-get-target|shell-get-variable|shell-goto-input-start|shell-group-id|shell-group-name|shell-handle-ansi-color|shell-handle-control-codes|shell-handle-local-variables|shell-index-value|shell-init-print-buffer|shell-insert-buffer-name|shell-insert-envvar|shell-insert-process|shell-insertion-filter|shell-interactive-output-p|shell-interactive-print|shell-interactive-process|shell-intercept-commands|shell-interpolate-variable|shell-interrupt-process|shell-invoke-batch-file|shell-invoke-directly|shell-invokify-arg|shell-io-initialize|shell-kill-append|shell-kill-buffer-function|shell-kill-input|shell-kill-new|shell-kill-output|shell-kill-process-function|shell-kill-process|shell-life-is-too-much|shell-lisp-command\\*|shell-lisp-command|shell-looking-at-backslash-return|shell-make-private-directory|shell-manipulate|shell-mark-output|shell-mode|shell-move-argument|shell-named-command\\*|shell-named-command|shell-needs-pipe-p|shell-no-command-conversion|shell-operator|shell-output-filter|shell-output-object-to-target|shell-output-object|shell-parse-ange-ls|shell-parse-argument|shell-parse-arguments|shell-parse-backslash|shell-parse-colon-path|shell-parse-command-input|shell-parse-command|shell-parse-delimiter|shell-parse-double-quote|shell-parse-indices|shell-parse-lisp-argument|shell-parse-literal-quote|shell-parse-pipeline|shell-parse-redirection|shell-parse-special-reference|shell-parse-subcommand-argument|shell-parse-variable-ref|shell-parse-variable|shell-plain-command|shell-postoutput-scroll-to-bottom|shell-preinput-scroll-to-bottom|shell-print|shell-printable-size|shell-printn|shell-proc-initialize|shell-process-identity|shell-process-interact|shell-processp|shell-protect-handles|shell-protect|shell-push-command-mark|shell-query-kill-processes|shell-queue-input|shell-quit-process|shell-quote-argument|shell-quote-backslash|shell-read-group-names|shell-read-host-names|shell-read-hosts-file|shell-read-hosts|shell-read-passwd-file|shell-read-passwd|shell-read-process-name|shell-read-user-names|shell-record-process-object|shell-redisplay|shell-regexp-arg|shell-remote-command|shell-remove-from-window-buffer-names|shell-remove-process-entry|shell-repeat-argument|shell-report-bug|shell-reset-after-proc|shell-reset|shell-resolve-current-argument|shell-resume-command|shell-resume-eval|shell-return-exits-minibuffer|shell-rewrite-for-command|shell-rewrite-if-command|shell-rewrite-initial-subcommand|shell-rewrite-named-command|shell-rewrite-sexp-command|shell-rewrite-while-command|shell-round-robin-kill|shell-run-output-filters|shell-script-interpreter|shell-search-path|shell-self-insert-command|shell-send-eof-to-process|shell-send-input|shell-send-invisible|shell-sentinel|shell-separate-commands|shell-set-output-handle|shell-show-maximum-output|shell-show-output|shell-show-usage|shell-split-path|shell-stringify-list|shell-stringify|shell-strip-redirections|shell-structure-basic-command|shell-subcommand-arg-values|shell-subgroups|shell-sublist|shell-substring|shell-to-flat-string|shell-toggle-direct-send|shell-trap-errors|shell-truncate-buffer|shell-under-windows-p|shell-uniqify-list|shell-unload-all-modules|shell-unload-extension-modules|shell-update-markers|shell-user-id|shell-user-name|shell-using-module|shell-var-initialize|shell-variables-list|shell-wait-for-process|shell-watch-for-password-prompt|shell-winnow-list|shell-with-file-modes|shell-with-private-file-modes|shell|tags--xref-find-definitions|tags-file-of-tag|tags-goto-tag-location|tags-list-tags|tags-recognize-tags-table|tags-snarf-tag|tags-tags-apropos-additional|tags-tags-apropos|tags-tags-completion-table|tags-tags-included-tables|tags-tags-table-files|tags-verify-tags-table|tags-xref-find|thio-composition-function|thio-fidel-to-java-buffer|thio-fidel-to-sera-buffer|thio-fidel-to-sera-marker|thio-fidel-to-sera-region|thio-fidel-to-tex-buffer|thio-find-file|thio-input-special-character|thio-insert-ethio-space|thio-java-to-fidel-buffer|thio-modify-vowel|thio-replace-space|thio-sera-to-fidel-buffer|thio-sera-to-fidel-marker|thio-sera-to-fidel-region|thio-tex-to-fidel-buffer|thio-write-file|typecase|udc-add-field-to-records|udc-bookmark-current-server|udc-bookmark-server|udc-caar|udc-cadr|udc-cdaar|udc-cdar|udc-customize|udc-default-set|udc-display-generic-binary|udc-display-jpeg-as-button|udc-display-jpeg-inline|udc-display-mail|udc-display-records|udc-display-sound|udc-display-url|udc-distribute-field-on-records|udc-edit-hotlist|udc-expand-inline|udc-extract-n-word-formats|udc-filter-duplicate-attributes|udc-filter-partial-records|udc-format-attribute-name-for-display|udc-format-query|udc-get-attribute-list|udc-get-email|udc-get-phone|udc-insert-record-at-point-into-bbdb|udc-install-menu|udc-lax-plist-get|udc-load-eudc|udc-menu|udc-mode|udc-move-to-next-record|udc-move-to-previous-record|udc-plist-get|udc-plist-member)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1153,7 +1153,7 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:file-cache-file-name|file-cache-files-matching-internal|file-cache-files-matching|file-cache-minibuffer-complete|file-cache-mouse-choose-completion|file-dependents|file-loadhist-lookup|file-modes-char-to-right|file-modes-char-to-who|file-modes-rights-to-number|file-name-non-special|file-name-shadow-mode|file-notify--event-cookie|file-notify--event-file-name|file-notify--event-file1-name|file-notify-callback|file-notify-handle-event|file-of-tag|file-provides|file-requires|file-set-intersect|file-size-human-readable|file-tree-walk|filesets-add-buffer|filesets-alist-get|filesets-browse-dir|filesets-browser-name|filesets-build-dir-submenu-now|filesets-build-dir-submenu|filesets-build-ingroup-submenu|filesets-build-menu-maybe|filesets-build-menu-now|filesets-build-menu|filesets-build-submenu|filesets-close|filesets-cmd-get-args|filesets-cmd-get-def|filesets-cmd-get-fn|filesets-cmd-isearch-getargs|filesets-cmd-query-replace-getargs|filesets-cmd-query-replace-regexp-getargs|filesets-cmd-shell-command-getargs|filesets-cmd-shell-command|filesets-cmd-show-result|filesets-conditional-sort|filesets-convert-path-list|filesets-convert-patterns|filesets-customize|filesets-data-get-data|filesets-data-get-name|filesets-data-get|filesets-data-set-default|filesets-data-set|filesets-directory-files|filesets-edit|filesets-entry-get-dormant-flag|filesets-entry-get-file|filesets-entry-get-files|filesets-entry-get-filter-dirs-flag|filesets-entry-get-master|filesets-entry-get-open-fn|filesets-entry-get-pattern--dir|filesets-entry-get-pattern--pattern|filesets-entry-get-pattern|filesets-entry-get-save-fn|filesets-entry-get-tree-max-level|filesets-entry-get-tree|filesets-entry-get-verbosity|filesets-entry-mode|filesets-entry-set-files|filesets-error|filesets-eviewer-constraint-p|filesets-eviewer-get-props|filesets-exit|filesets-file-close|filesets-file-open|filesets-files-equalp|filesets-files-in-same-directory-p|filesets-filetype-get-prop|filesets-filetype-property|filesets-filter-dir-names|filesets-filter-list|filesets-find-file-using|filesets-find-file|filesets-find-or-display-file|filesets-get-cmd-menu|filesets-get-external-viewer-by-name|filesets-get-external-viewer|filesets-get-filelist|filesets-get-fileset-from-name|filesets-get-fileset-name|filesets-get-menu-epilog|filesets-get-quoted-selection|filesets-get-selection|filesets-get-shortcut|filesets-goto-homepage|filesets-info|filesets-ingroup-cache-get|filesets-ingroup-cache-put|filesets-ingroup-collect-build-menu|filesets-ingroup-collect-files|filesets-ingroup-collect-finder|filesets-ingroup-collect|filesets-ingroup-get-data|filesets-ingroup-get-pattern|filesets-ingroup-get-remdupl-p|filesets-init|filesets-member|filesets-menu-cache-file-load|filesets-menu-cache-file-save-maybe|filesets-menu-cache-file-save|filesets-message|filesets-open|filesets-ormap|filesets-quote|filesets-rebuild-this-submenu|filesets-remake-shortcut|filesets-remove-buffer|filesets-remove-from-ubl|filesets-reset-filename-on-change|filesets-reset-fileset|filesets-run-cmd--repl-fn|filesets-run-cmd|filesets-save-config|filesets-select-command|filesets-set-config|filesets-set-default!|filesets-set-default\\+|filesets-set-default|filesets-some|filesets-spawn-external-viewer|filesets-sublist|filesets-update-cleanup|filesets-update-pre010505|filesets-update|filesets-which-command-p|filesets-which-command|filesets-which-file|filesets-wrap-submenu|fill-comment-paragraph|fill-common-string-prefix|fill-delete-newlines|fill-delete-prefix|fill-find-break-point|fill-flowed-encode|fill-flowed|fill-forward-paragraph|fill-french-nobreak-p|fill-indent-to-left-margin|fill-individual-paragraphs-citation|fill-individual-paragraphs-prefix|fill-match-adaptive-prefix|fill-minibuffer-function|fill-move-to-break-point|fill-newline|fill-nobreak-p|fill-nonuniform-paragraphs|fill-single-char-nobreak-p|fill-single-word-nobreak-p|fill-text-properties-at|fill|filtered-frame-list|find-alternate-file-other-window|find-alternate-file|find-change-log|find-class|find-cmd|find-cmpl-prefix-entry|find-coding-systems-region-internal|find-composition-internal|find-composition|find-definition-noselect|find-dired-filter|find-dired-sentinel|find-dired|find-emacs-lisp-shadows|find-exact-completion|find-face-definition|find-file--read-only|find-file-at-point|find-file-existing|find-file-literally-at-point|find-file-noselect-1|find-file-other-frame|find-file-read-args|find-file-read-only-other-frame|find-file-read-only-other-window|find-function-C-source|find-function-advised-original|find-function-at-point|find-function-do-it|find-function-library|find-function-noselect|find-function-on-key|find-function-other-frame|find-function-other-window|find-function-read|find-function-search-for-symbol|find-function-setup-keys|find-function|find-grep-dired|find-grep|find-if-not|find-if|find-library--load-name|find-library-name|find-library-suffixes|find-library|find-lisp-debug-message|find-lisp-default-directory-predicate|find-lisp-default-file-predicate|find-lisp-file-predicate-is-directory|find-lisp-find-dired-filter|find-lisp-find-dired-insert-file|find-lisp-find-dired-internal|find-lisp-find-dired-subdirectories|find-lisp-find-dired|find-lisp-find-files-internal|find-lisp-find-files|find-lisp-format-time|find-lisp-format|find-lisp-insert-directory|find-lisp-object-file-name|find-lisp-time-index|find-multibyte-characters|find-name-dired|find-new-buffer-file-coding-system|find-tag-default-as-regexp|find-tag-default-as-symbol-regexp|find-tag-default-bounds|find-tag-default|find-tag-in-order|find-tag-interactive|find-tag-noselect|find-tag-other-frame|find-tag-other-window|find-tag-regexp|find-tag-tag|find-tag|find-variable-at-point|find-variable-noselect|find-variable-other-frame|find-variable-other-window|find-variable|find|finder-by-keyword|finder-commentary|finder-compile-keywords-make-dist|finder-compile-keywords|finder-current-item|finder-exit|finder-goto-xref|finder-insert-at-column|finder-list-keywords|finder-list-matches|finder-mode|finder-mouse-face-on-line|finder-mouse-select|finder-select|finder-summary|finder-unknown-keywords|finder-unload-function|finger|first-error|first|floatp-safe|floor\\*|flush-lines|flymake-add-buildfile-to-cache|flymake-add-err-info|flymake-add-line-err-info|flymake-add-project-include-dirs-to-cache|flymake-after-change-function|flymake-after-save-hook|flymake-can-syntax-check-file|flymake-check-include|flymake-check-patch-master-file-buffer|flymake-clear-buildfile-cache|flymake-clear-project-include-dirs-cache|flymake-compilation-is-running|flymake-compile|flymake-copy-buffer-to-temp-buffer|flymake-create-master-file|flymake-create-temp-inplace|flymake-create-temp-with-folder-structure|flymake-delete-own-overlays|flymake-delete-temp-directory|flymake-display-err-menu-for-current-line|flymake-display-warning|flymake-er-get-line-err-info-list|flymake-er-get-line|flymake-er-make-er|flymake-find-buffer-for-file|flymake-find-buildfile|flymake-find-err-info|flymake-find-file-hook|flymake-find-make-buildfile|flymake-find-possible-master-files|flymake-fix-file-name|flymake-fix-line-numbers|flymake-get-ant-cmdline|flymake-get-buildfile-from-cache|flymake-get-cleanup-function|flymake-get-err-count|flymake-get-file-name-mode-and-masks|flymake-get-first-err-line-no|flymake-get-full-nonpatched-file-name|flymake-get-full-patched-file-name|flymake-get-include-dirs-dot|flymake-get-include-dirs|flymake-get-init-function|flymake-get-last-err-line-no|flymake-get-line-err-count|flymake-get-make-cmdline|flymake-get-next-err-line-no|flymake-get-prev-err-line-no|flymake-get-project-include-dirs-from-cache|flymake-get-project-include-dirs-imp|flymake-get-project-include-dirs|flymake-get-real-file-name-function|flymake-get-real-file-name|flymake-get-syntax-check-program-args|flymake-get-system-include-dirs|flymake-get-tex-args|flymake-goto-file-and-line|flymake-goto-line|flymake-goto-next-error|flymake-goto-prev-error|flymake-highlight-err-lines|flymake-highlight-line|flymake-init-create-temp-buffer-copy|flymake-init-create-temp-source-and-master-buffer-copy|flymake-init-find-buildfile-dir|flymake-ins-after|flymake-kill-buffer-hook|flymake-kill-process|flymake-ler-file--cmacro|flymake-ler-file|flymake-ler-full-file--cmacro|flymake-ler-full-file|flymake-ler-line--cmacro|flymake-ler-line|flymake-ler-make-ler--cmacro|flymake-ler-make-ler|flymake-ler-p--cmacro|flymake-ler-p|flymake-ler-set-file|flymake-ler-set-full-file|flymake-ler-set-line|flymake-ler-text--cmacro|flymake-ler-text|flymake-ler-type--cmacro|flymake-ler-type|flymake-line-err-info-is-less-or-equal|flymake-log|flymake-make-overlay|flymake-master-cleanup|flymake-master-file-compare|flymake-master-make-header-init|flymake-master-make-init|flymake-master-tex-init|flymake-mode-off|flymake-mode-on|flymake-mode|flymake-on-timer-event|flymake-overlay-p|flymake-parse-err-lines|flymake-parse-line|flymake-parse-output-and-residual|flymake-parse-residual|flymake-patch-err-text|flymake-perl-init|flymake-php-init|flymake-popup-current-error-menu|flymake-post-syntax-check|flymake-process-filter|flymake-process-sentinel|flymake-read-file-to-temp-buffer|flymake-reformat-err-line-patterns-from-compile-el|flymake-region-has-flymake-overlays|flymake-replace-region|flymake-report-fatal-status|flymake-report-status|flymake-safe-delete-directory|flymake-safe-delete-file|flymake-same-files|flymake-save-buffer-in-file|flymake-set-at|flymake-simple-ant-java-init|flymake-simple-cleanup|flymake-simple-java-cleanup|flymake-simple-make-init-impl|flymake-simple-make-init|flymake-simple-make-java-init|flymake-simple-tex-init|flymake-skip-whitespace|flymake-split-output|flymake-start-syntax-check-process|flymake-start-syntax-check|flymake-stop-all-syntax-checks|flymake-xml-init|flyspell-abbrev-table|flyspell-accept-buffer-local-defs|flyspell-after-change-function|flyspell-ajust-cursor-point|flyspell-already-abbrevp|flyspell-auto-correct-previous-hook|flyspell-auto-correct-previous-word|flyspell-auto-correct-word|flyspell-buffer|flyspell-change-abbrev|flyspell-check-changed-word-p|flyspell-check-pre-word-p|flyspell-check-previous-highlighted-word|flyspell-check-region-doublons|flyspell-check-word-p|flyspell-correct-word-before-point|flyspell-correct-word|flyspell-debug-signal-changed-checked|flyspell-debug-signal-no-check|flyspell-debug-signal-pre-word-checked|flyspell-debug-signal-word-checked|flyspell-define-abbrev|flyspell-delay-command|flyspell-delay-commands|flyspell-delete-all-overlays|flyspell-delete-region-overlays|flyspell-deplacement-command|flyspell-deplacement-commands|flyspell-display-next-corrections|flyspell-do-correct|flyspell-emacs-popup|flyspell-external-point-words|flyspell-generic-progmode-verify|flyspell-get-casechars|flyspell-get-not-casechars|flyspell-get-word|flyspell-goto-next-error|flyspell-hack-local-variables-hook|flyspell-highlight-duplicate-region|flyspell-highlight-incorrect-region|flyspell-kill-ispell-hook|flyspell-large-region|flyspell-math-tex-command-p|flyspell-maybe-correct-doubling|flyspell-maybe-correct-transposition|flyspell-minibuffer-p|flyspell-mode-off|flyspell-mode-on|flyspell-mode|flyspell-notify-misspell|flyspell-overlay-p|flyspell-post-command-hook|flyspell-pre-command-hook|flyspell-process-localwords|flyspell-prog-mode|flyspell-properties-at-p|flyspell-region|flyspell-small-region|flyspell-tex-command-p|flyspell-unhighlight-at|flyspell-word-search-backward|flyspell-word-search-forward|flyspell-word|flyspell-xemacs-popup|focus-frame|foldout-exit-fold|foldout-mouse-goto-heading|foldout-mouse-hide-or-exit|foldout-mouse-show|foldout-mouse-swallow-events|foldout-mouse-zoom|foldout-update-mode-line|foldout-zoom-subtree|follow--window-sorter|follow-adjust-window|follow-align-compilation-windows|follow-all-followers|follow-avoid-tail-recenter|follow-cache-valid-p|follow-calc-win-end|follow-calc-win-start|follow-calculate-first-window-start-from-above|follow-calculate-first-window-start-from-below|follow-comint-scroll-to-bottom|follow-debug-message|follow-delete-other-windows-and-split|follow-end-of-buffer|follow-estimate-first-window-start|follow-find-file-hook|follow-first-window|follow-last-window|follow-maximize-region|follow-menu-filter|follow-mode|follow-mwheel-scroll|follow-next-window|follow-point-visible-all-windows-p|follow-pos-visible|follow-post-command-hook|follow-previous-window|follow-recenter|follow-redisplay|follow-redraw-after-event|follow-redraw|follow-scroll-bar-drag|follow-scroll-bar-scroll-down)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)f(?:ile-cache-file-name|ile-cache-files-matching-internal|ile-cache-files-matching|ile-cache-minibuffer-complete|ile-cache-mouse-choose-completion|ile-dependents|ile-loadhist-lookup|ile-modes-char-to-right|ile-modes-char-to-who|ile-modes-rights-to-number|ile-name-non-special|ile-name-shadow-mode|ile-notify--event-cookie|ile-notify--event-file-name|ile-notify--event-file1-name|ile-notify-callback|ile-notify-handle-event|ile-of-tag|ile-provides|ile-requires|ile-set-intersect|ile-size-human-readable|ile-tree-walk|ilesets-add-buffer|ilesets-alist-get|ilesets-browse-dir|ilesets-browser-name|ilesets-build-dir-submenu-now|ilesets-build-dir-submenu|ilesets-build-ingroup-submenu|ilesets-build-menu-maybe|ilesets-build-menu-now|ilesets-build-menu|ilesets-build-submenu|ilesets-close|ilesets-cmd-get-args|ilesets-cmd-get-def|ilesets-cmd-get-fn|ilesets-cmd-isearch-getargs|ilesets-cmd-query-replace-getargs|ilesets-cmd-query-replace-regexp-getargs|ilesets-cmd-shell-command-getargs|ilesets-cmd-shell-command|ilesets-cmd-show-result|ilesets-conditional-sort|ilesets-convert-path-list|ilesets-convert-patterns|ilesets-customize|ilesets-data-get-data|ilesets-data-get-name|ilesets-data-get|ilesets-data-set-default|ilesets-data-set|ilesets-directory-files|ilesets-edit|ilesets-entry-get-dormant-flag|ilesets-entry-get-file|ilesets-entry-get-files|ilesets-entry-get-filter-dirs-flag|ilesets-entry-get-master|ilesets-entry-get-open-fn|ilesets-entry-get-pattern--dir|ilesets-entry-get-pattern--pattern|ilesets-entry-get-pattern|ilesets-entry-get-save-fn|ilesets-entry-get-tree-max-level|ilesets-entry-get-tree|ilesets-entry-get-verbosity|ilesets-entry-mode|ilesets-entry-set-files|ilesets-error|ilesets-eviewer-constraint-p|ilesets-eviewer-get-props|ilesets-exit|ilesets-file-close|ilesets-file-open|ilesets-files-equalp|ilesets-files-in-same-directory-p|ilesets-filetype-get-prop|ilesets-filetype-property|ilesets-filter-dir-names|ilesets-filter-list|ilesets-find-file-using|ilesets-find-file|ilesets-find-or-display-file|ilesets-get-cmd-menu|ilesets-get-external-viewer-by-name|ilesets-get-external-viewer|ilesets-get-filelist|ilesets-get-fileset-from-name|ilesets-get-fileset-name|ilesets-get-menu-epilog|ilesets-get-quoted-selection|ilesets-get-selection|ilesets-get-shortcut|ilesets-goto-homepage|ilesets-info|ilesets-ingroup-cache-get|ilesets-ingroup-cache-put|ilesets-ingroup-collect-build-menu|ilesets-ingroup-collect-files|ilesets-ingroup-collect-finder|ilesets-ingroup-collect|ilesets-ingroup-get-data|ilesets-ingroup-get-pattern|ilesets-ingroup-get-remdupl-p|ilesets-init|ilesets-member|ilesets-menu-cache-file-load|ilesets-menu-cache-file-save-maybe|ilesets-menu-cache-file-save|ilesets-message|ilesets-open|ilesets-ormap|ilesets-quote|ilesets-rebuild-this-submenu|ilesets-remake-shortcut|ilesets-remove-buffer|ilesets-remove-from-ubl|ilesets-reset-filename-on-change|ilesets-reset-fileset|ilesets-run-cmd--repl-fn|ilesets-run-cmd|ilesets-save-config|ilesets-select-command|ilesets-set-config|ilesets-set-default!|ilesets-set-default\\+|ilesets-set-default|ilesets-some|ilesets-spawn-external-viewer|ilesets-sublist|ilesets-update-cleanup|ilesets-update-pre010505|ilesets-update|ilesets-which-command-p|ilesets-which-command|ilesets-which-file|ilesets-wrap-submenu|ill-comment-paragraph|ill-common-string-prefix|ill-delete-newlines|ill-delete-prefix|ill-find-break-point|ill-flowed-encode|ill-flowed|ill-forward-paragraph|ill-french-nobreak-p|ill-indent-to-left-margin|ill-individual-paragraphs-citation|ill-individual-paragraphs-prefix|ill-match-adaptive-prefix|ill-minibuffer-function|ill-move-to-break-point|ill-newline|ill-nobreak-p|ill-nonuniform-paragraphs|ill-single-char-nobreak-p|ill-single-word-nobreak-p|ill-text-properties-at|ill|iltered-frame-list|ind-alternate-file-other-window|ind-alternate-file|ind-change-log|ind-class|ind-cmd|ind-cmpl-prefix-entry|ind-coding-systems-region-internal|ind-composition-internal|ind-composition|ind-definition-noselect|ind-dired-filter|ind-dired-sentinel|ind-dired|ind-emacs-lisp-shadows|ind-exact-completion|ind-face-definition|ind-file--read-only|ind-file-at-point|ind-file-existing|ind-file-literally-at-point|ind-file-noselect-1|ind-file-other-frame|ind-file-read-args|ind-file-read-only-other-frame|ind-file-read-only-other-window|ind-function-C-source|ind-function-advised-original|ind-function-at-point|ind-function-do-it|ind-function-library|ind-function-noselect|ind-function-on-key|ind-function-other-frame|ind-function-other-window|ind-function-read|ind-function-search-for-symbol|ind-function-setup-keys|ind-function|ind-grep-dired|ind-grep|ind-if-not|ind-if|ind-library--load-name|ind-library-name|ind-library-suffixes|ind-library|ind-lisp-debug-message|ind-lisp-default-directory-predicate|ind-lisp-default-file-predicate|ind-lisp-file-predicate-is-directory|ind-lisp-find-dired-filter|ind-lisp-find-dired-insert-file|ind-lisp-find-dired-internal|ind-lisp-find-dired-subdirectories|ind-lisp-find-dired|ind-lisp-find-files-internal|ind-lisp-find-files|ind-lisp-format-time|ind-lisp-format|ind-lisp-insert-directory|ind-lisp-object-file-name|ind-lisp-time-index|ind-multibyte-characters|ind-name-dired|ind-new-buffer-file-coding-system|ind-tag-default-as-regexp|ind-tag-default-as-symbol-regexp|ind-tag-default-bounds|ind-tag-default|ind-tag-in-order|ind-tag-interactive|ind-tag-noselect|ind-tag-other-frame|ind-tag-other-window|ind-tag-regexp|ind-tag-tag|ind-tag|ind-variable-at-point|ind-variable-noselect|ind-variable-other-frame|ind-variable-other-window|ind-variable|ind|inder-by-keyword|inder-commentary|inder-compile-keywords-make-dist|inder-compile-keywords|inder-current-item|inder-exit|inder-goto-xref|inder-insert-at-column|inder-list-keywords|inder-list-matches|inder-mode|inder-mouse-face-on-line|inder-mouse-select|inder-select|inder-summary|inder-unknown-keywords|inder-unload-function|inger|irst-error|irst|loatp-safe|loor\\*|lush-lines|lymake-add-buildfile-to-cache|lymake-add-err-info|lymake-add-line-err-info|lymake-add-project-include-dirs-to-cache|lymake-after-change-function|lymake-after-save-hook|lymake-can-syntax-check-file|lymake-check-include|lymake-check-patch-master-file-buffer|lymake-clear-buildfile-cache|lymake-clear-project-include-dirs-cache|lymake-compilation-is-running|lymake-compile|lymake-copy-buffer-to-temp-buffer|lymake-create-master-file|lymake-create-temp-inplace|lymake-create-temp-with-folder-structure|lymake-delete-own-overlays|lymake-delete-temp-directory|lymake-display-err-menu-for-current-line|lymake-display-warning|lymake-er-get-line-err-info-list|lymake-er-get-line|lymake-er-make-er|lymake-find-buffer-for-file|lymake-find-buildfile|lymake-find-err-info|lymake-find-file-hook|lymake-find-make-buildfile|lymake-find-possible-master-files|lymake-fix-file-name|lymake-fix-line-numbers|lymake-get-ant-cmdline|lymake-get-buildfile-from-cache|lymake-get-cleanup-function|lymake-get-err-count|lymake-get-file-name-mode-and-masks|lymake-get-first-err-line-no|lymake-get-full-nonpatched-file-name|lymake-get-full-patched-file-name|lymake-get-include-dirs-dot|lymake-get-include-dirs|lymake-get-init-function|lymake-get-last-err-line-no|lymake-get-line-err-count|lymake-get-make-cmdline|lymake-get-next-err-line-no|lymake-get-prev-err-line-no|lymake-get-project-include-dirs-from-cache|lymake-get-project-include-dirs-imp|lymake-get-project-include-dirs|lymake-get-real-file-name-function|lymake-get-real-file-name|lymake-get-syntax-check-program-args|lymake-get-system-include-dirs|lymake-get-tex-args|lymake-goto-file-and-line|lymake-goto-line|lymake-goto-next-error|lymake-goto-prev-error|lymake-highlight-err-lines|lymake-highlight-line|lymake-init-create-temp-buffer-copy|lymake-init-create-temp-source-and-master-buffer-copy|lymake-init-find-buildfile-dir|lymake-ins-after|lymake-kill-buffer-hook|lymake-kill-process|lymake-ler-file--cmacro|lymake-ler-file|lymake-ler-full-file--cmacro|lymake-ler-full-file|lymake-ler-line--cmacro|lymake-ler-line|lymake-ler-make-ler--cmacro|lymake-ler-make-ler|lymake-ler-p--cmacro|lymake-ler-p|lymake-ler-set-file|lymake-ler-set-full-file|lymake-ler-set-line|lymake-ler-text--cmacro|lymake-ler-text|lymake-ler-type--cmacro|lymake-ler-type|lymake-line-err-info-is-less-or-equal|lymake-log|lymake-make-overlay|lymake-master-cleanup|lymake-master-file-compare|lymake-master-make-header-init|lymake-master-make-init|lymake-master-tex-init|lymake-mode-off|lymake-mode-on|lymake-mode|lymake-on-timer-event|lymake-overlay-p|lymake-parse-err-lines|lymake-parse-line|lymake-parse-output-and-residual|lymake-parse-residual|lymake-patch-err-text|lymake-perl-init|lymake-php-init|lymake-popup-current-error-menu|lymake-post-syntax-check|lymake-process-filter|lymake-process-sentinel|lymake-read-file-to-temp-buffer|lymake-reformat-err-line-patterns-from-compile-el|lymake-region-has-flymake-overlays|lymake-replace-region|lymake-report-fatal-status|lymake-report-status|lymake-safe-delete-directory|lymake-safe-delete-file|lymake-same-files|lymake-save-buffer-in-file|lymake-set-at|lymake-simple-ant-java-init|lymake-simple-cleanup|lymake-simple-java-cleanup|lymake-simple-make-init-impl|lymake-simple-make-init|lymake-simple-make-java-init|lymake-simple-tex-init|lymake-skip-whitespace|lymake-split-output|lymake-start-syntax-check-process|lymake-start-syntax-check|lymake-stop-all-syntax-checks|lymake-xml-init|lyspell-abbrev-table|lyspell-accept-buffer-local-defs|lyspell-after-change-function|lyspell-ajust-cursor-point|lyspell-already-abbrevp|lyspell-auto-correct-previous-hook|lyspell-auto-correct-previous-word|lyspell-auto-correct-word|lyspell-buffer|lyspell-change-abbrev|lyspell-check-changed-word-p|lyspell-check-pre-word-p|lyspell-check-previous-highlighted-word|lyspell-check-region-doublons|lyspell-check-word-p|lyspell-correct-word-before-point|lyspell-correct-word|lyspell-debug-signal-changed-checked|lyspell-debug-signal-no-check|lyspell-debug-signal-pre-word-checked|lyspell-debug-signal-word-checked|lyspell-define-abbrev|lyspell-delay-command|lyspell-delay-commands|lyspell-delete-all-overlays|lyspell-delete-region-overlays|lyspell-deplacement-command|lyspell-deplacement-commands|lyspell-display-next-corrections|lyspell-do-correct|lyspell-emacs-popup|lyspell-external-point-words|lyspell-generic-progmode-verify|lyspell-get-casechars|lyspell-get-not-casechars|lyspell-get-word|lyspell-goto-next-error|lyspell-hack-local-variables-hook|lyspell-highlight-duplicate-region|lyspell-highlight-incorrect-region|lyspell-kill-ispell-hook|lyspell-large-region|lyspell-math-tex-command-p|lyspell-maybe-correct-doubling|lyspell-maybe-correct-transposition|lyspell-minibuffer-p|lyspell-mode-off|lyspell-mode-on|lyspell-mode|lyspell-notify-misspell|lyspell-overlay-p|lyspell-post-command-hook|lyspell-pre-command-hook|lyspell-process-localwords|lyspell-prog-mode|lyspell-properties-at-p|lyspell-region|lyspell-small-region|lyspell-tex-command-p|lyspell-unhighlight-at|lyspell-word-search-backward|lyspell-word-search-forward|lyspell-word|lyspell-xemacs-popup|ocus-frame|oldout-exit-fold|oldout-mouse-goto-heading|oldout-mouse-hide-or-exit|oldout-mouse-show|oldout-mouse-swallow-events|oldout-mouse-zoom|oldout-update-mode-line|oldout-zoom-subtree|ollow--window-sorter|ollow-adjust-window|ollow-align-compilation-windows|ollow-all-followers|ollow-avoid-tail-recenter|ollow-cache-valid-p|ollow-calc-win-end|ollow-calc-win-start|ollow-calculate-first-window-start-from-above|ollow-calculate-first-window-start-from-below|ollow-comint-scroll-to-bottom|ollow-debug-message|ollow-delete-other-windows-and-split|ollow-end-of-buffer|ollow-estimate-first-window-start|ollow-find-file-hook|ollow-first-window|ollow-last-window|ollow-maximize-region|ollow-menu-filter|ollow-mode|ollow-mwheel-scroll|ollow-next-window|ollow-point-visible-all-windows-p|ollow-pos-visible|ollow-post-command-hook|ollow-previous-window|ollow-recenter|ollow-redisplay|ollow-redraw-after-event|ollow-redraw|ollow-scroll-bar-drag|ollow-scroll-bar-scroll-down)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1161,7 +1161,7 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:gdb-put-breakpoint-icon|gdb-put-string|gdb-read-memory-custom|gdb-read-memory-handler|gdb-register-names-handler|gdb-registers-buffer-name|gdb-registers-handler-custom|gdb-registers-handler|gdb-registers-mode|gdb-remove-all-pending-triggers|gdb-remove-breakpoint-icons|gdb-remove-strings|gdb-reset|gdb-restore-windows|gdb-resync|gdb-rules-buffer-mode|gdb-rules-name-maker|gdb-rules-update-trigger|gdb-running|gdb-script-beginning-of-defun|gdb-script-calculate-indentation|gdb-script-end-of-defun|gdb-script-font-lock-syntactic-face|gdb-script-indent-line|gdb-script-mode|gdb-script-skip-to-head|gdb-select-frame|gdb-select-thread|gdb-send|gdb-set-buffer-rules|gdb-set-window-buffer|gdb-setq-thread-number|gdb-setup-windows|gdb-shell|gdb-show-run-p|gdb-show-stop-p|gdb-speedbar-auto-raise|gdb-speedbar-expand-node|gdb-speedbar-timer-fn|gdb-speedbar-update|gdb-stack-buffer-name|gdb-stack-list-frames-custom|gdb-stack-list-frames-handler|gdb-starting|gdb-step-thread|gdb-stopped|gdb-strip-string-backslash|gdb-table-add-row|gdb-table-column-sizes--cmacro|gdb-table-column-sizes|gdb-table-p--cmacro|gdb-table-p|gdb-table-right-align--cmacro|gdb-table-right-align|gdb-table-row-properties--cmacro|gdb-table-row-properties|gdb-table-rows--cmacro|gdb-table-rows|gdb-table-string|gdb-thread-created|gdb-thread-exited|gdb-thread-list-handler-custom|gdb-thread-list-handler|gdb-thread-selected|gdb-threads-buffer-name|gdb-threads-mode|gdb-toggle-breakpoint|gdb-toggle-switch-when-another-stopped|gdb-tooltip-print-1|gdb-tooltip-print|gdb-update-buffer-name|gdb-update-gud-running|gdb-update|gdb-var-create-handler|gdb-var-delete-1|gdb-var-delete-children|gdb-var-delete|gdb-var-evaluate-expression-handler|gdb-var-list-children-handler|gdb-var-list-children|gdb-var-set-format|gdb-var-update-handler|gdb-var-update|gdb-wait-for-pending|gdb|gdbmi-bnf-async-record|gdbmi-bnf-console-stream-output|gdbmi-bnf-gdb-prompt|gdbmi-bnf-incomplete-record-result|gdbmi-bnf-init|gdbmi-bnf-log-stream-output|gdbmi-bnf-out-of-band-record|gdbmi-bnf-output|gdbmi-bnf-result-and-async-record-impl|gdbmi-bnf-result-record|gdbmi-bnf-skip-unrecognized|gdbmi-bnf-stream-record|gdbmi-bnf-target-stream-output|gdbmi-is-number|gdbmi-same-start|gdbmi-start-with|generate-fontset-menu|generic-char-p|generic-make-keywords-list|generic-mode-internal|generic-mode|generic-p|generic-primary-only-one-p|generic-primary-only-p|gensym|gentemp|get\\*|get-edebug-spec|get-file-char|get-free-disk-space|get-language-info|get-mode-local-parent|get-mru-window|get-next-valid-buffer|get-other-frame|get-scroll-bar-mode|get-unicode-property-internal|get-unused-iso-final-char|get-upcase-table|getenv-internal|getf|gfile-add-watch|gfile-rm-watch|glasses-change|glasses-convert-to-unreadable|glasses-custom-set|glasses-make-overlay|glasses-make-readable|glasses-make-unreadable|glasses-mode|glasses-overlay-p|glasses-parenthesis-exception-p|glasses-set-overlay-properties|global-auto-composition-mode|global-auto-revert-mode|global-cwarn-mode-check-buffers|global-cwarn-mode-cmhh|global-cwarn-mode-enable-in-buffers|global-cwarn-mode|global-ede-mode|global-eldoc-mode|global-font-lock-mode-check-buffers|global-font-lock-mode-cmhh|global-font-lock-mode-enable-in-buffers|global-font-lock-mode|global-hi-lock-mode-check-buffers|global-hi-lock-mode-cmhh|global-hi-lock-mode-enable-in-buffers|global-hi-lock-mode|global-highlight-changes-mode-check-buffers|global-highlight-changes-mode-cmhh|global-highlight-changes-mode-enable-in-buffers|global-highlight-changes-mode|global-highlight-changes|global-hl-line-highlight|global-hl-line-mode|global-hl-line-unhighlight-all|global-hl-line-unhighlight|global-linum-mode-check-buffers|global-linum-mode-cmhh|global-linum-mode-enable-in-buffers|global-linum-mode|global-prettify-symbols-mode-check-buffers|global-prettify-symbols-mode-cmhh|global-prettify-symbols-mode-enable-in-buffers|global-prettify-symbols-mode|global-reveal-mode|global-semantic-decoration-mode|global-semantic-highlight-edits-mode|global-semantic-highlight-func-mode|global-semantic-idle-completions-mode|global-semantic-idle-local-symbol-highlight-mode|global-semantic-idle-scheduler-mode|global-semantic-idle-summary-mode|global-semantic-mru-bookmark-mode|global-semantic-show-parser-state-mode|global-semantic-show-unmatched-syntax-mode|global-semantic-stickyfunc-mode|global-semanticdb-minor-mode|global-set-scheme-interaction-buffer|global-srecode-minor-mode|global-subword-mode|global-superword-mode|global-visual-line-mode-check-buffers|global-visual-line-mode-cmhh|global-visual-line-mode-enable-in-buffers|global-visual-line-mode|global-whitespace-mode|global-whitespace-newline-mode|global-whitespace-toggle-options|glyphless-set-char-table-range|gmm-called-interactively-p|gmm-customize-mode|gmm-error|gmm-format-time-string|gmm-image-load-path-for-library|gmm-image-search-load-path|gmm-labels|gmm-message|gmm-regexp-concat|gmm-tool-bar-from-list|gmm-widget-p|gmm-write-region|gnus--random-face-with-type|gnus-1|gnus-Folder-save-name|gnus-active|gnus-add-buffer|gnus-add-configuration|gnus-add-shutdown|gnus-add-text-properties-when|gnus-add-text-properties|gnus-add-to-sorted-list|gnus-agent-batch-fetch|gnus-agent-batch|gnus-agent-delete-group|gnus-agent-fetch-session|gnus-agent-find-parameter|gnus-agent-get-function|gnus-agent-get-undownloaded-list|gnus-agent-group-covered-p|gnus-agent-method-p|gnus-agent-possibly-alter-active|gnus-agent-possibly-save-gcc|gnus-agent-regenerate|gnus-agent-rename-group|gnus-agent-request-article|gnus-agent-retrieve-headers|gnus-agent-save-active|gnus-agent-save-group-info|gnus-agent-store-article|gnus-agentize|gnus-alist-pull|gnus-alive-p|gnus-and|gnus-annotation-in-region-p|gnus-apply-kill-file-internal|gnus-apply-kill-file|gnus-archive-server-wanted-p|gnus-article-date-lapsed|gnus-article-date-local|gnus-article-date-original|gnus-article-de-base64-unreadable|gnus-article-de-quoted-unreadable|gnus-article-decode-HZ|gnus-article-decode-encoded-words|gnus-article-delete-invisible-text|gnus-article-display-x-face|gnus-article-edit-article|gnus-article-edit-done|gnus-article-edit-mode|gnus-article-fill-cited-article|gnus-article-fill-cited-long-lines|gnus-article-hide-boring-headers|gnus-article-hide-citation-in-followups|gnus-article-hide-citation-maybe|gnus-article-hide-citation|gnus-article-hide-headers|gnus-article-hide-pem|gnus-article-hide-signature|gnus-article-highlight-citation|gnus-article-html|gnus-article-mail|gnus-article-mode|gnus-article-next-page|gnus-article-outlook-deuglify-article|gnus-article-outlook-repair-attribution|gnus-article-outlook-unwrap-lines|gnus-article-prepare-display|gnus-article-prepare|gnus-article-prev-page|gnus-article-read-summary-keys|gnus-article-remove-cr|gnus-article-remove-trailing-blank-lines|gnus-article-save|gnus-article-set-window-start|gnus-article-setup-buffer|gnus-article-strip-leading-blank-lines|gnus-article-treat-overstrike|gnus-article-unsplit-urls|gnus-article-wash-html|gnus-assq-delete-all|gnus-async-halt-prefetch|gnus-async-prefetch-article|gnus-async-prefetch-next|gnus-async-prefetch-remove-group|gnus-async-request-fetched-article|gnus-atomic-progn-assign|gnus-atomic-progn|gnus-atomic-setq|gnus-backlog-enter-article|gnus-backlog-remove-article|gnus-backlog-request-article|gnus-batch-kill|gnus-batch-score|gnus-binary-mode|gnus-bind-print-variables|gnus-blocked-images|gnus-bookmark-bmenu-list|gnus-bookmark-jump|gnus-bookmark-set|gnus-bound-and-true-p|gnus-boundp|gnus-browse-foreign-server|gnus-buffer-exists-p|gnus-buffer-live-p|gnus-buffers|gnus-bug|gnus-button-mailto|gnus-button-reply|gnus-byte-compile|gnus-cache-articles-in-group|gnus-cache-close|gnus-cache-delete-group|gnus-cache-enter-article|gnus-cache-enter-remove-article|gnus-cache-file-contents|gnus-cache-generate-active|gnus-cache-generate-nov-databases|gnus-cache-open|gnus-cache-possibly-alter-active|gnus-cache-possibly-enter-article|gnus-cache-possibly-remove-articles|gnus-cache-remove-article|gnus-cache-rename-group|gnus-cache-request-article|gnus-cache-retrieve-headers|gnus-cache-save-buffers|gnus-cache-update-article|gnus-cached-article-p|gnus-character-to-event|gnus-check-backend-function|gnus-check-reasonable-setup|gnus-completing-read|gnus-configure-windows|gnus-continuum-version|gnus-convert-article-to-rmail|gnus-convert-face-to-png|gnus-convert-gray-x-face-to-xpm|gnus-convert-image-to-gray-x-face|gnus-convert-png-to-face|gnus-copy-article-buffer|gnus-copy-file|gnus-copy-overlay|gnus-copy-sequence|gnus-create-hash-size|gnus-create-image|gnus-create-info-command|gnus-current-score-file-nondirectory|gnus-data-find|gnus-data-header|gnus-date-get-time|gnus-date-iso8601|gnus-dd-mmm|gnus-deactivate-mark|gnus-declare-backend|gnus-decode-newsgroups|gnus-define-group-parameter|gnus-define-keymap|gnus-define-keys-1|gnus-define-keys-safe|gnus-define-keys|gnus-delay-article|gnus-delay-initialize|gnus-delay-send-queue|gnus-delete-alist|gnus-delete-directory|gnus-delete-duplicates|gnus-delete-file|gnus-delete-first|gnus-delete-gnus-frame|gnus-delete-line|gnus-delete-overlay|gnus-demon-add-disconnection|gnus-demon-add-handler|gnus-demon-add-rescan|gnus-demon-add-scan-timestamps|gnus-demon-add-scanmail|gnus-demon-cancel|gnus-demon-init|gnus-demon-remove-handler|gnus-display-x-face-in-from|gnus-draft-mode|gnus-draft-reminder|gnus-dribble-enter|gnus-dribble-touch|gnus-dup-enter-articles|gnus-dup-suppress-articles|gnus-dup-unsuppress-article|gnus-edit-form|gnus-emacs-completing-read|gnus-emacs-version|gnus-ems-redefine|gnus-enter-server-buffer|gnus-ephemeral-group-p|gnus-error|gnus-eval-in-buffer-window|gnus-execute|gnus-expand-group-parameter|gnus-expand-group-parameters|gnus-expunge|gnus-extended-version|gnus-extent-detached-p|gnus-extent-start-open|gnus-extract-address-components|gnus-extract-references|gnus-face-from-file|gnus-faces-at|gnus-fetch-field|gnus-fetch-group-other-frame|gnus-fetch-group|gnus-fetch-original-field|gnus-file-newer-than|gnus-final-warning|gnus-find-method-for-group|gnus-find-subscribed-addresses|gnus-find-text-property-region|gnus-float-time|gnus-folder-save-name|gnus-frame-or-window-display-name|gnus-generate-new-group-name|gnus-get-buffer-create|gnus-get-buffer-window|gnus-get-display-table|gnus-get-info|gnus-get-text-property-excluding-characters-with-faces|gnus-getenv-nntpserver|gnus-gethash-safe|gnus-gethash|gnus-globalify-regexp|gnus-goto-char|gnus-goto-colon|gnus-graphic-display-p|gnus-grep-in-list|gnus-group-add-parameter|gnus-group-add-score|gnus-group-auto-expirable-p|gnus-group-customize|gnus-group-decoded-name|gnus-group-entry|gnus-group-fast-parameter|gnus-group-find-parameter|gnus-group-first-unread-group|gnus-group-foreign-p|gnus-group-full-name|gnus-group-get-new-news|gnus-group-get-parameter|gnus-group-group-name|gnus-group-guess-full-name-from-command-method|gnus-group-insert-group-line|gnus-group-iterate|gnus-group-list-groups|gnus-group-mail|gnus-group-make-help-group|gnus-group-method|gnus-group-name-charset|gnus-group-name-decode|gnus-group-name-to-method|gnus-group-native-p|gnus-group-news|gnus-group-parameter-value|gnus-group-position-point|gnus-group-post-news|gnus-group-prefixed-name|gnus-group-prefixed-p|gnus-group-quit-config|gnus-group-quit|gnus-group-read-only-p|gnus-group-real-name|gnus-group-real-prefix|gnus-group-remove-parameter|gnus-group-save-newsrc|gnus-group-secondary-p|gnus-group-send-queue|gnus-group-server|gnus-group-set-info|gnus-group-set-mode-line|gnus-group-set-parameter|gnus-group-setup-buffer|gnus-group-short-name|gnus-group-split-fancy|gnus-group-split-setup|gnus-group-split-update|gnus-group-split|gnus-group-startup-message|gnus-group-total-expirable-p|gnus-group-unread|gnus-group-update-group|gnus-groups-from-server|gnus-header-from|gnus-highlight-selected-tree|gnus-horizontal-recenter|gnus-html-prefetch-images|gnus-ido-completing-read|gnus-image-type-available-p|gnus-indent-rigidly|gnus-info-find-node|gnus-info-group|gnus-info-level|gnus-info-marks|gnus-info-method|gnus-info-params|gnus-info-rank|gnus-info-read|gnus-info-score|gnus-info-set-entry|gnus-info-set-group|gnus-info-set-level|gnus-info-set-marks|gnus-info-set-method|gnus-info-set-params|gnus-info-set-rank|gnus-info-set-read|gnus-info-set-score|gnus-insert-random-face-header|gnus-insert-random-x-face-header|gnus-interactive|gnus-intern-safe|gnus-intersection|gnus-invisible-p|gnus-iswitchb-completing-read|gnus-jog-cache|gnus-key-press-event-p|gnus-kill-all-overlays)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)g(?:db-put-breakpoint-icon|db-put-string|db-read-memory-custom|db-read-memory-handler|db-register-names-handler|db-registers-buffer-name|db-registers-handler-custom|db-registers-handler|db-registers-mode|db-remove-all-pending-triggers|db-remove-breakpoint-icons|db-remove-strings|db-reset|db-restore-windows|db-resync|db-rules-buffer-mode|db-rules-name-maker|db-rules-update-trigger|db-running|db-script-beginning-of-defun|db-script-calculate-indentation|db-script-end-of-defun|db-script-font-lock-syntactic-face|db-script-indent-line|db-script-mode|db-script-skip-to-head|db-select-frame|db-select-thread|db-send|db-set-buffer-rules|db-set-window-buffer|db-setq-thread-number|db-setup-windows|db-shell|db-show-run-p|db-show-stop-p|db-speedbar-auto-raise|db-speedbar-expand-node|db-speedbar-timer-fn|db-speedbar-update|db-stack-buffer-name|db-stack-list-frames-custom|db-stack-list-frames-handler|db-starting|db-step-thread|db-stopped|db-strip-string-backslash|db-table-add-row|db-table-column-sizes--cmacro|db-table-column-sizes|db-table-p--cmacro|db-table-p|db-table-right-align--cmacro|db-table-right-align|db-table-row-properties--cmacro|db-table-row-properties|db-table-rows--cmacro|db-table-rows|db-table-string|db-thread-created|db-thread-exited|db-thread-list-handler-custom|db-thread-list-handler|db-thread-selected|db-threads-buffer-name|db-threads-mode|db-toggle-breakpoint|db-toggle-switch-when-another-stopped|db-tooltip-print-1|db-tooltip-print|db-update-buffer-name|db-update-gud-running|db-update|db-var-create-handler|db-var-delete-1|db-var-delete-children|db-var-delete|db-var-evaluate-expression-handler|db-var-list-children-handler|db-var-list-children|db-var-set-format|db-var-update-handler|db-var-update|db-wait-for-pending|db|dbmi-bnf-async-record|dbmi-bnf-console-stream-output|dbmi-bnf-gdb-prompt|dbmi-bnf-incomplete-record-result|dbmi-bnf-init|dbmi-bnf-log-stream-output|dbmi-bnf-out-of-band-record|dbmi-bnf-output|dbmi-bnf-result-and-async-record-impl|dbmi-bnf-result-record|dbmi-bnf-skip-unrecognized|dbmi-bnf-stream-record|dbmi-bnf-target-stream-output|dbmi-is-number|dbmi-same-start|dbmi-start-with|enerate-fontset-menu|eneric-char-p|eneric-make-keywords-list|eneric-mode-internal|eneric-mode|eneric-p|eneric-primary-only-one-p|eneric-primary-only-p|ensym|entemp|et\\*|et-edebug-spec|et-file-char|et-free-disk-space|et-language-info|et-mode-local-parent|et-mru-window|et-next-valid-buffer|et-other-frame|et-scroll-bar-mode|et-unicode-property-internal|et-unused-iso-final-char|et-upcase-table|etenv-internal|etf|file-add-watch|file-rm-watch|lasses-change|lasses-convert-to-unreadable|lasses-custom-set|lasses-make-overlay|lasses-make-readable|lasses-make-unreadable|lasses-mode|lasses-overlay-p|lasses-parenthesis-exception-p|lasses-set-overlay-properties|lobal-auto-composition-mode|lobal-auto-revert-mode|lobal-cwarn-mode-check-buffers|lobal-cwarn-mode-cmhh|lobal-cwarn-mode-enable-in-buffers|lobal-cwarn-mode|lobal-ede-mode|lobal-eldoc-mode|lobal-font-lock-mode-check-buffers|lobal-font-lock-mode-cmhh|lobal-font-lock-mode-enable-in-buffers|lobal-font-lock-mode|lobal-hi-lock-mode-check-buffers|lobal-hi-lock-mode-cmhh|lobal-hi-lock-mode-enable-in-buffers|lobal-hi-lock-mode|lobal-highlight-changes-mode-check-buffers|lobal-highlight-changes-mode-cmhh|lobal-highlight-changes-mode-enable-in-buffers|lobal-highlight-changes-mode|lobal-highlight-changes|lobal-hl-line-highlight|lobal-hl-line-mode|lobal-hl-line-unhighlight-all|lobal-hl-line-unhighlight|lobal-linum-mode-check-buffers|lobal-linum-mode-cmhh|lobal-linum-mode-enable-in-buffers|lobal-linum-mode|lobal-prettify-symbols-mode-check-buffers|lobal-prettify-symbols-mode-cmhh|lobal-prettify-symbols-mode-enable-in-buffers|lobal-prettify-symbols-mode|lobal-reveal-mode|lobal-semantic-decoration-mode|lobal-semantic-highlight-edits-mode|lobal-semantic-highlight-func-mode|lobal-semantic-idle-completions-mode|lobal-semantic-idle-local-symbol-highlight-mode|lobal-semantic-idle-scheduler-mode|lobal-semantic-idle-summary-mode|lobal-semantic-mru-bookmark-mode|lobal-semantic-show-parser-state-mode|lobal-semantic-show-unmatched-syntax-mode|lobal-semantic-stickyfunc-mode|lobal-semanticdb-minor-mode|lobal-set-scheme-interaction-buffer|lobal-srecode-minor-mode|lobal-subword-mode|lobal-superword-mode|lobal-visual-line-mode-check-buffers|lobal-visual-line-mode-cmhh|lobal-visual-line-mode-enable-in-buffers|lobal-visual-line-mode|lobal-whitespace-mode|lobal-whitespace-newline-mode|lobal-whitespace-toggle-options|lyphless-set-char-table-range|mm-called-interactively-p|mm-customize-mode|mm-error|mm-format-time-string|mm-image-load-path-for-library|mm-image-search-load-path|mm-labels|mm-message|mm-regexp-concat|mm-tool-bar-from-list|mm-widget-p|mm-write-region|nus--random-face-with-type|nus-1|nus-Folder-save-name|nus-active|nus-add-buffer|nus-add-configuration|nus-add-shutdown|nus-add-text-properties-when|nus-add-text-properties|nus-add-to-sorted-list|nus-agent-batch-fetch|nus-agent-batch|nus-agent-delete-group|nus-agent-fetch-session|nus-agent-find-parameter|nus-agent-get-function|nus-agent-get-undownloaded-list|nus-agent-group-covered-p|nus-agent-method-p|nus-agent-possibly-alter-active|nus-agent-possibly-save-gcc|nus-agent-regenerate|nus-agent-rename-group|nus-agent-request-article|nus-agent-retrieve-headers|nus-agent-save-active|nus-agent-save-group-info|nus-agent-store-article|nus-agentize|nus-alist-pull|nus-alive-p|nus-and|nus-annotation-in-region-p|nus-apply-kill-file-internal|nus-apply-kill-file|nus-archive-server-wanted-p|nus-article-date-lapsed|nus-article-date-local|nus-article-date-original|nus-article-de-base64-unreadable|nus-article-de-quoted-unreadable|nus-article-decode-HZ|nus-article-decode-encoded-words|nus-article-delete-invisible-text|nus-article-display-x-face|nus-article-edit-article|nus-article-edit-done|nus-article-edit-mode|nus-article-fill-cited-article|nus-article-fill-cited-long-lines|nus-article-hide-boring-headers|nus-article-hide-citation-in-followups|nus-article-hide-citation-maybe|nus-article-hide-citation|nus-article-hide-headers|nus-article-hide-pem|nus-article-hide-signature|nus-article-highlight-citation|nus-article-html|nus-article-mail|nus-article-mode|nus-article-next-page|nus-article-outlook-deuglify-article|nus-article-outlook-repair-attribution|nus-article-outlook-unwrap-lines|nus-article-prepare-display|nus-article-prepare|nus-article-prev-page|nus-article-read-summary-keys|nus-article-remove-cr|nus-article-remove-trailing-blank-lines|nus-article-save|nus-article-set-window-start|nus-article-setup-buffer|nus-article-strip-leading-blank-lines|nus-article-treat-overstrike|nus-article-unsplit-urls|nus-article-wash-html|nus-assq-delete-all|nus-async-halt-prefetch|nus-async-prefetch-article|nus-async-prefetch-next|nus-async-prefetch-remove-group|nus-async-request-fetched-article|nus-atomic-progn-assign|nus-atomic-progn|nus-atomic-setq|nus-backlog-enter-article|nus-backlog-remove-article|nus-backlog-request-article|nus-batch-kill|nus-batch-score|nus-binary-mode|nus-bind-print-variables|nus-blocked-images|nus-bookmark-bmenu-list|nus-bookmark-jump|nus-bookmark-set|nus-bound-and-true-p|nus-boundp|nus-browse-foreign-server|nus-buffer-exists-p|nus-buffer-live-p|nus-buffers|nus-bug|nus-button-mailto|nus-button-reply|nus-byte-compile|nus-cache-articles-in-group|nus-cache-close|nus-cache-delete-group|nus-cache-enter-article|nus-cache-enter-remove-article|nus-cache-file-contents|nus-cache-generate-active|nus-cache-generate-nov-databases|nus-cache-open|nus-cache-possibly-alter-active|nus-cache-possibly-enter-article|nus-cache-possibly-remove-articles|nus-cache-remove-article|nus-cache-rename-group|nus-cache-request-article|nus-cache-retrieve-headers|nus-cache-save-buffers|nus-cache-update-article|nus-cached-article-p|nus-character-to-event|nus-check-backend-function|nus-check-reasonable-setup|nus-completing-read|nus-configure-windows|nus-continuum-version|nus-convert-article-to-rmail|nus-convert-face-to-png|nus-convert-gray-x-face-to-xpm|nus-convert-image-to-gray-x-face|nus-convert-png-to-face|nus-copy-article-buffer|nus-copy-file|nus-copy-overlay|nus-copy-sequence|nus-create-hash-size|nus-create-image|nus-create-info-command|nus-current-score-file-nondirectory|nus-data-find|nus-data-header|nus-date-get-time|nus-date-iso8601|nus-dd-mmm|nus-deactivate-mark|nus-declare-backend|nus-decode-newsgroups|nus-define-group-parameter|nus-define-keymap|nus-define-keys-1|nus-define-keys-safe|nus-define-keys|nus-delay-article|nus-delay-initialize|nus-delay-send-queue|nus-delete-alist|nus-delete-directory|nus-delete-duplicates|nus-delete-file|nus-delete-first|nus-delete-gnus-frame|nus-delete-line|nus-delete-overlay|nus-demon-add-disconnection|nus-demon-add-handler|nus-demon-add-rescan|nus-demon-add-scan-timestamps|nus-demon-add-scanmail|nus-demon-cancel|nus-demon-init|nus-demon-remove-handler|nus-display-x-face-in-from|nus-draft-mode|nus-draft-reminder|nus-dribble-enter|nus-dribble-touch|nus-dup-enter-articles|nus-dup-suppress-articles|nus-dup-unsuppress-article|nus-edit-form|nus-emacs-completing-read|nus-emacs-version|nus-ems-redefine|nus-enter-server-buffer|nus-ephemeral-group-p|nus-error|nus-eval-in-buffer-window|nus-execute|nus-expand-group-parameter|nus-expand-group-parameters|nus-expunge|nus-extended-version|nus-extent-detached-p|nus-extent-start-open|nus-extract-address-components|nus-extract-references|nus-face-from-file|nus-faces-at|nus-fetch-field|nus-fetch-group-other-frame|nus-fetch-group|nus-fetch-original-field|nus-file-newer-than|nus-final-warning|nus-find-method-for-group|nus-find-subscribed-addresses|nus-find-text-property-region|nus-float-time|nus-folder-save-name|nus-frame-or-window-display-name|nus-generate-new-group-name|nus-get-buffer-create|nus-get-buffer-window|nus-get-display-table|nus-get-info|nus-get-text-property-excluding-characters-with-faces|nus-getenv-nntpserver|nus-gethash-safe|nus-gethash|nus-globalify-regexp|nus-goto-char|nus-goto-colon|nus-graphic-display-p|nus-grep-in-list|nus-group-add-parameter|nus-group-add-score|nus-group-auto-expirable-p|nus-group-customize|nus-group-decoded-name|nus-group-entry|nus-group-fast-parameter|nus-group-find-parameter|nus-group-first-unread-group|nus-group-foreign-p|nus-group-full-name|nus-group-get-new-news|nus-group-get-parameter|nus-group-group-name|nus-group-guess-full-name-from-command-method|nus-group-insert-group-line|nus-group-iterate|nus-group-list-groups|nus-group-mail|nus-group-make-help-group|nus-group-method|nus-group-name-charset|nus-group-name-decode|nus-group-name-to-method|nus-group-native-p|nus-group-news|nus-group-parameter-value|nus-group-position-point|nus-group-post-news|nus-group-prefixed-name|nus-group-prefixed-p|nus-group-quit-config|nus-group-quit|nus-group-read-only-p|nus-group-real-name|nus-group-real-prefix|nus-group-remove-parameter|nus-group-save-newsrc|nus-group-secondary-p|nus-group-send-queue|nus-group-server|nus-group-set-info|nus-group-set-mode-line|nus-group-set-parameter|nus-group-setup-buffer|nus-group-short-name|nus-group-split-fancy|nus-group-split-setup|nus-group-split-update|nus-group-split|nus-group-startup-message|nus-group-total-expirable-p|nus-group-unread|nus-group-update-group|nus-groups-from-server|nus-header-from|nus-highlight-selected-tree|nus-horizontal-recenter|nus-html-prefetch-images|nus-ido-completing-read|nus-image-type-available-p|nus-indent-rigidly|nus-info-find-node|nus-info-group|nus-info-level|nus-info-marks|nus-info-method|nus-info-params|nus-info-rank|nus-info-read|nus-info-score|nus-info-set-entry|nus-info-set-group|nus-info-set-level|nus-info-set-marks|nus-info-set-method|nus-info-set-params|nus-info-set-rank|nus-info-set-read|nus-info-set-score|nus-insert-random-face-header|nus-insert-random-x-face-header|nus-interactive|nus-intern-safe|nus-intersection|nus-invisible-p|nus-iswitchb-completing-read|nus-jog-cache|nus-key-press-event-p|nus-kill-all-overlays)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1169,19 +1169,19 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:he-list-beg|he-list-search|he-ordinary-case-p|he-reset-string|he-string-member|he-substitute-string|he-transfer-case|he-whole-kill-search|hebrew-font-get-precomposed|hebrew-shape-gstring|help--binding-locus|help--key-binding-keymap|help-C-file-name|help-add-fundoc-usage|help-at-pt-cancel-timer|help-at-pt-kbd-string|help-at-pt-maybe-display|help-at-pt-set-timer|help-at-pt-string|help-bookmark-jump|help-bookmark-make-record|help-button-action|help-describe-category-set|help-do-arg-highlight|help-do-xref|help-fns--autoloaded-p|help-fns--compiler-macro|help-fns--interactive-only|help-fns--key-bindings|help-fns--obsolete|help-fns--parent-mode|help-fns--signature|help-follow-mouse|help-follow-symbol|help-follow|help-for-help-internal-doc|help-for-help-internal|help-for-help|help-form-show|help-function-arglist|help-go-back|help-go-forward|help-highlight-arg|help-highlight-arguments|help-insert-string|help-insert-xref-button|help-key-description|help-make-usage|help-make-xrefs|help-mode-finish|help-mode-menu|help-mode-revert-buffer|help-mode-setup|help-mode|help-print-return-message|help-quit|help-split-fundoc|help-window-display-message|help-window-setup|help-with-tutorial-spec-language|help-with-tutorial|help-xref-button|help-xref-go-back|help-xref-go-forward|help-xref-interned|help-xref-on-pp|help|hexl-C-c-prefix|hexl-C-x-prefix|hexl-ESC-prefix|hexl-activate-ruler|hexl-address-to-marker|hexl-ascii-start-column|hexl-backward-char|hexl-backward-short|hexl-backward-word|hexl-beginning-of-1k-page|hexl-beginning-of-512b-page|hexl-beginning-of-buffer|hexl-beginning-of-line|hexl-char-after-point|hexl-current-address|hexl-end-of-1k-page|hexl-end-of-512b-page|hexl-end-of-buffer|hexl-end-of-line|hexl-find-file|hexl-follow-ascii-find|hexl-follow-ascii|hexl-follow-line|hexl-forward-char|hexl-forward-short|hexl-forward-word|hexl-goto-address|hexl-goto-hex-address|hexl-hex-char-to-integer|hexl-hex-string-to-integer|hexl-highlight-line-range|hexl-htoi|hexl-insert-char|hexl-insert-decimal-char|hexl-insert-hex-char|hexl-insert-hex-string|hexl-insert-multibyte-char|hexl-insert-octal-char|hexl-isearch-search-function|hexl-line-displen|hexl-maybe-dehexlify-buffer|hexl-menu|hexl-mode--minor-mode-p|hexl-mode--setq-local|hexl-mode-exit|hexl-mode-ruler|hexl-mode|hexl-next-line|hexl-oct-char-to-integer|hexl-octal-string-to-integer|hexl-options|hexl-previous-line|hexl-print-current-point-info|hexl-printable-character|hexl-quoted-insert|hexl-revert-buffer-function|hexl-rulerize|hexl-save-buffer|hexl-scroll-down|hexl-scroll-up|hexl-self-insert-command|hexlify-buffer|hfy-begin-span|hfy-bgcol|hfy-box-to-border-assoc|hfy-box-to-style|hfy-box|hfy-buffer|hfy-colour-vals|hfy-colour|hfy-combined-face-spec|hfy-compile-face-map|hfy-compile-stylesheet|hfy-copy-and-fontify-file|hfy-css-name|hfy-decor|hfy-default-footer|hfy-default-header|hfy-dirname|hfy-end-span|hfy-face-at|hfy-face-attr-for-class|hfy-face-or-def-to-name|hfy-face-resolve-face|hfy-face-to-css-default|hfy-face-to-style-i|hfy-face-to-style|hfy-fallback-colour-values|hfy-family|hfy-find-invisible-ranges|hfy-flatten-style|hfy-fontified-p|hfy-fontify-buffer|hfy-force-fontification|hfy-href-stub|hfy-href|hfy-html-dekludge-buffer|hfy-html-enkludge-buffer|hfy-html-quote|hfy-init-progn|hfy-initfile|hfy-interq|hfy-invisible-name|hfy-invisible|hfy-kludge-cperl-mode|hfy-link-style-string|hfy-link-style|hfy-list-files|hfy-load-tags-cache|hfy-lookup|hfy-make-directory|hfy-mark-tag-hrefs|hfy-mark-tag-names|hfy-mark-trailing-whitespace|hfy-merge-adjacent-spans|hfy-opt|hfy-overlay-props-at|hfy-parse-tags-buffer|hfy-prepare-index-i|hfy-prepare-index|hfy-prepare-tag-map|hfy-prop-invisible-p|hfy-relstub|hfy-save-buffer-state|hfy-save-initvar|hfy-save-kill-buffers|hfy-shell|hfy-size-to-int|hfy-size|hfy-slant|hfy-sprintf-stylesheet|hfy-subtract-maps|hfy-tags-for-file|hfy-text-p|hfy-triplet|hfy-unmark-trailing-whitespace|hfy-weight|hfy-which-etags|hfy-width|hfy-word-regex|hi-lock--hashcons|hi-lock--regexps-at-point|hi-lock-face-buffer|hi-lock-face-phrase-buffer|hi-lock-face-symbol-at-point|hi-lock-find-patterns|hi-lock-font-lock-hook|hi-lock-keyword->face|hi-lock-line-face-buffer|hi-lock-mode-set-explicitly|hi-lock-mode|hi-lock-process-phrase|hi-lock-read-face-name|hi-lock-regexp-okay|hi-lock-set-file-patterns|hi-lock-set-pattern|hi-lock-unface-buffer|hi-lock-unload-function|hi-lock-write-interactive-patterns|hide-body|hide-entry|hide-ifdef-block|hide-ifdef-define|hide-ifdef-guts|hide-ifdef-mode-menu|hide-ifdef-mode|hide-ifdef-region-internal|hide-ifdef-region|hide-ifdef-set-define-alist|hide-ifdef-toggle-outside-read-only|hide-ifdef-toggle-read-only|hide-ifdef-toggle-shadowing|hide-ifdef-undef|hide-ifdef-use-define-alist|hide-ifdefs|hide-leaves|hide-other|hide-region-body|hide-sublevels|hide-subtree|hif-add-new-defines|hif-after-revert-function|hif-and-expr|hif-and|hif-canonicalize-tokens|hif-canonicalize|hif-clear-all-ifdef-defined|hif-comma|hif-comp-expr|hif-compress-define-list|hif-conditional|hif-define-macro|hif-define-operator|hif-defined|hif-delimit|hif-divide|hif-end-of-line|hif-endif-to-ifdef|hif-eq-expr|hif-equal|hif-evaluate-macro|hif-evaluate-region|hif-expand-token-list|hif-expr|hif-exprlist|hif-factor|hif-find-any-ifX|hif-find-define|hif-find-ifdef-block|hif-find-next-relevant|hif-find-previous-relevant|hif-find-range|hif-flatten|hif-get-argument-list|hif-greater-equal|hif-greater|hif-hide-line|hif-if-valid-identifier-p|hif-ifdef-to-endif|hif-invoke|hif-less-equal|hif-less|hif-logand-expr|hif-logand|hif-logior-expr|hif-logior|hif-lognot|hif-logshift-expr|hif-logxor-expr|hif-logxor|hif-looking-at-elif|hif-looking-at-else|hif-looking-at-endif|hif-looking-at-ifX|hif-lookup|hif-macro-supply-arguments|hif-make-range|hif-math|hif-mathify-binop|hif-mathify|hif-merge-ifdef-region|hif-minus|hif-modulo|hif-muldiv-expr|hif-multiply|hif-nexttoken|hif-not|hif-notequal|hif-or-expr|hif-or|hif-parse-exp|hif-parse-macro-arglist|hif-place-macro-invocation|hif-plus|hif-possibly-hide|hif-range-elif|hif-range-else|hif-range-end|hif-range-start|hif-recurse-on|hif-set-var|hif-shiftleft|hif-shiftright|hif-show-all|hif-show-ifdef-region|hif-string-concatenation|hif-string-to-number|hif-stringify|hif-token-concat|hif-token-concatenation|hif-token-stringification|hif-tokenize|hif-undefine-symbol|highlight-changes-mode-set-explicitly|highlight-changes-mode-turn-on|highlight-changes-mode|highlight-changes-next-change|highlight-changes-previous-change|highlight-changes-remove-highlight|highlight-changes-rotate-faces|highlight-changes-visible-mode|highlight-compare-buffers|highlight-compare-with-file|highlight-lines-matching-regexp|highlight-markup-buffers|highlight-phrase|highlight-regexp|highlight-symbol-at-point|hilit-chg-bump-change|hilit-chg-clear|hilit-chg-cust-fix-changes-face-list|hilit-chg-desktop-restore|hilit-chg-display-changes|hilit-chg-fixup|hilit-chg-get-diff-info|hilit-chg-get-diff-list-hk|hilit-chg-hide-changes|hilit-chg-make-list|hilit-chg-make-ov|hilit-chg-map-changes|hilit-chg-set-face-on-change|hilit-chg-set|hilit-chg-unload-function|hilit-chg-update|hippie-expand|hl-line-highlight|hl-line-make-overlay|hl-line-mode|hl-line-move|hl-line-unhighlight|hl-line-unload-function|hmac-md5-96|hmac-md5|holiday-list|holidays|horizontal-scroll-bar-mode|horizontal-scroll-bars-available-p|how-many|hs-already-hidden-p|hs-c-like-adjust-block-beginning|hs-discard-overlays|hs-find-block-beginning|hs-forward-sexp|hs-grok-mode-type|hs-hide-all|hs-hide-block-at-point|hs-hide-block|hs-hide-comment-region|hs-hide-initial-comment-block|hs-hide-level-recursive|hs-hide-level|hs-inside-comment-p|hs-isearch-show-temporary|hs-isearch-show|hs-life-goes-on|hs-looking-at-block-start-p|hs-make-overlay|hs-minor-mode-menu|hs-minor-mode|hs-mouse-toggle-hiding|hs-overlay-at|hs-show-all|hs-show-block|hs-toggle-hiding|html-autoview-mode|html-checkboxes|html-current-defun-name|html-headline-1|html-headline-2|html-headline-3|html-headline-4|html-headline-5|html-headline-6|html-horizontal-rule|html-href-anchor|html-image|html-imenu-index|html-line|html-list-item|html-mode|html-name-anchor|html-ordered-list|html-paragraph|html-radio-buttons|html-unordered-list|html2text|htmlfontify-buffer|htmlfontify-copy-and-link-dir|htmlfontify-load-initfile|htmlfontify-load-rgb-file|htmlfontify-run-etags|htmlfontify-save-initfile|htmlfontify-string|htmlize-attrlist-to-fstruct|htmlize-buffer-1|htmlize-buffer-substring-no-invisible|htmlize-buffer|htmlize-color-to-rgb|htmlize-copy-attr-if-set|htmlize-css-insert-head|htmlize-css-insert-text|htmlize-css-specs|htmlize-defang-local-variables|htmlize-default-body-tag|htmlize-default-doctype|htmlize-despam-address|htmlize-ensure-fontified|htmlize-face-background|htmlize-face-color-internal|htmlize-face-emacs21-attr|htmlize-face-foreground|htmlize-face-list-p|htmlize-face-size|htmlize-face-specifies-property|htmlize-face-to-fstruct|htmlize-faces-at-point|htmlize-faces-in-buffer|htmlize-file|htmlize-font-body-tag|htmlize-font-insert-text|htmlize-fstruct-background--cmacro|htmlize-fstruct-background|htmlize-fstruct-boldp--cmacro|htmlize-fstruct-boldp|htmlize-fstruct-css-name--cmacro|htmlize-fstruct-css-name|htmlize-fstruct-foreground--cmacro|htmlize-fstruct-foreground|htmlize-fstruct-italicp--cmacro|htmlize-fstruct-italicp|htmlize-fstruct-overlinep--cmacro|htmlize-fstruct-overlinep|htmlize-fstruct-p--cmacro|htmlize-fstruct-p|htmlize-fstruct-size--cmacro|htmlize-fstruct-size|htmlize-fstruct-strikep--cmacro|htmlize-fstruct-strikep|htmlize-fstruct-underlinep--cmacro|htmlize-fstruct-underlinep|htmlize-get-color-rgb-hash|htmlize-inline-css-body-tag|htmlize-inline-css-insert-text|htmlize-locate-file|htmlize-make-face-map|htmlize-make-file-name|htmlize-make-hyperlinks|htmlize-many-files-dired|htmlize-many-files|htmlize-memoize|htmlize-merge-faces|htmlize-merge-size|htmlize-merge-two-faces|htmlize-method-function|htmlize-method|htmlize-next-change|htmlize-protect-string|htmlize-region-for-paste|htmlize-region|htmlize-trim-ellipsis|htmlize-unstringify-face|htmlize-untabify|htmlize-with-fontify-message|ibuffer-active-formats-name|ibuffer-add-saved-filters|ibuffer-add-to-tmp-hide|ibuffer-add-to-tmp-show|ibuffer-assert-ibuffer-mode|ibuffer-auto-mode|ibuffer-backward-filter-group|ibuffer-backward-line|ibuffer-backwards-next-marked|ibuffer-bs-show|ibuffer-buf-matches-predicates|ibuffer-buffer-file-name|ibuffer-buffer-name-face|ibuffer-buffer-names-with-mark|ibuffer-bury-buffer|ibuffer-check-formats|ibuffer-clear-filter-groups|ibuffer-clear-summary-columns|ibuffer-columnize-and-insert-list|ibuffer-compile-format|ibuffer-compile-make-eliding-form|ibuffer-compile-make-format-form|ibuffer-compile-make-substring-form|ibuffer-confirm-operation-on|ibuffer-copy-filename-as-kill|ibuffer-count-deletion-lines|ibuffer-count-marked-lines|ibuffer-current-buffer|ibuffer-current-buffers-with-marks|ibuffer-current-format|ibuffer-current-formats|ibuffer-current-mark|ibuffer-current-state-list|ibuffer-customize|ibuffer-decompose-filter-group|ibuffer-decompose-filter|ibuffer-delete-saved-filter-groups|ibuffer-delete-saved-filters|ibuffer-deletion-marked-buffer-names|ibuffer-diff-with-file|ibuffer-do-delete|ibuffer-do-eval|ibuffer-do-isearch-regexp|ibuffer-do-isearch|ibuffer-do-kill-lines|ibuffer-do-kill-on-deletion-marks|ibuffer-do-occur|ibuffer-do-print|ibuffer-do-query-replace-regexp|ibuffer-do-query-replace|ibuffer-do-rename-uniquely|ibuffer-do-replace-regexp|ibuffer-do-revert|ibuffer-do-save|ibuffer-do-shell-command-file|ibuffer-do-shell-command-pipe-replace|ibuffer-do-shell-command-pipe|ibuffer-do-sort-by-alphabetic|ibuffer-do-sort-by-filename\\/process|ibuffer-do-sort-by-major-mode|ibuffer-do-sort-by-mode-name|ibuffer-do-sort-by-recency|ibuffer-do-sort-by-size|ibuffer-do-toggle-modified|ibuffer-do-toggle-read-only|ibuffer-do-view-1|ibuffer-do-view-and-eval|ibuffer-do-view-horizontally|ibuffer-do-view-other-frame|ibuffer-do-view|ibuffer-exchange-filters|ibuffer-expand-format-entry|ibuffer-filter-buffers|ibuffer-filter-by-content|ibuffer-filter-by-derived-mode|ibuffer-filter-by-filename|ibuffer-filter-by-mode|ibuffer-filter-by-name|ibuffer-filter-by-predicate|ibuffer-filter-by-size-gt|ibuffer-filter-by-size-lt|ibuffer-filter-by-used-mode|ibuffer-filter-disable|ibuffer-filters-to-filter-group|ibuffer-find-file)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(?:he-list-beg|he-list-search|he-ordinary-case-p|he-reset-string|he-string-member|he-substitute-string|he-transfer-case|he-whole-kill-search|hebrew-font-get-precomposed|hebrew-shape-gstring|help--binding-locus|help--key-binding-keymap|help-C-file-name|help-add-fundoc-usage|help-at-pt-cancel-timer|help-at-pt-kbd-string|help-at-pt-maybe-display|help-at-pt-set-timer|help-at-pt-string|help-bookmark-jump|help-bookmark-make-record|help-button-action|help-describe-category-set|help-do-arg-highlight|help-do-xref|help-fns--autoloaded-p|help-fns--compiler-macro|help-fns--interactive-only|help-fns--key-bindings|help-fns--obsolete|help-fns--parent-mode|help-fns--signature|help-follow-mouse|help-follow-symbol|help-follow|help-for-help-internal-doc|help-for-help-internal|help-for-help|help-form-show|help-function-arglist|help-go-back|help-go-forward|help-highlight-arg|help-highlight-arguments|help-insert-string|help-insert-xref-button|help-key-description|help-make-usage|help-make-xrefs|help-mode-finish|help-mode-menu|help-mode-revert-buffer|help-mode-setup|help-mode|help-print-return-message|help-quit|help-split-fundoc|help-window-display-message|help-window-setup|help-with-tutorial-spec-language|help-with-tutorial|help-xref-button|help-xref-go-back|help-xref-go-forward|help-xref-interned|help-xref-on-pp|help|hexl-C-c-prefix|hexl-C-x-prefix|hexl-ESC-prefix|hexl-activate-ruler|hexl-address-to-marker|hexl-ascii-start-column|hexl-backward-char|hexl-backward-short|hexl-backward-word|hexl-beginning-of-1k-page|hexl-beginning-of-512b-page|hexl-beginning-of-buffer|hexl-beginning-of-line|hexl-char-after-point|hexl-current-address|hexl-end-of-1k-page|hexl-end-of-512b-page|hexl-end-of-buffer|hexl-end-of-line|hexl-find-file|hexl-follow-ascii-find|hexl-follow-ascii|hexl-follow-line|hexl-forward-char|hexl-forward-short|hexl-forward-word|hexl-goto-address|hexl-goto-hex-address|hexl-hex-char-to-integer|hexl-hex-string-to-integer|hexl-highlight-line-range|hexl-htoi|hexl-insert-char|hexl-insert-decimal-char|hexl-insert-hex-char|hexl-insert-hex-string|hexl-insert-multibyte-char|hexl-insert-octal-char|hexl-isearch-search-function|hexl-line-displen|hexl-maybe-dehexlify-buffer|hexl-menu|hexl-mode--minor-mode-p|hexl-mode--setq-local|hexl-mode-exit|hexl-mode-ruler|hexl-mode|hexl-next-line|hexl-oct-char-to-integer|hexl-octal-string-to-integer|hexl-options|hexl-previous-line|hexl-print-current-point-info|hexl-printable-character|hexl-quoted-insert|hexl-revert-buffer-function|hexl-rulerize|hexl-save-buffer|hexl-scroll-down|hexl-scroll-up|hexl-self-insert-command|hexlify-buffer|hfy-begin-span|hfy-bgcol|hfy-box-to-border-assoc|hfy-box-to-style|hfy-box|hfy-buffer|hfy-colour-vals|hfy-colour|hfy-combined-face-spec|hfy-compile-face-map|hfy-compile-stylesheet|hfy-copy-and-fontify-file|hfy-css-name|hfy-decor|hfy-default-footer|hfy-default-header|hfy-dirname|hfy-end-span|hfy-face-at|hfy-face-attr-for-class|hfy-face-or-def-to-name|hfy-face-resolve-face|hfy-face-to-css-default|hfy-face-to-style-i|hfy-face-to-style|hfy-fallback-colour-values|hfy-family|hfy-find-invisible-ranges|hfy-flatten-style|hfy-fontified-p|hfy-fontify-buffer|hfy-force-fontification|hfy-href-stub|hfy-href|hfy-html-dekludge-buffer|hfy-html-enkludge-buffer|hfy-html-quote|hfy-init-progn|hfy-initfile|hfy-interq|hfy-invisible-name|hfy-invisible|hfy-kludge-cperl-mode|hfy-link-style-string|hfy-link-style|hfy-list-files|hfy-load-tags-cache|hfy-lookup|hfy-make-directory|hfy-mark-tag-hrefs|hfy-mark-tag-names|hfy-mark-trailing-whitespace|hfy-merge-adjacent-spans|hfy-opt|hfy-overlay-props-at|hfy-parse-tags-buffer|hfy-prepare-index-i|hfy-prepare-index|hfy-prepare-tag-map|hfy-prop-invisible-p|hfy-relstub|hfy-save-buffer-state|hfy-save-initvar|hfy-save-kill-buffers|hfy-shell|hfy-size-to-int|hfy-size|hfy-slant|hfy-sprintf-stylesheet|hfy-subtract-maps|hfy-tags-for-file|hfy-text-p|hfy-triplet|hfy-unmark-trailing-whitespace|hfy-weight|hfy-which-etags|hfy-width|hfy-word-regex|hi-lock--hashcons|hi-lock--regexps-at-point|hi-lock-face-buffer|hi-lock-face-phrase-buffer|hi-lock-face-symbol-at-point|hi-lock-find-patterns|hi-lock-font-lock-hook|hi-lock-keyword->face|hi-lock-line-face-buffer|hi-lock-mode-set-explicitly|hi-lock-mode|hi-lock-process-phrase|hi-lock-read-face-name|hi-lock-regexp-okay|hi-lock-set-file-patterns|hi-lock-set-pattern|hi-lock-unface-buffer|hi-lock-unload-function|hi-lock-write-interactive-patterns|hide-body|hide-entry|hide-ifdef-block|hide-ifdef-define|hide-ifdef-guts|hide-ifdef-mode-menu|hide-ifdef-mode|hide-ifdef-region-internal|hide-ifdef-region|hide-ifdef-set-define-alist|hide-ifdef-toggle-outside-read-only|hide-ifdef-toggle-read-only|hide-ifdef-toggle-shadowing|hide-ifdef-undef|hide-ifdef-use-define-alist|hide-ifdefs|hide-leaves|hide-other|hide-region-body|hide-sublevels|hide-subtree|hif-add-new-defines|hif-after-revert-function|hif-and-expr|hif-and|hif-canonicalize-tokens|hif-canonicalize|hif-clear-all-ifdef-defined|hif-comma|hif-comp-expr|hif-compress-define-list|hif-conditional|hif-define-macro|hif-define-operator|hif-defined|hif-delimit|hif-divide|hif-end-of-line|hif-endif-to-ifdef|hif-eq-expr|hif-equal|hif-evaluate-macro|hif-evaluate-region|hif-expand-token-list|hif-expr|hif-exprlist|hif-factor|hif-find-any-ifX|hif-find-define|hif-find-ifdef-block|hif-find-next-relevant|hif-find-previous-relevant|hif-find-range|hif-flatten|hif-get-argument-list|hif-greater-equal|hif-greater|hif-hide-line|hif-if-valid-identifier-p|hif-ifdef-to-endif|hif-invoke|hif-less-equal|hif-less|hif-logand-expr|hif-logand|hif-logior-expr|hif-logior|hif-lognot|hif-logshift-expr|hif-logxor-expr|hif-logxor|hif-looking-at-elif|hif-looking-at-else|hif-looking-at-endif|hif-looking-at-ifX|hif-lookup|hif-macro-supply-arguments|hif-make-range|hif-math|hif-mathify-binop|hif-mathify|hif-merge-ifdef-region|hif-minus|hif-modulo|hif-muldiv-expr|hif-multiply|hif-nexttoken|hif-not|hif-notequal|hif-or-expr|hif-or|hif-parse-exp|hif-parse-macro-arglist|hif-place-macro-invocation|hif-plus|hif-possibly-hide|hif-range-elif|hif-range-else|hif-range-end|hif-range-start|hif-recurse-on|hif-set-var|hif-shiftleft|hif-shiftright|hif-show-all|hif-show-ifdef-region|hif-string-concatenation|hif-string-to-number|hif-stringify|hif-token-concat|hif-token-concatenation|hif-token-stringification|hif-tokenize|hif-undefine-symbol|highlight-changes-mode-set-explicitly|highlight-changes-mode-turn-on|highlight-changes-mode|highlight-changes-next-change|highlight-changes-previous-change|highlight-changes-remove-highlight|highlight-changes-rotate-faces|highlight-changes-visible-mode|highlight-compare-buffers|highlight-compare-with-file|highlight-lines-matching-regexp|highlight-markup-buffers|highlight-phrase|highlight-regexp|highlight-symbol-at-point|hilit-chg-bump-change|hilit-chg-clear|hilit-chg-cust-fix-changes-face-list|hilit-chg-desktop-restore|hilit-chg-display-changes|hilit-chg-fixup|hilit-chg-get-diff-info|hilit-chg-get-diff-list-hk|hilit-chg-hide-changes|hilit-chg-make-list|hilit-chg-make-ov|hilit-chg-map-changes|hilit-chg-set-face-on-change|hilit-chg-set|hilit-chg-unload-function|hilit-chg-update|hippie-expand|hl-line-highlight|hl-line-make-overlay|hl-line-mode|hl-line-move|hl-line-unhighlight|hl-line-unload-function|hmac-md5-96|hmac-md5|holiday-list|holidays|horizontal-scroll-bar-mode|horizontal-scroll-bars-available-p|how-many|hs-already-hidden-p|hs-c-like-adjust-block-beginning|hs-discard-overlays|hs-find-block-beginning|hs-forward-sexp|hs-grok-mode-type|hs-hide-all|hs-hide-block-at-point|hs-hide-block|hs-hide-comment-region|hs-hide-initial-comment-block|hs-hide-level-recursive|hs-hide-level|hs-inside-comment-p|hs-isearch-show-temporary|hs-isearch-show|hs-life-goes-on|hs-looking-at-block-start-p|hs-make-overlay|hs-minor-mode-menu|hs-minor-mode|hs-mouse-toggle-hiding|hs-overlay-at|hs-show-all|hs-show-block|hs-toggle-hiding|html-autoview-mode|html-checkboxes|html-current-defun-name|html-headline-1|html-headline-2|html-headline-3|html-headline-4|html-headline-5|html-headline-6|html-horizontal-rule|html-href-anchor|html-image|html-imenu-index|html-line|html-list-item|html-mode|html-name-anchor|html-ordered-list|html-paragraph|html-radio-buttons|html-unordered-list|html2text|htmlfontify-buffer|htmlfontify-copy-and-link-dir|htmlfontify-load-initfile|htmlfontify-load-rgb-file|htmlfontify-run-etags|htmlfontify-save-initfile|htmlfontify-string|htmlize-attrlist-to-fstruct|htmlize-buffer-1|htmlize-buffer-substring-no-invisible|htmlize-buffer|htmlize-color-to-rgb|htmlize-copy-attr-if-set|htmlize-css-insert-head|htmlize-css-insert-text|htmlize-css-specs|htmlize-defang-local-variables|htmlize-default-body-tag|htmlize-default-doctype|htmlize-despam-address|htmlize-ensure-fontified|htmlize-face-background|htmlize-face-color-internal|htmlize-face-emacs21-attr|htmlize-face-foreground|htmlize-face-list-p|htmlize-face-size|htmlize-face-specifies-property|htmlize-face-to-fstruct|htmlize-faces-at-point|htmlize-faces-in-buffer|htmlize-file|htmlize-font-body-tag|htmlize-font-insert-text|htmlize-fstruct-background--cmacro|htmlize-fstruct-background|htmlize-fstruct-boldp--cmacro|htmlize-fstruct-boldp|htmlize-fstruct-css-name--cmacro|htmlize-fstruct-css-name|htmlize-fstruct-foreground--cmacro|htmlize-fstruct-foreground|htmlize-fstruct-italicp--cmacro|htmlize-fstruct-italicp|htmlize-fstruct-overlinep--cmacro|htmlize-fstruct-overlinep|htmlize-fstruct-p--cmacro|htmlize-fstruct-p|htmlize-fstruct-size--cmacro|htmlize-fstruct-size|htmlize-fstruct-strikep--cmacro|htmlize-fstruct-strikep|htmlize-fstruct-underlinep--cmacro|htmlize-fstruct-underlinep|htmlize-get-color-rgb-hash|htmlize-inline-css-body-tag|htmlize-inline-css-insert-text|htmlize-locate-file|htmlize-make-face-map|htmlize-make-file-name|htmlize-make-hyperlinks|htmlize-many-files-dired|htmlize-many-files|htmlize-memoize|htmlize-merge-faces|htmlize-merge-size|htmlize-merge-two-faces|htmlize-method-function|htmlize-method|htmlize-next-change|htmlize-protect-string|htmlize-region-for-paste|htmlize-region|htmlize-trim-ellipsis|htmlize-unstringify-face|htmlize-untabify|htmlize-with-fontify-message|ibuffer-active-formats-name|ibuffer-add-saved-filters|ibuffer-add-to-tmp-hide|ibuffer-add-to-tmp-show|ibuffer-assert-ibuffer-mode|ibuffer-auto-mode|ibuffer-backward-filter-group|ibuffer-backward-line|ibuffer-backwards-next-marked|ibuffer-bs-show|ibuffer-buf-matches-predicates|ibuffer-buffer-file-name|ibuffer-buffer-name-face|ibuffer-buffer-names-with-mark|ibuffer-bury-buffer|ibuffer-check-formats|ibuffer-clear-filter-groups|ibuffer-clear-summary-columns|ibuffer-columnize-and-insert-list|ibuffer-compile-format|ibuffer-compile-make-eliding-form|ibuffer-compile-make-format-form|ibuffer-compile-make-substring-form|ibuffer-confirm-operation-on|ibuffer-copy-filename-as-kill|ibuffer-count-deletion-lines|ibuffer-count-marked-lines|ibuffer-current-buffer|ibuffer-current-buffers-with-marks|ibuffer-current-format|ibuffer-current-formats|ibuffer-current-mark|ibuffer-current-state-list|ibuffer-customize|ibuffer-decompose-filter-group|ibuffer-decompose-filter|ibuffer-delete-saved-filter-groups|ibuffer-delete-saved-filters|ibuffer-deletion-marked-buffer-names|ibuffer-diff-with-file|ibuffer-do-delete|ibuffer-do-eval|ibuffer-do-isearch-regexp|ibuffer-do-isearch|ibuffer-do-kill-lines|ibuffer-do-kill-on-deletion-marks|ibuffer-do-occur|ibuffer-do-print|ibuffer-do-query-replace-regexp|ibuffer-do-query-replace|ibuffer-do-rename-uniquely|ibuffer-do-replace-regexp|ibuffer-do-revert|ibuffer-do-save|ibuffer-do-shell-command-file|ibuffer-do-shell-command-pipe-replace|ibuffer-do-shell-command-pipe|ibuffer-do-sort-by-alphabetic|ibuffer-do-sort-by-filename/process|ibuffer-do-sort-by-major-mode|ibuffer-do-sort-by-mode-name|ibuffer-do-sort-by-recency|ibuffer-do-sort-by-size|ibuffer-do-toggle-modified|ibuffer-do-toggle-read-only|ibuffer-do-view-1|ibuffer-do-view-and-eval|ibuffer-do-view-horizontally|ibuffer-do-view-other-frame|ibuffer-do-view|ibuffer-exchange-filters|ibuffer-expand-format-entry|ibuffer-filter-buffers|ibuffer-filter-by-content|ibuffer-filter-by-derived-mode|ibuffer-filter-by-filename|ibuffer-filter-by-mode|ibuffer-filter-by-name|ibuffer-filter-by-predicate|ibuffer-filter-by-size-gt|ibuffer-filter-by-size-lt|ibuffer-filter-by-used-mode|ibuffer-filter-disable|ibuffer-filters-to-filter-group|ibuffer-find-file)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:ibuffer-format-column|ibuffer-forward-filter-group|ibuffer-forward-line|ibuffer-forward-next-marked|ibuffer-get-marked-buffers|ibuffer-included-in-filters-p|ibuffer-insert-buffer-line|ibuffer-insert-filter-group|ibuffer-interactive-filter-by-mode|ibuffer-invert-sorting|ibuffer-jump-to-buffer|ibuffer-jump-to-filter-group|ibuffer-kill-filter-group|ibuffer-kill-line|ibuffer-list-buffers|ibuffer-make-column-filename-and-process|ibuffer-make-column-filename|ibuffer-make-column-process|ibuffer-map-deletion-lines|ibuffer-map-lines-nomodify|ibuffer-map-lines|ibuffer-map-marked-lines|ibuffer-map-on-mark|ibuffer-mark-by-file-name-regexp|ibuffer-mark-by-mode-regexp|ibuffer-mark-by-mode|ibuffer-mark-by-name-regexp|ibuffer-mark-compressed-file-buffers|ibuffer-mark-dired-buffers|ibuffer-mark-dissociated-buffers|ibuffer-mark-for-delete-backwards|ibuffer-mark-for-delete|ibuffer-mark-forward|ibuffer-mark-help-buffers|ibuffer-mark-interactive|ibuffer-mark-modified-buffers|ibuffer-mark-old-buffers|ibuffer-mark-read-only-buffers|ibuffer-mark-special-buffers|ibuffer-mark-unsaved-buffers|ibuffer-marked-buffer-names|ibuffer-mode|ibuffer-mouse-filter-by-mode|ibuffer-mouse-popup-menu|ibuffer-mouse-toggle-filter-group|ibuffer-mouse-toggle-mark|ibuffer-mouse-visit-buffer|ibuffer-negate-filter|ibuffer-or-filter|ibuffer-other-window|ibuffer-pop-filter-group|ibuffer-pop-filter|ibuffer-recompile-formats|ibuffer-redisplay-current|ibuffer-redisplay-engine|ibuffer-redisplay|ibuffer-save-filter-groups|ibuffer-save-filters|ibuffer-set-filter-groups-by-mode|ibuffer-set-mark-1|ibuffer-set-mark|ibuffer-shrink-to-fit|ibuffer-skip-properties|ibuffer-sort-bufferlist|ibuffer-switch-format|ibuffer-switch-to-saved-filter-groups|ibuffer-switch-to-saved-filters|ibuffer-toggle-filter-group|ibuffer-toggle-marks|ibuffer-toggle-sorting-mode|ibuffer-unmark-all|ibuffer-unmark-backward|ibuffer-unmark-forward|ibuffer-update-format|ibuffer-update-title-and-summary|ibuffer-update|ibuffer-visible-p|ibuffer-visit-buffer-1-window|ibuffer-visit-buffer-other-frame|ibuffer-visit-buffer-other-window-noselect|ibuffer-visit-buffer-other-window|ibuffer-visit-buffer|ibuffer-visit-tags-table|ibuffer-yank-filter-group|ibuffer-yank|ibuffer|icalendar--add-decoded-times|icalendar--add-diary-entry|icalendar--all-events|icalendar--convert-all-timezones|icalendar--convert-anniversary-to-ical|icalendar--convert-block-to-ical|icalendar--convert-cyclic-to-ical|icalendar--convert-date-to-ical|icalendar--convert-float-to-ical|icalendar--convert-ical-to-diary|icalendar--convert-non-recurring-all-day-to-diary|icalendar--convert-non-recurring-not-all-day-to-diary|icalendar--convert-ordinary-to-ical|icalendar--convert-recurring-to-diary|icalendar--convert-sexp-to-ical|icalendar--convert-string-for-export|icalendar--convert-string-for-import|icalendar--convert-to-ical|icalendar--convert-tz-offset|icalendar--convert-weekly-to-ical|icalendar--convert-yearly-to-ical|icalendar--create-ical-alarm|icalendar--create-uid|icalendar--date-to-isodate|icalendar--datestring-to-isodate|icalendar--datetime-to-american-date|icalendar--datetime-to-colontime|icalendar--datetime-to-diary-date|icalendar--datetime-to-european-date|icalendar--datetime-to-iso-date|icalendar--datetime-to-noneuropean-date|icalendar--decode-isodatetime|icalendar--decode-isoduration|icalendar--diarytime-to-isotime|icalendar--dmsg|icalendar--do-create-ical-alarm|icalendar--find-time-zone|icalendar--format-ical-event|icalendar--get-children|icalendar--get-event-properties|icalendar--get-event-property-attributes|icalendar--get-event-property|icalendar--get-month-number|icalendar--get-unfolded-buffer|icalendar--get-weekday-abbrev|icalendar--get-weekday-number|icalendar--get-weekday-numbers|icalendar--parse-summary-and-rest|icalendar--parse-vtimezone|icalendar--read-element|icalendar--rris|icalendar--split-value|icalendar-convert-diary-to-ical|icalendar-export-file|icalendar-export-region|icalendar-extract-ical-from-buffer|icalendar-first-weekday-of-year|icalendar-import-buffer|icalendar-import-file|icalendar-import-format-sample|icomplete--completion-predicate|icomplete--completion-table|icomplete--field-beg|icomplete--field-end|icomplete--field-string|icomplete--in-region-setup|icomplete-backward-completions|icomplete-completions|icomplete-exhibit|icomplete-forward-completions|icomplete-minibuffer-setup|icomplete-mode|icomplete-post-command-hook|icomplete-pre-command-hook|icomplete-simple-completing-p|icomplete-tidy|icon-backward-to-noncomment|icon-backward-to-start-of-continued-exp|icon-backward-to-start-of-if|icon-comment-indent|icon-forward-sexp-function|icon-indent-command|icon-indent-line|icon-is-continuation-line|icon-is-continued-line|icon-mode|iconify-or-deiconify-frame|idl-font-lock-keywords-2|idl-font-lock-keywords-3|idl-font-lock-keywords|idl-mode|idlwave-action-and-binding|idlwave-active-rinfo-space|idlwave-add-file-link-selector|idlwave-after-successful-completion|idlwave-all-assq|idlwave-all-class-inherits|idlwave-all-class-tags|idlwave-all-method-classes|idlwave-all-method-keyword-classes|idlwave-any-syslib|idlwave-attach-class-tag-classes|idlwave-attach-classes|idlwave-attach-keyword-classes|idlwave-attach-method-classes|idlwave-auto-fill-mode|idlwave-auto-fill|idlwave-backward-block|idlwave-backward-up-block|idlwave-beginning-of-block|idlwave-beginning-of-statement|idlwave-beginning-of-subprogram|idlwave-best-rinfo-assoc|idlwave-best-rinfo-assq|idlwave-block-jump-out|idlwave-block-master|idlwave-calc-hanging-indent|idlwave-calculate-cont-indent|idlwave-calculate-indent|idlwave-calculate-paren-indent|idlwave-call-special|idlwave-case|idlwave-check-abbrev|idlwave-choose-completion|idlwave-choose|idlwave-class-alist|idlwave-class-file-or-buffer|idlwave-class-found-in|idlwave-class-info|idlwave-class-inherits|idlwave-class-or-superclass-with-tag|idlwave-class-tag-reset|idlwave-class-tags|idlwave-close-block|idlwave-code-abbrev|idlwave-command-hook|idlwave-comment-hook|idlwave-complete-class-structure-tag-help|idlwave-complete-class-structure-tag|idlwave-complete-class|idlwave-complete-filename|idlwave-complete-in-buffer|idlwave-complete-sysvar-help|idlwave-complete-sysvar-or-tag|idlwave-complete-sysvar-tag-help|idlwave-complete|idlwave-completing-read|idlwave-completion-fontify-classes|idlwave-concatenate-rinfo-lists|idlwave-context-help|idlwave-convert-xml-clean-routine-aliases|idlwave-convert-xml-clean-statement-aliases|idlwave-convert-xml-clean-sysvar-aliases|idlwave-convert-xml-system-routine-info|idlwave-count-eq|idlwave-count-memq|idlwave-count-outlawed-buffers|idlwave-create-customize-menu|idlwave-create-user-catalog-file|idlwave-current-indent|idlwave-current-routine-fullname|idlwave-current-routine|idlwave-current-statement-indent|idlwave-custom-ampersand-surround|idlwave-custom-ltgtr-surround|idlwave-customize|idlwave-debug-map|idlwave-default-choose-completion|idlwave-default-insert-timestamp|idlwave-define-abbrev|idlwave-delete-user-catalog-file|idlwave-determine-class|idlwave-display-calling-sequence|idlwave-display-completion-list-emacs|idlwave-display-completion-list-xemacs|idlwave-display-completion-list|idlwave-display-user-catalog-widget|idlwave-do-action|idlwave-do-context-help|idlwave-do-context-help1|idlwave-do-find-module|idlwave-do-kill-autoloaded-buffers|idlwave-do-mouse-completion-help|idlwave-doc-header|idlwave-doc-modification|idlwave-down-block|idlwave-downcase-safe|idlwave-edit-in-idlde|idlwave-elif|idlwave-end-of-block|idlwave-end-of-statement|idlwave-end-of-statement0|idlwave-end-of-subprogram|idlwave-entry-find-keyword|idlwave-entry-has-help|idlwave-entry-keywords|idlwave-expand-equal|idlwave-expand-keyword|idlwave-expand-lib-file-name|idlwave-expand-path|idlwave-expand-region-abbrevs|idlwave-explicit-class-listed|idlwave-fill-paragraph|idlwave-find-class-definition|idlwave-find-file-noselect|idlwave-find-inherited-class|idlwave-find-key|idlwave-find-module-this-file|idlwave-find-module|idlwave-find-struct-tag|idlwave-find-structure-definition|idlwave-fix-keywords|idlwave-fix-module-if-obj_new|idlwave-font-lock-fontify-region|idlwave-for|idlwave-forward-block|idlwave-function-menu|idlwave-function|idlwave-get-buffer-routine-info|idlwave-get-buffer-visiting|idlwave-get-routine-info-from-buffers|idlwave-goto-comment|idlwave-grep|idlwave-hard-tab|idlwave-has-help|idlwave-help-assistant-available|idlwave-help-assistant-close|idlwave-help-assistant-command|idlwave-help-assistant-help-with-topic|idlwave-help-assistant-open-link|idlwave-help-assistant-raise|idlwave-help-assistant-start|idlwave-help-check-locations|idlwave-help-diagnostics|idlwave-help-display-help-window|idlwave-help-error|idlwave-help-find-first-header|idlwave-help-find-header|idlwave-help-find-in-doc-header|idlwave-help-find-routine-definition|idlwave-help-fontify|idlwave-help-get-help-buffer|idlwave-help-get-special-help|idlwave-help-html-link|idlwave-help-menu|idlwave-help-mode|idlwave-help-quit|idlwave-help-return-to-calling-frame|idlwave-help-select-help-frame|idlwave-help-show-help-frame|idlwave-help-toggle-header-match-and-def|idlwave-help-toggle-header-top-and-def|idlwave-help-with-source|idlwave-highlight-linked-completions|idlwave-html-help-location|idlwave-if|idlwave-in-comment|idlwave-in-quote|idlwave-in-structure|idlwave-indent-and-action|idlwave-indent-left-margin|idlwave-indent-line|idlwave-indent-statement|idlwave-indent-subprogram|idlwave-indent-to|idlwave-info|idlwave-insert-source-location|idlwave-is-comment-line|idlwave-is-comment-or-empty-line|idlwave-is-continuation-line|idlwave-is-pointer-dereference|idlwave-keyboard-quit|idlwave-keyword-abbrev|idlwave-kill-autoloaded-buffers|idlwave-kill-buffer-update|idlwave-last-valid-char|idlwave-launch-idlhelp|idlwave-lib-p|idlwave-list-abbrevs|idlwave-list-all-load-path-shadows|idlwave-list-buffer-load-path-shadows|idlwave-list-load-path-shadows|idlwave-list-shell-load-path-shadows|idlwave-load-all-rinfo|idlwave-load-rinfo-next-step|idlwave-load-system-routine-info|idlwave-local-value|idlwave-locate-lib-file|idlwave-look-at|idlwave-make-force-complete-where-list|idlwave-make-full-name|idlwave-make-modified-completion-map-emacs|idlwave-make-modified-completion-map-xemacs|idlwave-make-one-key-alist|idlwave-make-space|idlwave-make-tags|idlwave-mark-block|idlwave-mark-doclib|idlwave-mark-statement|idlwave-mark-subprogram|idlwave-match-class-arrows|idlwave-members-only|idlwave-min-current-statement-indent|idlwave-mode-debug-menu|idlwave-mode-menu|idlwave-mode|idlwave-mouse-active-rinfo-right|idlwave-mouse-active-rinfo-shift|idlwave-mouse-active-rinfo|idlwave-mouse-choose-completion|idlwave-mouse-completion-help|idlwave-mouse-context-help|idlwave-new-buffer-update|idlwave-new-sintern-type|idlwave-newline|idlwave-next-statement|idlwave-nonmembers-only|idlwave-one-key-select|idlwave-online-help|idlwave-parse-definition|idlwave-path-alist-add-flag|idlwave-path-alist-remove-flag|idlwave-popup-select|idlwave-prepare-class-tag-completion|idlwave-prev-index-position|idlwave-previous-statement|idlwave-print-source|idlwave-procedure|idlwave-process-sysvars|idlwave-quit-help|idlwave-quoted|idlwave-read-paths|idlwave-recursive-directory-list|idlwave-region-active-p|idlwave-repeat|idlwave-replace-buffer-routine-info|idlwave-replace-string|idlwave-rescan-asynchronously|idlwave-rescan-catalog-directories|idlwave-reset-sintern-type|idlwave-reset-sintern|idlwave-resolve|idlwave-restore-wconf-after-completion|idlwave-revoke-license-to-kill|idlwave-rinfo-assoc|idlwave-rinfo-assq-any-class|idlwave-rinfo-assq|idlwave-rinfo-group-keywords|idlwave-rinfo-insert-keyword|idlwave-routine-entry-compare-twins|idlwave-routine-entry-compare|idlwave-routine-info|idlwave-routine-source-file|idlwave-routine-twin-compare|idlwave-routine-twins|idlwave-routines|idlwave-rw-case|idlwave-save-buffer-update|idlwave-save-routine-info|idlwave-scan-class-info|idlwave-scan-library-catalogs|idlwave-scan-user-lib-files|idlwave-scroll-completions|idlwave-selector|idlwave-set-local|idlwave-setup|idlwave-shell-break-here|idlwave-shell-compile-helper-routines|idlwave-shell-filter-sysvars|idlwave-shell-recenter-shell-window|idlwave-shell-run-region|idlwave-shell-save-and-run|idlwave-shell-send-command|idlwave-shell-show-commentary|idlwave-shell-update-routine-info|idlwave-shell|idlwave-shorten-syntax|idlwave-show-begin-check|idlwave-show-begin|idlwave-show-commentary|idlwave-show-matching-quote|idlwave-sintern-class-info|idlwave-sintern-class-tag|idlwave-sintern-class)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)i(?:buffer-format-column|buffer-forward-filter-group|buffer-forward-line|buffer-forward-next-marked|buffer-get-marked-buffers|buffer-included-in-filters-p|buffer-insert-buffer-line|buffer-insert-filter-group|buffer-interactive-filter-by-mode|buffer-invert-sorting|buffer-jump-to-buffer|buffer-jump-to-filter-group|buffer-kill-filter-group|buffer-kill-line|buffer-list-buffers|buffer-make-column-filename-and-process|buffer-make-column-filename|buffer-make-column-process|buffer-map-deletion-lines|buffer-map-lines-nomodify|buffer-map-lines|buffer-map-marked-lines|buffer-map-on-mark|buffer-mark-by-file-name-regexp|buffer-mark-by-mode-regexp|buffer-mark-by-mode|buffer-mark-by-name-regexp|buffer-mark-compressed-file-buffers|buffer-mark-dired-buffers|buffer-mark-dissociated-buffers|buffer-mark-for-delete-backwards|buffer-mark-for-delete|buffer-mark-forward|buffer-mark-help-buffers|buffer-mark-interactive|buffer-mark-modified-buffers|buffer-mark-old-buffers|buffer-mark-read-only-buffers|buffer-mark-special-buffers|buffer-mark-unsaved-buffers|buffer-marked-buffer-names|buffer-mode|buffer-mouse-filter-by-mode|buffer-mouse-popup-menu|buffer-mouse-toggle-filter-group|buffer-mouse-toggle-mark|buffer-mouse-visit-buffer|buffer-negate-filter|buffer-or-filter|buffer-other-window|buffer-pop-filter-group|buffer-pop-filter|buffer-recompile-formats|buffer-redisplay-current|buffer-redisplay-engine|buffer-redisplay|buffer-save-filter-groups|buffer-save-filters|buffer-set-filter-groups-by-mode|buffer-set-mark-1|buffer-set-mark|buffer-shrink-to-fit|buffer-skip-properties|buffer-sort-bufferlist|buffer-switch-format|buffer-switch-to-saved-filter-groups|buffer-switch-to-saved-filters|buffer-toggle-filter-group|buffer-toggle-marks|buffer-toggle-sorting-mode|buffer-unmark-all|buffer-unmark-backward|buffer-unmark-forward|buffer-update-format|buffer-update-title-and-summary|buffer-update|buffer-visible-p|buffer-visit-buffer-1-window|buffer-visit-buffer-other-frame|buffer-visit-buffer-other-window-noselect|buffer-visit-buffer-other-window|buffer-visit-buffer|buffer-visit-tags-table|buffer-yank-filter-group|buffer-yank|buffer|calendar--add-decoded-times|calendar--add-diary-entry|calendar--all-events|calendar--convert-all-timezones|calendar--convert-anniversary-to-ical|calendar--convert-block-to-ical|calendar--convert-cyclic-to-ical|calendar--convert-date-to-ical|calendar--convert-float-to-ical|calendar--convert-ical-to-diary|calendar--convert-non-recurring-all-day-to-diary|calendar--convert-non-recurring-not-all-day-to-diary|calendar--convert-ordinary-to-ical|calendar--convert-recurring-to-diary|calendar--convert-sexp-to-ical|calendar--convert-string-for-export|calendar--convert-string-for-import|calendar--convert-to-ical|calendar--convert-tz-offset|calendar--convert-weekly-to-ical|calendar--convert-yearly-to-ical|calendar--create-ical-alarm|calendar--create-uid|calendar--date-to-isodate|calendar--datestring-to-isodate|calendar--datetime-to-american-date|calendar--datetime-to-colontime|calendar--datetime-to-diary-date|calendar--datetime-to-european-date|calendar--datetime-to-iso-date|calendar--datetime-to-noneuropean-date|calendar--decode-isodatetime|calendar--decode-isoduration|calendar--diarytime-to-isotime|calendar--dmsg|calendar--do-create-ical-alarm|calendar--find-time-zone|calendar--format-ical-event|calendar--get-children|calendar--get-event-properties|calendar--get-event-property-attributes|calendar--get-event-property|calendar--get-month-number|calendar--get-unfolded-buffer|calendar--get-weekday-abbrev|calendar--get-weekday-number|calendar--get-weekday-numbers|calendar--parse-summary-and-rest|calendar--parse-vtimezone|calendar--read-element|calendar--rris|calendar--split-value|calendar-convert-diary-to-ical|calendar-export-file|calendar-export-region|calendar-extract-ical-from-buffer|calendar-first-weekday-of-year|calendar-import-buffer|calendar-import-file|calendar-import-format-sample|complete--completion-predicate|complete--completion-table|complete--field-beg|complete--field-end|complete--field-string|complete--in-region-setup|complete-backward-completions|complete-completions|complete-exhibit|complete-forward-completions|complete-minibuffer-setup|complete-mode|complete-post-command-hook|complete-pre-command-hook|complete-simple-completing-p|complete-tidy|con-backward-to-noncomment|con-backward-to-start-of-continued-exp|con-backward-to-start-of-if|con-comment-indent|con-forward-sexp-function|con-indent-command|con-indent-line|con-is-continuation-line|con-is-continued-line|con-mode|conify-or-deiconify-frame|dl-font-lock-keywords-2|dl-font-lock-keywords-3|dl-font-lock-keywords|dl-mode|dlwave-action-and-binding|dlwave-active-rinfo-space|dlwave-add-file-link-selector|dlwave-after-successful-completion|dlwave-all-assq|dlwave-all-class-inherits|dlwave-all-class-tags|dlwave-all-method-classes|dlwave-all-method-keyword-classes|dlwave-any-syslib|dlwave-attach-class-tag-classes|dlwave-attach-classes|dlwave-attach-keyword-classes|dlwave-attach-method-classes|dlwave-auto-fill-mode|dlwave-auto-fill|dlwave-backward-block|dlwave-backward-up-block|dlwave-beginning-of-block|dlwave-beginning-of-statement|dlwave-beginning-of-subprogram|dlwave-best-rinfo-assoc|dlwave-best-rinfo-assq|dlwave-block-jump-out|dlwave-block-master|dlwave-calc-hanging-indent|dlwave-calculate-cont-indent|dlwave-calculate-indent|dlwave-calculate-paren-indent|dlwave-call-special|dlwave-case|dlwave-check-abbrev|dlwave-choose-completion|dlwave-choose|dlwave-class-alist|dlwave-class-file-or-buffer|dlwave-class-found-in|dlwave-class-info|dlwave-class-inherits|dlwave-class-or-superclass-with-tag|dlwave-class-tag-reset|dlwave-class-tags|dlwave-close-block|dlwave-code-abbrev|dlwave-command-hook|dlwave-comment-hook|dlwave-complete-class-structure-tag-help|dlwave-complete-class-structure-tag|dlwave-complete-class|dlwave-complete-filename|dlwave-complete-in-buffer|dlwave-complete-sysvar-help|dlwave-complete-sysvar-or-tag|dlwave-complete-sysvar-tag-help|dlwave-complete|dlwave-completing-read|dlwave-completion-fontify-classes|dlwave-concatenate-rinfo-lists|dlwave-context-help|dlwave-convert-xml-clean-routine-aliases|dlwave-convert-xml-clean-statement-aliases|dlwave-convert-xml-clean-sysvar-aliases|dlwave-convert-xml-system-routine-info|dlwave-count-eq|dlwave-count-memq|dlwave-count-outlawed-buffers|dlwave-create-customize-menu|dlwave-create-user-catalog-file|dlwave-current-indent|dlwave-current-routine-fullname|dlwave-current-routine|dlwave-current-statement-indent|dlwave-custom-ampersand-surround|dlwave-custom-ltgtr-surround|dlwave-customize|dlwave-debug-map|dlwave-default-choose-completion|dlwave-default-insert-timestamp|dlwave-define-abbrev|dlwave-delete-user-catalog-file|dlwave-determine-class|dlwave-display-calling-sequence|dlwave-display-completion-list-emacs|dlwave-display-completion-list-xemacs|dlwave-display-completion-list|dlwave-display-user-catalog-widget|dlwave-do-action|dlwave-do-context-help|dlwave-do-context-help1|dlwave-do-find-module|dlwave-do-kill-autoloaded-buffers|dlwave-do-mouse-completion-help|dlwave-doc-header|dlwave-doc-modification|dlwave-down-block|dlwave-downcase-safe|dlwave-edit-in-idlde|dlwave-elif|dlwave-end-of-block|dlwave-end-of-statement|dlwave-end-of-statement0|dlwave-end-of-subprogram|dlwave-entry-find-keyword|dlwave-entry-has-help|dlwave-entry-keywords|dlwave-expand-equal|dlwave-expand-keyword|dlwave-expand-lib-file-name|dlwave-expand-path|dlwave-expand-region-abbrevs|dlwave-explicit-class-listed|dlwave-fill-paragraph|dlwave-find-class-definition|dlwave-find-file-noselect|dlwave-find-inherited-class|dlwave-find-key|dlwave-find-module-this-file|dlwave-find-module|dlwave-find-struct-tag|dlwave-find-structure-definition|dlwave-fix-keywords|dlwave-fix-module-if-obj_new|dlwave-font-lock-fontify-region|dlwave-for|dlwave-forward-block|dlwave-function-menu|dlwave-function|dlwave-get-buffer-routine-info|dlwave-get-buffer-visiting|dlwave-get-routine-info-from-buffers|dlwave-goto-comment|dlwave-grep|dlwave-hard-tab|dlwave-has-help|dlwave-help-assistant-available|dlwave-help-assistant-close|dlwave-help-assistant-command|dlwave-help-assistant-help-with-topic|dlwave-help-assistant-open-link|dlwave-help-assistant-raise|dlwave-help-assistant-start|dlwave-help-check-locations|dlwave-help-diagnostics|dlwave-help-display-help-window|dlwave-help-error|dlwave-help-find-first-header|dlwave-help-find-header|dlwave-help-find-in-doc-header|dlwave-help-find-routine-definition|dlwave-help-fontify|dlwave-help-get-help-buffer|dlwave-help-get-special-help|dlwave-help-html-link|dlwave-help-menu|dlwave-help-mode|dlwave-help-quit|dlwave-help-return-to-calling-frame|dlwave-help-select-help-frame|dlwave-help-show-help-frame|dlwave-help-toggle-header-match-and-def|dlwave-help-toggle-header-top-and-def|dlwave-help-with-source|dlwave-highlight-linked-completions|dlwave-html-help-location|dlwave-if|dlwave-in-comment|dlwave-in-quote|dlwave-in-structure|dlwave-indent-and-action|dlwave-indent-left-margin|dlwave-indent-line|dlwave-indent-statement|dlwave-indent-subprogram|dlwave-indent-to|dlwave-info|dlwave-insert-source-location|dlwave-is-comment-line|dlwave-is-comment-or-empty-line|dlwave-is-continuation-line|dlwave-is-pointer-dereference|dlwave-keyboard-quit|dlwave-keyword-abbrev|dlwave-kill-autoloaded-buffers|dlwave-kill-buffer-update|dlwave-last-valid-char|dlwave-launch-idlhelp|dlwave-lib-p|dlwave-list-abbrevs|dlwave-list-all-load-path-shadows|dlwave-list-buffer-load-path-shadows|dlwave-list-load-path-shadows|dlwave-list-shell-load-path-shadows|dlwave-load-all-rinfo|dlwave-load-rinfo-next-step|dlwave-load-system-routine-info|dlwave-local-value|dlwave-locate-lib-file|dlwave-look-at|dlwave-make-force-complete-where-list|dlwave-make-full-name|dlwave-make-modified-completion-map-emacs|dlwave-make-modified-completion-map-xemacs|dlwave-make-one-key-alist|dlwave-make-space|dlwave-make-tags|dlwave-mark-block|dlwave-mark-doclib|dlwave-mark-statement|dlwave-mark-subprogram|dlwave-match-class-arrows|dlwave-members-only|dlwave-min-current-statement-indent|dlwave-mode-debug-menu|dlwave-mode-menu|dlwave-mode|dlwave-mouse-active-rinfo-right|dlwave-mouse-active-rinfo-shift|dlwave-mouse-active-rinfo|dlwave-mouse-choose-completion|dlwave-mouse-completion-help|dlwave-mouse-context-help|dlwave-new-buffer-update|dlwave-new-sintern-type|dlwave-newline|dlwave-next-statement|dlwave-nonmembers-only|dlwave-one-key-select|dlwave-online-help|dlwave-parse-definition|dlwave-path-alist-add-flag|dlwave-path-alist-remove-flag|dlwave-popup-select|dlwave-prepare-class-tag-completion|dlwave-prev-index-position|dlwave-previous-statement|dlwave-print-source|dlwave-procedure|dlwave-process-sysvars|dlwave-quit-help|dlwave-quoted|dlwave-read-paths|dlwave-recursive-directory-list|dlwave-region-active-p|dlwave-repeat|dlwave-replace-buffer-routine-info|dlwave-replace-string|dlwave-rescan-asynchronously|dlwave-rescan-catalog-directories|dlwave-reset-sintern-type|dlwave-reset-sintern|dlwave-resolve|dlwave-restore-wconf-after-completion|dlwave-revoke-license-to-kill|dlwave-rinfo-assoc|dlwave-rinfo-assq-any-class|dlwave-rinfo-assq|dlwave-rinfo-group-keywords|dlwave-rinfo-insert-keyword|dlwave-routine-entry-compare-twins|dlwave-routine-entry-compare|dlwave-routine-info|dlwave-routine-source-file|dlwave-routine-twin-compare|dlwave-routine-twins|dlwave-routines|dlwave-rw-case|dlwave-save-buffer-update|dlwave-save-routine-info|dlwave-scan-class-info|dlwave-scan-library-catalogs|dlwave-scan-user-lib-files|dlwave-scroll-completions|dlwave-selector|dlwave-set-local|dlwave-setup|dlwave-shell-break-here|dlwave-shell-compile-helper-routines|dlwave-shell-filter-sysvars|dlwave-shell-recenter-shell-window|dlwave-shell-run-region|dlwave-shell-save-and-run|dlwave-shell-send-command|dlwave-shell-show-commentary|dlwave-shell-update-routine-info|dlwave-shell|dlwave-shorten-syntax|dlwave-show-begin-check|dlwave-show-begin|dlwave-show-commentary|dlwave-show-matching-quote|dlwave-sintern-class-info|dlwave-sintern-class-tag|dlwave-sintern-class)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:idlwave-sintern-dir|idlwave-sintern-keyword-list|idlwave-sintern-keyword|idlwave-sintern-libname|idlwave-sintern-method|idlwave-sintern-rinfo-list|idlwave-sintern-routine-or-method|idlwave-sintern-routine|idlwave-sintern-set|idlwave-sintern-sysvar-alist|idlwave-sintern-sysvar|idlwave-sintern-sysvartag|idlwave-sintern|idlwave-skip-label-or-case|idlwave-skip-multi-commands|idlwave-skip-object|idlwave-special-lib-test|idlwave-split-line|idlwave-split-link-target|idlwave-split-menu-emacs|idlwave-split-menu-xemacs|idlwave-split-string|idlwave-start-load-rinfo-timer|idlwave-start-of-substatement|idlwave-statement-type|idlwave-struct-borders|idlwave-struct-inherits|idlwave-struct-tags|idlwave-study-twins|idlwave-substitute-link-target|idlwave-surround|idlwave-switch|idlwave-sys-dir|idlwave-syslib-p|idlwave-syslib-scanned-p|idlwave-sysvars-reset|idlwave-template|idlwave-this-word|idlwave-toggle-comment-region|idlwave-true-path-alist|idlwave-uniquify|idlwave-unit-name|idlwave-update-buffer-routine-info|idlwave-update-current-buffer-info|idlwave-update-routine-info|idlwave-user-catalog-command-hook|idlwave-what-function|idlwave-what-module-find-class|idlwave-what-module|idlwave-what-procedure|idlwave-where|idlwave-while|idlwave-widget-scan-user-lib-files|idlwave-with-special-syntax|idlwave-write-paths|idlwave-xml-create-class-method-lists|idlwave-xml-create-rinfo-list|idlwave-xml-create-sysvar-alist|idlwave-xml-system-routine-info-up-to-date|idlwave-xor|idna-to-ascii|ido-active|ido-add-virtual-buffers-to-list|ido-all-completions|ido-buffer-internal|ido-buffer-window-other-frame|ido-bury-buffer-at-head|ido-cache-ftp-valid|ido-cache-unc-valid|ido-choose-completion-string|ido-chop|ido-common-initialization|ido-complete-space|ido-complete|ido-completing-read|ido-completion-help|ido-completions|ido-copy-current-file-name|ido-copy-current-word|ido-delete-backward-updir|ido-delete-backward-word-updir|ido-delete-file-at-head|ido-directory-too-big-p|ido-dired|ido-display-buffer|ido-display-file|ido-edit-input|ido-enter-dired|ido-enter-find-file|ido-enter-insert-buffer|ido-enter-insert-file|ido-enter-switch-buffer|ido-everywhere|ido-exhibit|ido-existing-item-p|ido-exit-minibuffer|ido-expand-directory|ido-fallback-command|ido-file-extension-aux|ido-file-extension-lessp|ido-file-extension-order|ido-file-internal|ido-file-lessp|ido-file-name-all-completions-1|ido-file-name-all-completions|ido-final-slash|ido-find-alternate-file|ido-find-common-substring|ido-find-file-in-dir|ido-find-file-other-frame|ido-find-file-other-window|ido-find-file-read-only-other-frame|ido-find-file-read-only-other-window|ido-find-file-read-only|ido-find-file|ido-flatten-merged-list|ido-forget-work-directory|ido-fractionp|ido-get-buffers-in-frames|ido-get-bufname|ido-get-work-directory|ido-get-work-file|ido-ignore-item-p|ido-init-completion-maps|ido-initiate-auto-merge|ido-insert-buffer|ido-insert-file|ido-is-ftp-directory|ido-is-root-directory|ido-is-slow-ftp-host|ido-is-tramp-root|ido-is-unc-host|ido-is-unc-root|ido-kill-buffer-at-head|ido-kill-buffer|ido-kill-emacs-hook|ido-list-directory|ido-load-history|ido-local-file-exists-p|ido-magic-backward-char|ido-magic-delete-char|ido-magic-forward-char|ido-make-buffer-list-1|ido-make-buffer-list|ido-make-choice-list|ido-make-dir-list-1|ido-make-dir-list|ido-make-directory|ido-make-file-list-1|ido-make-file-list|ido-make-merged-file-list-1|ido-make-merged-file-list|ido-make-prompt|ido-makealist|ido-may-cache-directory|ido-merge-work-directories|ido-minibuffer-setup|ido-mode|ido-name|ido-next-match-dir|ido-next-match|ido-next-work-directory|ido-next-work-file|ido-no-final-slash|ido-nonreadable-directory-p|ido-pop-dir|ido-pp|ido-prev-match-dir|ido-prev-match|ido-prev-work-directory|ido-prev-work-file|ido-push-dir-first|ido-push-dir|ido-read-buffer|ido-read-directory-name|ido-read-file-name|ido-read-internal|ido-record-command|ido-record-work-directory|ido-record-work-file|ido-remove-cached-dir|ido-reread-directory|ido-restrict-to-matches|ido-save-history|ido-select-text|ido-set-common-completion|ido-set-current-directory|ido-set-current-home|ido-set-matches-1|ido-set-matches|ido-setup-completion-map|ido-sort-merged-list|ido-summary-buffers-to-end|ido-switch-buffer-other-frame|ido-switch-buffer-other-window|ido-switch-buffer|ido-take-first-match|ido-tidy|ido-time-stamp|ido-to-end|ido-toggle-case|ido-toggle-ignore|ido-toggle-literal|ido-toggle-prefix|ido-toggle-regexp|ido-toggle-trace|ido-toggle-vc|ido-toggle-virtual-buffers|ido-trace|ido-unc-hosts-net-view|ido-unc-hosts|ido-undo-merge-work-directory|ido-unload-function|ido-up-directory|ido-visit-buffer|ido-wash-history|ido-wide-find-dir-or-delete-dir|ido-wide-find-dir|ido-wide-find-dirs-or-files|ido-wide-find-file-or-pop-dir|ido-wide-find-file|ido-word-matching-substring|ido-write-file|ielm|ietf-drums-get-comment|ietf-drums-init|ietf-drums-make-address|ietf-drums-narrow-to-header|ietf-drums-parse-address|ietf-drums-parse-addresses|ietf-drums-parse-date|ietf-drums-quote-string|ietf-drums-remove-comments|ietf-drums-remove-whitespace|ietf-drums-strip|ietf-drums-token-to-list|ietf-drums-unfold-fws|if-let|ifconfig|iimage-mode-buffer|iimage-mode|iimage-modification-hook|iimage-recenter|image--set-speed|image-after-revert-hook|image-animate-get-speed|image-animate-set-speed|image-animate-timeout|image-animated-p|image-backward-hscroll|image-bob|image-bol|image-bookmark-jump|image-bookmark-make-record|image-decrease-speed|image-dired--with-db-file|image-dired-add-to-file-comment-list|image-dired-add-to-tag-file-list|image-dired-add-to-tag-file-lists|image-dired-associated-dired-buffer-window|image-dired-associated-dired-buffer|image-dired-backward-image|image-dired-comment-thumbnail|image-dired-copy-with-exif-file-name|image-dired-create-display-image-buffer|image-dired-create-gallery-lists|image-dired-create-thumb|image-dired-create-thumbnail-buffer|image-dired-create-thumbs|image-dired-define-display-image-mode-keymap|image-dired-define-thumbnail-mode-keymap|image-dired-delete-char|image-dired-delete-tag|image-dired-dir|image-dired-dired-after-readin-hook|image-dired-dired-comment-files|image-dired-dired-display-external|image-dired-dired-display-image|image-dired-dired-display-properties|image-dired-dired-edit-comment-and-tags|image-dired-dired-file-marked-p|image-dired-dired-next-line|image-dired-dired-previous-line|image-dired-dired-toggle-marked-thumbs|image-dired-dired-with-window-configuration|image-dired-display-current-image-full|image-dired-display-current-image-sized|image-dired-display-image-mode|image-dired-display-image|image-dired-display-next-thumbnail-original|image-dired-display-previous-thumbnail-original|image-dired-display-thumb-properties|image-dired-display-thumb|image-dired-display-thumbnail-original-image|image-dired-display-thumbs-append|image-dired-display-thumbs|image-dired-display-window-height|image-dired-display-window-width|image-dired-display-window|image-dired-flag-thumb-original-file|image-dired-format-properties-string|image-dired-forward-image|image-dired-gallery-generate|image-dired-get-buffer-window|image-dired-get-comment|image-dired-get-exif-data|image-dired-get-exif-file-name|image-dired-get-thumbnail-image|image-dired-hidden-p|image-dired-image-at-point-p|image-dired-insert-image|image-dired-insert-thumbnail|image-dired-jump-original-dired-buffer|image-dired-jump-thumbnail-buffer|image-dired-kill-buffer-and-window|image-dired-line-up-dynamic|image-dired-line-up-interactive|image-dired-line-up|image-dired-list-tags|image-dired-mark-and-display-next|image-dired-mark-tagged-files|image-dired-mark-thumb-original-file|image-dired-modify-mark-on-thumb-original-file|image-dired-mouse-display-image|image-dired-mouse-select-thumbnail|image-dired-mouse-toggle-mark|image-dired-next-line-and-display|image-dired-next-line|image-dired-original-file-name|image-dired-previous-line-and-display|image-dired-previous-line|image-dired-read-comment|image-dired-refresh-thumb|image-dired-remove-tag|image-dired-restore-window-configuration|image-dired-rotate-original-left|image-dired-rotate-original-right|image-dired-rotate-original|image-dired-rotate-thumbnail-left|image-dired-rotate-thumbnail-right|image-dired-rotate-thumbnail|image-dired-sane-db-file|image-dired-save-information-from-widgets|image-dired-set-exif-data|image-dired-setup-dired-keybindings|image-dired-show-all-from-dir|image-dired-slideshow-start|image-dired-slideshow-step|image-dired-slideshow-stop|image-dired-tag-files|image-dired-tag-thumbnail-remove|image-dired-tag-thumbnail|image-dired-thumb-name|image-dired-thumbnail-display-external|image-dired-thumbnail-mode|image-dired-thumbnail-set-image-description|image-dired-thumbnail-window|image-dired-toggle-append-browsing|image-dired-toggle-dired-display-properties|image-dired-toggle-mark-thumb-original-file|image-dired-toggle-movement-tracking|image-dired-track-original-file|image-dired-track-thumbnail|image-dired-unmark-thumb-original-file|image-dired-update-property|image-dired-window-height-pixels|image-dired-window-width-pixels|image-dired-write-comments|image-dired-write-tags|image-dired|image-display-size|image-eob|image-eol|image-extension-data|image-file-call-underlying|image-file-handler|image-file-name-regexp|image-file-yank-handler|image-forward-hscroll|image-get-display-property|image-goto-frame|image-increase-speed|image-jpeg-p|image-metadata|image-minor-mode|image-mode--images-in-directory|image-mode-as-text|image-mode-fit-frame|image-mode-maybe|image-mode-menu|image-mode-reapply-winprops|image-mode-setup-winprops|image-mode-window-get|image-mode-window-put|image-mode-winprops|image-mode|image-next-file|image-next-frame|image-next-line|image-previous-file|image-previous-frame|image-previous-line|image-refresh|image-reset-speed|image-reverse-speed|image-scroll-down|image-scroll-up|image-search-load-path|image-set-window-hscroll|image-set-window-vscroll|image-toggle-animation|image-toggle-display-image|image-toggle-display-text|image-toggle-display|image-transform-check-size|image-transform-fit-to-height|image-transform-fit-to-width|image-transform-fit-width|image-transform-properties|image-transform-reset|image-transform-set-rotation|image-transform-set-scale|image-transform-width|image-type-auto-detected-p|image-type-from-buffer|image-type-from-data|image-type-from-file-header|image-type-from-file-name|image-type|imagemagick-filter-types|imagemagick-register-types|imap-add-callback|imap-anonymous-auth|imap-anonymous-p|imap-arrival-filter|imap-authenticate|imap-body-lines|imap-capability|imap-close|imap-cram-md5-auth|imap-cram-md5-p|imap-current-mailbox-p-1|imap-current-mailbox-p|imap-current-mailbox|imap-current-message|imap-digest-md5-auth|imap-digest-md5-p|imap-disable-multibyte|imap-envelope-from|imap-error-text|imap-fetch-asynch|imap-fetch-safe|imap-fetch|imap-find-next-line|imap-forward|imap-gssapi-auth-p|imap-gssapi-auth|imap-gssapi-open|imap-gssapi-stream-p|imap-id|imap-interactive-login|imap-kerberos4-auth-p|imap-kerberos4-auth|imap-kerberos4-open|imap-kerberos4-stream-p|imap-list-to-message-set|imap-log|imap-login-auth|imap-login-p|imap-logout-wait|imap-logout|imap-mailbox-acl-delete|imap-mailbox-acl-get|imap-mailbox-acl-set|imap-mailbox-close|imap-mailbox-create-1|imap-mailbox-create|imap-mailbox-delete|imap-mailbox-examine-1|imap-mailbox-examine|imap-mailbox-expunge|imap-mailbox-get-1|imap-mailbox-get|imap-mailbox-list|imap-mailbox-lsub|imap-mailbox-map-1|imap-mailbox-map|imap-mailbox-put|imap-mailbox-rename|imap-mailbox-select-1|imap-mailbox-select|imap-mailbox-status-asynch|imap-mailbox-status|imap-mailbox-subscribe|imap-mailbox-unselect|imap-mailbox-unsubscribe|imap-message-append|imap-message-appenduid-1|imap-message-appenduid|imap-message-body|imap-message-copy|imap-message-copyuid-1|imap-message-copyuid|imap-message-envelope-bcc|imap-message-envelope-cc|imap-message-envelope-date|imap-message-envelope-from|imap-message-envelope-in-reply-to|imap-message-envelope-message-id|imap-message-envelope-reply-to|imap-message-envelope-sender|imap-message-envelope-subject|imap-message-envelope-to|imap-message-flag-permanent-p|imap-message-flags-add|imap-message-flags-del|imap-message-flags-set|imap-message-get|imap-message-map|imap-message-put|imap-namespace|imap-network-open|imap-network-p|imap-ok-p|imap-open-1|imap-open|imap-opened|imap-parse-acl|imap-parse-address-list|imap-parse-address|imap-parse-astring|imap-parse-body-ext)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)i(?:dlwave-sintern-dir|dlwave-sintern-keyword-list|dlwave-sintern-keyword|dlwave-sintern-libname|dlwave-sintern-method|dlwave-sintern-rinfo-list|dlwave-sintern-routine-or-method|dlwave-sintern-routine|dlwave-sintern-set|dlwave-sintern-sysvar-alist|dlwave-sintern-sysvar|dlwave-sintern-sysvartag|dlwave-sintern|dlwave-skip-label-or-case|dlwave-skip-multi-commands|dlwave-skip-object|dlwave-special-lib-test|dlwave-split-line|dlwave-split-link-target|dlwave-split-menu-emacs|dlwave-split-menu-xemacs|dlwave-split-string|dlwave-start-load-rinfo-timer|dlwave-start-of-substatement|dlwave-statement-type|dlwave-struct-borders|dlwave-struct-inherits|dlwave-struct-tags|dlwave-study-twins|dlwave-substitute-link-target|dlwave-surround|dlwave-switch|dlwave-sys-dir|dlwave-syslib-p|dlwave-syslib-scanned-p|dlwave-sysvars-reset|dlwave-template|dlwave-this-word|dlwave-toggle-comment-region|dlwave-true-path-alist|dlwave-uniquify|dlwave-unit-name|dlwave-update-buffer-routine-info|dlwave-update-current-buffer-info|dlwave-update-routine-info|dlwave-user-catalog-command-hook|dlwave-what-function|dlwave-what-module-find-class|dlwave-what-module|dlwave-what-procedure|dlwave-where|dlwave-while|dlwave-widget-scan-user-lib-files|dlwave-with-special-syntax|dlwave-write-paths|dlwave-xml-create-class-method-lists|dlwave-xml-create-rinfo-list|dlwave-xml-create-sysvar-alist|dlwave-xml-system-routine-info-up-to-date|dlwave-xor|dna-to-ascii|do-active|do-add-virtual-buffers-to-list|do-all-completions|do-buffer-internal|do-buffer-window-other-frame|do-bury-buffer-at-head|do-cache-ftp-valid|do-cache-unc-valid|do-choose-completion-string|do-chop|do-common-initialization|do-complete-space|do-complete|do-completing-read|do-completion-help|do-completions|do-copy-current-file-name|do-copy-current-word|do-delete-backward-updir|do-delete-backward-word-updir|do-delete-file-at-head|do-directory-too-big-p|do-dired|do-display-buffer|do-display-file|do-edit-input|do-enter-dired|do-enter-find-file|do-enter-insert-buffer|do-enter-insert-file|do-enter-switch-buffer|do-everywhere|do-exhibit|do-existing-item-p|do-exit-minibuffer|do-expand-directory|do-fallback-command|do-file-extension-aux|do-file-extension-lessp|do-file-extension-order|do-file-internal|do-file-lessp|do-file-name-all-completions-1|do-file-name-all-completions|do-final-slash|do-find-alternate-file|do-find-common-substring|do-find-file-in-dir|do-find-file-other-frame|do-find-file-other-window|do-find-file-read-only-other-frame|do-find-file-read-only-other-window|do-find-file-read-only|do-find-file|do-flatten-merged-list|do-forget-work-directory|do-fractionp|do-get-buffers-in-frames|do-get-bufname|do-get-work-directory|do-get-work-file|do-ignore-item-p|do-init-completion-maps|do-initiate-auto-merge|do-insert-buffer|do-insert-file|do-is-ftp-directory|do-is-root-directory|do-is-slow-ftp-host|do-is-tramp-root|do-is-unc-host|do-is-unc-root|do-kill-buffer-at-head|do-kill-buffer|do-kill-emacs-hook|do-list-directory|do-load-history|do-local-file-exists-p|do-magic-backward-char|do-magic-delete-char|do-magic-forward-char|do-make-buffer-list-1|do-make-buffer-list|do-make-choice-list|do-make-dir-list-1|do-make-dir-list|do-make-directory|do-make-file-list-1|do-make-file-list|do-make-merged-file-list-1|do-make-merged-file-list|do-make-prompt|do-makealist|do-may-cache-directory|do-merge-work-directories|do-minibuffer-setup|do-mode|do-name|do-next-match-dir|do-next-match|do-next-work-directory|do-next-work-file|do-no-final-slash|do-nonreadable-directory-p|do-pop-dir|do-pp|do-prev-match-dir|do-prev-match|do-prev-work-directory|do-prev-work-file|do-push-dir-first|do-push-dir|do-read-buffer|do-read-directory-name|do-read-file-name|do-read-internal|do-record-command|do-record-work-directory|do-record-work-file|do-remove-cached-dir|do-reread-directory|do-restrict-to-matches|do-save-history|do-select-text|do-set-common-completion|do-set-current-directory|do-set-current-home|do-set-matches-1|do-set-matches|do-setup-completion-map|do-sort-merged-list|do-summary-buffers-to-end|do-switch-buffer-other-frame|do-switch-buffer-other-window|do-switch-buffer|do-take-first-match|do-tidy|do-time-stamp|do-to-end|do-toggle-case|do-toggle-ignore|do-toggle-literal|do-toggle-prefix|do-toggle-regexp|do-toggle-trace|do-toggle-vc|do-toggle-virtual-buffers|do-trace|do-unc-hosts-net-view|do-unc-hosts|do-undo-merge-work-directory|do-unload-function|do-up-directory|do-visit-buffer|do-wash-history|do-wide-find-dir-or-delete-dir|do-wide-find-dir|do-wide-find-dirs-or-files|do-wide-find-file-or-pop-dir|do-wide-find-file|do-word-matching-substring|do-write-file|elm|etf-drums-get-comment|etf-drums-init|etf-drums-make-address|etf-drums-narrow-to-header|etf-drums-parse-address|etf-drums-parse-addresses|etf-drums-parse-date|etf-drums-quote-string|etf-drums-remove-comments|etf-drums-remove-whitespace|etf-drums-strip|etf-drums-token-to-list|etf-drums-unfold-fws|f-let|fconfig|image-mode-buffer|image-mode|image-modification-hook|image-recenter|mage--set-speed|mage-after-revert-hook|mage-animate-get-speed|mage-animate-set-speed|mage-animate-timeout|mage-animated-p|mage-backward-hscroll|mage-bob|mage-bol|mage-bookmark-jump|mage-bookmark-make-record|mage-decrease-speed|mage-dired--with-db-file|mage-dired-add-to-file-comment-list|mage-dired-add-to-tag-file-list|mage-dired-add-to-tag-file-lists|mage-dired-associated-dired-buffer-window|mage-dired-associated-dired-buffer|mage-dired-backward-image|mage-dired-comment-thumbnail|mage-dired-copy-with-exif-file-name|mage-dired-create-display-image-buffer|mage-dired-create-gallery-lists|mage-dired-create-thumb|mage-dired-create-thumbnail-buffer|mage-dired-create-thumbs|mage-dired-define-display-image-mode-keymap|mage-dired-define-thumbnail-mode-keymap|mage-dired-delete-char|mage-dired-delete-tag|mage-dired-dir|mage-dired-dired-after-readin-hook|mage-dired-dired-comment-files|mage-dired-dired-display-external|mage-dired-dired-display-image|mage-dired-dired-display-properties|mage-dired-dired-edit-comment-and-tags|mage-dired-dired-file-marked-p|mage-dired-dired-next-line|mage-dired-dired-previous-line|mage-dired-dired-toggle-marked-thumbs|mage-dired-dired-with-window-configuration|mage-dired-display-current-image-full|mage-dired-display-current-image-sized|mage-dired-display-image-mode|mage-dired-display-image|mage-dired-display-next-thumbnail-original|mage-dired-display-previous-thumbnail-original|mage-dired-display-thumb-properties|mage-dired-display-thumb|mage-dired-display-thumbnail-original-image|mage-dired-display-thumbs-append|mage-dired-display-thumbs|mage-dired-display-window-height|mage-dired-display-window-width|mage-dired-display-window|mage-dired-flag-thumb-original-file|mage-dired-format-properties-string|mage-dired-forward-image|mage-dired-gallery-generate|mage-dired-get-buffer-window|mage-dired-get-comment|mage-dired-get-exif-data|mage-dired-get-exif-file-name|mage-dired-get-thumbnail-image|mage-dired-hidden-p|mage-dired-image-at-point-p|mage-dired-insert-image|mage-dired-insert-thumbnail|mage-dired-jump-original-dired-buffer|mage-dired-jump-thumbnail-buffer|mage-dired-kill-buffer-and-window|mage-dired-line-up-dynamic|mage-dired-line-up-interactive|mage-dired-line-up|mage-dired-list-tags|mage-dired-mark-and-display-next|mage-dired-mark-tagged-files|mage-dired-mark-thumb-original-file|mage-dired-modify-mark-on-thumb-original-file|mage-dired-mouse-display-image|mage-dired-mouse-select-thumbnail|mage-dired-mouse-toggle-mark|mage-dired-next-line-and-display|mage-dired-next-line|mage-dired-original-file-name|mage-dired-previous-line-and-display|mage-dired-previous-line|mage-dired-read-comment|mage-dired-refresh-thumb|mage-dired-remove-tag|mage-dired-restore-window-configuration|mage-dired-rotate-original-left|mage-dired-rotate-original-right|mage-dired-rotate-original|mage-dired-rotate-thumbnail-left|mage-dired-rotate-thumbnail-right|mage-dired-rotate-thumbnail|mage-dired-sane-db-file|mage-dired-save-information-from-widgets|mage-dired-set-exif-data|mage-dired-setup-dired-keybindings|mage-dired-show-all-from-dir|mage-dired-slideshow-start|mage-dired-slideshow-step|mage-dired-slideshow-stop|mage-dired-tag-files|mage-dired-tag-thumbnail-remove|mage-dired-tag-thumbnail|mage-dired-thumb-name|mage-dired-thumbnail-display-external|mage-dired-thumbnail-mode|mage-dired-thumbnail-set-image-description|mage-dired-thumbnail-window|mage-dired-toggle-append-browsing|mage-dired-toggle-dired-display-properties|mage-dired-toggle-mark-thumb-original-file|mage-dired-toggle-movement-tracking|mage-dired-track-original-file|mage-dired-track-thumbnail|mage-dired-unmark-thumb-original-file|mage-dired-update-property|mage-dired-window-height-pixels|mage-dired-window-width-pixels|mage-dired-write-comments|mage-dired-write-tags|mage-dired|mage-display-size|mage-eob|mage-eol|mage-extension-data|mage-file-call-underlying|mage-file-handler|mage-file-name-regexp|mage-file-yank-handler|mage-forward-hscroll|mage-get-display-property|mage-goto-frame|mage-increase-speed|mage-jpeg-p|mage-metadata|mage-minor-mode|mage-mode--images-in-directory|mage-mode-as-text|mage-mode-fit-frame|mage-mode-maybe|mage-mode-menu|mage-mode-reapply-winprops|mage-mode-setup-winprops|mage-mode-window-get|mage-mode-window-put|mage-mode-winprops|mage-mode|mage-next-file|mage-next-frame|mage-next-line|mage-previous-file|mage-previous-frame|mage-previous-line|mage-refresh|mage-reset-speed|mage-reverse-speed|mage-scroll-down|mage-scroll-up|mage-search-load-path|mage-set-window-hscroll|mage-set-window-vscroll|mage-toggle-animation|mage-toggle-display-image|mage-toggle-display-text|mage-toggle-display|mage-transform-check-size|mage-transform-fit-to-height|mage-transform-fit-to-width|mage-transform-fit-width|mage-transform-properties|mage-transform-reset|mage-transform-set-rotation|mage-transform-set-scale|mage-transform-width|mage-type-auto-detected-p|mage-type-from-buffer|mage-type-from-data|mage-type-from-file-header|mage-type-from-file-name|mage-type|magemagick-filter-types|magemagick-register-types|map-add-callback|map-anonymous-auth|map-anonymous-p|map-arrival-filter|map-authenticate|map-body-lines|map-capability|map-close|map-cram-md5-auth|map-cram-md5-p|map-current-mailbox-p-1|map-current-mailbox-p|map-current-mailbox|map-current-message|map-digest-md5-auth|map-digest-md5-p|map-disable-multibyte|map-envelope-from|map-error-text|map-fetch-asynch|map-fetch-safe|map-fetch|map-find-next-line|map-forward|map-gssapi-auth-p|map-gssapi-auth|map-gssapi-open|map-gssapi-stream-p|map-id|map-interactive-login|map-kerberos4-auth-p|map-kerberos4-auth|map-kerberos4-open|map-kerberos4-stream-p|map-list-to-message-set|map-log|map-login-auth|map-login-p|map-logout-wait|map-logout|map-mailbox-acl-delete|map-mailbox-acl-get|map-mailbox-acl-set|map-mailbox-close|map-mailbox-create-1|map-mailbox-create|map-mailbox-delete|map-mailbox-examine-1|map-mailbox-examine|map-mailbox-expunge|map-mailbox-get-1|map-mailbox-get|map-mailbox-list|map-mailbox-lsub|map-mailbox-map-1|map-mailbox-map|map-mailbox-put|map-mailbox-rename|map-mailbox-select-1|map-mailbox-select|map-mailbox-status-asynch|map-mailbox-status|map-mailbox-subscribe|map-mailbox-unselect|map-mailbox-unsubscribe|map-message-append|map-message-appenduid-1|map-message-appenduid|map-message-body|map-message-copy|map-message-copyuid-1|map-message-copyuid|map-message-envelope-bcc|map-message-envelope-cc|map-message-envelope-date|map-message-envelope-from|map-message-envelope-in-reply-to|map-message-envelope-message-id|map-message-envelope-reply-to|map-message-envelope-sender|map-message-envelope-subject|map-message-envelope-to|map-message-flag-permanent-p|map-message-flags-add|map-message-flags-del|map-message-flags-set|map-message-get|map-message-map|map-message-put|map-namespace|map-network-open|map-network-p|map-ok-p|map-open-1|map-open|map-opened|map-parse-acl|map-parse-address-list|map-parse-address|map-parse-astring|map-parse-body-ext)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:imap-parse-body-extension|imap-parse-body|imap-parse-data-list|imap-parse-envelope|imap-parse-fetch-body-section|imap-parse-fetch|imap-parse-flag-list|imap-parse-greeting|imap-parse-header-list|imap-parse-literal|imap-parse-mailbox|imap-parse-nil|imap-parse-nstring|imap-parse-number|imap-parse-resp-text-code|imap-parse-resp-text|imap-parse-response|imap-parse-status|imap-parse-string-list|imap-parse-string|imap-ping-server|imap-quote-specials|imap-range-to-message-set|imap-remassoc|imap-sasl-auth-p|imap-sasl-auth|imap-sasl-make-mechanisms|imap-search|imap-send-command-1|imap-send-command-wait|imap-send-command|imap-sentinel|imap-shell-open|imap-shell-p|imap-ssl-open|imap-ssl-p|imap-starttls-open|imap-starttls-p|imap-string-to-integer|imap-tls-open|imap-tls-p|imap-utf7-decode|imap-utf7-encode|imap-wait-for-tag|imenu--cleanup|imenu--completion-buffer|imenu--create-keymap|imenu--generic-function|imenu--in-alist|imenu--make-index-alist|imenu--menubar-select|imenu--mouse-menu|imenu--relative-position|imenu--sort-by-name|imenu--sort-by-position|imenu--split-menu|imenu--split-submenus|imenu--split|imenu--subalist-p|imenu--truncate-items|imenu-add-menubar-index|imenu-choose-buffer-index|imenu-default-create-index-function|imenu-default-goto-function|imenu-example--create-c-index|imenu-example--create-lisp-index|imenu-example--lisp-extract-index-name|imenu-example--name-and-position|imenu-find-default|imenu-progress-message|imenu-update-menubar|imenu|in-is13194-post-read-conversion|in-is13194-pre-write-conversion|in-string-p|inactivate-input-method|incf|increase-left-margin|increase-right-margin|increment-register|indent-accumulate-tab-stops|indent-for-comment|indent-icon-exp|indent-line-to|indent-new-comment-line|indent-next-tab-stop|indent-perl-exp|indent-pp-sexp|indent-rigidly--current-indentation|indent-rigidly--pop-undo|indent-rigidly-left-to-tab-stop|indent-rigidly-left|indent-rigidly-right-to-tab-stop|indent-rigidly-right|indent-sexp|indent-tcl-exp|indent-to-column|indented-text-mode|indian-2-column-to-ucs-region|indian-compose-regexp|indian-compose-region|indian-compose-string|indicate-copied-region|inferior-lisp-install-letter-bindings|inferior-lisp-menu|inferior-lisp-mode|inferior-lisp-proc|inferior-lisp|inferior-octave-check-process|inferior-octave-complete|inferior-octave-completion-at-point|inferior-octave-completion-table|inferior-octave-directory-tracker|inferior-octave-dynamic-list-input-ring|inferior-octave-mode|inferior-octave-output-digest|inferior-octave-process-live-p|inferior-octave-resync-dirs|inferior-octave-send-list-and-digest|inferior-octave-startup|inferior-octave-track-window-width-change|inferior-octave|inferior-python-mode|inferior-scheme-mode|inferior-tcl-mode|inferior-tcl-proc|inferior-tcl|info--manual-names|info--prettify-description|info-apropos|info-complete-file|info-complete-symbol|info-complete|info-display-manual|info-emacs-bug|info-emacs-manual|info-file-exists-p|info-finder|info-initialize|info-insert-file-contents-1|info-insert-file-contents|info-lookup->all-modes|info-lookup->cache|info-lookup->completions|info-lookup->doc-spec|info-lookup->ignore-case|info-lookup->initialized|info-lookup->mode-cache|info-lookup->mode-value|info-lookup->other-modes|info-lookup->parse-rule|info-lookup->refer-modes|info-lookup->regexp|info-lookup->topic-cache|info-lookup->topic-value|info-lookup-add-help\\*|info-lookup-add-help|info-lookup-change-mode|info-lookup-completions-at-point|info-lookup-file|info-lookup-guess-c-symbol|info-lookup-guess-custom-symbol|info-lookup-guess-default\\*|info-lookup-guess-default|info-lookup-interactive-arguments|info-lookup-make-completions|info-lookup-maybe-add-help|info-lookup-quick-all-modes|info-lookup-reset|info-lookup-select-mode|info-lookup-setup-mode|info-lookup-symbol|info-lookup|info-other-window|info-setup|info-standalone|info-xref-all-info-files|info-xref-check-all-custom|info-xref-check-all|info-xref-check-buffer|info-xref-check-list|info-xref-check-node|info-xref-check|info-xref-docstrings|info-xref-goto-node-p|info-xref-lock-file-p|info-xref-output-error|info-xref-output|info-xref-subfile-p|info-xref-with-file|info-xref-with-output|info|inhibit-local-variables-p|init-image-library|initialize-completions|initialize-instance|initialize-new-tags-table|inline|insert-abbrevs|insert-byte|insert-directory-adj-pos|insert-directory-safely|insert-file-1|insert-file-literally|insert-file|insert-for-yank-1|insert-image-file|insert-kbd-macro|insert-pair|insert-parentheses|insert-rectangle|insert-string|insert-tab|int-to-string|interactive-completion-string-reader|interactive-p|intern-safe|internal--after-save-selected-window|internal--after-with-selected-window|internal--before-save-selected-window|internal--before-with-selected-window|internal--build-binding-value-form|internal--build-binding|internal--build-bindings|internal--check-binding|internal--listify|internal--thread-argument|internal--track-mouse|internal-ange-ftp-mode|internal-char-font|internal-complete-buffer-except|internal-complete-buffer|internal-copy-lisp-face|internal-default-process-filter|internal-default-process-sentinel|internal-describe-syntax-value|internal-event-symbol-parse-modifiers|internal-face-x-get-resource|internal-get-lisp-face-attribute|internal-lisp-face-attribute-values|internal-lisp-face-empty-p|internal-lisp-face-equal-p|internal-lisp-face-p|internal-macroexpand-for-load|internal-make-lisp-face|internal-make-var-non-special|internal-merge-in-global-face|internal-pop-keymap|internal-push-keymap|internal-set-alternative-font-family-alist|internal-set-alternative-font-registry-alist|internal-set-font-selection-order|internal-set-lisp-face-attribute-from-resource|internal-set-lisp-face-attribute|internal-show-cursor-p|internal-show-cursor|internal-temp-output-buffer-show|internal-timer-start-idle|intersection|inverse-add-abbrev|inverse-add-global-abbrev|inverse-add-mode-abbrev|inversion-<|inversion-=|inversion-add-to-load-path|inversion-check-version|inversion-decode-version|inversion-download-package-ask|inversion-find-version|inversion-locate-package-files-and-split|inversion-locate-package-files|inversion-package-incompatibility-version|inversion-package-version|inversion-recode|inversion-release-to-number|inversion-require-emacs|inversion-require|inversion-reverse-test|inversion-test|ipconfig|irc|isInNet|isPlainHostName|isResolvable|isearch--get-state|isearch--set-state|isearch--state-barrier--cmacro|isearch--state-barrier|isearch--state-case-fold-search--cmacro|isearch--state-case-fold-search|isearch--state-error--cmacro|isearch--state-error|isearch--state-forward--cmacro|isearch--state-forward|isearch--state-message--cmacro|isearch--state-message|isearch--state-other-end--cmacro|isearch--state-other-end|isearch--state-p--cmacro|isearch--state-p|isearch--state-point--cmacro|isearch--state-point|isearch--state-pop-fun--cmacro|isearch--state-pop-fun|isearch--state-string--cmacro|isearch--state-string|isearch--state-success--cmacro|isearch--state-success|isearch--state-word--cmacro|isearch--state-word|isearch--state-wrapped--cmacro|isearch--state-wrapped|isearch-abort|isearch-back-into-window|isearch-backslash|isearch-backward-regexp|isearch-backward|isearch-cancel|isearch-char-by-name|isearch-clean-overlays|isearch-close-unnecessary-overlays|isearch-complete-edit|isearch-complete|isearch-complete1|isearch-dehighlight|isearch-del-char|isearch-delete-char|isearch-describe-bindings|isearch-describe-key|isearch-describe-mode|isearch-done|isearch-edit-string|isearch-exit|isearch-fail-pos|isearch-fallback|isearch-filter-visible|isearch-forward-exit-minibuffer|isearch-forward-regexp|isearch-forward-symbol-at-point|isearch-forward-symbol|isearch-forward-word|isearch-forward|isearch-help-for-help-internal-doc|isearch-help-for-help-internal|isearch-help-for-help|isearch-highlight-regexp|isearch-highlight|isearch-intersects-p|isearch-lazy-highlight-cleanup|isearch-lazy-highlight-new-loop|isearch-lazy-highlight-search|isearch-lazy-highlight-update|isearch-message-prefix|isearch-message-suffix|isearch-message|isearch-mode-help|isearch-mode|isearch-mouse-2|isearch-no-upper-case-p|isearch-nonincremental-exit-minibuffer|isearch-occur|isearch-open-necessary-overlays|isearch-open-overlay-temporary|isearch-pop-state|isearch-post-command-hook|isearch-pre-command-hook|isearch-printing-char|isearch-process-search-char|isearch-process-search-multibyte-characters|isearch-process-search-string|isearch-push-state|isearch-query-replace-regexp|isearch-query-replace|isearch-quote-char|isearch-range-invisible|isearch-repeat-backward|isearch-repeat-forward|isearch-repeat|isearch-resume|isearch-reverse-exit-minibuffer|isearch-ring-adjust|isearch-ring-adjust1|isearch-ring-advance|isearch-ring-retreat|isearch-search-and-update|isearch-search-fun-default|isearch-search-fun|isearch-search-string|isearch-search|isearch-string-out-of-window|isearch-symbol-regexp|isearch-text-char-description|isearch-toggle-case-fold|isearch-toggle-input-method|isearch-toggle-invisible|isearch-toggle-lax-whitespace|isearch-toggle-regexp|isearch-toggle-specified-input-method|isearch-toggle-symbol|isearch-toggle-word|isearch-unread|isearch-update-ring|isearch-update|isearch-yank-char-in-minibuffer|isearch-yank-char|isearch-yank-internal|isearch-yank-kill|isearch-yank-line|isearch-yank-pop|isearch-yank-string|isearch-yank-word-or-char|isearch-yank-word|isearch-yank-x-selection|isearchb-activate|isearchb-follow-char|isearchb-iswitchb|isearchb-set-keybindings|isearchb-stop|isearchb|iso-charset|iso-cvt-define-menu|iso-cvt-read-only|iso-cvt-write-only|iso-german|iso-gtex2iso|iso-iso2duden|iso-iso2gtex|iso-iso2sgml|iso-iso2tex|iso-sgml2iso|iso-spanish|iso-tex2iso|iso-transl-ctl-x-8-map|ispell-accept-buffer-local-defs|ispell-accept-output|ispell-add-per-file-word-list|ispell-aspell-add-aliases|ispell-aspell-find-dictionary|ispell-begin-skip-region-regexp|ispell-begin-skip-region|ispell-begin-tex-skip-regexp|ispell-buffer-local-dict|ispell-buffer-local-parsing|ispell-buffer-local-words|ispell-buffer-with-debug|ispell-buffer|ispell-call-process-region|ispell-call-process|ispell-change-dictionary|ispell-check-minver|ispell-check-version|ispell-command-loop|ispell-comments-and-strings|ispell-complete-word-interior-frag|ispell-complete-word|ispell-continue|ispell-create-debug-buffer|ispell-decode-string|ispell-display-buffer|ispell-filter|ispell-find-aspell-dictionaries|ispell-find-hunspell-dictionaries|ispell-get-aspell-config-value|ispell-get-casechars|ispell-get-coding-system|ispell-get-decoded-string|ispell-get-extended-character-mode|ispell-get-ispell-args|ispell-get-line|ispell-get-many-otherchars-p|ispell-get-not-casechars|ispell-get-otherchars|ispell-get-word|ispell-help|ispell-highlight-spelling-error-generic|ispell-highlight-spelling-error-overlay|ispell-highlight-spelling-error-xemacs|ispell-highlight-spelling-error|ispell-horiz-scroll|ispell-hunspell-fill-dictionary-entry|ispell-ignore-fcc|ispell-init-process|ispell-int-char|ispell-internal-change-dictionary|ispell-kill-ispell|ispell-looking-at|ispell-looking-back|ispell-lookup-words|ispell-menu-map|ispell-message|ispell-mime-multipartp|ispell-mime-skip-part|ispell-minor-check|ispell-minor-mode|ispell-non-empty-string|ispell-parse-hunspell-affix-file|ispell-parse-output|ispell-pdict-save|ispell-print-if-debug|ispell-process-line|ispell-process-status|ispell-region|ispell-send-replacement|ispell-send-string|ispell-set-spellchecker-params|ispell-show-choices|ispell-skip-region-list|ispell-skip-region|ispell-start-process|ispell-tex-arg-end|ispell-valid-dictionary-list|ispell-with-no-warnings|ispell-word|ispell|isqrt|iswitchb-buffer-other-frame|iswitchb-buffer-other-window|iswitchb-buffer|iswitchb-case|iswitchb-chop|iswitchb-complete|iswitchb-completion-help|iswitchb-completions|iswitchb-display-buffer|iswitchb-entryfn-p|iswitchb-exhibit|iswitchb-existing-buffer-p|iswitchb-exit-minibuffer|iswitchb-find-common-substring|iswitchb-find-file|iswitchb-get-buffers-in-frames|iswitchb-get-bufname|iswitchb-get-matched-buffers|iswitchb-ignore-buffername-p|iswitchb-init-XEmacs-trick|iswitchb-kill-buffer|iswitchb-make-buflist|iswitchb-makealist|iswitchb-minibuffer-setup|iswitchb-mode|iswitchb-next-match|iswitchb-output-completion|iswitchb-possible-new-buffer)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)i(?:map-parse-body-extension|map-parse-body|map-parse-data-list|map-parse-envelope|map-parse-fetch-body-section|map-parse-fetch|map-parse-flag-list|map-parse-greeting|map-parse-header-list|map-parse-literal|map-parse-mailbox|map-parse-nil|map-parse-nstring|map-parse-number|map-parse-resp-text-code|map-parse-resp-text|map-parse-response|map-parse-status|map-parse-string-list|map-parse-string|map-ping-server|map-quote-specials|map-range-to-message-set|map-remassoc|map-sasl-auth-p|map-sasl-auth|map-sasl-make-mechanisms|map-search|map-send-command-1|map-send-command-wait|map-send-command|map-sentinel|map-shell-open|map-shell-p|map-ssl-open|map-ssl-p|map-starttls-open|map-starttls-p|map-string-to-integer|map-tls-open|map-tls-p|map-utf7-decode|map-utf7-encode|map-wait-for-tag|menu--cleanup|menu--completion-buffer|menu--create-keymap|menu--generic-function|menu--in-alist|menu--make-index-alist|menu--menubar-select|menu--mouse-menu|menu--relative-position|menu--sort-by-name|menu--sort-by-position|menu--split-menu|menu--split-submenus|menu--split|menu--subalist-p|menu--truncate-items|menu-add-menubar-index|menu-choose-buffer-index|menu-default-create-index-function|menu-default-goto-function|menu-example--create-c-index|menu-example--create-lisp-index|menu-example--lisp-extract-index-name|menu-example--name-and-position|menu-find-default|menu-progress-message|menu-update-menubar|menu|n-is13194-post-read-conversion|n-is13194-pre-write-conversion|n-string-p|nactivate-input-method|ncf|ncrease-left-margin|ncrease-right-margin|ncrement-register|ndent-accumulate-tab-stops|ndent-for-comment|ndent-icon-exp|ndent-line-to|ndent-new-comment-line|ndent-next-tab-stop|ndent-perl-exp|ndent-pp-sexp|ndent-rigidly--current-indentation|ndent-rigidly--pop-undo|ndent-rigidly-left-to-tab-stop|ndent-rigidly-left|ndent-rigidly-right-to-tab-stop|ndent-rigidly-right|ndent-sexp|ndent-tcl-exp|ndent-to-column|ndented-text-mode|ndian-2-column-to-ucs-region|ndian-compose-regexp|ndian-compose-region|ndian-compose-string|ndicate-copied-region|nferior-lisp-install-letter-bindings|nferior-lisp-menu|nferior-lisp-mode|nferior-lisp-proc|nferior-lisp|nferior-octave-check-process|nferior-octave-complete|nferior-octave-completion-at-point|nferior-octave-completion-table|nferior-octave-directory-tracker|nferior-octave-dynamic-list-input-ring|nferior-octave-mode|nferior-octave-output-digest|nferior-octave-process-live-p|nferior-octave-resync-dirs|nferior-octave-send-list-and-digest|nferior-octave-startup|nferior-octave-track-window-width-change|nferior-octave|nferior-python-mode|nferior-scheme-mode|nferior-tcl-mode|nferior-tcl-proc|nferior-tcl|nfo--manual-names|nfo--prettify-description|nfo-apropos|nfo-complete-file|nfo-complete-symbol|nfo-complete|nfo-display-manual|nfo-emacs-bug|nfo-emacs-manual|nfo-file-exists-p|nfo-finder|nfo-initialize|nfo-insert-file-contents-1|nfo-insert-file-contents|nfo-lookup->all-modes|nfo-lookup->cache|nfo-lookup->completions|nfo-lookup->doc-spec|nfo-lookup->ignore-case|nfo-lookup->initialized|nfo-lookup->mode-cache|nfo-lookup->mode-value|nfo-lookup->other-modes|nfo-lookup->parse-rule|nfo-lookup->refer-modes|nfo-lookup->regexp|nfo-lookup->topic-cache|nfo-lookup->topic-value|nfo-lookup-add-help\\*|nfo-lookup-add-help|nfo-lookup-change-mode|nfo-lookup-completions-at-point|nfo-lookup-file|nfo-lookup-guess-c-symbol|nfo-lookup-guess-custom-symbol|nfo-lookup-guess-default\\*|nfo-lookup-guess-default|nfo-lookup-interactive-arguments|nfo-lookup-make-completions|nfo-lookup-maybe-add-help|nfo-lookup-quick-all-modes|nfo-lookup-reset|nfo-lookup-select-mode|nfo-lookup-setup-mode|nfo-lookup-symbol|nfo-lookup|nfo-other-window|nfo-setup|nfo-standalone|nfo-xref-all-info-files|nfo-xref-check-all-custom|nfo-xref-check-all|nfo-xref-check-buffer|nfo-xref-check-list|nfo-xref-check-node|nfo-xref-check|nfo-xref-docstrings|nfo-xref-goto-node-p|nfo-xref-lock-file-p|nfo-xref-output-error|nfo-xref-output|nfo-xref-subfile-p|nfo-xref-with-file|nfo-xref-with-output|nfo|nhibit-local-variables-p|nit-image-library|nitialize-completions|nitialize-instance|nitialize-new-tags-table|nline|nsert-abbrevs|nsert-byte|nsert-directory-adj-pos|nsert-directory-safely|nsert-file-1|nsert-file-literally|nsert-file|nsert-for-yank-1|nsert-image-file|nsert-kbd-macro|nsert-pair|nsert-parentheses|nsert-rectangle|nsert-string|nsert-tab|nt-to-string|nteractive-completion-string-reader|nteractive-p|ntern-safe|nternal--after-save-selected-window|nternal--after-with-selected-window|nternal--before-save-selected-window|nternal--before-with-selected-window|nternal--build-binding-value-form|nternal--build-binding|nternal--build-bindings|nternal--check-binding|nternal--listify|nternal--thread-argument|nternal--track-mouse|nternal-ange-ftp-mode|nternal-char-font|nternal-complete-buffer-except|nternal-complete-buffer|nternal-copy-lisp-face|nternal-default-process-filter|nternal-default-process-sentinel|nternal-describe-syntax-value|nternal-event-symbol-parse-modifiers|nternal-face-x-get-resource|nternal-get-lisp-face-attribute|nternal-lisp-face-attribute-values|nternal-lisp-face-empty-p|nternal-lisp-face-equal-p|nternal-lisp-face-p|nternal-macroexpand-for-load|nternal-make-lisp-face|nternal-make-var-non-special|nternal-merge-in-global-face|nternal-pop-keymap|nternal-push-keymap|nternal-set-alternative-font-family-alist|nternal-set-alternative-font-registry-alist|nternal-set-font-selection-order|nternal-set-lisp-face-attribute-from-resource|nternal-set-lisp-face-attribute|nternal-show-cursor-p|nternal-show-cursor|nternal-temp-output-buffer-show|nternal-timer-start-idle|ntersection|nverse-add-abbrev|nverse-add-global-abbrev|nverse-add-mode-abbrev|nversion-<|nversion-=|nversion-add-to-load-path|nversion-check-version|nversion-decode-version|nversion-download-package-ask|nversion-find-version|nversion-locate-package-files-and-split|nversion-locate-package-files|nversion-package-incompatibility-version|nversion-package-version|nversion-recode|nversion-release-to-number|nversion-require-emacs|nversion-require|nversion-reverse-test|nversion-test|pconfig|rc|sInNet|sPlainHostName|sResolvable|search--get-state|search--set-state|search--state-barrier--cmacro|search--state-barrier|search--state-case-fold-search--cmacro|search--state-case-fold-search|search--state-error--cmacro|search--state-error|search--state-forward--cmacro|search--state-forward|search--state-message--cmacro|search--state-message|search--state-other-end--cmacro|search--state-other-end|search--state-p--cmacro|search--state-p|search--state-point--cmacro|search--state-point|search--state-pop-fun--cmacro|search--state-pop-fun|search--state-string--cmacro|search--state-string|search--state-success--cmacro|search--state-success|search--state-word--cmacro|search--state-word|search--state-wrapped--cmacro|search--state-wrapped|search-abort|search-back-into-window|search-backslash|search-backward-regexp|search-backward|search-cancel|search-char-by-name|search-clean-overlays|search-close-unnecessary-overlays|search-complete-edit|search-complete|search-complete1|search-dehighlight|search-del-char|search-delete-char|search-describe-bindings|search-describe-key|search-describe-mode|search-done|search-edit-string|search-exit|search-fail-pos|search-fallback|search-filter-visible|search-forward-exit-minibuffer|search-forward-regexp|search-forward-symbol-at-point|search-forward-symbol|search-forward-word|search-forward|search-help-for-help-internal-doc|search-help-for-help-internal|search-help-for-help|search-highlight-regexp|search-highlight|search-intersects-p|search-lazy-highlight-cleanup|search-lazy-highlight-new-loop|search-lazy-highlight-search|search-lazy-highlight-update|search-message-prefix|search-message-suffix|search-message|search-mode-help|search-mode|search-mouse-2|search-no-upper-case-p|search-nonincremental-exit-minibuffer|search-occur|search-open-necessary-overlays|search-open-overlay-temporary|search-pop-state|search-post-command-hook|search-pre-command-hook|search-printing-char|search-process-search-char|search-process-search-multibyte-characters|search-process-search-string|search-push-state|search-query-replace-regexp|search-query-replace|search-quote-char|search-range-invisible|search-repeat-backward|search-repeat-forward|search-repeat|search-resume|search-reverse-exit-minibuffer|search-ring-adjust|search-ring-adjust1|search-ring-advance|search-ring-retreat|search-search-and-update|search-search-fun-default|search-search-fun|search-search-string|search-search|search-string-out-of-window|search-symbol-regexp|search-text-char-description|search-toggle-case-fold|search-toggle-input-method|search-toggle-invisible|search-toggle-lax-whitespace|search-toggle-regexp|search-toggle-specified-input-method|search-toggle-symbol|search-toggle-word|search-unread|search-update-ring|search-update|search-yank-char-in-minibuffer|search-yank-char|search-yank-internal|search-yank-kill|search-yank-line|search-yank-pop|search-yank-string|search-yank-word-or-char|search-yank-word|search-yank-x-selection|searchb-activate|searchb-follow-char|searchb-iswitchb|searchb-set-keybindings|searchb-stop|searchb|so-charset|so-cvt-define-menu|so-cvt-read-only|so-cvt-write-only|so-german|so-gtex2iso|so-iso2duden|so-iso2gtex|so-iso2sgml|so-iso2tex|so-sgml2iso|so-spanish|so-tex2iso|so-transl-ctl-x-8-map|spell-accept-buffer-local-defs|spell-accept-output|spell-add-per-file-word-list|spell-aspell-add-aliases|spell-aspell-find-dictionary|spell-begin-skip-region-regexp|spell-begin-skip-region|spell-begin-tex-skip-regexp|spell-buffer-local-dict|spell-buffer-local-parsing|spell-buffer-local-words|spell-buffer-with-debug|spell-buffer|spell-call-process-region|spell-call-process|spell-change-dictionary|spell-check-minver|spell-check-version|spell-command-loop|spell-comments-and-strings|spell-complete-word-interior-frag|spell-complete-word|spell-continue|spell-create-debug-buffer|spell-decode-string|spell-display-buffer|spell-filter|spell-find-aspell-dictionaries|spell-find-hunspell-dictionaries|spell-get-aspell-config-value|spell-get-casechars|spell-get-coding-system|spell-get-decoded-string|spell-get-extended-character-mode|spell-get-ispell-args|spell-get-line|spell-get-many-otherchars-p|spell-get-not-casechars|spell-get-otherchars|spell-get-word|spell-help|spell-highlight-spelling-error-generic|spell-highlight-spelling-error-overlay|spell-highlight-spelling-error-xemacs|spell-highlight-spelling-error|spell-horiz-scroll|spell-hunspell-fill-dictionary-entry|spell-ignore-fcc|spell-init-process|spell-int-char|spell-internal-change-dictionary|spell-kill-ispell|spell-looking-at|spell-looking-back|spell-lookup-words|spell-menu-map|spell-message|spell-mime-multipartp|spell-mime-skip-part|spell-minor-check|spell-minor-mode|spell-non-empty-string|spell-parse-hunspell-affix-file|spell-parse-output|spell-pdict-save|spell-print-if-debug|spell-process-line|spell-process-status|spell-region|spell-send-replacement|spell-send-string|spell-set-spellchecker-params|spell-show-choices|spell-skip-region-list|spell-skip-region|spell-start-process|spell-tex-arg-end|spell-valid-dictionary-list|spell-with-no-warnings|spell-word|spell|sqrt|switchb-buffer-other-frame|switchb-buffer-other-window|switchb-buffer|switchb-case|switchb-chop|switchb-complete|switchb-completion-help|switchb-completions|switchb-display-buffer|switchb-entryfn-p|switchb-exhibit|switchb-existing-buffer-p|switchb-exit-minibuffer|switchb-find-common-substring|switchb-find-file|switchb-get-buffers-in-frames|switchb-get-bufname|switchb-get-matched-buffers|switchb-ignore-buffername-p|switchb-init-XEmacs-trick|switchb-kill-buffer|switchb-make-buflist|switchb-makealist|switchb-minibuffer-setup|switchb-mode|switchb-next-match|switchb-output-completion|switchb-possible-new-buffer)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1193,11 +1193,11 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:make-soap-port|make-soap-sequence-element--cmacro|make-soap-sequence-element|make-soap-sequence-type--cmacro|make-soap-sequence-type|make-soap-simple-type--cmacro|make-soap-simple-type|make-soap-wsdl--cmacro|make-soap-wsdl|make-tar-header--cmacro|make-tar-header|make-term|make-terminal-frame|make-url-queue--cmacro|make-url-queue|make-variable-frame-local|makefile-add-log-defun|makefile-append-backslash|makefile-automake-mode|makefile-backslash-region|makefile-browse|makefile-browser-fill|makefile-browser-format-macro-line|makefile-browser-format-target-line|makefile-browser-get-state-for-line|makefile-browser-insert-continuation|makefile-browser-insert-selection-and-quit|makefile-browser-insert-selection|makefile-browser-next-line|makefile-browser-on-macro-line-p|makefile-browser-previous-line|makefile-browser-quit|makefile-browser-send-this-line-item|makefile-browser-set-state-for-line|makefile-browser-start-interaction|makefile-browser-this-line-macro-name|makefile-browser-this-line-target-name|makefile-browser-toggle-state-for-line|makefile-browser-toggle|makefile-bsdmake-mode|makefile-cleanup-continuations|makefile-complete|makefile-completions-at-point|makefile-create-up-to-date-overview|makefile-delete-backslash|makefile-do-macro-insertion|makefile-electric-colon|makefile-electric-dot|makefile-electric-equal|makefile-fill-paragraph|makefile-first-line-p|makefile-format-macro-ref|makefile-forward-after-target-colon|makefile-generate-temporary-filename|makefile-gmake-mode|makefile-imake-mode|makefile-insert-gmake-function|makefile-insert-macro-ref|makefile-insert-macro|makefile-insert-special-target|makefile-insert-target-ref|makefile-insert-target|makefile-last-line-p|makefile-make-font-lock-keywords|makefile-makepp-mode|makefile-match-action|makefile-match-dependency|makefile-match-function-end|makefile-mode|makefile-next-dependency|makefile-pickup-everything|makefile-pickup-filenames-as-targets|makefile-pickup-macros|makefile-pickup-targets|makefile-previous-dependency|makefile-prompt-for-gmake-funargs|makefile-query-by-make-minus-q|makefile-query-targets|makefile-remember-macro|makefile-remember-target|makefile-save-temporary|makefile-switch-to-browser|makefile-warn-continuations|makefile-warn-suspicious-lines|makeinfo-buffer|makeinfo-compilation-sentinel-buffer|makeinfo-compilation-sentinel-region|makeinfo-compile|makeinfo-current-node|makeinfo-next-error|makeinfo-recenter-compilation-buffer|makeinfo-region|man-follow|man|mantemp-insert-cxx-syntax|mantemp-make-mantemps-buffer|mantemp-make-mantemps-region|mantemp-make-mantemps|mantemp-remove-comments|mantemp-remove-memfuncs|mantemp-sort-and-unique-lines|manual-entry|map-keymap-internal|map-keymap-sorted|map-query-replace-regexp|map|mapcan|mapcar\\*|mapcon|mapl|maplist|mark-bib|mark-defun|mark-end-of-sentence|mark-icon-function|mark-page|mark-paragraph|mark-perl-function|mark-sexp|mark-whole-buffer|mark-word|master-mode|master-says-beginning-of-buffer|master-says-end-of-buffer|master-says-recenter|master-says-scroll-down|master-says-scroll-up|master-says|master-set-slave|master-show-slave|matching-paren|math-add-bignum|math-add-float|math-add|math-bignum-big|math-bignum|math-build-parse-table|math-check-complete|math-comp-concat|math-concat|math-constp|math-div-bignum-big|math-div-bignum-digit|math-div-bignum-part|math-div-bignum-try|math-div-bignum|math-div-float|math-div|math-div10-bignum|math-div2-bignum|math-div2|math-do-working|math-evenp|math-expr-ops|math-find-user-tokens|math-fixnatnump|math-fixnump|math-float|math-floatp|math-floor|math-format-bignum-decimal|math-format-bignum|math-format-flat-expr|math-format-number|math-format-stack-value|math-format-value|math-idivmod|math-imod|math-infinitep|math-ipow|math-looks-negp|math-make-float|math-match-substring|math-mod|math-mul-bignum-digit|math-mul-bignum|math-mul|math-neg|math-negp|math-normalize|math-numdigs|math-posp|math-pow|math-quotient|math-read-bignum|math-read-expr-list|math-read-exprs|math-read-if|math-read-number-simple|math-read-number|math-read-preprocess-string|math-read-radix-digit|math-read-token|math-reject-arg|math-remove-dashes|math-scale-int|math-scale-left-bignum|math-scale-left|math-scale-right-bignum|math-scale-right|math-scale-rounding|math-showing-full-precision|math-stack-value-offset|math-standard-ops-p|math-standard-ops|math-sub-bignum|math-sub-float|math-sub|math-trunc|math-with-extra-prec|math-working|math-zerop|md4-64|md4-F|md4-G|md4-H|md4-add|md4-and|md4-copy64|md4-make-step|md4-pack-int16|md4-pack-int32|md4-round1|md4-round2|md4-round3|md4-unpack-int16|md4-unpack-int32|md4|md5-binary|member\\*|member-if-not|member-if|memory-info|menu-bar-bookmark-map|menu-bar-buffer-vector|menu-bar-ediff-menu|menu-bar-ediff-merge-menu|menu-bar-ediff-misc-menu|menu-bar-enable-clipboard|menu-bar-epatch-menu|menu-bar-frame-for-menubar|menu-bar-handwrite-map|menu-bar-horizontal-scroll-bar|menu-bar-kill-ring-save|menu-bar-left-scroll-bar|menu-bar-make-mm-toggle|menu-bar-make-toggle|menu-bar-menu-at-x-y|menu-bar-menu-frame-live-and-visible-p|menu-bar-mode|menu-bar-next-tag-other-window|menu-bar-next-tag|menu-bar-no-horizontal-scroll-bar|menu-bar-no-scroll-bar|menu-bar-non-minibuffer-window-p|menu-bar-open|menu-bar-options-save|menu-bar-positive-p|menu-bar-read-lispintro|menu-bar-read-lispref|menu-bar-read-mail|menu-bar-right-scroll-bar|menu-bar-select-buffer|menu-bar-select-frame|menu-bar-select-yank|menu-bar-set-tool-bar-position|menu-bar-showhide-fringe-ind-box|menu-bar-showhide-fringe-ind-customize|menu-bar-showhide-fringe-ind-left|menu-bar-showhide-fringe-ind-mixed|menu-bar-showhide-fringe-ind-none|menu-bar-showhide-fringe-ind-right|menu-bar-showhide-fringe-menu-customize-disable|menu-bar-showhide-fringe-menu-customize-left|menu-bar-showhide-fringe-menu-customize-reset|menu-bar-showhide-fringe-menu-customize-right|menu-bar-showhide-fringe-menu-customize|menu-bar-showhide-tool-bar-menu-customize-disable|menu-bar-showhide-tool-bar-menu-customize-enable-bottom|menu-bar-showhide-tool-bar-menu-customize-enable-left|menu-bar-showhide-tool-bar-menu-customize-enable-right|menu-bar-showhide-tool-bar-menu-customize-enable-top|menu-bar-update-buffers-1|menu-bar-update-buffers|menu-bar-update-yank-menu|menu-find-file-existing|menu-or-popup-active-p|menu-set-font|mercury-mode|merge-coding-systems|merge-mail-abbrevs|merge|message--yank-original-internal|message-add-action|message-add-archive-header|message-add-header|message-alter-recipients-discard-bogus-full-name|message-beginning-of-line|message-bogus-recipient-p|message-bold-region|message-bounce|message-buffer-name|message-buffers|message-bury|message-caesar-buffer-body|message-caesar-region|message-cancel-news|message-canlock-generate|message-canlock-password|message-carefully-insert-headers|message-change-subject|message-check-element|message-check-news-body-syntax|message-check-news-header-syntax|message-check-news-syntax|message-check-recipients|message-check|message-checksum|message-cite-original-1|message-cite-original-without-signature|message-cite-original|message-cleanup-headers|message-clone-locals|message-completion-function|message-completion-in-region|message-cross-post-followup-to-header|message-cross-post-followup-to|message-cross-post-insert-note|message-default-send-mail-function|message-default-send-rename-function|message-delete-action|message-delete-line|message-delete-not-region|message-delete-overlay|message-disassociate-draft|message-display-abbrev|message-do-actions|message-do-auto-fill|message-do-fcc|message-do-send-housekeeping|message-dont-reply-to-names|message-dont-send|message-elide-region|message-encode-message-body|message-exchange-point-and-mark|message-expand-group|message-expand-name|message-fetch-field|message-fetch-reply-field|message-field-name|message-field-value|message-fill-field-address|message-fill-field-general|message-fill-field|message-fill-paragraph|message-fill-yanked-message|message-fix-before-sending|message-flatten-list|message-followup|message-font-lock-make-header-matcher|message-forward-make-body-digest-mime|message-forward-make-body-digest-plain|message-forward-make-body-digest|message-forward-make-body-mime|message-forward-make-body-mml|message-forward-make-body-plain|message-forward-make-body|message-forward-rmail-make-body|message-forward-subject-author-subject|message-forward-subject-fwd|message-forward-subject-name-subject|message-forward|message-generate-headers|message-generate-new-buffer-clone-locals|message-generate-unsubscribed-mail-followup-to|message-get-reply-headers|message-gnksa-enable-p|message-goto-bcc|message-goto-body|message-goto-cc|message-goto-distribution|message-goto-eoh|message-goto-fcc|message-goto-followup-to|message-goto-from|message-goto-keywords|message-goto-mail-followup-to|message-goto-newsgroups|message-goto-reply-to|message-goto-signature|message-goto-subject|message-goto-summary|message-goto-to|message-headers-to-generate|message-hide-header-p|message-hide-headers|message-idna-to-ascii-rhs-1|message-idna-to-ascii-rhs|message-in-body-p|message-indent-citation|message-info|message-insert-canlock|message-insert-citation-line|message-insert-courtesy-copy|message-insert-disposition-notification-to|message-insert-expires|message-insert-formatted-citation-line|message-insert-header|message-insert-headers|message-insert-importance-high|message-insert-importance-low|message-insert-newsgroups|message-insert-or-toggle-importance|message-insert-signature|message-insert-to|message-insert-wide-reply|message-insinuate-rmail|message-is-yours-p|message-kill-address|message-kill-all-overlays|message-kill-buffer|message-kill-to-signature|message-mail-alias-type-p|message-mail-file-mbox-p|message-mail-other-frame|message-mail-other-window|message-mail-p|message-mail-user-agent|message-mail|message-make-address|message-make-caesar-translation-table|message-make-date|message-make-distribution|message-make-domain|message-make-expires-date|message-make-expires|message-make-forward-subject|message-make-fqdn|message-make-from|message-make-html-message-with-image-files|message-make-in-reply-to|message-make-lines|message-make-mail-followup-to|message-make-message-id|message-make-organization|message-make-overlay|message-make-path|message-make-references|message-make-sender|message-make-tool-bar|message-mark-active-p|message-mark-insert-file|message-mark-inserted-region|message-mode-field-menu|message-mode-menu|message-mode|message-multi-smtp-send-mail|message-narrow-to-field|message-narrow-to-head-1|message-narrow-to-head|message-narrow-to-headers-or-head|message-narrow-to-headers|message-newline-and-reformat|message-news-other-frame|message-news-other-window|message-news-p|message-news|message-next-header|message-number-base36|message-options-get|message-options-set-recipient|message-options-set|message-output|message-overlay-put|message-pipe-buffer-body|message-point-in-header-p|message-pop-to-buffer|message-position-on-field|message-position-point|message-posting-charset|message-prune-recipients|message-put-addresses-in-ecomplete|message-read-from-minibuffer|message-recover|message-reduce-to-to-cc|message-remove-blank-cited-lines|message-remove-first-header|message-remove-header|message-remove-ignored-headers|message-rename-buffer|message-replace-header|message-reply|message-resend|message-send-and-exit|message-send-form-letter|message-send-mail-function|message-send-mail-partially|message-send-mail-with-mailclient|message-send-mail-with-mh|message-send-mail-with-qmail|message-send-mail-with-sendmail|message-send-mail|message-send-news|message-send-via-mail|message-send-via-news|message-send|message-sendmail-envelope-from|message-set-auto-save-file-name|message-setup-1|message-setup-fill-variables|message-setup-toolbar|message-setup|message-shorten-1|message-shorten-references|message-signed-or-encrypted-p|message-simplify-recipients|message-simplify-subject|message-skip-to-next-address|message-smtpmail-send-it|message-sort-headers-1|message-sort-headers|message-split-line|message-strip-forbidden-properties|message-strip-list-identifiers|message-strip-subject-encoded-words|message-strip-subject-re|message-strip-subject-trailing-was|message-subscribed-p|message-supersede|message-tab|message-talkative-question|message-tamago-not-in-use-p|message-text-with-property|message-to-list-only|message-tokenize-header|message-tool-bar-update|message-unbold-region|message-unique-id|message-unquote-tokens|message-use-alternative-email-as-from|message-user-mail-address|message-wash-subject|message-wide-reply|message-widen-reply|message-with-reply-buffer|message-y-or-n-p)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)m(?:ake-soap-port|ake-soap-sequence-element--cmacro|ake-soap-sequence-element|ake-soap-sequence-type--cmacro|ake-soap-sequence-type|ake-soap-simple-type--cmacro|ake-soap-simple-type|ake-soap-wsdl--cmacro|ake-soap-wsdl|ake-tar-header--cmacro|ake-tar-header|ake-term|ake-terminal-frame|ake-url-queue--cmacro|ake-url-queue|ake-variable-frame-local|akefile-add-log-defun|akefile-append-backslash|akefile-automake-mode|akefile-backslash-region|akefile-browse|akefile-browser-fill|akefile-browser-format-macro-line|akefile-browser-format-target-line|akefile-browser-get-state-for-line|akefile-browser-insert-continuation|akefile-browser-insert-selection-and-quit|akefile-browser-insert-selection|akefile-browser-next-line|akefile-browser-on-macro-line-p|akefile-browser-previous-line|akefile-browser-quit|akefile-browser-send-this-line-item|akefile-browser-set-state-for-line|akefile-browser-start-interaction|akefile-browser-this-line-macro-name|akefile-browser-this-line-target-name|akefile-browser-toggle-state-for-line|akefile-browser-toggle|akefile-bsdmake-mode|akefile-cleanup-continuations|akefile-complete|akefile-completions-at-point|akefile-create-up-to-date-overview|akefile-delete-backslash|akefile-do-macro-insertion|akefile-electric-colon|akefile-electric-dot|akefile-electric-equal|akefile-fill-paragraph|akefile-first-line-p|akefile-format-macro-ref|akefile-forward-after-target-colon|akefile-generate-temporary-filename|akefile-gmake-mode|akefile-imake-mode|akefile-insert-gmake-function|akefile-insert-macro-ref|akefile-insert-macro|akefile-insert-special-target|akefile-insert-target-ref|akefile-insert-target|akefile-last-line-p|akefile-make-font-lock-keywords|akefile-makepp-mode|akefile-match-action|akefile-match-dependency|akefile-match-function-end|akefile-mode|akefile-next-dependency|akefile-pickup-everything|akefile-pickup-filenames-as-targets|akefile-pickup-macros|akefile-pickup-targets|akefile-previous-dependency|akefile-prompt-for-gmake-funargs|akefile-query-by-make-minus-q|akefile-query-targets|akefile-remember-macro|akefile-remember-target|akefile-save-temporary|akefile-switch-to-browser|akefile-warn-continuations|akefile-warn-suspicious-lines|akeinfo-buffer|akeinfo-compilation-sentinel-buffer|akeinfo-compilation-sentinel-region|akeinfo-compile|akeinfo-current-node|akeinfo-next-error|akeinfo-recenter-compilation-buffer|akeinfo-region|an-follow|an|antemp-insert-cxx-syntax|antemp-make-mantemps-buffer|antemp-make-mantemps-region|antemp-make-mantemps|antemp-remove-comments|antemp-remove-memfuncs|antemp-sort-and-unique-lines|anual-entry|ap-keymap-internal|ap-keymap-sorted|ap-query-replace-regexp|ap|apcan|apcar\\*|apcon|apl|aplist|ark-bib|ark-defun|ark-end-of-sentence|ark-icon-function|ark-page|ark-paragraph|ark-perl-function|ark-sexp|ark-whole-buffer|ark-word|aster-mode|aster-says-beginning-of-buffer|aster-says-end-of-buffer|aster-says-recenter|aster-says-scroll-down|aster-says-scroll-up|aster-says|aster-set-slave|aster-show-slave|atching-paren|ath-add-bignum|ath-add-float|ath-add|ath-bignum-big|ath-bignum|ath-build-parse-table|ath-check-complete|ath-comp-concat|ath-concat|ath-constp|ath-div-bignum-big|ath-div-bignum-digit|ath-div-bignum-part|ath-div-bignum-try|ath-div-bignum|ath-div-float|ath-div|ath-div10-bignum|ath-div2-bignum|ath-div2|ath-do-working|ath-evenp|ath-expr-ops|ath-find-user-tokens|ath-fixnatnump|ath-fixnump|ath-float|ath-floatp|ath-floor|ath-format-bignum-decimal|ath-format-bignum|ath-format-flat-expr|ath-format-number|ath-format-stack-value|ath-format-value|ath-idivmod|ath-imod|ath-infinitep|ath-ipow|ath-looks-negp|ath-make-float|ath-match-substring|ath-mod|ath-mul-bignum-digit|ath-mul-bignum|ath-mul|ath-neg|ath-negp|ath-normalize|ath-numdigs|ath-posp|ath-pow|ath-quotient|ath-read-bignum|ath-read-expr-list|ath-read-exprs|ath-read-if|ath-read-number-simple|ath-read-number|ath-read-preprocess-string|ath-read-radix-digit|ath-read-token|ath-reject-arg|ath-remove-dashes|ath-scale-int|ath-scale-left-bignum|ath-scale-left|ath-scale-right-bignum|ath-scale-right|ath-scale-rounding|ath-showing-full-precision|ath-stack-value-offset|ath-standard-ops-p|ath-standard-ops|ath-sub-bignum|ath-sub-float|ath-sub|ath-trunc|ath-with-extra-prec|ath-working|ath-zerop|d4-64|d4-F|d4-G|d4-H|d4-add|d4-and|d4-copy64|d4-make-step|d4-pack-int16|d4-pack-int32|d4-round1|d4-round2|d4-round3|d4-unpack-int16|d4-unpack-int32|d4|d5-binary|ember\\*|ember-if-not|ember-if|emory-info|enu-bar-bookmark-map|enu-bar-buffer-vector|enu-bar-ediff-menu|enu-bar-ediff-merge-menu|enu-bar-ediff-misc-menu|enu-bar-enable-clipboard|enu-bar-epatch-menu|enu-bar-frame-for-menubar|enu-bar-handwrite-map|enu-bar-horizontal-scroll-bar|enu-bar-kill-ring-save|enu-bar-left-scroll-bar|enu-bar-make-mm-toggle|enu-bar-make-toggle|enu-bar-menu-at-x-y|enu-bar-menu-frame-live-and-visible-p|enu-bar-mode|enu-bar-next-tag-other-window|enu-bar-next-tag|enu-bar-no-horizontal-scroll-bar|enu-bar-no-scroll-bar|enu-bar-non-minibuffer-window-p|enu-bar-open|enu-bar-options-save|enu-bar-positive-p|enu-bar-read-lispintro|enu-bar-read-lispref|enu-bar-read-mail|enu-bar-right-scroll-bar|enu-bar-select-buffer|enu-bar-select-frame|enu-bar-select-yank|enu-bar-set-tool-bar-position|enu-bar-showhide-fringe-ind-box|enu-bar-showhide-fringe-ind-customize|enu-bar-showhide-fringe-ind-left|enu-bar-showhide-fringe-ind-mixed|enu-bar-showhide-fringe-ind-none|enu-bar-showhide-fringe-ind-right|enu-bar-showhide-fringe-menu-customize-disable|enu-bar-showhide-fringe-menu-customize-left|enu-bar-showhide-fringe-menu-customize-reset|enu-bar-showhide-fringe-menu-customize-right|enu-bar-showhide-fringe-menu-customize|enu-bar-showhide-tool-bar-menu-customize-disable|enu-bar-showhide-tool-bar-menu-customize-enable-bottom|enu-bar-showhide-tool-bar-menu-customize-enable-left|enu-bar-showhide-tool-bar-menu-customize-enable-right|enu-bar-showhide-tool-bar-menu-customize-enable-top|enu-bar-update-buffers-1|enu-bar-update-buffers|enu-bar-update-yank-menu|enu-find-file-existing|enu-or-popup-active-p|enu-set-font|ercury-mode|erge-coding-systems|erge-mail-abbrevs|erge|essage--yank-original-internal|essage-add-action|essage-add-archive-header|essage-add-header|essage-alter-recipients-discard-bogus-full-name|essage-beginning-of-line|essage-bogus-recipient-p|essage-bold-region|essage-bounce|essage-buffer-name|essage-buffers|essage-bury|essage-caesar-buffer-body|essage-caesar-region|essage-cancel-news|essage-canlock-generate|essage-canlock-password|essage-carefully-insert-headers|essage-change-subject|essage-check-element|essage-check-news-body-syntax|essage-check-news-header-syntax|essage-check-news-syntax|essage-check-recipients|essage-check|essage-checksum|essage-cite-original-1|essage-cite-original-without-signature|essage-cite-original|essage-cleanup-headers|essage-clone-locals|essage-completion-function|essage-completion-in-region|essage-cross-post-followup-to-header|essage-cross-post-followup-to|essage-cross-post-insert-note|essage-default-send-mail-function|essage-default-send-rename-function|essage-delete-action|essage-delete-line|essage-delete-not-region|essage-delete-overlay|essage-disassociate-draft|essage-display-abbrev|essage-do-actions|essage-do-auto-fill|essage-do-fcc|essage-do-send-housekeeping|essage-dont-reply-to-names|essage-dont-send|essage-elide-region|essage-encode-message-body|essage-exchange-point-and-mark|essage-expand-group|essage-expand-name|essage-fetch-field|essage-fetch-reply-field|essage-field-name|essage-field-value|essage-fill-field-address|essage-fill-field-general|essage-fill-field|essage-fill-paragraph|essage-fill-yanked-message|essage-fix-before-sending|essage-flatten-list|essage-followup|essage-font-lock-make-header-matcher|essage-forward-make-body-digest-mime|essage-forward-make-body-digest-plain|essage-forward-make-body-digest|essage-forward-make-body-mime|essage-forward-make-body-mml|essage-forward-make-body-plain|essage-forward-make-body|essage-forward-rmail-make-body|essage-forward-subject-author-subject|essage-forward-subject-fwd|essage-forward-subject-name-subject|essage-forward|essage-generate-headers|essage-generate-new-buffer-clone-locals|essage-generate-unsubscribed-mail-followup-to|essage-get-reply-headers|essage-gnksa-enable-p|essage-goto-bcc|essage-goto-body|essage-goto-cc|essage-goto-distribution|essage-goto-eoh|essage-goto-fcc|essage-goto-followup-to|essage-goto-from|essage-goto-keywords|essage-goto-mail-followup-to|essage-goto-newsgroups|essage-goto-reply-to|essage-goto-signature|essage-goto-subject|essage-goto-summary|essage-goto-to|essage-headers-to-generate|essage-hide-header-p|essage-hide-headers|essage-idna-to-ascii-rhs-1|essage-idna-to-ascii-rhs|essage-in-body-p|essage-indent-citation|essage-info|essage-insert-canlock|essage-insert-citation-line|essage-insert-courtesy-copy|essage-insert-disposition-notification-to|essage-insert-expires|essage-insert-formatted-citation-line|essage-insert-header|essage-insert-headers|essage-insert-importance-high|essage-insert-importance-low|essage-insert-newsgroups|essage-insert-or-toggle-importance|essage-insert-signature|essage-insert-to|essage-insert-wide-reply|essage-insinuate-rmail|essage-is-yours-p|essage-kill-address|essage-kill-all-overlays|essage-kill-buffer|essage-kill-to-signature|essage-mail-alias-type-p|essage-mail-file-mbox-p|essage-mail-other-frame|essage-mail-other-window|essage-mail-p|essage-mail-user-agent|essage-mail|essage-make-address|essage-make-caesar-translation-table|essage-make-date|essage-make-distribution|essage-make-domain|essage-make-expires-date|essage-make-expires|essage-make-forward-subject|essage-make-fqdn|essage-make-from|essage-make-html-message-with-image-files|essage-make-in-reply-to|essage-make-lines|essage-make-mail-followup-to|essage-make-message-id|essage-make-organization|essage-make-overlay|essage-make-path|essage-make-references|essage-make-sender|essage-make-tool-bar|essage-mark-active-p|essage-mark-insert-file|essage-mark-inserted-region|essage-mode-field-menu|essage-mode-menu|essage-mode|essage-multi-smtp-send-mail|essage-narrow-to-field|essage-narrow-to-head-1|essage-narrow-to-head|essage-narrow-to-headers-or-head|essage-narrow-to-headers|essage-newline-and-reformat|essage-news-other-frame|essage-news-other-window|essage-news-p|essage-news|essage-next-header|essage-number-base36|essage-options-get|essage-options-set-recipient|essage-options-set|essage-output|essage-overlay-put|essage-pipe-buffer-body|essage-point-in-header-p|essage-pop-to-buffer|essage-position-on-field|essage-position-point|essage-posting-charset|essage-prune-recipients|essage-put-addresses-in-ecomplete|essage-read-from-minibuffer|essage-recover|essage-reduce-to-to-cc|essage-remove-blank-cited-lines|essage-remove-first-header|essage-remove-header|essage-remove-ignored-headers|essage-rename-buffer|essage-replace-header|essage-reply|essage-resend|essage-send-and-exit|essage-send-form-letter|essage-send-mail-function|essage-send-mail-partially|essage-send-mail-with-mailclient|essage-send-mail-with-mh|essage-send-mail-with-qmail|essage-send-mail-with-sendmail|essage-send-mail|essage-send-news|essage-send-via-mail|essage-send-via-news|essage-send|essage-sendmail-envelope-from|essage-set-auto-save-file-name|essage-setup-1|essage-setup-fill-variables|essage-setup-toolbar|essage-setup|essage-shorten-1|essage-shorten-references|essage-signed-or-encrypted-p|essage-simplify-recipients|essage-simplify-subject|essage-skip-to-next-address|essage-smtpmail-send-it|essage-sort-headers-1|essage-sort-headers|essage-split-line|essage-strip-forbidden-properties|essage-strip-list-identifiers|essage-strip-subject-encoded-words|essage-strip-subject-re|essage-strip-subject-trailing-was|essage-subscribed-p|essage-supersede|essage-tab|essage-talkative-question|essage-tamago-not-in-use-p|essage-text-with-property|essage-to-list-only|essage-tokenize-header|essage-tool-bar-update|essage-unbold-region|essage-unique-id|essage-unquote-tokens|essage-use-alternative-email-as-from|essage-user-mail-address|essage-wash-subject|essage-wide-reply|essage-widen-reply|essage-with-reply-buffer|essage-y-or-n-p)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:message-yank-buffer|message-yank-original|messages-buffer-mode|meta-add-symbols|meta-beginning-of-defun|meta-car-string-lessp|meta-comment-defun|meta-comment-indent|meta-comment-region|meta-common-mode|meta-complete-symbol|meta-completions-at-point|meta-end-of-defun|meta-indent-buffer|meta-indent-calculate|meta-indent-current-indentation|meta-indent-current-nesting|meta-indent-defun|meta-indent-in-string-p|meta-indent-level-count|meta-indent-line|meta-indent-looking-at-code|meta-indent-previous-line|meta-indent-region|meta-indent-unfinished-line|meta-listify|meta-mark-active|meta-mark-defun|meta-mode-menu|meta-symbol-list|meta-uncomment-defun|meta-uncomment-region|metafont-mode|metamail-buffer|metamail-interpret-body|metamail-interpret-header|metamail-region|metapost-mode|mh-adaptive-cmd-note-flag-check|mh-add-missing-mime-version-header|mh-add-msgs-to-seq|mh-alias-address-to-alias|mh-alias-expand|mh-alias-for-from-p|mh-alias-grab-from-field|mh-alias-letter-expand-alias|mh-alias-minibuffer-confirm-address|mh-alias-reload-maybe|mh-assoc-string|mh-beginning-of-word|mh-bogofilter-blacklist|mh-bogofilter-whitelist|mh-buffer-data|mh-burst-digest|mh-cancel-timer|mh-catchup|mh-cl-flet|mh-clean-msg-header|mh-clear-sub-folders-cache|mh-coalesce-msg-list|mh-colors-available-p|mh-colors-in-use-p|mh-complete-word|mh-compose-forward|mh-compose-insertion|mh-copy-msg|mh-create-sequence-map|mh-customize|mh-decode-message-header|mh-decode-message-subject|mh-define-obsolete-variable-alias|mh-define-sequence|mh-defstruct|mh-delete-a-msg|mh-delete-line|mh-delete-msg-from-seq|mh-delete-msg-no-motion|mh-delete-msg|mh-delete-seq|mh-delete-subject-or-thread|mh-delete-subject|mh-destroy-postponed-handles|mh-display-color-cells|mh-display-completion-list|mh-display-emphasis|mh-display-msg|mh-display-smileys|mh-display-with-external-viewer|mh-do-at-event-location|mh-do-in-gnu-emacs|mh-do-in-xemacs|mh-edit-again|mh-ephem-message|mh-exchange-point-and-mark-preserving-active-mark|mh-exec-cmd-daemon|mh-exec-cmd-env-daemon|mh-exec-cmd-error|mh-exec-cmd-output|mh-exec-cmd-quiet|mh-exec-cmd|mh-exec-lib-cmd-output|mh-execute-commands|mh-expand-file-name|mh-extract-from-header-value|mh-extract-rejected-mail|mh-face-background|mh-face-data|mh-face-foreground|mh-file-command-p|mh-file-mime-type|mh-find-path|mh-find-seq|mh-first-msg|mh-folder-completion-function|mh-folder-from-address|mh-folder-inline-mime-part|mh-folder-list|mh-folder-mode|mh-folder-name-p|mh-folder-save-mime-part|mh-folder-speedbar-buttons|mh-folder-toggle-mime-part|mh-font-lock-add-keywords|mh-forward|mh-fully-kill-draft|mh-funcall-if-exists|mh-get-header-field|mh-get-msg-num|mh-gnus-article-highlight-citation|mh-goto-cur-msg|mh-goto-header-end|mh-goto-header-field|mh-goto-msg|mh-goto-next-button|mh-handle-process-error|mh-have-file-command|mh-header-display|mh-header-field-beginning|mh-header-field-end|mh-help|mh-identity-add-menu|mh-identity-handler-attribution-verb|mh-identity-handler-bottom|mh-identity-handler-gpg-identity|mh-identity-handler-signature|mh-identity-handler-top|mh-identity-insert-attribution-verb|mh-identity-make-menu-no-autoload|mh-identity-make-menu|mh-image-load-path-for-library|mh-image-search-load-path|mh-in-header-p|mh-in-show-buffer|mh-inc-folder|mh-inc-spool-make-no-autoload|mh-inc-spool-make|mh-index-add-to-sequence|mh-index-create-imenu-index|mh-index-create-sequences|mh-index-delete-folder-headers|mh-index-delete-from-sequence|mh-index-execute-commands|mh-index-group-by-folder|mh-index-insert-folder-headers|mh-index-new-messages|mh-index-next-folder|mh-index-previous-folder|mh-index-read-data|mh-index-sequenced-messages|mh-index-ticked-messages|mh-index-update-maps|mh-index-visit-folder|mh-insert-auto-fields|mh-insert-identity|mh-insert-signature|mh-interactive-range|mh-invalidate-show-buffer|mh-invisible-headers|mh-iterate-on-messages-in-region|mh-iterate-on-range|mh-junk-blacklist-disposition|mh-junk-blacklist|mh-junk-choose|mh-junk-process-blacklist|mh-junk-process-whitelist|mh-junk-whitelist|mh-kill-folder|mh-last-msg|mh-lessp|mh-letter-hide-all-skipped-fields|mh-letter-mode|mh-letter-next-header-field|mh-letter-skip-leading-whitespace-in-header-field|mh-letter-skipped-header-field-p|mh-letter-speedbar-buttons|mh-letter-toggle-header-field-display-button|mh-letter-toggle-header-field-display|mh-line-beginning-position|mh-line-end-position|mh-list-folders|mh-list-sequences|mh-list-to-string-1|mh-list-to-string|mh-logo-display|mh-macro-expansion-time-gnus-version|mh-mail-abbrev-make-syntax-table|mh-mail-header-end|mh-make-folder-mode-line|mh-make-local-hook|mh-make-local-vars|mh-make-obsolete-variable|mh-mapc|mh-mark-active-p|mh-match-string-no-properties|mh-maybe-show|mh-mh-compose-anon-ftp|mh-mh-compose-external-compressed-tar|mh-mh-compose-external-type|mh-mh-directive-present-p|mh-mh-to-mime-undo|mh-mh-to-mime|mh-mime-cleanup|mh-mime-display|mh-mime-save-parts|mh-mml-forward-message|mh-mml-secure-message-encrypt|mh-mml-secure-message-sign|mh-mml-secure-message-signencrypt|mh-mml-tag-present-p|mh-mml-to-mime|mh-mml-unsecure-message|mh-modify|mh-msg-filename|mh-msg-is-in-seq|mh-msg-num-width-to-column|mh-msg-num-width|mh-narrow-to-cc|mh-narrow-to-from|mh-narrow-to-range|mh-narrow-to-seq|mh-narrow-to-subject|mh-narrow-to-tick|mh-narrow-to-to|mh-new-draft-name|mh-next-button|mh-next-msg|mh-next-undeleted-msg|mh-next-unread-msg|mh-nmail|mh-notate-cur|mh-notate-deleted-and-refiled|mh-notate-user-sequences|mh-notate|mh-outstanding-commands-p|mh-pack-folder|mh-page-digest-backwards|mh-page-digest|mh-page-msg|mh-parse-flist-output-line|mh-pipe-msg|mh-position-on-field|mh-prefix-help|mh-prev-button|mh-previous-page|mh-previous-undeleted-msg|mh-previous-unread-msg|mh-print-msg|mh-process-daemon|mh-process-or-undo-commands|mh-profile-component-value|mh-profile-component|mh-prompt-for-folder|mh-prompt-for-refile-folder|mh-ps-print-msg-file|mh-ps-print-msg|mh-ps-print-toggle-color|mh-ps-print-toggle-faces|mh-put-msg-in-seq|mh-quit|mh-quote-for-shell|mh-quote-pick-expr|mh-range-to-msg-list|mh-read-address|mh-read-folder-sequences|mh-read-range|mh-read-seq-default|mh-recenter|mh-redistribute|mh-refile-a-msg|mh-refile-msg|mh-refile-or-write-again|mh-regenerate-headers|mh-remove-all-notation|mh-remove-cur-notation|mh-remove-from-sub-folders-cache|mh-replace-regexp-in-string|mh-replace-string|mh-reply|mh-require-cl|mh-require|mh-rescan-folder|mh-reset-threads-and-narrowing|mh-rmail|mh-run-time-gnus-version|mh-scan-folder|mh-scan-format-file-check|mh-scan-format|mh-scan-msg-number-regexp|mh-scan-msg-search-regexp|mh-search-from-end|mh-search-p|mh-search|mh-send-letter|mh-send|mh-seq-msgs|mh-seq-to-msgs|mh-set-cmd-note|mh-set-folder-modified-p|mh-set-help|mh-set-x-image-cache-directory|mh-show-addr|mh-show-buffer-message-number|mh-show-font-lock-keywords-with-cite|mh-show-font-lock-keywords|mh-show-mode|mh-show-preferred-alternative|mh-show-speedbar-buttons|mh-show-xface|mh-show|mh-showing-mode|mh-signature-separator-p|mh-smail-batch|mh-smail-other-window|mh-smail|mh-sort-folder|mh-spamassassin-blacklist|mh-spamassassin-identify-spammers|mh-spamassassin-whitelist|mh-spamprobe-blacklist|mh-spamprobe-whitelist|mh-speed-add-folder|mh-speed-flists-active-p|mh-speed-flists|mh-speed-invalidate-map|mh-start-of-uncleaned-message|mh-store-msg|mh-strip-package-version|mh-sub-folders|mh-test-completion|mh-thread-add-spaces|mh-thread-ancestor|mh-thread-delete|mh-thread-find-msg-subject|mh-thread-forget-message|mh-thread-generate|mh-thread-inc|mh-thread-next-sibling|mh-thread-parse-scan-line|mh-thread-previous-sibling|mh-thread-print-scan-lines|mh-thread-refile|mh-thread-update-scan-line-map|mh-toggle-mh-decode-mime-flag|mh-toggle-mime-buttons|mh-toggle-showing|mh-toggle-threads|mh-toggle-tick|mh-translate-range|mh-truncate-log-buffer|mh-undefine-sequence|mh-undo-folder|mh-undo|mh-update-sequences|mh-url-hexify-string|mh-user-agent-compose|mh-valid-seq-p|mh-valid-view-change-operation-p|mh-variant-gnu-mh-info|mh-variant-info|mh-variant-mh-info|mh-variant-nmh-info|mh-variant-p|mh-variant-set-variant|mh-variant-set|mh-variants|mh-version|mh-view-mode-enter|mh-visit-folder|mh-widen|mh-window-full-height-p|mh-write-file-functions|mh-write-msg-to-file|mh-xargs|mh-yank-cur-msg|midnight-buffer-display-time|midnight-delay-set|midnight-find|midnight-next|mime-to-mml|minibuf-eldef-setup-minibuffer|minibuf-eldef-update-minibuffer|minibuffer--bitset|minibuffer--double-dollars|minibuffer-avoid-prompt|minibuffer-completion-contents|minibuffer-default--in-prompt-regexps|minibuffer-default-add-completions|minibuffer-default-add-shell-commands|minibuffer-depth-indicate-mode|minibuffer-depth-setup|minibuffer-electric-default-mode|minibuffer-force-complete-and-exit|minibuffer-force-complete|minibuffer-frame-list|minibuffer-hide-completions|minibuffer-history-initialize|minibuffer-history-isearch-end|minibuffer-history-isearch-message|minibuffer-history-isearch-pop-state|minibuffer-history-isearch-push-state|minibuffer-history-isearch-search|minibuffer-history-isearch-setup|minibuffer-history-isearch-wrap|minibuffer-insert-file-name-at-point|minibuffer-keyboard-quit|minibuffer-with-setup-hook|minor-mode-menu-from-indicator|minusp|mismatch|mixal-debug|mixal-describe-operation-code|mixal-mode|mixal-run|mm-add-meta-html-tag|mm-alist-to-plist|mm-annotationp|mm-append-to-file|mm-archive-decoders|mm-archive-dissect-and-inline|mm-assoc-string-match|mm-attachment-override-p|mm-auto-mode-alist|mm-automatic-display-p|mm-automatic-external-display-p|mm-body-7-or-8|mm-body-encoding|mm-char-int|mm-char-or-char-int-p|mm-charset-after|mm-charset-to-coding-system|mm-codepage-setup|mm-coding-system-equal|mm-coding-system-list|mm-coding-system-p|mm-coding-system-to-mime-charset|mm-complicated-handles|mm-content-transfer-encoding|mm-convert-shr-links|mm-copy-to-buffer|mm-create-image-xemacs|mm-decode-body|mm-decode-coding-region|mm-decode-coding-string|mm-decode-content-transfer-encoding|mm-decode-string|mm-decompress-buffer|mm-default-file-encoding|mm-default-multibyte-p|mm-delete-duplicates|mm-destroy-part|mm-destroy-parts|mm-destroy-postponed-undisplay-list|mm-detect-coding-region|mm-detect-mime-charset-region|mm-disable-multibyte|mm-display-external|mm-display-inline|mm-display-part|mm-display-parts|mm-dissect-archive|mm-dissect-buffer|mm-dissect-multipart|mm-dissect-singlepart|mm-enable-multibyte|mm-encode-body|mm-encode-buffer|mm-encode-coding-region|mm-encode-coding-string|mm-encode-content-transfer-encoding|mm-enrich-utf-8-by-mule-ucs|mm-extern-cache-contents|mm-file-name-collapse-whitespace|mm-file-name-delete-control|mm-file-name-delete-gotchas|mm-file-name-delete-whitespace|mm-file-name-replace-whitespace|mm-file-name-trim-whitespace|mm-find-buffer-file-coding-system|mm-find-charset-region|mm-find-mime-charset-region|mm-find-part-by-type|mm-find-raw-part-by-type|mm-get-coding-system-list|mm-get-content-id|mm-get-image|mm-get-part|mm-guess-charset|mm-handle-buffer|mm-handle-cache|mm-handle-description|mm-handle-displayed-p|mm-handle-disposition|mm-handle-encoding|mm-handle-filename|mm-handle-id|mm-handle-media-subtype|mm-handle-media-supertype|mm-handle-media-type|mm-handle-multipart-ctl-parameter|mm-handle-multipart-from|mm-handle-multipart-original-buffer|mm-handle-set-cache|mm-handle-set-external-undisplayer|mm-handle-set-undisplayer|mm-handle-type|mm-handle-undisplayer|mm-image-fit-p|mm-image-load-path|mm-image-type-from-buffer|mm-inlinable-p|mm-inline-external-body|mm-inline-override-p|mm-inline-partial|mm-inlined-p|mm-insert-byte|mm-insert-file-contents|mm-insert-headers|mm-insert-inline|mm-insert-multipart-headers|mm-insert-part|mm-insert-rfc822-headers|mm-interactively-view-part|mm-iso-8859-x-to-15-region|mm-keep-viewer-alive-p|mm-line-number-at-pos|mm-long-lines-p|mm-mailcap-command|mm-make-handle|mm-make-temp-file|mm-merge-handles|mm-mime-charset|mm-mule-charset-to-mime-charset|mm-multibyte-char-to-unibyte|mm-multibyte-p|mm-multibyte-string-p|mm-multiple-handles|mm-pipe-part|mm-possibly-verify-or-decrypt|mm-preferred-alternative-precedence|mm-preferred-alternative|mm-preferred-coding-system|mm-qp-or-base64|mm-read-charset|mm-read-coding-system|mm-readable-p|mm-remove-part|mm-remove-parts|mm-replace-in-string|mm-safer-encoding|mm-save-part-to-file|mm-save-part|mm-set-buffer-file-coding-system|mm-set-buffer-multibyte|mm-set-handle-multipart-parameter|mm-setup-codepage-ibm|mm-setup-codepage-iso-8859|mm-shr|mm-sort-coding-systems-predicate)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)m(?:essage-yank-buffer|essage-yank-original|essages-buffer-mode|eta-add-symbols|eta-beginning-of-defun|eta-car-string-lessp|eta-comment-defun|eta-comment-indent|eta-comment-region|eta-common-mode|eta-complete-symbol|eta-completions-at-point|eta-end-of-defun|eta-indent-buffer|eta-indent-calculate|eta-indent-current-indentation|eta-indent-current-nesting|eta-indent-defun|eta-indent-in-string-p|eta-indent-level-count|eta-indent-line|eta-indent-looking-at-code|eta-indent-previous-line|eta-indent-region|eta-indent-unfinished-line|eta-listify|eta-mark-active|eta-mark-defun|eta-mode-menu|eta-symbol-list|eta-uncomment-defun|eta-uncomment-region|etafont-mode|etamail-buffer|etamail-interpret-body|etamail-interpret-header|etamail-region|etapost-mode|h-adaptive-cmd-note-flag-check|h-add-missing-mime-version-header|h-add-msgs-to-seq|h-alias-address-to-alias|h-alias-expand|h-alias-for-from-p|h-alias-grab-from-field|h-alias-letter-expand-alias|h-alias-minibuffer-confirm-address|h-alias-reload-maybe|h-assoc-string|h-beginning-of-word|h-bogofilter-blacklist|h-bogofilter-whitelist|h-buffer-data|h-burst-digest|h-cancel-timer|h-catchup|h-cl-flet|h-clean-msg-header|h-clear-sub-folders-cache|h-coalesce-msg-list|h-colors-available-p|h-colors-in-use-p|h-complete-word|h-compose-forward|h-compose-insertion|h-copy-msg|h-create-sequence-map|h-customize|h-decode-message-header|h-decode-message-subject|h-define-obsolete-variable-alias|h-define-sequence|h-defstruct|h-delete-a-msg|h-delete-line|h-delete-msg-from-seq|h-delete-msg-no-motion|h-delete-msg|h-delete-seq|h-delete-subject-or-thread|h-delete-subject|h-destroy-postponed-handles|h-display-color-cells|h-display-completion-list|h-display-emphasis|h-display-msg|h-display-smileys|h-display-with-external-viewer|h-do-at-event-location|h-do-in-gnu-emacs|h-do-in-xemacs|h-edit-again|h-ephem-message|h-exchange-point-and-mark-preserving-active-mark|h-exec-cmd-daemon|h-exec-cmd-env-daemon|h-exec-cmd-error|h-exec-cmd-output|h-exec-cmd-quiet|h-exec-cmd|h-exec-lib-cmd-output|h-execute-commands|h-expand-file-name|h-extract-from-header-value|h-extract-rejected-mail|h-face-background|h-face-data|h-face-foreground|h-file-command-p|h-file-mime-type|h-find-path|h-find-seq|h-first-msg|h-folder-completion-function|h-folder-from-address|h-folder-inline-mime-part|h-folder-list|h-folder-mode|h-folder-name-p|h-folder-save-mime-part|h-folder-speedbar-buttons|h-folder-toggle-mime-part|h-font-lock-add-keywords|h-forward|h-fully-kill-draft|h-funcall-if-exists|h-get-header-field|h-get-msg-num|h-gnus-article-highlight-citation|h-goto-cur-msg|h-goto-header-end|h-goto-header-field|h-goto-msg|h-goto-next-button|h-handle-process-error|h-have-file-command|h-header-display|h-header-field-beginning|h-header-field-end|h-help|h-identity-add-menu|h-identity-handler-attribution-verb|h-identity-handler-bottom|h-identity-handler-gpg-identity|h-identity-handler-signature|h-identity-handler-top|h-identity-insert-attribution-verb|h-identity-make-menu-no-autoload|h-identity-make-menu|h-image-load-path-for-library|h-image-search-load-path|h-in-header-p|h-in-show-buffer|h-inc-folder|h-inc-spool-make-no-autoload|h-inc-spool-make|h-index-add-to-sequence|h-index-create-imenu-index|h-index-create-sequences|h-index-delete-folder-headers|h-index-delete-from-sequence|h-index-execute-commands|h-index-group-by-folder|h-index-insert-folder-headers|h-index-new-messages|h-index-next-folder|h-index-previous-folder|h-index-read-data|h-index-sequenced-messages|h-index-ticked-messages|h-index-update-maps|h-index-visit-folder|h-insert-auto-fields|h-insert-identity|h-insert-signature|h-interactive-range|h-invalidate-show-buffer|h-invisible-headers|h-iterate-on-messages-in-region|h-iterate-on-range|h-junk-blacklist-disposition|h-junk-blacklist|h-junk-choose|h-junk-process-blacklist|h-junk-process-whitelist|h-junk-whitelist|h-kill-folder|h-last-msg|h-lessp|h-letter-hide-all-skipped-fields|h-letter-mode|h-letter-next-header-field|h-letter-skip-leading-whitespace-in-header-field|h-letter-skipped-header-field-p|h-letter-speedbar-buttons|h-letter-toggle-header-field-display-button|h-letter-toggle-header-field-display|h-line-beginning-position|h-line-end-position|h-list-folders|h-list-sequences|h-list-to-string-1|h-list-to-string|h-logo-display|h-macro-expansion-time-gnus-version|h-mail-abbrev-make-syntax-table|h-mail-header-end|h-make-folder-mode-line|h-make-local-hook|h-make-local-vars|h-make-obsolete-variable|h-mapc|h-mark-active-p|h-match-string-no-properties|h-maybe-show|h-mh-compose-anon-ftp|h-mh-compose-external-compressed-tar|h-mh-compose-external-type|h-mh-directive-present-p|h-mh-to-mime-undo|h-mh-to-mime|h-mime-cleanup|h-mime-display|h-mime-save-parts|h-mml-forward-message|h-mml-secure-message-encrypt|h-mml-secure-message-sign|h-mml-secure-message-signencrypt|h-mml-tag-present-p|h-mml-to-mime|h-mml-unsecure-message|h-modify|h-msg-filename|h-msg-is-in-seq|h-msg-num-width-to-column|h-msg-num-width|h-narrow-to-cc|h-narrow-to-from|h-narrow-to-range|h-narrow-to-seq|h-narrow-to-subject|h-narrow-to-tick|h-narrow-to-to|h-new-draft-name|h-next-button|h-next-msg|h-next-undeleted-msg|h-next-unread-msg|h-nmail|h-notate-cur|h-notate-deleted-and-refiled|h-notate-user-sequences|h-notate|h-outstanding-commands-p|h-pack-folder|h-page-digest-backwards|h-page-digest|h-page-msg|h-parse-flist-output-line|h-pipe-msg|h-position-on-field|h-prefix-help|h-prev-button|h-previous-page|h-previous-undeleted-msg|h-previous-unread-msg|h-print-msg|h-process-daemon|h-process-or-undo-commands|h-profile-component-value|h-profile-component|h-prompt-for-folder|h-prompt-for-refile-folder|h-ps-print-msg-file|h-ps-print-msg|h-ps-print-toggle-color|h-ps-print-toggle-faces|h-put-msg-in-seq|h-quit|h-quote-for-shell|h-quote-pick-expr|h-range-to-msg-list|h-read-address|h-read-folder-sequences|h-read-range|h-read-seq-default|h-recenter|h-redistribute|h-refile-a-msg|h-refile-msg|h-refile-or-write-again|h-regenerate-headers|h-remove-all-notation|h-remove-cur-notation|h-remove-from-sub-folders-cache|h-replace-regexp-in-string|h-replace-string|h-reply|h-require-cl|h-require|h-rescan-folder|h-reset-threads-and-narrowing|h-rmail|h-run-time-gnus-version|h-scan-folder|h-scan-format-file-check|h-scan-format|h-scan-msg-number-regexp|h-scan-msg-search-regexp|h-search-from-end|h-search-p|h-search|h-send-letter|h-send|h-seq-msgs|h-seq-to-msgs|h-set-cmd-note|h-set-folder-modified-p|h-set-help|h-set-x-image-cache-directory|h-show-addr|h-show-buffer-message-number|h-show-font-lock-keywords-with-cite|h-show-font-lock-keywords|h-show-mode|h-show-preferred-alternative|h-show-speedbar-buttons|h-show-xface|h-show|h-showing-mode|h-signature-separator-p|h-smail-batch|h-smail-other-window|h-smail|h-sort-folder|h-spamassassin-blacklist|h-spamassassin-identify-spammers|h-spamassassin-whitelist|h-spamprobe-blacklist|h-spamprobe-whitelist|h-speed-add-folder|h-speed-flists-active-p|h-speed-flists|h-speed-invalidate-map|h-start-of-uncleaned-message|h-store-msg|h-strip-package-version|h-sub-folders|h-test-completion|h-thread-add-spaces|h-thread-ancestor|h-thread-delete|h-thread-find-msg-subject|h-thread-forget-message|h-thread-generate|h-thread-inc|h-thread-next-sibling|h-thread-parse-scan-line|h-thread-previous-sibling|h-thread-print-scan-lines|h-thread-refile|h-thread-update-scan-line-map|h-toggle-mh-decode-mime-flag|h-toggle-mime-buttons|h-toggle-showing|h-toggle-threads|h-toggle-tick|h-translate-range|h-truncate-log-buffer|h-undefine-sequence|h-undo-folder|h-undo|h-update-sequences|h-url-hexify-string|h-user-agent-compose|h-valid-seq-p|h-valid-view-change-operation-p|h-variant-gnu-mh-info|h-variant-info|h-variant-mh-info|h-variant-nmh-info|h-variant-p|h-variant-set-variant|h-variant-set|h-variants|h-version|h-view-mode-enter|h-visit-folder|h-widen|h-window-full-height-p|h-write-file-functions|h-write-msg-to-file|h-xargs|h-yank-cur-msg|idnight-buffer-display-time|idnight-delay-set|idnight-find|idnight-next|ime-to-mml|inibuf-eldef-setup-minibuffer|inibuf-eldef-update-minibuffer|inibuffer--bitset|inibuffer--double-dollars|inibuffer-avoid-prompt|inibuffer-completion-contents|inibuffer-default--in-prompt-regexps|inibuffer-default-add-completions|inibuffer-default-add-shell-commands|inibuffer-depth-indicate-mode|inibuffer-depth-setup|inibuffer-electric-default-mode|inibuffer-force-complete-and-exit|inibuffer-force-complete|inibuffer-frame-list|inibuffer-hide-completions|inibuffer-history-initialize|inibuffer-history-isearch-end|inibuffer-history-isearch-message|inibuffer-history-isearch-pop-state|inibuffer-history-isearch-push-state|inibuffer-history-isearch-search|inibuffer-history-isearch-setup|inibuffer-history-isearch-wrap|inibuffer-insert-file-name-at-point|inibuffer-keyboard-quit|inibuffer-with-setup-hook|inor-mode-menu-from-indicator|inusp|ismatch|ixal-debug|ixal-describe-operation-code|ixal-mode|ixal-run|m-add-meta-html-tag|m-alist-to-plist|m-annotationp|m-append-to-file|m-archive-decoders|m-archive-dissect-and-inline|m-assoc-string-match|m-attachment-override-p|m-auto-mode-alist|m-automatic-display-p|m-automatic-external-display-p|m-body-7-or-8|m-body-encoding|m-char-int|m-char-or-char-int-p|m-charset-after|m-charset-to-coding-system|m-codepage-setup|m-coding-system-equal|m-coding-system-list|m-coding-system-p|m-coding-system-to-mime-charset|m-complicated-handles|m-content-transfer-encoding|m-convert-shr-links|m-copy-to-buffer|m-create-image-xemacs|m-decode-body|m-decode-coding-region|m-decode-coding-string|m-decode-content-transfer-encoding|m-decode-string|m-decompress-buffer|m-default-file-encoding|m-default-multibyte-p|m-delete-duplicates|m-destroy-part|m-destroy-parts|m-destroy-postponed-undisplay-list|m-detect-coding-region|m-detect-mime-charset-region|m-disable-multibyte|m-display-external|m-display-inline|m-display-part|m-display-parts|m-dissect-archive|m-dissect-buffer|m-dissect-multipart|m-dissect-singlepart|m-enable-multibyte|m-encode-body|m-encode-buffer|m-encode-coding-region|m-encode-coding-string|m-encode-content-transfer-encoding|m-enrich-utf-8-by-mule-ucs|m-extern-cache-contents|m-file-name-collapse-whitespace|m-file-name-delete-control|m-file-name-delete-gotchas|m-file-name-delete-whitespace|m-file-name-replace-whitespace|m-file-name-trim-whitespace|m-find-buffer-file-coding-system|m-find-charset-region|m-find-mime-charset-region|m-find-part-by-type|m-find-raw-part-by-type|m-get-coding-system-list|m-get-content-id|m-get-image|m-get-part|m-guess-charset|m-handle-buffer|m-handle-cache|m-handle-description|m-handle-displayed-p|m-handle-disposition|m-handle-encoding|m-handle-filename|m-handle-id|m-handle-media-subtype|m-handle-media-supertype|m-handle-media-type|m-handle-multipart-ctl-parameter|m-handle-multipart-from|m-handle-multipart-original-buffer|m-handle-set-cache|m-handle-set-external-undisplayer|m-handle-set-undisplayer|m-handle-type|m-handle-undisplayer|m-image-fit-p|m-image-load-path|m-image-type-from-buffer|m-inlinable-p|m-inline-external-body|m-inline-override-p|m-inline-partial|m-inlined-p|m-insert-byte|m-insert-file-contents|m-insert-headers|m-insert-inline|m-insert-multipart-headers|m-insert-part|m-insert-rfc822-headers|m-interactively-view-part|m-iso-8859-x-to-15-region|m-keep-viewer-alive-p|m-line-number-at-pos|m-long-lines-p|m-mailcap-command|m-make-handle|m-make-temp-file|m-merge-handles|m-mime-charset|m-mule-charset-to-mime-charset|m-multibyte-char-to-unibyte|m-multibyte-p|m-multibyte-string-p|m-multiple-handles|m-pipe-part|m-possibly-verify-or-decrypt|m-preferred-alternative-precedence|m-preferred-alternative|m-preferred-coding-system|m-qp-or-base64|m-read-charset|m-read-coding-system|m-readable-p|m-remove-part|m-remove-parts|m-replace-in-string|m-safer-encoding|m-save-part-to-file|m-save-part|m-set-buffer-file-coding-system|m-set-buffer-multibyte|m-set-handle-multipart-parameter|m-setup-codepage-ibm|m-setup-codepage-iso-8859|m-shr|m-sort-coding-systems-predicate)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1205,7 +1205,7 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:newsticker--cache-update|newsticker--count-grouped-feeds|newsticker--count-groups|newsticker--debug-msg|newsticker--decode-iso8601-date|newsticker--decode-rfc822-date|newsticker--desc|newsticker--display-jump|newsticker--display-scroll|newsticker--display-tick|newsticker--do-forget-preformatted|newsticker--do-mark-item-at-point-as-read|newsticker--do-print-extra-element|newsticker--do-run-auto-mark-filter|newsticker--do-xml-workarounds|newsticker--echo-area-clean-p|newsticker--enclosure|newsticker--extra|newsticker--forget-preformatted|newsticker--get-group-names|newsticker--get-icon-url-atom-1\\.0|newsticker--get-logo-url-atom-0\\.3|newsticker--get-logo-url-atom-1\\.0|newsticker--get-logo-url-rss-0\\.91|newsticker--get-logo-url-rss-0\\.92|newsticker--get-logo-url-rss-1\\.0|newsticker--get-logo-url-rss-2\\.0|newsticker--get-news-by-funcall|newsticker--get-news-by-url-callback|newsticker--get-news-by-url|newsticker--get-news-by-wget|newsticker--group-all-groups|newsticker--group-do-find-group|newsticker--group-do-get-group|newsticker--group-do-rename-group|newsticker--group-find-parent-group|newsticker--group-get-feeds|newsticker--group-get-group|newsticker--group-get-subgroups|newsticker--group-manage-orphan-feeds|newsticker--group-names|newsticker--group-remove-obsolete-feeds|newsticker--group-shift|newsticker--guid-to-string|newsticker--guid|newsticker--icon-read|newsticker--icons-dir|newsticker--image-download-by-url-callback|newsticker--image-download-by-url|newsticker--image-download-by-wget|newsticker--image-get|newsticker--image-read|newsticker--image-remove|newsticker--image-save|newsticker--image-sentinel|newsticker--images-dir|newsticker--imenu-create-index|newsticker--imenu-goto|newsticker--insert-enclosure|newsticker--insert-image|newsticker--link|newsticker--lists-intersect-p|newsticker--opml-import-outlines|newsticker--parse-atom-0\\.3|newsticker--parse-atom-1\\.0|newsticker--parse-generic-feed|newsticker--parse-generic-items|newsticker--parse-rss-0\\.91|newsticker--parse-rss-0\\.92|newsticker--parse-rss-1\\.0|newsticker--parse-rss-2\\.0|newsticker--pos|newsticker--preformatted-contents|newsticker--preformatted-title|newsticker--print-extra-elements|newsticker--process-auto-mark-filter-match|newsticker--real-feed-name|newsticker--remove-whitespace|newsticker--run-auto-mark-filter|newsticker--sentinel-work|newsticker--sentinel|newsticker--set-customvar-buffer|newsticker--set-customvar-formatting|newsticker--set-customvar-retrieval|newsticker--set-customvar-sorting|newsticker--set-customvar-ticker|newsticker--set-face-properties|newsticker--splicer|newsticker--start-feed|newsticker--stat-num-items-for-group|newsticker--stat-num-items-total|newsticker--stat-num-items|newsticker--stop-feed|newsticker--ticker-text-remove|newsticker--ticker-text-setup|newsticker--time|newsticker--title|newsticker--tree-widget-icon-create|newsticker--treeview-activate-node|newsticker--treeview-buffer-init|newsticker--treeview-count-node-items|newsticker--treeview-do-get-node-by-id|newsticker--treeview-do-get-node-of-feed|newsticker--treeview-first-feed|newsticker--treeview-frame-init|newsticker--treeview-get-current-node|newsticker--treeview-get-feed-vfeed|newsticker--treeview-get-first-child|newsticker--treeview-get-id|newsticker--treeview-get-last-child|newsticker--treeview-get-next-sibling|newsticker--treeview-get-next-uncle|newsticker--treeview-get-node-by-id|newsticker--treeview-get-node-of-feed|newsticker--treeview-get-other-tree|newsticker--treeview-get-prev-sibling|newsticker--treeview-get-prev-uncle|newsticker--treeview-get-second-child|newsticker--treeview-get-selected-item|newsticker--treeview-ids-eq|newsticker--treeview-item-buffer|newsticker--treeview-item-show-text|newsticker--treeview-item-show|newsticker--treeview-item-update|newsticker--treeview-item-window|newsticker--treeview-list-add-item|newsticker--treeview-list-all-items|newsticker--treeview-list-buffer|newsticker--treeview-list-clear-highlight|newsticker--treeview-list-clear|newsticker--treeview-list-compare-item-by-age-reverse|newsticker--treeview-list-compare-item-by-age|newsticker--treeview-list-compare-item-by-time-reverse|newsticker--treeview-list-compare-item-by-time|newsticker--treeview-list-compare-item-by-title-reverse|newsticker--treeview-list-compare-item-by-title|newsticker--treeview-list-feed-items|newsticker--treeview-list-highlight-start|newsticker--treeview-list-immortal-items|newsticker--treeview-list-items-v|newsticker--treeview-list-items-with-age-callback|newsticker--treeview-list-items-with-age|newsticker--treeview-list-items|newsticker--treeview-list-new-items|newsticker--treeview-list-obsolete-items|newsticker--treeview-list-select|newsticker--treeview-list-sort-by-column|newsticker--treeview-list-sort-items|newsticker--treeview-list-update-faces|newsticker--treeview-list-update-highlight|newsticker--treeview-list-update|newsticker--treeview-list-window|newsticker--treeview-load|newsticker--treeview-mark-item|newsticker--treeview-nodes-eq|newsticker--treeview-propertize-tag|newsticker--treeview-render-text|newsticker--treeview-restore-layout|newsticker--treeview-set-current-node|newsticker--treeview-tree-buffer|newsticker--treeview-tree-do-update-tags|newsticker--treeview-tree-expand-status|newsticker--treeview-tree-expand|newsticker--treeview-tree-get-tag|newsticker--treeview-tree-open-menu|newsticker--treeview-tree-update-highlight|newsticker--treeview-tree-update-tag|newsticker--treeview-tree-update-tags|newsticker--treeview-tree-update|newsticker--treeview-tree-window|newsticker--treeview-unfold-node|newsticker--treeview-virtual-feed-p|newsticker--treeview-window-init|newsticker--unxml-attribute|newsticker--unxml-node|newsticker--unxml|newsticker--update-process-ids|newsticker-add-url|newsticker-browse-url-item|newsticker-browse-url|newsticker-buffer-force-update|newsticker-buffer-update|newsticker-close-buffer|newsticker-customize|newsticker-download-enclosures|newsticker-download-images|newsticker-get-all-news|newsticker-get-news-at-point|newsticker-get-news|newsticker-group-add-group|newsticker-group-delete-group|newsticker-group-move-feed|newsticker-group-rename-group|newsticker-group-shift-feed-down|newsticker-group-shift-feed-up|newsticker-group-shift-group-down|newsticker-group-shift-group-up|newsticker-handle-url|newsticker-hide-all-desc|newsticker-hide-entry|newsticker-hide-extra|newsticker-hide-feed-desc|newsticker-hide-new-item-desc|newsticker-hide-old-item-desc|newsticker-hide-old-items|newsticker-htmlr-render|newsticker-item-not-immortal-p|newsticker-item-not-old-p|newsticker-mark-all-items-as-read|newsticker-mark-all-items-at-point-as-read-and-redraw|newsticker-mark-all-items-at-point-as-read|newsticker-mark-all-items-of-feed-as-read|newsticker-mark-item-at-point-as-immortal|newsticker-mark-item-at-point-as-read|newsticker-mode|newsticker-mouse-browse-url|newsticker-new-item-functions-sample|newsticker-next-feed-available-p|newsticker-next-feed|newsticker-next-item-available-p|newsticker-next-item-same-feed|newsticker-next-item|newsticker-next-new-item|newsticker-opml-export|newsticker-opml-import|newsticker-plainview|newsticker-previous-feed-available-p|newsticker-previous-feed|newsticker-previous-item-available-p|newsticker-previous-item|newsticker-previous-new-item|newsticker-retrieve-random-message|newsticker-running-p|newsticker-save-item|newsticker-set-auto-narrow-to-feed|newsticker-set-auto-narrow-to-item|newsticker-show-all-desc|newsticker-show-entry|newsticker-show-extra|newsticker-show-feed-desc|newsticker-show-new-item-desc|newsticker-show-news|newsticker-show-old-item-desc|newsticker-show-old-items|newsticker-start-ticker|newsticker-start|newsticker-stop-ticker|newsticker-stop|newsticker-ticker-running-p|newsticker-toggle-auto-narrow-to-feed|newsticker-toggle-auto-narrow-to-item|newsticker-treeview-browse-url-item|newsticker-treeview-browse-url|newsticker-treeview-get-news|newsticker-treeview-item-mode|newsticker-treeview-jump|newsticker-treeview-list-make-sort-button|newsticker-treeview-list-mode|newsticker-treeview-mark-item-old|newsticker-treeview-mark-list-items-old|newsticker-treeview-mode|newsticker-treeview-mouse-browse-url|newsticker-treeview-next-feed|newsticker-treeview-next-item|newsticker-treeview-next-new-or-immortal-item|newsticker-treeview-next-page|newsticker-treeview-prev-feed|newsticker-treeview-prev-item|newsticker-treeview-prev-new-or-immortal-item|newsticker-treeview-quit|newsticker-treeview-save-item|newsticker-treeview-save|newsticker-treeview-scroll-item|newsticker-treeview-show-item|newsticker-treeview-toggle-item-immortal|newsticker-treeview-tree-click|newsticker-treeview-tree-do-click|newsticker-treeview-update|newsticker-treeview|newsticker-w3m-show-inline-images|next-buffer|next-cdabbrev|next-completion|next-error-buffer-p|next-error-find-buffer|next-error-follow-minor-mode|next-error-follow-mode-post-command-hook|next-error-internal|next-error-no-select|next-error|next-file|next-ifdef|next-line-or-history-element|next-line|next-logical-line|next-match|next-method-p|next-multiframe-window|next-page|next-read-file-uses-dialog-p|nintersection|ninth|nndiary-generate-nov-databases|nndoc-add-type|nndraft-request-associate-buffer|nndraft-request-expire-articles|nnfolder-generate-active-file|nnheader-accept-process-output|nnheader-article-p|nnheader-article-to-file-alist|nnheader-be-verbose|nnheader-cancel-function-timers|nnheader-cancel-timer|nnheader-concat|nnheader-directory-articles|nnheader-directory-files-safe|nnheader-directory-files|nnheader-directory-regular-files|nnheader-fake-message-id-p|nnheader-file-error|nnheader-file-size|nnheader-file-to-group|nnheader-file-to-number|nnheader-find-etc-directory|nnheader-find-file-noselect|nnheader-find-nov-line|nnheader-fold-continuation-lines|nnheader-generate-fake-message-id|nnheader-get-lines-and-char|nnheader-get-report-string|nnheader-get-report|nnheader-group-pathname|nnheader-header-value|nnheader-init-server-buffer|nnheader-insert-article-line|nnheader-insert-buffer-substring|nnheader-insert-file-contents|nnheader-insert-head|nnheader-insert-header|nnheader-insert-nov-file|nnheader-insert-nov|nnheader-insert-references|nnheader-insert|nnheader-message-maybe|nnheader-message|nnheader-ms-strip-cr|nnheader-narrow-to-headers|nnheader-nov-delete-outside-range|nnheader-nov-field|nnheader-nov-parse-extra|nnheader-nov-read-integer|nnheader-nov-read-message-id|nnheader-nov-skip-field|nnheader-parse-head|nnheader-parse-naked-head|nnheader-parse-nov|nnheader-parse-overview-file|nnheader-re-read-dir|nnheader-remove-body|nnheader-remove-cr-followed-by-lf|nnheader-replace-chars-in-string|nnheader-replace-duplicate-chars-in-string|nnheader-replace-header|nnheader-replace-regexp|nnheader-replace-string|nnheader-report|nnheader-set-temp-buffer|nnheader-skeleton-replace|nnheader-strip-cr|nnheader-translate-file-chars|nnheader-update-marks-actions|nnheader-write-overview-file|nnmail-article-group|nnmail-message-id|nnmail-split-fancy|nnml-generate-nov-databases|nnvirtual-catchup-group|nnvirtual-convert-headers|nnvirtual-find-group-art|no-applicable-method|no-next-method|nonincremental-re-search-backward|nonincremental-re-search-forward|nonincremental-repeat-search-backward|nonincremental-repeat-search-forward|nonincremental-search-backward|nonincremental-search-forward|normal-about-screen|normal-erase-is-backspace-mode|normal-erase-is-backspace-setup-frame|normal-mouse-startup-screen|normal-no-mouse-startup-screen|normal-splash-screen|normal-top-level-add-subdirs-to-load-path|normal-top-level-add-to-load-path|normal-top-level|notany|notevery|notifications-on-action-signal|notifications-on-closed-signal|nreconc|nroff-backward-text-line|nroff-comment-indent|nroff-count-text-lines|nroff-electric-mode|nroff-electric-newline|nroff-forward-text-line|nroff-insert-comment-function|nroff-mode|nroff-outline-level|nroff-view|nset-difference|nset-exclusive-or|nslookup-host|nslookup-mode|nslookup|nsm-certificate-part|nsm-check-certificate|nsm-check-plain-connection|nsm-check-protocol|nsm-check-tls-connection|nsm-fingerprint-ok-p|nsm-fingerprint|nsm-format-certificate|nsm-host-settings|nsm-id|nsm-level|nsm-new-fingerprint-ok-p|nsm-parse-subject|nsm-query-user|nsm-query|nsm-read-settings|nsm-remove-permanent-setting|nsm-remove-temporary-setting|nsm-save-host|nsm-verify-connection|nsm-warnings-ok-p|nsm-write-settings|nsublis|nsubst-if-not|nsubst-if|nsubst|nsubstitute-if-not)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)n(?:ewsticker--cache-update|ewsticker--count-grouped-feeds|ewsticker--count-groups|ewsticker--debug-msg|ewsticker--decode-iso8601-date|ewsticker--decode-rfc822-date|ewsticker--desc|ewsticker--display-jump|ewsticker--display-scroll|ewsticker--display-tick|ewsticker--do-forget-preformatted|ewsticker--do-mark-item-at-point-as-read|ewsticker--do-print-extra-element|ewsticker--do-run-auto-mark-filter|ewsticker--do-xml-workarounds|ewsticker--echo-area-clean-p|ewsticker--enclosure|ewsticker--extra|ewsticker--forget-preformatted|ewsticker--get-group-names|ewsticker--get-icon-url-atom-1\\.0|ewsticker--get-logo-url-atom-0\\.3|ewsticker--get-logo-url-atom-1\\.0|ewsticker--get-logo-url-rss-0\\.91|ewsticker--get-logo-url-rss-0\\.92|ewsticker--get-logo-url-rss-1\\.0|ewsticker--get-logo-url-rss-2\\.0|ewsticker--get-news-by-funcall|ewsticker--get-news-by-url-callback|ewsticker--get-news-by-url|ewsticker--get-news-by-wget|ewsticker--group-all-groups|ewsticker--group-do-find-group|ewsticker--group-do-get-group|ewsticker--group-do-rename-group|ewsticker--group-find-parent-group|ewsticker--group-get-feeds|ewsticker--group-get-group|ewsticker--group-get-subgroups|ewsticker--group-manage-orphan-feeds|ewsticker--group-names|ewsticker--group-remove-obsolete-feeds|ewsticker--group-shift|ewsticker--guid-to-string|ewsticker--guid|ewsticker--icon-read|ewsticker--icons-dir|ewsticker--image-download-by-url-callback|ewsticker--image-download-by-url|ewsticker--image-download-by-wget|ewsticker--image-get|ewsticker--image-read|ewsticker--image-remove|ewsticker--image-save|ewsticker--image-sentinel|ewsticker--images-dir|ewsticker--imenu-create-index|ewsticker--imenu-goto|ewsticker--insert-enclosure|ewsticker--insert-image|ewsticker--link|ewsticker--lists-intersect-p|ewsticker--opml-import-outlines|ewsticker--parse-atom-0\\.3|ewsticker--parse-atom-1\\.0|ewsticker--parse-generic-feed|ewsticker--parse-generic-items|ewsticker--parse-rss-0\\.91|ewsticker--parse-rss-0\\.92|ewsticker--parse-rss-1\\.0|ewsticker--parse-rss-2\\.0|ewsticker--pos|ewsticker--preformatted-contents|ewsticker--preformatted-title|ewsticker--print-extra-elements|ewsticker--process-auto-mark-filter-match|ewsticker--real-feed-name|ewsticker--remove-whitespace|ewsticker--run-auto-mark-filter|ewsticker--sentinel-work|ewsticker--sentinel|ewsticker--set-customvar-buffer|ewsticker--set-customvar-formatting|ewsticker--set-customvar-retrieval|ewsticker--set-customvar-sorting|ewsticker--set-customvar-ticker|ewsticker--set-face-properties|ewsticker--splicer|ewsticker--start-feed|ewsticker--stat-num-items-for-group|ewsticker--stat-num-items-total|ewsticker--stat-num-items|ewsticker--stop-feed|ewsticker--ticker-text-remove|ewsticker--ticker-text-setup|ewsticker--time|ewsticker--title|ewsticker--tree-widget-icon-create|ewsticker--treeview-activate-node|ewsticker--treeview-buffer-init|ewsticker--treeview-count-node-items|ewsticker--treeview-do-get-node-by-id|ewsticker--treeview-do-get-node-of-feed|ewsticker--treeview-first-feed|ewsticker--treeview-frame-init|ewsticker--treeview-get-current-node|ewsticker--treeview-get-feed-vfeed|ewsticker--treeview-get-first-child|ewsticker--treeview-get-id|ewsticker--treeview-get-last-child|ewsticker--treeview-get-next-sibling|ewsticker--treeview-get-next-uncle|ewsticker--treeview-get-node-by-id|ewsticker--treeview-get-node-of-feed|ewsticker--treeview-get-other-tree|ewsticker--treeview-get-prev-sibling|ewsticker--treeview-get-prev-uncle|ewsticker--treeview-get-second-child|ewsticker--treeview-get-selected-item|ewsticker--treeview-ids-eq|ewsticker--treeview-item-buffer|ewsticker--treeview-item-show-text|ewsticker--treeview-item-show|ewsticker--treeview-item-update|ewsticker--treeview-item-window|ewsticker--treeview-list-add-item|ewsticker--treeview-list-all-items|ewsticker--treeview-list-buffer|ewsticker--treeview-list-clear-highlight|ewsticker--treeview-list-clear|ewsticker--treeview-list-compare-item-by-age-reverse|ewsticker--treeview-list-compare-item-by-age|ewsticker--treeview-list-compare-item-by-time-reverse|ewsticker--treeview-list-compare-item-by-time|ewsticker--treeview-list-compare-item-by-title-reverse|ewsticker--treeview-list-compare-item-by-title|ewsticker--treeview-list-feed-items|ewsticker--treeview-list-highlight-start|ewsticker--treeview-list-immortal-items|ewsticker--treeview-list-items-v|ewsticker--treeview-list-items-with-age-callback|ewsticker--treeview-list-items-with-age|ewsticker--treeview-list-items|ewsticker--treeview-list-new-items|ewsticker--treeview-list-obsolete-items|ewsticker--treeview-list-select|ewsticker--treeview-list-sort-by-column|ewsticker--treeview-list-sort-items|ewsticker--treeview-list-update-faces|ewsticker--treeview-list-update-highlight|ewsticker--treeview-list-update|ewsticker--treeview-list-window|ewsticker--treeview-load|ewsticker--treeview-mark-item|ewsticker--treeview-nodes-eq|ewsticker--treeview-propertize-tag|ewsticker--treeview-render-text|ewsticker--treeview-restore-layout|ewsticker--treeview-set-current-node|ewsticker--treeview-tree-buffer|ewsticker--treeview-tree-do-update-tags|ewsticker--treeview-tree-expand-status|ewsticker--treeview-tree-expand|ewsticker--treeview-tree-get-tag|ewsticker--treeview-tree-open-menu|ewsticker--treeview-tree-update-highlight|ewsticker--treeview-tree-update-tag|ewsticker--treeview-tree-update-tags|ewsticker--treeview-tree-update|ewsticker--treeview-tree-window|ewsticker--treeview-unfold-node|ewsticker--treeview-virtual-feed-p|ewsticker--treeview-window-init|ewsticker--unxml-attribute|ewsticker--unxml-node|ewsticker--unxml|ewsticker--update-process-ids|ewsticker-add-url|ewsticker-browse-url-item|ewsticker-browse-url|ewsticker-buffer-force-update|ewsticker-buffer-update|ewsticker-close-buffer|ewsticker-customize|ewsticker-download-enclosures|ewsticker-download-images|ewsticker-get-all-news|ewsticker-get-news-at-point|ewsticker-get-news|ewsticker-group-add-group|ewsticker-group-delete-group|ewsticker-group-move-feed|ewsticker-group-rename-group|ewsticker-group-shift-feed-down|ewsticker-group-shift-feed-up|ewsticker-group-shift-group-down|ewsticker-group-shift-group-up|ewsticker-handle-url|ewsticker-hide-all-desc|ewsticker-hide-entry|ewsticker-hide-extra|ewsticker-hide-feed-desc|ewsticker-hide-new-item-desc|ewsticker-hide-old-item-desc|ewsticker-hide-old-items|ewsticker-htmlr-render|ewsticker-item-not-immortal-p|ewsticker-item-not-old-p|ewsticker-mark-all-items-as-read|ewsticker-mark-all-items-at-point-as-read-and-redraw|ewsticker-mark-all-items-at-point-as-read|ewsticker-mark-all-items-of-feed-as-read|ewsticker-mark-item-at-point-as-immortal|ewsticker-mark-item-at-point-as-read|ewsticker-mode|ewsticker-mouse-browse-url|ewsticker-new-item-functions-sample|ewsticker-next-feed-available-p|ewsticker-next-feed|ewsticker-next-item-available-p|ewsticker-next-item-same-feed|ewsticker-next-item|ewsticker-next-new-item|ewsticker-opml-export|ewsticker-opml-import|ewsticker-plainview|ewsticker-previous-feed-available-p|ewsticker-previous-feed|ewsticker-previous-item-available-p|ewsticker-previous-item|ewsticker-previous-new-item|ewsticker-retrieve-random-message|ewsticker-running-p|ewsticker-save-item|ewsticker-set-auto-narrow-to-feed|ewsticker-set-auto-narrow-to-item|ewsticker-show-all-desc|ewsticker-show-entry|ewsticker-show-extra|ewsticker-show-feed-desc|ewsticker-show-new-item-desc|ewsticker-show-news|ewsticker-show-old-item-desc|ewsticker-show-old-items|ewsticker-start-ticker|ewsticker-start|ewsticker-stop-ticker|ewsticker-stop|ewsticker-ticker-running-p|ewsticker-toggle-auto-narrow-to-feed|ewsticker-toggle-auto-narrow-to-item|ewsticker-treeview-browse-url-item|ewsticker-treeview-browse-url|ewsticker-treeview-get-news|ewsticker-treeview-item-mode|ewsticker-treeview-jump|ewsticker-treeview-list-make-sort-button|ewsticker-treeview-list-mode|ewsticker-treeview-mark-item-old|ewsticker-treeview-mark-list-items-old|ewsticker-treeview-mode|ewsticker-treeview-mouse-browse-url|ewsticker-treeview-next-feed|ewsticker-treeview-next-item|ewsticker-treeview-next-new-or-immortal-item|ewsticker-treeview-next-page|ewsticker-treeview-prev-feed|ewsticker-treeview-prev-item|ewsticker-treeview-prev-new-or-immortal-item|ewsticker-treeview-quit|ewsticker-treeview-save-item|ewsticker-treeview-save|ewsticker-treeview-scroll-item|ewsticker-treeview-show-item|ewsticker-treeview-toggle-item-immortal|ewsticker-treeview-tree-click|ewsticker-treeview-tree-do-click|ewsticker-treeview-update|ewsticker-treeview|ewsticker-w3m-show-inline-images|ext-buffer|ext-cdabbrev|ext-completion|ext-error-buffer-p|ext-error-find-buffer|ext-error-follow-minor-mode|ext-error-follow-mode-post-command-hook|ext-error-internal|ext-error-no-select|ext-error|ext-file|ext-ifdef|ext-line-or-history-element|ext-line|ext-logical-line|ext-match|ext-method-p|ext-multiframe-window|ext-page|ext-read-file-uses-dialog-p|intersection|inth|ndiary-generate-nov-databases|ndoc-add-type|ndraft-request-associate-buffer|ndraft-request-expire-articles|nfolder-generate-active-file|nheader-accept-process-output|nheader-article-p|nheader-article-to-file-alist|nheader-be-verbose|nheader-cancel-function-timers|nheader-cancel-timer|nheader-concat|nheader-directory-articles|nheader-directory-files-safe|nheader-directory-files|nheader-directory-regular-files|nheader-fake-message-id-p|nheader-file-error|nheader-file-size|nheader-file-to-group|nheader-file-to-number|nheader-find-etc-directory|nheader-find-file-noselect|nheader-find-nov-line|nheader-fold-continuation-lines|nheader-generate-fake-message-id|nheader-get-lines-and-char|nheader-get-report-string|nheader-get-report|nheader-group-pathname|nheader-header-value|nheader-init-server-buffer|nheader-insert-article-line|nheader-insert-buffer-substring|nheader-insert-file-contents|nheader-insert-head|nheader-insert-header|nheader-insert-nov-file|nheader-insert-nov|nheader-insert-references|nheader-insert|nheader-message-maybe|nheader-message|nheader-ms-strip-cr|nheader-narrow-to-headers|nheader-nov-delete-outside-range|nheader-nov-field|nheader-nov-parse-extra|nheader-nov-read-integer|nheader-nov-read-message-id|nheader-nov-skip-field|nheader-parse-head|nheader-parse-naked-head|nheader-parse-nov|nheader-parse-overview-file|nheader-re-read-dir|nheader-remove-body|nheader-remove-cr-followed-by-lf|nheader-replace-chars-in-string|nheader-replace-duplicate-chars-in-string|nheader-replace-header|nheader-replace-regexp|nheader-replace-string|nheader-report|nheader-set-temp-buffer|nheader-skeleton-replace|nheader-strip-cr|nheader-translate-file-chars|nheader-update-marks-actions|nheader-write-overview-file|nmail-article-group|nmail-message-id|nmail-split-fancy|nml-generate-nov-databases|nvirtual-catchup-group|nvirtual-convert-headers|nvirtual-find-group-art|o-applicable-method|o-next-method|onincremental-re-search-backward|onincremental-re-search-forward|onincremental-repeat-search-backward|onincremental-repeat-search-forward|onincremental-search-backward|onincremental-search-forward|ormal-about-screen|ormal-erase-is-backspace-mode|ormal-erase-is-backspace-setup-frame|ormal-mouse-startup-screen|ormal-no-mouse-startup-screen|ormal-splash-screen|ormal-top-level-add-subdirs-to-load-path|ormal-top-level-add-to-load-path|ormal-top-level|otany|otevery|otifications-on-action-signal|otifications-on-closed-signal|reconc|roff-backward-text-line|roff-comment-indent|roff-count-text-lines|roff-electric-mode|roff-electric-newline|roff-forward-text-line|roff-insert-comment-function|roff-mode|roff-outline-level|roff-view|set-difference|set-exclusive-or|slookup-host|slookup-mode|slookup|sm-certificate-part|sm-check-certificate|sm-check-plain-connection|sm-check-protocol|sm-check-tls-connection|sm-fingerprint-ok-p|sm-fingerprint|sm-format-certificate|sm-host-settings|sm-id|sm-level|sm-new-fingerprint-ok-p|sm-parse-subject|sm-query-user|sm-query|sm-read-settings|sm-remove-permanent-setting|sm-remove-temporary-setting|sm-save-host|sm-verify-connection|sm-warnings-ok-p|sm-write-settings|sublis|subst-if-not|subst-if|subst|substitute-if-not)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1213,19 +1213,19 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:org-clone-subtree-with-time-shift|org-closest-date|org-columns-compute|org-columns-get-format-and-top-level|org-columns-number-to-string|org-columns-remove-overlays|org-columns|org-combine-plists|org-command-at-point|org-comment-line-break-function|org-comment-or-uncomment-region|org-compatible-face|org-complete-expand-structure-template|org-completing-read-no-i|org-completing-read|org-compute-latex-and-related-regexp|org-compute-property-at-point|org-content|org-context-p|org-context|org-contextualize-keys|org-contextualize-validate-key|org-convert-to-odd-levels|org-convert-to-oddeven-levels|org-copy-face|org-copy-special|org-copy-subtree|org-copy-visible|org-copy|org-count-lines|org-count|org-create-customize-menu|org-create-dblock|org-create-formula--latex-header|org-create-formula-image-with-dvipng|org-create-formula-image-with-imagemagick|org-create-formula-image|org-create-math-formula|org-create-multibrace-regexp|org-ctrl-c-ctrl-c|org-ctrl-c-minus|org-ctrl-c-ret|org-ctrl-c-star|org-current-effective-time|org-current-level|org-current-line-string|org-current-line|org-current-time|org-cursor-to-region-beginning|org-customize|org-cut-special|org-cut-subtree|org-cycle-agenda-files|org-cycle-hide-archived-subtrees|org-cycle-hide-drawers|org-cycle-hide-inline-tasks|org-cycle-internal-global|org-cycle-internal-local|org-cycle-item-indentation|org-cycle-level|org-cycle-list-bullet|org-cycle-show-empty-lines|org-cycle|org-date-from-calendar|org-date-to-gregorian|org-datetree-find-date-create|org-days-to-iso-week|org-days-to-time|org-dblock-update|org-dblock-write:clocktable|org-dblock-write:columnview|org-deadline-close|org-deadline|org-decompose-region|org-default-apps|org-defkey|org-defvaralias|org-delete-all|org-delete-backward-char|org-delete-char|org-delete-directory|org-delete-property-globally|org-delete-property|org-demote-subtree|org-demote|org-detach-overlay|org-diary-sexp-entry|org-diary-to-ical-string|org-diary|org-display-custom-time|org-display-inline-images|org-display-inline-modification-hook|org-display-inline-remove-overlay|org-display-outline-path|org-display-warning|org-do-demote|org-do-emphasis-faces|org-do-latex-and-related|org-do-occur|org-do-promote|org-do-remove-indentation|org-do-sort|org-do-wrap|org-down-element|org-drag-element-backward|org-drag-element-forward|org-drag-line-backward|org-drag-line-forward|org-duration-string-to-minutes|org-dvipng-color-format|org-dvipng-color|org-edit-agenda-file-list|org-edit-fixed-width-region|org-edit-special|org-edit-src-abort|org-edit-src-code|org-edit-src-continue|org-edit-src-exit|org-edit-src-find-buffer|org-edit-src-find-region-and-lang|org-edit-src-get-indentation|org-edit-src-get-label-format|org-edit-src-get-lang|org-edit-src-save|org-element-at-point|org-element-context|org-element-interpret-data|org-email-link-description|org-emphasize|org-end-of-item-list|org-end-of-item|org-end-of-line|org-end-of-meta-data-and-drawers|org-end-of-subtree|org-entities-create-table|org-entities-help|org-entity-get-representation|org-entity-get|org-entity-latex-math-p|org-entry-add-to-multivalued-property|org-entry-beginning-position|org-entry-blocked-p|org-entry-delete|org-entry-end-position|org-entry-get-multivalued-property|org-entry-get-with-inheritance|org-entry-get|org-entry-is-done-p|org-entry-is-todo-p|org-entry-member-in-multivalued-property|org-entry-properties|org-entry-protect-space|org-entry-put-multivalued-property|org-entry-put|org-entry-remove-from-multivalued-property|org-entry-restore-space|org-escape-code-in-region|org-escape-code-in-string|org-eval-in-calendar|org-eval-in-environment|org-eval|org-evaluate-time-range|org-every|org-export-as|org-export-dispatch|org-export-insert-default-template|org-export-replace-region-by|org-export-string-as|org-export-to-buffer|org-export-to-file|org-extract-attributes|org-extract-log-state-settings|org-face-from-face-or-color|org-fast-tag-insert|org-fast-tag-selection|org-fast-tag-show-exit|org-fast-todo-selection|org-feed-goto-inbox|org-feed-show-raw-feed|org-feed-update-all|org-feed-update|org-file-apps-entry-match-against-dlink-p|org-file-complete-link|org-file-contents|org-file-equal-p|org-file-image-p|org-file-menu-entry|org-file-remote-p|org-files-list|org-fill-line-break-nobreak-p|org-fill-paragraph-with-timestamp-nobreak-p|org-fill-paragraph|org-fill-template|org-find-base-buffer-visiting|org-find-dblock|org-find-entry-with-id|org-find-exact-heading-in-directory|org-find-exact-headline-in-buffer|org-find-file-at-mouse|org-find-if|org-find-invisible-foreground|org-find-invisible|org-find-library-dir|org-find-olp|org-find-overlays|org-find-text-property-in-string|org-find-visible|org-first-headline-recenter|org-first-sibling-p|org-fit-window-to-buffer|org-fix-decoded-time|org-fix-indentation|org-fix-position-after-promote|org-fix-tags-on-the-fly|org-fixup-indentation|org-fixup-message-id-for-http|org-flag-drawer|org-flag-heading|org-flag-subtree|org-float-time|org-floor\\*|org-follow-timestamp-link|org-font-lock-add-priority-faces|org-font-lock-add-tag-faces|org-font-lock-ensure|org-font-lock-hook|org-fontify-entities|org-fontify-like-in-org-mode|org-fontify-meta-lines-and-blocks-1|org-fontify-meta-lines-and-blocks|org-footnote-action|org-footnote-all-labels|org-footnote-at-definition-p|org-footnote-at-reference-p|org-footnote-auto-adjust-maybe|org-footnote-create-definition|org-footnote-delete-definitions|org-footnote-delete-references|org-footnote-delete|org-footnote-get-definition|org-footnote-get-next-reference|org-footnote-goto-definition|org-footnote-goto-local-insertion-point|org-footnote-goto-previous-reference|org-footnote-in-valid-context-p|org-footnote-new|org-footnote-next-reference-or-definition|org-footnote-normalize-label|org-footnote-normalize|org-footnote-renumber-fn:N|org-footnote-unique-label|org-force-cycle-archived|org-force-self-insert|org-format-latex-as-mathml|org-format-latex-mathml-available-p|org-format-latex|org-format-outline-path|org-format-seconds|org-forward-element|org-forward-heading-same-level|org-forward-paragraph|org-forward-sentence|org-get-agenda-file-buffer|org-get-alist-option|org-get-at-bol|org-get-buffer-for-internal-link|org-get-buffer-tags|org-get-category|org-get-checkbox-statistics-face|org-get-compact-tod|org-get-cursor-date|org-get-date-from-calendar|org-get-deadline-time|org-get-entry|org-get-export-keywords|org-get-heading|org-get-indentation|org-get-indirect-buffer|org-get-last-sibling|org-get-level-face|org-get-limited-outline-regexp|org-get-local-tags-at|org-get-local-tags|org-get-local-variables|org-get-location|org-get-next-sibling|org-get-org-file|org-get-outline-path|org-get-packages-alist|org-get-previous-line-level|org-get-priority|org-get-property-block|org-get-repeat|org-get-scheduled-time|org-get-string-indentation|org-get-tag-face|org-get-tags-at|org-get-tags-string|org-get-tags|org-get-todo-face|org-get-todo-sequence-head|org-get-todo-state|org-get-valid-level|org-get-wdays|org-get-x-clipboard-compat|org-get-x-clipboard|org-git-version|org-global-cycle|org-global-tags-completion-table|org-goto-calendar|org-goto-first-child|org-goto-left|org-goto-line|org-goto-local-auto-isearch|org-goto-local-search-headings|org-goto-map|org-goto-marker-or-bmk|org-goto-quit|org-goto-ret|org-goto-right|org-goto-sibling|org-goto|org-heading-components|org-hh:mm-string-to-minutes|org-hidden-tree-error|org-hide-archived-subtrees|org-hide-block-all|org-hide-block-toggle-all|org-hide-block-toggle-maybe|org-hide-block-toggle|org-hide-wide-columns|org-highlight-new-match|org-hours-to-clocksum-string|org-html-convert-region-to-html|org-html-export-as-html|org-html-export-to-html|org-html-htmlize-generate-css|org-html-publish-to-html|org-icalendar-combine-agenda-files|org-icalendar-export-agenda-files|org-icalendar-export-to-ics|org-icompleting-read|org-id-copy|org-id-find-id-file|org-id-find|org-id-get-create|org-id-get-with-outline-drilling|org-id-get-with-outline-path-completion|org-id-get|org-id-goto|org-id-new|org-id-store-link|org-id-update-id-locations|org-ido-switchb|org-image-file-name-regexp|org-imenu-get-tree|org-imenu-new-marker|org-in-block-p|org-in-clocktable-p|org-in-commented-line|org-in-drawer-p|org-in-fixed-width-region-p|org-in-indented-comment-line|org-in-invisibility-spec-p|org-in-item-p|org-in-regexp|org-in-src-block-p|org-in-subtree-not-table-p|org-in-verbatim-emphasis|org-inc-effort|org-indent-block|org-indent-drawer|org-indent-item-tree|org-indent-item|org-indent-line-to|org-indent-line|org-indent-mode|org-indent-region|org-indent-to-column|org-info|org-inhibit-invisibility|org-insert-all-links|org-insert-columns-dblock|org-insert-comment|org-insert-drawer|org-insert-heading-after-current|org-insert-heading-respect-content|org-insert-heading|org-insert-item|org-insert-link-global|org-insert-link|org-insert-property-drawer|org-insert-subheading|org-insert-time-stamp|org-insert-todo-heading-respect-content|org-insert-todo-heading|org-insert-todo-subheading|org-inside-LaTeX-fragment-p|org-inside-latex-macro-p|org-install-agenda-files-menu|org-invisible-p2|org-irc-store-link|org-iread-file-name|org-isearch-end|org-isearch-post-command|org-iswitchb-completing-read|org-iswitchb|org-item-beginning-re|org-item-re|org-key|org-kill-is-subtree-p|org-kill-line|org-kill-new|org-kill-note-or-show-branches|org-last|org-latex-color-format|org-latex-color|org-latex-convert-region-to-latex|org-latex-export-as-latex|org-latex-export-to-latex|org-latex-export-to-pdf|org-latex-packages-to-string|org-latex-publish-to-latex|org-latex-publish-to-pdf|org-let|org-let2|org-level-increment|org-link-display-format|org-link-escape|org-link-expand-abbrev|org-link-fontify-links-to-this-file|org-link-prettify|org-link-search|org-link-try-special-completion|org-link-unescape-compound|org-link-unescape-single-byte-sequence|org-link-unescape|org-list-at-regexp-after-bullet-p|org-list-bullet-string|org-list-context|org-list-delete-item|org-list-get-all-items|org-list-get-bottom-point|org-list-get-bullet|org-list-get-checkbox|org-list-get-children|org-list-get-counter|org-list-get-first-item|org-list-get-ind|org-list-get-item-begin|org-list-get-item-end-before-blank|org-list-get-item-end|org-list-get-item-number|org-list-get-last-item|org-list-get-list-begin|org-list-get-list-end|org-list-get-list-type|org-list-get-next-item|org-list-get-nth|org-list-get-parent|org-list-get-prev-item|org-list-get-subtree|org-list-get-tag|org-list-get-top-point|org-list-has-child-p|org-list-in-valid-context-p|org-list-inc-bullet-maybe|org-list-indent-item-generic|org-list-insert-item|org-list-insert-radio-list|org-list-item-body-column|org-list-item-trim-br|org-list-make-subtree|org-list-parents-alist|org-list-prevs-alist|org-list-repair|org-list-search-backward|org-list-search-forward|org-list-search-generic|org-list-send-item|org-list-send-list|org-list-separating-blank-lines-number|org-list-set-bullet|org-list-set-checkbox|org-list-set-ind|org-list-set-item-visibility|org-list-set-nth|org-list-struct-apply-struct|org-list-struct-assoc-end|org-list-struct-fix-box|org-list-struct-fix-bul|org-list-struct-fix-ind|org-list-struct-fix-item-end|org-list-struct-indent|org-list-struct-outdent|org-list-swap-items|org-list-to-generic|org-list-to-html|org-list-to-latex|org-list-to-subtree|org-list-to-texinfo|org-list-use-alpha-bul-p|org-list-write-struct|org-load-modules-maybe|org-load-noerror-mustsuffix|org-local-logging|org-log-into-drawer|org-looking-at-p|org-looking-back|org-macro--collect-macros|org-macro-expand|org-macro-initialize-templates|org-macro-replace-all|org-make-link-regexps|org-make-link-string|org-make-options-regexp|org-make-org-heading-search-string|org-make-parameter-alist|org-make-tags-matcher|org-make-target-link-regexp|org-make-tdiff-string|org-map-dblocks|org-map-entries|org-map-region|org-map-tree|org-mark-element|org-mark-ring-goto|org-mark-ring-push|org-mark-subtree|org-match-any-p|org-match-line|org-match-sparse-tree|org-match-string-no-properties|org-matcher-time|org-maybe-intangible|org-md-convert-region-to-md|org-md-export-as-markdown|org-md-export-to-markdown|org-meta-return|org-metadown|org-metaleft|org-metaright|org-metaup|org-minutes-to-clocksum-string|org-minutes-to-hh:mm-string|org-mobile-pull|org-mobile-push|org-mode-flyspell-verify|org-mode-restart|org-mode|org-modifier-cursor-error)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)org-(?:clone-subtree-with-time-shift|closest-date|columns-compute|columns-get-format-and-top-level|columns-number-to-string|columns-remove-overlays|columns|combine-plists|command-at-point|comment-line-break-function|comment-or-uncomment-region|compatible-face|complete-expand-structure-template|completing-read-no-i|completing-read|compute-latex-and-related-regexp|compute-property-at-point|content|context-p|context|contextualize-keys|contextualize-validate-key|convert-to-odd-levels|convert-to-oddeven-levels|copy-face|copy-special|copy-subtree|copy-visible|copy|count-lines|count|create-customize-menu|create-dblock|create-formula--latex-header|create-formula-image-with-dvipng|create-formula-image-with-imagemagick|create-formula-image|create-math-formula|create-multibrace-regexp|ctrl-c-ctrl-c|ctrl-c-minus|ctrl-c-ret|ctrl-c-star|current-effective-time|current-level|current-line-string|current-line|current-time|cursor-to-region-beginning|customize|cut-special|cut-subtree|cycle-agenda-files|cycle-hide-archived-subtrees|cycle-hide-drawers|cycle-hide-inline-tasks|cycle-internal-global|cycle-internal-local|cycle-item-indentation|cycle-level|cycle-list-bullet|cycle-show-empty-lines|cycle|date-from-calendar|date-to-gregorian|datetree-find-date-create|days-to-iso-week|days-to-time|dblock-update|dblock-write:clocktable|dblock-write:columnview|deadline-close|deadline|decompose-region|default-apps|defkey|defvaralias|delete-all|delete-backward-char|delete-char|delete-directory|delete-property-globally|delete-property|demote-subtree|demote|detach-overlay|diary-sexp-entry|diary-to-ical-string|diary|display-custom-time|display-inline-images|display-inline-modification-hook|display-inline-remove-overlay|display-outline-path|display-warning|do-demote|do-emphasis-faces|do-latex-and-related|do-occur|do-promote|do-remove-indentation|do-sort|do-wrap|down-element|drag-element-backward|drag-element-forward|drag-line-backward|drag-line-forward|duration-string-to-minutes|dvipng-color-format|dvipng-color|edit-agenda-file-list|edit-fixed-width-region|edit-special|edit-src-abort|edit-src-code|edit-src-continue|edit-src-exit|edit-src-find-buffer|edit-src-find-region-and-lang|edit-src-get-indentation|edit-src-get-label-format|edit-src-get-lang|edit-src-save|element-at-point|element-context|element-interpret-data|email-link-description|emphasize|end-of-item-list|end-of-item|end-of-line|end-of-meta-data-and-drawers|end-of-subtree|entities-create-table|entities-help|entity-get-representation|entity-get|entity-latex-math-p|entry-add-to-multivalued-property|entry-beginning-position|entry-blocked-p|entry-delete|entry-end-position|entry-get-multivalued-property|entry-get-with-inheritance|entry-get|entry-is-done-p|entry-is-todo-p|entry-member-in-multivalued-property|entry-properties|entry-protect-space|entry-put-multivalued-property|entry-put|entry-remove-from-multivalued-property|entry-restore-space|escape-code-in-region|escape-code-in-string|eval-in-calendar|eval-in-environment|eval|evaluate-time-range|every|export-as|export-dispatch|export-insert-default-template|export-replace-region-by|export-string-as|export-to-buffer|export-to-file|extract-attributes|extract-log-state-settings|face-from-face-or-color|fast-tag-insert|fast-tag-selection|fast-tag-show-exit|fast-todo-selection|feed-goto-inbox|feed-show-raw-feed|feed-update-all|feed-update|file-apps-entry-match-against-dlink-p|file-complete-link|file-contents|file-equal-p|file-image-p|file-menu-entry|file-remote-p|files-list|fill-line-break-nobreak-p|fill-paragraph-with-timestamp-nobreak-p|fill-paragraph|fill-template|find-base-buffer-visiting|find-dblock|find-entry-with-id|find-exact-heading-in-directory|find-exact-headline-in-buffer|find-file-at-mouse|find-if|find-invisible-foreground|find-invisible|find-library-dir|find-olp|find-overlays|find-text-property-in-string|find-visible|first-headline-recenter|first-sibling-p|fit-window-to-buffer|fix-decoded-time|fix-indentation|fix-position-after-promote|fix-tags-on-the-fly|fixup-indentation|fixup-message-id-for-http|flag-drawer|flag-heading|flag-subtree|float-time|floor\\*|follow-timestamp-link|font-lock-add-priority-faces|font-lock-add-tag-faces|font-lock-ensure|font-lock-hook|fontify-entities|fontify-like-in-org-mode|fontify-meta-lines-and-blocks-1|fontify-meta-lines-and-blocks|footnote-action|footnote-all-labels|footnote-at-definition-p|footnote-at-reference-p|footnote-auto-adjust-maybe|footnote-create-definition|footnote-delete-definitions|footnote-delete-references|footnote-delete|footnote-get-definition|footnote-get-next-reference|footnote-goto-definition|footnote-goto-local-insertion-point|footnote-goto-previous-reference|footnote-in-valid-context-p|footnote-new|footnote-next-reference-or-definition|footnote-normalize-label|footnote-normalize|footnote-renumber-fn:N|footnote-unique-label|force-cycle-archived|force-self-insert|format-latex-as-mathml|format-latex-mathml-available-p|format-latex|format-outline-path|format-seconds|forward-element|forward-heading-same-level|forward-paragraph|forward-sentence|get-agenda-file-buffer|get-alist-option|get-at-bol|get-buffer-for-internal-link|get-buffer-tags|get-category|get-checkbox-statistics-face|get-compact-tod|get-cursor-date|get-date-from-calendar|get-deadline-time|get-entry|get-export-keywords|get-heading|get-indentation|get-indirect-buffer|get-last-sibling|get-level-face|get-limited-outline-regexp|get-local-tags-at|get-local-tags|get-local-variables|get-location|get-next-sibling|get-org-file|get-outline-path|get-packages-alist|get-previous-line-level|get-priority|get-property-block|get-repeat|get-scheduled-time|get-string-indentation|get-tag-face|get-tags-at|get-tags-string|get-tags|get-todo-face|get-todo-sequence-head|get-todo-state|get-valid-level|get-wdays|get-x-clipboard-compat|get-x-clipboard|git-version|global-cycle|global-tags-completion-table|goto-calendar|goto-first-child|goto-left|goto-line|goto-local-auto-isearch|goto-local-search-headings|goto-map|goto-marker-or-bmk|goto-quit|goto-ret|goto-right|goto-sibling|goto|heading-components|hh:mm-string-to-minutes|hidden-tree-error|hide-archived-subtrees|hide-block-all|hide-block-toggle-all|hide-block-toggle-maybe|hide-block-toggle|hide-wide-columns|highlight-new-match|hours-to-clocksum-string|html-convert-region-to-html|html-export-as-html|html-export-to-html|html-htmlize-generate-css|html-publish-to-html|icalendar-combine-agenda-files|icalendar-export-agenda-files|icalendar-export-to-ics|icompleting-read|id-copy|id-find-id-file|id-find|id-get-create|id-get-with-outline-drilling|id-get-with-outline-path-completion|id-get|id-goto|id-new|id-store-link|id-update-id-locations|ido-switchb|image-file-name-regexp|imenu-get-tree|imenu-new-marker|in-block-p|in-clocktable-p|in-commented-line|in-drawer-p|in-fixed-width-region-p|in-indented-comment-line|in-invisibility-spec-p|in-item-p|in-regexp|in-src-block-p|in-subtree-not-table-p|in-verbatim-emphasis|inc-effort|indent-block|indent-drawer|indent-item-tree|indent-item|indent-line-to|indent-line|indent-mode|indent-region|indent-to-column|info|inhibit-invisibility|insert-all-links|insert-columns-dblock|insert-comment|insert-drawer|insert-heading-after-current|insert-heading-respect-content|insert-heading|insert-item|insert-link-global|insert-link|insert-property-drawer|insert-subheading|insert-time-stamp|insert-todo-heading-respect-content|insert-todo-heading|insert-todo-subheading|inside-LaTeX-fragment-p|inside-latex-macro-p|install-agenda-files-menu|invisible-p2|irc-store-link|iread-file-name|isearch-end|isearch-post-command|iswitchb-completing-read|iswitchb|item-beginning-re|item-re|key|kill-is-subtree-p|kill-line|kill-new|kill-note-or-show-branches|last|latex-color-format|latex-color|latex-convert-region-to-latex|latex-export-as-latex|latex-export-to-latex|latex-export-to-pdf|latex-packages-to-string|latex-publish-to-latex|latex-publish-to-pdf|let|let2|level-increment|link-display-format|link-escape|link-expand-abbrev|link-fontify-links-to-this-file|link-prettify|link-search|link-try-special-completion|link-unescape-compound|link-unescape-single-byte-sequence|link-unescape|list-at-regexp-after-bullet-p|list-bullet-string|list-context|list-delete-item|list-get-all-items|list-get-bottom-point|list-get-bullet|list-get-checkbox|list-get-children|list-get-counter|list-get-first-item|list-get-ind|list-get-item-begin|list-get-item-end-before-blank|list-get-item-end|list-get-item-number|list-get-last-item|list-get-list-begin|list-get-list-end|list-get-list-type|list-get-next-item|list-get-nth|list-get-parent|list-get-prev-item|list-get-subtree|list-get-tag|list-get-top-point|list-has-child-p|list-in-valid-context-p|list-inc-bullet-maybe|list-indent-item-generic|list-insert-item|list-insert-radio-list|list-item-body-column|list-item-trim-br|list-make-subtree|list-parents-alist|list-prevs-alist|list-repair|list-search-backward|list-search-forward|list-search-generic|list-send-item|list-send-list|list-separating-blank-lines-number|list-set-bullet|list-set-checkbox|list-set-ind|list-set-item-visibility|list-set-nth|list-struct-apply-struct|list-struct-assoc-end|list-struct-fix-box|list-struct-fix-bul|list-struct-fix-ind|list-struct-fix-item-end|list-struct-indent|list-struct-outdent|list-swap-items|list-to-generic|list-to-html|list-to-latex|list-to-subtree|list-to-texinfo|list-use-alpha-bul-p|list-write-struct|load-modules-maybe|load-noerror-mustsuffix|local-logging|log-into-drawer|looking-at-p|looking-back|macro--collect-macros|macro-expand|macro-initialize-templates|macro-replace-all|make-link-regexps|make-link-string|make-options-regexp|make-org-heading-search-string|make-parameter-alist|make-tags-matcher|make-target-link-regexp|make-tdiff-string|map-dblocks|map-entries|map-region|map-tree|mark-element|mark-ring-goto|mark-ring-push|mark-subtree|match-any-p|match-line|match-sparse-tree|match-string-no-properties|matcher-time|maybe-intangible|md-convert-region-to-md|md-export-as-markdown|md-export-to-markdown|meta-return|metadown|metaleft|metaright|metaup|minutes-to-clocksum-string|minutes-to-hh:mm-string|mobile-pull|mobile-push|mode-flyspell-verify|mode-restart|mode|modifier-cursor-error)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:org-modify-ts-extra|org-move-item-down|org-move-item-up|org-move-subtree-down|org-move-subtree-up|org-move-to-column|org-narrow-to-block|org-narrow-to-element|org-narrow-to-subtree|org-next-block|org-next-item|org-next-link|org-no-popups|org-no-properties|org-no-read-only|org-no-warnings|org-normalize-color|org-not-nil|org-notes-order-reversed-p|org-number-sequence|org-occur-in-agenda-files|org-occur-link-in-agenda-files|org-occur-next-match|org-occur|org-odt-convert|org-odt-export-as-odf-and-open|org-odt-export-as-odf|org-odt-export-to-odt|org-offer-links-in-entry|org-olpath-completing-read|org-on-heading-p|org-on-target-p|org-op-to-function|org-open-at-mouse|org-open-at-point-global|org-open-at-point|org-open-file-with-emacs|org-open-file-with-system|org-open-file|org-open-line|org-open-link-from-string|org-optimize-window-after-visibility-change|org-order-calendar-date-args|org-org-export-as-org|org-org-export-to-org|org-org-menu|org-org-publish-to-org|org-outdent-item-tree|org-outdent-item|org-outline-level|org-outline-overlay-data|org-overlay-before-string|org-overlay-display|org-overview|org-parse-arguments|org-parse-time-string|org-paste-special|org-paste-subtree|org-pcomplete-case-double|org-pcomplete-initial|org-plist-delete|org-plot\\/gnuplot|org-point-at-end-of-empty-headline|org-point-in-group|org-pop-to-buffer-same-window|org-pos-in-match-range|org-prepare-dblock|org-preserve-lc|org-preview-latex-fragment|org-previous-block|org-previous-item|org-previous-line-empty-p|org-previous-link|org-print-speed-command|org-priority-down|org-priority-up|org-priority|org-promote-subtree|org-promote|org-propertize|org-property-action|org-property-get-allowed-values|org-property-inherit-p|org-property-next-allowed-value|org-property-or-variable-value|org-property-previous-allowed-value|org-property-values|org-protect-slash|org-publish-all|org-publish-current-file|org-publish-current-project|org-publish-project|org-publish|org-quote-csv-field|org-quote-vert|org-raise-scripts|org-re-property|org-re-timestamp|org-re|org-read-agenda-file-list|org-read-date-analyze|org-read-date-display|org-read-date-get-relative|org-read-date|org-read-property-name|org-read-property-value|org-rear-nonsticky-at|org-recenter-calendar|org-redisplay-inline-images|org-reduce|org-reduced-level|org-refile--get-location|org-refile-cache-check-set|org-refile-cache-clear|org-refile-cache-get|org-refile-cache-put|org-refile-check-position|org-refile-get-location|org-refile-get-targets|org-refile-goto-last-stored|org-refile-marker|org-refile-new-child|org-refile|org-refresh-category-properties|org-refresh-properties|org-reftex-citation|org-region-active-p|org-reinstall-markers-in-region|org-release-buffers|org-release|org-reload|org-remap|org-remove-angle-brackets|org-remove-double-quotes|org-remove-empty-drawer-at|org-remove-empty-overlays-at|org-remove-file|org-remove-flyspell-overlays-in|org-remove-font-lock-display-properties|org-remove-from-invisibility-spec|org-remove-if-not|org-remove-if|org-remove-indentation|org-remove-inline-images|org-remove-keyword-keys|org-remove-latex-fragment-image-overlays|org-remove-occur-highlights|org-remove-tabs|org-remove-timestamp-with-keyword|org-remove-uninherited-tags|org-replace-escapes|org-replace-match-keep-properties|org-require-autoloaded-modules|org-reset-checkbox-state-subtree|org-resolve-clocks|org-restart-font-lock|org-return-indent|org-return|org-reveal|org-reverse-string|org-revert-all-org-buffers|org-run-like-in-org-mode|org-save-all-org-buffers|org-save-markers-in-region|org-save-outline-visibility|org-sbe|org-scan-tags|org-schedule|org-search-not-self|org-search-view|org-select-frame-set-input-focus|org-self-insert-command|org-set-current-tags-overlay|org-set-effort|org-set-emph-re|org-set-font-lock-defaults|org-set-frame-title|org-set-local|org-set-modules|org-set-outline-overlay-data|org-set-packages-alist|org-set-property-and-value|org-set-property-function|org-set-property|org-set-regexps-and-options-for-tags|org-set-regexps-and-options|org-set-startup-visibility|org-set-tag-faces|org-set-tags-command|org-set-tags-to|org-set-tags|org-set-transient-map|org-set-visibility-according-to-property|org-setup-comments-handling|org-setup-filling|org-shiftcontroldown|org-shiftcontrolleft|org-shiftcontrolright|org-shiftcontrolup|org-shiftdown|org-shiftleft|org-shiftmetadown|org-shiftmetaleft|org-shiftmetaright|org-shiftmetaup|org-shiftright|org-shiftselect-error|org-shifttab|org-shiftup|org-shorten-string|org-show-block-all|org-show-context|org-show-empty-lines-in-parent|org-show-entry|org-show-hidden-entry|org-show-priority|org-show-siblings|org-show-subtree|org-show-todo-tree|org-skip-over-state-notes|org-skip-whitespace|org-small-year-to-year|org-some|org-sort-entries|org-sort-list|org-sort-remove-invisible|org-sort|org-sparse-tree|org-speed-command-activate|org-speed-command-default-hook|org-speed-command-help|org-speed-move-safe|org-speedbar-set-agenda-restriction|org-splice-latex-header|org-split-string|org-src-associate-babel-session|org-src-babel-configure-edit-buffer|org-src-construct-edit-buffer-name|org-src-do-at-code-block|org-src-do-key-sequence-at-code-block|org-src-edit-buffer-p|org-src-font-lock-fontify-block|org-src-fontify-block|org-src-fontify-buffer|org-src-get-lang-mode|org-src-in-org-buffer|org-src-mode-configure-edit-buffer|org-src-mode|org-src-native-tab-command-maybe|org-src-switch-to-buffer|org-src-tangle|org-store-agenda-views|org-store-link-props|org-store-link|org-store-log-note|org-store-new-agenda-file-list|org-string-match-p|org-string-nw-p|org-string-width|org-string<=|org-string<>|org-string>|org-string>=|org-sublist|org-submit-bug-report|org-substitute-posix-classes|org-subtree-end-visible-p|org-switch-to-buffer-other-window|org-switchb|org-table-align|org-table-begin|org-table-blank-field|org-table-convert-region|org-table-convert|org-table-copy-down|org-table-copy-region|org-table-create-or-convert-from-region|org-table-create-with-table\\.el|org-table-create|org-table-current-dline|org-table-cut-region|org-table-delete-column|org-table-edit-field|org-table-edit-formulas|org-table-end|org-table-eval-formula|org-table-export|org-table-field-info|org-table-get-stored-formulas|org-table-goto-column|org-table-hline-and-move|org-table-import|org-table-insert-column|org-table-insert-hline|org-table-insert-row|org-table-iterate-buffer-tables|org-table-iterate|org-table-justify-field-maybe|org-table-kill-row|org-table-map-tables|org-table-maybe-eval-formula|org-table-maybe-recalculate-line|org-table-move-column-left|org-table-move-column-right|org-table-move-column|org-table-move-row-down|org-table-move-row-up|org-table-move-row|org-table-next-field|org-table-next-row|org-table-p|org-table-paste-rectangle|org-table-previous-field|org-table-recalculate-buffer-tables|org-table-recalculate|org-table-recognize-table\\.el|org-table-rotate-recalc-marks|org-table-set-constants|org-table-sort-lines|org-table-sum|org-table-to-lisp|org-table-toggle-coordinate-overlays|org-table-toggle-formula-debugger|org-table-wrap-region|org-tag-inherit-p|org-tags-completion-function|org-tags-expand|org-tags-sparse-tree|org-tags-view|org-tbl-menu|org-texinfo-convert-region-to-texinfo|org-texinfo-publish-to-texinfo|org-thing-at-point|org-time-from-absolute|org-time-stamp-format|org-time-stamp-inactive|org-time-stamp-to-now|org-time-stamp|org-time-string-to-absolute|org-time-string-to-seconds|org-time-string-to-time|org-time-today|org-time<|org-time<=|org-time<>|org-time=|org-time>|org-time>=|org-timer-change-times-in-region|org-timer-item|org-timer-set-timer|org-timer-start|org-timer|org-timestamp-change|org-timestamp-down-day|org-timestamp-down|org-timestamp-format|org-timestamp-has-time-p|org-timestamp-split-range|org-timestamp-translate|org-timestamp-up-day|org-timestamp-up|org-today|org-todo-list|org-todo-trigger-tag-changes|org-todo-yesterday|org-todo|org-toggle-archive-tag|org-toggle-checkbox|org-toggle-comment|org-toggle-custom-properties-visibility|org-toggle-fixed-width-section|org-toggle-heading|org-toggle-inline-images|org-toggle-item|org-toggle-link-display|org-toggle-ordered-property|org-toggle-pretty-entities|org-toggle-sticky-agenda|org-toggle-tag|org-toggle-tags-groups|org-toggle-time-stamp-overlays|org-toggle-timestamp-type|org-tr-level|org-translate-link-from-planner|org-translate-link|org-translate-time|org-transpose-element|org-transpose-words|org-tree-to-indirect-buffer|org-trim|org-truely-invisible-p|org-try-cdlatex-tab|org-try-structure-completion|org-unescape-code-in-region|org-unescape-code-in-string|org-unfontify-region|org-unindent-buffer|org-uniquify-alist|org-uniquify|org-unlogged-message|org-unmodified|org-up-element|org-up-heading-all|org-up-heading-safe|org-update-all-dblocks|org-update-checkbox-count-maybe|org-update-checkbox-count|org-update-dblock|org-update-parent-todo-statistics|org-update-property-plist|org-update-radio-target-regexp|org-update-statistics-cookies|org-uuidgen-p|org-version-check|org-version|org-with-gensyms|org-with-limited-levels|org-with-point-at|org-with-remote-undo|org-with-silent-modifications|org-with-wide-buffer|org-without-partial-completion|org-wrap|org-xemacs-without-invisibility|org-xor|org-yank-folding-would-swallow-text|org-yank-generic|org-yank|org<>|orgstruct\\+\\+-mode|orgstruct-error|orgstruct-make-binding|orgstruct-mode|orgstruct-setup|orgtbl-mode|orgtbl-to-csv|orgtbl-to-generic|orgtbl-to-html|orgtbl-to-latex|orgtbl-to-orgtbl|orgtbl-to-texinfo|orgtbl-to-tsv|oset-default|oset|other-frame|other-window-for-scrolling|outline-back-to-heading|outline-backward-same-level|outline-demote|outline-end-of-heading|outline-end-of-subtree|outline-flag-region|outline-flag-subtree|outline-font-lock-face|outline-forward-same-level|outline-get-last-sibling|outline-get-next-sibling|outline-head-from-level|outline-headers-as-kill|outline-insert-heading|outline-invent-heading|outline-invisible-p|outline-isearch-open-invisible|outline-level|outline-map-region|outline-mark-subtree|outline-minor-mode|outline-mode|outline-move-subtree-down|outline-move-subtree-up|outline-next-heading|outline-next-preface|outline-next-visible-heading|outline-on-heading-p|outline-previous-heading|outline-previous-visible-heading|outline-promote|outline-reveal-toggle-invisible|outline-show-heading|outline-toggle-children|outline-up-heading|outlineify-sticky|outlinify-sticky|overlay-lists|overload-docstring-extension|overload-obsoleted-by|overload-that-obsolete|package--ac-desc-extras--cmacro|package--ac-desc-extras|package--ac-desc-kind--cmacro|package--ac-desc-kind|package--ac-desc-reqs--cmacro|package--ac-desc-reqs|package--ac-desc-summary--cmacro|package--ac-desc-summary|package--ac-desc-version--cmacro|package--ac-desc-version|package--add-to-archive-contents|package--alist-to-plist-args|package--archive-file-exists-p|package--bi-desc-reqs--cmacro|package--bi-desc-reqs|package--bi-desc-summary--cmacro|package--bi-desc-summary|package--bi-desc-version--cmacro|package--bi-desc-version|package--check-signature|package--compile|package--description-file|package--display-verify-error|package--download-one-archive|package--from-builtin|package--has-keyword-p|package--list-loaded-files|package--make-autoloads-and-stuff|package--mapc|package--prepare-dependencies|package--push|package--read-archive-file|package--with-work-buffer|package--write-file-no-coding|package-activate-1|package-activate|package-all-keywords|package-archive-base|package-autoload-ensure-default-file|package-buffer-info|package-built-in-p|package-compute-transaction|package-delete|package-desc--keywords|package-desc-archive--cmacro|package-desc-archive|package-desc-create--cmacro|package-desc-create|package-desc-dir--cmacro|package-desc-dir|package-desc-extras--cmacro|package-desc-extras|package-desc-from-define|package-desc-full-name|package-desc-kind--cmacro|package-desc-kind|package-desc-name--cmacro|package-desc-name|package-desc-p--cmacro|package-desc-p|package-desc-reqs--cmacro|package-desc-reqs|package-desc-signed--cmacro|package-desc-signed|package-desc-status|package-desc-suffix|package-desc-summary--cmacro|package-desc-summary|package-desc-version--cmacro|package-desc-version|package-disabled-p|package-download-transaction|package-generate-autoloads|package-generate-description-file|package-import-keyring|package-install-button-action|package-install-file|package-install-from-archive)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(?:org-modify-ts-extra|org-move-item-down|org-move-item-up|org-move-subtree-down|org-move-subtree-up|org-move-to-column|org-narrow-to-block|org-narrow-to-element|org-narrow-to-subtree|org-next-block|org-next-item|org-next-link|org-no-popups|org-no-properties|org-no-read-only|org-no-warnings|org-normalize-color|org-not-nil|org-notes-order-reversed-p|org-number-sequence|org-occur-in-agenda-files|org-occur-link-in-agenda-files|org-occur-next-match|org-occur|org-odt-convert|org-odt-export-as-odf-and-open|org-odt-export-as-odf|org-odt-export-to-odt|org-offer-links-in-entry|org-olpath-completing-read|org-on-heading-p|org-on-target-p|org-op-to-function|org-open-at-mouse|org-open-at-point-global|org-open-at-point|org-open-file-with-emacs|org-open-file-with-system|org-open-file|org-open-line|org-open-link-from-string|org-optimize-window-after-visibility-change|org-order-calendar-date-args|org-org-export-as-org|org-org-export-to-org|org-org-menu|org-org-publish-to-org|org-outdent-item-tree|org-outdent-item|org-outline-level|org-outline-overlay-data|org-overlay-before-string|org-overlay-display|org-overview|org-parse-arguments|org-parse-time-string|org-paste-special|org-paste-subtree|org-pcomplete-case-double|org-pcomplete-initial|org-plist-delete|org-plot/gnuplot|org-point-at-end-of-empty-headline|org-point-in-group|org-pop-to-buffer-same-window|org-pos-in-match-range|org-prepare-dblock|org-preserve-lc|org-preview-latex-fragment|org-previous-block|org-previous-item|org-previous-line-empty-p|org-previous-link|org-print-speed-command|org-priority-down|org-priority-up|org-priority|org-promote-subtree|org-promote|org-propertize|org-property-action|org-property-get-allowed-values|org-property-inherit-p|org-property-next-allowed-value|org-property-or-variable-value|org-property-previous-allowed-value|org-property-values|org-protect-slash|org-publish-all|org-publish-current-file|org-publish-current-project|org-publish-project|org-publish|org-quote-csv-field|org-quote-vert|org-raise-scripts|org-re-property|org-re-timestamp|org-re|org-read-agenda-file-list|org-read-date-analyze|org-read-date-display|org-read-date-get-relative|org-read-date|org-read-property-name|org-read-property-value|org-rear-nonsticky-at|org-recenter-calendar|org-redisplay-inline-images|org-reduce|org-reduced-level|org-refile--get-location|org-refile-cache-check-set|org-refile-cache-clear|org-refile-cache-get|org-refile-cache-put|org-refile-check-position|org-refile-get-location|org-refile-get-targets|org-refile-goto-last-stored|org-refile-marker|org-refile-new-child|org-refile|org-refresh-category-properties|org-refresh-properties|org-reftex-citation|org-region-active-p|org-reinstall-markers-in-region|org-release-buffers|org-release|org-reload|org-remap|org-remove-angle-brackets|org-remove-double-quotes|org-remove-empty-drawer-at|org-remove-empty-overlays-at|org-remove-file|org-remove-flyspell-overlays-in|org-remove-font-lock-display-properties|org-remove-from-invisibility-spec|org-remove-if-not|org-remove-if|org-remove-indentation|org-remove-inline-images|org-remove-keyword-keys|org-remove-latex-fragment-image-overlays|org-remove-occur-highlights|org-remove-tabs|org-remove-timestamp-with-keyword|org-remove-uninherited-tags|org-replace-escapes|org-replace-match-keep-properties|org-require-autoloaded-modules|org-reset-checkbox-state-subtree|org-resolve-clocks|org-restart-font-lock|org-return-indent|org-return|org-reveal|org-reverse-string|org-revert-all-org-buffers|org-run-like-in-org-mode|org-save-all-org-buffers|org-save-markers-in-region|org-save-outline-visibility|org-sbe|org-scan-tags|org-schedule|org-search-not-self|org-search-view|org-select-frame-set-input-focus|org-self-insert-command|org-set-current-tags-overlay|org-set-effort|org-set-emph-re|org-set-font-lock-defaults|org-set-frame-title|org-set-local|org-set-modules|org-set-outline-overlay-data|org-set-packages-alist|org-set-property-and-value|org-set-property-function|org-set-property|org-set-regexps-and-options-for-tags|org-set-regexps-and-options|org-set-startup-visibility|org-set-tag-faces|org-set-tags-command|org-set-tags-to|org-set-tags|org-set-transient-map|org-set-visibility-according-to-property|org-setup-comments-handling|org-setup-filling|org-shiftcontroldown|org-shiftcontrolleft|org-shiftcontrolright|org-shiftcontrolup|org-shiftdown|org-shiftleft|org-shiftmetadown|org-shiftmetaleft|org-shiftmetaright|org-shiftmetaup|org-shiftright|org-shiftselect-error|org-shifttab|org-shiftup|org-shorten-string|org-show-block-all|org-show-context|org-show-empty-lines-in-parent|org-show-entry|org-show-hidden-entry|org-show-priority|org-show-siblings|org-show-subtree|org-show-todo-tree|org-skip-over-state-notes|org-skip-whitespace|org-small-year-to-year|org-some|org-sort-entries|org-sort-list|org-sort-remove-invisible|org-sort|org-sparse-tree|org-speed-command-activate|org-speed-command-default-hook|org-speed-command-help|org-speed-move-safe|org-speedbar-set-agenda-restriction|org-splice-latex-header|org-split-string|org-src-associate-babel-session|org-src-babel-configure-edit-buffer|org-src-construct-edit-buffer-name|org-src-do-at-code-block|org-src-do-key-sequence-at-code-block|org-src-edit-buffer-p|org-src-font-lock-fontify-block|org-src-fontify-block|org-src-fontify-buffer|org-src-get-lang-mode|org-src-in-org-buffer|org-src-mode-configure-edit-buffer|org-src-mode|org-src-native-tab-command-maybe|org-src-switch-to-buffer|org-src-tangle|org-store-agenda-views|org-store-link-props|org-store-link|org-store-log-note|org-store-new-agenda-file-list|org-string-match-p|org-string-nw-p|org-string-width|org-string<=|org-string<>|org-string>|org-string>=|org-sublist|org-submit-bug-report|org-substitute-posix-classes|org-subtree-end-visible-p|org-switch-to-buffer-other-window|org-switchb|org-table-align|org-table-begin|org-table-blank-field|org-table-convert-region|org-table-convert|org-table-copy-down|org-table-copy-region|org-table-create-or-convert-from-region|org-table-create-with-table\\.el|org-table-create|org-table-current-dline|org-table-cut-region|org-table-delete-column|org-table-edit-field|org-table-edit-formulas|org-table-end|org-table-eval-formula|org-table-export|org-table-field-info|org-table-get-stored-formulas|org-table-goto-column|org-table-hline-and-move|org-table-import|org-table-insert-column|org-table-insert-hline|org-table-insert-row|org-table-iterate-buffer-tables|org-table-iterate|org-table-justify-field-maybe|org-table-kill-row|org-table-map-tables|org-table-maybe-eval-formula|org-table-maybe-recalculate-line|org-table-move-column-left|org-table-move-column-right|org-table-move-column|org-table-move-row-down|org-table-move-row-up|org-table-move-row|org-table-next-field|org-table-next-row|org-table-p|org-table-paste-rectangle|org-table-previous-field|org-table-recalculate-buffer-tables|org-table-recalculate|org-table-recognize-table\\.el|org-table-rotate-recalc-marks|org-table-set-constants|org-table-sort-lines|org-table-sum|org-table-to-lisp|org-table-toggle-coordinate-overlays|org-table-toggle-formula-debugger|org-table-wrap-region|org-tag-inherit-p|org-tags-completion-function|org-tags-expand|org-tags-sparse-tree|org-tags-view|org-tbl-menu|org-texinfo-convert-region-to-texinfo|org-texinfo-publish-to-texinfo|org-thing-at-point|org-time-from-absolute|org-time-stamp-format|org-time-stamp-inactive|org-time-stamp-to-now|org-time-stamp|org-time-string-to-absolute|org-time-string-to-seconds|org-time-string-to-time|org-time-today|org-time<|org-time<=|org-time<>|org-time=|org-time>|org-time>=|org-timer-change-times-in-region|org-timer-item|org-timer-set-timer|org-timer-start|org-timer|org-timestamp-change|org-timestamp-down-day|org-timestamp-down|org-timestamp-format|org-timestamp-has-time-p|org-timestamp-split-range|org-timestamp-translate|org-timestamp-up-day|org-timestamp-up|org-today|org-todo-list|org-todo-trigger-tag-changes|org-todo-yesterday|org-todo|org-toggle-archive-tag|org-toggle-checkbox|org-toggle-comment|org-toggle-custom-properties-visibility|org-toggle-fixed-width-section|org-toggle-heading|org-toggle-inline-images|org-toggle-item|org-toggle-link-display|org-toggle-ordered-property|org-toggle-pretty-entities|org-toggle-sticky-agenda|org-toggle-tag|org-toggle-tags-groups|org-toggle-time-stamp-overlays|org-toggle-timestamp-type|org-tr-level|org-translate-link-from-planner|org-translate-link|org-translate-time|org-transpose-element|org-transpose-words|org-tree-to-indirect-buffer|org-trim|org-truely-invisible-p|org-try-cdlatex-tab|org-try-structure-completion|org-unescape-code-in-region|org-unescape-code-in-string|org-unfontify-region|org-unindent-buffer|org-uniquify-alist|org-uniquify|org-unlogged-message|org-unmodified|org-up-element|org-up-heading-all|org-up-heading-safe|org-update-all-dblocks|org-update-checkbox-count-maybe|org-update-checkbox-count|org-update-dblock|org-update-parent-todo-statistics|org-update-property-plist|org-update-radio-target-regexp|org-update-statistics-cookies|org-uuidgen-p|org-version-check|org-version|org-with-gensyms|org-with-limited-levels|org-with-point-at|org-with-remote-undo|org-with-silent-modifications|org-with-wide-buffer|org-without-partial-completion|org-wrap|org-xemacs-without-invisibility|org-xor|org-yank-folding-would-swallow-text|org-yank-generic|org-yank|org<>|orgstruct\\+\\+-mode|orgstruct-error|orgstruct-make-binding|orgstruct-mode|orgstruct-setup|orgtbl-mode|orgtbl-to-csv|orgtbl-to-generic|orgtbl-to-html|orgtbl-to-latex|orgtbl-to-orgtbl|orgtbl-to-texinfo|orgtbl-to-tsv|oset-default|oset|other-frame|other-window-for-scrolling|outline-back-to-heading|outline-backward-same-level|outline-demote|outline-end-of-heading|outline-end-of-subtree|outline-flag-region|outline-flag-subtree|outline-font-lock-face|outline-forward-same-level|outline-get-last-sibling|outline-get-next-sibling|outline-head-from-level|outline-headers-as-kill|outline-insert-heading|outline-invent-heading|outline-invisible-p|outline-isearch-open-invisible|outline-level|outline-map-region|outline-mark-subtree|outline-minor-mode|outline-mode|outline-move-subtree-down|outline-move-subtree-up|outline-next-heading|outline-next-preface|outline-next-visible-heading|outline-on-heading-p|outline-previous-heading|outline-previous-visible-heading|outline-promote|outline-reveal-toggle-invisible|outline-show-heading|outline-toggle-children|outline-up-heading|outlineify-sticky|outlinify-sticky|overlay-lists|overload-docstring-extension|overload-obsoleted-by|overload-that-obsolete|package--ac-desc-extras--cmacro|package--ac-desc-extras|package--ac-desc-kind--cmacro|package--ac-desc-kind|package--ac-desc-reqs--cmacro|package--ac-desc-reqs|package--ac-desc-summary--cmacro|package--ac-desc-summary|package--ac-desc-version--cmacro|package--ac-desc-version|package--add-to-archive-contents|package--alist-to-plist-args|package--archive-file-exists-p|package--bi-desc-reqs--cmacro|package--bi-desc-reqs|package--bi-desc-summary--cmacro|package--bi-desc-summary|package--bi-desc-version--cmacro|package--bi-desc-version|package--check-signature|package--compile|package--description-file|package--display-verify-error|package--download-one-archive|package--from-builtin|package--has-keyword-p|package--list-loaded-files|package--make-autoloads-and-stuff|package--mapc|package--prepare-dependencies|package--push|package--read-archive-file|package--with-work-buffer|package--write-file-no-coding|package-activate-1|package-activate|package-all-keywords|package-archive-base|package-autoload-ensure-default-file|package-buffer-info|package-built-in-p|package-compute-transaction|package-delete|package-desc--keywords|package-desc-archive--cmacro|package-desc-archive|package-desc-create--cmacro|package-desc-create|package-desc-dir--cmacro|package-desc-dir|package-desc-extras--cmacro|package-desc-extras|package-desc-from-define|package-desc-full-name|package-desc-kind--cmacro|package-desc-kind|package-desc-name--cmacro|package-desc-name|package-desc-p--cmacro|package-desc-p|package-desc-reqs--cmacro|package-desc-reqs|package-desc-signed--cmacro|package-desc-signed|package-desc-status|package-desc-suffix|package-desc-summary--cmacro|package-desc-summary|package-desc-version--cmacro|package-desc-version|package-disabled-p|package-download-transaction|package-generate-autoloads|package-generate-description-file|package-import-keyring|package-install-button-action|package-install-file|package-install-from-archive)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:package-install-from-buffer|package-install|package-installed-p|package-keyword-button-action|package-list-packages-no-fetch|package-list-packages|package-load-all-descriptors|package-load-descriptor|package-make-ac-desc--cmacro|package-make-ac-desc|package-make-builtin--cmacro|package-make-builtin|package-make-button|package-menu--archive-predicate|package-menu--description-predicate|package-menu--find-upgrades|package-menu--generate|package-menu--name-predicate|package-menu--print-info|package-menu--refresh|package-menu--status-predicate|package-menu--version-predicate|package-menu-backup-unmark|package-menu-describe-package|package-menu-execute|package-menu-filter|package-menu-get-status|package-menu-mark-delete|package-menu-mark-install|package-menu-mark-obsolete-for-deletion|package-menu-mark-unmark|package-menu-mark-upgrades|package-menu-mode|package-menu-quick-help|package-menu-refresh|package-menu-view-commentary|package-process-define-package|package-read-all-archive-contents|package-read-archive-contents|package-read-from-string|package-refresh-contents|package-show-package-list|package-strip-rcs-id|package-tar-file-info|package-unpack|package-untar-buffer|package-version-join|pages-copy-header-and-position|pages-directory-address-mode|pages-directory-for-addresses|pages-directory-goto-with-mouse|pages-directory-goto|pages-directory-mode|pages-directory|pairlis|paragraph-indent-minor-mode|paragraph-indent-text-mode|parse-iso8601-time-string|parse-time-string-chars|parse-time-string|parse-time-tokenize|pascal-beg-of-defun|pascal-build-defun-re|pascal-calculate-indent|pascal-capitalize-keywords|pascal-change-keywords|pascal-comment-area|pascal-comp-defun|pascal-complete-word|pascal-completion|pascal-completions-at-point|pascal-declaration-beg|pascal-declaration-end|pascal-downcase-keywords|pascal-end-of-defun|pascal-end-of-statement|pascal-func-completion|pascal-get-completion-decl|pascal-get-default-symbol|pascal-get-lineup-indent|pascal-goto-defun|pascal-hide-other-defuns|pascal-indent-case|pascal-indent-command|pascal-indent-comment|pascal-indent-declaration|pascal-indent-level|pascal-indent-line|pascal-indent-paramlist|pascal-insert-block|pascal-keyword-completion|pascal-mark-defun|pascal-mode|pascal-outline-change|pascal-outline-goto-defun|pascal-outline-mode|pascal-outline-next-defun|pascal-outline-prev-defun|pascal-outline|pascal-set-auto-comments|pascal-show-all|pascal-show-completions|pascal-star-comment|pascal-string-diff|pascal-type-completion|pascal-uncomment-area|pascal-upcase-keywords|pascal-var-completion|pascal-within-string|password-cache-add|password-cache-remove|password-in-cache-p|password-read-and-add|password-read-from-cache|password-read|password-reset|pcase--and|pcase--app-subst-match|pcase--app-subst-rest|pcase--eval|pcase--expand|pcase--fgrep|pcase--flip|pcase--funcall|pcase--if|pcase--let\\*|pcase--macroexpand|pcase--mark-used|pcase--match|pcase--mutually-exclusive-p|pcase--self-quoting-p|pcase--small-branch-p|pcase--split-equal|pcase--split-match|pcase--split-member|pcase--split-pred|pcase--split-rest|pcase--trivial-upat-p|pcase--u|pcase--u1|pcase-codegen|pcase-defmacro|pcase-dolist|pcase-exhaustive|pcase-let\\*|pcase-let|pcomplete\\/ack-grep|pcomplete\\/ack|pcomplete\\/ag|pcomplete\\/bzip2|pcomplete\\/cd|pcomplete\\/chgrp|pcomplete\\/chown|pcomplete\\/cvs|pcomplete\\/erc-mode\\/CLEARTOPIC|pcomplete\\/erc-mode\\/CTCP|pcomplete\\/erc-mode\\/DCC|pcomplete\\/erc-mode\\/DEOP|pcomplete\\/erc-mode\\/DESCRIBE|pcomplete\\/erc-mode\\/IDLE|pcomplete\\/erc-mode\\/KICK|pcomplete\\/erc-mode\\/LEAVE|pcomplete\\/erc-mode\\/LOAD|pcomplete\\/erc-mode\\/ME|pcomplete\\/erc-mode\\/MODE|pcomplete\\/erc-mode\\/MSG|pcomplete\\/erc-mode\\/NAMES|pcomplete\\/erc-mode\\/NOTICE|pcomplete\\/erc-mode\\/NOTIFY|pcomplete\\/erc-mode\\/OP|pcomplete\\/erc-mode\\/PART|pcomplete\\/erc-mode\\/QUERY|pcomplete\\/erc-mode\\/SAY|pcomplete\\/erc-mode\\/SOUND|pcomplete\\/erc-mode\\/TOPIC|pcomplete\\/erc-mode\\/UNIGNORE|pcomplete\\/erc-mode\\/WHOIS|pcomplete\\/erc-mode\\/complete-command|pcomplete\\/eshell-mode\\/eshell-debug|pcomplete\\/eshell-mode\\/export|pcomplete\\/eshell-mode\\/setq|pcomplete\\/eshell-mode\\/unset|pcomplete\\/gdb|pcomplete\\/gzip|pcomplete\\/kill|pcomplete\\/make|pcomplete\\/mount|pcomplete\\/org-mode\\/block-option\\/clocktable|pcomplete\\/org-mode\\/block-option\\/src|pcomplete\\/org-mode\\/drawer|pcomplete\\/org-mode\\/file-option\\/author|pcomplete\\/org-mode\\/file-option\\/bind|pcomplete\\/org-mode\\/file-option\\/date|pcomplete\\/org-mode\\/file-option\\/email|pcomplete\\/org-mode\\/file-option\\/exclude_tags|pcomplete\\/org-mode\\/file-option\\/filetags|pcomplete\\/org-mode\\/file-option\\/infojs_opt|pcomplete\\/org-mode\\/file-option\\/language|pcomplete\\/org-mode\\/file-option\\/options|pcomplete\\/org-mode\\/file-option\\/priorities|pcomplete\\/org-mode\\/file-option\\/select_tags|pcomplete\\/org-mode\\/file-option\\/startup|pcomplete\\/org-mode\\/file-option\\/tags|pcomplete\\/org-mode\\/file-option\\/title|pcomplete\\/org-mode\\/file-option|pcomplete\\/org-mode\\/link|pcomplete\\/org-mode\\/prop|pcomplete\\/org-mode\\/searchhead|pcomplete\\/org-mode\\/tag|pcomplete\\/org-mode\\/tex|pcomplete\\/org-mode\\/todo|pcomplete\\/pushd|pcomplete\\/rm|pcomplete\\/rmdir|pcomplete\\/rpm|pcomplete\\/scp|pcomplete\\/ssh|pcomplete\\/tar|pcomplete\\/time|pcomplete\\/tlmgr|pcomplete\\/umount|pcomplete\\/which|pcomplete\\/xargs|pcomplete--common-suffix|pcomplete--entries|pcomplete--help|pcomplete--here|pcomplete--test|pcomplete-actual-arg|pcomplete-all-entries|pcomplete-arg|pcomplete-begin|pcomplete-comint-setup|pcomplete-command-name|pcomplete-completions-at-point|pcomplete-completions|pcomplete-continue|pcomplete-dirs-or-entries|pcomplete-dirs|pcomplete-do-complete|pcomplete-entries|pcomplete-erc-all-nicks|pcomplete-erc-channels|pcomplete-erc-command-name|pcomplete-erc-commands|pcomplete-erc-nicks|pcomplete-erc-not-ops|pcomplete-erc-ops|pcomplete-erc-parse-arguments|pcomplete-erc-setup|pcomplete-event-matches-key-specifier-p|pcomplete-executables|pcomplete-expand-and-complete|pcomplete-expand|pcomplete-find-completion-function|pcomplete-help|pcomplete-here\\*|pcomplete-here|pcomplete-insert-entry|pcomplete-list|pcomplete-match-beginning|pcomplete-match-end|pcomplete-match-string|pcomplete-match|pcomplete-next-arg|pcomplete-opt|pcomplete-parse-arguments|pcomplete-parse-buffer-arguments|pcomplete-parse-comint-arguments|pcomplete-process-result|pcomplete-quote-argument|pcomplete-read-event|pcomplete-restore-windows|pcomplete-reverse|pcomplete-shell-setup|pcomplete-show-completions|pcomplete-std-complete|pcomplete-stub|pcomplete-test|pcomplete-uniqify-list|pcomplete-unquote-argument|pcomplete|pdb|pending-delete-mode|perl-backward-to-noncomment|perl-backward-to-start-of-continued-exp|perl-beginning-of-function|perl-calculate-indent|perl-comment-indent|perl-continuation-line-p|perl-current-defun-name|perl-electric-noindent-p|perl-electric-terminator|perl-end-of-function|perl-font-lock-syntactic-face-function|perl-hanging-paren-p|perl-indent-command|perl-indent-exp|perl-indent-line|perl-indent-new-calculate|perl-mark-function|perl-mode|perl-outline-level|perl-quote-syntax-table|perl-syntax-propertize-function|perl-syntax-propertize-special-constructs|perldb|picture-backward-clear-column|picture-backward-column|picture-beginning-of-line|picture-clear-column|picture-clear-line|picture-clear-rectangle-to-register|picture-clear-rectangle|picture-current-line|picture-delete-char|picture-draw-rectangle|picture-duplicate-line|picture-end-of-line|picture-forward-column|picture-insert-rectangle|picture-insert|picture-mode-exit|picture-mode|picture-motion-reverse|picture-motion|picture-mouse-set-point|picture-move-down|picture-move-up|picture-move|picture-movement-down|picture-movement-left|picture-movement-ne|picture-movement-nw|picture-movement-right|picture-movement-se|picture-movement-sw|picture-movement-up|picture-newline|picture-open-line|picture-replace-match|picture-self-insert|picture-set-motion|picture-set-tab-stops|picture-snarf-rectangle|picture-tab-search|picture-tab|picture-update-desired-column|picture-yank-at-click|picture-yank-rectangle-from-register|picture-yank-rectangle|pike-font-lock-keywords-2|pike-font-lock-keywords-3|pike-font-lock-keywords|pike-mode|ping|plain-TeX-mode|plain-tex-mode|play-sound-internal|plstore-delete|plstore-find|plstore-get-file|plstore-mode|plstore-open|plstore-put|plstore-save|plusp|po-find-charset|po-find-file-coding-system-guts|po-find-file-coding-system|point-at-bol|point-at-eol|point-to-register|pong-display-options|pong-init-buffer|pong-init|pong-move-down|pong-move-left|pong-move-right|pong-move-up|pong-pause|pong-quit|pong-resume|pong-update-bat|pong-update-game|pong-update-score|pong|pop-global-mark|pop-tag-mark|pop-to-buffer-same-window|pop-to-mark-command|pop3-movemail|popup-menu-normalize-position|popup-menu|position-if-not|position-if|position|posn-set-point|post-read-decode-hz|pp-buffer|pp-display-expression|pp-eval-expression|pp-eval-last-sexp|pp-last-sexp|pp-macroexpand-expression|pp-macroexpand-last-sexp|pp-to-string|pr-alist-custom-set|pr-article-date|pr-auto-mode-p|pr-call-process|pr-choice-alist|pr-command|pr-complete-alist|pr-create-interface|pr-customize|pr-delete-file-if-exists|pr-delete-file|pr-despool-preview|pr-despool-print|pr-despool-ps-print|pr-despool-using-ghostscript|pr-do-update-menus|pr-dosify-file-name|pr-eval-alist|pr-eval-local-alist|pr-eval-setting-alist|pr-even-or-odd-pages|pr-expand-file-name|pr-file-list|pr-find-buffer-visiting|pr-find-command|pr-get-symbol|pr-global-menubar|pr-gnus-lpr|pr-gnus-print|pr-help|pr-i-directory|pr-i-ps-send|pr-insert-button|pr-insert-checkbox|pr-insert-italic|pr-insert-menu|pr-insert-radio-button|pr-insert-section-1|pr-insert-section-2|pr-insert-section-3|pr-insert-section-4|pr-insert-section-5|pr-insert-section-6|pr-insert-section-7|pr-insert-toggle|pr-interactive-dir-args|pr-interactive-dir|pr-interactive-n-up-file|pr-interactive-n-up-inout|pr-interactive-n-up|pr-interactive-ps-dir-args|pr-interactive-regexp|pr-interface-directory|pr-interface-help|pr-interface-infile|pr-interface-outfile|pr-interface-preview|pr-interface-printify|pr-interface-ps-print|pr-interface-ps|pr-interface-quit|pr-interface-save|pr-interface-txt-print|pr-interface|pr-keep-region-active|pr-kill-help|pr-kill-local-variable|pr-local-variable|pr-lpr-message-from-summary|pr-menu-alist|pr-menu-bind|pr-menu-char-height|pr-menu-char-width|pr-menu-create|pr-menu-get-item|pr-menu-index|pr-menu-lock|pr-menu-lookup|pr-menu-position|pr-menu-set-item-name|pr-menu-set-ps-title|pr-menu-set-txt-title|pr-menu-set-utility-title|pr-mh-current-message|pr-mh-lpr-1|pr-mh-lpr-2|pr-mh-print-1|pr-mh-print-2|pr-mode-alist-p|pr-mode-lpr|pr-mode-print|pr-path-command|pr-printify-buffer|pr-printify-directory|pr-printify-region|pr-prompt-gs|pr-prompt-region|pr-prompt|pr-ps-buffer-preview|pr-ps-buffer-print|pr-ps-buffer-ps-print|pr-ps-buffer-using-ghostscript|pr-ps-directory-preview|pr-ps-directory-print|pr-ps-directory-ps-print|pr-ps-directory-using-ghostscript|pr-ps-fast-fire|pr-ps-file-list|pr-ps-file-preview|pr-ps-file-print|pr-ps-file-ps-print|pr-ps-file-up-preview|pr-ps-file-up-ps-print|pr-ps-file-using-ghostscript|pr-ps-file|pr-ps-infile-preprint|pr-ps-message-from-summary|pr-ps-mode-preview|pr-ps-mode-print|pr-ps-mode-ps-print|pr-ps-mode-using-ghostscript|pr-ps-mode|pr-ps-name-custom-set|pr-ps-name|pr-ps-outfile-preprint|pr-ps-preview|pr-ps-print|pr-ps-region-preview|pr-ps-region-print|pr-ps-region-ps-print|pr-ps-region-using-ghostscript|pr-ps-set-printer|pr-ps-set-utility|pr-ps-using-ghostscript|pr-ps-utility-args|pr-ps-utility-custom-set|pr-ps-utility-process|pr-ps-utility|pr-read-string|pr-region-active-p|pr-region-active-string|pr-region-active-symbol|pr-remove-nil-from-list|pr-rmail-lpr|pr-rmail-print|pr-save-file-modes|pr-set-dir-args|pr-set-keymap-name|pr-set-keymap-parents|pr-set-n-up-and-filename|pr-set-outfilename|pr-set-ps-dir-args|pr-setup|pr-show-lpr-setup|pr-show-pr-setup|pr-show-ps-setup|pr-show-setup|pr-standard-file-name|pr-switches-string|pr-switches|pr-text2ps|pr-toggle-duplex-menu|pr-toggle-duplex|pr-toggle-faces-menu|pr-toggle-faces|pr-toggle-file-duplex-menu|pr-toggle-file-duplex)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)p(?:ackage-install-from-buffer|ackage-install|ackage-installed-p|ackage-keyword-button-action|ackage-list-packages-no-fetch|ackage-list-packages|ackage-load-all-descriptors|ackage-load-descriptor|ackage-make-ac-desc--cmacro|ackage-make-ac-desc|ackage-make-builtin--cmacro|ackage-make-builtin|ackage-make-button|ackage-menu--archive-predicate|ackage-menu--description-predicate|ackage-menu--find-upgrades|ackage-menu--generate|ackage-menu--name-predicate|ackage-menu--print-info|ackage-menu--refresh|ackage-menu--status-predicate|ackage-menu--version-predicate|ackage-menu-backup-unmark|ackage-menu-describe-package|ackage-menu-execute|ackage-menu-filter|ackage-menu-get-status|ackage-menu-mark-delete|ackage-menu-mark-install|ackage-menu-mark-obsolete-for-deletion|ackage-menu-mark-unmark|ackage-menu-mark-upgrades|ackage-menu-mode|ackage-menu-quick-help|ackage-menu-refresh|ackage-menu-view-commentary|ackage-process-define-package|ackage-read-all-archive-contents|ackage-read-archive-contents|ackage-read-from-string|ackage-refresh-contents|ackage-show-package-list|ackage-strip-rcs-id|ackage-tar-file-info|ackage-unpack|ackage-untar-buffer|ackage-version-join|ages-copy-header-and-position|ages-directory-address-mode|ages-directory-for-addresses|ages-directory-goto-with-mouse|ages-directory-goto|ages-directory-mode|ages-directory|airlis|aragraph-indent-minor-mode|aragraph-indent-text-mode|arse-iso8601-time-string|arse-time-string-chars|arse-time-string|arse-time-tokenize|ascal-beg-of-defun|ascal-build-defun-re|ascal-calculate-indent|ascal-capitalize-keywords|ascal-change-keywords|ascal-comment-area|ascal-comp-defun|ascal-complete-word|ascal-completion|ascal-completions-at-point|ascal-declaration-beg|ascal-declaration-end|ascal-downcase-keywords|ascal-end-of-defun|ascal-end-of-statement|ascal-func-completion|ascal-get-completion-decl|ascal-get-default-symbol|ascal-get-lineup-indent|ascal-goto-defun|ascal-hide-other-defuns|ascal-indent-case|ascal-indent-command|ascal-indent-comment|ascal-indent-declaration|ascal-indent-level|ascal-indent-line|ascal-indent-paramlist|ascal-insert-block|ascal-keyword-completion|ascal-mark-defun|ascal-mode|ascal-outline-change|ascal-outline-goto-defun|ascal-outline-mode|ascal-outline-next-defun|ascal-outline-prev-defun|ascal-outline|ascal-set-auto-comments|ascal-show-all|ascal-show-completions|ascal-star-comment|ascal-string-diff|ascal-type-completion|ascal-uncomment-area|ascal-upcase-keywords|ascal-var-completion|ascal-within-string|assword-cache-add|assword-cache-remove|assword-in-cache-p|assword-read-and-add|assword-read-from-cache|assword-read|assword-reset|case--and|case--app-subst-match|case--app-subst-rest|case--eval|case--expand|case--fgrep|case--flip|case--funcall|case--if|case--let\\*|case--macroexpand|case--mark-used|case--match|case--mutually-exclusive-p|case--self-quoting-p|case--small-branch-p|case--split-equal|case--split-match|case--split-member|case--split-pred|case--split-rest|case--trivial-upat-p|case--u|case--u1|case-codegen|case-defmacro|case-dolist|case-exhaustive|case-let\\*|case-let|complete/ack-grep|complete/ack|complete/ag|complete/bzip2|complete/cd|complete/chgrp|complete/chown|complete/cvs|complete/erc-mode/CLEARTOPIC|complete/erc-mode/CTCP|complete/erc-mode/DCC|complete/erc-mode/DEOP|complete/erc-mode/DESCRIBE|complete/erc-mode/IDLE|complete/erc-mode/KICK|complete/erc-mode/LEAVE|complete/erc-mode/LOAD|complete/erc-mode/ME|complete/erc-mode/MODE|complete/erc-mode/MSG|complete/erc-mode/NAMES|complete/erc-mode/NOTICE|complete/erc-mode/NOTIFY|complete/erc-mode/OP|complete/erc-mode/PART|complete/erc-mode/QUERY|complete/erc-mode/SAY|complete/erc-mode/SOUND|complete/erc-mode/TOPIC|complete/erc-mode/UNIGNORE|complete/erc-mode/WHOIS|complete/erc-mode/complete-command|complete/eshell-mode/eshell-debug|complete/eshell-mode/export|complete/eshell-mode/setq|complete/eshell-mode/unset|complete/gdb|complete/gzip|complete/kill|complete/make|complete/mount|complete/org-mode/block-option/clocktable|complete/org-mode/block-option/src|complete/org-mode/drawer|complete/org-mode/file-option/author|complete/org-mode/file-option/bind|complete/org-mode/file-option/date|complete/org-mode/file-option/email|complete/org-mode/file-option/exclude_tags|complete/org-mode/file-option/filetags|complete/org-mode/file-option/infojs_opt|complete/org-mode/file-option/language|complete/org-mode/file-option/options|complete/org-mode/file-option/priorities|complete/org-mode/file-option/select_tags|complete/org-mode/file-option/startup|complete/org-mode/file-option/tags|complete/org-mode/file-option/title|complete/org-mode/file-option|complete/org-mode/link|complete/org-mode/prop|complete/org-mode/searchhead|complete/org-mode/tag|complete/org-mode/tex|complete/org-mode/todo|complete/pushd|complete/rm|complete/rmdir|complete/rpm|complete/scp|complete/ssh|complete/tar|complete/time|complete/tlmgr|complete/umount|complete/which|complete/xargs|complete--common-suffix|complete--entries|complete--help|complete--here|complete--test|complete-actual-arg|complete-all-entries|complete-arg|complete-begin|complete-comint-setup|complete-command-name|complete-completions-at-point|complete-completions|complete-continue|complete-dirs-or-entries|complete-dirs|complete-do-complete|complete-entries|complete-erc-all-nicks|complete-erc-channels|complete-erc-command-name|complete-erc-commands|complete-erc-nicks|complete-erc-not-ops|complete-erc-ops|complete-erc-parse-arguments|complete-erc-setup|complete-event-matches-key-specifier-p|complete-executables|complete-expand-and-complete|complete-expand|complete-find-completion-function|complete-help|complete-here\\*|complete-here|complete-insert-entry|complete-list|complete-match-beginning|complete-match-end|complete-match-string|complete-match|complete-next-arg|complete-opt|complete-parse-arguments|complete-parse-buffer-arguments|complete-parse-comint-arguments|complete-process-result|complete-quote-argument|complete-read-event|complete-restore-windows|complete-reverse|complete-shell-setup|complete-show-completions|complete-std-complete|complete-stub|complete-test|complete-uniqify-list|complete-unquote-argument|complete|db|ending-delete-mode|erl-backward-to-noncomment|erl-backward-to-start-of-continued-exp|erl-beginning-of-function|erl-calculate-indent|erl-comment-indent|erl-continuation-line-p|erl-current-defun-name|erl-electric-noindent-p|erl-electric-terminator|erl-end-of-function|erl-font-lock-syntactic-face-function|erl-hanging-paren-p|erl-indent-command|erl-indent-exp|erl-indent-line|erl-indent-new-calculate|erl-mark-function|erl-mode|erl-outline-level|erl-quote-syntax-table|erl-syntax-propertize-function|erl-syntax-propertize-special-constructs|erldb|icture-backward-clear-column|icture-backward-column|icture-beginning-of-line|icture-clear-column|icture-clear-line|icture-clear-rectangle-to-register|icture-clear-rectangle|icture-current-line|icture-delete-char|icture-draw-rectangle|icture-duplicate-line|icture-end-of-line|icture-forward-column|icture-insert-rectangle|icture-insert|icture-mode-exit|icture-mode|icture-motion-reverse|icture-motion|icture-mouse-set-point|icture-move-down|icture-move-up|icture-move|icture-movement-down|icture-movement-left|icture-movement-ne|icture-movement-nw|icture-movement-right|icture-movement-se|icture-movement-sw|icture-movement-up|icture-newline|icture-open-line|icture-replace-match|icture-self-insert|icture-set-motion|icture-set-tab-stops|icture-snarf-rectangle|icture-tab-search|icture-tab|icture-update-desired-column|icture-yank-at-click|icture-yank-rectangle-from-register|icture-yank-rectangle|ike-font-lock-keywords-2|ike-font-lock-keywords-3|ike-font-lock-keywords|ike-mode|ing|lain-TeX-mode|lain-tex-mode|lay-sound-internal|lstore-delete|lstore-find|lstore-get-file|lstore-mode|lstore-open|lstore-put|lstore-save|lusp|o-find-charset|o-find-file-coding-system-guts|o-find-file-coding-system|oint-at-bol|oint-at-eol|oint-to-register|ong-display-options|ong-init-buffer|ong-init|ong-move-down|ong-move-left|ong-move-right|ong-move-up|ong-pause|ong-quit|ong-resume|ong-update-bat|ong-update-game|ong-update-score|ong|op-global-mark|op-tag-mark|op-to-buffer-same-window|op-to-mark-command|op3-movemail|opup-menu-normalize-position|opup-menu|osition-if-not|osition-if|osition|osn-set-point|ost-read-decode-hz|p-buffer|p-display-expression|p-eval-expression|p-eval-last-sexp|p-last-sexp|p-macroexpand-expression|p-macroexpand-last-sexp|p-to-string|r-alist-custom-set|r-article-date|r-auto-mode-p|r-call-process|r-choice-alist|r-command|r-complete-alist|r-create-interface|r-customize|r-delete-file-if-exists|r-delete-file|r-despool-preview|r-despool-print|r-despool-ps-print|r-despool-using-ghostscript|r-do-update-menus|r-dosify-file-name|r-eval-alist|r-eval-local-alist|r-eval-setting-alist|r-even-or-odd-pages|r-expand-file-name|r-file-list|r-find-buffer-visiting|r-find-command|r-get-symbol|r-global-menubar|r-gnus-lpr|r-gnus-print|r-help|r-i-directory|r-i-ps-send|r-insert-button|r-insert-checkbox|r-insert-italic|r-insert-menu|r-insert-radio-button|r-insert-section-1|r-insert-section-2|r-insert-section-3|r-insert-section-4|r-insert-section-5|r-insert-section-6|r-insert-section-7|r-insert-toggle|r-interactive-dir-args|r-interactive-dir|r-interactive-n-up-file|r-interactive-n-up-inout|r-interactive-n-up|r-interactive-ps-dir-args|r-interactive-regexp|r-interface-directory|r-interface-help|r-interface-infile|r-interface-outfile|r-interface-preview|r-interface-printify|r-interface-ps-print|r-interface-ps|r-interface-quit|r-interface-save|r-interface-txt-print|r-interface|r-keep-region-active|r-kill-help|r-kill-local-variable|r-local-variable|r-lpr-message-from-summary|r-menu-alist|r-menu-bind|r-menu-char-height|r-menu-char-width|r-menu-create|r-menu-get-item|r-menu-index|r-menu-lock|r-menu-lookup|r-menu-position|r-menu-set-item-name|r-menu-set-ps-title|r-menu-set-txt-title|r-menu-set-utility-title|r-mh-current-message|r-mh-lpr-1|r-mh-lpr-2|r-mh-print-1|r-mh-print-2|r-mode-alist-p|r-mode-lpr|r-mode-print|r-path-command|r-printify-buffer|r-printify-directory|r-printify-region|r-prompt-gs|r-prompt-region|r-prompt|r-ps-buffer-preview|r-ps-buffer-print|r-ps-buffer-ps-print|r-ps-buffer-using-ghostscript|r-ps-directory-preview|r-ps-directory-print|r-ps-directory-ps-print|r-ps-directory-using-ghostscript|r-ps-fast-fire|r-ps-file-list|r-ps-file-preview|r-ps-file-print|r-ps-file-ps-print|r-ps-file-up-preview|r-ps-file-up-ps-print|r-ps-file-using-ghostscript|r-ps-file|r-ps-infile-preprint|r-ps-message-from-summary|r-ps-mode-preview|r-ps-mode-print|r-ps-mode-ps-print|r-ps-mode-using-ghostscript|r-ps-mode|r-ps-name-custom-set|r-ps-name|r-ps-outfile-preprint|r-ps-preview|r-ps-print|r-ps-region-preview|r-ps-region-print|r-ps-region-ps-print|r-ps-region-using-ghostscript|r-ps-set-printer|r-ps-set-utility|r-ps-using-ghostscript|r-ps-utility-args|r-ps-utility-custom-set|r-ps-utility-process|r-ps-utility|r-read-string|r-region-active-p|r-region-active-string|r-region-active-symbol|r-remove-nil-from-list|r-rmail-lpr|r-rmail-print|r-save-file-modes|r-set-dir-args|r-set-keymap-name|r-set-keymap-parents|r-set-n-up-and-filename|r-set-outfilename|r-set-ps-dir-args|r-setup|r-show-lpr-setup|r-show-pr-setup|r-show-ps-setup|r-show-setup|r-standard-file-name|r-switches-string|r-switches|r-text2ps|r-toggle-duplex-menu|r-toggle-duplex|r-toggle-faces-menu|r-toggle-faces|r-toggle-file-duplex-menu|r-toggle-file-duplex)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:pr-toggle-file-landscape-menu|pr-toggle-file-landscape|pr-toggle-file-tumble-menu|pr-toggle-file-tumble|pr-toggle-ghostscript-menu|pr-toggle-ghostscript|pr-toggle-header-frame-menu|pr-toggle-header-frame|pr-toggle-header-menu|pr-toggle-header|pr-toggle-landscape-menu|pr-toggle-landscape|pr-toggle-line-menu|pr-toggle-line|pr-toggle-lock-menu|pr-toggle-lock|pr-toggle-mode-menu|pr-toggle-mode|pr-toggle-region-menu|pr-toggle-region|pr-toggle-spool-menu|pr-toggle-spool|pr-toggle-tumble-menu|pr-toggle-tumble|pr-toggle-upside-down-menu|pr-toggle-upside-down|pr-toggle-zebra-menu|pr-toggle-zebra|pr-toggle|pr-txt-buffer|pr-txt-directory|pr-txt-fast-fire|pr-txt-mode|pr-txt-name-custom-set|pr-txt-name|pr-txt-print|pr-txt-region|pr-txt-set-printer|pr-unixify-file-name|pr-update-checkbox|pr-update-menus|pr-update-mode-line|pr-update-radio-button|pr-update-var|pr-using-ghostscript-p|pr-visible-p|pr-vm-lpr|pr-vm-print|pr-widget-field-action|pre-write-encode-hz|preceding-sexp|prefer-coding-system|prepare-abbrev-list-buffer|prepend-to-buffer|prepend-to-register|prettify-symbols--compose-symbol|prettify-symbols--make-keywords|prettify-symbols-mode-set-explicitly|prettify-symbols-mode|previous-buffer|previous-completion|previous-error-no-select|previous-error|previous-ifdef|previous-line-or-history-element|previous-line|previous-logical-line|previous-multiframe-window|previous-page|prin1-char|princ-list|print-buffer|print-help-return-message|print-region-1|print-region-new-buffer|print-region|printify-region|proced-<|proced-auto-update-timer|proced-children-alist|proced-children-pids|proced-do-mark-all|proced-do-mark|proced-filter-children|proced-filter-interactive|proced-filter-parents|proced-filter|proced-format-args|proced-format-interactive|proced-format-start|proced-format-time|proced-format-tree|proced-format-ttname|proced-format|proced-header-line|proced-help|proced-insert-mark|proced-log-summary|proced-log|proced-mark-all|proced-mark-children|proced-mark-parents|proced-mark-process-alist|proced-mark|proced-marked-processes|proced-marker-regexp|proced-menu|proced-mode|proced-move-to-goal-column|proced-omit-process|proced-omit-processes|proced-pid-at-point|proced-process-attributes|proced-process-tree-internal|proced-process-tree|proced-refine|proced-renice|proced-revert|proced-send-signal|proced-sort-header|proced-sort-interactive|proced-sort-p|proced-sort-pcpu|proced-sort-pid|proced-sort-pmem|proced-sort-start|proced-sort-time|proced-sort-user|proced-sort|proced-string-lessp|proced-success-message|proced-time-lessp|proced-toggle-auto-update|proced-toggle-marks|proced-toggle-tree|proced-tree-insert|proced-tree|proced-undo|proced-unmark-all|proced-unmark-backward|proced-unmark|proced-update|proced-why|proced-with-processes-buffer|proced-xor|proced|process-filter-multibyte-p|process-inherit-coding-system-flag|process-kill-without-query|process-menu-delete-process|process-menu-mode|process-menu-visit-buffer|proclaim|produce-allout-mode-menubar-entries|profiler-calltree-build-1|profiler-calltree-build-unified|profiler-calltree-build|profiler-calltree-children--cmacro|profiler-calltree-children|profiler-calltree-compute-percentages|profiler-calltree-count--cmacro|profiler-calltree-count-percent--cmacro|profiler-calltree-count-percent|profiler-calltree-count|profiler-calltree-count<|profiler-calltree-count>|profiler-calltree-depth|profiler-calltree-entry--cmacro|profiler-calltree-entry|profiler-calltree-find|profiler-calltree-leaf-p|profiler-calltree-p--cmacro|profiler-calltree-p|profiler-calltree-parent--cmacro|profiler-calltree-parent|profiler-calltree-sort|profiler-calltree-walk|profiler-compare-logs|profiler-compare-profiles|profiler-cpu-log|profiler-cpu-profile|profiler-cpu-running-p|profiler-cpu-start|profiler-cpu-stop|profiler-ensure-string|profiler-find-profile-other-frame|profiler-find-profile-other-window|profiler-find-profile|profiler-fixup-backtrace|profiler-fixup-entry|profiler-fixup-log|profiler-fixup-profile|profiler-format-entry|profiler-format-number|profiler-format-percent|profiler-format|profiler-make-calltree--cmacro|profiler-make-calltree|profiler-make-profile--cmacro|profiler-make-profile|profiler-memory-log|profiler-memory-profile|profiler-memory-running-p|profiler-memory-start|profiler-memory-stop|profiler-profile-diff-p--cmacro|profiler-profile-diff-p|profiler-profile-log--cmacro|profiler-profile-log|profiler-profile-tag--cmacro|profiler-profile-tag|profiler-profile-timestamp--cmacro|profiler-profile-timestamp|profiler-profile-type--cmacro|profiler-profile-type|profiler-profile-version--cmacro|profiler-profile-version|profiler-read-profile|profiler-report-ascending-sort|profiler-report-calltree-at-point|profiler-report-collapse-entry|profiler-report-compare-profile|profiler-report-cpu|profiler-report-descending-sort|profiler-report-describe-entry|profiler-report-expand-entry|profiler-report-find-entry|profiler-report-header-line-format|profiler-report-insert-calltree-children|profiler-report-insert-calltree|profiler-report-line-format|profiler-report-make-buffer-name|profiler-report-make-entry-part|profiler-report-make-name-part|profiler-report-memory|profiler-report-menu|profiler-report-mode|profiler-report-move-to-entry|profiler-report-next-entry|profiler-report-previous-entry|profiler-report-profile-other-frame|profiler-report-profile-other-window|profiler-report-profile|profiler-report-render-calltree-1|profiler-report-render-calltree|profiler-report-render-reversed-calltree|profiler-report-rerender-calltree|profiler-report-setup-buffer-1|profiler-report-setup-buffer|profiler-report-toggle-entry|profiler-report-write-profile|profiler-report|profiler-reset|profiler-running-p|profiler-start|profiler-stop|profiler-write-profile|prog-indent-sexp|progress-reporter-do-update|progv|project-add-file|project-compile-project|project-compile-target|project-debug-target|project-delete-target|project-dist-files|project-edit-file-target|project-interactive-select-target|project-make-dist|project-new-target-custom|project-new-target|project-remove-file|project-rescan|project-run-target|prolog-Info-follow-nearest-node|prolog-atleast-version|prolog-atom-under-point|prolog-beginning-of-clause|prolog-beginning-of-predicate|prolog-bsts|prolog-buffer-module|prolog-build-info-alist|prolog-build-prolog-command|prolog-clause-end|prolog-clause-info|prolog-clause-start|prolog-comment-limits|prolog-compile-buffer|prolog-compile-file|prolog-compile-predicate|prolog-compile-region|prolog-compile-string|prolog-consult-buffer|prolog-consult-compile-buffer|prolog-consult-compile-file|prolog-consult-compile-filter|prolog-consult-compile-predicate|prolog-consult-compile-region|prolog-consult-compile|prolog-consult-file|prolog-consult-predicate|prolog-consult-region|prolog-consult-string|prolog-debug-off|prolog-debug-on|prolog-disable-sicstus-sd|prolog-do-auto-fill|prolog-edit-menu-insert-move|prolog-edit-menu-runtime|prolog-electric--colon|prolog-electric--dash|prolog-electric--dot|prolog-electric--if-then-else|prolog-electric--underscore|prolog-enable-sicstus-sd|prolog-end-of-clause|prolog-end-of-predicate|prolog-ensure-process|prolog-face-name-p|prolog-fill-paragraph|prolog-find-documentation|prolog-find-term|prolog-find-unmatched-paren|prolog-find-value-by-system|prolog-font-lock-keywords|prolog-font-lock-object-matcher|prolog-get-predspec|prolog-goto-predicate-info|prolog-goto-prolog-process-buffer|prolog-guess-fill-prefix|prolog-help-apropos|prolog-help-info|prolog-help-on-predicate|prolog-help-online|prolog-in-object|prolog-indent-buffer|prolog-indent-predicate|prolog-inferior-buffer|prolog-inferior-guess-flavor|prolog-inferior-menu-all|prolog-inferior-menu|prolog-inferior-mode|prolog-inferior-self-insert-command|prolog-input-filter|prolog-insert-module-modeline|prolog-insert-next-clause|prolog-insert-predicate-template|prolog-insert-predspec|prolog-mark-clause|prolog-mark-predicate|prolog-menu-help|prolog-menu|prolog-mode-keybindings-common|prolog-mode-keybindings-edit|prolog-mode-keybindings-inferior|prolog-mode-variables|prolog-mode-version|prolog-mode|prolog-old-process-buffer|prolog-old-process-file|prolog-old-process-predicate|prolog-old-process-region|prolog-paren-balance|prolog-parse-sicstus-compilation-errors|prolog-post-self-insert|prolog-pred-end|prolog-pred-start|prolog-process-insert-string|prolog-program-name|prolog-program-switches|prolog-prompt-regexp|prolog-read-predicate|prolog-replace-in-string|prolog-smie-backward-token|prolog-smie-forward-token|prolog-smie-rules|prolog-temporary-file|prolog-toggle-sicstus-sd|prolog-trace-off|prolog-trace-on|prolog-uncomment-region|prolog-variables-to-anonymous|prolog-view-predspec|prolog-zip-off|prolog-zip-on|prompt-for-change-log-name|propertized-buffer-identification|prune-directory-list|ps-alist-position|ps-avg-char-width|ps-background-image|ps-background-pages|ps-background-text|ps-background|ps-basic-plot-str|ps-basic-plot-string|ps-basic-plot-whitespace|ps-begin-file|ps-begin-job|ps-begin-page|ps-boolean-capitalized|ps-boolean-constant|ps-build-reference-face-lists|ps-color-device|ps-color-scale|ps-color-values|ps-comment-string|ps-continue-line|ps-control-character|ps-count-lines-preprint|ps-count-lines|ps-del|ps-despool|ps-do-despool|ps-end-job|ps-end-page|ps-end-sheet|ps-extend-face-list|ps-extend-face|ps-extension-bit|ps-face-attribute-list|ps-face-attributes|ps-face-background-color-p|ps-face-background-name|ps-face-background|ps-face-bold-p|ps-face-box-p|ps-face-color-p|ps-face-extract-color|ps-face-foreground-color-p|ps-face-foreground-name|ps-face-italic-p|ps-face-overline-p|ps-face-strikeout-p|ps-face-underlined-p|ps-find-wrappoint|ps-float-format|ps-flush-output|ps-font-alist|ps-font-lock-face-attributes|ps-font-number|ps-font|ps-fonts|ps-format-color|ps-frame-parameter|ps-generate-header-line|ps-generate-header|ps-generate-postscript-with-faces|ps-generate-postscript-with-faces1|ps-generate-postscript|ps-generate|ps-get-boundingbox|ps-get-buffer-name|ps-get-font-size|ps-get-page-dimensions|ps-get-size|ps-get|ps-header-dirpart|ps-header-page|ps-header-sheet|ps-init-output-queue|ps-insert-file|ps-insert-string|ps-kill-emacs-check|ps-line-height|ps-line-lengths-internal|ps-line-lengths|ps-lookup|ps-map-face|ps-mark-active-p|ps-message-log-max|ps-mode--syntax-propertize-special|ps-mode-RE|ps-mode-backward-delete-char|ps-mode-center|ps-mode-comment-out-region|ps-mode-epsf-rich|ps-mode-epsf-sparse|ps-mode-heapsort|ps-mode-latin-extended|ps-mode-main|ps-mode-octal-buffer|ps-mode-octal-region|ps-mode-other-newline|ps-mode-print-buffer|ps-mode-print-region|ps-mode-right|ps-mode-show-version|ps-mode-smie-rules|ps-mode-submit-bug-report|ps-mode-syntax-propertize|ps-mode-target-column|ps-mode-uncomment-region|ps-mode|ps-mule-begin-job|ps-mule-end-job|ps-mule-initialize|ps-n-up-columns|ps-n-up-end|ps-n-up-filling|ps-n-up-landscape|ps-n-up-lines|ps-n-up-missing|ps-n-up-printing|ps-n-up-repeat|ps-n-up-xcolumn|ps-n-up-xline|ps-n-up-xstart|ps-n-up-ycolumn|ps-n-up-yline|ps-n-up-ystart|ps-nb-pages-buffer|ps-nb-pages-region|ps-nb-pages|ps-next-line|ps-next-page|ps-output-boolean|ps-output-frame-properties|ps-output-prologue|ps-output-string-prim|ps-output-string|ps-output|ps-page-dimensions-get-height|ps-page-dimensions-get-media|ps-page-dimensions-get-width|ps-page-number|ps-plot-region|ps-plot-string|ps-plot-with-face|ps-plot|ps-print-buffer-with-faces|ps-print-buffer|ps-print-customize|ps-print-ensure-fontified|ps-print-page-p|ps-print-preprint-region|ps-print-preprint|ps-print-quote|ps-print-region-with-faces|ps-print-region|ps-print-sheet-p|ps-print-with-faces|ps-print-without-faces|ps-printing-region|ps-prologue-file|ps-put|ps-remove-duplicates|ps-restore-selected-pages|ps-rgb-color|ps-run-boundingbox|ps-run-buffer|ps-run-cleanup|ps-run-clear|ps-run-goto-error|ps-run-kill|ps-run-make-tmp-filename|ps-run-mode|ps-run-mouse-goto-error|ps-run-quit|ps-run-region|ps-run-running|ps-run-send-string|ps-run-start|ps-screen-to-bit-face|ps-select-font|ps-selected-pages|ps-set-bg|ps-set-color|ps-set-face-attribute|ps-set-face-bold|ps-set-face-italic|ps-set-face-underline|ps-set-font|ps-setup|ps-size-scale|ps-skip-newline|ps-space-width|ps-spool-buffer-with-faces|ps-spool-buffer|ps-spool-region-with-faces|ps-spool-region|ps-spool-with-faces|ps-spool-without-faces|ps-time-stamp-hh:mm:ss|ps-time-stamp-iso8601)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)p(?:r-toggle-file-landscape-menu|r-toggle-file-landscape|r-toggle-file-tumble-menu|r-toggle-file-tumble|r-toggle-ghostscript-menu|r-toggle-ghostscript|r-toggle-header-frame-menu|r-toggle-header-frame|r-toggle-header-menu|r-toggle-header|r-toggle-landscape-menu|r-toggle-landscape|r-toggle-line-menu|r-toggle-line|r-toggle-lock-menu|r-toggle-lock|r-toggle-mode-menu|r-toggle-mode|r-toggle-region-menu|r-toggle-region|r-toggle-spool-menu|r-toggle-spool|r-toggle-tumble-menu|r-toggle-tumble|r-toggle-upside-down-menu|r-toggle-upside-down|r-toggle-zebra-menu|r-toggle-zebra|r-toggle|r-txt-buffer|r-txt-directory|r-txt-fast-fire|r-txt-mode|r-txt-name-custom-set|r-txt-name|r-txt-print|r-txt-region|r-txt-set-printer|r-unixify-file-name|r-update-checkbox|r-update-menus|r-update-mode-line|r-update-radio-button|r-update-var|r-using-ghostscript-p|r-visible-p|r-vm-lpr|r-vm-print|r-widget-field-action|re-write-encode-hz|receding-sexp|refer-coding-system|repare-abbrev-list-buffer|repend-to-buffer|repend-to-register|rettify-symbols--compose-symbol|rettify-symbols--make-keywords|rettify-symbols-mode-set-explicitly|rettify-symbols-mode|revious-buffer|revious-completion|revious-error-no-select|revious-error|revious-ifdef|revious-line-or-history-element|revious-line|revious-logical-line|revious-multiframe-window|revious-page|rin1-char|rinc-list|rint-buffer|rint-help-return-message|rint-region-1|rint-region-new-buffer|rint-region|rintify-region|roced-<|roced-auto-update-timer|roced-children-alist|roced-children-pids|roced-do-mark-all|roced-do-mark|roced-filter-children|roced-filter-interactive|roced-filter-parents|roced-filter|roced-format-args|roced-format-interactive|roced-format-start|roced-format-time|roced-format-tree|roced-format-ttname|roced-format|roced-header-line|roced-help|roced-insert-mark|roced-log-summary|roced-log|roced-mark-all|roced-mark-children|roced-mark-parents|roced-mark-process-alist|roced-mark|roced-marked-processes|roced-marker-regexp|roced-menu|roced-mode|roced-move-to-goal-column|roced-omit-process|roced-omit-processes|roced-pid-at-point|roced-process-attributes|roced-process-tree-internal|roced-process-tree|roced-refine|roced-renice|roced-revert|roced-send-signal|roced-sort-header|roced-sort-interactive|roced-sort-p|roced-sort-pcpu|roced-sort-pid|roced-sort-pmem|roced-sort-start|roced-sort-time|roced-sort-user|roced-sort|roced-string-lessp|roced-success-message|roced-time-lessp|roced-toggle-auto-update|roced-toggle-marks|roced-toggle-tree|roced-tree-insert|roced-tree|roced-undo|roced-unmark-all|roced-unmark-backward|roced-unmark|roced-update|roced-why|roced-with-processes-buffer|roced-xor|roced|rocess-filter-multibyte-p|rocess-inherit-coding-system-flag|rocess-kill-without-query|rocess-menu-delete-process|rocess-menu-mode|rocess-menu-visit-buffer|roclaim|roduce-allout-mode-menubar-entries|rofiler-calltree-build-1|rofiler-calltree-build-unified|rofiler-calltree-build|rofiler-calltree-children--cmacro|rofiler-calltree-children|rofiler-calltree-compute-percentages|rofiler-calltree-count--cmacro|rofiler-calltree-count-percent--cmacro|rofiler-calltree-count-percent|rofiler-calltree-count|rofiler-calltree-count<|rofiler-calltree-count>|rofiler-calltree-depth|rofiler-calltree-entry--cmacro|rofiler-calltree-entry|rofiler-calltree-find|rofiler-calltree-leaf-p|rofiler-calltree-p--cmacro|rofiler-calltree-p|rofiler-calltree-parent--cmacro|rofiler-calltree-parent|rofiler-calltree-sort|rofiler-calltree-walk|rofiler-compare-logs|rofiler-compare-profiles|rofiler-cpu-log|rofiler-cpu-profile|rofiler-cpu-running-p|rofiler-cpu-start|rofiler-cpu-stop|rofiler-ensure-string|rofiler-find-profile-other-frame|rofiler-find-profile-other-window|rofiler-find-profile|rofiler-fixup-backtrace|rofiler-fixup-entry|rofiler-fixup-log|rofiler-fixup-profile|rofiler-format-entry|rofiler-format-number|rofiler-format-percent|rofiler-format|rofiler-make-calltree--cmacro|rofiler-make-calltree|rofiler-make-profile--cmacro|rofiler-make-profile|rofiler-memory-log|rofiler-memory-profile|rofiler-memory-running-p|rofiler-memory-start|rofiler-memory-stop|rofiler-profile-diff-p--cmacro|rofiler-profile-diff-p|rofiler-profile-log--cmacro|rofiler-profile-log|rofiler-profile-tag--cmacro|rofiler-profile-tag|rofiler-profile-timestamp--cmacro|rofiler-profile-timestamp|rofiler-profile-type--cmacro|rofiler-profile-type|rofiler-profile-version--cmacro|rofiler-profile-version|rofiler-read-profile|rofiler-report-ascending-sort|rofiler-report-calltree-at-point|rofiler-report-collapse-entry|rofiler-report-compare-profile|rofiler-report-cpu|rofiler-report-descending-sort|rofiler-report-describe-entry|rofiler-report-expand-entry|rofiler-report-find-entry|rofiler-report-header-line-format|rofiler-report-insert-calltree-children|rofiler-report-insert-calltree|rofiler-report-line-format|rofiler-report-make-buffer-name|rofiler-report-make-entry-part|rofiler-report-make-name-part|rofiler-report-memory|rofiler-report-menu|rofiler-report-mode|rofiler-report-move-to-entry|rofiler-report-next-entry|rofiler-report-previous-entry|rofiler-report-profile-other-frame|rofiler-report-profile-other-window|rofiler-report-profile|rofiler-report-render-calltree-1|rofiler-report-render-calltree|rofiler-report-render-reversed-calltree|rofiler-report-rerender-calltree|rofiler-report-setup-buffer-1|rofiler-report-setup-buffer|rofiler-report-toggle-entry|rofiler-report-write-profile|rofiler-report|rofiler-reset|rofiler-running-p|rofiler-start|rofiler-stop|rofiler-write-profile|rog-indent-sexp|rogress-reporter-do-update|rogv|roject-add-file|roject-compile-project|roject-compile-target|roject-debug-target|roject-delete-target|roject-dist-files|roject-edit-file-target|roject-interactive-select-target|roject-make-dist|roject-new-target-custom|roject-new-target|roject-remove-file|roject-rescan|roject-run-target|rolog-Info-follow-nearest-node|rolog-atleast-version|rolog-atom-under-point|rolog-beginning-of-clause|rolog-beginning-of-predicate|rolog-bsts|rolog-buffer-module|rolog-build-info-alist|rolog-build-prolog-command|rolog-clause-end|rolog-clause-info|rolog-clause-start|rolog-comment-limits|rolog-compile-buffer|rolog-compile-file|rolog-compile-predicate|rolog-compile-region|rolog-compile-string|rolog-consult-buffer|rolog-consult-compile-buffer|rolog-consult-compile-file|rolog-consult-compile-filter|rolog-consult-compile-predicate|rolog-consult-compile-region|rolog-consult-compile|rolog-consult-file|rolog-consult-predicate|rolog-consult-region|rolog-consult-string|rolog-debug-off|rolog-debug-on|rolog-disable-sicstus-sd|rolog-do-auto-fill|rolog-edit-menu-insert-move|rolog-edit-menu-runtime|rolog-electric--colon|rolog-electric--dash|rolog-electric--dot|rolog-electric--if-then-else|rolog-electric--underscore|rolog-enable-sicstus-sd|rolog-end-of-clause|rolog-end-of-predicate|rolog-ensure-process|rolog-face-name-p|rolog-fill-paragraph|rolog-find-documentation|rolog-find-term|rolog-find-unmatched-paren|rolog-find-value-by-system|rolog-font-lock-keywords|rolog-font-lock-object-matcher|rolog-get-predspec|rolog-goto-predicate-info|rolog-goto-prolog-process-buffer|rolog-guess-fill-prefix|rolog-help-apropos|rolog-help-info|rolog-help-on-predicate|rolog-help-online|rolog-in-object|rolog-indent-buffer|rolog-indent-predicate|rolog-inferior-buffer|rolog-inferior-guess-flavor|rolog-inferior-menu-all|rolog-inferior-menu|rolog-inferior-mode|rolog-inferior-self-insert-command|rolog-input-filter|rolog-insert-module-modeline|rolog-insert-next-clause|rolog-insert-predicate-template|rolog-insert-predspec|rolog-mark-clause|rolog-mark-predicate|rolog-menu-help|rolog-menu|rolog-mode-keybindings-common|rolog-mode-keybindings-edit|rolog-mode-keybindings-inferior|rolog-mode-variables|rolog-mode-version|rolog-mode|rolog-old-process-buffer|rolog-old-process-file|rolog-old-process-predicate|rolog-old-process-region|rolog-paren-balance|rolog-parse-sicstus-compilation-errors|rolog-post-self-insert|rolog-pred-end|rolog-pred-start|rolog-process-insert-string|rolog-program-name|rolog-program-switches|rolog-prompt-regexp|rolog-read-predicate|rolog-replace-in-string|rolog-smie-backward-token|rolog-smie-forward-token|rolog-smie-rules|rolog-temporary-file|rolog-toggle-sicstus-sd|rolog-trace-off|rolog-trace-on|rolog-uncomment-region|rolog-variables-to-anonymous|rolog-view-predspec|rolog-zip-off|rolog-zip-on|rompt-for-change-log-name|ropertized-buffer-identification|rune-directory-list|s-alist-position|s-avg-char-width|s-background-image|s-background-pages|s-background-text|s-background|s-basic-plot-str|s-basic-plot-string|s-basic-plot-whitespace|s-begin-file|s-begin-job|s-begin-page|s-boolean-capitalized|s-boolean-constant|s-build-reference-face-lists|s-color-device|s-color-scale|s-color-values|s-comment-string|s-continue-line|s-control-character|s-count-lines-preprint|s-count-lines|s-del|s-despool|s-do-despool|s-end-job|s-end-page|s-end-sheet|s-extend-face-list|s-extend-face|s-extension-bit|s-face-attribute-list|s-face-attributes|s-face-background-color-p|s-face-background-name|s-face-background|s-face-bold-p|s-face-box-p|s-face-color-p|s-face-extract-color|s-face-foreground-color-p|s-face-foreground-name|s-face-italic-p|s-face-overline-p|s-face-strikeout-p|s-face-underlined-p|s-find-wrappoint|s-float-format|s-flush-output|s-font-alist|s-font-lock-face-attributes|s-font-number|s-font|s-fonts|s-format-color|s-frame-parameter|s-generate-header-line|s-generate-header|s-generate-postscript-with-faces|s-generate-postscript-with-faces1|s-generate-postscript|s-generate|s-get-boundingbox|s-get-buffer-name|s-get-font-size|s-get-page-dimensions|s-get-size|s-get|s-header-dirpart|s-header-page|s-header-sheet|s-init-output-queue|s-insert-file|s-insert-string|s-kill-emacs-check|s-line-height|s-line-lengths-internal|s-line-lengths|s-lookup|s-map-face|s-mark-active-p|s-message-log-max|s-mode--syntax-propertize-special|s-mode-RE|s-mode-backward-delete-char|s-mode-center|s-mode-comment-out-region|s-mode-epsf-rich|s-mode-epsf-sparse|s-mode-heapsort|s-mode-latin-extended|s-mode-main|s-mode-octal-buffer|s-mode-octal-region|s-mode-other-newline|s-mode-print-buffer|s-mode-print-region|s-mode-right|s-mode-show-version|s-mode-smie-rules|s-mode-submit-bug-report|s-mode-syntax-propertize|s-mode-target-column|s-mode-uncomment-region|s-mode|s-mule-begin-job|s-mule-end-job|s-mule-initialize|s-n-up-columns|s-n-up-end|s-n-up-filling|s-n-up-landscape|s-n-up-lines|s-n-up-missing|s-n-up-printing|s-n-up-repeat|s-n-up-xcolumn|s-n-up-xline|s-n-up-xstart|s-n-up-ycolumn|s-n-up-yline|s-n-up-ystart|s-nb-pages-buffer|s-nb-pages-region|s-nb-pages|s-next-line|s-next-page|s-output-boolean|s-output-frame-properties|s-output-prologue|s-output-string-prim|s-output-string|s-output|s-page-dimensions-get-height|s-page-dimensions-get-media|s-page-dimensions-get-width|s-page-number|s-plot-region|s-plot-string|s-plot-with-face|s-plot|s-print-buffer-with-faces|s-print-buffer|s-print-customize|s-print-ensure-fontified|s-print-page-p|s-print-preprint-region|s-print-preprint|s-print-quote|s-print-region-with-faces|s-print-region|s-print-sheet-p|s-print-with-faces|s-print-without-faces|s-printing-region|s-prologue-file|s-put|s-remove-duplicates|s-restore-selected-pages|s-rgb-color|s-run-boundingbox|s-run-buffer|s-run-cleanup|s-run-clear|s-run-goto-error|s-run-kill|s-run-make-tmp-filename|s-run-mode|s-run-mouse-goto-error|s-run-quit|s-run-region|s-run-running|s-run-send-string|s-run-start|s-screen-to-bit-face|s-select-font|s-selected-pages|s-set-bg|s-set-color|s-set-face-attribute|s-set-face-bold|s-set-face-italic|s-set-face-underline|s-set-font|s-setup|s-size-scale|s-skip-newline|s-space-width|s-spool-buffer-with-faces|s-spool-buffer|s-spool-region-with-faces|s-spool-region|s-spool-with-faces|s-spool-without-faces|s-time-stamp-hh:mm:ss|s-time-stamp-iso8601)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1237,47 +1237,47 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:semantic-default-c-setup|semantic-default-elisp-setup|semantic-default-html-setup|semantic-default-make-setup|semantic-default-scheme-setup|semantic-default-texi-setup|semantic-delete-overlay-maybe|semantic-dependency-tag-file|semantic-describe-buffer-var-helper|semantic-describe-buffer|semantic-describe-tag|semantic-desktop-ignore-this-minor-mode|semantic-documentation-for-tag|semantic-dump-parser-warnings|semantic-edits-incremental-parser|semantic-elapsed-time|semantic-equivalent-tag-p|semantic-error-if-unparsed|semantic-event-window|semantic-exit-on-input|semantic-fetch-available-tags|semantic-fetch-tags-fast|semantic-fetch-tags|semantic-file-tag-table|semantic-file-token-stream|semantic-find-file-noselect|semantic-find-first-tag-by-name|semantic-find-tag-by-overlay-in-region|semantic-find-tag-by-overlay-next|semantic-find-tag-by-overlay-prev|semantic-find-tag-by-overlay|semantic-find-tag-for-completion|semantic-find-tag-parent-by-overlay|semantic-find-tags-by-scope-protection|semantic-find-tags-included|semantic-flatten-tags-table|semantic-flex-buffer|semantic-flex-end|semantic-flex-keyword-get|semantic-flex-keyword-p|semantic-flex-keyword-put|semantic-flex-keywords|semantic-flex-list|semantic-flex-make-keyword-table|semantic-flex-map-keywords|semantic-flex-start|semantic-flex-text|semantic-flex|semantic-force-refresh|semantic-foreign-tag-check|semantic-foreign-tag-invalid|semantic-foreign-tag-p|semantic-foreign-tag|semantic-format-tag-concise-prototype|semantic-format-tag-name|semantic-format-tag-prototype|semantic-format-tag-summarize|semantic-fw-add-edebug-spec|semantic-gcc-setup|semantic-get-cache-data|semantic-go-to-tag|semantic-highlight-edits-mode|semantic-highlight-edits-new-change-hook-fcn|semantic-highlight-func-highlight-current-tag|semantic-highlight-func-menu|semantic-highlight-func-mode|semantic-highlight-func-popup-menu|semantic-ia-complete-symbol-menu|semantic-ia-complete-symbol|semantic-ia-complete-tip|semantic-ia-describe-class|semantic-ia-fast-jump|semantic-ia-fast-mouse-jump|semantic-ia-show-doc|semantic-ia-show-summary|semantic-ia-show-variants|semantic-idle-completions-mode|semantic-idle-scheduler-mode|semantic-idle-summary-mode|semantic-insert-foreign-tag-change-log-mode|semantic-insert-foreign-tag-default|semantic-insert-foreign-tag-log-edit-mode|semantic-insert-foreign-tag|semantic-install-function-overrides|semantic-lex-beginning-of-line|semantic-lex-buffer|semantic-lex-catch-errors|semantic-lex-charquote|semantic-lex-close-paren|semantic-lex-comments-as-whitespace|semantic-lex-comments|semantic-lex-debug-break|semantic-lex-debug|semantic-lex-default-action|semantic-lex-end-block|semantic-lex-expand-block-specs|semantic-lex-highlight-token|semantic-lex-ignore-comments|semantic-lex-ignore-newline|semantic-lex-ignore-whitespace|semantic-lex-init|semantic-lex-keyword-get|semantic-lex-keyword-invalid|semantic-lex-keyword-p|semantic-lex-keyword-put|semantic-lex-keyword-set|semantic-lex-keyword-symbol|semantic-lex-keyword-value|semantic-lex-keywords|semantic-lex-list|semantic-lex-make-keyword-table|semantic-lex-make-type-table|semantic-lex-map-keywords|semantic-lex-map-symbols|semantic-lex-map-types|semantic-lex-newline-as-whitespace|semantic-lex-newline|semantic-lex-number|semantic-lex-one-token|semantic-lex-open-paren|semantic-lex-paren-or-list|semantic-lex-preset-default-types|semantic-lex-punctuation-type|semantic-lex-punctuation|semantic-lex-push-token|semantic-lex-spp-table-write-slot-value|semantic-lex-start-block|semantic-lex-string|semantic-lex-symbol-or-keyword|semantic-lex-test|semantic-lex-token-bounds|semantic-lex-token-class|semantic-lex-token-end|semantic-lex-token-p|semantic-lex-token-start|semantic-lex-token-text|semantic-lex-token-with-text-p|semantic-lex-token-without-text-p|semantic-lex-token|semantic-lex-type-get|semantic-lex-type-invalid|semantic-lex-type-p|semantic-lex-type-put|semantic-lex-type-set|semantic-lex-type-symbol|semantic-lex-type-value|semantic-lex-types|semantic-lex-unterminated-syntax-detected|semantic-lex-unterminated-syntax-protection|semantic-lex-whitespace|semantic-lex|semantic-make-local-hook|semantic-make-overlay|semantic-map-buffers|semantic-map-mode-buffers|semantic-menu-item|semantic-mode-line-update|semantic-mode|semantic-narrow-to-tag|semantic-new-buffer-fcn|semantic-next-unmatched-syntax|semantic-obtain-foreign-tag|semantic-overlay-buffer|semantic-overlay-delete|semantic-overlay-end|semantic-overlay-get|semantic-overlay-lists|semantic-overlay-live-p|semantic-overlay-move|semantic-overlay-next-change|semantic-overlay-p|semantic-overlay-previous-change|semantic-overlay-properties|semantic-overlay-put|semantic-overlay-start|semantic-overlays-at|semantic-overlays-in|semantic-overload-symbol-from-function|semantic-parse-changes-default|semantic-parse-changes|semantic-parse-region-default|semantic-parse-region|semantic-parse-stream-default|semantic-parse-stream|semantic-parse-tree-needs-rebuild-p|semantic-parse-tree-needs-update-p|semantic-parse-tree-set-needs-rebuild|semantic-parse-tree-set-needs-update|semantic-parse-tree-set-up-to-date|semantic-parse-tree-unparseable-p|semantic-parse-tree-unparseable|semantic-parse-tree-up-to-date-p|semantic-parser-working-message|semantic-popup-menu|semantic-push-parser-warning|semantic-read-event|semantic-read-function|semantic-read-symbol|semantic-read-type|semantic-read-variable|semantic-refresh-tags-safe|semantic-remove-system-include|semantic-repeat-parse-whole-stream|semantic-require-version|semantic-reset-system-include|semantic-run-mode-hooks|semantic-safe|semantic-sanity-check|semantic-set-unmatched-syntax-cache|semantic-show-label|semantic-show-parser-state-auto-marker|semantic-show-parser-state-marker|semantic-show-parser-state-mode|semantic-show-unmatched-lex-tokens-fetch|semantic-show-unmatched-syntax-mode|semantic-show-unmatched-syntax-next|semantic-show-unmatched-syntax|semantic-showing-unmatched-syntax-p|semantic-simple-lexer|semantic-something-to-stream|semantic-something-to-tag-table|semantic-speedbar-analysis|semantic-stickyfunc-fetch-stickyline|semantic-stickyfunc-menu|semantic-stickyfunc-mode|semantic-stickyfunc-popup-menu|semantic-stickyfunc-tag-to-stick|semantic-subst-char-in-string|semantic-symref-find-file-references-by-name|semantic-symref-find-references-by-name|semantic-symref-find-tags-by-completion|semantic-symref-find-tags-by-name|semantic-symref-find-tags-by-regexp|semantic-symref-find-text|semantic-symref-regexp|semantic-symref-symbol|semantic-symref-tool-cscope-child-p|semantic-symref-tool-cscope-list-p|semantic-symref-tool-cscope-p|semantic-symref-tool-cscope|semantic-symref-tool-global-child-p|semantic-symref-tool-global-list-p|semantic-symref-tool-global-p|semantic-symref-tool-global|semantic-symref-tool-grep-child-p|semantic-symref-tool-grep-list-p|semantic-symref-tool-grep-p|semantic-symref-tool-grep|semantic-symref-tool-idutils-child-p|semantic-symref-tool-idutils-list-p|semantic-symref-tool-idutils-p|semantic-symref-tool-idutils|semantic-symref|semantic-tag-add-hook|semantic-tag-alias-class|semantic-tag-alias-definition|semantic-tag-attributes|semantic-tag-bounds|semantic-tag-buffer|semantic-tag-children-compatibility|semantic-tag-class|semantic-tag-clone|semantic-tag-code-detail|semantic-tag-components-default|semantic-tag-components-with-overlays-default|semantic-tag-components-with-overlays|semantic-tag-components|semantic-tag-copy|semantic-tag-deep-copy-one-tag|semantic-tag-docstring|semantic-tag-end|semantic-tag-external-member-parent|semantic-tag-faux-p|semantic-tag-file-name|semantic-tag-function-arguments|semantic-tag-function-constructor-p|semantic-tag-function-destructor-p|semantic-tag-function-parent|semantic-tag-function-throws|semantic-tag-get-attribute|semantic-tag-in-buffer-p|semantic-tag-include-filename-default|semantic-tag-include-filename|semantic-tag-include-system-p|semantic-tag-make-assoc-list|semantic-tag-make-plist|semantic-tag-mode|semantic-tag-modifiers|semantic-tag-name|semantic-tag-named-parent|semantic-tag-new-alias|semantic-tag-new-code|semantic-tag-new-function|semantic-tag-new-include|semantic-tag-new-package|semantic-tag-new-type|semantic-tag-new-variable|semantic-tag-of-class-p|semantic-tag-of-type-p|semantic-tag-overlay|semantic-tag-p|semantic-tag-properties|semantic-tag-prototype-p|semantic-tag-put-attribute-no-side-effect|semantic-tag-put-attribute|semantic-tag-remove-hook|semantic-tag-resolve-proxy|semantic-tag-set-bounds|semantic-tag-set-faux|semantic-tag-set-name|semantic-tag-set-proxy|semantic-tag-similar-with-subtags-p|semantic-tag-start|semantic-tag-type-compound-p|semantic-tag-type-interfaces|semantic-tag-type-members|semantic-tag-type-superclass-protection|semantic-tag-type-superclasses|semantic-tag-type|semantic-tag-variable-constant-p|semantic-tag-variable-default|semantic-tag-with-position-p|semantic-tag-write-list-slot-value|semantic-tag|semantic-test-data-cache|semantic-throw-on-input|semantic-toggle-minor-mode-globally|semantic-token-type-parent|semantic-unmatched-syntax-overlay-p|semantic-unmatched-syntax-tokens|semantic-varalias-obsolete|semantic-with-buffer-narrowed-to-current-tag|semantic-with-buffer-narrowed-to-tag|semanticdb-database-typecache-child-p|semanticdb-database-typecache-list-p|semanticdb-database-typecache-p|semanticdb-database-typecache|semanticdb-enable-gnu-global-databases|semanticdb-file-table-object|semanticdb-find-adebug-lost-includes|semanticdb-find-result-length|semanticdb-find-result-nth-in-buffer|semanticdb-find-result-nth|semanticdb-find-table-for-include|semanticdb-find-tags-by-class|semanticdb-find-tags-by-name-regexp|semanticdb-find-tags-by-name|semanticdb-find-tags-for-completion|semanticdb-find-test-translate-path|semanticdb-find-translate-path|semanticdb-minor-mode-p|semanticdb-project-database-file-child-p|semanticdb-project-database-file-list-p|semanticdb-project-database-file-p|semanticdb-project-database-file|semanticdb-strip-find-results|semanticdb-typecache-child-p|semanticdb-typecache-find|semanticdb-typecache-list-p|semanticdb-typecache-p|semanticdb-typecache|semanticdb-without-unloaded-file-searches|senator-copy-tag-to-register|senator-copy-tag|senator-go-to-up-reference|senator-kill-tag|senator-next-tag|senator-previous-tag|senator-transpose-tags-down|senator-transpose-tags-up|senator-yank-tag|send-invisible|send-process-next-char|send-region|send-string|sendmail-query-once|sendmail-query-user-about-smtp|sendmail-send-it|sendmail-sync-aliases|sendmail-user-agent-compose|sentence-at-point|seq--count-successive|seq--drop-list|seq--drop-while-list|seq--take-list|seq--take-while-list|seq-concatenate|seq-contains-p|seq-copy|seq-count|seq-do|seq-doseq|seq-drop-while|seq-drop|seq-each|seq-elt|seq-empty-p|seq-every-p|seq-filter|seq-length|seq-map|seq-reduce|seq-remove|seq-reverse|seq-some-p|seq-sort|seq-subseq|seq-take-while|seq-take|seq-uniq|serial-mode-line-config-menu-1|serial-mode-line-config-menu|serial-mode-line-speed-menu-1|serial-mode-line-speed-menu|serial-nice-speed-history|serial-port-is-file-p|serial-read-name|serial-read-speed|serial-speed|serial-supported-or-barf|serial-update-config-menu|serial-update-speed-menu|server--on-display-p|server-add-client|server-buffer-done|server-clients-with|server-create-tty-frame|server-create-window-system-frame|server-delete-client|server-done|server-edit|server-ensure-safe-dir|server-eval-and-print|server-eval-at|server-execute-continuation|server-execute|server-force-delete|server-force-stop|server-generate-key|server-get-auth-key|server-goto-line-column|server-goto-toplevel|server-handle-delete-frame|server-handle-suspend-tty|server-kill-buffer|server-kill-emacs-query-function|server-log|server-mode|server-process-filter|server-quote-arg|server-reply-print|server-return-error|server-running-p|server-save-buffers-kill-terminal|server-select-display|server-send-string|server-sentinel|server-start|server-switch-buffer|server-temp-file-p|server-unload-function|server-unquote-arg|server-unselect-display|server-visit-files|server-with-environment|ses\\+|ses--advice-copy-region-as-kill|ses--advice-yank|ses--cell|ses--clean-!|ses--clean-_|ses--letref|ses--local-printer|ses--locprn-compiled--cmacro|ses--locprn-compiled|ses--locprn-def--cmacro|ses--locprn-def|ses--locprn-local-printer-list--cmacro|ses--locprn-local-printer-list|ses--locprn-number--cmacro|ses--locprn-number|ses--locprn-p--cmacro|ses--locprn-p|ses--metaprogramming)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)se(?:mantic-default-c-setup|mantic-default-elisp-setup|mantic-default-html-setup|mantic-default-make-setup|mantic-default-scheme-setup|mantic-default-texi-setup|mantic-delete-overlay-maybe|mantic-dependency-tag-file|mantic-describe-buffer-var-helper|mantic-describe-buffer|mantic-describe-tag|mantic-desktop-ignore-this-minor-mode|mantic-documentation-for-tag|mantic-dump-parser-warnings|mantic-edits-incremental-parser|mantic-elapsed-time|mantic-equivalent-tag-p|mantic-error-if-unparsed|mantic-event-window|mantic-exit-on-input|mantic-fetch-available-tags|mantic-fetch-tags-fast|mantic-fetch-tags|mantic-file-tag-table|mantic-file-token-stream|mantic-find-file-noselect|mantic-find-first-tag-by-name|mantic-find-tag-by-overlay-in-region|mantic-find-tag-by-overlay-next|mantic-find-tag-by-overlay-prev|mantic-find-tag-by-overlay|mantic-find-tag-for-completion|mantic-find-tag-parent-by-overlay|mantic-find-tags-by-scope-protection|mantic-find-tags-included|mantic-flatten-tags-table|mantic-flex-buffer|mantic-flex-end|mantic-flex-keyword-get|mantic-flex-keyword-p|mantic-flex-keyword-put|mantic-flex-keywords|mantic-flex-list|mantic-flex-make-keyword-table|mantic-flex-map-keywords|mantic-flex-start|mantic-flex-text|mantic-flex|mantic-force-refresh|mantic-foreign-tag-check|mantic-foreign-tag-invalid|mantic-foreign-tag-p|mantic-foreign-tag|mantic-format-tag-concise-prototype|mantic-format-tag-name|mantic-format-tag-prototype|mantic-format-tag-summarize|mantic-fw-add-edebug-spec|mantic-gcc-setup|mantic-get-cache-data|mantic-go-to-tag|mantic-highlight-edits-mode|mantic-highlight-edits-new-change-hook-fcn|mantic-highlight-func-highlight-current-tag|mantic-highlight-func-menu|mantic-highlight-func-mode|mantic-highlight-func-popup-menu|mantic-ia-complete-symbol-menu|mantic-ia-complete-symbol|mantic-ia-complete-tip|mantic-ia-describe-class|mantic-ia-fast-jump|mantic-ia-fast-mouse-jump|mantic-ia-show-doc|mantic-ia-show-summary|mantic-ia-show-variants|mantic-idle-completions-mode|mantic-idle-scheduler-mode|mantic-idle-summary-mode|mantic-insert-foreign-tag-change-log-mode|mantic-insert-foreign-tag-default|mantic-insert-foreign-tag-log-edit-mode|mantic-insert-foreign-tag|mantic-install-function-overrides|mantic-lex-beginning-of-line|mantic-lex-buffer|mantic-lex-catch-errors|mantic-lex-charquote|mantic-lex-close-paren|mantic-lex-comments-as-whitespace|mantic-lex-comments|mantic-lex-debug-break|mantic-lex-debug|mantic-lex-default-action|mantic-lex-end-block|mantic-lex-expand-block-specs|mantic-lex-highlight-token|mantic-lex-ignore-comments|mantic-lex-ignore-newline|mantic-lex-ignore-whitespace|mantic-lex-init|mantic-lex-keyword-get|mantic-lex-keyword-invalid|mantic-lex-keyword-p|mantic-lex-keyword-put|mantic-lex-keyword-set|mantic-lex-keyword-symbol|mantic-lex-keyword-value|mantic-lex-keywords|mantic-lex-list|mantic-lex-make-keyword-table|mantic-lex-make-type-table|mantic-lex-map-keywords|mantic-lex-map-symbols|mantic-lex-map-types|mantic-lex-newline-as-whitespace|mantic-lex-newline|mantic-lex-number|mantic-lex-one-token|mantic-lex-open-paren|mantic-lex-paren-or-list|mantic-lex-preset-default-types|mantic-lex-punctuation-type|mantic-lex-punctuation|mantic-lex-push-token|mantic-lex-spp-table-write-slot-value|mantic-lex-start-block|mantic-lex-string|mantic-lex-symbol-or-keyword|mantic-lex-test|mantic-lex-token-bounds|mantic-lex-token-class|mantic-lex-token-end|mantic-lex-token-p|mantic-lex-token-start|mantic-lex-token-text|mantic-lex-token-with-text-p|mantic-lex-token-without-text-p|mantic-lex-token|mantic-lex-type-get|mantic-lex-type-invalid|mantic-lex-type-p|mantic-lex-type-put|mantic-lex-type-set|mantic-lex-type-symbol|mantic-lex-type-value|mantic-lex-types|mantic-lex-unterminated-syntax-detected|mantic-lex-unterminated-syntax-protection|mantic-lex-whitespace|mantic-lex|mantic-make-local-hook|mantic-make-overlay|mantic-map-buffers|mantic-map-mode-buffers|mantic-menu-item|mantic-mode-line-update|mantic-mode|mantic-narrow-to-tag|mantic-new-buffer-fcn|mantic-next-unmatched-syntax|mantic-obtain-foreign-tag|mantic-overlay-buffer|mantic-overlay-delete|mantic-overlay-end|mantic-overlay-get|mantic-overlay-lists|mantic-overlay-live-p|mantic-overlay-move|mantic-overlay-next-change|mantic-overlay-p|mantic-overlay-previous-change|mantic-overlay-properties|mantic-overlay-put|mantic-overlay-start|mantic-overlays-at|mantic-overlays-in|mantic-overload-symbol-from-function|mantic-parse-changes-default|mantic-parse-changes|mantic-parse-region-default|mantic-parse-region|mantic-parse-stream-default|mantic-parse-stream|mantic-parse-tree-needs-rebuild-p|mantic-parse-tree-needs-update-p|mantic-parse-tree-set-needs-rebuild|mantic-parse-tree-set-needs-update|mantic-parse-tree-set-up-to-date|mantic-parse-tree-unparseable-p|mantic-parse-tree-unparseable|mantic-parse-tree-up-to-date-p|mantic-parser-working-message|mantic-popup-menu|mantic-push-parser-warning|mantic-read-event|mantic-read-function|mantic-read-symbol|mantic-read-type|mantic-read-variable|mantic-refresh-tags-safe|mantic-remove-system-include|mantic-repeat-parse-whole-stream|mantic-require-version|mantic-reset-system-include|mantic-run-mode-hooks|mantic-safe|mantic-sanity-check|mantic-set-unmatched-syntax-cache|mantic-show-label|mantic-show-parser-state-auto-marker|mantic-show-parser-state-marker|mantic-show-parser-state-mode|mantic-show-unmatched-lex-tokens-fetch|mantic-show-unmatched-syntax-mode|mantic-show-unmatched-syntax-next|mantic-show-unmatched-syntax|mantic-showing-unmatched-syntax-p|mantic-simple-lexer|mantic-something-to-stream|mantic-something-to-tag-table|mantic-speedbar-analysis|mantic-stickyfunc-fetch-stickyline|mantic-stickyfunc-menu|mantic-stickyfunc-mode|mantic-stickyfunc-popup-menu|mantic-stickyfunc-tag-to-stick|mantic-subst-char-in-string|mantic-symref-find-file-references-by-name|mantic-symref-find-references-by-name|mantic-symref-find-tags-by-completion|mantic-symref-find-tags-by-name|mantic-symref-find-tags-by-regexp|mantic-symref-find-text|mantic-symref-regexp|mantic-symref-symbol|mantic-symref-tool-cscope-child-p|mantic-symref-tool-cscope-list-p|mantic-symref-tool-cscope-p|mantic-symref-tool-cscope|mantic-symref-tool-global-child-p|mantic-symref-tool-global-list-p|mantic-symref-tool-global-p|mantic-symref-tool-global|mantic-symref-tool-grep-child-p|mantic-symref-tool-grep-list-p|mantic-symref-tool-grep-p|mantic-symref-tool-grep|mantic-symref-tool-idutils-child-p|mantic-symref-tool-idutils-list-p|mantic-symref-tool-idutils-p|mantic-symref-tool-idutils|mantic-symref|mantic-tag-add-hook|mantic-tag-alias-class|mantic-tag-alias-definition|mantic-tag-attributes|mantic-tag-bounds|mantic-tag-buffer|mantic-tag-children-compatibility|mantic-tag-class|mantic-tag-clone|mantic-tag-code-detail|mantic-tag-components-default|mantic-tag-components-with-overlays-default|mantic-tag-components-with-overlays|mantic-tag-components|mantic-tag-copy|mantic-tag-deep-copy-one-tag|mantic-tag-docstring|mantic-tag-end|mantic-tag-external-member-parent|mantic-tag-faux-p|mantic-tag-file-name|mantic-tag-function-arguments|mantic-tag-function-constructor-p|mantic-tag-function-destructor-p|mantic-tag-function-parent|mantic-tag-function-throws|mantic-tag-get-attribute|mantic-tag-in-buffer-p|mantic-tag-include-filename-default|mantic-tag-include-filename|mantic-tag-include-system-p|mantic-tag-make-assoc-list|mantic-tag-make-plist|mantic-tag-mode|mantic-tag-modifiers|mantic-tag-name|mantic-tag-named-parent|mantic-tag-new-alias|mantic-tag-new-code|mantic-tag-new-function|mantic-tag-new-include|mantic-tag-new-package|mantic-tag-new-type|mantic-tag-new-variable|mantic-tag-of-class-p|mantic-tag-of-type-p|mantic-tag-overlay|mantic-tag-p|mantic-tag-properties|mantic-tag-prototype-p|mantic-tag-put-attribute-no-side-effect|mantic-tag-put-attribute|mantic-tag-remove-hook|mantic-tag-resolve-proxy|mantic-tag-set-bounds|mantic-tag-set-faux|mantic-tag-set-name|mantic-tag-set-proxy|mantic-tag-similar-with-subtags-p|mantic-tag-start|mantic-tag-type-compound-p|mantic-tag-type-interfaces|mantic-tag-type-members|mantic-tag-type-superclass-protection|mantic-tag-type-superclasses|mantic-tag-type|mantic-tag-variable-constant-p|mantic-tag-variable-default|mantic-tag-with-position-p|mantic-tag-write-list-slot-value|mantic-tag|mantic-test-data-cache|mantic-throw-on-input|mantic-toggle-minor-mode-globally|mantic-token-type-parent|mantic-unmatched-syntax-overlay-p|mantic-unmatched-syntax-tokens|mantic-varalias-obsolete|mantic-with-buffer-narrowed-to-current-tag|mantic-with-buffer-narrowed-to-tag|manticdb-database-typecache-child-p|manticdb-database-typecache-list-p|manticdb-database-typecache-p|manticdb-database-typecache|manticdb-enable-gnu-global-databases|manticdb-file-table-object|manticdb-find-adebug-lost-includes|manticdb-find-result-length|manticdb-find-result-nth-in-buffer|manticdb-find-result-nth|manticdb-find-table-for-include|manticdb-find-tags-by-class|manticdb-find-tags-by-name-regexp|manticdb-find-tags-by-name|manticdb-find-tags-for-completion|manticdb-find-test-translate-path|manticdb-find-translate-path|manticdb-minor-mode-p|manticdb-project-database-file-child-p|manticdb-project-database-file-list-p|manticdb-project-database-file-p|manticdb-project-database-file|manticdb-strip-find-results|manticdb-typecache-child-p|manticdb-typecache-find|manticdb-typecache-list-p|manticdb-typecache-p|manticdb-typecache|manticdb-without-unloaded-file-searches|nator-copy-tag-to-register|nator-copy-tag|nator-go-to-up-reference|nator-kill-tag|nator-next-tag|nator-previous-tag|nator-transpose-tags-down|nator-transpose-tags-up|nator-yank-tag|nd-invisible|nd-process-next-char|nd-region|nd-string|ndmail-query-once|ndmail-query-user-about-smtp|ndmail-send-it|ndmail-sync-aliases|ndmail-user-agent-compose|ntence-at-point|q--count-successive|q--drop-list|q--drop-while-list|q--take-list|q--take-while-list|q-concatenate|q-contains-p|q-copy|q-count|q-do|q-doseq|q-drop-while|q-drop|q-each|q-elt|q-empty-p|q-every-p|q-filter|q-length|q-map|q-reduce|q-remove|q-reverse|q-some-p|q-sort|q-subseq|q-take-while|q-take|q-uniq|rial-mode-line-config-menu-1|rial-mode-line-config-menu|rial-mode-line-speed-menu-1|rial-mode-line-speed-menu|rial-nice-speed-history|rial-port-is-file-p|rial-read-name|rial-read-speed|rial-speed|rial-supported-or-barf|rial-update-config-menu|rial-update-speed-menu|rver--on-display-p|rver-add-client|rver-buffer-done|rver-clients-with|rver-create-tty-frame|rver-create-window-system-frame|rver-delete-client|rver-done|rver-edit|rver-ensure-safe-dir|rver-eval-and-print|rver-eval-at|rver-execute-continuation|rver-execute|rver-force-delete|rver-force-stop|rver-generate-key|rver-get-auth-key|rver-goto-line-column|rver-goto-toplevel|rver-handle-delete-frame|rver-handle-suspend-tty|rver-kill-buffer|rver-kill-emacs-query-function|rver-log|rver-mode|rver-process-filter|rver-quote-arg|rver-reply-print|rver-return-error|rver-running-p|rver-save-buffers-kill-terminal|rver-select-display|rver-send-string|rver-sentinel|rver-start|rver-switch-buffer|rver-temp-file-p|rver-unload-function|rver-unquote-arg|rver-unselect-display|rver-visit-files|rver-with-environment|s\\+|s--advice-copy-region-as-kill|s--advice-yank|s--cell|s--clean-!|s--clean-_|s--letref|s--local-printer|s--locprn-compiled--cmacro|s--locprn-compiled|s--locprn-def--cmacro|s--locprn-def|s--locprn-local-printer-list--cmacro|s--locprn-local-printer-list|s--locprn-number--cmacro|s--locprn-number|s--locprn-p--cmacro|s--locprn-p|s--metaprogramming)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:ses--time-check|ses-adjust-print-width|ses-append-row-jump-first-column|ses-aset-with-undo|ses-average|ses-begin-change|ses-calculate-cell|ses-call-printer|ses-cell--formula--cmacro|ses-cell--formula|ses-cell--printer--cmacro|ses-cell--printer|ses-cell--properties--cmacro|ses-cell--properties|ses-cell--references--cmacro|ses-cell--references|ses-cell--symbol--cmacro|ses-cell--symbol|ses-cell-formula|ses-cell-p|ses-cell-printer|ses-cell-property-pop|ses-cell-property|ses-cell-references|ses-cell-set-formula|ses-cell-symbol|ses-cell-value|ses-center-span|ses-center|ses-check-curcell|ses-cleanup|ses-clear-cell-backward|ses-clear-cell-forward|ses-clear-cell|ses-col-printer|ses-col-width|ses-column-letter|ses-column-printers|ses-column-widths|ses-command-hook|ses-copy-region-helper|ses-copy-region|ses-create-cell-symbol|ses-create-cell-variable-range|ses-create-cell-variable|ses-create-header-string|ses-dashfill-span|ses-dashfill|ses-decode-cell-symbol|ses-default-printer|ses-define-local-printer|ses-delete-blanks|ses-delete-column|ses-delete-line|ses-delete-row|ses-destroy-cell-variable-range|ses-dorange|ses-edit-cell|ses-end-of-line|ses-export-keymap|ses-export-tab|ses-export-tsf|ses-export-tsv|ses-file-format-extend-parameter-list|ses-formula-record|ses-formula-references|ses-forward-or-insert|ses-get-cell|ses-goto-data|ses-goto-print|ses-header-line-menu|ses-header-row|ses-in-print-area|ses-initialize-Dijkstra-attempt|ses-insert-column|ses-insert-range-click|ses-insert-range|ses-insert-row|ses-insert-ses-range-click|ses-insert-ses-range|ses-is-cell-sym-p|ses-jump-safe|ses-jump|ses-kill-override|ses-load|ses-local-printer-compile|ses-make-cell--cmacro|ses-make-cell|ses-make-local-printer-info|ses-mark-column|ses-mark-row|ses-menu|ses-mode-print-map|ses-mode|ses-print-cell-new-width|ses-print-cell|ses-printer-record|ses-printer-validate|ses-range|ses-read-cell-printer|ses-read-cell|ses-read-column-printer|ses-read-default-printer|ses-read-printer|ses-read-symbol|ses-recalculate-all|ses-recalculate-cell|ses-reconstruct-all|ses-refresh-local-printer|ses-relocate-all|ses-relocate-formula|ses-relocate-range|ses-relocate-symbol|ses-rename-cell|ses-renarrow-buffer|ses-repair-cell-reference-all|ses-replace-name-in-formula|ses-reprint-all|ses-reset-header-string|ses-safe-formula|ses-safe-printer|ses-select|ses-set-cell|ses-set-column-width|ses-set-curcell|ses-set-header-row|ses-set-localvars|ses-set-parameter|ses-set-with-undo|ses-setter-with-undo|ses-setup|ses-sort-column-click|ses-sort-column|ses-sym-rowcol|ses-tildefill-span|ses-truncate-cell|ses-unload-function|ses-unsafe|ses-unset-header-row|ses-update-cells|ses-vector-delete|ses-vector-insert|ses-warn-unsafe|ses-widen|ses-write-cells|ses-yank-cells|ses-yank-one|ses-yank-pop|ses-yank-resize|ses-yank-tsf|set-allout-regexp|set-auto-mode-0|set-auto-mode-1|set-background-color|set-border-color|set-buffer-file-coding-system|set-buffer-process-coding-system|set-cdabbrev-buffer|set-charset-plist|set-clipboard-coding-system|set-cmpl-prefix-entry-head|set-cmpl-prefix-entry-tail|set-coding-priority|set-comment-column|set-completion-last-use-time|set-completion-num-uses|set-completion-string|set-cursor-color|set-default-coding-systems|set-default-font|set-default-toplevel-value|set-difference|set-display-table-and-terminal-coding-system|set-downcase-syntax|set-exclusive-or|set-face-attribute-from-resource|set-face-attributes-from-resources|set-face-background-pixmap|set-face-bold-p|set-face-doc-string|set-face-documentation|set-face-inverse-video-p|set-face-italic-p|set-face-underline-p|set-file-name-coding-system|set-fill-column|set-fill-prefix|set-font-encoding|set-foreground-color|set-frame-font|set-frame-name|set-fringe-mode-1|set-fringe-mode|set-fringe-style|set-goal-column|set-hard-newline-properties|set-input-interrupt-mode|set-input-meta-mode|set-justification-center|set-justification-full|set-justification-left|set-justification-none|set-justification-right|set-justification|set-keyboard-coding-system-internal|set-language-environment-charset|set-language-environment-coding-systems|set-language-environment-input-method|set-language-environment-nonascii-translation|set-language-environment-unibyte|set-language-environment|set-language-info-alist|set-language-info-internal|set-language-info|set-locale-environment|set-mark-command|set-mode-local-parent|set-mouse-color|set-nested-alist|set-next-selection-coding-system|set-output-flow-control|set-page-delimiter|set-process-filter-multibyte|set-process-inherit-coding-system-flag|set-process-window-size|set-quit-char|set-rcirc-decode-coding-system|set-rcirc-encode-coding-system|set-rmail-inbox-list|set-safe-terminal-coding-system-internal|set-scroll-bar-mode|set-selection-coding-system|set-selective-display|set-slot-value|set-temporary-overlay-map|set-terminal-coding-system-internal|set-time-zone-rule|set-upcase-syntax|set-variable|set-viper-state-in-major-mode|set-window-buffer-start-and-point|set-window-dot|set-window-new-normal|set-window-new-pixel|set-window-new-total|set-window-redisplay-end-trigger|set-window-text-height|set-woman-file-regexp|setenv-internal|setq-mode-local|setup-chinese-environment-map|setup-cyrillic-environment-map|setup-default-fontset|setup-ethiopic-environment-internal|setup-european-environment-map|setup-indian-environment-map|setup-japanese-environment-internal|setup-korean-environment-internal|setup-specified-language-environment|seventh|sexp-at-point|sgml-at-indentation-p|sgml-attributes|sgml-auto-attributes|sgml-beginning-of-tag|sgml-calculate-indent|sgml-close-tag|sgml-comment-indent-new-line|sgml-comment-indent|sgml-delete-tag|sgml-electric-tag-pair-before-change-function|sgml-electric-tag-pair-flush-overlays|sgml-electric-tag-pair-mode|sgml-empty-tag-p|sgml-fill-nobreak|sgml-get-context|sgml-guess-indent|sgml-html-meta-auto-coding-function|sgml-indent-line|sgml-lexical-context|sgml-looking-back-at|sgml-make-syntax-table|sgml-make-tag--cmacro|sgml-make-tag|sgml-maybe-end-tag|sgml-maybe-name-self|sgml-mode-facemenu-add-face-function|sgml-mode-flyspell-verify|sgml-mode|sgml-name-8bit-mode|sgml-name-char|sgml-name-self|sgml-namify-char|sgml-parse-dtd|sgml-parse-tag-backward|sgml-parse-tag-name|sgml-point-entered|sgml-pretty-print|sgml-quote|sgml-show-context|sgml-skip-tag-backward|sgml-skip-tag-forward|sgml-slash-matching|sgml-slash|sgml-tag-end--cmacro|sgml-tag-end|sgml-tag-help|sgml-tag-name--cmacro|sgml-tag-name|sgml-tag-p--cmacro|sgml-tag-p|sgml-tag-start--cmacro|sgml-tag-start|sgml-tag-text-p|sgml-tag-type--cmacro|sgml-tag-type|sgml-tag|sgml-tags-invisible|sgml-unclosed-tag-p|sgml-validate|sgml-value|sgml-xml-auto-coding-function|sgml-xml-guess|sh--cmd-completion-table|sh--inside-noncommand-expression|sh--maybe-here-document|sh--vars-before-point|sh-add-completer|sh-add|sh-after-hack-local-variables|sh-append-backslash|sh-append|sh-assignment|sh-backslash-region|sh-basic-indent-line|sh-beginning-of-command|sh-blink|sh-calculate-indent|sh-canonicalize-shell|sh-case|sh-cd-here|sh-check-rule|sh-completion-at-point-function|sh-current-defun-name|sh-debug|sh-delete-backslash|sh-electric-here-document-mode|sh-end-of-command|sh-execute-region|sh-feature|sh-find-prev-matching|sh-find-prev-switch|sh-font-lock-backslash-quote|sh-font-lock-keywords-1|sh-font-lock-keywords-2|sh-font-lock-keywords|sh-font-lock-open-heredoc|sh-font-lock-paren|sh-font-lock-quoted-subshell|sh-font-lock-syntactic-face-function|sh-for|sh-function|sh-get-indent-info|sh-get-indent-var-for-line|sh-get-kw|sh-get-word|sh-goto-match-for-done|sh-goto-matching-case|sh-goto-matching-if|sh-guess-basic-offset|sh-handle-after-case-label|sh-handle-prev-case-alt-end|sh-handle-prev-case|sh-handle-prev-do|sh-handle-prev-done|sh-handle-prev-else|sh-handle-prev-esac|sh-handle-prev-fi|sh-handle-prev-if|sh-handle-prev-open|sh-handle-prev-rc-case|sh-handle-prev-then|sh-handle-this-close|sh-handle-this-do|sh-handle-this-done|sh-handle-this-else|sh-handle-this-esac|sh-handle-this-fi|sh-handle-this-rc-case|sh-handle-this-then|sh-help-string-for-variable|sh-if|sh-in-comment-or-string|sh-indent-line|sh-indexed-loop|sh-is-quoted-p|sh-learn-buffer-indent|sh-learn-line-indent|sh-load-style|sh-make-vars-local|sh-mark-init|sh-mark-line|sh-maybe-here-document|sh-mkword-regexpr|sh-mode-syntax-table|sh-mode|sh-modify|sh-must-support-indent|sh-name-style|sh-prev-line|sh-prev-stmt|sh-prev-thing|sh-quoted-p|sh-read-variable|sh-remember-variable|sh-repeat|sh-reset-indent-vars-to-global-values|sh-safe-forward-sexp|sh-save-styles-to-buffer|sh-select|sh-send-line-or-region-and-step|sh-send-text|sh-set-indent|sh-set-shell|sh-set-var-value|sh-shell-initialize-variables|sh-shell-process|sh-show-indent|sh-show-shell|sh-smie--continuation-start-indent|sh-smie--default-backward-token|sh-smie--default-forward-token|sh-smie--keyword-p|sh-smie--looking-back-at-continuation-p|sh-smie--newline-semi-p|sh-smie--rc-after-special-arg-p|sh-smie--rc-newline-semi-p|sh-smie--sh-keyword-in-p|sh-smie--sh-keyword-p|sh-smie-rc-backward-token|sh-smie-rc-forward-token|sh-smie-rc-rules|sh-smie-sh-backward-token|sh-smie-sh-forward-token|sh-smie-sh-rules|sh-syntax-propertize-function|sh-syntax-propertize-here-doc|sh-this-is-a-continuation|sh-tmp-file|sh-until|sh-var-value|sh-while-getopts|sh-while|sha1|shadow-add-to-todo|shadow-cancel|shadow-cluster-name|shadow-cluster-primary|shadow-cluster-regexp|shadow-contract-file-name|shadow-copy-file|shadow-copy-files|shadow-define-cluster|shadow-define-literal-group|shadow-define-regexp-group|shadow-expand-cluster-in-file-name|shadow-expand-file-name|shadow-file-match|shadow-find|shadow-get-cluster|shadow-get-user|shadow-initialize|shadow-insert-var|shadow-invalidate-hashtable|shadow-local-file|shadow-make-cluster|shadow-make-fullname|shadow-make-group|shadow-parse-fullname|shadow-parse-name|shadow-read-files|shadow-read-site|shadow-regexp-superquote|shadow-remove-from-todo|shadow-replace-name-component|shadow-same-site|shadow-save-buffers-kill-emacs|shadow-save-todo-file|shadow-set-cluster|shadow-shadows-of-1|shadow-shadows-of|shadow-shadows|shadow-site-cluster|shadow-site-match|shadow-site-primary|shadow-suffix|shadow-union|shadow-write-info-file|shadow-write-todo-file|shadowfile-unload-function|shared-initialize|shell--command-completion-data|shell--parse-pcomplete-arguments|shell--requote-argument|shell--unquote&requote-argument|shell--unquote-argument|shell-apply-ansi-color|shell-backward-command|shell-c-a-p-replace-by-expanded-directory|shell-cd|shell-command-completion-function|shell-command-completion|shell-command-on-region|shell-command-sentinel|shell-command|shell-completion-vars|shell-copy-environment-variable|shell-directory-tracker|shell-dirstack-message|shell-dirtrack-mode|shell-dirtrack-toggle|shell-dynamic-complete-command|shell-dynamic-complete-environment-variable|shell-dynamic-complete-filename|shell-environment-variable-completion|shell-extract-num|shell-filename-completion|shell-filter-ctrl-a-ctrl-b|shell-forward-command|shell-match-partial-variable|shell-mode|shell-prefixed-directory-name|shell-process-cd|shell-process-popd|shell-process-pushd|shell-quote-wildcard-pattern|shell-reapply-ansi-color|shell-replace-by-expanded-directory|shell-resync-dirs|shell-script-mode|shell-snarf-envar|shell-strip-ctrl-m|shell-unquote-argument|shell-write-history-on-exit|shell|shiftf|should-error|should-not|should|show-all|show-branches|show-buffer|show-children|show-entry|show-ifdef-block|show-ifdefs|show-paren--categorize-paren|show-paren--default|show-paren--locate-near-paren|show-paren--unescaped-p|show-paren-function|show-paren-mode|show-subtree|shr--extract-best-source|shr--get-media-pref|shr-add-font|shr-browse-image|shr-browse-url|shr-buffer-width|shr-char-breakable-p--inliner|shr-char-breakable-p|shr-char-kinsoku-bol-p--inliner|shr-char-kinsoku-bol-p|shr-char-kinsoku-eol-p--inliner|shr-char-kinsoku-eol-p|shr-char-nospace-p--inliner|shr-char-nospace-p|shr-color->hexadecimal|shr-color-check|shr-color-hsl-to-rgb-fractions|shr-color-hue-to-rgb|shr-color-relative-to-absolute|shr-color-set-minimum-interval|shr-color-visible|shr-colorize-region|shr-column-specs|shr-copy-url|shr-count|shr-descend|shr-dom-print|shr-dom-to-xml|shr-encode-url|shr-ensure-newline|shr-ensure-paragraph|shr-expand-newlines|shr-expand-url|shr-find-fill-point|shr-fold-text|shr-fontize-dom|shr-generic|shr-get-image-data|shr-heading|shr-image-displayer|shr-image-fetched|shr-image-from-data|shr-indent)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)s(?:es--time-check|es-adjust-print-width|es-append-row-jump-first-column|es-aset-with-undo|es-average|es-begin-change|es-calculate-cell|es-call-printer|es-cell--formula--cmacro|es-cell--formula|es-cell--printer--cmacro|es-cell--printer|es-cell--properties--cmacro|es-cell--properties|es-cell--references--cmacro|es-cell--references|es-cell--symbol--cmacro|es-cell--symbol|es-cell-formula|es-cell-p|es-cell-printer|es-cell-property-pop|es-cell-property|es-cell-references|es-cell-set-formula|es-cell-symbol|es-cell-value|es-center-span|es-center|es-check-curcell|es-cleanup|es-clear-cell-backward|es-clear-cell-forward|es-clear-cell|es-col-printer|es-col-width|es-column-letter|es-column-printers|es-column-widths|es-command-hook|es-copy-region-helper|es-copy-region|es-create-cell-symbol|es-create-cell-variable-range|es-create-cell-variable|es-create-header-string|es-dashfill-span|es-dashfill|es-decode-cell-symbol|es-default-printer|es-define-local-printer|es-delete-blanks|es-delete-column|es-delete-line|es-delete-row|es-destroy-cell-variable-range|es-dorange|es-edit-cell|es-end-of-line|es-export-keymap|es-export-tab|es-export-tsf|es-export-tsv|es-file-format-extend-parameter-list|es-formula-record|es-formula-references|es-forward-or-insert|es-get-cell|es-goto-data|es-goto-print|es-header-line-menu|es-header-row|es-in-print-area|es-initialize-Dijkstra-attempt|es-insert-column|es-insert-range-click|es-insert-range|es-insert-row|es-insert-ses-range-click|es-insert-ses-range|es-is-cell-sym-p|es-jump-safe|es-jump|es-kill-override|es-load|es-local-printer-compile|es-make-cell--cmacro|es-make-cell|es-make-local-printer-info|es-mark-column|es-mark-row|es-menu|es-mode-print-map|es-mode|es-print-cell-new-width|es-print-cell|es-printer-record|es-printer-validate|es-range|es-read-cell-printer|es-read-cell|es-read-column-printer|es-read-default-printer|es-read-printer|es-read-symbol|es-recalculate-all|es-recalculate-cell|es-reconstruct-all|es-refresh-local-printer|es-relocate-all|es-relocate-formula|es-relocate-range|es-relocate-symbol|es-rename-cell|es-renarrow-buffer|es-repair-cell-reference-all|es-replace-name-in-formula|es-reprint-all|es-reset-header-string|es-safe-formula|es-safe-printer|es-select|es-set-cell|es-set-column-width|es-set-curcell|es-set-header-row|es-set-localvars|es-set-parameter|es-set-with-undo|es-setter-with-undo|es-setup|es-sort-column-click|es-sort-column|es-sym-rowcol|es-tildefill-span|es-truncate-cell|es-unload-function|es-unsafe|es-unset-header-row|es-update-cells|es-vector-delete|es-vector-insert|es-warn-unsafe|es-widen|es-write-cells|es-yank-cells|es-yank-one|es-yank-pop|es-yank-resize|es-yank-tsf|et-allout-regexp|et-auto-mode-0|et-auto-mode-1|et-background-color|et-border-color|et-buffer-file-coding-system|et-buffer-process-coding-system|et-cdabbrev-buffer|et-charset-plist|et-clipboard-coding-system|et-cmpl-prefix-entry-head|et-cmpl-prefix-entry-tail|et-coding-priority|et-comment-column|et-completion-last-use-time|et-completion-num-uses|et-completion-string|et-cursor-color|et-default-coding-systems|et-default-font|et-default-toplevel-value|et-difference|et-display-table-and-terminal-coding-system|et-downcase-syntax|et-exclusive-or|et-face-attribute-from-resource|et-face-attributes-from-resources|et-face-background-pixmap|et-face-bold-p|et-face-doc-string|et-face-documentation|et-face-inverse-video-p|et-face-italic-p|et-face-underline-p|et-file-name-coding-system|et-fill-column|et-fill-prefix|et-font-encoding|et-foreground-color|et-frame-font|et-frame-name|et-fringe-mode-1|et-fringe-mode|et-fringe-style|et-goal-column|et-hard-newline-properties|et-input-interrupt-mode|et-input-meta-mode|et-justification-center|et-justification-full|et-justification-left|et-justification-none|et-justification-right|et-justification|et-keyboard-coding-system-internal|et-language-environment-charset|et-language-environment-coding-systems|et-language-environment-input-method|et-language-environment-nonascii-translation|et-language-environment-unibyte|et-language-environment|et-language-info-alist|et-language-info-internal|et-language-info|et-locale-environment|et-mark-command|et-mode-local-parent|et-mouse-color|et-nested-alist|et-next-selection-coding-system|et-output-flow-control|et-page-delimiter|et-process-filter-multibyte|et-process-inherit-coding-system-flag|et-process-window-size|et-quit-char|et-rcirc-decode-coding-system|et-rcirc-encode-coding-system|et-rmail-inbox-list|et-safe-terminal-coding-system-internal|et-scroll-bar-mode|et-selection-coding-system|et-selective-display|et-slot-value|et-temporary-overlay-map|et-terminal-coding-system-internal|et-time-zone-rule|et-upcase-syntax|et-variable|et-viper-state-in-major-mode|et-window-buffer-start-and-point|et-window-dot|et-window-new-normal|et-window-new-pixel|et-window-new-total|et-window-redisplay-end-trigger|et-window-text-height|et-woman-file-regexp|etenv-internal|etq-mode-local|etup-chinese-environment-map|etup-cyrillic-environment-map|etup-default-fontset|etup-ethiopic-environment-internal|etup-european-environment-map|etup-indian-environment-map|etup-japanese-environment-internal|etup-korean-environment-internal|etup-specified-language-environment|eventh|exp-at-point|gml-at-indentation-p|gml-attributes|gml-auto-attributes|gml-beginning-of-tag|gml-calculate-indent|gml-close-tag|gml-comment-indent-new-line|gml-comment-indent|gml-delete-tag|gml-electric-tag-pair-before-change-function|gml-electric-tag-pair-flush-overlays|gml-electric-tag-pair-mode|gml-empty-tag-p|gml-fill-nobreak|gml-get-context|gml-guess-indent|gml-html-meta-auto-coding-function|gml-indent-line|gml-lexical-context|gml-looking-back-at|gml-make-syntax-table|gml-make-tag--cmacro|gml-make-tag|gml-maybe-end-tag|gml-maybe-name-self|gml-mode-facemenu-add-face-function|gml-mode-flyspell-verify|gml-mode|gml-name-8bit-mode|gml-name-char|gml-name-self|gml-namify-char|gml-parse-dtd|gml-parse-tag-backward|gml-parse-tag-name|gml-point-entered|gml-pretty-print|gml-quote|gml-show-context|gml-skip-tag-backward|gml-skip-tag-forward|gml-slash-matching|gml-slash|gml-tag-end--cmacro|gml-tag-end|gml-tag-help|gml-tag-name--cmacro|gml-tag-name|gml-tag-p--cmacro|gml-tag-p|gml-tag-start--cmacro|gml-tag-start|gml-tag-text-p|gml-tag-type--cmacro|gml-tag-type|gml-tag|gml-tags-invisible|gml-unclosed-tag-p|gml-validate|gml-value|gml-xml-auto-coding-function|gml-xml-guess|h--cmd-completion-table|h--inside-noncommand-expression|h--maybe-here-document|h--vars-before-point|h-add-completer|h-add|h-after-hack-local-variables|h-append-backslash|h-append|h-assignment|h-backslash-region|h-basic-indent-line|h-beginning-of-command|h-blink|h-calculate-indent|h-canonicalize-shell|h-case|h-cd-here|h-check-rule|h-completion-at-point-function|h-current-defun-name|h-debug|h-delete-backslash|h-electric-here-document-mode|h-end-of-command|h-execute-region|h-feature|h-find-prev-matching|h-find-prev-switch|h-font-lock-backslash-quote|h-font-lock-keywords-1|h-font-lock-keywords-2|h-font-lock-keywords|h-font-lock-open-heredoc|h-font-lock-paren|h-font-lock-quoted-subshell|h-font-lock-syntactic-face-function|h-for|h-function|h-get-indent-info|h-get-indent-var-for-line|h-get-kw|h-get-word|h-goto-match-for-done|h-goto-matching-case|h-goto-matching-if|h-guess-basic-offset|h-handle-after-case-label|h-handle-prev-case-alt-end|h-handle-prev-case|h-handle-prev-do|h-handle-prev-done|h-handle-prev-else|h-handle-prev-esac|h-handle-prev-fi|h-handle-prev-if|h-handle-prev-open|h-handle-prev-rc-case|h-handle-prev-then|h-handle-this-close|h-handle-this-do|h-handle-this-done|h-handle-this-else|h-handle-this-esac|h-handle-this-fi|h-handle-this-rc-case|h-handle-this-then|h-help-string-for-variable|h-if|h-in-comment-or-string|h-indent-line|h-indexed-loop|h-is-quoted-p|h-learn-buffer-indent|h-learn-line-indent|h-load-style|h-make-vars-local|h-mark-init|h-mark-line|h-maybe-here-document|h-mkword-regexpr|h-mode-syntax-table|h-mode|h-modify|h-must-support-indent|h-name-style|h-prev-line|h-prev-stmt|h-prev-thing|h-quoted-p|h-read-variable|h-remember-variable|h-repeat|h-reset-indent-vars-to-global-values|h-safe-forward-sexp|h-save-styles-to-buffer|h-select|h-send-line-or-region-and-step|h-send-text|h-set-indent|h-set-shell|h-set-var-value|h-shell-initialize-variables|h-shell-process|h-show-indent|h-show-shell|h-smie--continuation-start-indent|h-smie--default-backward-token|h-smie--default-forward-token|h-smie--keyword-p|h-smie--looking-back-at-continuation-p|h-smie--newline-semi-p|h-smie--rc-after-special-arg-p|h-smie--rc-newline-semi-p|h-smie--sh-keyword-in-p|h-smie--sh-keyword-p|h-smie-rc-backward-token|h-smie-rc-forward-token|h-smie-rc-rules|h-smie-sh-backward-token|h-smie-sh-forward-token|h-smie-sh-rules|h-syntax-propertize-function|h-syntax-propertize-here-doc|h-this-is-a-continuation|h-tmp-file|h-until|h-var-value|h-while-getopts|h-while|ha1|hadow-add-to-todo|hadow-cancel|hadow-cluster-name|hadow-cluster-primary|hadow-cluster-regexp|hadow-contract-file-name|hadow-copy-file|hadow-copy-files|hadow-define-cluster|hadow-define-literal-group|hadow-define-regexp-group|hadow-expand-cluster-in-file-name|hadow-expand-file-name|hadow-file-match|hadow-find|hadow-get-cluster|hadow-get-user|hadow-initialize|hadow-insert-var|hadow-invalidate-hashtable|hadow-local-file|hadow-make-cluster|hadow-make-fullname|hadow-make-group|hadow-parse-fullname|hadow-parse-name|hadow-read-files|hadow-read-site|hadow-regexp-superquote|hadow-remove-from-todo|hadow-replace-name-component|hadow-same-site|hadow-save-buffers-kill-emacs|hadow-save-todo-file|hadow-set-cluster|hadow-shadows-of-1|hadow-shadows-of|hadow-shadows|hadow-site-cluster|hadow-site-match|hadow-site-primary|hadow-suffix|hadow-union|hadow-write-info-file|hadow-write-todo-file|hadowfile-unload-function|hared-initialize|hell--command-completion-data|hell--parse-pcomplete-arguments|hell--requote-argument|hell--unquote&requote-argument|hell--unquote-argument|hell-apply-ansi-color|hell-backward-command|hell-c-a-p-replace-by-expanded-directory|hell-cd|hell-command-completion-function|hell-command-completion|hell-command-on-region|hell-command-sentinel|hell-command|hell-completion-vars|hell-copy-environment-variable|hell-directory-tracker|hell-dirstack-message|hell-dirtrack-mode|hell-dirtrack-toggle|hell-dynamic-complete-command|hell-dynamic-complete-environment-variable|hell-dynamic-complete-filename|hell-environment-variable-completion|hell-extract-num|hell-filename-completion|hell-filter-ctrl-a-ctrl-b|hell-forward-command|hell-match-partial-variable|hell-mode|hell-prefixed-directory-name|hell-process-cd|hell-process-popd|hell-process-pushd|hell-quote-wildcard-pattern|hell-reapply-ansi-color|hell-replace-by-expanded-directory|hell-resync-dirs|hell-script-mode|hell-snarf-envar|hell-strip-ctrl-m|hell-unquote-argument|hell-write-history-on-exit|hell|hiftf|hould-error|hould-not|hould|how-all|how-branches|how-buffer|how-children|how-entry|how-ifdef-block|how-ifdefs|how-paren--categorize-paren|how-paren--default|how-paren--locate-near-paren|how-paren--unescaped-p|how-paren-function|how-paren-mode|how-subtree|hr--extract-best-source|hr--get-media-pref|hr-add-font|hr-browse-image|hr-browse-url|hr-buffer-width|hr-char-breakable-p--inliner|hr-char-breakable-p|hr-char-kinsoku-bol-p--inliner|hr-char-kinsoku-bol-p|hr-char-kinsoku-eol-p--inliner|hr-char-kinsoku-eol-p|hr-char-nospace-p--inliner|hr-char-nospace-p|hr-color->hexadecimal|hr-color-check|hr-color-hsl-to-rgb-fractions|hr-color-hue-to-rgb|hr-color-relative-to-absolute|hr-color-set-minimum-interval|hr-color-visible|hr-colorize-region|hr-column-specs|hr-copy-url|hr-count|hr-descend|hr-dom-print|hr-dom-to-xml|hr-encode-url|hr-ensure-newline|hr-ensure-paragraph|hr-expand-newlines|hr-expand-url|hr-find-fill-point|hr-fold-text|hr-fontize-dom|hr-generic|hr-get-image-data|hr-heading|hr-image-displayer|hr-image-fetched|hr-image-from-data|hr-indent)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:shr-insert-image|shr-insert-table-ruler|shr-insert-table|shr-insert|shr-make-table-1|shr-make-table|shr-max-columns|shr-mouse-browse-url|shr-next-link|shr-parse-base|shr-parse-image-data|shr-parse-style|shr-previous-link|shr-previous-newline-padding-width|shr-pro-rate-columns|shr-put-image|shr-remove-trailing-whitespace|shr-render-buffer|shr-render-region|shr-render-td|shr-rescale-image|shr-save-contents|shr-show-alt-text|shr-store-contents|shr-table-widths|shr-tag-a|shr-tag-audio|shr-tag-b|shr-tag-base|shr-tag-blockquote|shr-tag-body|shr-tag-br|shr-tag-comment|shr-tag-dd|shr-tag-del|shr-tag-div|shr-tag-dl|shr-tag-dt|shr-tag-em|shr-tag-font|shr-tag-h1|shr-tag-h2|shr-tag-h3|shr-tag-h4|shr-tag-h5|shr-tag-h6|shr-tag-hr|shr-tag-i|shr-tag-img|shr-tag-label|shr-tag-li|shr-tag-object|shr-tag-ol|shr-tag-p|shr-tag-pre|shr-tag-s|shr-tag-script|shr-tag-span|shr-tag-strong|shr-tag-style|shr-tag-sub|shr-tag-sup|shr-tag-svg|shr-tag-table-1|shr-tag-table|shr-tag-title|shr-tag-u|shr-tag-ul|shr-tag-video|shr-urlify|shr-zoom-image|shrink-window-horizontally|shrink-window|shuffle-vector|sieve-manage|sieve-mode|sieve-upload-and-bury|sieve-upload-and-kill|sieve-upload|signum|simula-backward-up-level|simula-calculate-indent|simula-context|simula-electric-keyword|simula-electric-label|simula-expand-keyword|simula-expand-stdproc|simula-find-do-match|simula-find-if|simula-find-inspect|simula-forward-down-level|simula-forward-up-level|simula-goto-definition|simula-indent-command|simula-indent-exp|simula-indent-line|simula-inside-parens|simula-install-standard-abbrevs|simula-mode|simula-next-statement|simula-popup-menu|simula-previous-statement|simula-search-backward|simula-search-forward|simula-skip-comment-backward|simula-skip-comment-forward|simula-submit-bug-report|sixth|size-indication-mode|skeleton-insert|skeleton-internal-1|skeleton-internal-list|skeleton-pair-insert-maybe|skeleton-proxy-new|skeleton-read|skip-line-prefix|slitex-mode|slot-boundp|slot-exists-p|slot-makeunbound|slot-missing|slot-unbound|slot-value|smbclient-list-shares|smbclient-mode|smbclient|smerge--get-marker|smerge-apply-resolution-patch|smerge-auto-combine|smerge-auto-leave|smerge-batch-resolve|smerge-check|smerge-combine-with-next|smerge-conflict-overlay|smerge-context-menu|smerge-diff-base-mine|smerge-diff-base-other|smerge-diff-mine-other|smerge-diff|smerge-ediff|smerge-ensure-match|smerge-find-conflict|smerge-get-current|smerge-keep-all|smerge-keep-base|smerge-keep-current|smerge-keep-mine|smerge-keep-n|smerge-keep-other|smerge-kill-current|smerge-makeup-conflict|smerge-match-conflict|smerge-mode-menu|smerge-mode|smerge-next|smerge-popup-context-menu|smerge-prev|smerge-refine-chopup-region|smerge-refine-forward|smerge-refine-highlight-change|smerge-refine-subst|smerge-refine|smerge-remove-props|smerge-resolve--extract-comment|smerge-resolve--normalize|smerge-resolve-all|smerge-resolve|smerge-start-session|smerge-swap|smie--associative-p|smie--matching-block-data|smie--next-indent-change|smie--opener\\/closer-at-point|smie-auto-fill|smie-backward-sexp-command|smie-backward-sexp|smie-blink-matching-check|smie-blink-matching-open|smie-bnf--classify|smie-bnf--closer-alist|smie-bnf--set-class|smie-config--advice|smie-config--get-trace|smie-config--guess-1|smie-config--guess-value|smie-config--guess|smie-config--mode-hook|smie-config--setter|smie-debug--describe-cycle|smie-debug--prec2-cycle|smie-default-backward-token|smie-default-forward-token|smie-edebug|smie-forward-sexp-command|smie-forward-sexp|smie-indent--bolp-1|smie-indent--bolp|smie-indent--hanging-p|smie-indent--offset|smie-indent--parent|smie-indent--rule-1|smie-indent--rule|smie-indent--separator-outdent|smie-indent-after-keyword|smie-indent-backward-token|smie-indent-bob|smie-indent-calculate|smie-indent-close|smie-indent-comment-close|smie-indent-comment-continue|smie-indent-comment-inside|smie-indent-comment|smie-indent-exps|smie-indent-fixindent|smie-indent-forward-token|smie-indent-inside-string|smie-indent-keyword|smie-indent-line|smie-indent-virtual|smie-next-sexp|smie-op-left|smie-op-right|smie-set-prec2tab|smiley-buffer|smiley-region|smtpmail-command-or-throw|smtpmail-cred-cert|smtpmail-cred-key|smtpmail-cred-passwd|smtpmail-cred-port|smtpmail-cred-server|smtpmail-cred-user|smtpmail-deduce-address-list|smtpmail-do-bcc|smtpmail-find-credentials|smtpmail-fqdn|smtpmail-intersection|smtpmail-maybe-append-domain|smtpmail-ok-p|smtpmail-process-filter|smtpmail-query-smtp-server|smtpmail-read-response|smtpmail-response-code|smtpmail-response-text|smtpmail-send-command|smtpmail-send-data-1|smtpmail-send-data|smtpmail-send-it|smtpmail-send-queued-mail|smtpmail-try-auth-method|smtpmail-try-auth-methods|smtpmail-user-mail-address|smtpmail-via-smtp|snake-active-p|snake-display-options|snake-end-game|snake-final-x-velocity|snake-final-y-velocity|snake-init-buffer|snake-mode|snake-move-down|snake-move-left|snake-move-right|snake-move-up|snake-pause-game|snake-reset-game|snake-start-game|snake-update-game|snake-update-score|snake-update-velocity|snake|snarf-spooks|snmp-calculate-indent|snmp-common-mode|snmp-completing-read|snmp-indent-line|snmp-mode-imenu-create-index|snmp-mode|snmpv2-mode|soap-array-type-element-type--cmacro|soap-array-type-element-type|soap-array-type-name--cmacro|soap-array-type-name|soap-array-type-namespace-tag--cmacro|soap-array-type-namespace-tag|soap-array-type-p--cmacro|soap-array-type-p|soap-basic-type-kind--cmacro|soap-basic-type-kind|soap-basic-type-name--cmacro|soap-basic-type-name|soap-basic-type-namespace-tag--cmacro|soap-basic-type-namespace-tag|soap-basic-type-p--cmacro|soap-basic-type-p|soap-binding-name--cmacro|soap-binding-name|soap-binding-namespace-tag--cmacro|soap-binding-namespace-tag|soap-binding-operations--cmacro|soap-binding-operations|soap-binding-p--cmacro|soap-binding-p|soap-binding-port-type--cmacro|soap-binding-port-type|soap-bound-operation-operation--cmacro|soap-bound-operation-operation|soap-bound-operation-p--cmacro|soap-bound-operation-p|soap-bound-operation-soap-action--cmacro|soap-bound-operation-soap-action|soap-bound-operation-use--cmacro|soap-bound-operation-use|soap-create-envelope|soap-decode-any-type|soap-decode-array-type|soap-decode-array|soap-decode-basic-type|soap-decode-sequence-type|soap-decode-type|soap-default-soapenc-types|soap-default-xsd-types|soap-element-fq-name|soap-element-name--cmacro|soap-element-name|soap-element-namespace-tag--cmacro|soap-element-namespace-tag|soap-element-p--cmacro|soap-element-p|soap-encode-array-type|soap-encode-basic-type|soap-encode-body|soap-encode-sequence-type|soap-encode-simple-type|soap-encode-value|soap-extract-xmlns|soap-get-target-namespace|soap-invoke|soap-l2fq|soap-l2wk|soap-load-wsdl-from-url|soap-load-wsdl|soap-message-name--cmacro|soap-message-name|soap-message-namespace-tag--cmacro|soap-message-namespace-tag|soap-message-p--cmacro|soap-message-p|soap-message-parts--cmacro|soap-message-parts|soap-namespace-elements--cmacro|soap-namespace-elements|soap-namespace-get|soap-namespace-link-name--cmacro|soap-namespace-link-name|soap-namespace-link-namespace-tag--cmacro|soap-namespace-link-namespace-tag|soap-namespace-link-p--cmacro|soap-namespace-link-p|soap-namespace-link-target--cmacro|soap-namespace-link-target|soap-namespace-name--cmacro|soap-namespace-name|soap-namespace-p--cmacro|soap-namespace-p|soap-namespace-put-link|soap-namespace-put|soap-operation-faults--cmacro|soap-operation-faults|soap-operation-input--cmacro|soap-operation-input|soap-operation-name--cmacro|soap-operation-name|soap-operation-namespace-tag--cmacro|soap-operation-namespace-tag|soap-operation-output--cmacro|soap-operation-output|soap-operation-p--cmacro|soap-operation-p|soap-operation-parameter-order--cmacro|soap-operation-parameter-order|soap-parse-binding|soap-parse-complex-type-complex-content|soap-parse-complex-type-sequence|soap-parse-complex-type|soap-parse-envelope|soap-parse-message|soap-parse-operation|soap-parse-port-type|soap-parse-response|soap-parse-schema-element|soap-parse-schema|soap-parse-sequence|soap-parse-simple-type|soap-parse-wsdl|soap-port-binding--cmacro|soap-port-binding|soap-port-name--cmacro|soap-port-name|soap-port-namespace-tag--cmacro|soap-port-namespace-tag|soap-port-p--cmacro|soap-port-p|soap-port-service-url--cmacro|soap-port-service-url|soap-port-type-name--cmacro|soap-port-type-name|soap-port-type-namespace-tag--cmacro|soap-port-type-namespace-tag|soap-port-type-operations--cmacro|soap-port-type-operations|soap-port-type-p--cmacro|soap-port-type-p|soap-resolve-references-for-array-type|soap-resolve-references-for-binding|soap-resolve-references-for-element|soap-resolve-references-for-message|soap-resolve-references-for-operation|soap-resolve-references-for-port|soap-resolve-references-for-sequence-type|soap-resolve-references-for-simple-type|soap-sequence-element-multiple\\?--cmacro|soap-sequence-element-multiple\\?|soap-sequence-element-name--cmacro|soap-sequence-element-name|soap-sequence-element-nillable\\?--cmacro|soap-sequence-element-nillable\\?|soap-sequence-element-p--cmacro|soap-sequence-element-p|soap-sequence-element-type--cmacro|soap-sequence-element-type|soap-sequence-type-elements--cmacro|soap-sequence-type-elements|soap-sequence-type-name--cmacro|soap-sequence-type-name|soap-sequence-type-namespace-tag--cmacro|soap-sequence-type-namespace-tag|soap-sequence-type-p--cmacro|soap-sequence-type-p|soap-sequence-type-parent--cmacro|soap-sequence-type-parent|soap-simple-type-enumeration--cmacro|soap-simple-type-enumeration|soap-simple-type-kind--cmacro|soap-simple-type-kind|soap-simple-type-name--cmacro|soap-simple-type-name|soap-simple-type-namespace-tag--cmacro|soap-simple-type-namespace-tag|soap-simple-type-p--cmacro|soap-simple-type-p|soap-type-p|soap-warning|soap-with-local-xmlns|soap-wk2l|soap-wsdl-add-alias|soap-wsdl-add-namespace|soap-wsdl-alias-table--cmacro|soap-wsdl-alias-table|soap-wsdl-find-namespace|soap-wsdl-get|soap-wsdl-namespaces--cmacro|soap-wsdl-namespaces|soap-wsdl-origin--cmacro|soap-wsdl-origin|soap-wsdl-p--cmacro|soap-wsdl-p|soap-wsdl-ports--cmacro|soap-wsdl-ports|soap-wsdl-resolve-references|soap-xml-get-attribute-or-nil1|soap-xml-get-children1|socks-build-auth-list|socks-chap-auth|socks-cram-auth|socks-filter|socks-find-route|socks-find-services-entry|socks-gssapi-auth|socks-nslookup-host|socks-open-connection|socks-open-network-stream|socks-original-open-network-stream|socks-parse-services|socks-register-authentication-method|socks-send-command|socks-split-string|socks-unregister-authentication-method|socks-username\\/password-auth-filter|socks-username\\/password-auth|socks-wait-for-state-change|solicit-char-in-string|solitaire-build-mode-line|solitaire-center-point|solitaire-check|solitaire-current-line|solitaire-do-check|solitaire-down|solitaire-insert-board|solitaire-left|solitaire-mode|solitaire-move-down|solitaire-move-left|solitaire-move-right|solitaire-move-up|solitaire-move|solitaire-possible-move|solitaire-right|solitaire-solve|solitaire-undo|solitaire-up|solitaire|some-window|some|sort\\*|sort-build-lists|sort-charsets|sort-coding-systems|sort-fields-1|sort-pages-buffer|sort-pages-in-region|sort-regexp-fields-next-record|sort-reorder-buffer|sort-skip-fields|soundex|spaces-string|spam-initialize|spam-report-agentize|spam-report-deagentize|spam-report-process-queue|spam-report-url-ping-mm-url|spam-report-url-to-file|special-display-p|special-display-popup-frame|speedbar-add-expansion-list|speedbar-add-ignored-directory-regexp|speedbar-add-ignored-path-regexp|speedbar-add-indicator|speedbar-add-localized-speedbar-support|speedbar-add-mode-functions-list|speedbar-add-supported-extension|speedbar-backward-list|speedbar-buffer-buttons-engine|speedbar-buffer-buttons-temp|speedbar-buffer-buttons|speedbar-buffer-click|speedbar-buffer-kill-buffer|speedbar-buffer-revert-buffer|speedbar-buffers-item-info|speedbar-buffers-line-directory|speedbar-buffers-line-path|speedbar-buffers-tail-notes|speedbar-center-buffer-smartly|speedbar-change-expand-button-char|speedbar-change-initial-expansion-list|speedbar-check-obj-this-line|speedbar-check-objects|speedbar-check-read-only|speedbar-check-vc-this-line|speedbar-check-vc|speedbar-clear-current-file|speedbar-click|speedbar-contract-line-descendants|speedbar-contract-line|speedbar-create-directory)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)s(?:hr-insert-image|hr-insert-table-ruler|hr-insert-table|hr-insert|hr-make-table-1|hr-make-table|hr-max-columns|hr-mouse-browse-url|hr-next-link|hr-parse-base|hr-parse-image-data|hr-parse-style|hr-previous-link|hr-previous-newline-padding-width|hr-pro-rate-columns|hr-put-image|hr-remove-trailing-whitespace|hr-render-buffer|hr-render-region|hr-render-td|hr-rescale-image|hr-save-contents|hr-show-alt-text|hr-store-contents|hr-table-widths|hr-tag-a|hr-tag-audio|hr-tag-b|hr-tag-base|hr-tag-blockquote|hr-tag-body|hr-tag-br|hr-tag-comment|hr-tag-dd|hr-tag-del|hr-tag-div|hr-tag-dl|hr-tag-dt|hr-tag-em|hr-tag-font|hr-tag-h1|hr-tag-h2|hr-tag-h3|hr-tag-h4|hr-tag-h5|hr-tag-h6|hr-tag-hr|hr-tag-i|hr-tag-img|hr-tag-label|hr-tag-li|hr-tag-object|hr-tag-ol|hr-tag-p|hr-tag-pre|hr-tag-s|hr-tag-script|hr-tag-span|hr-tag-strong|hr-tag-style|hr-tag-sub|hr-tag-sup|hr-tag-svg|hr-tag-table-1|hr-tag-table|hr-tag-title|hr-tag-u|hr-tag-ul|hr-tag-video|hr-urlify|hr-zoom-image|hrink-window-horizontally|hrink-window|huffle-vector|ieve-manage|ieve-mode|ieve-upload-and-bury|ieve-upload-and-kill|ieve-upload|ignum|imula-backward-up-level|imula-calculate-indent|imula-context|imula-electric-keyword|imula-electric-label|imula-expand-keyword|imula-expand-stdproc|imula-find-do-match|imula-find-if|imula-find-inspect|imula-forward-down-level|imula-forward-up-level|imula-goto-definition|imula-indent-command|imula-indent-exp|imula-indent-line|imula-inside-parens|imula-install-standard-abbrevs|imula-mode|imula-next-statement|imula-popup-menu|imula-previous-statement|imula-search-backward|imula-search-forward|imula-skip-comment-backward|imula-skip-comment-forward|imula-submit-bug-report|ixth|ize-indication-mode|keleton-insert|keleton-internal-1|keleton-internal-list|keleton-pair-insert-maybe|keleton-proxy-new|keleton-read|kip-line-prefix|litex-mode|lot-boundp|lot-exists-p|lot-makeunbound|lot-missing|lot-unbound|lot-value|mbclient-list-shares|mbclient-mode|mbclient|merge--get-marker|merge-apply-resolution-patch|merge-auto-combine|merge-auto-leave|merge-batch-resolve|merge-check|merge-combine-with-next|merge-conflict-overlay|merge-context-menu|merge-diff-base-mine|merge-diff-base-other|merge-diff-mine-other|merge-diff|merge-ediff|merge-ensure-match|merge-find-conflict|merge-get-current|merge-keep-all|merge-keep-base|merge-keep-current|merge-keep-mine|merge-keep-n|merge-keep-other|merge-kill-current|merge-makeup-conflict|merge-match-conflict|merge-mode-menu|merge-mode|merge-next|merge-popup-context-menu|merge-prev|merge-refine-chopup-region|merge-refine-forward|merge-refine-highlight-change|merge-refine-subst|merge-refine|merge-remove-props|merge-resolve--extract-comment|merge-resolve--normalize|merge-resolve-all|merge-resolve|merge-start-session|merge-swap|mie--associative-p|mie--matching-block-data|mie--next-indent-change|mie--opener/closer-at-point|mie-auto-fill|mie-backward-sexp-command|mie-backward-sexp|mie-blink-matching-check|mie-blink-matching-open|mie-bnf--classify|mie-bnf--closer-alist|mie-bnf--set-class|mie-config--advice|mie-config--get-trace|mie-config--guess-1|mie-config--guess-value|mie-config--guess|mie-config--mode-hook|mie-config--setter|mie-debug--describe-cycle|mie-debug--prec2-cycle|mie-default-backward-token|mie-default-forward-token|mie-edebug|mie-forward-sexp-command|mie-forward-sexp|mie-indent--bolp-1|mie-indent--bolp|mie-indent--hanging-p|mie-indent--offset|mie-indent--parent|mie-indent--rule-1|mie-indent--rule|mie-indent--separator-outdent|mie-indent-after-keyword|mie-indent-backward-token|mie-indent-bob|mie-indent-calculate|mie-indent-close|mie-indent-comment-close|mie-indent-comment-continue|mie-indent-comment-inside|mie-indent-comment|mie-indent-exps|mie-indent-fixindent|mie-indent-forward-token|mie-indent-inside-string|mie-indent-keyword|mie-indent-line|mie-indent-virtual|mie-next-sexp|mie-op-left|mie-op-right|mie-set-prec2tab|miley-buffer|miley-region|mtpmail-command-or-throw|mtpmail-cred-cert|mtpmail-cred-key|mtpmail-cred-passwd|mtpmail-cred-port|mtpmail-cred-server|mtpmail-cred-user|mtpmail-deduce-address-list|mtpmail-do-bcc|mtpmail-find-credentials|mtpmail-fqdn|mtpmail-intersection|mtpmail-maybe-append-domain|mtpmail-ok-p|mtpmail-process-filter|mtpmail-query-smtp-server|mtpmail-read-response|mtpmail-response-code|mtpmail-response-text|mtpmail-send-command|mtpmail-send-data-1|mtpmail-send-data|mtpmail-send-it|mtpmail-send-queued-mail|mtpmail-try-auth-method|mtpmail-try-auth-methods|mtpmail-user-mail-address|mtpmail-via-smtp|nake-active-p|nake-display-options|nake-end-game|nake-final-x-velocity|nake-final-y-velocity|nake-init-buffer|nake-mode|nake-move-down|nake-move-left|nake-move-right|nake-move-up|nake-pause-game|nake-reset-game|nake-start-game|nake-update-game|nake-update-score|nake-update-velocity|nake|narf-spooks|nmp-calculate-indent|nmp-common-mode|nmp-completing-read|nmp-indent-line|nmp-mode-imenu-create-index|nmp-mode|nmpv2-mode|oap-array-type-element-type--cmacro|oap-array-type-element-type|oap-array-type-name--cmacro|oap-array-type-name|oap-array-type-namespace-tag--cmacro|oap-array-type-namespace-tag|oap-array-type-p--cmacro|oap-array-type-p|oap-basic-type-kind--cmacro|oap-basic-type-kind|oap-basic-type-name--cmacro|oap-basic-type-name|oap-basic-type-namespace-tag--cmacro|oap-basic-type-namespace-tag|oap-basic-type-p--cmacro|oap-basic-type-p|oap-binding-name--cmacro|oap-binding-name|oap-binding-namespace-tag--cmacro|oap-binding-namespace-tag|oap-binding-operations--cmacro|oap-binding-operations|oap-binding-p--cmacro|oap-binding-p|oap-binding-port-type--cmacro|oap-binding-port-type|oap-bound-operation-operation--cmacro|oap-bound-operation-operation|oap-bound-operation-p--cmacro|oap-bound-operation-p|oap-bound-operation-soap-action--cmacro|oap-bound-operation-soap-action|oap-bound-operation-use--cmacro|oap-bound-operation-use|oap-create-envelope|oap-decode-any-type|oap-decode-array-type|oap-decode-array|oap-decode-basic-type|oap-decode-sequence-type|oap-decode-type|oap-default-soapenc-types|oap-default-xsd-types|oap-element-fq-name|oap-element-name--cmacro|oap-element-name|oap-element-namespace-tag--cmacro|oap-element-namespace-tag|oap-element-p--cmacro|oap-element-p|oap-encode-array-type|oap-encode-basic-type|oap-encode-body|oap-encode-sequence-type|oap-encode-simple-type|oap-encode-value|oap-extract-xmlns|oap-get-target-namespace|oap-invoke|oap-l2fq|oap-l2wk|oap-load-wsdl-from-url|oap-load-wsdl|oap-message-name--cmacro|oap-message-name|oap-message-namespace-tag--cmacro|oap-message-namespace-tag|oap-message-p--cmacro|oap-message-p|oap-message-parts--cmacro|oap-message-parts|oap-namespace-elements--cmacro|oap-namespace-elements|oap-namespace-get|oap-namespace-link-name--cmacro|oap-namespace-link-name|oap-namespace-link-namespace-tag--cmacro|oap-namespace-link-namespace-tag|oap-namespace-link-p--cmacro|oap-namespace-link-p|oap-namespace-link-target--cmacro|oap-namespace-link-target|oap-namespace-name--cmacro|oap-namespace-name|oap-namespace-p--cmacro|oap-namespace-p|oap-namespace-put-link|oap-namespace-put|oap-operation-faults--cmacro|oap-operation-faults|oap-operation-input--cmacro|oap-operation-input|oap-operation-name--cmacro|oap-operation-name|oap-operation-namespace-tag--cmacro|oap-operation-namespace-tag|oap-operation-output--cmacro|oap-operation-output|oap-operation-p--cmacro|oap-operation-p|oap-operation-parameter-order--cmacro|oap-operation-parameter-order|oap-parse-binding|oap-parse-complex-type-complex-content|oap-parse-complex-type-sequence|oap-parse-complex-type|oap-parse-envelope|oap-parse-message|oap-parse-operation|oap-parse-port-type|oap-parse-response|oap-parse-schema-element|oap-parse-schema|oap-parse-sequence|oap-parse-simple-type|oap-parse-wsdl|oap-port-binding--cmacro|oap-port-binding|oap-port-name--cmacro|oap-port-name|oap-port-namespace-tag--cmacro|oap-port-namespace-tag|oap-port-p--cmacro|oap-port-p|oap-port-service-url--cmacro|oap-port-service-url|oap-port-type-name--cmacro|oap-port-type-name|oap-port-type-namespace-tag--cmacro|oap-port-type-namespace-tag|oap-port-type-operations--cmacro|oap-port-type-operations|oap-port-type-p--cmacro|oap-port-type-p|oap-resolve-references-for-array-type|oap-resolve-references-for-binding|oap-resolve-references-for-element|oap-resolve-references-for-message|oap-resolve-references-for-operation|oap-resolve-references-for-port|oap-resolve-references-for-sequence-type|oap-resolve-references-for-simple-type|oap-sequence-element-multiple\\?--cmacro|oap-sequence-element-multiple\\?|oap-sequence-element-name--cmacro|oap-sequence-element-name|oap-sequence-element-nillable\\?--cmacro|oap-sequence-element-nillable\\?|oap-sequence-element-p--cmacro|oap-sequence-element-p|oap-sequence-element-type--cmacro|oap-sequence-element-type|oap-sequence-type-elements--cmacro|oap-sequence-type-elements|oap-sequence-type-name--cmacro|oap-sequence-type-name|oap-sequence-type-namespace-tag--cmacro|oap-sequence-type-namespace-tag|oap-sequence-type-p--cmacro|oap-sequence-type-p|oap-sequence-type-parent--cmacro|oap-sequence-type-parent|oap-simple-type-enumeration--cmacro|oap-simple-type-enumeration|oap-simple-type-kind--cmacro|oap-simple-type-kind|oap-simple-type-name--cmacro|oap-simple-type-name|oap-simple-type-namespace-tag--cmacro|oap-simple-type-namespace-tag|oap-simple-type-p--cmacro|oap-simple-type-p|oap-type-p|oap-warning|oap-with-local-xmlns|oap-wk2l|oap-wsdl-add-alias|oap-wsdl-add-namespace|oap-wsdl-alias-table--cmacro|oap-wsdl-alias-table|oap-wsdl-find-namespace|oap-wsdl-get|oap-wsdl-namespaces--cmacro|oap-wsdl-namespaces|oap-wsdl-origin--cmacro|oap-wsdl-origin|oap-wsdl-p--cmacro|oap-wsdl-p|oap-wsdl-ports--cmacro|oap-wsdl-ports|oap-wsdl-resolve-references|oap-xml-get-attribute-or-nil1|oap-xml-get-children1|ocks-build-auth-list|ocks-chap-auth|ocks-cram-auth|ocks-filter|ocks-find-route|ocks-find-services-entry|ocks-gssapi-auth|ocks-nslookup-host|ocks-open-connection|ocks-open-network-stream|ocks-original-open-network-stream|ocks-parse-services|ocks-register-authentication-method|ocks-send-command|ocks-split-string|ocks-unregister-authentication-method|ocks-username/password-auth-filter|ocks-username/password-auth|ocks-wait-for-state-change|olicit-char-in-string|olitaire-build-mode-line|olitaire-center-point|olitaire-check|olitaire-current-line|olitaire-do-check|olitaire-down|olitaire-insert-board|olitaire-left|olitaire-mode|olitaire-move-down|olitaire-move-left|olitaire-move-right|olitaire-move-up|olitaire-move|olitaire-possible-move|olitaire-right|olitaire-solve|olitaire-undo|olitaire-up|olitaire|ome-window|ome|ort\\*|ort-build-lists|ort-charsets|ort-coding-systems|ort-fields-1|ort-pages-buffer|ort-pages-in-region|ort-regexp-fields-next-record|ort-reorder-buffer|ort-skip-fields|oundex|paces-string|pam-initialize|pam-report-agentize|pam-report-deagentize|pam-report-process-queue|pam-report-url-ping-mm-url|pam-report-url-to-file|pecial-display-p|pecial-display-popup-frame|peedbar-add-expansion-list|peedbar-add-ignored-directory-regexp|peedbar-add-ignored-path-regexp|peedbar-add-indicator|peedbar-add-localized-speedbar-support|peedbar-add-mode-functions-list|peedbar-add-supported-extension|peedbar-backward-list|peedbar-buffer-buttons-engine|peedbar-buffer-buttons-temp|peedbar-buffer-buttons|peedbar-buffer-click|peedbar-buffer-kill-buffer|peedbar-buffer-revert-buffer|peedbar-buffers-item-info|peedbar-buffers-line-directory|peedbar-buffers-line-path|peedbar-buffers-tail-notes|peedbar-center-buffer-smartly|peedbar-change-expand-button-char|peedbar-change-initial-expansion-list|peedbar-check-obj-this-line|peedbar-check-objects|peedbar-check-read-only|peedbar-check-vc-this-line|peedbar-check-vc|peedbar-clear-current-file|peedbar-click|peedbar-contract-line-descendants|peedbar-contract-line|peedbar-create-directory)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:speedbar-create-tag-hierarchy|speedbar-current-frame|speedbar-customize|speedbar-default-directory-list|speedbar-delete-overlay|speedbar-delete-subblock|speedbar-dir-follow|speedbar-directory-buttons-follow|speedbar-directory-buttons|speedbar-directory-line|speedbar-dired|speedbar-disable-update|speedbar-do-function-pointer|speedbar-edit-line|speedbar-enable-update|speedbar-expand-line-descendants|speedbar-expand-line|speedbar-extension-list-to-regex|speedbar-extract-one-symbol|speedbar-fetch-dynamic-etags|speedbar-fetch-dynamic-imenu|speedbar-fetch-dynamic-tags|speedbar-fetch-replacement-function|speedbar-file-lists|speedbar-files-item-info|speedbar-files-line-directory|speedbar-find-file-in-frame|speedbar-find-file|speedbar-find-selected-file|speedbar-flush-expand-line|speedbar-forward-list|speedbar-frame-mode|speedbar-frame-reposition-smartly|speedbar-frame-width|speedbar-generic-item-info|speedbar-generic-list-group-p|speedbar-generic-list-positioned-group-p|speedbar-generic-list-tag-p|speedbar-get-focus|speedbar-goto-this-file|speedbar-handle-delete-frame|speedbar-highlight-one-tag-line|speedbar-image-dump|speedbar-initial-expansion-list|speedbar-initial-keymap|speedbar-initial-menu|speedbar-initial-stealthy-functions|speedbar-insert-button|speedbar-insert-etags-list|speedbar-insert-files-at-point|speedbar-insert-generic-list|speedbar-insert-image-button-maybe|speedbar-insert-imenu-list|speedbar-insert-separator|speedbar-item-byte-compile|speedbar-item-copy|speedbar-item-delete|speedbar-item-info-file-helper|speedbar-item-info-tag-helper|speedbar-item-info|speedbar-item-load|speedbar-item-object-delete|speedbar-item-rename|speedbar-line-directory|speedbar-line-file|speedbar-line-path|speedbar-line-text|speedbar-line-token|speedbar-make-button|speedbar-make-overlay|speedbar-make-specialized-keymap|speedbar-make-tag-line|speedbar-maybe-add-localized-support|speedbar-maybee-jump-to-attached-frame|speedbar-message|speedbar-mode-line-update|speedbar-mode|speedbar-mouse-item-info|speedbar-navigate-list|speedbar-next|speedbar-overlay-put|speedbar-parse-c-or-c\\+\\+tag|speedbar-parse-tex-string|speedbar-path-line|speedbar-position-cursor-on-line|speedbar-prefix-group-tag-hierarchy|speedbar-prev|speedbar-recenter-to-top|speedbar-recenter|speedbar-reconfigure-keymaps|speedbar-refresh|speedbar-remove-localized-speedbar-support|speedbar-reset-scanners|speedbar-restricted-move|speedbar-restricted-next|speedbar-restricted-prev|speedbar-scroll-down|speedbar-scroll-up|speedbar-select-attached-frame|speedbar-set-mode-line-format|speedbar-set-timer|speedbar-show-info-under-mouse|speedbar-simple-group-tag-hierarchy|speedbar-sort-tag-hierarchy|speedbar-stealthy-updates|speedbar-tag-expand|speedbar-tag-file|speedbar-tag-find|speedbar-this-file-in-vc|speedbar-timer-fn|speedbar-toggle-etags|speedbar-toggle-images|speedbar-toggle-line-expansion|speedbar-toggle-show-all-files|speedbar-toggle-sorting|speedbar-toggle-updates|speedbar-track-mouse|speedbar-trim-words-tag-hierarchy|speedbar-try-completion|speedbar-unhighlight-one-tag-line|speedbar-up-directory|speedbar-update-contents|speedbar-update-current-file|speedbar-update-directory-contents|speedbar-update-localized-contents|speedbar-update-special-contents|speedbar-vc-check-dir-p|speedbar-with-attached-buffer|speedbar-with-writable|speedbar-y-or-n-p|speedbar|split-char|split-line|split-window-horizontally|split-window-internal|split-window-vertically|spook|sql--completion-table|sql--make-help-docstring|sql--oracle-show-reserved-words|sql-accumulate-and-indent|sql-add-product-keywords|sql-add-product|sql-beginning-of-statement|sql-buffer-live-p|sql-build-completions-1|sql-build-completions|sql-comint-db2|sql-comint-informix|sql-comint-ingres|sql-comint-interbase|sql-comint-linter|sql-comint-ms|sql-comint-mysql|sql-comint-oracle|sql-comint-postgres|sql-comint-solid|sql-comint-sqlite|sql-comint-sybase|sql-comint-vertica|sql-comint|sql-connect|sql-connection-menu-filter|sql-copy-column|sql-db2|sql-default-value|sql-del-product|sql-end-of-statement|sql-ends-with-prompt-re|sql-escape-newlines-filter|sql-execute-feature|sql-execute|sql-find-sqli-buffer|sql-font-lock-keywords-builder|sql-for-each-login|sql-get-login-ext|sql-get-login|sql-get-product-feature|sql-help-list-products|sql-help|sql-highlight-ansi-keywords|sql-highlight-db2-keywords|sql-highlight-informix-keywords|sql-highlight-ingres-keywords|sql-highlight-interbase-keywords|sql-highlight-linter-keywords|sql-highlight-ms-keywords|sql-highlight-mysql-keywords|sql-highlight-oracle-keywords|sql-highlight-postgres-keywords|sql-highlight-product|sql-highlight-solid-keywords|sql-highlight-sqlite-keywords|sql-highlight-sybase-keywords|sql-highlight-vertica-keywords|sql-informix|sql-ingres|sql-input-sender|sql-interactive-mode-menu|sql-interactive-mode|sql-interactive-remove-continuation-prompt|sql-interbase|sql-linter|sql-list-all|sql-list-table|sql-magic-go|sql-magic-semicolon|sql-make-alternate-buffer-name|sql-mode-menu|sql-mode|sql-ms|sql-mysql|sql-oracle-completion-object|sql-oracle-list-all|sql-oracle-list-table|sql-oracle-restore-settings|sql-oracle-save-settings|sql-oracle|sql-placeholders-filter|sql-postgres-completion-object|sql-postgres|sql-product-font-lock-syntax-alist|sql-product-font-lock|sql-product-interactive|sql-product-syntax-table|sql-read-connection|sql-read-product|sql-read-table-name|sql-redirect-one|sql-redirect-value|sql-redirect|sql-regexp-abbrev-list|sql-regexp-abbrev|sql-remove-tabs-filter|sql-rename-buffer|sql-save-connection|sql-send-buffer|sql-send-line-and-next|sql-send-magic-terminator|sql-send-paragraph|sql-send-region|sql-send-string|sql-set-product-feature|sql-set-product|sql-set-sqli-buffer-generally|sql-set-sqli-buffer|sql-show-sqli-buffer|sql-solid|sql-sqlite-completion-object|sql-sqlite|sql-starts-with-prompt-re|sql-statement-regexp|sql-stop|sql-str-literal|sql-sybase|sql-toggle-pop-to-buffer-after-send-region|sql-vertica|squeeze-bidi-context-1|squeeze-bidi-context|srecode-compile-templates|srecode-document-insert-comment|srecode-document-insert-function-comment|srecode-document-insert-group-comments|srecode-document-insert-variable-one-line-comment|srecode-get-maps|srecode-insert-getset|srecode-insert-prototype-expansion|srecode-insert|srecode-minor-mode|srecode-semantic-handle-:c|srecode-semantic-handle-:cpp|srecode-semantic-handle-:el-custom|srecode-semantic-handle-:el|srecode-semantic-handle-:java|srecode-semantic-handle-:srt|srecode-semantic-handle-:texi|srecode-semantic-handle-:texitag|srecode-template-mode|srecode-template-setup-parser|srt-mode|stable-sort|standard-class|standard-display-8bit|standard-display-ascii|standard-display-cyrillic-translit|standard-display-default|standard-display-european-internal|standard-display-european|standard-display-g1|standard-display-graphic|standard-display-underline|start-kbd-macro|start-of-paragraph-text|start-scheme|starttls-any-program-available|starttls-available-p|starttls-negotiate-gnutls|starttls-negotiate|starttls-open-stream-gnutls|starttls-open-stream|starttls-set-process-query-on-exit-flag|startup-echo-area-message|straight-use-package|store-kbd-macro-event|string-blank-p|string-collate-equalp|string-collate-lessp|string-empty-p|string-insert-rectangle|string-join|string-make-multibyte|string-make-unibyte|string-rectangle-line|string-rectangle|string-remove-prefix|string-remove-suffix|string-reverse|string-to-list|string-to-vector|string-trim-left|string-trim-right|string-trim|strokes-alphabetic-lessp|strokes-button-press-event-p|strokes-button-release-event-p|strokes-click-p|strokes-compose-complex-stroke|strokes-decode-buffer|strokes-define-stroke|strokes-describe-stroke|strokes-distance-squared|strokes-do-complex-stroke|strokes-do-stroke|strokes-eliminate-consecutive-redundancies|strokes-encode-buffer|strokes-event-closest-point-1|strokes-event-closest-point|strokes-execute-stroke|strokes-fill-current-buffer-with-whitespace|strokes-fill-stroke|strokes-get-grid-position|strokes-get-stroke-extent|strokes-global-set-stroke-string|strokes-global-set-stroke|strokes-help|strokes-lift-p|strokes-list-strokes|strokes-load-user-strokes|strokes-match-stroke|strokes-mode|strokes-mouse-event-p|strokes-prompt-user-save-strokes|strokes-rate-stroke|strokes-read-complex-stroke|strokes-read-stroke|strokes-remassoc|strokes-renormalize-to-grid|strokes-report-bug|strokes-square|strokes-toggle-strokes-buffer|strokes-unload-function|strokes-unset-last-stroke|strokes-update-window-configuration|strokes-window-configuration-changed-p|strokes-xpm-char-bit-p|strokes-xpm-char-on-p|strokes-xpm-decode-char|strokes-xpm-encode-length-as-string|strokes-xpm-for-compressed-string|strokes-xpm-for-stroke|strokes-xpm-to-compressed-string|studlify-buffer|studlify-region|studlify-word|sublis|subr-name|subregexp-context-p|subseq|subsetp|subst-char-in-string|subst-if-not|subst-if|subst|substitute-env-in-file-name|substitute-env-vars|substitute-if-not|substitute-if|substitute-key-definition-key|substitute|subtract-time|subword-mode|sunrise-sunset|superword-mode|suspicious-object|svref|switch-to-completions|switch-to-lisp|switch-to-prolog|switch-to-scheme|switch-to-tcl|symbol-at-point|symbol-before-point-for-complete|symbol-before-point|symbol-macrolet|symbol-under-or-before-point|symbol-under-point|syntax-ppss-after-change-function|syntax-ppss-context|syntax-ppss-debug|syntax-ppss-depth|syntax-ppss-stats|syntax-propertize--shift-groups|syntax-propertize-multiline|syntax-propertize-precompile-rules|syntax-propertize-rules|syntax-propertize-via-font-lock|syntax-propertize-wholelines|syntax-propertize|t-mouse-mode|tabify|table--at-cell-p|table--buffer-substring-and-trim|table--cancel-timer|table--cell-blank-str|table--cell-can-span-p|table--cell-can-split-horizontally-p|table--cell-can-split-vertically-p|table--cell-horizontal-char-p|table--cell-insert-char|table--cell-list-to-coord-list|table--cell-to-coord|table--char-in-str-at-column|table--copy-coordinate|table--create-growing-space-below|table--current-line|table--detect-cell-alignment|table--editable-cell-p|table--fill-region-strictly|table--fill-region|table--find-row-column|table--finish-delayed-tasks|table--generate-source-cell-contents|table--generate-source-cells-in-a-row|table--generate-source-epilogue|table--generate-source-prologue|table--generate-source-scan-lines|table--generate-source-scan-rows|table--get-cell-justify-property|table--get-cell-valign-property|table--get-coordinate|table--get-last-command|table--get-property|table--goto-coordinate|table--horizontal-cell-list|table--horizontally-shift-above-and-below|table--insert-rectangle|table--justify-cell-contents|table--line-column-position|table--log|table--make-cell-map|table--measure-max-width|table--min-coord-list|table--multiply-string|table--offset-coordinate|table--point-entered-cell-function|table--point-in-cell-p|table--point-left-cell-function|table--probe-cell-left-up|table--probe-cell-right-bottom|table--probe-cell|table--put-cell-content-property|table--put-cell-face-property|table--put-cell-indicator-property|table--put-cell-justify-property|table--put-cell-keymap-property|table--put-cell-line-property|table--put-cell-point-entered\\/left-property|table--put-cell-property|table--put-cell-rear-nonsticky|table--put-cell-valign-property|table--put-property|table--query-justification|table--read-from-minibuffer|table--region-in-cell-p|table--remove-blank-lines|table--remove-cell-properties|table--remove-eol-spaces|table--row-column-insertion-point-p|table--set-timer|table--spacify-frame|table--str-index-at-column|table--string-to-number-list|table--test-cell-list|table--transcoord-cache-to-table|table--transcoord-table-to-cache|table--uniform-list-p|table--untabify-line|table--untabify|table--update-cell-face|table--update-cell-heightened|table--update-cell-widened|table--update-cell|table--valign|table--vertical-cell-list|table--warn-incompatibility|table-backward-cell|table-capture|table-delete-column|table-delete-row|table-fixed-width-mode|table-forward-cell|table-function|table-generate-source|table-get-source-info|table-global-menu-map|table-goto-bottom-left-corner|table-goto-bottom-right-corner|table-goto-top-left-corner|table-goto-top-right-corner|table-heighten-cell|table-insert-column|table-insert-row-column|table-insert-row|table-insert-sequence|table-insert|table-justify-cell|table-justify-column|table-justify-row|table-justify|table-narrow-cell|table-put-source-info|table-query-dimension|table-recognize-cell|table-recognize-region)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(?:speedbar-create-tag-hierarchy|speedbar-current-frame|speedbar-customize|speedbar-default-directory-list|speedbar-delete-overlay|speedbar-delete-subblock|speedbar-dir-follow|speedbar-directory-buttons-follow|speedbar-directory-buttons|speedbar-directory-line|speedbar-dired|speedbar-disable-update|speedbar-do-function-pointer|speedbar-edit-line|speedbar-enable-update|speedbar-expand-line-descendants|speedbar-expand-line|speedbar-extension-list-to-regex|speedbar-extract-one-symbol|speedbar-fetch-dynamic-etags|speedbar-fetch-dynamic-imenu|speedbar-fetch-dynamic-tags|speedbar-fetch-replacement-function|speedbar-file-lists|speedbar-files-item-info|speedbar-files-line-directory|speedbar-find-file-in-frame|speedbar-find-file|speedbar-find-selected-file|speedbar-flush-expand-line|speedbar-forward-list|speedbar-frame-mode|speedbar-frame-reposition-smartly|speedbar-frame-width|speedbar-generic-item-info|speedbar-generic-list-group-p|speedbar-generic-list-positioned-group-p|speedbar-generic-list-tag-p|speedbar-get-focus|speedbar-goto-this-file|speedbar-handle-delete-frame|speedbar-highlight-one-tag-line|speedbar-image-dump|speedbar-initial-expansion-list|speedbar-initial-keymap|speedbar-initial-menu|speedbar-initial-stealthy-functions|speedbar-insert-button|speedbar-insert-etags-list|speedbar-insert-files-at-point|speedbar-insert-generic-list|speedbar-insert-image-button-maybe|speedbar-insert-imenu-list|speedbar-insert-separator|speedbar-item-byte-compile|speedbar-item-copy|speedbar-item-delete|speedbar-item-info-file-helper|speedbar-item-info-tag-helper|speedbar-item-info|speedbar-item-load|speedbar-item-object-delete|speedbar-item-rename|speedbar-line-directory|speedbar-line-file|speedbar-line-path|speedbar-line-text|speedbar-line-token|speedbar-make-button|speedbar-make-overlay|speedbar-make-specialized-keymap|speedbar-make-tag-line|speedbar-maybe-add-localized-support|speedbar-maybee-jump-to-attached-frame|speedbar-message|speedbar-mode-line-update|speedbar-mode|speedbar-mouse-item-info|speedbar-navigate-list|speedbar-next|speedbar-overlay-put|speedbar-parse-c-or-c\\+\\+tag|speedbar-parse-tex-string|speedbar-path-line|speedbar-position-cursor-on-line|speedbar-prefix-group-tag-hierarchy|speedbar-prev|speedbar-recenter-to-top|speedbar-recenter|speedbar-reconfigure-keymaps|speedbar-refresh|speedbar-remove-localized-speedbar-support|speedbar-reset-scanners|speedbar-restricted-move|speedbar-restricted-next|speedbar-restricted-prev|speedbar-scroll-down|speedbar-scroll-up|speedbar-select-attached-frame|speedbar-set-mode-line-format|speedbar-set-timer|speedbar-show-info-under-mouse|speedbar-simple-group-tag-hierarchy|speedbar-sort-tag-hierarchy|speedbar-stealthy-updates|speedbar-tag-expand|speedbar-tag-file|speedbar-tag-find|speedbar-this-file-in-vc|speedbar-timer-fn|speedbar-toggle-etags|speedbar-toggle-images|speedbar-toggle-line-expansion|speedbar-toggle-show-all-files|speedbar-toggle-sorting|speedbar-toggle-updates|speedbar-track-mouse|speedbar-trim-words-tag-hierarchy|speedbar-try-completion|speedbar-unhighlight-one-tag-line|speedbar-up-directory|speedbar-update-contents|speedbar-update-current-file|speedbar-update-directory-contents|speedbar-update-localized-contents|speedbar-update-special-contents|speedbar-vc-check-dir-p|speedbar-with-attached-buffer|speedbar-with-writable|speedbar-y-or-n-p|speedbar|split-char|split-line|split-window-horizontally|split-window-internal|split-window-vertically|spook|sql--completion-table|sql--make-help-docstring|sql--oracle-show-reserved-words|sql-accumulate-and-indent|sql-add-product-keywords|sql-add-product|sql-beginning-of-statement|sql-buffer-live-p|sql-build-completions-1|sql-build-completions|sql-comint-db2|sql-comint-informix|sql-comint-ingres|sql-comint-interbase|sql-comint-linter|sql-comint-ms|sql-comint-mysql|sql-comint-oracle|sql-comint-postgres|sql-comint-solid|sql-comint-sqlite|sql-comint-sybase|sql-comint-vertica|sql-comint|sql-connect|sql-connection-menu-filter|sql-copy-column|sql-db2|sql-default-value|sql-del-product|sql-end-of-statement|sql-ends-with-prompt-re|sql-escape-newlines-filter|sql-execute-feature|sql-execute|sql-find-sqli-buffer|sql-font-lock-keywords-builder|sql-for-each-login|sql-get-login-ext|sql-get-login|sql-get-product-feature|sql-help-list-products|sql-help|sql-highlight-ansi-keywords|sql-highlight-db2-keywords|sql-highlight-informix-keywords|sql-highlight-ingres-keywords|sql-highlight-interbase-keywords|sql-highlight-linter-keywords|sql-highlight-ms-keywords|sql-highlight-mysql-keywords|sql-highlight-oracle-keywords|sql-highlight-postgres-keywords|sql-highlight-product|sql-highlight-solid-keywords|sql-highlight-sqlite-keywords|sql-highlight-sybase-keywords|sql-highlight-vertica-keywords|sql-informix|sql-ingres|sql-input-sender|sql-interactive-mode-menu|sql-interactive-mode|sql-interactive-remove-continuation-prompt|sql-interbase|sql-linter|sql-list-all|sql-list-table|sql-magic-go|sql-magic-semicolon|sql-make-alternate-buffer-name|sql-mode-menu|sql-mode|sql-ms|sql-mysql|sql-oracle-completion-object|sql-oracle-list-all|sql-oracle-list-table|sql-oracle-restore-settings|sql-oracle-save-settings|sql-oracle|sql-placeholders-filter|sql-postgres-completion-object|sql-postgres|sql-product-font-lock-syntax-alist|sql-product-font-lock|sql-product-interactive|sql-product-syntax-table|sql-read-connection|sql-read-product|sql-read-table-name|sql-redirect-one|sql-redirect-value|sql-redirect|sql-regexp-abbrev-list|sql-regexp-abbrev|sql-remove-tabs-filter|sql-rename-buffer|sql-save-connection|sql-send-buffer|sql-send-line-and-next|sql-send-magic-terminator|sql-send-paragraph|sql-send-region|sql-send-string|sql-set-product-feature|sql-set-product|sql-set-sqli-buffer-generally|sql-set-sqli-buffer|sql-show-sqli-buffer|sql-solid|sql-sqlite-completion-object|sql-sqlite|sql-starts-with-prompt-re|sql-statement-regexp|sql-stop|sql-str-literal|sql-sybase|sql-toggle-pop-to-buffer-after-send-region|sql-vertica|squeeze-bidi-context-1|squeeze-bidi-context|srecode-compile-templates|srecode-document-insert-comment|srecode-document-insert-function-comment|srecode-document-insert-group-comments|srecode-document-insert-variable-one-line-comment|srecode-get-maps|srecode-insert-getset|srecode-insert-prototype-expansion|srecode-insert|srecode-minor-mode|srecode-semantic-handle-:c|srecode-semantic-handle-:cpp|srecode-semantic-handle-:el-custom|srecode-semantic-handle-:el|srecode-semantic-handle-:java|srecode-semantic-handle-:srt|srecode-semantic-handle-:texi|srecode-semantic-handle-:texitag|srecode-template-mode|srecode-template-setup-parser|srt-mode|stable-sort|standard-class|standard-display-8bit|standard-display-ascii|standard-display-cyrillic-translit|standard-display-default|standard-display-european-internal|standard-display-european|standard-display-g1|standard-display-graphic|standard-display-underline|start-kbd-macro|start-of-paragraph-text|start-scheme|starttls-any-program-available|starttls-available-p|starttls-negotiate-gnutls|starttls-negotiate|starttls-open-stream-gnutls|starttls-open-stream|starttls-set-process-query-on-exit-flag|startup-echo-area-message|straight-use-package|store-kbd-macro-event|string-blank-p|string-collate-equalp|string-collate-lessp|string-empty-p|string-insert-rectangle|string-join|string-make-multibyte|string-make-unibyte|string-rectangle-line|string-rectangle|string-remove-prefix|string-remove-suffix|string-reverse|string-to-list|string-to-vector|string-trim-left|string-trim-right|string-trim|strokes-alphabetic-lessp|strokes-button-press-event-p|strokes-button-release-event-p|strokes-click-p|strokes-compose-complex-stroke|strokes-decode-buffer|strokes-define-stroke|strokes-describe-stroke|strokes-distance-squared|strokes-do-complex-stroke|strokes-do-stroke|strokes-eliminate-consecutive-redundancies|strokes-encode-buffer|strokes-event-closest-point-1|strokes-event-closest-point|strokes-execute-stroke|strokes-fill-current-buffer-with-whitespace|strokes-fill-stroke|strokes-get-grid-position|strokes-get-stroke-extent|strokes-global-set-stroke-string|strokes-global-set-stroke|strokes-help|strokes-lift-p|strokes-list-strokes|strokes-load-user-strokes|strokes-match-stroke|strokes-mode|strokes-mouse-event-p|strokes-prompt-user-save-strokes|strokes-rate-stroke|strokes-read-complex-stroke|strokes-read-stroke|strokes-remassoc|strokes-renormalize-to-grid|strokes-report-bug|strokes-square|strokes-toggle-strokes-buffer|strokes-unload-function|strokes-unset-last-stroke|strokes-update-window-configuration|strokes-window-configuration-changed-p|strokes-xpm-char-bit-p|strokes-xpm-char-on-p|strokes-xpm-decode-char|strokes-xpm-encode-length-as-string|strokes-xpm-for-compressed-string|strokes-xpm-for-stroke|strokes-xpm-to-compressed-string|studlify-buffer|studlify-region|studlify-word|sublis|subr-name|subregexp-context-p|subseq|subsetp|subst-char-in-string|subst-if-not|subst-if|subst|substitute-env-in-file-name|substitute-env-vars|substitute-if-not|substitute-if|substitute-key-definition-key|substitute|subtract-time|subword-mode|sunrise-sunset|superword-mode|suspicious-object|svref|switch-to-completions|switch-to-lisp|switch-to-prolog|switch-to-scheme|switch-to-tcl|symbol-at-point|symbol-before-point-for-complete|symbol-before-point|symbol-macrolet|symbol-under-or-before-point|symbol-under-point|syntax-ppss-after-change-function|syntax-ppss-context|syntax-ppss-debug|syntax-ppss-depth|syntax-ppss-stats|syntax-propertize--shift-groups|syntax-propertize-multiline|syntax-propertize-precompile-rules|syntax-propertize-rules|syntax-propertize-via-font-lock|syntax-propertize-wholelines|syntax-propertize|t-mouse-mode|tabify|table--at-cell-p|table--buffer-substring-and-trim|table--cancel-timer|table--cell-blank-str|table--cell-can-span-p|table--cell-can-split-horizontally-p|table--cell-can-split-vertically-p|table--cell-horizontal-char-p|table--cell-insert-char|table--cell-list-to-coord-list|table--cell-to-coord|table--char-in-str-at-column|table--copy-coordinate|table--create-growing-space-below|table--current-line|table--detect-cell-alignment|table--editable-cell-p|table--fill-region-strictly|table--fill-region|table--find-row-column|table--finish-delayed-tasks|table--generate-source-cell-contents|table--generate-source-cells-in-a-row|table--generate-source-epilogue|table--generate-source-prologue|table--generate-source-scan-lines|table--generate-source-scan-rows|table--get-cell-justify-property|table--get-cell-valign-property|table--get-coordinate|table--get-last-command|table--get-property|table--goto-coordinate|table--horizontal-cell-list|table--horizontally-shift-above-and-below|table--insert-rectangle|table--justify-cell-contents|table--line-column-position|table--log|table--make-cell-map|table--measure-max-width|table--min-coord-list|table--multiply-string|table--offset-coordinate|table--point-entered-cell-function|table--point-in-cell-p|table--point-left-cell-function|table--probe-cell-left-up|table--probe-cell-right-bottom|table--probe-cell|table--put-cell-content-property|table--put-cell-face-property|table--put-cell-indicator-property|table--put-cell-justify-property|table--put-cell-keymap-property|table--put-cell-line-property|table--put-cell-point-entered/left-property|table--put-cell-property|table--put-cell-rear-nonsticky|table--put-cell-valign-property|table--put-property|table--query-justification|table--read-from-minibuffer|table--region-in-cell-p|table--remove-blank-lines|table--remove-cell-properties|table--remove-eol-spaces|table--row-column-insertion-point-p|table--set-timer|table--spacify-frame|table--str-index-at-column|table--string-to-number-list|table--test-cell-list|table--transcoord-cache-to-table|table--transcoord-table-to-cache|table--uniform-list-p|table--untabify-line|table--untabify|table--update-cell-face|table--update-cell-heightened|table--update-cell-widened|table--update-cell|table--valign|table--vertical-cell-list|table--warn-incompatibility|table-backward-cell|table-capture|table-delete-column|table-delete-row|table-fixed-width-mode|table-forward-cell|table-function|table-generate-source|table-get-source-info|table-global-menu-map|table-goto-bottom-left-corner|table-goto-bottom-right-corner|table-goto-top-left-corner|table-goto-top-right-corner|table-heighten-cell|table-insert-column|table-insert-row-column|table-insert-row|table-insert-sequence|table-insert|table-justify-cell|table-justify-column|table-justify-row|table-justify|table-narrow-cell|table-put-source-info|table-query-dimension|table-recognize-cell|table-recognize-region)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:table-recognize-table|table-recognize|table-release|table-shorten-cell|table-span-cell|table-split-cell-horizontally|table-split-cell-vertically|table-split-cell|table-unrecognize-cell|table-unrecognize-region|table-unrecognize-table|table-unrecognize|table-widen-cell|table-with-cache-buffer|tabulated-list--column-number|tabulated-list--sort-by-column-name|tabulated-list-col-sort|tabulated-list-delete-entry|tabulated-list-entry-size->|tabulated-list-get-entry|tabulated-list-get-id|tabulated-list-print-col|tabulated-list-print-entry|tabulated-list-print-fake-header|tabulated-list-put-tag|tabulated-list-revert|tabulated-list-set-col|tabulated-list-sort|tag-any-match-p|tag-exact-file-name-match-p|tag-exact-match-p|tag-file-name-match-p|tag-find-file-of-tag-noselect|tag-find-file-of-tag|tag-implicit-name-match-p|tag-partial-file-name-match-p|tag-re-match-p|tag-symbol-match-p|tag-word-match-p|tags-apropos|tags-complete-tags-table-file|tags-completion-at-point-function|tags-completion-table|tags-expand-table-name|tags-included-tables|tags-lazy-completion-table|tags-loop-continue|tags-loop-eval|tags-next-table|tags-query-replace|tags-recognize-empty-tags-table|tags-reset-tags-tables|tags-search|tags-table-check-computed-list|tags-table-extend-computed-list|tags-table-files|tags-table-including|tags-table-list-member|tags-table-mode|tags-verify-table|tags-with-face|tai-viet-composition-function|tailp|talk-add-display|talk-connect|talk-disconnect|talk-handle-delete-frame|talk-split-up-frame|talk-update-buffers|talk|tar--check-descriptor|tar--extract|tar-alter-one-field|tar-change-major-mode-hook|tar-chgrp-entry|tar-chmod-entry|tar-chown-entry|tar-clear-modification-flags|tar-clip-time-string|tar-copy|tar-current-descriptor|tar-data-swapped-p|tar-display-other-window|tar-expunge-internal|tar-expunge|tar-extract-other-window|tar-extract|tar-file-name-handler|tar-flag-deleted|tar-get-descriptor|tar-get-file-descriptor|tar-grind-file-mode|tar-header-block-check-checksum|tar-header-block-checksum|tar-header-block-summarize|tar-header-block-tokenize|tar-header-checksum--cmacro|tar-header-checksum|tar-header-data-end|tar-header-data-start--cmacro|tar-header-data-start|tar-header-date--cmacro|tar-header-date|tar-header-dmaj--cmacro|tar-header-dmaj|tar-header-dmin--cmacro|tar-header-dmin|tar-header-gid--cmacro|tar-header-gid|tar-header-gname--cmacro|tar-header-gname|tar-header-header-start--cmacro|tar-header-header-start|tar-header-link-name--cmacro|tar-header-link-name|tar-header-link-type--cmacro|tar-header-link-type|tar-header-magic--cmacro|tar-header-magic|tar-header-mode--cmacro|tar-header-mode|tar-header-name--cmacro|tar-header-name|tar-header-p--cmacro|tar-header-p|tar-header-size--cmacro|tar-header-size|tar-header-uid--cmacro|tar-header-uid|tar-header-uname--cmacro|tar-header-uname|tar-mode-kill-buffer-hook|tar-mode-revert|tar-mode|tar-mouse-extract|tar-next-line|tar-octal-time|tar-pad-to-blocksize|tar-parse-octal-integer-safe|tar-parse-octal-integer|tar-parse-octal-long-integer|tar-previous-line|tar-read-file-name|tar-rename-entry|tar-roundup-512|tar-subfile-mode|tar-subfile-save-buffer|tar-summarize-buffer|tar-swap-data|tar-unflag-backwards|tar-unflag|tar-untar-buffer|tar-view|tar-write-region-annotate|tcl-add-log-defun|tcl-auto-fill-mode|tcl-beginning-of-defun|tcl-calculate-indent|tcl-comment-indent|tcl-current-word|tcl-electric-brace|tcl-electric-char|tcl-electric-hash|tcl-end-of-defun|tcl-eval-defun|tcl-eval-region|tcl-figure-type|tcl-files-alist|tcl-filter|tcl-guess-application|tcl-hairy-scan-for-comment|tcl-hashify-buffer|tcl-help-on-word|tcl-help-snarf-commands|tcl-in-comment|tcl-indent-command|tcl-indent-exp|tcl-indent-for-comment|tcl-indent-line|tcl-load-file|tcl-mark-defun|tcl-mark|tcl-mode-menu|tcl-mode|tcl-outline-level|tcl-popup-menu|tcl-quote|tcl-real-command-p|tcl-real-comment-p|tcl-reread-help-files|tcl-restart-with-file|tcl-send-region|tcl-send-string|tcl-set-font-lock-keywords|tcl-set-proc-regexp|tcl-uncomment-region|tcl-word-no-props|tear-off-window|telnet-c-z|telnet-check-software-type-initialize|telnet-filter|telnet-initial-filter|telnet-interrupt-subjob|telnet-mode|telnet-send-input|telnet-simple-send|telnet|temp-buffer-resize-mode|temp-buffer-window-setup|temp-buffer-window-show|tempo-add-tag|tempo-backward-mark|tempo-build-collection|tempo-complete-tag|tempo-define-template|tempo-display-completions|tempo-expand-if-complete|tempo-find-match-string|tempo-forget-insertions|tempo-forward-mark|tempo-insert-mark|tempo-insert-named|tempo-insert-prompt-compat|tempo-insert-prompt|tempo-insert-template|tempo-insert|tempo-invalidate-collection|tempo-is-user-element|tempo-lookup-named|tempo-process-and-insert-string|tempo-save-named|tempo-template-dcl-f\\$context|tempo-template-dcl-f\\$csid|tempo-template-dcl-f\\$cvsi|tempo-template-dcl-f\\$cvtime|tempo-template-dcl-f\\$cvui|tempo-template-dcl-f\\$device|tempo-template-dcl-f\\$directory|tempo-template-dcl-f\\$edit|tempo-template-dcl-f\\$element|tempo-template-dcl-f\\$environment|tempo-template-dcl-f\\$extract|tempo-template-dcl-f\\$fao|tempo-template-dcl-f\\$file_attributes|tempo-template-dcl-f\\$getdvi|tempo-template-dcl-f\\$getjpi|tempo-template-dcl-f\\$getqui|tempo-template-dcl-f\\$getsyi|tempo-template-dcl-f\\$identifier|tempo-template-dcl-f\\$integer|tempo-template-dcl-f\\$length|tempo-template-dcl-f\\$locate|tempo-template-dcl-f\\$message|tempo-template-dcl-f\\$mode|tempo-template-dcl-f\\$parse|tempo-template-dcl-f\\$pid|tempo-template-dcl-f\\$privilege|tempo-template-dcl-f\\$process|tempo-template-dcl-f\\$search|tempo-template-dcl-f\\$setprv|tempo-template-dcl-f\\$string|tempo-template-dcl-f\\$time|tempo-template-dcl-f\\$trnlnm|tempo-template-dcl-f\\$type|tempo-template-dcl-f\\$user|tempo-template-dcl-f\\$verify|tempo-template-snmp-object-type|tempo-template-snmp-table-type|tempo-template-snmpv2-object-type|tempo-template-snmpv2-table-type|tempo-template-snmpv2-textual-convention|tempo-use-tag-list|tenth|term-adjust-current-row-cache|term-after-pmark-p|term-ansi-make-term|term-ansi-reset|term-args|term-arguments|term-backward-matching-input|term-bol|term-buffer-vertical-motion|term-char-mode|term-check-kill-echo-list|term-check-proc|term-check-size|term-check-source|term-command-hook|term-continue-subjob|term-copy-old-input|term-current-column|term-current-row|term-delchar-or-maybe-eof|term-delete-chars|term-delete-lines|term-delim-arg|term-directory|term-display-buffer-line|term-display-line|term-down|term-dynamic-complete-as-filename|term-dynamic-complete-filename|term-dynamic-complete|term-dynamic-list-completions|term-dynamic-list-filename-completions|term-dynamic-list-input-ring|term-dynamic-simple-complete|term-emulate-terminal|term-erase-in-display|term-erase-in-line|term-exec-1|term-exec|term-extract-string|term-forward-matching-input|term-get-old-input-default|term-get-source|term-goto-home|term-goto|term-handle-ansi-escape|term-handle-ansi-terminal-messages|term-handle-colors-array|term-handle-deferred-scroll|term-handle-exit|term-handle-scroll|term-handling-pager|term-horizontal-column|term-how-many-region|term-in-char-mode|term-in-line-mode|term-insert-char|term-insert-lines|term-insert-spaces|term-interrupt-subjob|term-kill-input|term-kill-output|term-kill-subjob|term-line-mode|term-magic-space|term-match-partial-filename|term-mode|term-mouse-paste|term-move-columns|term-next-input|term-next-matching-input-from-input|term-next-matching-input|term-next-prompt|term-pager-back-line|term-pager-back-page|term-pager-bob|term-pager-continue|term-pager-disable|term-pager-discard|term-pager-enable|term-pager-enabled|term-pager-eob|term-pager-help|term-pager-line|term-pager-menu|term-pager-page|term-pager-toggle|term-paste|term-previous-input-string|term-previous-input|term-previous-matching-input-from-input|term-previous-matching-input-string-position|term-previous-matching-input-string|term-previous-matching-input|term-previous-prompt|term-proc-query|term-process-pager|term-quit-subjob|term-read-input-ring|term-read-noecho|term-regexp-arg|term-replace-by-expanded-filename|term-replace-by-expanded-history-before-point|term-replace-by-expanded-history|term-reset-size|term-reset-terminal|term-search-arg|term-search-start|term-send-backspace|term-send-del|term-send-down|term-send-end|term-send-eof|term-send-home|term-send-input|term-send-insert|term-send-invisible|term-send-left|term-send-next|term-send-prior|term-send-raw-meta|term-send-raw-string|term-send-raw|term-send-region|term-send-right|term-send-string|term-send-up|term-sentinel|term-set-escape-char|term-set-scroll-region|term-show-maximum-output|term-show-output|term-signals-menu|term-simple-send|term-skip-prompt|term-source-default|term-start-line-column|term-start-output-log|term-stop-output-log|term-stop-subjob|term-terminal-menu|term-terminal-pos|term-unwrap-line|term-update-mode-line|term-using-alternate-sub-buffer|term-vertical-motion|term-window-width|term-within-quotes|term-word|term-write-input-ring|term|testcover-1value|testcover-after|testcover-end|testcover-enter|testcover-mark|testcover-read|testcover-reinstrument-compose|testcover-reinstrument-list|testcover-reinstrument|testcover-this-defun|testcover-unmark-all|tetris-active-p|tetris-default-update-speed-function|tetris-display-options|tetris-draw-border-p|tetris-draw-next-shape|tetris-draw-score|tetris-draw-shape|tetris-end-game|tetris-erase-shape|tetris-full-row|tetris-get-shape-cell|tetris-get-tick-period|tetris-init-buffer|tetris-mode|tetris-move-bottom|tetris-move-left|tetris-move-right|tetris-new-shape|tetris-pause-game|tetris-reset-game|tetris-rotate-next|tetris-rotate-prev|tetris-shape-done|tetris-shape-rotations|tetris-shape-width|tetris-shift-down|tetris-shift-row|tetris-start-game|tetris-test-shape|tetris-update-game|tetris-update-score|tetris|tex-alt-print|tex-append|tex-bibtex-file|tex-buffer|tex-categorize-whitespace|tex-close-latex-block|tex-cmd-doc-view|tex-command-active-p|tex-command-executable|tex-common-initialization|tex-compile-default|tex-compile|tex-count-words|tex-current-defun-name|tex-define-common-keys|tex-delete-last-temp-files|tex-display-shell|tex-env-mark|tex-executable-exists-p|tex-expand-files|tex-facemenu-add-face-function|tex-feed-input|tex-file|tex-font-lock-append-prop|tex-font-lock-match-suscript|tex-font-lock-suscript|tex-font-lock-syntactic-face-function|tex-font-lock-unfontify-region|tex-font-lock-verb|tex-format-cmd|tex-generate-zap-file-name|tex-goto-last-unclosed-latex-block|tex-guess-main-file|tex-guess-mode|tex-insert-braces|tex-insert-quote|tex-kill-job|tex-last-unended-begin|tex-last-unended-eparen|tex-latex-block|tex-main-file|tex-mode-flyspell-verify|tex-mode-internal|tex-mode|tex-next-unmatched-end|tex-next-unmatched-eparen|tex-old-error-file-name|tex-print|tex-recenter-output-buffer|tex-region-header|tex-region|tex-search-noncomment|tex-send-command|tex-send-tex-command|tex-set-buffer-directory|tex-shell-buf-no-error|tex-shell-buf|tex-shell-proc|tex-shell-running|tex-shell-sentinel|tex-shell|tex-show-print-queue|tex-start-shell|tex-start-tex|tex-string-prefix-p|tex-summarize-command|tex-suscript-height|tex-terminate-paragraph|tex-uptodate-p|tex-validate-buffer|tex-validate-region|tex-view|texi2info|texinfmt-version|texinfo-alias|texinfo-all-menus-update|texinfo-alphaenumerate-item|texinfo-alphaenumerate|texinfo-anchor|texinfo-append-refill|texinfo-capsenumerate-item|texinfo-capsenumerate|texinfo-check-for-node-name|texinfo-clean-up-node-line|texinfo-clear|texinfo-clone-environment|texinfo-copy-menu-title|texinfo-copy-menu|texinfo-copy-next-section-title|texinfo-copy-node-name|texinfo-copy-section-title|texinfo-copying|texinfo-current-defun-name|texinfo-define-common-keys|texinfo-define-info-enclosure|texinfo-delete-existing-pointers|texinfo-delete-from-print-queue|texinfo-delete-old-menu|texinfo-description|texinfo-discard-command-and-arg|texinfo-discard-command|texinfo-discard-line-with-args|texinfo-discard-line|texinfo-do-flushright|texinfo-do-itemize|texinfo-end-alphaenumerate|texinfo-end-capsenumerate|texinfo-end-defun|texinfo-end-direntry|texinfo-end-enumerate|texinfo-end-example|texinfo-end-flushleft)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)t(?:able-recognize-table|able-recognize|able-release|able-shorten-cell|able-span-cell|able-split-cell-horizontally|able-split-cell-vertically|able-split-cell|able-unrecognize-cell|able-unrecognize-region|able-unrecognize-table|able-unrecognize|able-widen-cell|able-with-cache-buffer|abulated-list--column-number|abulated-list--sort-by-column-name|abulated-list-col-sort|abulated-list-delete-entry|abulated-list-entry-size->|abulated-list-get-entry|abulated-list-get-id|abulated-list-print-col|abulated-list-print-entry|abulated-list-print-fake-header|abulated-list-put-tag|abulated-list-revert|abulated-list-set-col|abulated-list-sort|ag-any-match-p|ag-exact-file-name-match-p|ag-exact-match-p|ag-file-name-match-p|ag-find-file-of-tag-noselect|ag-find-file-of-tag|ag-implicit-name-match-p|ag-partial-file-name-match-p|ag-re-match-p|ag-symbol-match-p|ag-word-match-p|ags-apropos|ags-complete-tags-table-file|ags-completion-at-point-function|ags-completion-table|ags-expand-table-name|ags-included-tables|ags-lazy-completion-table|ags-loop-continue|ags-loop-eval|ags-next-table|ags-query-replace|ags-recognize-empty-tags-table|ags-reset-tags-tables|ags-search|ags-table-check-computed-list|ags-table-extend-computed-list|ags-table-files|ags-table-including|ags-table-list-member|ags-table-mode|ags-verify-table|ags-with-face|ai-viet-composition-function|ailp|alk-add-display|alk-connect|alk-disconnect|alk-handle-delete-frame|alk-split-up-frame|alk-update-buffers|alk|ar--check-descriptor|ar--extract|ar-alter-one-field|ar-change-major-mode-hook|ar-chgrp-entry|ar-chmod-entry|ar-chown-entry|ar-clear-modification-flags|ar-clip-time-string|ar-copy|ar-current-descriptor|ar-data-swapped-p|ar-display-other-window|ar-expunge-internal|ar-expunge|ar-extract-other-window|ar-extract|ar-file-name-handler|ar-flag-deleted|ar-get-descriptor|ar-get-file-descriptor|ar-grind-file-mode|ar-header-block-check-checksum|ar-header-block-checksum|ar-header-block-summarize|ar-header-block-tokenize|ar-header-checksum--cmacro|ar-header-checksum|ar-header-data-end|ar-header-data-start--cmacro|ar-header-data-start|ar-header-date--cmacro|ar-header-date|ar-header-dmaj--cmacro|ar-header-dmaj|ar-header-dmin--cmacro|ar-header-dmin|ar-header-gid--cmacro|ar-header-gid|ar-header-gname--cmacro|ar-header-gname|ar-header-header-start--cmacro|ar-header-header-start|ar-header-link-name--cmacro|ar-header-link-name|ar-header-link-type--cmacro|ar-header-link-type|ar-header-magic--cmacro|ar-header-magic|ar-header-mode--cmacro|ar-header-mode|ar-header-name--cmacro|ar-header-name|ar-header-p--cmacro|ar-header-p|ar-header-size--cmacro|ar-header-size|ar-header-uid--cmacro|ar-header-uid|ar-header-uname--cmacro|ar-header-uname|ar-mode-kill-buffer-hook|ar-mode-revert|ar-mode|ar-mouse-extract|ar-next-line|ar-octal-time|ar-pad-to-blocksize|ar-parse-octal-integer-safe|ar-parse-octal-integer|ar-parse-octal-long-integer|ar-previous-line|ar-read-file-name|ar-rename-entry|ar-roundup-512|ar-subfile-mode|ar-subfile-save-buffer|ar-summarize-buffer|ar-swap-data|ar-unflag-backwards|ar-unflag|ar-untar-buffer|ar-view|ar-write-region-annotate|cl-add-log-defun|cl-auto-fill-mode|cl-beginning-of-defun|cl-calculate-indent|cl-comment-indent|cl-current-word|cl-electric-brace|cl-electric-char|cl-electric-hash|cl-end-of-defun|cl-eval-defun|cl-eval-region|cl-figure-type|cl-files-alist|cl-filter|cl-guess-application|cl-hairy-scan-for-comment|cl-hashify-buffer|cl-help-on-word|cl-help-snarf-commands|cl-in-comment|cl-indent-command|cl-indent-exp|cl-indent-for-comment|cl-indent-line|cl-load-file|cl-mark-defun|cl-mark|cl-mode-menu|cl-mode|cl-outline-level|cl-popup-menu|cl-quote|cl-real-command-p|cl-real-comment-p|cl-reread-help-files|cl-restart-with-file|cl-send-region|cl-send-string|cl-set-font-lock-keywords|cl-set-proc-regexp|cl-uncomment-region|cl-word-no-props|ear-off-window|elnet-c-z|elnet-check-software-type-initialize|elnet-filter|elnet-initial-filter|elnet-interrupt-subjob|elnet-mode|elnet-send-input|elnet-simple-send|elnet|emp-buffer-resize-mode|emp-buffer-window-setup|emp-buffer-window-show|empo-add-tag|empo-backward-mark|empo-build-collection|empo-complete-tag|empo-define-template|empo-display-completions|empo-expand-if-complete|empo-find-match-string|empo-forget-insertions|empo-forward-mark|empo-insert-mark|empo-insert-named|empo-insert-prompt-compat|empo-insert-prompt|empo-insert-template|empo-insert|empo-invalidate-collection|empo-is-user-element|empo-lookup-named|empo-process-and-insert-string|empo-save-named|empo-template-dcl-f\\$context|empo-template-dcl-f\\$csid|empo-template-dcl-f\\$cvsi|empo-template-dcl-f\\$cvtime|empo-template-dcl-f\\$cvui|empo-template-dcl-f\\$device|empo-template-dcl-f\\$directory|empo-template-dcl-f\\$edit|empo-template-dcl-f\\$element|empo-template-dcl-f\\$environment|empo-template-dcl-f\\$extract|empo-template-dcl-f\\$fao|empo-template-dcl-f\\$file_attributes|empo-template-dcl-f\\$getdvi|empo-template-dcl-f\\$getjpi|empo-template-dcl-f\\$getqui|empo-template-dcl-f\\$getsyi|empo-template-dcl-f\\$identifier|empo-template-dcl-f\\$integer|empo-template-dcl-f\\$length|empo-template-dcl-f\\$locate|empo-template-dcl-f\\$message|empo-template-dcl-f\\$mode|empo-template-dcl-f\\$parse|empo-template-dcl-f\\$pid|empo-template-dcl-f\\$privilege|empo-template-dcl-f\\$process|empo-template-dcl-f\\$search|empo-template-dcl-f\\$setprv|empo-template-dcl-f\\$string|empo-template-dcl-f\\$time|empo-template-dcl-f\\$trnlnm|empo-template-dcl-f\\$type|empo-template-dcl-f\\$user|empo-template-dcl-f\\$verify|empo-template-snmp-object-type|empo-template-snmp-table-type|empo-template-snmpv2-object-type|empo-template-snmpv2-table-type|empo-template-snmpv2-textual-convention|empo-use-tag-list|enth|erm-adjust-current-row-cache|erm-after-pmark-p|erm-ansi-make-term|erm-ansi-reset|erm-args|erm-arguments|erm-backward-matching-input|erm-bol|erm-buffer-vertical-motion|erm-char-mode|erm-check-kill-echo-list|erm-check-proc|erm-check-size|erm-check-source|erm-command-hook|erm-continue-subjob|erm-copy-old-input|erm-current-column|erm-current-row|erm-delchar-or-maybe-eof|erm-delete-chars|erm-delete-lines|erm-delim-arg|erm-directory|erm-display-buffer-line|erm-display-line|erm-down|erm-dynamic-complete-as-filename|erm-dynamic-complete-filename|erm-dynamic-complete|erm-dynamic-list-completions|erm-dynamic-list-filename-completions|erm-dynamic-list-input-ring|erm-dynamic-simple-complete|erm-emulate-terminal|erm-erase-in-display|erm-erase-in-line|erm-exec-1|erm-exec|erm-extract-string|erm-forward-matching-input|erm-get-old-input-default|erm-get-source|erm-goto-home|erm-goto|erm-handle-ansi-escape|erm-handle-ansi-terminal-messages|erm-handle-colors-array|erm-handle-deferred-scroll|erm-handle-exit|erm-handle-scroll|erm-handling-pager|erm-horizontal-column|erm-how-many-region|erm-in-char-mode|erm-in-line-mode|erm-insert-char|erm-insert-lines|erm-insert-spaces|erm-interrupt-subjob|erm-kill-input|erm-kill-output|erm-kill-subjob|erm-line-mode|erm-magic-space|erm-match-partial-filename|erm-mode|erm-mouse-paste|erm-move-columns|erm-next-input|erm-next-matching-input-from-input|erm-next-matching-input|erm-next-prompt|erm-pager-back-line|erm-pager-back-page|erm-pager-bob|erm-pager-continue|erm-pager-disable|erm-pager-discard|erm-pager-enable|erm-pager-enabled|erm-pager-eob|erm-pager-help|erm-pager-line|erm-pager-menu|erm-pager-page|erm-pager-toggle|erm-paste|erm-previous-input-string|erm-previous-input|erm-previous-matching-input-from-input|erm-previous-matching-input-string-position|erm-previous-matching-input-string|erm-previous-matching-input|erm-previous-prompt|erm-proc-query|erm-process-pager|erm-quit-subjob|erm-read-input-ring|erm-read-noecho|erm-regexp-arg|erm-replace-by-expanded-filename|erm-replace-by-expanded-history-before-point|erm-replace-by-expanded-history|erm-reset-size|erm-reset-terminal|erm-search-arg|erm-search-start|erm-send-backspace|erm-send-del|erm-send-down|erm-send-end|erm-send-eof|erm-send-home|erm-send-input|erm-send-insert|erm-send-invisible|erm-send-left|erm-send-next|erm-send-prior|erm-send-raw-meta|erm-send-raw-string|erm-send-raw|erm-send-region|erm-send-right|erm-send-string|erm-send-up|erm-sentinel|erm-set-escape-char|erm-set-scroll-region|erm-show-maximum-output|erm-show-output|erm-signals-menu|erm-simple-send|erm-skip-prompt|erm-source-default|erm-start-line-column|erm-start-output-log|erm-stop-output-log|erm-stop-subjob|erm-terminal-menu|erm-terminal-pos|erm-unwrap-line|erm-update-mode-line|erm-using-alternate-sub-buffer|erm-vertical-motion|erm-window-width|erm-within-quotes|erm-word|erm-write-input-ring|erm|estcover-1value|estcover-after|estcover-end|estcover-enter|estcover-mark|estcover-read|estcover-reinstrument-compose|estcover-reinstrument-list|estcover-reinstrument|estcover-this-defun|estcover-unmark-all|etris-active-p|etris-default-update-speed-function|etris-display-options|etris-draw-border-p|etris-draw-next-shape|etris-draw-score|etris-draw-shape|etris-end-game|etris-erase-shape|etris-full-row|etris-get-shape-cell|etris-get-tick-period|etris-init-buffer|etris-mode|etris-move-bottom|etris-move-left|etris-move-right|etris-new-shape|etris-pause-game|etris-reset-game|etris-rotate-next|etris-rotate-prev|etris-shape-done|etris-shape-rotations|etris-shape-width|etris-shift-down|etris-shift-row|etris-start-game|etris-test-shape|etris-update-game|etris-update-score|etris|ex-alt-print|ex-append|ex-bibtex-file|ex-buffer|ex-categorize-whitespace|ex-close-latex-block|ex-cmd-doc-view|ex-command-active-p|ex-command-executable|ex-common-initialization|ex-compile-default|ex-compile|ex-count-words|ex-current-defun-name|ex-define-common-keys|ex-delete-last-temp-files|ex-display-shell|ex-env-mark|ex-executable-exists-p|ex-expand-files|ex-facemenu-add-face-function|ex-feed-input|ex-file|ex-font-lock-append-prop|ex-font-lock-match-suscript|ex-font-lock-suscript|ex-font-lock-syntactic-face-function|ex-font-lock-unfontify-region|ex-font-lock-verb|ex-format-cmd|ex-generate-zap-file-name|ex-goto-last-unclosed-latex-block|ex-guess-main-file|ex-guess-mode|ex-insert-braces|ex-insert-quote|ex-kill-job|ex-last-unended-begin|ex-last-unended-eparen|ex-latex-block|ex-main-file|ex-mode-flyspell-verify|ex-mode-internal|ex-mode|ex-next-unmatched-end|ex-next-unmatched-eparen|ex-old-error-file-name|ex-print|ex-recenter-output-buffer|ex-region-header|ex-region|ex-search-noncomment|ex-send-command|ex-send-tex-command|ex-set-buffer-directory|ex-shell-buf-no-error|ex-shell-buf|ex-shell-proc|ex-shell-running|ex-shell-sentinel|ex-shell|ex-show-print-queue|ex-start-shell|ex-start-tex|ex-string-prefix-p|ex-summarize-command|ex-suscript-height|ex-terminate-paragraph|ex-uptodate-p|ex-validate-buffer|ex-validate-region|ex-view|exi2info|exinfmt-version|exinfo-alias|exinfo-all-menus-update|exinfo-alphaenumerate-item|exinfo-alphaenumerate|exinfo-anchor|exinfo-append-refill|exinfo-capsenumerate-item|exinfo-capsenumerate|exinfo-check-for-node-name|exinfo-clean-up-node-line|exinfo-clear|exinfo-clone-environment|exinfo-copy-menu-title|exinfo-copy-menu|exinfo-copy-next-section-title|exinfo-copy-node-name|exinfo-copy-section-title|exinfo-copying|exinfo-current-defun-name|exinfo-define-common-keys|exinfo-define-info-enclosure|exinfo-delete-existing-pointers|exinfo-delete-from-print-queue|exinfo-delete-old-menu|exinfo-description|exinfo-discard-command-and-arg|exinfo-discard-command|exinfo-discard-line-with-args|exinfo-discard-line|exinfo-do-flushright|exinfo-do-itemize|exinfo-end-alphaenumerate|exinfo-end-capsenumerate|exinfo-end-defun|exinfo-end-direntry|exinfo-end-enumerate|exinfo-end-example|exinfo-end-flushleft)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:texinfo-end-flushright|texinfo-end-ftable|texinfo-end-indextable|texinfo-end-itemize|texinfo-end-multitable|texinfo-end-table|texinfo-end-vtable|texinfo-enumerate-item|texinfo-enumerate|texinfo-every-node-update|texinfo-filter|texinfo-find-higher-level-node|texinfo-find-lower-level-node|texinfo-find-pointer|texinfo-footnotestyle|texinfo-format-\\.|texinfo-format-:|texinfo-format-French-OE-ligature|texinfo-format-French-oe-ligature|texinfo-format-German-sharp-S|texinfo-format-Latin-Scandinavian-AE|texinfo-format-Latin-Scandinavian-ae|texinfo-format-Polish-suppressed-L|texinfo-format-Polish-suppressed-l-lower-case|texinfo-format-Scandinavian-A-with-circle|texinfo-format-Scandinavian-O-with-slash|texinfo-format-Scandinavian-a-with-circle|texinfo-format-Scandinavian-o-with-slash-lower-case|texinfo-format-TeX|texinfo-format-begin-end|texinfo-format-begin|texinfo-format-breve-accent|texinfo-format-buffer-1|texinfo-format-buffer|texinfo-format-bullet|texinfo-format-cedilla-accent|texinfo-format-center|texinfo-format-chapter-1|texinfo-format-chapter|texinfo-format-cindex|texinfo-format-code|texinfo-format-convert|texinfo-format-copyright|texinfo-format-ctrl|texinfo-format-defcv|texinfo-format-deffn|texinfo-format-defindex|texinfo-format-defivar|texinfo-format-defmethod|texinfo-format-defn|texinfo-format-defop|texinfo-format-deftypefn|texinfo-format-deftypefun|texinfo-format-defun-1|texinfo-format-defun|texinfo-format-defunx|texinfo-format-dircategory|texinfo-format-direntry|texinfo-format-documentdescription|texinfo-format-dotless|texinfo-format-dots|texinfo-format-email|texinfo-format-emph|texinfo-format-end-node|texinfo-format-end|texinfo-format-enddots|texinfo-format-equiv|texinfo-format-error|texinfo-format-example|texinfo-format-exdent|texinfo-format-expand-region|texinfo-format-expansion|texinfo-format-findex|texinfo-format-flushleft|texinfo-format-flushright|texinfo-format-footnote|texinfo-format-hacek-accent|texinfo-format-html|texinfo-format-ifeq|texinfo-format-ifhtml|texinfo-format-ifnotinfo|texinfo-format-ifplaintext|texinfo-format-iftex|texinfo-format-ifxml|texinfo-format-ignore|texinfo-format-image|texinfo-format-inforef|texinfo-format-kbd|texinfo-format-key|texinfo-format-kindex|texinfo-format-long-Hungarian-umlaut|texinfo-format-menu|texinfo-format-minus|texinfo-format-node|texinfo-format-noop|texinfo-format-option|texinfo-format-overdot-accent|texinfo-format-paragraph-break|texinfo-format-parse-args|texinfo-format-parse-defun-args|texinfo-format-parse-line-args|texinfo-format-pindex|texinfo-format-point|texinfo-format-pounds|texinfo-format-print|texinfo-format-printindex|texinfo-format-pxref|texinfo-format-refill|texinfo-format-region|texinfo-format-result|texinfo-format-ring-accent|texinfo-format-scan|texinfo-format-section|texinfo-format-sectionpad|texinfo-format-separate-node|texinfo-format-setfilename|texinfo-format-soft-hyphen|texinfo-format-sp|texinfo-format-specialized-defun|texinfo-format-subsection|texinfo-format-subsubsection|texinfo-format-synindex|texinfo-format-tex|texinfo-format-tie-after-accent|texinfo-format-timestamp|texinfo-format-tindex|texinfo-format-titlepage|texinfo-format-titlespec|texinfo-format-today|texinfo-format-underbar-accent|texinfo-format-underdot-accent|texinfo-format-upside-down-exclamation-mark|texinfo-format-upside-down-question-mark|texinfo-format-uref|texinfo-format-var|texinfo-format-verb|texinfo-format-vindex|texinfo-format-xml|texinfo-format-xref|texinfo-ftable-item|texinfo-ftable|texinfo-hierarchic-level|texinfo-if-clear|texinfo-if-set|texinfo-incorporate-descriptions|texinfo-incorporate-menu-entry-names|texinfo-indent-menu-description|texinfo-index-defcv|texinfo-index-deffn|texinfo-index-defivar|texinfo-index-defmethod|texinfo-index-defop|texinfo-index-deftypefn|texinfo-index-defun|texinfo-index|texinfo-indextable-item|texinfo-indextable|texinfo-insert-@code|texinfo-insert-@dfn|texinfo-insert-@email|texinfo-insert-@emph|texinfo-insert-@end|texinfo-insert-@example|texinfo-insert-@file|texinfo-insert-@item|texinfo-insert-@kbd|texinfo-insert-@node|texinfo-insert-@noindent|texinfo-insert-@quotation|texinfo-insert-@samp|texinfo-insert-@strong|texinfo-insert-@table|texinfo-insert-@uref|texinfo-insert-@url|texinfo-insert-@var|texinfo-insert-block|texinfo-insert-braces|texinfo-insert-master-menu-list|texinfo-insert-menu|texinfo-insert-node-lines|texinfo-insert-pointer|texinfo-insert-quote|texinfo-insertcopying|texinfo-inside-env-p|texinfo-inside-macro-p|texinfo-item|texinfo-itemize-item|texinfo-itemize|texinfo-last-unended-begin|texinfo-locate-menu-p|texinfo-make-menu-list|texinfo-make-menu|texinfo-make-one-menu|texinfo-master-menu-list|texinfo-master-menu|texinfo-menu-copy-old-description|texinfo-menu-end|texinfo-menu-first-node|texinfo-menu-indent-description|texinfo-menu-locate-entry-p|texinfo-mode-flyspell-verify|texinfo-mode-menu|texinfo-mode|texinfo-multi-file-included-list|texinfo-multi-file-master-menu-list|texinfo-multi-file-update|texinfo-multi-files-insert-main-menu|texinfo-multiple-files-update|texinfo-multitable-extract-row|texinfo-multitable-item|texinfo-multitable-widths|texinfo-multitable|texinfo-next-unmatched-end|texinfo-noindent|texinfo-old-menu-p|texinfo-optional-braces-discard|texinfo-paragraphindent|texinfo-parse-arg-discard|texinfo-parse-expanded-arg|texinfo-parse-line-arg|texinfo-pointer-name|texinfo-pop-stack|texinfo-print-index|texinfo-push-stack|texinfo-quit-job|texinfo-raise-lower-sections|texinfo-sequential-node-update|texinfo-sequentially-find-pointer|texinfo-sequentially-insert-pointer|texinfo-sequentially-update-the-node|texinfo-set|texinfo-show-structure|texinfo-sort-region|texinfo-sort-startkeyfun|texinfo-specific-section-type|texinfo-start-menu-description|texinfo-table-item|texinfo-table|texinfo-tex-buffer|texinfo-tex-print|texinfo-tex-region|texinfo-tex-view|texinfo-texindex|texinfo-top-pointer-case|texinfo-unsupported|texinfo-update-menu-region-beginning|texinfo-update-menu-region-end|texinfo-update-node|texinfo-update-the-node|texinfo-value|texinfo-vtable-item|texinfo-vtable|text-clone--maintain|text-clone-create|text-mode-hook-identify|text-scale-adjust|text-scale-decrease|text-scale-increase|text-scale-mode|text-scale-set|thai-compose-buffer|thai-compose-region|thai-compose-string|thai-composition-function|the|thing-at-point--bounds-of-markedup-url|thing-at-point--bounds-of-well-formed-url|thing-at-point-bounds-of-list-at-point|thing-at-point-bounds-of-url-at-point|thing-at-point-looking-at|thing-at-point-newsgroup-p|thing-at-point-url-at-point|third|this-major-mode-requires-vi-state|this-single-command-keys|this-single-command-raw-keys|thread-first|thread-last|thumbs-backward-char|thumbs-backward-line|thumbs-call-convert|thumbs-call-setroot-command|thumbs-cleanup-thumbsdir|thumbs-current-image|thumbs-delete-images|thumbs-dired-setroot|thumbs-dired-show-marked|thumbs-dired-show|thumbs-dired|thumbs-display-thumbs-buffer|thumbs-do-thumbs-insertion|thumbs-emboss-image|thumbs-enlarge-image|thumbs-file-alist|thumbs-file-list|thumbs-file-size|thumbs-find-image-at-point-other-window|thumbs-find-image-at-point|thumbs-find-image|thumbs-find-thumb|thumbs-forward-char|thumbs-forward-line|thumbs-image-type|thumbs-insert-image|thumbs-insert-thumb|thumbs-kill-buffer|thumbs-make-thumb|thumbs-mark|thumbs-mode|thumbs-modify-image|thumbs-monochrome-image|thumbs-mouse-find-image|thumbs-negate-image|thumbs-new-image-size|thumbs-next-image|thumbs-previous-image|thumbs-redraw-buffer|thumbs-rename-images|thumbs-resize-image-1|thumbs-resize-image|thumbs-rotate-left|thumbs-rotate-right|thumbs-save-current-image|thumbs-set-image-at-point-to-root-window|thumbs-set-root|thumbs-show-from-dir|thumbs-show-image-num|thumbs-show-more-images|thumbs-show-name|thumbs-show-thumbs-list|thumbs-shrink-image|thumbs-temp-dir|thumbs-temp-file|thumbs-thumbname|thumbs-thumbsdir|thumbs-unmark|thumbs-view-image-mode|thumbs|tibetan-char-p|tibetan-compose-buffer|tibetan-compose-region|tibetan-compose-string|tibetan-decompose-buffer|tibetan-decompose-region|tibetan-decompose-string|tibetan-post-read-conversion|tibetan-pre-write-canonicalize-for-unicode|tibetan-pre-write-conversion|tibetan-tibetan-to-transcription|tibetan-transcription-to-tibetan|tildify--deprecated-ignore-evironments|tildify--find-env|tildify--foreach-region|tildify--pick-alist-entry|tildify-buffer|tildify-foreach-ignore-environments|tildify-region|tildify-tildify|time-date--day-in-year|time-since|time-stamp-conv-warn|time-stamp-do-number|time-stamp-fconcat|time-stamp-mail-host-name|time-stamp-once|time-stamp-string-preprocess|time-stamp-string|time-stamp-toggle-active|time-stamp|time-to-number-of-days|time-to-seconds|timeclock-ask-for-project|timeclock-ask-for-reason|timeclock-change|timeclock-completing-read|timeclock-current-debt|timeclock-currently-in-p|timeclock-day-alist|timeclock-day-base|timeclock-day-begin|timeclock-day-break|timeclock-day-debt|timeclock-day-end|timeclock-day-length|timeclock-day-list-begin|timeclock-day-list-break|timeclock-day-list-debt|timeclock-day-list-end|timeclock-day-list-length|timeclock-day-list-projects|timeclock-day-list-required|timeclock-day-list-span|timeclock-day-list-template|timeclock-day-list|timeclock-day-projects|timeclock-day-required|timeclock-day-span|timeclock-entry-begin|timeclock-entry-comment|timeclock-entry-end|timeclock-entry-length|timeclock-entry-list-begin|timeclock-entry-list-break|timeclock-entry-list-end|timeclock-entry-list-length|timeclock-entry-list-projects|timeclock-entry-list-span|timeclock-entry-project|timeclock-find-discrep|timeclock-generate-report|timeclock-in|timeclock-last-period|timeclock-log-data|timeclock-log|timeclock-make-hours-explicit|timeclock-mean|timeclock-mode-line-display|timeclock-modeline-display|timeclock-out|timeclock-project-alist|timeclock-query-out|timeclock-read-moment|timeclock-reread-log|timeclock-seconds-to-string|timeclock-seconds-to-time|timeclock-status-string|timeclock-time-to-date|timeclock-time-to-seconds|timeclock-update-mode-line|timeclock-update-modeline|timeclock-visit-timelog|timeclock-when-to-leave-string|timeclock-when-to-leave|timeclock-workday-elapsed-string|timeclock-workday-elapsed|timeclock-workday-remaining-string|timeclock-workday-remaining|timeout-event-p|timep|timer--activate|timer--args--cmacro|timer--args|timer--check|timer--function--cmacro|timer--function|timer--high-seconds--cmacro|timer--high-seconds|timer--idle-delay--cmacro|timer--idle-delay|timer--low-seconds--cmacro|timer--low-seconds|timer--psecs--cmacro|timer--psecs|timer--repeat-delay--cmacro|timer--repeat-delay|timer--time-less-p|timer--time-setter|timer--time|timer--triggered--cmacro|timer--triggered|timer--usecs--cmacro|timer--usecs|timer-activate-when-idle|timer-activate|timer-create--cmacro|timer-create|timer-duration|timer-event-handler|timer-inc-time|timer-next-integral-multiple-of-time|timer-relative-time|timer-set-function|timer-set-idle-time|timer-set-time-with-usecs|timer-set-time|timer-until|timerp|timezone-absolute-from-gregorian|timezone-day-number|timezone-fix-time|timezone-last-day-of-month|timezone-leap-year-p|timezone-make-arpa-date|timezone-make-date-arpa-standard|timezone-make-date-sortable|timezone-make-sortable-date|timezone-make-time-string|timezone-parse-date|timezone-parse-time|timezone-time-from-absolute|timezone-time-zone-from-absolute|timezone-zone-to-minute|titdic-convert|tls-certificate-information|tmm--completion-table|tmm-add-one-shortcut|tmm-add-prompt|tmm-add-shortcuts|tmm-completion-delete-prompt|tmm-define-keys|tmm-get-keybind|tmm-get-keymap|tmm-goto-completions|tmm-menubar-mouse|tmm-menubar|tmm-prompt|tmm-remove-inactive-mouse-face|tmm-shortcut|todo--user-error-if-marked-done-item|todo-absolute-file-name|todo-add-category|todo-add-file|todo-adjusted-category-label-length|todo-archive-done-item|todo-archive-mode|todo-backward-category|todo-backward-item|todo-categories-mode|todo-category-completions|todo-category-number|todo-category-select|todo-category-string-matcher-1|todo-category-string-matcher-2|todo-check-file|todo-check-filtered-items-file|todo-check-format|todo-choose-archive|todo-clear-matches|todo-comment-string-matcher|todo-convert-legacy-date-time|todo-convert-legacy-files|todo-current-category|todo-date-string-matcher|todo-delete-category|todo-delete-file|todo-delete-item|todo-desktop-save-buffer)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)t(?:exinfo-end-flushright|exinfo-end-ftable|exinfo-end-indextable|exinfo-end-itemize|exinfo-end-multitable|exinfo-end-table|exinfo-end-vtable|exinfo-enumerate-item|exinfo-enumerate|exinfo-every-node-update|exinfo-filter|exinfo-find-higher-level-node|exinfo-find-lower-level-node|exinfo-find-pointer|exinfo-footnotestyle|exinfo-format-\\.|exinfo-format-:|exinfo-format-French-OE-ligature|exinfo-format-French-oe-ligature|exinfo-format-German-sharp-S|exinfo-format-Latin-Scandinavian-AE|exinfo-format-Latin-Scandinavian-ae|exinfo-format-Polish-suppressed-L|exinfo-format-Polish-suppressed-l-lower-case|exinfo-format-Scandinavian-A-with-circle|exinfo-format-Scandinavian-O-with-slash|exinfo-format-Scandinavian-a-with-circle|exinfo-format-Scandinavian-o-with-slash-lower-case|exinfo-format-TeX|exinfo-format-begin-end|exinfo-format-begin|exinfo-format-breve-accent|exinfo-format-buffer-1|exinfo-format-buffer|exinfo-format-bullet|exinfo-format-cedilla-accent|exinfo-format-center|exinfo-format-chapter-1|exinfo-format-chapter|exinfo-format-cindex|exinfo-format-code|exinfo-format-convert|exinfo-format-copyright|exinfo-format-ctrl|exinfo-format-defcv|exinfo-format-deffn|exinfo-format-defindex|exinfo-format-defivar|exinfo-format-defmethod|exinfo-format-defn|exinfo-format-defop|exinfo-format-deftypefn|exinfo-format-deftypefun|exinfo-format-defun-1|exinfo-format-defun|exinfo-format-defunx|exinfo-format-dircategory|exinfo-format-direntry|exinfo-format-documentdescription|exinfo-format-dotless|exinfo-format-dots|exinfo-format-email|exinfo-format-emph|exinfo-format-end-node|exinfo-format-end|exinfo-format-enddots|exinfo-format-equiv|exinfo-format-error|exinfo-format-example|exinfo-format-exdent|exinfo-format-expand-region|exinfo-format-expansion|exinfo-format-findex|exinfo-format-flushleft|exinfo-format-flushright|exinfo-format-footnote|exinfo-format-hacek-accent|exinfo-format-html|exinfo-format-ifeq|exinfo-format-ifhtml|exinfo-format-ifnotinfo|exinfo-format-ifplaintext|exinfo-format-iftex|exinfo-format-ifxml|exinfo-format-ignore|exinfo-format-image|exinfo-format-inforef|exinfo-format-kbd|exinfo-format-key|exinfo-format-kindex|exinfo-format-long-Hungarian-umlaut|exinfo-format-menu|exinfo-format-minus|exinfo-format-node|exinfo-format-noop|exinfo-format-option|exinfo-format-overdot-accent|exinfo-format-paragraph-break|exinfo-format-parse-args|exinfo-format-parse-defun-args|exinfo-format-parse-line-args|exinfo-format-pindex|exinfo-format-point|exinfo-format-pounds|exinfo-format-print|exinfo-format-printindex|exinfo-format-pxref|exinfo-format-refill|exinfo-format-region|exinfo-format-result|exinfo-format-ring-accent|exinfo-format-scan|exinfo-format-section|exinfo-format-sectionpad|exinfo-format-separate-node|exinfo-format-setfilename|exinfo-format-soft-hyphen|exinfo-format-sp|exinfo-format-specialized-defun|exinfo-format-subsection|exinfo-format-subsubsection|exinfo-format-synindex|exinfo-format-tex|exinfo-format-tie-after-accent|exinfo-format-timestamp|exinfo-format-tindex|exinfo-format-titlepage|exinfo-format-titlespec|exinfo-format-today|exinfo-format-underbar-accent|exinfo-format-underdot-accent|exinfo-format-upside-down-exclamation-mark|exinfo-format-upside-down-question-mark|exinfo-format-uref|exinfo-format-var|exinfo-format-verb|exinfo-format-vindex|exinfo-format-xml|exinfo-format-xref|exinfo-ftable-item|exinfo-ftable|exinfo-hierarchic-level|exinfo-if-clear|exinfo-if-set|exinfo-incorporate-descriptions|exinfo-incorporate-menu-entry-names|exinfo-indent-menu-description|exinfo-index-defcv|exinfo-index-deffn|exinfo-index-defivar|exinfo-index-defmethod|exinfo-index-defop|exinfo-index-deftypefn|exinfo-index-defun|exinfo-index|exinfo-indextable-item|exinfo-indextable|exinfo-insert-@code|exinfo-insert-@dfn|exinfo-insert-@email|exinfo-insert-@emph|exinfo-insert-@end|exinfo-insert-@example|exinfo-insert-@file|exinfo-insert-@item|exinfo-insert-@kbd|exinfo-insert-@node|exinfo-insert-@noindent|exinfo-insert-@quotation|exinfo-insert-@samp|exinfo-insert-@strong|exinfo-insert-@table|exinfo-insert-@uref|exinfo-insert-@url|exinfo-insert-@var|exinfo-insert-block|exinfo-insert-braces|exinfo-insert-master-menu-list|exinfo-insert-menu|exinfo-insert-node-lines|exinfo-insert-pointer|exinfo-insert-quote|exinfo-insertcopying|exinfo-inside-env-p|exinfo-inside-macro-p|exinfo-item|exinfo-itemize-item|exinfo-itemize|exinfo-last-unended-begin|exinfo-locate-menu-p|exinfo-make-menu-list|exinfo-make-menu|exinfo-make-one-menu|exinfo-master-menu-list|exinfo-master-menu|exinfo-menu-copy-old-description|exinfo-menu-end|exinfo-menu-first-node|exinfo-menu-indent-description|exinfo-menu-locate-entry-p|exinfo-mode-flyspell-verify|exinfo-mode-menu|exinfo-mode|exinfo-multi-file-included-list|exinfo-multi-file-master-menu-list|exinfo-multi-file-update|exinfo-multi-files-insert-main-menu|exinfo-multiple-files-update|exinfo-multitable-extract-row|exinfo-multitable-item|exinfo-multitable-widths|exinfo-multitable|exinfo-next-unmatched-end|exinfo-noindent|exinfo-old-menu-p|exinfo-optional-braces-discard|exinfo-paragraphindent|exinfo-parse-arg-discard|exinfo-parse-expanded-arg|exinfo-parse-line-arg|exinfo-pointer-name|exinfo-pop-stack|exinfo-print-index|exinfo-push-stack|exinfo-quit-job|exinfo-raise-lower-sections|exinfo-sequential-node-update|exinfo-sequentially-find-pointer|exinfo-sequentially-insert-pointer|exinfo-sequentially-update-the-node|exinfo-set|exinfo-show-structure|exinfo-sort-region|exinfo-sort-startkeyfun|exinfo-specific-section-type|exinfo-start-menu-description|exinfo-table-item|exinfo-table|exinfo-tex-buffer|exinfo-tex-print|exinfo-tex-region|exinfo-tex-view|exinfo-texindex|exinfo-top-pointer-case|exinfo-unsupported|exinfo-update-menu-region-beginning|exinfo-update-menu-region-end|exinfo-update-node|exinfo-update-the-node|exinfo-value|exinfo-vtable-item|exinfo-vtable|ext-clone--maintain|ext-clone-create|ext-mode-hook-identify|ext-scale-adjust|ext-scale-decrease|ext-scale-increase|ext-scale-mode|ext-scale-set|hai-compose-buffer|hai-compose-region|hai-compose-string|hai-composition-function|he|hing-at-point--bounds-of-markedup-url|hing-at-point--bounds-of-well-formed-url|hing-at-point-bounds-of-list-at-point|hing-at-point-bounds-of-url-at-point|hing-at-point-looking-at|hing-at-point-newsgroup-p|hing-at-point-url-at-point|hird|his-major-mode-requires-vi-state|his-single-command-keys|his-single-command-raw-keys|hread-first|hread-last|humbs-backward-char|humbs-backward-line|humbs-call-convert|humbs-call-setroot-command|humbs-cleanup-thumbsdir|humbs-current-image|humbs-delete-images|humbs-dired-setroot|humbs-dired-show-marked|humbs-dired-show|humbs-dired|humbs-display-thumbs-buffer|humbs-do-thumbs-insertion|humbs-emboss-image|humbs-enlarge-image|humbs-file-alist|humbs-file-list|humbs-file-size|humbs-find-image-at-point-other-window|humbs-find-image-at-point|humbs-find-image|humbs-find-thumb|humbs-forward-char|humbs-forward-line|humbs-image-type|humbs-insert-image|humbs-insert-thumb|humbs-kill-buffer|humbs-make-thumb|humbs-mark|humbs-mode|humbs-modify-image|humbs-monochrome-image|humbs-mouse-find-image|humbs-negate-image|humbs-new-image-size|humbs-next-image|humbs-previous-image|humbs-redraw-buffer|humbs-rename-images|humbs-resize-image-1|humbs-resize-image|humbs-rotate-left|humbs-rotate-right|humbs-save-current-image|humbs-set-image-at-point-to-root-window|humbs-set-root|humbs-show-from-dir|humbs-show-image-num|humbs-show-more-images|humbs-show-name|humbs-show-thumbs-list|humbs-shrink-image|humbs-temp-dir|humbs-temp-file|humbs-thumbname|humbs-thumbsdir|humbs-unmark|humbs-view-image-mode|humbs|ibetan-char-p|ibetan-compose-buffer|ibetan-compose-region|ibetan-compose-string|ibetan-decompose-buffer|ibetan-decompose-region|ibetan-decompose-string|ibetan-post-read-conversion|ibetan-pre-write-canonicalize-for-unicode|ibetan-pre-write-conversion|ibetan-tibetan-to-transcription|ibetan-transcription-to-tibetan|ildify--deprecated-ignore-evironments|ildify--find-env|ildify--foreach-region|ildify--pick-alist-entry|ildify-buffer|ildify-foreach-ignore-environments|ildify-region|ildify-tildify|ime-date--day-in-year|ime-since|ime-stamp-conv-warn|ime-stamp-do-number|ime-stamp-fconcat|ime-stamp-mail-host-name|ime-stamp-once|ime-stamp-string-preprocess|ime-stamp-string|ime-stamp-toggle-active|ime-stamp|ime-to-number-of-days|ime-to-seconds|imeclock-ask-for-project|imeclock-ask-for-reason|imeclock-change|imeclock-completing-read|imeclock-current-debt|imeclock-currently-in-p|imeclock-day-alist|imeclock-day-base|imeclock-day-begin|imeclock-day-break|imeclock-day-debt|imeclock-day-end|imeclock-day-length|imeclock-day-list-begin|imeclock-day-list-break|imeclock-day-list-debt|imeclock-day-list-end|imeclock-day-list-length|imeclock-day-list-projects|imeclock-day-list-required|imeclock-day-list-span|imeclock-day-list-template|imeclock-day-list|imeclock-day-projects|imeclock-day-required|imeclock-day-span|imeclock-entry-begin|imeclock-entry-comment|imeclock-entry-end|imeclock-entry-length|imeclock-entry-list-begin|imeclock-entry-list-break|imeclock-entry-list-end|imeclock-entry-list-length|imeclock-entry-list-projects|imeclock-entry-list-span|imeclock-entry-project|imeclock-find-discrep|imeclock-generate-report|imeclock-in|imeclock-last-period|imeclock-log-data|imeclock-log|imeclock-make-hours-explicit|imeclock-mean|imeclock-mode-line-display|imeclock-modeline-display|imeclock-out|imeclock-project-alist|imeclock-query-out|imeclock-read-moment|imeclock-reread-log|imeclock-seconds-to-string|imeclock-seconds-to-time|imeclock-status-string|imeclock-time-to-date|imeclock-time-to-seconds|imeclock-update-mode-line|imeclock-update-modeline|imeclock-visit-timelog|imeclock-when-to-leave-string|imeclock-when-to-leave|imeclock-workday-elapsed-string|imeclock-workday-elapsed|imeclock-workday-remaining-string|imeclock-workday-remaining|imeout-event-p|imep|imer--activate|imer--args--cmacro|imer--args|imer--check|imer--function--cmacro|imer--function|imer--high-seconds--cmacro|imer--high-seconds|imer--idle-delay--cmacro|imer--idle-delay|imer--low-seconds--cmacro|imer--low-seconds|imer--psecs--cmacro|imer--psecs|imer--repeat-delay--cmacro|imer--repeat-delay|imer--time-less-p|imer--time-setter|imer--time|imer--triggered--cmacro|imer--triggered|imer--usecs--cmacro|imer--usecs|imer-activate-when-idle|imer-activate|imer-create--cmacro|imer-create|imer-duration|imer-event-handler|imer-inc-time|imer-next-integral-multiple-of-time|imer-relative-time|imer-set-function|imer-set-idle-time|imer-set-time-with-usecs|imer-set-time|imer-until|imerp|imezone-absolute-from-gregorian|imezone-day-number|imezone-fix-time|imezone-last-day-of-month|imezone-leap-year-p|imezone-make-arpa-date|imezone-make-date-arpa-standard|imezone-make-date-sortable|imezone-make-sortable-date|imezone-make-time-string|imezone-parse-date|imezone-parse-time|imezone-time-from-absolute|imezone-time-zone-from-absolute|imezone-zone-to-minute|itdic-convert|ls-certificate-information|mm--completion-table|mm-add-one-shortcut|mm-add-prompt|mm-add-shortcuts|mm-completion-delete-prompt|mm-define-keys|mm-get-keybind|mm-get-keymap|mm-goto-completions|mm-menubar-mouse|mm-menubar|mm-prompt|mm-remove-inactive-mouse-face|mm-shortcut|odo--user-error-if-marked-done-item|odo-absolute-file-name|odo-add-category|odo-add-file|odo-adjusted-category-label-length|odo-archive-done-item|odo-archive-mode|odo-backward-category|odo-backward-item|odo-categories-mode|odo-category-completions|odo-category-number|odo-category-select|odo-category-string-matcher-1|odo-category-string-matcher-2|odo-check-file|odo-check-filtered-items-file|odo-check-format|odo-choose-archive|odo-clear-matches|odo-comment-string-matcher|odo-convert-legacy-date-time|odo-convert-legacy-files|odo-current-category|odo-date-string-matcher|odo-delete-category|odo-delete-file|odo-delete-item|odo-desktop-save-buffer)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:todo-diary-expired-matcher|todo-diary-goto-entry|todo-diary-item-p|todo-diary-nonmarking-matcher|todo-display-categories|todo-display-sorted|todo-done-item-p|todo-done-item-section-p|todo-done-separator|todo-done-string-matcher|todo-edit-category-diary-inclusion|todo-edit-category-diary-nonmarking|todo-edit-file|todo-edit-item--diary-inclusion|todo-edit-item--header|todo-edit-item--next-key|todo-edit-item--text|todo-edit-item|todo-edit-mode|todo-edit-quit|todo-files|todo-filter-diary-items-multifile|todo-filter-diary-items|todo-filter-items-1|todo-filter-items-filename|todo-filter-items|todo-filter-regexp-items-multifile|todo-filter-regexp-items|todo-filter-top-priorities-multifile|todo-filter-top-priorities|todo-filtered-items-mode|todo-find-archive|todo-find-filtered-items-file|todo-find-item|todo-forward-category|todo-forward-item|todo-get-count|todo-get-overlay|todo-go-to-source-item|todo-indent|todo-insert-category-line|todo-insert-item--apply-args|todo-insert-item--argsleft|todo-insert-item--basic|todo-insert-item--keyof|todo-insert-item--next-param|todo-insert-item--this-key|todo-insert-item-from-calendar|todo-insert-item|todo-insert-sort-button|todo-insert-with-overlays|todo-item-done|todo-item-end|todo-item-start|todo-item-string|todo-item-undone|todo-jump-to-archive-category|todo-jump-to-category|todo-label-to-key|todo-longest-category-name-length|todo-lower-category|todo-lower-item-priority|todo-make-categories-list|todo-mark-category|todo-marked-item-p|todo-menu|todo-merge-category|todo-mode-external-set|todo-mode-line-control|todo-mode|todo-modes-set-1|todo-modes-set-2|todo-modes-set-3|todo-move-category|todo-move-item|todo-multiple-filter-files|todo-next-button|todo-next-item|todo-nondiary-marker-matcher|todo-padded-string|todo-prefix-overlays|todo-previous-button|todo-previous-item|todo-print-buffer-to-file|todo-print-buffer|todo-quit|todo-raise-category|todo-raise-item-priority|todo-read-category|todo-read-date|todo-read-dayname|todo-read-file-name|todo-read-time|todo-reevaluate-category-completions-files-defcustom|todo-reevaluate-default-file-defcustom|todo-reevaluate-filelist-defcustoms|todo-reevaluate-filter-files-defcustom|todo-remove-item|todo-rename-category|todo-rename-file|todo-repair-categories-sexp|todo-reset-and-enable-done-separator|todo-reset-comment-string|todo-reset-done-separator-string|todo-reset-done-separator|todo-reset-done-string|todo-reset-global-current-todo-file|todo-reset-highlight-item|todo-reset-nondiary-marker|todo-reset-prefix|todo-restore-desktop-buffer|todo-revert-buffer|todo-save-filtered-items-buffer|todo-save|todo-search|todo-set-categories|todo-set-category-number|todo-set-date-from-calendar|todo-set-item-priority|todo-set-show-current-file|todo-set-top-priorities-in-category|todo-set-top-priorities-in-file|todo-set-top-priorities|todo-short-file-name|todo-show-categories-table|todo-show-current-file|todo-show|todo-sort-categories-alphabetically-or-numerically|todo-sort-categories-by-archived|todo-sort-categories-by-diary|todo-sort-categories-by-done|todo-sort-categories-by-todo|todo-sort|todo-time-string-matcher|todo-toggle-item-header|todo-toggle-item-highlighting|todo-toggle-mark-item|todo-toggle-prefix-numbers|todo-toggle-view-done-items|todo-toggle-view-done-only|todo-total-item-counts|todo-unarchive-items|todo-unmark-category|todo-update-buffer-list|todo-update-categories-display|todo-update-categories-sexp|todo-update-count|todo-validate-name|todo-y-or-n-p|toggle-auto-composition|toggle-case-fold-search|toggle-debug-on-error|toggle-debug-on-quit|toggle-emacs-lock|toggle-frame-fullscreen|toggle-frame-maximized|toggle-horizontal-scroll-bar|toggle-indicate-empty-lines|toggle-input-method|toggle-menu-bar-mode-from-frame|toggle-read-only|toggle-rot13-mode|toggle-save-place-globally|toggle-save-place|toggle-scroll-bar|toggle-text-mode-auto-fill|toggle-tool-bar-mode-from-frame|toggle-truncate-lines|toggle-uniquify-buffer-names|toggle-use-system-font|toggle-viper-mode|toggle-word-wrap|tool-bar--image-expression|tool-bar-get-system-style|tool-bar-height|tool-bar-lines-needed|tool-bar-local-item|tool-bar-make-keymap-1|tool-bar-make-keymap|tool-bar-mode|tool-bar-pixel-width|tool-bar-setup|tooltip-cancel-delayed-tip|tooltip-delay|tooltip-event-buffer|tooltip-expr-to-print|tooltip-gud-toggle-dereference|tooltip-help-tips|tooltip-hide|tooltip-identifier-from-point|tooltip-mode|tooltip-process-prompt-regexp|tooltip-set-param|tooltip-show-help-non-mode|tooltip-show-help|tooltip-show|tooltip-start-delayed-tip|tooltip-strip-prompt|tooltip-timeout|tq-buffer|tq-filter|tq-process-buffer|tq-process|tq-queue-add|tq-queue-empty|tq-queue-head-closure|tq-queue-head-fn|tq-queue-head-question|tq-queue-head-regexp|tq-queue-pop|tq-queue|trace--display-buffer|trace--read-args|trace-entry-message|trace-exit-message|trace-function-background|trace-function-foreground|trace-function-internal|trace-function|trace-is-traced|trace-make-advice|trace-values|traceroute|tramp-accept-process-output|tramp-action-login|tramp-action-out-of-band|tramp-action-password|tramp-action-permission-denied|tramp-action-process-alive|tramp-action-succeed|tramp-action-terminal|tramp-action-yesno|tramp-action-yn|tramp-adb-file-name-handler|tramp-adb-file-name-p|tramp-adb-parse-device-names|tramp-autoload-file-name-handler|tramp-backtrace|tramp-buffer-name|tramp-bug|tramp-cache-print|tramp-call-process|tramp-check-cached-permissions|tramp-check-for-regexp|tramp-check-proper-method-and-host|tramp-cleanup-all-buffers|tramp-cleanup-all-connections|tramp-cleanup-connection|tramp-cleanup-this-connection|tramp-clear-passwd|tramp-compat-coding-system-change-eol-conversion|tramp-compat-condition-case-unless-debug|tramp-compat-copy-directory|tramp-compat-copy-file|tramp-compat-decimal-to-octal|tramp-compat-delete-directory|tramp-compat-delete-file|tramp-compat-file-attributes|tramp-compat-font-lock-add-keywords|tramp-compat-funcall|tramp-compat-load|tramp-compat-make-temp-file|tramp-compat-most-positive-fixnum|tramp-compat-number-sequence|tramp-compat-octal-to-decimal|tramp-compat-process-get|tramp-compat-process-put|tramp-compat-process-running-p|tramp-compat-replace-regexp-in-string|tramp-compat-set-process-query-on-exit-flag|tramp-compat-split-string|tramp-compat-temporary-file-directory|tramp-compat-with-temp-message|tramp-completion-dissect-file-name|tramp-completion-dissect-file-name1|tramp-completion-file-name-handler|tramp-completion-handle-file-name-all-completions|tramp-completion-handle-file-name-completion|tramp-completion-make-tramp-file-name|tramp-completion-mode-p|tramp-completion-run-real-handler|tramp-condition-case-unless-debug|tramp-connectable-p|tramp-connection-property-p|tramp-debug-buffer-name|tramp-debug-message|tramp-debug-outline-level|tramp-default-file-modes|tramp-delete-temp-file-function|tramp-dissect-file-name|tramp-drop-volume-letter|tramp-equal-remote|tramp-error-with-buffer|tramp-error|tramp-eshell-directory-change|tramp-exists-file-name-handler|tramp-file-mode-from-int|tramp-file-mode-permissions|tramp-file-name-domain|tramp-file-name-for-operation|tramp-file-name-handler|tramp-file-name-hop|tramp-file-name-host|tramp-file-name-localname|tramp-file-name-method|tramp-file-name-p|tramp-file-name-port|tramp-file-name-real-host|tramp-file-name-real-user|tramp-file-name-user|tramp-find-file-name-coding-system-alist|tramp-find-foreign-file-name-handler|tramp-find-host|tramp-find-method|tramp-find-user|tramp-flush-connection-property|tramp-flush-directory-property|tramp-flush-file-property|tramp-ftp-enable-ange-ftp|tramp-ftp-file-name-handler|tramp-ftp-file-name-p|tramp-get-buffer|tramp-get-completion-function|tramp-get-completion-methods|tramp-get-completion-user-host|tramp-get-connection-buffer|tramp-get-connection-name|tramp-get-connection-process|tramp-get-connection-property|tramp-get-debug-buffer|tramp-get-device|tramp-get-file-property|tramp-get-inode|tramp-get-local-gid|tramp-get-local-uid|tramp-get-method-parameter|tramp-get-remote-tmpdir|tramp-gvfs-file-name-handler|tramp-gvfs-file-name-p|tramp-gw-open-connection|tramp-handle-directory-file-name|tramp-handle-directory-files-and-attributes|tramp-handle-directory-files|tramp-handle-dired-uncache|tramp-handle-file-accessible-directory-p|tramp-handle-file-exists-p|tramp-handle-file-modes|tramp-handle-file-name-as-directory|tramp-handle-file-name-completion|tramp-handle-file-name-directory|tramp-handle-file-name-nondirectory|tramp-handle-file-newer-than-file-p|tramp-handle-file-notify-add-watch|tramp-handle-file-notify-rm-watch|tramp-handle-file-regular-p|tramp-handle-file-remote-p|tramp-handle-file-symlink-p|tramp-handle-find-backup-file-name|tramp-handle-insert-directory|tramp-handle-insert-file-contents|tramp-handle-load|tramp-handle-make-auto-save-file-name|tramp-handle-make-symbolic-link|tramp-handle-set-visited-file-modtime|tramp-handle-shell-command|tramp-handle-substitute-in-file-name|tramp-handle-unhandled-file-name-directory|tramp-handle-verify-visited-file-modtime|tramp-list-connections|tramp-local-host-p|tramp-make-tramp-file-name|tramp-make-tramp-temp-file|tramp-message|tramp-mode-string-to-int|tramp-parse-connection-properties|tramp-parse-file|tramp-parse-group|tramp-parse-hosts-group|tramp-parse-hosts|tramp-parse-netrc-group|tramp-parse-netrc|tramp-parse-passwd-group|tramp-parse-passwd|tramp-parse-putty-group|tramp-parse-putty|tramp-parse-rhosts-group|tramp-parse-rhosts|tramp-parse-sconfig-group|tramp-parse-sconfig|tramp-parse-shostkeys-sknownhosts|tramp-parse-shostkeys|tramp-parse-shosts-group|tramp-parse-shosts|tramp-parse-sknownhosts|tramp-process-actions|tramp-process-one-action|tramp-progress-reporter-update|tramp-read-passwd|tramp-register-autoload-file-name-handlers|tramp-register-file-name-handlers|tramp-replace-environment-variables|tramp-rfn-eshadow-setup-minibuffer|tramp-rfn-eshadow-update-overlay|tramp-run-real-handler|tramp-send-string|tramp-set-auto-save-file-modes|tramp-set-completion-function|tramp-set-connection-property|tramp-set-file-property|tramp-sh-file-name-handler|tramp-shell-quote-argument|tramp-smb-file-name-handler|tramp-smb-file-name-p|tramp-subst-strs-in-string|tramp-time-diff|tramp-tramp-file-p|tramp-unload-file-name-handlers|tramp-unload-tramp|tramp-user-error|tramp-uuencode-region|tramp-version|tramp-wait-for-regexp|transform-make-coding-system-args|translate-region-internal|transpose-chars|transpose-lines|transpose-paragraphs|transpose-sentences|transpose-sexps|transpose-subr-1|transpose-subr|transpose-words|tree-equal|tree-widget--locate-sub-directory|tree-widget-action|tree-widget-button-click|tree-widget-children-value-save|tree-widget-convert-widget|tree-widget-create-image|tree-widget-expander-p|tree-widget-find-image|tree-widget-help-echo|tree-widget-icon-action|tree-widget-icon-create|tree-widget-icon-help-echo|tree-widget-image-formats|tree-widget-image-properties|tree-widget-keep|tree-widget-leaf-node-icon-p|tree-widget-lookup-image|tree-widget-node|tree-widget-p|tree-widget-set-image-properties|tree-widget-set-parent-theme|tree-widget-set-theme|tree-widget-theme-name|tree-widget-themes-path|tree-widget-use-image-p|tree-widget-value-create|truncate\\*|truncated-partial-width-window-p|try-complete-file-name-partially|try-complete-file-name|try-complete-lisp-symbol-partially|try-complete-lisp-symbol|try-expand-all-abbrevs|try-expand-dabbrev-all-buffers|try-expand-dabbrev-from-kill|try-expand-dabbrev-visible|try-expand-dabbrev|try-expand-line-all-buffers|try-expand-line|try-expand-list-all-buffers|try-expand-list|try-expand-whole-kill|tty-color-by-index|tty-color-canonicalize|tty-color-desc|tty-color-gray-shades|tty-color-off-gray-diag|tty-color-standard-values|tty-color-values|tty-create-frame-with-faces|tty-display-color-cells|tty-display-color-p|tty-find-type|tty-handle-args|tty-handle-reverse-video|tty-modify-color-alist|tty-no-underline|tty-register-default-colors|tty-run-terminal-initialization|tty-set-up-initial-frame-faces|tty-suppress-bold-inverse-default-colors|tty-type|tumme|turkish-case-conversion-disable|turkish-case-conversion-enable|turn-off-auto-fill|turn-off-flyspell|turn-off-follow-mode|turn-off-hideshow|turn-off-iimage-mode|turn-off-xterm-mouse-tracking-on-terminal|turn-on-auto-fill|turn-on-auto-revert-mode|turn-on-auto-revert-tail-mode|turn-on-cwarn-mode-if-enabled|turn-on-cwarn-mode|turn-on-eldoc-mode|turn-on-flyspell|turn-on-follow-mode|turn-on-font-lock-if-desired|turn-on-font-lock|turn-on-gnus-dired-mode)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)t(?:odo-diary-expired-matcher|odo-diary-goto-entry|odo-diary-item-p|odo-diary-nonmarking-matcher|odo-display-categories|odo-display-sorted|odo-done-item-p|odo-done-item-section-p|odo-done-separator|odo-done-string-matcher|odo-edit-category-diary-inclusion|odo-edit-category-diary-nonmarking|odo-edit-file|odo-edit-item--diary-inclusion|odo-edit-item--header|odo-edit-item--next-key|odo-edit-item--text|odo-edit-item|odo-edit-mode|odo-edit-quit|odo-files|odo-filter-diary-items-multifile|odo-filter-diary-items|odo-filter-items-1|odo-filter-items-filename|odo-filter-items|odo-filter-regexp-items-multifile|odo-filter-regexp-items|odo-filter-top-priorities-multifile|odo-filter-top-priorities|odo-filtered-items-mode|odo-find-archive|odo-find-filtered-items-file|odo-find-item|odo-forward-category|odo-forward-item|odo-get-count|odo-get-overlay|odo-go-to-source-item|odo-indent|odo-insert-category-line|odo-insert-item--apply-args|odo-insert-item--argsleft|odo-insert-item--basic|odo-insert-item--keyof|odo-insert-item--next-param|odo-insert-item--this-key|odo-insert-item-from-calendar|odo-insert-item|odo-insert-sort-button|odo-insert-with-overlays|odo-item-done|odo-item-end|odo-item-start|odo-item-string|odo-item-undone|odo-jump-to-archive-category|odo-jump-to-category|odo-label-to-key|odo-longest-category-name-length|odo-lower-category|odo-lower-item-priority|odo-make-categories-list|odo-mark-category|odo-marked-item-p|odo-menu|odo-merge-category|odo-mode-external-set|odo-mode-line-control|odo-mode|odo-modes-set-1|odo-modes-set-2|odo-modes-set-3|odo-move-category|odo-move-item|odo-multiple-filter-files|odo-next-button|odo-next-item|odo-nondiary-marker-matcher|odo-padded-string|odo-prefix-overlays|odo-previous-button|odo-previous-item|odo-print-buffer-to-file|odo-print-buffer|odo-quit|odo-raise-category|odo-raise-item-priority|odo-read-category|odo-read-date|odo-read-dayname|odo-read-file-name|odo-read-time|odo-reevaluate-category-completions-files-defcustom|odo-reevaluate-default-file-defcustom|odo-reevaluate-filelist-defcustoms|odo-reevaluate-filter-files-defcustom|odo-remove-item|odo-rename-category|odo-rename-file|odo-repair-categories-sexp|odo-reset-and-enable-done-separator|odo-reset-comment-string|odo-reset-done-separator-string|odo-reset-done-separator|odo-reset-done-string|odo-reset-global-current-todo-file|odo-reset-highlight-item|odo-reset-nondiary-marker|odo-reset-prefix|odo-restore-desktop-buffer|odo-revert-buffer|odo-save-filtered-items-buffer|odo-save|odo-search|odo-set-categories|odo-set-category-number|odo-set-date-from-calendar|odo-set-item-priority|odo-set-show-current-file|odo-set-top-priorities-in-category|odo-set-top-priorities-in-file|odo-set-top-priorities|odo-short-file-name|odo-show-categories-table|odo-show-current-file|odo-show|odo-sort-categories-alphabetically-or-numerically|odo-sort-categories-by-archived|odo-sort-categories-by-diary|odo-sort-categories-by-done|odo-sort-categories-by-todo|odo-sort|odo-time-string-matcher|odo-toggle-item-header|odo-toggle-item-highlighting|odo-toggle-mark-item|odo-toggle-prefix-numbers|odo-toggle-view-done-items|odo-toggle-view-done-only|odo-total-item-counts|odo-unarchive-items|odo-unmark-category|odo-update-buffer-list|odo-update-categories-display|odo-update-categories-sexp|odo-update-count|odo-validate-name|odo-y-or-n-p|oggle-auto-composition|oggle-case-fold-search|oggle-debug-on-error|oggle-debug-on-quit|oggle-emacs-lock|oggle-frame-fullscreen|oggle-frame-maximized|oggle-horizontal-scroll-bar|oggle-indicate-empty-lines|oggle-input-method|oggle-menu-bar-mode-from-frame|oggle-read-only|oggle-rot13-mode|oggle-save-place-globally|oggle-save-place|oggle-scroll-bar|oggle-text-mode-auto-fill|oggle-tool-bar-mode-from-frame|oggle-truncate-lines|oggle-uniquify-buffer-names|oggle-use-system-font|oggle-viper-mode|oggle-word-wrap|ool-bar--image-expression|ool-bar-get-system-style|ool-bar-height|ool-bar-lines-needed|ool-bar-local-item|ool-bar-make-keymap-1|ool-bar-make-keymap|ool-bar-mode|ool-bar-pixel-width|ool-bar-setup|ooltip-cancel-delayed-tip|ooltip-delay|ooltip-event-buffer|ooltip-expr-to-print|ooltip-gud-toggle-dereference|ooltip-help-tips|ooltip-hide|ooltip-identifier-from-point|ooltip-mode|ooltip-process-prompt-regexp|ooltip-set-param|ooltip-show-help-non-mode|ooltip-show-help|ooltip-show|ooltip-start-delayed-tip|ooltip-strip-prompt|ooltip-timeout|q-buffer|q-filter|q-process-buffer|q-process|q-queue-add|q-queue-empty|q-queue-head-closure|q-queue-head-fn|q-queue-head-question|q-queue-head-regexp|q-queue-pop|q-queue|race--display-buffer|race--read-args|race-entry-message|race-exit-message|race-function-background|race-function-foreground|race-function-internal|race-function|race-is-traced|race-make-advice|race-values|raceroute|ramp-accept-process-output|ramp-action-login|ramp-action-out-of-band|ramp-action-password|ramp-action-permission-denied|ramp-action-process-alive|ramp-action-succeed|ramp-action-terminal|ramp-action-yesno|ramp-action-yn|ramp-adb-file-name-handler|ramp-adb-file-name-p|ramp-adb-parse-device-names|ramp-autoload-file-name-handler|ramp-backtrace|ramp-buffer-name|ramp-bug|ramp-cache-print|ramp-call-process|ramp-check-cached-permissions|ramp-check-for-regexp|ramp-check-proper-method-and-host|ramp-cleanup-all-buffers|ramp-cleanup-all-connections|ramp-cleanup-connection|ramp-cleanup-this-connection|ramp-clear-passwd|ramp-compat-coding-system-change-eol-conversion|ramp-compat-condition-case-unless-debug|ramp-compat-copy-directory|ramp-compat-copy-file|ramp-compat-decimal-to-octal|ramp-compat-delete-directory|ramp-compat-delete-file|ramp-compat-file-attributes|ramp-compat-font-lock-add-keywords|ramp-compat-funcall|ramp-compat-load|ramp-compat-make-temp-file|ramp-compat-most-positive-fixnum|ramp-compat-number-sequence|ramp-compat-octal-to-decimal|ramp-compat-process-get|ramp-compat-process-put|ramp-compat-process-running-p|ramp-compat-replace-regexp-in-string|ramp-compat-set-process-query-on-exit-flag|ramp-compat-split-string|ramp-compat-temporary-file-directory|ramp-compat-with-temp-message|ramp-completion-dissect-file-name|ramp-completion-dissect-file-name1|ramp-completion-file-name-handler|ramp-completion-handle-file-name-all-completions|ramp-completion-handle-file-name-completion|ramp-completion-make-tramp-file-name|ramp-completion-mode-p|ramp-completion-run-real-handler|ramp-condition-case-unless-debug|ramp-connectable-p|ramp-connection-property-p|ramp-debug-buffer-name|ramp-debug-message|ramp-debug-outline-level|ramp-default-file-modes|ramp-delete-temp-file-function|ramp-dissect-file-name|ramp-drop-volume-letter|ramp-equal-remote|ramp-error-with-buffer|ramp-error|ramp-eshell-directory-change|ramp-exists-file-name-handler|ramp-file-mode-from-int|ramp-file-mode-permissions|ramp-file-name-domain|ramp-file-name-for-operation|ramp-file-name-handler|ramp-file-name-hop|ramp-file-name-host|ramp-file-name-localname|ramp-file-name-method|ramp-file-name-p|ramp-file-name-port|ramp-file-name-real-host|ramp-file-name-real-user|ramp-file-name-user|ramp-find-file-name-coding-system-alist|ramp-find-foreign-file-name-handler|ramp-find-host|ramp-find-method|ramp-find-user|ramp-flush-connection-property|ramp-flush-directory-property|ramp-flush-file-property|ramp-ftp-enable-ange-ftp|ramp-ftp-file-name-handler|ramp-ftp-file-name-p|ramp-get-buffer|ramp-get-completion-function|ramp-get-completion-methods|ramp-get-completion-user-host|ramp-get-connection-buffer|ramp-get-connection-name|ramp-get-connection-process|ramp-get-connection-property|ramp-get-debug-buffer|ramp-get-device|ramp-get-file-property|ramp-get-inode|ramp-get-local-gid|ramp-get-local-uid|ramp-get-method-parameter|ramp-get-remote-tmpdir|ramp-gvfs-file-name-handler|ramp-gvfs-file-name-p|ramp-gw-open-connection|ramp-handle-directory-file-name|ramp-handle-directory-files-and-attributes|ramp-handle-directory-files|ramp-handle-dired-uncache|ramp-handle-file-accessible-directory-p|ramp-handle-file-exists-p|ramp-handle-file-modes|ramp-handle-file-name-as-directory|ramp-handle-file-name-completion|ramp-handle-file-name-directory|ramp-handle-file-name-nondirectory|ramp-handle-file-newer-than-file-p|ramp-handle-file-notify-add-watch|ramp-handle-file-notify-rm-watch|ramp-handle-file-regular-p|ramp-handle-file-remote-p|ramp-handle-file-symlink-p|ramp-handle-find-backup-file-name|ramp-handle-insert-directory|ramp-handle-insert-file-contents|ramp-handle-load|ramp-handle-make-auto-save-file-name|ramp-handle-make-symbolic-link|ramp-handle-set-visited-file-modtime|ramp-handle-shell-command|ramp-handle-substitute-in-file-name|ramp-handle-unhandled-file-name-directory|ramp-handle-verify-visited-file-modtime|ramp-list-connections|ramp-local-host-p|ramp-make-tramp-file-name|ramp-make-tramp-temp-file|ramp-message|ramp-mode-string-to-int|ramp-parse-connection-properties|ramp-parse-file|ramp-parse-group|ramp-parse-hosts-group|ramp-parse-hosts|ramp-parse-netrc-group|ramp-parse-netrc|ramp-parse-passwd-group|ramp-parse-passwd|ramp-parse-putty-group|ramp-parse-putty|ramp-parse-rhosts-group|ramp-parse-rhosts|ramp-parse-sconfig-group|ramp-parse-sconfig|ramp-parse-shostkeys-sknownhosts|ramp-parse-shostkeys|ramp-parse-shosts-group|ramp-parse-shosts|ramp-parse-sknownhosts|ramp-process-actions|ramp-process-one-action|ramp-progress-reporter-update|ramp-read-passwd|ramp-register-autoload-file-name-handlers|ramp-register-file-name-handlers|ramp-replace-environment-variables|ramp-rfn-eshadow-setup-minibuffer|ramp-rfn-eshadow-update-overlay|ramp-run-real-handler|ramp-send-string|ramp-set-auto-save-file-modes|ramp-set-completion-function|ramp-set-connection-property|ramp-set-file-property|ramp-sh-file-name-handler|ramp-shell-quote-argument|ramp-smb-file-name-handler|ramp-smb-file-name-p|ramp-subst-strs-in-string|ramp-time-diff|ramp-tramp-file-p|ramp-unload-file-name-handlers|ramp-unload-tramp|ramp-user-error|ramp-uuencode-region|ramp-version|ramp-wait-for-regexp|ransform-make-coding-system-args|ranslate-region-internal|ranspose-chars|ranspose-lines|ranspose-paragraphs|ranspose-sentences|ranspose-sexps|ranspose-subr-1|ranspose-subr|ranspose-words|ree-equal|ree-widget--locate-sub-directory|ree-widget-action|ree-widget-button-click|ree-widget-children-value-save|ree-widget-convert-widget|ree-widget-create-image|ree-widget-expander-p|ree-widget-find-image|ree-widget-help-echo|ree-widget-icon-action|ree-widget-icon-create|ree-widget-icon-help-echo|ree-widget-image-formats|ree-widget-image-properties|ree-widget-keep|ree-widget-leaf-node-icon-p|ree-widget-lookup-image|ree-widget-node|ree-widget-p|ree-widget-set-image-properties|ree-widget-set-parent-theme|ree-widget-set-theme|ree-widget-theme-name|ree-widget-themes-path|ree-widget-use-image-p|ree-widget-value-create|runcate\\*|runcated-partial-width-window-p|ry-complete-file-name-partially|ry-complete-file-name|ry-complete-lisp-symbol-partially|ry-complete-lisp-symbol|ry-expand-all-abbrevs|ry-expand-dabbrev-all-buffers|ry-expand-dabbrev-from-kill|ry-expand-dabbrev-visible|ry-expand-dabbrev|ry-expand-line-all-buffers|ry-expand-line|ry-expand-list-all-buffers|ry-expand-list|ry-expand-whole-kill|ty-color-by-index|ty-color-canonicalize|ty-color-desc|ty-color-gray-shades|ty-color-off-gray-diag|ty-color-standard-values|ty-color-values|ty-create-frame-with-faces|ty-display-color-cells|ty-display-color-p|ty-find-type|ty-handle-args|ty-handle-reverse-video|ty-modify-color-alist|ty-no-underline|ty-register-default-colors|ty-run-terminal-initialization|ty-set-up-initial-frame-faces|ty-suppress-bold-inverse-default-colors|ty-type|umme|urkish-case-conversion-disable|urkish-case-conversion-enable|urn-off-auto-fill|urn-off-flyspell|urn-off-follow-mode|urn-off-hideshow|urn-off-iimage-mode|urn-off-xterm-mouse-tracking-on-terminal|urn-on-auto-fill|urn-on-auto-revert-mode|urn-on-auto-revert-tail-mode|urn-on-cwarn-mode-if-enabled|urn-on-cwarn-mode|urn-on-eldoc-mode|urn-on-flyspell|urn-on-follow-mode|urn-on-font-lock-if-desired|urn-on-font-lock|urn-on-gnus-dired-mode)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:turn-on-gnus-mailing-list-mode|turn-on-hi-lock-if-enabled|turn-on-iimage-mode|turn-on-org-cdlatex|turn-on-orgstruct\\+\\+|turn-on-orgstruct|turn-on-orgtbl|turn-on-prettify-symbols-mode|turn-on-reftex|turn-on-visual-line-mode|turn-on-xterm-mouse-tracking-on-terminal|type-break-alarm|type-break-cancel-function-timers|type-break-cancel-schedule|type-break-cancel-time-warning-schedule|type-break-catch-up-event|type-break-check-keystroke-warning|type-break-check-post-command-hook|type-break-check|type-break-choose-file|type-break-demo-boring|type-break-demo-hanoi|type-break-demo-life|type-break-do-query|type-break-file-keystroke-count|type-break-file-time|type-break-force-mode-line-update|type-break-format-time|type-break-get-previous-count|type-break-get-previous-time|type-break-guesstimate-keystroke-threshold|type-break-keystroke-reset|type-break-keystroke-warning|type-break-mode-line-countdown-or-break|type-break-mode-line-message-mode|type-break-mode|type-break-noninteractive-query|type-break-query-mode|type-break-query|type-break-run-at-time|type-break-run-tb-post-command-hook|type-break-schedule|type-break-statistics|type-break-time-difference|type-break-time-stamp|type-break-time-sum|type-break-time-warning-alarm|type-break-time-warning-schedule|type-break-time-warning|type-break|typecase|typep|uce-insert-ranting|uce-reply-to-uce|ucs-input-activate|ucs-insert|ucs-names|ucs-normalize-HFS-NFC-region|ucs-normalize-HFS-NFC-string|ucs-normalize-HFS-NFD-region|ucs-normalize-HFS-NFD-string|ucs-normalize-NFC-region|ucs-normalize-NFC-string|ucs-normalize-NFD-region|ucs-normalize-NFD-string|ucs-normalize-NFKC-region|ucs-normalize-NFKC-string|ucs-normalize-NFKD-region|ucs-normalize-NFKD-string|uncomment-region-default|uncomment-region|uncompface|underline-region|undigestify-rmail-message|undo-adjust-beg-end|undo-adjust-elt|undo-adjust-pos|undo-copy-list-1|undo-copy-list|undo-delta|undo-elt-crosses-region|undo-elt-in-region|undo-make-selective-list|undo-more|undo-only|undo-outer-limit-truncate|undo-start|undo|unencodable-char-position|unexpand-abbrev|unfocus-frame|unforward-rmail-message|unhighlight-regexp|unicode-property-table-internal|unify-8859-on-decoding-mode|unify-8859-on-encoding-mode|unify-charset|union|uniquify--create-file-buffer-advice|uniquify--rename-buffer-advice|uniquify-buffer-base-name|uniquify-buffer-file-name|uniquify-get-proposed-name|uniquify-item-base--cmacro|uniquify-item-base|uniquify-item-buffer--cmacro|uniquify-item-buffer|uniquify-item-dirname--cmacro|uniquify-item-dirname|uniquify-item-greaterp|uniquify-item-p--cmacro|uniquify-item-p|uniquify-item-proposed--cmacro|uniquify-item-proposed|uniquify-kill-buffer-function|uniquify-make-item--cmacro|uniquify-make-item|uniquify-maybe-rerationalize-w\\/o-cb|uniquify-rationalize-a-list|uniquify-rationalize-conflicting-sublist|uniquify-rationalize-file-buffer-names|uniquify-rationalize|uniquify-rename-buffer|uniquify-rerationalize-w\\/o-cb|uniquify-unload-function|universal-argument--mode|universal-argument-more|universal-coding-system-argument|unix-sync|unjustify-current-line|unjustify-region|unload--set-major-mode|unmorse-region|unmsys--file-name|unread-bib|unrecord-window-buffer|unrmail|unsafep-function|unsafep-let|unsafep-progn|unsafep-variable|untabify-backward|untabify|untrace-all|untrace-function|ununderline-region|up-ifdef|upcase-initials-region|update-glyphless-char-display|update-leim-list-file|url--allowed-chars|url-attributes--cmacro|url-attributes|url-auth-registered|url-auth-user-prompt|url-basepath|url-basic-auth|url-bit-for-url|url-build-query-string|url-cache-create-filename|url-cache-extract|url-cache-prune-cache|url-cid|url-completion-function|url-cookie-clean-up|url-cookie-create--cmacro|url-cookie-create|url-cookie-delete|url-cookie-domain--cmacro|url-cookie-domain|url-cookie-expired-p|url-cookie-expires--cmacro|url-cookie-expires|url-cookie-generate-header-lines|url-cookie-handle-set-cookie|url-cookie-host-can-set-p|url-cookie-list|url-cookie-localpart--cmacro|url-cookie-localpart|url-cookie-mode|url-cookie-name--cmacro|url-cookie-name|url-cookie-p--cmacro|url-cookie-p|url-cookie-parse-file|url-cookie-quit|url-cookie-retrieve|url-cookie-secure--cmacro|url-cookie-secure|url-cookie-setup-save-timer|url-cookie-store|url-cookie-value--cmacro|url-cookie-value|url-cookie-write-file|url-copy-file|url-data|url-dav-request|url-dav-supported-p|url-dav-vc-registered|url-debug|url-default-expander|url-default-find-proxy-for-url|url-device-type|url-digest-auth-create-key|url-digest-auth|url-display-percentage|url-do-auth-source-search|url-do-setup|url-domsuf-cookie-allowed-p|url-domsuf-parse-file|url-eat-trailing-space|url-encode-url|url-expand-file-name|url-expander-remove-relative-links|url-extract-mime-headers|url-file-directory|url-file-extension|url-file-handler|url-file-local-copy|url-file-nondirectory|url-file|url-filename--cmacro|url-filename|url-find-proxy-for-url|url-fullness--cmacro|url-fullness|url-gateway-nslookup-host|url-gc-dead-buffers|url-generate-unique-filename|url-generic-emulator-loader|url-generic-parse-url|url-get-authentication|url-get-normalized-date|url-get-url-at-point|url-handle-content-transfer-encoding|url-handler-mode|url-have-visited-url|url-hexify-string|url-history-parse-history|url-history-save-history|url-history-setup-save-timer|url-history-update-url|url-host--cmacro|url-host|url-http-activate-callback|url-http-async-sentinel|url-http-chunked-encoding-after-change-function|url-http-clean-headers|url-http-content-length-after-change-function|url-http-create-request|url-http-debug|url-http-end-of-document-sentinel|url-http-expand-file-name|url-http-file-attributes|url-http-file-exists-p|url-http-file-readable-p|url-http-find-free-connection|url-http-generic-filter|url-http-handle-authentication|url-http-handle-cookies|url-http-head-file-attributes|url-http-head|url-http-idle-sentinel|url-http-mark-connection-as-busy|url-http-mark-connection-as-free|url-http-options|url-http-parse-headers|url-http-parse-response|url-http-simple-after-change-function|url-http-symbol-value-in-buffer|url-http-user-agent-string|url-http-wait-for-headers-change-function|url-http|url-https-create-secure-wrapper|url-https-expand-file-name|url-https-file-attributes|url-https-file-exists-p|url-https-file-readable-p|url-https|url-identity-expander|url-info|url-insert-entities-in-string|url-insert-file-contents|url-irc|url-is-cached|url-lazy-message|url-ldap|url-mail|url-mailto|url-make-private-file|url-man|url-mark-buffer-as-dead|url-mime-charset-string|url-mm-callback|url-mm-url|url-news|url-normalize-url|url-ns-prefs|url-ns-user-pref|url-open-rlogin|url-open-stream|url-open-telnet|url-p--cmacro|url-p|url-parse-args|url-parse-make-urlobj--cmacro|url-parse-make-urlobj|url-parse-query-string|url-password--cmacro|url-password-for-url|url-password|url-path-and-query|url-percentage|url-port-if-non-default|url-port|url-portspec--cmacro|url-portspec|url-pretty-length|url-proxy|url-queue-buffer--cmacro|url-queue-buffer|url-queue-callback--cmacro|url-queue-callback-function|url-queue-callback|url-queue-cbargs--cmacro|url-queue-cbargs|url-queue-inhibit-cookiesp--cmacro|url-queue-inhibit-cookiesp|url-queue-kill-job|url-queue-p--cmacro|url-queue-p|url-queue-pre-triggered--cmacro|url-queue-pre-triggered|url-queue-prune-old-entries|url-queue-remove-jobs-from-host|url-queue-retrieve|url-queue-run-queue|url-queue-setup-runners|url-queue-silentp--cmacro|url-queue-silentp|url-queue-start-retrieve|url-queue-start-time--cmacro|url-queue-start-time|url-queue-url--cmacro|url-queue-url|url-recreate-url-attributes|url-recreate-url|url-register-auth-scheme|url-retrieve-internal|url-retrieve-synchronously|url-retrieve|url-rlogin|url-scheme-default-loader|url-scheme-get-property|url-scheme-register-proxy|url-set-mime-charset-string|url-setup-privacy-info|url-silent--cmacro|url-silent|url-snews|url-store-in-cache|url-strip-leading-spaces|url-target--cmacro|url-target|url-telnet|url-tn3270|url-tramp-file-handler|url-truncate-url-for-viewing|url-type--cmacro|url-type|url-unhex-string|url-unhex|url-use-cookies--cmacro|url-use-cookies|url-user--cmacro|url-user-for-url|url-user|url-view-url|url-wait-for-string|url-warn|use-cjk-char-width-table|use-completion-backward-under|use-completion-backward|use-completion-before-point|use-completion-before-separator|use-completion-minibuffer-separator|use-completion-under-or-before-point|use-completion-under-point|use-default-char-width-table|use-fancy-splash-screens-p|use-package|user-original-login-name|user-variable-p|utf-7-imap-post-read-conversion|utf-7-imap-pre-write-conversion|utf-7-post-read-conversion|utf-7-pre-write-conversion|utf7-decode|utf7-encode|uudecode-char-int|uudecode-decode-region-external|uudecode-decode-region-internal|uudecode-decode-region|uudecode-string-to-multibyte|values-list|variable-at-point|variable-binding-locus|variable-pitch-mode|vc--add-line|vc--process-sentinel|vc--read-lines|vc--remove-regexp|vc-after-save|vc-annotate|vc-backend-for-registration|vc-backend-subdirectory-name|vc-backend|vc-before-save|vc-branch-p|vc-branch-part|vc-buffer-context|vc-buffer-sync|vc-bzr-registered|vc-call-backend|vc-call|vc-check-headers|vc-check-master-templates|vc-checkin|vc-checkout-model|vc-checkout|vc-clear-context|vc-coding-system-for-diff|vc-comment-search-forward|vc-comment-search-reverse|vc-comment-to-change-log|vc-compatible-state|vc-compilation-mode|vc-context-matches-p|vc-create-repo|vc-create-tag|vc-cvs-after-dir-status|vc-cvs-annotate-command|vc-cvs-annotate-current-time|vc-cvs-annotate-extract-revision-at-line|vc-cvs-annotate-process-filter|vc-cvs-annotate-time|vc-cvs-append-to-ignore|vc-cvs-check-headers|vc-cvs-checkin|vc-cvs-checkout-model|vc-cvs-checkout|vc-cvs-command|vc-cvs-comment-history|vc-cvs-could-register|vc-cvs-create-tag|vc-cvs-delete-file|vc-cvs-diff|vc-cvs-dir-extra-headers|vc-cvs-dir-status-files|vc-cvs-dir-status-heuristic|vc-cvs-file-to-string|vc-cvs-find-admin-dir|vc-cvs-find-revision|vc-cvs-get-entries|vc-cvs-ignore|vc-cvs-make-version-backups-p|vc-cvs-merge-file|vc-cvs-merge-news|vc-cvs-merge|vc-cvs-mode-line-string|vc-cvs-modify-change-comment|vc-cvs-next-revision|vc-cvs-parse-entry|vc-cvs-parse-root|vc-cvs-parse-status|vc-cvs-parse-sticky-tag|vc-cvs-parse-uhp|vc-cvs-previous-revision|vc-cvs-print-log|vc-cvs-register|vc-cvs-registered|vc-cvs-repository-hostname|vc-cvs-responsible-p|vc-cvs-retrieve-tag|vc-cvs-revert|vc-cvs-revision-completion-table|vc-cvs-revision-granularity|vc-cvs-revision-table|vc-cvs-state-heuristic|vc-cvs-state|vc-cvs-stay-local-p|vc-cvs-update-changelog|vc-cvs-valid-revision-number-p|vc-cvs-valid-symbolic-tag-name-p|vc-cvs-working-revision|vc-deduce-backend|vc-deduce-fileset|vc-default-check-headers|vc-default-comment-history|vc-default-dir-status-files|vc-default-extra-menu|vc-default-find-file-hook|vc-default-find-revision|vc-default-ignore-completion-table|vc-default-ignore|vc-default-log-edit-mode|vc-default-log-view-mode|vc-default-make-version-backups-p|vc-default-mark-resolved|vc-default-mode-line-string|vc-default-receive-file|vc-default-registered|vc-default-rename-file|vc-default-responsible-p|vc-default-retrieve-tag|vc-default-revert|vc-default-revision-completion-table|vc-default-show-log-entry|vc-default-working-revision|vc-delete-automatic-version-backups|vc-delete-file|vc-delistify|vc-diff-build-argument-list-internal|vc-diff-finish|vc-diff-internal|vc-diff-switches-list|vc-diff|vc-dir-mode|vc-dir|vc-dired-deduce-fileset|vc-dispatcher-browsing|vc-do-async-command|vc-do-command|vc-ediff|vc-editable-p|vc-ensure-vc-buffer|vc-error-occurred|vc-exec-after|vc-expand-dirs|vc-file-clearprops|vc-file-getprop|vc-file-setprop|vc-file-tree-walk-internal|vc-file-tree-walk|vc-find-backend-function|vc-find-conflicted-file|vc-find-file-hook|vc-find-position-by-context|vc-find-revision|vc-find-root|vc-finish-logentry|vc-follow-link|vc-git-registered|vc-hg-registered|vc-ignore|vc-incoming-outgoing-internal|vc-insert-file|vc-insert-headers|vc-kill-buffer-hook|vc-log-edit|vc-log-incoming|vc-log-internal-common|vc-log-outgoing|vc-make-backend-sym|vc-make-version-backup|vc-mark-resolved|vc-maybe-resolve-conflicts|vc-menu-map-filter|vc-menu-map|vc-merge|vc-mode-line|vc-modify-change-comment|vc-mtn-registered|vc-next-action|vc-next-comment|vc-parse-buffer)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(?:turn-on-gnus-mailing-list-mode|turn-on-hi-lock-if-enabled|turn-on-iimage-mode|turn-on-org-cdlatex|turn-on-orgstruct\\+\\+|turn-on-orgstruct|turn-on-orgtbl|turn-on-prettify-symbols-mode|turn-on-reftex|turn-on-visual-line-mode|turn-on-xterm-mouse-tracking-on-terminal|type-break-alarm|type-break-cancel-function-timers|type-break-cancel-schedule|type-break-cancel-time-warning-schedule|type-break-catch-up-event|type-break-check-keystroke-warning|type-break-check-post-command-hook|type-break-check|type-break-choose-file|type-break-demo-boring|type-break-demo-hanoi|type-break-demo-life|type-break-do-query|type-break-file-keystroke-count|type-break-file-time|type-break-force-mode-line-update|type-break-format-time|type-break-get-previous-count|type-break-get-previous-time|type-break-guesstimate-keystroke-threshold|type-break-keystroke-reset|type-break-keystroke-warning|type-break-mode-line-countdown-or-break|type-break-mode-line-message-mode|type-break-mode|type-break-noninteractive-query|type-break-query-mode|type-break-query|type-break-run-at-time|type-break-run-tb-post-command-hook|type-break-schedule|type-break-statistics|type-break-time-difference|type-break-time-stamp|type-break-time-sum|type-break-time-warning-alarm|type-break-time-warning-schedule|type-break-time-warning|type-break|typecase|typep|uce-insert-ranting|uce-reply-to-uce|ucs-input-activate|ucs-insert|ucs-names|ucs-normalize-HFS-NFC-region|ucs-normalize-HFS-NFC-string|ucs-normalize-HFS-NFD-region|ucs-normalize-HFS-NFD-string|ucs-normalize-NFC-region|ucs-normalize-NFC-string|ucs-normalize-NFD-region|ucs-normalize-NFD-string|ucs-normalize-NFKC-region|ucs-normalize-NFKC-string|ucs-normalize-NFKD-region|ucs-normalize-NFKD-string|uncomment-region-default|uncomment-region|uncompface|underline-region|undigestify-rmail-message|undo-adjust-beg-end|undo-adjust-elt|undo-adjust-pos|undo-copy-list-1|undo-copy-list|undo-delta|undo-elt-crosses-region|undo-elt-in-region|undo-make-selective-list|undo-more|undo-only|undo-outer-limit-truncate|undo-start|undo|unencodable-char-position|unexpand-abbrev|unfocus-frame|unforward-rmail-message|unhighlight-regexp|unicode-property-table-internal|unify-8859-on-decoding-mode|unify-8859-on-encoding-mode|unify-charset|union|uniquify--create-file-buffer-advice|uniquify--rename-buffer-advice|uniquify-buffer-base-name|uniquify-buffer-file-name|uniquify-get-proposed-name|uniquify-item-base--cmacro|uniquify-item-base|uniquify-item-buffer--cmacro|uniquify-item-buffer|uniquify-item-dirname--cmacro|uniquify-item-dirname|uniquify-item-greaterp|uniquify-item-p--cmacro|uniquify-item-p|uniquify-item-proposed--cmacro|uniquify-item-proposed|uniquify-kill-buffer-function|uniquify-make-item--cmacro|uniquify-make-item|uniquify-maybe-rerationalize-w/o-cb|uniquify-rationalize-a-list|uniquify-rationalize-conflicting-sublist|uniquify-rationalize-file-buffer-names|uniquify-rationalize|uniquify-rename-buffer|uniquify-rerationalize-w/o-cb|uniquify-unload-function|universal-argument--mode|universal-argument-more|universal-coding-system-argument|unix-sync|unjustify-current-line|unjustify-region|unload--set-major-mode|unmorse-region|unmsys--file-name|unread-bib|unrecord-window-buffer|unrmail|unsafep-function|unsafep-let|unsafep-progn|unsafep-variable|untabify-backward|untabify|untrace-all|untrace-function|ununderline-region|up-ifdef|upcase-initials-region|update-glyphless-char-display|update-leim-list-file|url--allowed-chars|url-attributes--cmacro|url-attributes|url-auth-registered|url-auth-user-prompt|url-basepath|url-basic-auth|url-bit-for-url|url-build-query-string|url-cache-create-filename|url-cache-extract|url-cache-prune-cache|url-cid|url-completion-function|url-cookie-clean-up|url-cookie-create--cmacro|url-cookie-create|url-cookie-delete|url-cookie-domain--cmacro|url-cookie-domain|url-cookie-expired-p|url-cookie-expires--cmacro|url-cookie-expires|url-cookie-generate-header-lines|url-cookie-handle-set-cookie|url-cookie-host-can-set-p|url-cookie-list|url-cookie-localpart--cmacro|url-cookie-localpart|url-cookie-mode|url-cookie-name--cmacro|url-cookie-name|url-cookie-p--cmacro|url-cookie-p|url-cookie-parse-file|url-cookie-quit|url-cookie-retrieve|url-cookie-secure--cmacro|url-cookie-secure|url-cookie-setup-save-timer|url-cookie-store|url-cookie-value--cmacro|url-cookie-value|url-cookie-write-file|url-copy-file|url-data|url-dav-request|url-dav-supported-p|url-dav-vc-registered|url-debug|url-default-expander|url-default-find-proxy-for-url|url-device-type|url-digest-auth-create-key|url-digest-auth|url-display-percentage|url-do-auth-source-search|url-do-setup|url-domsuf-cookie-allowed-p|url-domsuf-parse-file|url-eat-trailing-space|url-encode-url|url-expand-file-name|url-expander-remove-relative-links|url-extract-mime-headers|url-file-directory|url-file-extension|url-file-handler|url-file-local-copy|url-file-nondirectory|url-file|url-filename--cmacro|url-filename|url-find-proxy-for-url|url-fullness--cmacro|url-fullness|url-gateway-nslookup-host|url-gc-dead-buffers|url-generate-unique-filename|url-generic-emulator-loader|url-generic-parse-url|url-get-authentication|url-get-normalized-date|url-get-url-at-point|url-handle-content-transfer-encoding|url-handler-mode|url-have-visited-url|url-hexify-string|url-history-parse-history|url-history-save-history|url-history-setup-save-timer|url-history-update-url|url-host--cmacro|url-host|url-http-activate-callback|url-http-async-sentinel|url-http-chunked-encoding-after-change-function|url-http-clean-headers|url-http-content-length-after-change-function|url-http-create-request|url-http-debug|url-http-end-of-document-sentinel|url-http-expand-file-name|url-http-file-attributes|url-http-file-exists-p|url-http-file-readable-p|url-http-find-free-connection|url-http-generic-filter|url-http-handle-authentication|url-http-handle-cookies|url-http-head-file-attributes|url-http-head|url-http-idle-sentinel|url-http-mark-connection-as-busy|url-http-mark-connection-as-free|url-http-options|url-http-parse-headers|url-http-parse-response|url-http-simple-after-change-function|url-http-symbol-value-in-buffer|url-http-user-agent-string|url-http-wait-for-headers-change-function|url-http|url-https-create-secure-wrapper|url-https-expand-file-name|url-https-file-attributes|url-https-file-exists-p|url-https-file-readable-p|url-https|url-identity-expander|url-info|url-insert-entities-in-string|url-insert-file-contents|url-irc|url-is-cached|url-lazy-message|url-ldap|url-mail|url-mailto|url-make-private-file|url-man|url-mark-buffer-as-dead|url-mime-charset-string|url-mm-callback|url-mm-url|url-news|url-normalize-url|url-ns-prefs|url-ns-user-pref|url-open-rlogin|url-open-stream|url-open-telnet|url-p--cmacro|url-p|url-parse-args|url-parse-make-urlobj--cmacro|url-parse-make-urlobj|url-parse-query-string|url-password--cmacro|url-password-for-url|url-password|url-path-and-query|url-percentage|url-port-if-non-default|url-port|url-portspec--cmacro|url-portspec|url-pretty-length|url-proxy|url-queue-buffer--cmacro|url-queue-buffer|url-queue-callback--cmacro|url-queue-callback-function|url-queue-callback|url-queue-cbargs--cmacro|url-queue-cbargs|url-queue-inhibit-cookiesp--cmacro|url-queue-inhibit-cookiesp|url-queue-kill-job|url-queue-p--cmacro|url-queue-p|url-queue-pre-triggered--cmacro|url-queue-pre-triggered|url-queue-prune-old-entries|url-queue-remove-jobs-from-host|url-queue-retrieve|url-queue-run-queue|url-queue-setup-runners|url-queue-silentp--cmacro|url-queue-silentp|url-queue-start-retrieve|url-queue-start-time--cmacro|url-queue-start-time|url-queue-url--cmacro|url-queue-url|url-recreate-url-attributes|url-recreate-url|url-register-auth-scheme|url-retrieve-internal|url-retrieve-synchronously|url-retrieve|url-rlogin|url-scheme-default-loader|url-scheme-get-property|url-scheme-register-proxy|url-set-mime-charset-string|url-setup-privacy-info|url-silent--cmacro|url-silent|url-snews|url-store-in-cache|url-strip-leading-spaces|url-target--cmacro|url-target|url-telnet|url-tn3270|url-tramp-file-handler|url-truncate-url-for-viewing|url-type--cmacro|url-type|url-unhex-string|url-unhex|url-use-cookies--cmacro|url-use-cookies|url-user--cmacro|url-user-for-url|url-user|url-view-url|url-wait-for-string|url-warn|use-cjk-char-width-table|use-completion-backward-under|use-completion-backward|use-completion-before-point|use-completion-before-separator|use-completion-minibuffer-separator|use-completion-under-or-before-point|use-completion-under-point|use-default-char-width-table|use-fancy-splash-screens-p|use-package|user-original-login-name|user-variable-p|utf-7-imap-post-read-conversion|utf-7-imap-pre-write-conversion|utf-7-post-read-conversion|utf-7-pre-write-conversion|utf7-decode|utf7-encode|uudecode-char-int|uudecode-decode-region-external|uudecode-decode-region-internal|uudecode-decode-region|uudecode-string-to-multibyte|values-list|variable-at-point|variable-binding-locus|variable-pitch-mode|vc--add-line|vc--process-sentinel|vc--read-lines|vc--remove-regexp|vc-after-save|vc-annotate|vc-backend-for-registration|vc-backend-subdirectory-name|vc-backend|vc-before-save|vc-branch-p|vc-branch-part|vc-buffer-context|vc-buffer-sync|vc-bzr-registered|vc-call-backend|vc-call|vc-check-headers|vc-check-master-templates|vc-checkin|vc-checkout-model|vc-checkout|vc-clear-context|vc-coding-system-for-diff|vc-comment-search-forward|vc-comment-search-reverse|vc-comment-to-change-log|vc-compatible-state|vc-compilation-mode|vc-context-matches-p|vc-create-repo|vc-create-tag|vc-cvs-after-dir-status|vc-cvs-annotate-command|vc-cvs-annotate-current-time|vc-cvs-annotate-extract-revision-at-line|vc-cvs-annotate-process-filter|vc-cvs-annotate-time|vc-cvs-append-to-ignore|vc-cvs-check-headers|vc-cvs-checkin|vc-cvs-checkout-model|vc-cvs-checkout|vc-cvs-command|vc-cvs-comment-history|vc-cvs-could-register|vc-cvs-create-tag|vc-cvs-delete-file|vc-cvs-diff|vc-cvs-dir-extra-headers|vc-cvs-dir-status-files|vc-cvs-dir-status-heuristic|vc-cvs-file-to-string|vc-cvs-find-admin-dir|vc-cvs-find-revision|vc-cvs-get-entries|vc-cvs-ignore|vc-cvs-make-version-backups-p|vc-cvs-merge-file|vc-cvs-merge-news|vc-cvs-merge|vc-cvs-mode-line-string|vc-cvs-modify-change-comment|vc-cvs-next-revision|vc-cvs-parse-entry|vc-cvs-parse-root|vc-cvs-parse-status|vc-cvs-parse-sticky-tag|vc-cvs-parse-uhp|vc-cvs-previous-revision|vc-cvs-print-log|vc-cvs-register|vc-cvs-registered|vc-cvs-repository-hostname|vc-cvs-responsible-p|vc-cvs-retrieve-tag|vc-cvs-revert|vc-cvs-revision-completion-table|vc-cvs-revision-granularity|vc-cvs-revision-table|vc-cvs-state-heuristic|vc-cvs-state|vc-cvs-stay-local-p|vc-cvs-update-changelog|vc-cvs-valid-revision-number-p|vc-cvs-valid-symbolic-tag-name-p|vc-cvs-working-revision|vc-deduce-backend|vc-deduce-fileset|vc-default-check-headers|vc-default-comment-history|vc-default-dir-status-files|vc-default-extra-menu|vc-default-find-file-hook|vc-default-find-revision|vc-default-ignore-completion-table|vc-default-ignore|vc-default-log-edit-mode|vc-default-log-view-mode|vc-default-make-version-backups-p|vc-default-mark-resolved|vc-default-mode-line-string|vc-default-receive-file|vc-default-registered|vc-default-rename-file|vc-default-responsible-p|vc-default-retrieve-tag|vc-default-revert|vc-default-revision-completion-table|vc-default-show-log-entry|vc-default-working-revision|vc-delete-automatic-version-backups|vc-delete-file|vc-delistify|vc-diff-build-argument-list-internal|vc-diff-finish|vc-diff-internal|vc-diff-switches-list|vc-diff|vc-dir-mode|vc-dir|vc-dired-deduce-fileset|vc-dispatcher-browsing|vc-do-async-command|vc-do-command|vc-ediff|vc-editable-p|vc-ensure-vc-buffer|vc-error-occurred|vc-exec-after|vc-expand-dirs|vc-file-clearprops|vc-file-getprop|vc-file-setprop|vc-file-tree-walk-internal|vc-file-tree-walk|vc-find-backend-function|vc-find-conflicted-file|vc-find-file-hook|vc-find-position-by-context|vc-find-revision|vc-find-root|vc-finish-logentry|vc-follow-link|vc-git-registered|vc-hg-registered|vc-ignore|vc-incoming-outgoing-internal|vc-insert-file|vc-insert-headers|vc-kill-buffer-hook|vc-log-edit|vc-log-incoming|vc-log-internal-common|vc-log-outgoing|vc-make-backend-sym|vc-make-version-backup|vc-mark-resolved|vc-maybe-resolve-conflicts|vc-menu-map-filter|vc-menu-map|vc-merge|vc-mode-line|vc-modify-change-comment|vc-mtn-registered|vc-next-action|vc-next-comment|vc-parse-buffer)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:vc-position-context|vc-possible-master|vc-previous-comment|vc-print-log-internal|vc-print-log-setup-buttons|vc-print-log|vc-print-root-log|vc-process-filter|vc-pull|vc-rcs-registered|vc-read-backend|vc-read-revision|vc-region-history|vc-register-with|vc-register|vc-registered|vc-rename-file|vc-resolve-conflicts|vc-responsible-backend|vc-restore-buffer-context|vc-resynch-buffer|vc-resynch-buffers-in-directory|vc-resynch-window|vc-retrieve-tag|vc-revert-buffer-internal|vc-revert-buffer|vc-revert-file|vc-revert|vc-revision-other-window|vc-rollback|vc-root-diff|vc-root-dir|vc-run-delayed|vc-sccs-registered|vc-sccs-search-project-dir|vc-set-async-update|vc-set-mode-line-busy-indicator|vc-setup-buffer|vc-src-registered|vc-start-logentry|vc-state-refresh|vc-state|vc-steal-lock|vc-string-prefix-p|vc-svn-registered|vc-switch-backend|vc-switches|vc-tag-precondition|vc-toggle-read-only|vc-transfer-file|vc-up-to-date-p|vc-update-change-log|vc-update|vc-user-login-name|vc-version-backup-file-name|vc-version-backup-file|vc-version-diff|vc-version-ediff|vc-workfile-version|vc-working-revision|vcursor-backward-char|vcursor-backward-word|vcursor-beginning-of-buffer|vcursor-beginning-of-line|vcursor-bind-keys|vcursor-check|vcursor-compare-windows|vcursor-copy-line|vcursor-copy-word|vcursor-copy|vcursor-cs-binding|vcursor-disable|vcursor-end-of-buffer|vcursor-end-of-line|vcursor-execute-command|vcursor-execute-key|vcursor-find-window|vcursor-forward-char|vcursor-forward-word|vcursor-get-char-count|vcursor-goto|vcursor-insert|vcursor-isearch-backward|vcursor-isearch-forward|vcursor-locate|vcursor-map|vcursor-move|vcursor-next-line|vcursor-other-window|vcursor-post-command|vcursor-previous-line|vcursor-relative-move|vcursor-scroll-down|vcursor-scroll-up|vcursor-swap-point|vcursor-toggle-copy|vcursor-toggle-vcursor-map|vcursor-use-vcursor-map|vcursor-window-funcall|vector-or-char-table-p|vendor-specific-keysyms|vera-add-syntax|vera-backward-same-indent|vera-backward-statement|vera-backward-syntactic-ws|vera-beginning-of-statement|vera-beginning-of-substatement|vera-comment-uncomment-region|vera-corresponding-begin|vera-corresponding-if|vera-customize|vera-electric-closing-brace|vera-electric-opening-brace|vera-electric-pound|vera-electric-return|vera-electric-slash|vera-electric-space|vera-electric-star|vera-electric-tab|vera-evaluate-offset|vera-expand-abbrev|vera-font-lock-match-item|vera-fontify-buffer|vera-forward-same-indent|vera-forward-statement|vera-forward-syntactic-ws|vera-get-offset|vera-guess-basic-syntax|vera-in-literal|vera-indent-block-closing|vera-indent-buffer|vera-indent-line|vera-indent-region|vera-langelem-col|vera-lineup-C-comments|vera-lineup-comment|vera-mode-menu|vera-mode|vera-point|vera-prepare-search|vera-re-search-backward|vera-re-search-forward|vera-skip-backward-literal|vera-skip-forward-literal|vera-submit-bug-report|vera-try-expand-abbrev|vera-version|verify-xscheme-buffer|verilog-add-list-unique|verilog-alw-get-inputs|verilog-alw-get-outputs-delayed|verilog-alw-get-outputs-immediate|verilog-alw-get-temps|verilog-alw-get-uses-delayed|verilog-alw-new|verilog-at-close-constraint-p|verilog-at-close-struct-p|verilog-at-constraint-p|verilog-at-struct-mv-p|verilog-at-struct-p|verilog-auto-arg-ports|verilog-auto-arg|verilog-auto-ascii-enum|verilog-auto-assign-modport|verilog-auto-inout-comp|verilog-auto-inout-in|verilog-auto-inout-modport|verilog-auto-inout-module|verilog-auto-inout-param|verilog-auto-inout|verilog-auto-input|verilog-auto-insert-last|verilog-auto-insert-lisp|verilog-auto-inst-first|verilog-auto-inst-param|verilog-auto-inst-port-list|verilog-auto-inst-port-map|verilog-auto-inst-port|verilog-auto-inst|verilog-auto-logic-setup|verilog-auto-logic|verilog-auto-output-every|verilog-auto-output|verilog-auto-re-search-do|verilog-auto-read-locals|verilog-auto-reeval-locals|verilog-auto-reg-input|verilog-auto-reg|verilog-auto-reset|verilog-auto-save-check|verilog-auto-save-compile|verilog-auto-sense-sigs|verilog-auto-sense|verilog-auto-star-safe|verilog-auto-star|verilog-auto-template-lint|verilog-auto-templated-rel|verilog-auto-tieoff|verilog-auto-undef|verilog-auto-unused|verilog-auto-wire|verilog-auto|verilog-back-to-start-translate-off|verilog-backward-case-item|verilog-backward-open-bracket|verilog-backward-open-paren|verilog-backward-sexp|verilog-backward-syntactic-ws-quick|verilog-backward-syntactic-ws|verilog-backward-token|verilog-backward-up-list|verilog-backward-ws&directives|verilog-batch-auto|verilog-batch-delete-auto|verilog-batch-delete-trailing-whitespace|verilog-batch-diff-auto|verilog-batch-error-wrapper|verilog-batch-execute-func|verilog-batch-indent|verilog-batch-inject-auto|verilog-beg-of-defun-quick|verilog-beg-of-defun|verilog-beg-of-statement-1|verilog-beg-of-statement|verilog-booleanp|verilog-build-defun-re|verilog-calc-1|verilog-calculate-indent-directive|verilog-calculate-indent|verilog-case-indent-level|verilog-clog2|verilog-colorize-include-files-buffer|verilog-comment-depth|verilog-comment-indent|verilog-comment-region|verilog-comp-defun|verilog-complete-word|verilog-completion-response|verilog-completion|verilog-continued-line-1|verilog-continued-line|verilog-current-flags|verilog-current-indent-level|verilog-customize|verilog-declaration-beg|verilog-declaration-end|verilog-decls-append|verilog-decls-get-assigns|verilog-decls-get-consts|verilog-decls-get-gparams|verilog-decls-get-inouts|verilog-decls-get-inputs|verilog-decls-get-interfaces|verilog-decls-get-iovars|verilog-decls-get-modports|verilog-decls-get-outputs|verilog-decls-get-ports|verilog-decls-get-signals|verilog-decls-get-vars|verilog-decls-new|verilog-decls-princ|verilog-define-abbrev|verilog-delete-auto-star-all|verilog-delete-auto-star-implicit|verilog-delete-auto|verilog-delete-autos-lined|verilog-delete-empty-auto-pair|verilog-delete-to-paren|verilog-delete-trailing-whitespace|verilog-diff-auto|verilog-diff-buffers-p|verilog-diff-file-with-buffer|verilog-diff-report|verilog-dir-file-exists-p|verilog-dir-files|verilog-do-indent|verilog-easy-menu-filter|verilog-end-of-defun|verilog-end-of-statement|verilog-end-translate-off|verilog-enum-ascii|verilog-error-regexp-add-emacs|verilog-expand-command|verilog-expand-dirnames|verilog-expand-vector-internal|verilog-expand-vector|verilog-faq|verilog-font-customize|verilog-font-lock-match-item|verilog-forward-close-paren|verilog-forward-or-insert-line|verilog-forward-sexp-cmt|verilog-forward-sexp-function|verilog-forward-sexp-ign-cmt|verilog-forward-sexp|verilog-forward-syntactic-ws|verilog-forward-ws&directives|verilog-func-completion|verilog-generate-numbers|verilog-get-completion-decl|verilog-get-default-symbol|verilog-get-end-of-defun|verilog-get-expr|verilog-get-lineup-indent-2|verilog-get-lineup-indent|verilog-getopt-file|verilog-getopt-flags|verilog-getopt|verilog-goto-defun-file|verilog-goto-defun|verilog-header|verilog-highlight-buffer|verilog-highlight-region|verilog-in-attribute-p|verilog-in-case-region-p|verilog-in-comment-or-string-p|verilog-in-comment-p|verilog-in-coverage-p|verilog-in-directive-p|verilog-in-escaped-name-p|verilog-in-fork-region-p|verilog-in-generate-region-p|verilog-in-parameter-p|verilog-in-paren-count|verilog-in-paren-quick|verilog-in-paren|verilog-in-parenthesis-p|verilog-in-slash-comment-p|verilog-in-star-comment-p|verilog-in-struct-nested-p|verilog-in-struct-p|verilog-indent-buffer|verilog-indent-comment|verilog-indent-declaration|verilog-indent-line-relative|verilog-indent-line|verilog-inject-arg|verilog-inject-auto|verilog-inject-inst|verilog-inject-sense|verilog-insert-1|verilog-insert-block|verilog-insert-date|verilog-insert-definition|verilog-insert-indent|verilog-insert-indices|verilog-insert-last-command-event|verilog-insert-one-definition|verilog-insert-year|verilog-insert|verilog-inside-comment-or-string-p|verilog-is-number|verilog-just-one-space|verilog-keyword-completion|verilog-kill-existing-comment|verilog-label-be|verilog-leap-to-case-head|verilog-leap-to-head|verilog-library-filenames|verilog-lint-off|verilog-linter-name|verilog-load-file-at-mouse|verilog-load-file-at-point|verilog-make-width-expression|verilog-mark-defun|verilog-match-translate-off|verilog-menu|verilog-mode|verilog-modi-cache-add-gparams|verilog-modi-cache-add-inouts|verilog-modi-cache-add-inputs|verilog-modi-cache-add-outputs|verilog-modi-cache-add-vars|verilog-modi-cache-add|verilog-modi-cache-results|verilog-modi-current-get|verilog-modi-current|verilog-modi-file-or-buffer|verilog-modi-filename|verilog-modi-get-decls|verilog-modi-get-point|verilog-modi-get-sub-decls|verilog-modi-get-type|verilog-modi-goto|verilog-modi-lookup|verilog-modi-modport-lookup-one|verilog-modi-modport-lookup|verilog-modi-name|verilog-modi-new|verilog-modify-compile-command|verilog-modport-clockings-add|verilog-modport-clockings|verilog-modport-decls-set|verilog-modport-decls|verilog-modport-name|verilog-modport-new|verilog-modport-princ|verilog-module-filenames|verilog-module-inside-filename-p|verilog-more-comment|verilog-one-line|verilog-parenthesis-depth|verilog-point-text|verilog-preprocess|verilog-preserve-dir-cache|verilog-preserve-modi-cache|verilog-pretty-declarations-auto|verilog-pretty-declarations|verilog-pretty-expr|verilog-re-search-backward-quick|verilog-re-search-backward-substr|verilog-re-search-backward|verilog-re-search-forward-quick|verilog-re-search-forward-substr|verilog-re-search-forward|verilog-read-always-signals-recurse|verilog-read-always-signals|verilog-read-arg-pins|verilog-read-auto-constants|verilog-read-auto-lisp-present|verilog-read-auto-lisp|verilog-read-auto-params|verilog-read-auto-template-hit|verilog-read-auto-template-middle|verilog-read-auto-template|verilog-read-decls|verilog-read-defines|verilog-read-includes|verilog-read-inst-backward-name|verilog-read-inst-module-matcher|verilog-read-inst-module|verilog-read-inst-name|verilog-read-inst-param-value|verilog-read-inst-pins|verilog-read-instants|verilog-read-module-name|verilog-read-signals|verilog-read-sub-decls-expr|verilog-read-sub-decls-gate|verilog-read-sub-decls-line|verilog-read-sub-decls-sig|verilog-read-sub-decls|verilog-regexp-opt|verilog-regexp-words|verilog-repair-close-comma|verilog-repair-open-comma|verilog-run-hooks|verilog-save-buffer-state|verilog-save-font-mods|verilog-save-no-change-functions|verilog-save-scan-cache|verilog-scan-and-debug|verilog-scan-cache-flush|verilog-scan-cache-ok-p|verilog-scan-debug|verilog-scan-region|verilog-scan|verilog-set-auto-endcomments|verilog-set-compile-command|verilog-set-define|verilog-show-completions|verilog-showscopes|verilog-sig-bits|verilog-sig-comment|verilog-sig-enum|verilog-sig-memory|verilog-sig-modport|verilog-sig-multidim-string|verilog-sig-multidim|verilog-sig-name|verilog-sig-new|verilog-sig-signed|verilog-sig-tieoff|verilog-sig-type-set|verilog-sig-type|verilog-sig-width|verilog-signals-combine-bus|verilog-signals-edit-wire-reg|verilog-signals-from-signame|verilog-signals-in|verilog-signals-matching-dir-re|verilog-signals-matching-enum|verilog-signals-matching-regexp|verilog-signals-memory|verilog-signals-not-in|verilog-signals-not-matching-regexp|verilog-signals-not-params|verilog-signals-princ|verilog-signals-sort-compare|verilog-signals-with|verilog-simplify-range-expression|verilog-sk-always|verilog-sk-assign|verilog-sk-begin|verilog-sk-case|verilog-sk-casex|verilog-sk-casez|verilog-sk-comment|verilog-sk-datadef|verilog-sk-def-reg|verilog-sk-define-signal|verilog-sk-else-if|verilog-sk-for|verilog-sk-fork|verilog-sk-function|verilog-sk-generate|verilog-sk-header-tmpl|verilog-sk-header|verilog-sk-if|verilog-sk-initial|verilog-sk-inout|verilog-sk-input|verilog-sk-module|verilog-sk-output|verilog-sk-ovm-class|verilog-sk-primitive|verilog-sk-prompt-clock|verilog-sk-prompt-condition|verilog-sk-prompt-inc|verilog-sk-prompt-init|verilog-sk-prompt-lsb|verilog-sk-prompt-msb|verilog-sk-prompt-name|verilog-sk-prompt-output|verilog-sk-prompt-reset|verilog-sk-prompt-state-selector|verilog-sk-prompt-width|verilog-sk-reg|verilog-sk-repeat|verilog-sk-specify|verilog-sk-state-machine|verilog-sk-task|verilog-sk-uvm-component|verilog-sk-uvm-object|verilog-sk-while|verilog-sk-wire|verilog-skip-backward-comment-or-string|verilog-skip-backward-comments|verilog-skip-forward-comment-or-string)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)v(?:c-position-context|c-possible-master|c-previous-comment|c-print-log-internal|c-print-log-setup-buttons|c-print-log|c-print-root-log|c-process-filter|c-pull|c-rcs-registered|c-read-backend|c-read-revision|c-region-history|c-register-with|c-register|c-registered|c-rename-file|c-resolve-conflicts|c-responsible-backend|c-restore-buffer-context|c-resynch-buffer|c-resynch-buffers-in-directory|c-resynch-window|c-retrieve-tag|c-revert-buffer-internal|c-revert-buffer|c-revert-file|c-revert|c-revision-other-window|c-rollback|c-root-diff|c-root-dir|c-run-delayed|c-sccs-registered|c-sccs-search-project-dir|c-set-async-update|c-set-mode-line-busy-indicator|c-setup-buffer|c-src-registered|c-start-logentry|c-state-refresh|c-state|c-steal-lock|c-string-prefix-p|c-svn-registered|c-switch-backend|c-switches|c-tag-precondition|c-toggle-read-only|c-transfer-file|c-up-to-date-p|c-update-change-log|c-update|c-user-login-name|c-version-backup-file-name|c-version-backup-file|c-version-diff|c-version-ediff|c-workfile-version|c-working-revision|cursor-backward-char|cursor-backward-word|cursor-beginning-of-buffer|cursor-beginning-of-line|cursor-bind-keys|cursor-check|cursor-compare-windows|cursor-copy-line|cursor-copy-word|cursor-copy|cursor-cs-binding|cursor-disable|cursor-end-of-buffer|cursor-end-of-line|cursor-execute-command|cursor-execute-key|cursor-find-window|cursor-forward-char|cursor-forward-word|cursor-get-char-count|cursor-goto|cursor-insert|cursor-isearch-backward|cursor-isearch-forward|cursor-locate|cursor-map|cursor-move|cursor-next-line|cursor-other-window|cursor-post-command|cursor-previous-line|cursor-relative-move|cursor-scroll-down|cursor-scroll-up|cursor-swap-point|cursor-toggle-copy|cursor-toggle-vcursor-map|cursor-use-vcursor-map|cursor-window-funcall|ector-or-char-table-p|endor-specific-keysyms|era-add-syntax|era-backward-same-indent|era-backward-statement|era-backward-syntactic-ws|era-beginning-of-statement|era-beginning-of-substatement|era-comment-uncomment-region|era-corresponding-begin|era-corresponding-if|era-customize|era-electric-closing-brace|era-electric-opening-brace|era-electric-pound|era-electric-return|era-electric-slash|era-electric-space|era-electric-star|era-electric-tab|era-evaluate-offset|era-expand-abbrev|era-font-lock-match-item|era-fontify-buffer|era-forward-same-indent|era-forward-statement|era-forward-syntactic-ws|era-get-offset|era-guess-basic-syntax|era-in-literal|era-indent-block-closing|era-indent-buffer|era-indent-line|era-indent-region|era-langelem-col|era-lineup-C-comments|era-lineup-comment|era-mode-menu|era-mode|era-point|era-prepare-search|era-re-search-backward|era-re-search-forward|era-skip-backward-literal|era-skip-forward-literal|era-submit-bug-report|era-try-expand-abbrev|era-version|erify-xscheme-buffer|erilog-add-list-unique|erilog-alw-get-inputs|erilog-alw-get-outputs-delayed|erilog-alw-get-outputs-immediate|erilog-alw-get-temps|erilog-alw-get-uses-delayed|erilog-alw-new|erilog-at-close-constraint-p|erilog-at-close-struct-p|erilog-at-constraint-p|erilog-at-struct-mv-p|erilog-at-struct-p|erilog-auto-arg-ports|erilog-auto-arg|erilog-auto-ascii-enum|erilog-auto-assign-modport|erilog-auto-inout-comp|erilog-auto-inout-in|erilog-auto-inout-modport|erilog-auto-inout-module|erilog-auto-inout-param|erilog-auto-inout|erilog-auto-input|erilog-auto-insert-last|erilog-auto-insert-lisp|erilog-auto-inst-first|erilog-auto-inst-param|erilog-auto-inst-port-list|erilog-auto-inst-port-map|erilog-auto-inst-port|erilog-auto-inst|erilog-auto-logic-setup|erilog-auto-logic|erilog-auto-output-every|erilog-auto-output|erilog-auto-re-search-do|erilog-auto-read-locals|erilog-auto-reeval-locals|erilog-auto-reg-input|erilog-auto-reg|erilog-auto-reset|erilog-auto-save-check|erilog-auto-save-compile|erilog-auto-sense-sigs|erilog-auto-sense|erilog-auto-star-safe|erilog-auto-star|erilog-auto-template-lint|erilog-auto-templated-rel|erilog-auto-tieoff|erilog-auto-undef|erilog-auto-unused|erilog-auto-wire|erilog-auto|erilog-back-to-start-translate-off|erilog-backward-case-item|erilog-backward-open-bracket|erilog-backward-open-paren|erilog-backward-sexp|erilog-backward-syntactic-ws-quick|erilog-backward-syntactic-ws|erilog-backward-token|erilog-backward-up-list|erilog-backward-ws&directives|erilog-batch-auto|erilog-batch-delete-auto|erilog-batch-delete-trailing-whitespace|erilog-batch-diff-auto|erilog-batch-error-wrapper|erilog-batch-execute-func|erilog-batch-indent|erilog-batch-inject-auto|erilog-beg-of-defun-quick|erilog-beg-of-defun|erilog-beg-of-statement-1|erilog-beg-of-statement|erilog-booleanp|erilog-build-defun-re|erilog-calc-1|erilog-calculate-indent-directive|erilog-calculate-indent|erilog-case-indent-level|erilog-clog2|erilog-colorize-include-files-buffer|erilog-comment-depth|erilog-comment-indent|erilog-comment-region|erilog-comp-defun|erilog-complete-word|erilog-completion-response|erilog-completion|erilog-continued-line-1|erilog-continued-line|erilog-current-flags|erilog-current-indent-level|erilog-customize|erilog-declaration-beg|erilog-declaration-end|erilog-decls-append|erilog-decls-get-assigns|erilog-decls-get-consts|erilog-decls-get-gparams|erilog-decls-get-inouts|erilog-decls-get-inputs|erilog-decls-get-interfaces|erilog-decls-get-iovars|erilog-decls-get-modports|erilog-decls-get-outputs|erilog-decls-get-ports|erilog-decls-get-signals|erilog-decls-get-vars|erilog-decls-new|erilog-decls-princ|erilog-define-abbrev|erilog-delete-auto-star-all|erilog-delete-auto-star-implicit|erilog-delete-auto|erilog-delete-autos-lined|erilog-delete-empty-auto-pair|erilog-delete-to-paren|erilog-delete-trailing-whitespace|erilog-diff-auto|erilog-diff-buffers-p|erilog-diff-file-with-buffer|erilog-diff-report|erilog-dir-file-exists-p|erilog-dir-files|erilog-do-indent|erilog-easy-menu-filter|erilog-end-of-defun|erilog-end-of-statement|erilog-end-translate-off|erilog-enum-ascii|erilog-error-regexp-add-emacs|erilog-expand-command|erilog-expand-dirnames|erilog-expand-vector-internal|erilog-expand-vector|erilog-faq|erilog-font-customize|erilog-font-lock-match-item|erilog-forward-close-paren|erilog-forward-or-insert-line|erilog-forward-sexp-cmt|erilog-forward-sexp-function|erilog-forward-sexp-ign-cmt|erilog-forward-sexp|erilog-forward-syntactic-ws|erilog-forward-ws&directives|erilog-func-completion|erilog-generate-numbers|erilog-get-completion-decl|erilog-get-default-symbol|erilog-get-end-of-defun|erilog-get-expr|erilog-get-lineup-indent-2|erilog-get-lineup-indent|erilog-getopt-file|erilog-getopt-flags|erilog-getopt|erilog-goto-defun-file|erilog-goto-defun|erilog-header|erilog-highlight-buffer|erilog-highlight-region|erilog-in-attribute-p|erilog-in-case-region-p|erilog-in-comment-or-string-p|erilog-in-comment-p|erilog-in-coverage-p|erilog-in-directive-p|erilog-in-escaped-name-p|erilog-in-fork-region-p|erilog-in-generate-region-p|erilog-in-parameter-p|erilog-in-paren-count|erilog-in-paren-quick|erilog-in-paren|erilog-in-parenthesis-p|erilog-in-slash-comment-p|erilog-in-star-comment-p|erilog-in-struct-nested-p|erilog-in-struct-p|erilog-indent-buffer|erilog-indent-comment|erilog-indent-declaration|erilog-indent-line-relative|erilog-indent-line|erilog-inject-arg|erilog-inject-auto|erilog-inject-inst|erilog-inject-sense|erilog-insert-1|erilog-insert-block|erilog-insert-date|erilog-insert-definition|erilog-insert-indent|erilog-insert-indices|erilog-insert-last-command-event|erilog-insert-one-definition|erilog-insert-year|erilog-insert|erilog-inside-comment-or-string-p|erilog-is-number|erilog-just-one-space|erilog-keyword-completion|erilog-kill-existing-comment|erilog-label-be|erilog-leap-to-case-head|erilog-leap-to-head|erilog-library-filenames|erilog-lint-off|erilog-linter-name|erilog-load-file-at-mouse|erilog-load-file-at-point|erilog-make-width-expression|erilog-mark-defun|erilog-match-translate-off|erilog-menu|erilog-mode|erilog-modi-cache-add-gparams|erilog-modi-cache-add-inouts|erilog-modi-cache-add-inputs|erilog-modi-cache-add-outputs|erilog-modi-cache-add-vars|erilog-modi-cache-add|erilog-modi-cache-results|erilog-modi-current-get|erilog-modi-current|erilog-modi-file-or-buffer|erilog-modi-filename|erilog-modi-get-decls|erilog-modi-get-point|erilog-modi-get-sub-decls|erilog-modi-get-type|erilog-modi-goto|erilog-modi-lookup|erilog-modi-modport-lookup-one|erilog-modi-modport-lookup|erilog-modi-name|erilog-modi-new|erilog-modify-compile-command|erilog-modport-clockings-add|erilog-modport-clockings|erilog-modport-decls-set|erilog-modport-decls|erilog-modport-name|erilog-modport-new|erilog-modport-princ|erilog-module-filenames|erilog-module-inside-filename-p|erilog-more-comment|erilog-one-line|erilog-parenthesis-depth|erilog-point-text|erilog-preprocess|erilog-preserve-dir-cache|erilog-preserve-modi-cache|erilog-pretty-declarations-auto|erilog-pretty-declarations|erilog-pretty-expr|erilog-re-search-backward-quick|erilog-re-search-backward-substr|erilog-re-search-backward|erilog-re-search-forward-quick|erilog-re-search-forward-substr|erilog-re-search-forward|erilog-read-always-signals-recurse|erilog-read-always-signals|erilog-read-arg-pins|erilog-read-auto-constants|erilog-read-auto-lisp-present|erilog-read-auto-lisp|erilog-read-auto-params|erilog-read-auto-template-hit|erilog-read-auto-template-middle|erilog-read-auto-template|erilog-read-decls|erilog-read-defines|erilog-read-includes|erilog-read-inst-backward-name|erilog-read-inst-module-matcher|erilog-read-inst-module|erilog-read-inst-name|erilog-read-inst-param-value|erilog-read-inst-pins|erilog-read-instants|erilog-read-module-name|erilog-read-signals|erilog-read-sub-decls-expr|erilog-read-sub-decls-gate|erilog-read-sub-decls-line|erilog-read-sub-decls-sig|erilog-read-sub-decls|erilog-regexp-opt|erilog-regexp-words|erilog-repair-close-comma|erilog-repair-open-comma|erilog-run-hooks|erilog-save-buffer-state|erilog-save-font-mods|erilog-save-no-change-functions|erilog-save-scan-cache|erilog-scan-and-debug|erilog-scan-cache-flush|erilog-scan-cache-ok-p|erilog-scan-debug|erilog-scan-region|erilog-scan|erilog-set-auto-endcomments|erilog-set-compile-command|erilog-set-define|erilog-show-completions|erilog-showscopes|erilog-sig-bits|erilog-sig-comment|erilog-sig-enum|erilog-sig-memory|erilog-sig-modport|erilog-sig-multidim-string|erilog-sig-multidim|erilog-sig-name|erilog-sig-new|erilog-sig-signed|erilog-sig-tieoff|erilog-sig-type-set|erilog-sig-type|erilog-sig-width|erilog-signals-combine-bus|erilog-signals-edit-wire-reg|erilog-signals-from-signame|erilog-signals-in|erilog-signals-matching-dir-re|erilog-signals-matching-enum|erilog-signals-matching-regexp|erilog-signals-memory|erilog-signals-not-in|erilog-signals-not-matching-regexp|erilog-signals-not-params|erilog-signals-princ|erilog-signals-sort-compare|erilog-signals-with|erilog-simplify-range-expression|erilog-sk-always|erilog-sk-assign|erilog-sk-begin|erilog-sk-case|erilog-sk-casex|erilog-sk-casez|erilog-sk-comment|erilog-sk-datadef|erilog-sk-def-reg|erilog-sk-define-signal|erilog-sk-else-if|erilog-sk-for|erilog-sk-fork|erilog-sk-function|erilog-sk-generate|erilog-sk-header-tmpl|erilog-sk-header|erilog-sk-if|erilog-sk-initial|erilog-sk-inout|erilog-sk-input|erilog-sk-module|erilog-sk-output|erilog-sk-ovm-class|erilog-sk-primitive|erilog-sk-prompt-clock|erilog-sk-prompt-condition|erilog-sk-prompt-inc|erilog-sk-prompt-init|erilog-sk-prompt-lsb|erilog-sk-prompt-msb|erilog-sk-prompt-name|erilog-sk-prompt-output|erilog-sk-prompt-reset|erilog-sk-prompt-state-selector|erilog-sk-prompt-width|erilog-sk-reg|erilog-sk-repeat|erilog-sk-specify|erilog-sk-state-machine|erilog-sk-task|erilog-sk-uvm-component|erilog-sk-uvm-object|erilog-sk-while|erilog-sk-wire|erilog-skip-backward-comment-or-string|erilog-skip-backward-comments|erilog-skip-forward-comment-or-string)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:verilog-skip-forward-comment-p|verilog-star-comment|verilog-start-translate-off|verilog-stmt-menu|verilog-string-diff|verilog-string-match-fold|verilog-string-remove-spaces|verilog-string-replace-matches|verilog-strip-comments|verilog-subdecls-get-inouts|verilog-subdecls-get-inputs|verilog-subdecls-get-interfaced|verilog-subdecls-get-interfaces|verilog-subdecls-get-outputs|verilog-subdecls-new|verilog-submit-bug-report|verilog-surelint-off|verilog-symbol-detick-denumber|verilog-symbol-detick-text|verilog-symbol-detick|verilog-syntax-ppss|verilog-typedef-name-p|verilog-uncomment-region|verilog-var-completion|verilog-verilint-off|verilog-version|verilog-wai|verilog-warn-error|verilog-warn|verilog-within-string|verilog-within-translate-off|version-list-<|version-list-<=|version-list-=|version-list-not-zero|version-to-list|version|version<|version<=|version=|vhdl-abbrev-list-init|vhdl-activate-customizations|vhdl-add-modified-file|vhdl-add-source-files-menu|vhdl-add-syntax|vhdl-adelete|vhdl-aget|vhdl-align-buffer|vhdl-align-declarations|vhdl-align-group|vhdl-align-inline-comment-buffer|vhdl-align-inline-comment-group|vhdl-align-inline-comment-region-1|vhdl-align-inline-comment-region|vhdl-align-list|vhdl-align-region-1|vhdl-align-region-2|vhdl-align-region-groups|vhdl-align-region|vhdl-align-same-indent|vhdl-aput-delete-if-nil|vhdl-aput|vhdl-auto-load-project|vhdl-back-to-indentation|vhdl-backward-same-indent|vhdl-backward-sexp|vhdl-backward-skip-label|vhdl-backward-syntactic-ws|vhdl-backward-to-block|vhdl-backward-up-list|vhdl-beautify-buffer|vhdl-beautify-region|vhdl-begin-p|vhdl-beginning-of-block|vhdl-beginning-of-defun|vhdl-beginning-of-libunit|vhdl-beginning-of-macro|vhdl-beginning-of-statement-1|vhdl-beginning-of-statement|vhdl-case-alternative-p|vhdl-case-keyword|vhdl-case-word|vhdl-character-to-event|vhdl-comment-append-inline|vhdl-comment-block|vhdl-comment-display-line|vhdl-comment-display|vhdl-comment-indent|vhdl-comment-insert-inline|vhdl-comment-insert|vhdl-comment-kill-inline-region|vhdl-comment-kill-region|vhdl-comment-uncomment-line|vhdl-comment-uncomment-region|vhdl-compile-directory|vhdl-compile-init|vhdl-compile-print-file-name|vhdl-compile|vhdl-compose-components-package|vhdl-compose-configuration-architecture|vhdl-compose-configuration|vhdl-compose-insert-generic|vhdl-compose-insert-port|vhdl-compose-insert-signal|vhdl-compose-new-component|vhdl-compose-place-component|vhdl-compose-wire-components|vhdl-corresponding-begin|vhdl-corresponding-defun|vhdl-corresponding-end|vhdl-corresponding-mid|vhdl-create-mode-menu|vhdl-current-line|vhdl-custom-set|vhdl-customize|vhdl-decision-query|vhdl-default-directory|vhdl-defun-p|vhdl-delete-indentation|vhdl-delete|vhdl-directory-files|vhdl-do-group|vhdl-do-list|vhdl-do-same-indent|vhdl-doc-mode|vhdl-doc-variable|vhdl-duplicate-project|vhdl-electric-close-bracket|vhdl-electric-comma|vhdl-electric-dash|vhdl-electric-equal|vhdl-electric-mode|vhdl-electric-open-bracket|vhdl-electric-period|vhdl-electric-quote|vhdl-electric-return|vhdl-electric-semicolon|vhdl-electric-space|vhdl-electric-tab|vhdl-end-of-block|vhdl-end-of-defun|vhdl-end-of-leader|vhdl-end-of-statement|vhdl-end-p|vhdl-end-translate-off|vhdl-error-regexp-add-emacs|vhdl-expand-abbrev|vhdl-expand-paren|vhdl-export-project|vhdl-fill-group|vhdl-fill-list|vhdl-fill-region|vhdl-fill-same-indent|vhdl-first-word|vhdl-fix-case-buffer|vhdl-fix-case-region-1|vhdl-fix-case-region|vhdl-fix-case-word|vhdl-fix-clause-buffer|vhdl-fix-clause|vhdl-fix-statement-buffer|vhdl-fix-statement-region|vhdl-fixup-whitespace-buffer|vhdl-fixup-whitespace-region|vhdl-font-lock-init|vhdl-font-lock-match-item|vhdl-fontify-buffer|vhdl-forward-comment|vhdl-forward-same-indent|vhdl-forward-sexp|vhdl-forward-skip-label|vhdl-forward-syntactic-ws|vhdl-function-name|vhdl-generate-makefile-1|vhdl-generate-makefile|vhdl-get-block-state|vhdl-get-compile-options|vhdl-get-components-package-name|vhdl-get-end-of-unit|vhdl-get-hierarchy|vhdl-get-instantiations|vhdl-get-library-unit|vhdl-get-make-options|vhdl-get-offset|vhdl-get-packages|vhdl-get-source-files|vhdl-get-subdirs|vhdl-get-syntactic-context|vhdl-get-visible-signals|vhdl-goto-marker|vhdl-has-syntax|vhdl-he-list-beg|vhdl-hideshow-init|vhdl-hooked-abbrev|vhdl-hs-forward-sexp-func|vhdl-hs-minor-mode|vhdl-import-project|vhdl-in-argument-list-p|vhdl-in-comment-p|vhdl-in-extended-identifier-p|vhdl-in-literal|vhdl-in-quote-p|vhdl-in-string-p|vhdl-indent-buffer|vhdl-indent-group|vhdl-indent-line|vhdl-indent-region|vhdl-indent-sexp|vhdl-index-menu-init|vhdl-insert-file-contents|vhdl-insert-keyword|vhdl-insert-string-or-file|vhdl-keep-region-active|vhdl-last-word|vhdl-libunit-p|vhdl-line-copy|vhdl-line-expand|vhdl-line-kill-entire|vhdl-line-kill|vhdl-line-open|vhdl-line-transpose-next|vhdl-line-transpose-previous|vhdl-line-yank|vhdl-lineup-arglist-intro|vhdl-lineup-arglist|vhdl-lineup-comment|vhdl-lineup-statement-cont|vhdl-load-cache|vhdl-make|vhdl-makefile-name|vhdl-mark-defun|vhdl-match-string-downcase|vhdl-match-translate-off|vhdl-max-marker|vhdl-menu-split|vhdl-minibuffer-tab|vhdl-mode-abbrev-table-init|vhdl-mode-map-init|vhdl-mode|vhdl-model-defun|vhdl-model-example-model|vhdl-model-insert|vhdl-model-map-init|vhdl-parse-group-comment|vhdl-parse-string|vhdl-paste-group-comment|vhdl-point|vhdl-port-copy|vhdl-port-flatten|vhdl-port-paste-component|vhdl-port-paste-constants|vhdl-port-paste-context-clause|vhdl-port-paste-declaration|vhdl-port-paste-entity|vhdl-port-paste-generic-map|vhdl-port-paste-generic|vhdl-port-paste-initializations|vhdl-port-paste-instance|vhdl-port-paste-port-map|vhdl-port-paste-port|vhdl-port-paste-signals|vhdl-port-paste-testbench|vhdl-port-reverse-direction|vhdl-prepare-search-1|vhdl-prepare-search-2|vhdl-print-warnings|vhdl-process-command-line-option|vhdl-project-p|vhdl-ps-print-init|vhdl-ps-print-settings|vhdl-re-search-backward|vhdl-re-search-forward|vhdl-read-offset|vhdl-regress-line|vhdl-remove-trailing-spaces-region|vhdl-remove-trailing-spaces|vhdl-replace-string|vhdl-require-hierarchy-info|vhdl-resolve-env-variable|vhdl-resolve-paths|vhdl-run-when-idle|vhdl-safe|vhdl-save-cache|vhdl-save-caches|vhdl-scan-context-clause|vhdl-scan-directory-contents|vhdl-scan-project-contents|vhdl-sequential-statement-p|vhdl-set-compiler|vhdl-set-default-project|vhdl-set-offset|vhdl-set-project|vhdl-set-style|vhdl-show-messages|vhdl-show-syntactic-information|vhdl-skip-case-alternative|vhdl-sort-alist|vhdl-speedbar-check-unit|vhdl-speedbar-configuration|vhdl-speedbar-contract-all|vhdl-speedbar-contract-level|vhdl-speedbar-dired|vhdl-speedbar-display-directory|vhdl-speedbar-display-projects|vhdl-speedbar-expand-all|vhdl-speedbar-expand-architecture|vhdl-speedbar-expand-config|vhdl-speedbar-expand-dirs|vhdl-speedbar-expand-entity|vhdl-speedbar-expand-package|vhdl-speedbar-expand-project|vhdl-speedbar-expand-units|vhdl-speedbar-find-file|vhdl-speedbar-generate-makefile|vhdl-speedbar-goto-this-unit|vhdl-speedbar-higher-text|vhdl-speedbar-initialize|vhdl-speedbar-insert-dir-hierarchy|vhdl-speedbar-insert-dirs|vhdl-speedbar-insert-hierarchy|vhdl-speedbar-insert-project-hierarchy|vhdl-speedbar-insert-projects|vhdl-speedbar-insert-subpackages|vhdl-speedbar-item-info|vhdl-speedbar-line-key|vhdl-speedbar-line-project|vhdl-speedbar-line-text|vhdl-speedbar-make-design|vhdl-speedbar-make-inst-line|vhdl-speedbar-make-pack-line|vhdl-speedbar-make-subpack-line|vhdl-speedbar-make-subprogram-line|vhdl-speedbar-make-title-line|vhdl-speedbar-place-component|vhdl-speedbar-port-copy|vhdl-speedbar-refresh|vhdl-speedbar-rescan-hierarchy|vhdl-speedbar-select-mra|vhdl-speedbar-set-depth|vhdl-speedbar-update-current-project|vhdl-speedbar-update-current-unit|vhdl-speedbar-update-units|vhdl-speedbar|vhdl-standard-p|vhdl-start-translate-off|vhdl-statement-p|vhdl-statistics-buffer|vhdl-stutter-mode|vhdl-submit-bug-report|vhdl-subprog-copy|vhdl-subprog-flatten|vhdl-subprog-paste-body|vhdl-subprog-paste-call|vhdl-subprog-paste-declaration|vhdl-subprog-paste-specification|vhdl-template-alias-hook|vhdl-template-alias|vhdl-template-and-hook|vhdl-template-architecture-hook|vhdl-template-architecture|vhdl-template-argument-list|vhdl-template-array|vhdl-template-assert-hook|vhdl-template-assert|vhdl-template-attribute-decl|vhdl-template-attribute-hook|vhdl-template-attribute-spec|vhdl-template-attribute|vhdl-template-bare-loop-hook|vhdl-template-bare-loop|vhdl-template-begin-end|vhdl-template-block-configuration|vhdl-template-block-hook|vhdl-template-block|vhdl-template-break-hook|vhdl-template-break|vhdl-template-case-hook|vhdl-template-case-is|vhdl-template-case-use|vhdl-template-case|vhdl-template-clocked-wait|vhdl-template-component-conf|vhdl-template-component-decl|vhdl-template-component-hook|vhdl-template-component-inst|vhdl-template-component|vhdl-template-conditional-signal-asst-hook|vhdl-template-conditional-signal-asst|vhdl-template-configuration-decl|vhdl-template-configuration-hook|vhdl-template-configuration-spec|vhdl-template-configuration|vhdl-template-constant-hook|vhdl-template-constant|vhdl-template-construct-alist-init|vhdl-template-default-hook|vhdl-template-default-indent-hook|vhdl-template-default-indent|vhdl-template-default|vhdl-template-directive-synthesis-off|vhdl-template-directive-synthesis-on|vhdl-template-directive-translate-off|vhdl-template-directive-translate-on|vhdl-template-directive|vhdl-template-disconnect-hook|vhdl-template-disconnect|vhdl-template-display-comment-hook|vhdl-template-else-hook|vhdl-template-else|vhdl-template-elsif-hook|vhdl-template-elsif|vhdl-template-entity-hook|vhdl-template-entity|vhdl-template-exit-hook|vhdl-template-exit|vhdl-template-field|vhdl-template-file-hook|vhdl-template-file|vhdl-template-footer|vhdl-template-for-generate|vhdl-template-for-hook|vhdl-template-for-loop|vhdl-template-for|vhdl-template-function-body|vhdl-template-function-decl|vhdl-template-function-hook|vhdl-template-function|vhdl-template-generate-body|vhdl-template-generate|vhdl-template-generic-hook|vhdl-template-generic-list|vhdl-template-generic|vhdl-template-group-decl|vhdl-template-group-hook|vhdl-template-group-template|vhdl-template-group|vhdl-template-header|vhdl-template-if-generate|vhdl-template-if-hook|vhdl-template-if-then-use|vhdl-template-if-then|vhdl-template-if-use|vhdl-template-if|vhdl-template-insert-construct|vhdl-template-insert-date|vhdl-template-insert-directive|vhdl-template-insert-fun|vhdl-template-insert-package|vhdl-template-instance-hook|vhdl-template-instance|vhdl-template-library-hook|vhdl-template-library|vhdl-template-limit-hook|vhdl-template-limit|vhdl-template-loop|vhdl-template-map-hook|vhdl-template-map-init|vhdl-template-map|vhdl-template-modify-noerror|vhdl-template-modify|vhdl-template-nand-hook|vhdl-template-nature-hook|vhdl-template-nature|vhdl-template-next-hook|vhdl-template-next|vhdl-template-nor-hook|vhdl-template-not-hook|vhdl-template-or-hook|vhdl-template-others-hook|vhdl-template-others|vhdl-template-package-alist-init|vhdl-template-package-body|vhdl-template-package-decl|vhdl-template-package-electrical-systems|vhdl-template-package-energy-systems|vhdl-template-package-fluidic-systems|vhdl-template-package-fundamental-constants|vhdl-template-package-hook|vhdl-template-package-material-constants|vhdl-template-package-math-complex|vhdl-template-package-math-real|vhdl-template-package-mechanical-systems|vhdl-template-package-numeric-bit|vhdl-template-package-numeric-std|vhdl-template-package-radiant-systems|vhdl-template-package-std-logic-1164|vhdl-template-package-std-logic-arith|vhdl-template-package-std-logic-misc|vhdl-template-package-std-logic-signed|vhdl-template-package-std-logic-textio|vhdl-template-package-std-logic-unsigned|vhdl-template-package-textio|vhdl-template-package-thermal-systems|vhdl-template-package|vhdl-template-paired-parens|vhdl-template-port-hook|vhdl-template-port-list|vhdl-template-port|vhdl-template-procedural-hook|vhdl-template-procedural|vhdl-template-procedure-body|vhdl-template-procedure-decl|vhdl-template-procedure-hook|vhdl-template-procedure|vhdl-template-process-comb|vhdl-template-process-hook|vhdl-template-process-seq|vhdl-template-process|vhdl-template-quantity-branch|vhdl-template-quantity-free|vhdl-template-quantity-hook|vhdl-template-quantity-source|vhdl-template-quantity|vhdl-template-record|vhdl-template-replace-header-keywords|vhdl-template-report-hook|vhdl-template-report)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)v(?:erilog-skip-forward-comment-p|erilog-star-comment|erilog-start-translate-off|erilog-stmt-menu|erilog-string-diff|erilog-string-match-fold|erilog-string-remove-spaces|erilog-string-replace-matches|erilog-strip-comments|erilog-subdecls-get-inouts|erilog-subdecls-get-inputs|erilog-subdecls-get-interfaced|erilog-subdecls-get-interfaces|erilog-subdecls-get-outputs|erilog-subdecls-new|erilog-submit-bug-report|erilog-surelint-off|erilog-symbol-detick-denumber|erilog-symbol-detick-text|erilog-symbol-detick|erilog-syntax-ppss|erilog-typedef-name-p|erilog-uncomment-region|erilog-var-completion|erilog-verilint-off|erilog-version|erilog-wai|erilog-warn-error|erilog-warn|erilog-within-string|erilog-within-translate-off|ersion-list-<|ersion-list-<=|ersion-list-=|ersion-list-not-zero|ersion-to-list|ersion|ersion<|ersion<=|ersion=|hdl-abbrev-list-init|hdl-activate-customizations|hdl-add-modified-file|hdl-add-source-files-menu|hdl-add-syntax|hdl-adelete|hdl-aget|hdl-align-buffer|hdl-align-declarations|hdl-align-group|hdl-align-inline-comment-buffer|hdl-align-inline-comment-group|hdl-align-inline-comment-region-1|hdl-align-inline-comment-region|hdl-align-list|hdl-align-region-1|hdl-align-region-2|hdl-align-region-groups|hdl-align-region|hdl-align-same-indent|hdl-aput-delete-if-nil|hdl-aput|hdl-auto-load-project|hdl-back-to-indentation|hdl-backward-same-indent|hdl-backward-sexp|hdl-backward-skip-label|hdl-backward-syntactic-ws|hdl-backward-to-block|hdl-backward-up-list|hdl-beautify-buffer|hdl-beautify-region|hdl-begin-p|hdl-beginning-of-block|hdl-beginning-of-defun|hdl-beginning-of-libunit|hdl-beginning-of-macro|hdl-beginning-of-statement-1|hdl-beginning-of-statement|hdl-case-alternative-p|hdl-case-keyword|hdl-case-word|hdl-character-to-event|hdl-comment-append-inline|hdl-comment-block|hdl-comment-display-line|hdl-comment-display|hdl-comment-indent|hdl-comment-insert-inline|hdl-comment-insert|hdl-comment-kill-inline-region|hdl-comment-kill-region|hdl-comment-uncomment-line|hdl-comment-uncomment-region|hdl-compile-directory|hdl-compile-init|hdl-compile-print-file-name|hdl-compile|hdl-compose-components-package|hdl-compose-configuration-architecture|hdl-compose-configuration|hdl-compose-insert-generic|hdl-compose-insert-port|hdl-compose-insert-signal|hdl-compose-new-component|hdl-compose-place-component|hdl-compose-wire-components|hdl-corresponding-begin|hdl-corresponding-defun|hdl-corresponding-end|hdl-corresponding-mid|hdl-create-mode-menu|hdl-current-line|hdl-custom-set|hdl-customize|hdl-decision-query|hdl-default-directory|hdl-defun-p|hdl-delete-indentation|hdl-delete|hdl-directory-files|hdl-do-group|hdl-do-list|hdl-do-same-indent|hdl-doc-mode|hdl-doc-variable|hdl-duplicate-project|hdl-electric-close-bracket|hdl-electric-comma|hdl-electric-dash|hdl-electric-equal|hdl-electric-mode|hdl-electric-open-bracket|hdl-electric-period|hdl-electric-quote|hdl-electric-return|hdl-electric-semicolon|hdl-electric-space|hdl-electric-tab|hdl-end-of-block|hdl-end-of-defun|hdl-end-of-leader|hdl-end-of-statement|hdl-end-p|hdl-end-translate-off|hdl-error-regexp-add-emacs|hdl-expand-abbrev|hdl-expand-paren|hdl-export-project|hdl-fill-group|hdl-fill-list|hdl-fill-region|hdl-fill-same-indent|hdl-first-word|hdl-fix-case-buffer|hdl-fix-case-region-1|hdl-fix-case-region|hdl-fix-case-word|hdl-fix-clause-buffer|hdl-fix-clause|hdl-fix-statement-buffer|hdl-fix-statement-region|hdl-fixup-whitespace-buffer|hdl-fixup-whitespace-region|hdl-font-lock-init|hdl-font-lock-match-item|hdl-fontify-buffer|hdl-forward-comment|hdl-forward-same-indent|hdl-forward-sexp|hdl-forward-skip-label|hdl-forward-syntactic-ws|hdl-function-name|hdl-generate-makefile-1|hdl-generate-makefile|hdl-get-block-state|hdl-get-compile-options|hdl-get-components-package-name|hdl-get-end-of-unit|hdl-get-hierarchy|hdl-get-instantiations|hdl-get-library-unit|hdl-get-make-options|hdl-get-offset|hdl-get-packages|hdl-get-source-files|hdl-get-subdirs|hdl-get-syntactic-context|hdl-get-visible-signals|hdl-goto-marker|hdl-has-syntax|hdl-he-list-beg|hdl-hideshow-init|hdl-hooked-abbrev|hdl-hs-forward-sexp-func|hdl-hs-minor-mode|hdl-import-project|hdl-in-argument-list-p|hdl-in-comment-p|hdl-in-extended-identifier-p|hdl-in-literal|hdl-in-quote-p|hdl-in-string-p|hdl-indent-buffer|hdl-indent-group|hdl-indent-line|hdl-indent-region|hdl-indent-sexp|hdl-index-menu-init|hdl-insert-file-contents|hdl-insert-keyword|hdl-insert-string-or-file|hdl-keep-region-active|hdl-last-word|hdl-libunit-p|hdl-line-copy|hdl-line-expand|hdl-line-kill-entire|hdl-line-kill|hdl-line-open|hdl-line-transpose-next|hdl-line-transpose-previous|hdl-line-yank|hdl-lineup-arglist-intro|hdl-lineup-arglist|hdl-lineup-comment|hdl-lineup-statement-cont|hdl-load-cache|hdl-make|hdl-makefile-name|hdl-mark-defun|hdl-match-string-downcase|hdl-match-translate-off|hdl-max-marker|hdl-menu-split|hdl-minibuffer-tab|hdl-mode-abbrev-table-init|hdl-mode-map-init|hdl-mode|hdl-model-defun|hdl-model-example-model|hdl-model-insert|hdl-model-map-init|hdl-parse-group-comment|hdl-parse-string|hdl-paste-group-comment|hdl-point|hdl-port-copy|hdl-port-flatten|hdl-port-paste-component|hdl-port-paste-constants|hdl-port-paste-context-clause|hdl-port-paste-declaration|hdl-port-paste-entity|hdl-port-paste-generic-map|hdl-port-paste-generic|hdl-port-paste-initializations|hdl-port-paste-instance|hdl-port-paste-port-map|hdl-port-paste-port|hdl-port-paste-signals|hdl-port-paste-testbench|hdl-port-reverse-direction|hdl-prepare-search-1|hdl-prepare-search-2|hdl-print-warnings|hdl-process-command-line-option|hdl-project-p|hdl-ps-print-init|hdl-ps-print-settings|hdl-re-search-backward|hdl-re-search-forward|hdl-read-offset|hdl-regress-line|hdl-remove-trailing-spaces-region|hdl-remove-trailing-spaces|hdl-replace-string|hdl-require-hierarchy-info|hdl-resolve-env-variable|hdl-resolve-paths|hdl-run-when-idle|hdl-safe|hdl-save-cache|hdl-save-caches|hdl-scan-context-clause|hdl-scan-directory-contents|hdl-scan-project-contents|hdl-sequential-statement-p|hdl-set-compiler|hdl-set-default-project|hdl-set-offset|hdl-set-project|hdl-set-style|hdl-show-messages|hdl-show-syntactic-information|hdl-skip-case-alternative|hdl-sort-alist|hdl-speedbar-check-unit|hdl-speedbar-configuration|hdl-speedbar-contract-all|hdl-speedbar-contract-level|hdl-speedbar-dired|hdl-speedbar-display-directory|hdl-speedbar-display-projects|hdl-speedbar-expand-all|hdl-speedbar-expand-architecture|hdl-speedbar-expand-config|hdl-speedbar-expand-dirs|hdl-speedbar-expand-entity|hdl-speedbar-expand-package|hdl-speedbar-expand-project|hdl-speedbar-expand-units|hdl-speedbar-find-file|hdl-speedbar-generate-makefile|hdl-speedbar-goto-this-unit|hdl-speedbar-higher-text|hdl-speedbar-initialize|hdl-speedbar-insert-dir-hierarchy|hdl-speedbar-insert-dirs|hdl-speedbar-insert-hierarchy|hdl-speedbar-insert-project-hierarchy|hdl-speedbar-insert-projects|hdl-speedbar-insert-subpackages|hdl-speedbar-item-info|hdl-speedbar-line-key|hdl-speedbar-line-project|hdl-speedbar-line-text|hdl-speedbar-make-design|hdl-speedbar-make-inst-line|hdl-speedbar-make-pack-line|hdl-speedbar-make-subpack-line|hdl-speedbar-make-subprogram-line|hdl-speedbar-make-title-line|hdl-speedbar-place-component|hdl-speedbar-port-copy|hdl-speedbar-refresh|hdl-speedbar-rescan-hierarchy|hdl-speedbar-select-mra|hdl-speedbar-set-depth|hdl-speedbar-update-current-project|hdl-speedbar-update-current-unit|hdl-speedbar-update-units|hdl-speedbar|hdl-standard-p|hdl-start-translate-off|hdl-statement-p|hdl-statistics-buffer|hdl-stutter-mode|hdl-submit-bug-report|hdl-subprog-copy|hdl-subprog-flatten|hdl-subprog-paste-body|hdl-subprog-paste-call|hdl-subprog-paste-declaration|hdl-subprog-paste-specification|hdl-template-alias-hook|hdl-template-alias|hdl-template-and-hook|hdl-template-architecture-hook|hdl-template-architecture|hdl-template-argument-list|hdl-template-array|hdl-template-assert-hook|hdl-template-assert|hdl-template-attribute-decl|hdl-template-attribute-hook|hdl-template-attribute-spec|hdl-template-attribute|hdl-template-bare-loop-hook|hdl-template-bare-loop|hdl-template-begin-end|hdl-template-block-configuration|hdl-template-block-hook|hdl-template-block|hdl-template-break-hook|hdl-template-break|hdl-template-case-hook|hdl-template-case-is|hdl-template-case-use|hdl-template-case|hdl-template-clocked-wait|hdl-template-component-conf|hdl-template-component-decl|hdl-template-component-hook|hdl-template-component-inst|hdl-template-component|hdl-template-conditional-signal-asst-hook|hdl-template-conditional-signal-asst|hdl-template-configuration-decl|hdl-template-configuration-hook|hdl-template-configuration-spec|hdl-template-configuration|hdl-template-constant-hook|hdl-template-constant|hdl-template-construct-alist-init|hdl-template-default-hook|hdl-template-default-indent-hook|hdl-template-default-indent|hdl-template-default|hdl-template-directive-synthesis-off|hdl-template-directive-synthesis-on|hdl-template-directive-translate-off|hdl-template-directive-translate-on|hdl-template-directive|hdl-template-disconnect-hook|hdl-template-disconnect|hdl-template-display-comment-hook|hdl-template-else-hook|hdl-template-else|hdl-template-elsif-hook|hdl-template-elsif|hdl-template-entity-hook|hdl-template-entity|hdl-template-exit-hook|hdl-template-exit|hdl-template-field|hdl-template-file-hook|hdl-template-file|hdl-template-footer|hdl-template-for-generate|hdl-template-for-hook|hdl-template-for-loop|hdl-template-for|hdl-template-function-body|hdl-template-function-decl|hdl-template-function-hook|hdl-template-function|hdl-template-generate-body|hdl-template-generate|hdl-template-generic-hook|hdl-template-generic-list|hdl-template-generic|hdl-template-group-decl|hdl-template-group-hook|hdl-template-group-template|hdl-template-group|hdl-template-header|hdl-template-if-generate|hdl-template-if-hook|hdl-template-if-then-use|hdl-template-if-then|hdl-template-if-use|hdl-template-if|hdl-template-insert-construct|hdl-template-insert-date|hdl-template-insert-directive|hdl-template-insert-fun|hdl-template-insert-package|hdl-template-instance-hook|hdl-template-instance|hdl-template-library-hook|hdl-template-library|hdl-template-limit-hook|hdl-template-limit|hdl-template-loop|hdl-template-map-hook|hdl-template-map-init|hdl-template-map|hdl-template-modify-noerror|hdl-template-modify|hdl-template-nand-hook|hdl-template-nature-hook|hdl-template-nature|hdl-template-next-hook|hdl-template-next|hdl-template-nor-hook|hdl-template-not-hook|hdl-template-or-hook|hdl-template-others-hook|hdl-template-others|hdl-template-package-alist-init|hdl-template-package-body|hdl-template-package-decl|hdl-template-package-electrical-systems|hdl-template-package-energy-systems|hdl-template-package-fluidic-systems|hdl-template-package-fundamental-constants|hdl-template-package-hook|hdl-template-package-material-constants|hdl-template-package-math-complex|hdl-template-package-math-real|hdl-template-package-mechanical-systems|hdl-template-package-numeric-bit|hdl-template-package-numeric-std|hdl-template-package-radiant-systems|hdl-template-package-std-logic-1164|hdl-template-package-std-logic-arith|hdl-template-package-std-logic-misc|hdl-template-package-std-logic-signed|hdl-template-package-std-logic-textio|hdl-template-package-std-logic-unsigned|hdl-template-package-textio|hdl-template-package-thermal-systems|hdl-template-package|hdl-template-paired-parens|hdl-template-port-hook|hdl-template-port-list|hdl-template-port|hdl-template-procedural-hook|hdl-template-procedural|hdl-template-procedure-body|hdl-template-procedure-decl|hdl-template-procedure-hook|hdl-template-procedure|hdl-template-process-comb|hdl-template-process-hook|hdl-template-process-seq|hdl-template-process|hdl-template-quantity-branch|hdl-template-quantity-free|hdl-template-quantity-hook|hdl-template-quantity-source|hdl-template-quantity|hdl-template-record|hdl-template-replace-header-keywords|hdl-template-report-hook|hdl-template-report)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:vhdl-template-return-hook|vhdl-template-return|vhdl-template-search-prompt|vhdl-template-selected-signal-asst-hook|vhdl-template-selected-signal-asst|vhdl-template-seq-process|vhdl-template-signal-hook|vhdl-template-signal|vhdl-template-standard-package|vhdl-template-subnature-hook|vhdl-template-subnature|vhdl-template-subprogram-body|vhdl-template-subprogram-decl|vhdl-template-subtype-hook|vhdl-template-subtype|vhdl-template-terminal-hook|vhdl-template-terminal|vhdl-template-type-hook|vhdl-template-type|vhdl-template-undo|vhdl-template-use-hook|vhdl-template-use|vhdl-template-variable-hook|vhdl-template-variable|vhdl-template-wait-hook|vhdl-template-wait|vhdl-template-when-hook|vhdl-template-when|vhdl-template-while-loop-hook|vhdl-template-while-loop|vhdl-template-with-hook|vhdl-template-with|vhdl-template-xnor-hook|vhdl-template-xor-hook|vhdl-toggle-project|vhdl-try-expand-abbrev|vhdl-uniquify|vhdl-upcase-list|vhdl-update-file-contents|vhdl-update-hierarchy|vhdl-update-mode-menu|vhdl-update-progress-info|vhdl-update-sensitivity-list-buffer|vhdl-update-sensitivity-list-process|vhdl-update-sensitivity-list|vhdl-use-direct-instantiation|vhdl-version|vhdl-visit-file|vhdl-warning-when-idle|vhdl-warning|vhdl-widget-directory-validate|vhdl-win-bsws|vhdl-win-fsws|vhdl-win-il|vhdl-within-translate-off|vhdl-words-init|vhdl-work-library|vhdl-write-file-hooks-init|viet-decode-viqr-buffer|viet-decode-viqr-region|viet-encode-viqr-buffer|viet-encode-viqr-region|viet-encode-viscii-char|view--disable|view--enable|view-buffer-other-frame|view-buffer-other-window|view-buffer|view-echo-area-messages|view-emacs-FAQ|view-emacs-debugging|view-emacs-news|view-emacs-problems|view-emacs-todo|view-end-message|view-external-packages|view-file-other-frame|view-file-other-window|view-file|view-hello-file|view-help-file|view-lossage|view-mode-disable|view-mode-enable|view-mode-enter|view-mode-exit|view-mode|view-order-manuals|view-page-size-default|view-really-at-end|view-recenter|view-return-to-alist-update|view-scroll-lines|view-search-no-match-lines|view-search|view-set-half-page-size-default|view-todo|view-window-size|viper--lookup-key|viper--tty-ESC-filter|viper-Append|viper-ESC-event-p|viper-ESC-keyseq-timeout|viper-ESC|viper-Insert|viper-Open-line|viper-P-val|viper-Put-back|viper-R-state-post-command-sentinel|viper-Region|viper-abbreviate-file-name|viper-abbreviate-string|viper-activate-input-method-action|viper-activate-input-method|viper-add-keymap|viper-add-local-keys|viper-add-newline-at-eob-if-necessary|viper-adjust-keys-for|viper-adjust-undo|viper-adjust-window|viper-after-change-sentinel|viper-after-change-undo-hook|viper-alist-to-list|viper-alternate-Meta-key|viper-append-filter-alist|viper-append-to-register|viper-append|viper-apply-major-mode-modifiers|viper-array-to-string|viper-ask-level|viper-autoindent|viper-backward-Word|viper-backward-char-carefully|viper-backward-char|viper-backward-indent|viper-backward-paragraph|viper-backward-sentence|viper-backward-word-kernel|viper-backward-word|viper-before-change-sentinel|viper-beginning-of-field|viper-beginning-of-line|viper-bind-mouse-insert-key|viper-bind-mouse-search-key|viper-bol-and-skip-white|viper-brac-function|viper-buffer-live-p|viper-buffer-search-enable|viper-can-release-key|viper-catch-tty-ESC|viper-change-cursor-color|viper-change-state-to-emacs|viper-change-state-to-insert|viper-change-state-to-replace|viper-change-state-to-vi|viper-change-state|viper-change-subr|viper-change-to-eol|viper-change|viper-char-array-p|viper-char-array-to-macro|viper-char-at-pos|viper-char-equal|viper-char-symbol-sequence-p|viper-characterp|viper-charlist-to-string|viper-charpair-command-p|viper-chars-in-region|viper-check-minibuffer-overlay|viper-check-version|viper-cleanup-ring|viper-color-defined-p|viper-color-display-p|viper-comint-mode-hook|viper-command-argument|viper-common-seq-prefix|viper-complete-filename-or-exit|viper-copy-event|viper-copy-region-as-kill|viper-current-ring-item|viper-cycle-through-mark-ring|viper-deactivate-input-method-action|viper-deactivate-input-method|viper-deactivate-mark|viper-debug-keymaps|viper-default-ex-addresses|viper-deflocalvar|viper-del-backward-char-in-insert|viper-del-backward-char-in-replace|viper-del-forward-char-in-insert|viper-delete-backward-char|viper-delete-backward-word|viper-delete-char|viper-delocalize-var|viper-describe-arg|viper-describe-kbd-macros|viper-describe-one-macro-elt|viper-describe-one-macro|viper-device-type|viper-digit-argument|viper-digit-command-p|viper-display-current-destructive-command|viper-display-macro|viper-display-vector-completions|viper-do-sequence-completion|viper-dotable-command-p|viper-downgrade-to-insert|viper-end-mapping-kbd-macro|viper-end-of-Word|viper-end-of-word-kernel|viper-end-of-word-p|viper-end-of-word|viper-end-with-a-newline-p|viper-enlarge-region|viper-erase-line|viper-escape-to-emacs|viper-escape-to-state|viper-escape-to-vi|viper-event-click-count|viper-event-key|viper-event-vector-p|viper-eventify-list-xemacs|viper-events-to-macro|viper-ex-read-file-name|viper-ex|viper-exchange-point-and-mark|viper-exec-Change|viper-exec-Delete|viper-exec-Yank|viper-exec-bang|viper-exec-buffer-search|viper-exec-change|viper-exec-delete|viper-exec-dummy|viper-exec-equals|viper-exec-form-in-emacs|viper-exec-form-in-vi|viper-exec-key-in-emacs|viper-exec-mapped-kbd-macro|viper-exec-shift|viper-exec-yank|viper-execute-com|viper-exit-insert-state|viper-exit-minibuffer|viper-extract-matching-alist-members|viper-fast-keysequence-p|viper-file-add-suffix|viper-file-checked-in-p|viper-filter-alist|viper-filter-list|viper-find-best-matching-macro|viper-find-char-backward|viper-find-char-forward|viper-find-char|viper-finish-R-mode|viper-finish-change|viper-fixup-macro|viper-flash-search-pattern|viper-forward-Word|viper-forward-char-carefully|viper-forward-char|viper-forward-indent|viper-forward-paragraph|viper-forward-sentence|viper-forward-word-kernel|viper-forward-word|viper-frame-value|viper-get-cursor-color|viper-get-ex-address-subr|viper-get-ex-address|viper-get-ex-buffer|viper-get-ex-com-subr|viper-get-ex-count|viper-get-ex-file|viper-get-ex-opt-gc|viper-get-ex-pat|viper-get-ex-token|viper-get-face|viper-get-filenames-from-buffer|viper-get-saved-cursor-color-in-emacs-mode|viper-get-saved-cursor-color-in-insert-mode|viper-get-saved-cursor-color-in-replace-mode|viper-get-visible-buffer-window|viper-getCom|viper-getcom|viper-glob-mswindows-files|viper-glob-unix-files|viper-global-execute|viper-go-away|viper-goto-char-backward|viper-goto-char-forward|viper-goto-col|viper-goto-eol|viper-goto-line|viper-goto-mark-and-skip-white|viper-goto-mark-subr|viper-goto-mark|viper-handle-!|viper-harness-minor-mode|viper-has-face-support-p|viper-hash-command-p|viper-heading-end|viper-hide-replace-overlay|viper-hide-search-overlay|viper-iconify|viper-if-string|viper-indent-line|viper-info-on-file|viper-insert-isearch-string|viper-insert-next-from-insertion-ring|viper-insert-prev-from-insertion-ring|viper-insert-state-post-command-sentinel|viper-insert-state-pre-command-sentinel|viper-insert-tab|viper-insert|viper-int-to-char|viper-intercept-ESC-key|viper-is-in-minibuffer|viper-isearch-backward|viper-isearch-forward|viper-join-lines|viper-kbd-buf-alist|viper-kbd-buf-definition|viper-kbd-buf-pair|viper-kbd-global-definition|viper-kbd-global-pair|viper-kbd-mode-alist|viper-kbd-mode-definition|viper-kbd-mode-pair|viper-ket-function|viper-key-press-events-to-chars|viper-key-to-character|viper-key-to-emacs-key|viper-keyseq-is-a-possible-macro|viper-kill-buffer|viper-kill-line|viper-last-command-char|viper-leave-region-active|viper-line-pos|viper-line-to-bottom|viper-line-to-middle|viper-line-to-top|viper-line|viper-list-to-alist|viper-load-custom-file|viper-looking-at-alpha|viper-looking-at-alphasep|viper-looking-at-separator|viper-looking-back|viper-loop|viper-macro-to-events|viper-major-mode-change-sentinel|viper-make-overlay|viper-mark-beginning-of-buffer|viper-mark-end-of-buffer|viper-mark-marker|viper-mark-point|viper-maybe-checkout|viper-memq-char|viper-message-conditions|viper-minibuffer-post-command-hook|viper-minibuffer-real-start|viper-minibuffer-setup-sentinel|viper-minibuffer-standard-hook|viper-minibuffer-trim-tail|viper-mode|viper-modify-keymap|viper-modify-major-mode|viper-mouse-catch-frame-switch|viper-mouse-click-frame|viper-mouse-click-get-word|viper-mouse-click-insert-word|viper-mouse-click-posn|viper-mouse-click-search-word|viper-mouse-click-window-buffer-name|viper-mouse-click-window-buffer|viper-mouse-click-window|viper-mouse-event-p|viper-move-marker-locally|viper-move-overlay|viper-move-replace-overlay|viper-movement-command-p|viper-multiclick-p|viper-next-destructive-command|viper-next-heading|viper-next-line-at-bol|viper-next-line-carefully|viper-next-line|viper-nil|viper-non-hook-settings|viper-normalize-minor-mode-map-alist|viper-open-line-at-point|viper-open-line|viper-over-whitespace-line|viper-overlay-end|viper-overlay-get|viper-overlay-live-p|viper-overlay-p|viper-overlay-put|viper-overlay-start|viper-overwrite|viper-p-val|viper-paren-match|viper-parse-mouse-key|viper-pos-within-region|viper-post-command-sentinel|viper-pre-command-sentinel|viper-prefix-arg-com|viper-prefix-arg-value|viper-prefix-command-p|viper-prefix-subseq-p|viper-preserve-cursor-color|viper-prev-destructive-command|viper-prev-heading|viper-previous-line-at-bol|viper-previous-line|viper-push-onto-ring|viper-put-back|viper-put-on-search-overlay|viper-put-string-on-kill-ring|viper-query-replace|viper-quote-region|viper-read-char-exclusive|viper-read-event-convert-to-char|viper-read-event|viper-read-fast-keysequence|viper-read-key-sequence|viper-read-key|viper-read-string-with-history|viper-record-kbd-macro|viper-refresh-mode-line|viper-region|viper-register-macro|viper-register-to-point|viper-regsuffix-command-p|viper-remember-current-frame|viper-remove-hooks|viper-repeat-find-opposite|viper-repeat-find|viper-repeat-from-history|viper-repeat-insert-command|viper-repeat|viper-replace-char-subr|viper-replace-char|viper-replace-end|viper-replace-mode-spy-after|viper-replace-mode-spy-before|viper-replace-start|viper-replace-state-carriage-return|viper-replace-state-exit-cmd|viper-replace-state-post-command-sentinel|viper-replace-state-pre-command-sentinel|viper-reset-mouse-insert-key|viper-reset-mouse-search-key|viper-restore-cursor-color|viper-restore-cursor-type|viper-ring-insert|viper-ring-pop|viper-ring-rotate1|viper-same-line|viper-save-cursor-color|viper-save-kill-buffer|viper-save-last-insertion|viper-save-setting|viper-save-string-in-file|viper-scroll-down-one|viper-scroll-down|viper-scroll-screen-back|viper-scroll-screen|viper-scroll-up-one|viper-scroll-up|viper-search-Next|viper-search-backward|viper-search-forward|viper-search-next|viper-search|viper-separator-skipback-special|viper-seq-last-elt|viper-set-complex-command-for-undo|viper-set-cursor-color-according-to-state|viper-set-destructive-command|viper-set-emacs-state-searchstyle-macros|viper-set-expert-level|viper-set-hooks|viper-set-input-method|viper-set-insert-cursor-type|viper-set-iso-accents-mode|viper-set-mark-if-necessary|viper-set-minibuffer-overlay|viper-set-minibuffer-style|viper-set-mode-vars-for|viper-set-parsing-style-toggling-macro|viper-set-register-macro|viper-set-replace-overlay-glyphs|viper-set-replace-overlay|viper-set-searchstyle-toggling-macros|viper-set-syntax-preference|viper-set-unread-command-events|viper-setup-ESC-to-escape|viper-setup-master-buffer|viper-sit-for-short|viper-skip-all-separators-backward|viper-skip-all-separators-forward|viper-skip-alpha-backward|viper-skip-alpha-forward|viper-skip-nonalphasep-backward|viper-skip-nonalphasep-forward|viper-skip-nonseparators|viper-skip-separators|viper-skip-syntax|viper-special-prefix-com|viper-special-read-and-insert-char|viper-special-ring-rotate1|viper-standard-value|viper-start-R-mode|viper-start-replace|viper-string-to-list|viper-submit-report|viper-subseq|viper-substitute-line|viper-substitute|viper-surrounding-word|viper-switch-to-buffer-other-window|viper-switch-to-buffer|viper-test-com-defun|viper-this-buffer-macros|viper-tmp-insert-at-eob|viper-toggle-case|viper-toggle-key-action|viper-toggle-parse-sexp-ignore-comments)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)v(?:hdl-template-return-hook|hdl-template-return|hdl-template-search-prompt|hdl-template-selected-signal-asst-hook|hdl-template-selected-signal-asst|hdl-template-seq-process|hdl-template-signal-hook|hdl-template-signal|hdl-template-standard-package|hdl-template-subnature-hook|hdl-template-subnature|hdl-template-subprogram-body|hdl-template-subprogram-decl|hdl-template-subtype-hook|hdl-template-subtype|hdl-template-terminal-hook|hdl-template-terminal|hdl-template-type-hook|hdl-template-type|hdl-template-undo|hdl-template-use-hook|hdl-template-use|hdl-template-variable-hook|hdl-template-variable|hdl-template-wait-hook|hdl-template-wait|hdl-template-when-hook|hdl-template-when|hdl-template-while-loop-hook|hdl-template-while-loop|hdl-template-with-hook|hdl-template-with|hdl-template-xnor-hook|hdl-template-xor-hook|hdl-toggle-project|hdl-try-expand-abbrev|hdl-uniquify|hdl-upcase-list|hdl-update-file-contents|hdl-update-hierarchy|hdl-update-mode-menu|hdl-update-progress-info|hdl-update-sensitivity-list-buffer|hdl-update-sensitivity-list-process|hdl-update-sensitivity-list|hdl-use-direct-instantiation|hdl-version|hdl-visit-file|hdl-warning-when-idle|hdl-warning|hdl-widget-directory-validate|hdl-win-bsws|hdl-win-fsws|hdl-win-il|hdl-within-translate-off|hdl-words-init|hdl-work-library|hdl-write-file-hooks-init|iet-decode-viqr-buffer|iet-decode-viqr-region|iet-encode-viqr-buffer|iet-encode-viqr-region|iet-encode-viscii-char|iew--disable|iew--enable|iew-buffer-other-frame|iew-buffer-other-window|iew-buffer|iew-echo-area-messages|iew-emacs-FAQ|iew-emacs-debugging|iew-emacs-news|iew-emacs-problems|iew-emacs-todo|iew-end-message|iew-external-packages|iew-file-other-frame|iew-file-other-window|iew-file|iew-hello-file|iew-help-file|iew-lossage|iew-mode-disable|iew-mode-enable|iew-mode-enter|iew-mode-exit|iew-mode|iew-order-manuals|iew-page-size-default|iew-really-at-end|iew-recenter|iew-return-to-alist-update|iew-scroll-lines|iew-search-no-match-lines|iew-search|iew-set-half-page-size-default|iew-todo|iew-window-size|iper--lookup-key|iper--tty-ESC-filter|iper-Append|iper-ESC-event-p|iper-ESC-keyseq-timeout|iper-ESC|iper-Insert|iper-Open-line|iper-P-val|iper-Put-back|iper-R-state-post-command-sentinel|iper-Region|iper-abbreviate-file-name|iper-abbreviate-string|iper-activate-input-method-action|iper-activate-input-method|iper-add-keymap|iper-add-local-keys|iper-add-newline-at-eob-if-necessary|iper-adjust-keys-for|iper-adjust-undo|iper-adjust-window|iper-after-change-sentinel|iper-after-change-undo-hook|iper-alist-to-list|iper-alternate-Meta-key|iper-append-filter-alist|iper-append-to-register|iper-append|iper-apply-major-mode-modifiers|iper-array-to-string|iper-ask-level|iper-autoindent|iper-backward-Word|iper-backward-char-carefully|iper-backward-char|iper-backward-indent|iper-backward-paragraph|iper-backward-sentence|iper-backward-word-kernel|iper-backward-word|iper-before-change-sentinel|iper-beginning-of-field|iper-beginning-of-line|iper-bind-mouse-insert-key|iper-bind-mouse-search-key|iper-bol-and-skip-white|iper-brac-function|iper-buffer-live-p|iper-buffer-search-enable|iper-can-release-key|iper-catch-tty-ESC|iper-change-cursor-color|iper-change-state-to-emacs|iper-change-state-to-insert|iper-change-state-to-replace|iper-change-state-to-vi|iper-change-state|iper-change-subr|iper-change-to-eol|iper-change|iper-char-array-p|iper-char-array-to-macro|iper-char-at-pos|iper-char-equal|iper-char-symbol-sequence-p|iper-characterp|iper-charlist-to-string|iper-charpair-command-p|iper-chars-in-region|iper-check-minibuffer-overlay|iper-check-version|iper-cleanup-ring|iper-color-defined-p|iper-color-display-p|iper-comint-mode-hook|iper-command-argument|iper-common-seq-prefix|iper-complete-filename-or-exit|iper-copy-event|iper-copy-region-as-kill|iper-current-ring-item|iper-cycle-through-mark-ring|iper-deactivate-input-method-action|iper-deactivate-input-method|iper-deactivate-mark|iper-debug-keymaps|iper-default-ex-addresses|iper-deflocalvar|iper-del-backward-char-in-insert|iper-del-backward-char-in-replace|iper-del-forward-char-in-insert|iper-delete-backward-char|iper-delete-backward-word|iper-delete-char|iper-delocalize-var|iper-describe-arg|iper-describe-kbd-macros|iper-describe-one-macro-elt|iper-describe-one-macro|iper-device-type|iper-digit-argument|iper-digit-command-p|iper-display-current-destructive-command|iper-display-macro|iper-display-vector-completions|iper-do-sequence-completion|iper-dotable-command-p|iper-downgrade-to-insert|iper-end-mapping-kbd-macro|iper-end-of-Word|iper-end-of-word-kernel|iper-end-of-word-p|iper-end-of-word|iper-end-with-a-newline-p|iper-enlarge-region|iper-erase-line|iper-escape-to-emacs|iper-escape-to-state|iper-escape-to-vi|iper-event-click-count|iper-event-key|iper-event-vector-p|iper-eventify-list-xemacs|iper-events-to-macro|iper-ex-read-file-name|iper-ex|iper-exchange-point-and-mark|iper-exec-Change|iper-exec-Delete|iper-exec-Yank|iper-exec-bang|iper-exec-buffer-search|iper-exec-change|iper-exec-delete|iper-exec-dummy|iper-exec-equals|iper-exec-form-in-emacs|iper-exec-form-in-vi|iper-exec-key-in-emacs|iper-exec-mapped-kbd-macro|iper-exec-shift|iper-exec-yank|iper-execute-com|iper-exit-insert-state|iper-exit-minibuffer|iper-extract-matching-alist-members|iper-fast-keysequence-p|iper-file-add-suffix|iper-file-checked-in-p|iper-filter-alist|iper-filter-list|iper-find-best-matching-macro|iper-find-char-backward|iper-find-char-forward|iper-find-char|iper-finish-R-mode|iper-finish-change|iper-fixup-macro|iper-flash-search-pattern|iper-forward-Word|iper-forward-char-carefully|iper-forward-char|iper-forward-indent|iper-forward-paragraph|iper-forward-sentence|iper-forward-word-kernel|iper-forward-word|iper-frame-value|iper-get-cursor-color|iper-get-ex-address-subr|iper-get-ex-address|iper-get-ex-buffer|iper-get-ex-com-subr|iper-get-ex-count|iper-get-ex-file|iper-get-ex-opt-gc|iper-get-ex-pat|iper-get-ex-token|iper-get-face|iper-get-filenames-from-buffer|iper-get-saved-cursor-color-in-emacs-mode|iper-get-saved-cursor-color-in-insert-mode|iper-get-saved-cursor-color-in-replace-mode|iper-get-visible-buffer-window|iper-getCom|iper-getcom|iper-glob-mswindows-files|iper-glob-unix-files|iper-global-execute|iper-go-away|iper-goto-char-backward|iper-goto-char-forward|iper-goto-col|iper-goto-eol|iper-goto-line|iper-goto-mark-and-skip-white|iper-goto-mark-subr|iper-goto-mark|iper-handle-!|iper-harness-minor-mode|iper-has-face-support-p|iper-hash-command-p|iper-heading-end|iper-hide-replace-overlay|iper-hide-search-overlay|iper-iconify|iper-if-string|iper-indent-line|iper-info-on-file|iper-insert-isearch-string|iper-insert-next-from-insertion-ring|iper-insert-prev-from-insertion-ring|iper-insert-state-post-command-sentinel|iper-insert-state-pre-command-sentinel|iper-insert-tab|iper-insert|iper-int-to-char|iper-intercept-ESC-key|iper-is-in-minibuffer|iper-isearch-backward|iper-isearch-forward|iper-join-lines|iper-kbd-buf-alist|iper-kbd-buf-definition|iper-kbd-buf-pair|iper-kbd-global-definition|iper-kbd-global-pair|iper-kbd-mode-alist|iper-kbd-mode-definition|iper-kbd-mode-pair|iper-ket-function|iper-key-press-events-to-chars|iper-key-to-character|iper-key-to-emacs-key|iper-keyseq-is-a-possible-macro|iper-kill-buffer|iper-kill-line|iper-last-command-char|iper-leave-region-active|iper-line-pos|iper-line-to-bottom|iper-line-to-middle|iper-line-to-top|iper-line|iper-list-to-alist|iper-load-custom-file|iper-looking-at-alpha|iper-looking-at-alphasep|iper-looking-at-separator|iper-looking-back|iper-loop|iper-macro-to-events|iper-major-mode-change-sentinel|iper-make-overlay|iper-mark-beginning-of-buffer|iper-mark-end-of-buffer|iper-mark-marker|iper-mark-point|iper-maybe-checkout|iper-memq-char|iper-message-conditions|iper-minibuffer-post-command-hook|iper-minibuffer-real-start|iper-minibuffer-setup-sentinel|iper-minibuffer-standard-hook|iper-minibuffer-trim-tail|iper-mode|iper-modify-keymap|iper-modify-major-mode|iper-mouse-catch-frame-switch|iper-mouse-click-frame|iper-mouse-click-get-word|iper-mouse-click-insert-word|iper-mouse-click-posn|iper-mouse-click-search-word|iper-mouse-click-window-buffer-name|iper-mouse-click-window-buffer|iper-mouse-click-window|iper-mouse-event-p|iper-move-marker-locally|iper-move-overlay|iper-move-replace-overlay|iper-movement-command-p|iper-multiclick-p|iper-next-destructive-command|iper-next-heading|iper-next-line-at-bol|iper-next-line-carefully|iper-next-line|iper-nil|iper-non-hook-settings|iper-normalize-minor-mode-map-alist|iper-open-line-at-point|iper-open-line|iper-over-whitespace-line|iper-overlay-end|iper-overlay-get|iper-overlay-live-p|iper-overlay-p|iper-overlay-put|iper-overlay-start|iper-overwrite|iper-p-val|iper-paren-match|iper-parse-mouse-key|iper-pos-within-region|iper-post-command-sentinel|iper-pre-command-sentinel|iper-prefix-arg-com|iper-prefix-arg-value|iper-prefix-command-p|iper-prefix-subseq-p|iper-preserve-cursor-color|iper-prev-destructive-command|iper-prev-heading|iper-previous-line-at-bol|iper-previous-line|iper-push-onto-ring|iper-put-back|iper-put-on-search-overlay|iper-put-string-on-kill-ring|iper-query-replace|iper-quote-region|iper-read-char-exclusive|iper-read-event-convert-to-char|iper-read-event|iper-read-fast-keysequence|iper-read-key-sequence|iper-read-key|iper-read-string-with-history|iper-record-kbd-macro|iper-refresh-mode-line|iper-region|iper-register-macro|iper-register-to-point|iper-regsuffix-command-p|iper-remember-current-frame|iper-remove-hooks|iper-repeat-find-opposite|iper-repeat-find|iper-repeat-from-history|iper-repeat-insert-command|iper-repeat|iper-replace-char-subr|iper-replace-char|iper-replace-end|iper-replace-mode-spy-after|iper-replace-mode-spy-before|iper-replace-start|iper-replace-state-carriage-return|iper-replace-state-exit-cmd|iper-replace-state-post-command-sentinel|iper-replace-state-pre-command-sentinel|iper-reset-mouse-insert-key|iper-reset-mouse-search-key|iper-restore-cursor-color|iper-restore-cursor-type|iper-ring-insert|iper-ring-pop|iper-ring-rotate1|iper-same-line|iper-save-cursor-color|iper-save-kill-buffer|iper-save-last-insertion|iper-save-setting|iper-save-string-in-file|iper-scroll-down-one|iper-scroll-down|iper-scroll-screen-back|iper-scroll-screen|iper-scroll-up-one|iper-scroll-up|iper-search-Next|iper-search-backward|iper-search-forward|iper-search-next|iper-search|iper-separator-skipback-special|iper-seq-last-elt|iper-set-complex-command-for-undo|iper-set-cursor-color-according-to-state|iper-set-destructive-command|iper-set-emacs-state-searchstyle-macros|iper-set-expert-level|iper-set-hooks|iper-set-input-method|iper-set-insert-cursor-type|iper-set-iso-accents-mode|iper-set-mark-if-necessary|iper-set-minibuffer-overlay|iper-set-minibuffer-style|iper-set-mode-vars-for|iper-set-parsing-style-toggling-macro|iper-set-register-macro|iper-set-replace-overlay-glyphs|iper-set-replace-overlay|iper-set-searchstyle-toggling-macros|iper-set-syntax-preference|iper-set-unread-command-events|iper-setup-ESC-to-escape|iper-setup-master-buffer|iper-sit-for-short|iper-skip-all-separators-backward|iper-skip-all-separators-forward|iper-skip-alpha-backward|iper-skip-alpha-forward|iper-skip-nonalphasep-backward|iper-skip-nonalphasep-forward|iper-skip-nonseparators|iper-skip-separators|iper-skip-syntax|iper-special-prefix-com|iper-special-read-and-insert-char|iper-special-ring-rotate1|iper-standard-value|iper-start-R-mode|iper-start-replace|iper-string-to-list|iper-submit-report|iper-subseq|iper-substitute-line|iper-substitute|iper-surrounding-word|iper-switch-to-buffer-other-window|iper-switch-to-buffer|iper-test-com-defun|iper-this-buffer-macros|iper-tmp-insert-at-eob|iper-toggle-case|iper-toggle-key-action|iper-toggle-parse-sexp-ignore-comments)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         },
         {
@@ -1285,7 +1285,7 @@
           "name": "support.function.emacs.lisp"
         },
         {
-          "match": "(?<=[()]|^)(?:woman-expand-directory-path|woman-expand-locale|woman-file-accessible-directory-p|woman-file-name-all-completions|woman-file-name|woman-file-readable-p|woman-find-file|woman-find-next-control-line-carefully|woman-find-next-control-line|woman-follow-word|woman-follow|woman-forward-arg|woman-get-next-char|woman-get-numeric-arg|woman-get-tab-stop|woman-horizontal-escapes|woman-horizontal-line|woman-if-body|woman-if-ignore|woman-imenu|woman-insert-file-contents|woman-interparagraph-space|woman-interpolate-macro|woman-leave-blank-lines|woman-make-bufname|woman-man-buffer|woman-manpath-add-locales|woman-mark-horizontal-position|woman-match-name|woman-menu|woman-mini-help|woman-mode|woman-monochrome-faces|woman-negative-vertical-space|woman-non-underline-faces|woman-not-member|woman-parse-colon-path|woman-parse-man\\.conf|woman-parse-numeric-arg|woman-parse-numeric-value|woman-pop|woman-pre-process-region|woman-process-buffer|woman-push|woman-read-directory-cache|woman-really-find-file|woman-reformat-last-file|woman-replace-match|woman-reset-emulation|woman-reset-nospace|woman-select-symbol-fonts|woman-select|woman-set-arg|woman-set-buffer-display-table|woman-set-face|woman-set-interparagraph-distance|woman-special-characters|woman-strings|woman-tab-to-tab-stop|woman-tar-extract-file|woman-toggle-fill-frame|woman-toggle-use-extended-font|woman-toggle-use-symbol-font|woman-topic-all-completions-1|woman-topic-all-completions-merge|woman-topic-all-completions|woman-translate|woman-unescape|woman-unquote-args|woman-unquote|woman-write-directory-cache|woman|woman0-de|woman0-el|woman0-if|woman0-ig|woman0-macro|woman0-process-escapes|woman0-rename|woman0-rn|woman0-roff-buffer|woman0-so|woman1-B-or-I|woman1-B|woman1-BI|woman1-BR|woman1-I|woman1-IB|woman1-IR|woman1-IX|woman1-RB|woman1-RI|woman1-SB|woman1-SM|woman1-TP|woman1-TX|woman1-alt-fonts|woman1-bd|woman1-cs|woman1-hc|woman1-hw|woman1-hy|woman1-ne|woman1-nh|woman1-ps|woman1-roff-buffer|woman1-ss|woman1-ul|woman1-vs|woman2-DT|woman2-HP|woman2-IP|woman2-LP|woman2-P|woman2-PD|woman2-PP|woman2-RE|woman2-RS|woman2-SH|woman2-SS|woman2-TE|woman2-TH|woman2-TP|woman2-TS|woman2-ad|woman2-br|woman2-fc|woman2-fi|woman2-format-paragraphs|woman2-get-prevailing-indent|woman2-in|woman2-ll|woman2-na|woman2-nf|woman2-nr|woman2-ns|woman2-process-escapes-to-eol|woman2-process-escapes|woman2-roff-buffer|woman2-rs|woman2-sp|woman2-ta|woman2-tagged-paragraph|woman2-ti|woman2-tr|word-at-point|x-apply-session-resources|x-backspace-delete-keys-p|x-change-window-property|x-clipboard-yank|x-complement-fontset-spec|x-compose-font-name|x-create-frame-with-faces|x-create-frame|x-cut-buffer-or-selection-value|x-decompose-font-name|x-delete-window-property|x-disown-selection-internal|x-display-backing-store|x-display-color-cells|x-display-grayscale-p|x-display-mm-height|x-display-mm-width|x-display-monitor-attributes-list|x-display-pixel-height|x-display-pixel-width|x-display-planes|x-display-save-under|x-display-screens|x-display-visual-class|x-dnd-choose-type|x-dnd-current-type|x-dnd-default-test-function|x-dnd-drop-data|x-dnd-forget-drop|x-dnd-get-drop-width-height|x-dnd-get-drop-x-y|x-dnd-get-motif-value|x-dnd-get-state-cons-for-frame|x-dnd-get-state-for-frame|x-dnd-handle-drag-n-drop-event|x-dnd-handle-file-name|x-dnd-handle-motif|x-dnd-handle-moz-url|x-dnd-handle-old-kde|x-dnd-handle-uri-list|x-dnd-handle-xdnd|x-dnd-init-frame|x-dnd-init-motif-for-frame|x-dnd-init-xdnd-for-frame|x-dnd-insert-ctext|x-dnd-insert-utf16-text|x-dnd-insert-utf8-text|x-dnd-maybe-call-test-function|x-dnd-more-than-3-from-flags|x-dnd-motif-value-to-list|x-dnd-save-state|x-dnd-version-from-flags|x-file-dialog|x-focus-frame|x-frame-geometry|x-get-atom-name|x-get-clipboard|x-get-selection-internal|x-get-selection-value|x-gtk-map-stock|x-handle-args|x-handle-display|x-handle-geometry|x-handle-iconic|x-handle-initial-switch|x-handle-name-switch|x-handle-named-frame-geometry|x-handle-no-bitmap-icon|x-handle-numeric-switch|x-handle-parent-id|x-handle-reverse-video|x-handle-smid|x-handle-switch|x-handle-xrm-switch|x-hide-tip|x-initialize-window-system|x-menu-bar-open-internal|x-menu-bar-open|x-must-resolve-font-name|x-own-selection-internal|x-register-dnd-atom|x-resolve-font-name|x-select-font|x-select-text|x-selection-exists-p|x-selection-owner-p|x-selection-value|x-selection|x-send-client-message|x-server-max-request-size|x-show-tip|x-synchronize|x-uses-old-gtk-dialog|x-win-suspend-error|x-window-property|x-wm-set-size-hint|xdb|xml--entity-replacement-text|xml--parse-buffer|xml-debug-print-internal|xml-debug-print|xml-escape-string|xml-find-file-coding-system|xml-get-attribute-or-nil|xml-get-attribute|xml-get-children|xml-maybe-do-ns|xml-mode|xml-node-attributes|xml-node-children|xml-node-name|xml-parse-attlist|xml-parse-dtd|xml-parse-elem-type|xml-parse-file|xml-parse-region|xml-parse-string|xml-parse-tag-1|xml-parse-tag|xml-print|xml-skip-dtd|xml-substitute-numeric-entities|xml-substitute-special|xmltok-get-declared-encoding-position|xor|xref--alistify|xref--analyze|xref--display-position|xref--find-definitions|xref--goto-location|xref--insert-propertized|xref--insert-xrefs|xref--location-at-point|xref--next-line|xref--pop-to-location|xref--read-identifier|xref--search-property|xref--show-location|xref--show-xref-buffer|xref--show-xrefs|xref--xref-buffer-mode|xref--xref-child-p|xref--xref-description|xref--xref-list-p|xref--xref-location|xref--xref-p|xref--xref|xref-bogus-location-child-p|xref-bogus-location-list-p|xref-bogus-location-message|xref-bogus-location-p|xref-bogus-location|xref-buffer-location-child-p|xref-buffer-location-list-p|xref-buffer-location-p|xref-buffer-location|xref-clear-marker-stack|xref-default-identifier-at-point|xref-elisp-location-child-p|xref-elisp-location-list-p|xref-elisp-location-p|xref-elisp-location|xref-file-location-child-p|xref-file-location-list-p|xref-file-location-p|xref-file-location|xref-find-apropos|xref-find-definitions-other-frame|xref-find-definitions-other-window|xref-find-definitions|xref-find-references|xref-goto-xref|xref-location-child-p|xref-location-group|xref-location-list-p|xref-location-marker|xref-location-p|xref-location|xref-make-bogus-location|xref-make-buffer-location|xref-make-elisp-location|xref-make-file-location|xref-make|xref-next-line|xref-pop-marker-stack|xref-prev-line|xref-push-marker-stack|xscheme-cd|xscheme-coerce-prompt|xscheme-debugger-mode-p|xscheme-default-command-line|xscheme-delete-output|xscheme-display-process-buffer|xscheme-enable-control-g|xscheme-enter-debugger-mode|xscheme-enter-input-wait|xscheme-enter-interaction-mode|xscheme-eval|xscheme-evaluation-commands|xscheme-exit-input-wait|xscheme-finish-gc|xscheme-goto-output-point|xscheme-guarantee-newlines|xscheme-insert-expression|xscheme-interrupt-commands|xscheme-message|xscheme-mode-line-initialize|xscheme-output-goto|xscheme-parse-command-line|xscheme-process-buffer-current-p|xscheme-process-buffer-window|xscheme-process-buffer|xscheme-process-filter-initialize|xscheme-process-filter-output|xscheme-process-filter|xscheme-process-filter:simple-action|xscheme-process-filter:string-action-noexcursion|xscheme-process-filter:string-action|xscheme-process-running-p|xscheme-process-sentinel|xscheme-prompt-for-confirmation|xscheme-prompt-for-expression-exit|xscheme-prompt-for-expression|xscheme-read-command-line|xscheme-region-expression-p|xscheme-rotate-yank-pointer|xscheme-select-process-buffer|xscheme-send-breakpoint-interrupt|xscheme-send-buffer|xscheme-send-char|xscheme-send-control-g-interrupt|xscheme-send-control-u-interrupt|xscheme-send-control-x-interrupt|xscheme-send-current-line|xscheme-send-definition|xscheme-send-interrupt|xscheme-send-next-expression|xscheme-send-previous-expression|xscheme-send-proceed|xscheme-send-region|xscheme-send-string-1|xscheme-send-string-2|xscheme-send-string|xscheme-set-prompt-variable|xscheme-set-prompt|xscheme-set-runlight|xscheme-start-gc|xscheme-start-process|xscheme-start|xscheme-unsolicited-read-char|xscheme-wait-for-process|xscheme-write-message-1|xscheme-write-value|xscheme-yank-pop|xscheme-yank-previous-send|xscheme-yank-push|xscheme-yank|xselect--encode-string|xselect--int-to-cons|xselect--selection-bounds|xselect-convert-to-atom|xselect-convert-to-charpos|xselect-convert-to-class|xselect-convert-to-colno|xselect-convert-to-delete|xselect-convert-to-filename|xselect-convert-to-host|xselect-convert-to-identity|xselect-convert-to-integer|xselect-convert-to-length|xselect-convert-to-lineno|xselect-convert-to-name|xselect-convert-to-os|xselect-convert-to-save-targets|xselect-convert-to-string|xselect-convert-to-targets|xselect-convert-to-user|xterm-mouse--read-event-sequence-1000|xterm-mouse--read-event-sequence-1006|xterm-mouse--set-click-count|xterm-mouse-event|xterm-mouse-mode|xterm-mouse-position-function|xterm-mouse-translate-1|xterm-mouse-translate-extended|xterm-mouse-translate|xterm-mouse-truncate-wrap|xw-color-defined-p|xw-color-values|xw-defined-colors|xw-display-color-p|yank-handle-category-property|yank-handle-font-lock-face-property|yank-menu|yank-rectangle|yenc-decode-region|yenc-extract-filename|zap-to-char|zeroconf-get-domain|zeroconf-get-host-domain|zeroconf-get-host|zeroconf-get-interface-name|zeroconf-get-interface-number|zeroconf-get-service|zeroconf-init|zeroconf-list-service-names|zeroconf-list-service-types|zeroconf-list-services|zeroconf-publish-service|zeroconf-register-service-browser|zeroconf-register-service-resolver|zeroconf-register-service-type-browser|zeroconf-resolve-service|zeroconf-service-add-hook|zeroconf-service-address|zeroconf-service-aprotocol|zeroconf-service-browser-handler|zeroconf-service-domain|zeroconf-service-flags|zeroconf-service-host|zeroconf-service-interface|zeroconf-service-name|zeroconf-service-port|zeroconf-service-protocol|zeroconf-service-remove-hook|zeroconf-service-resolver-handler|zeroconf-service-txt|zeroconf-service-type-browser-handler|zeroconf-service-type|zerop--anon-cmacro|zone-call|zone-cpos|zone-exploding-remove|zone-fall-through-ws|zone-fill-out-screen|zone-fret|zone-hiding-mode-line|zone-leave-me-alone|zone-line-specs|zone-mode|zone-orig|zone-park\\/sit-for|zone-pgm-2nd-putz-with-case|zone-pgm-dissolve|zone-pgm-drip-fretfully|zone-pgm-drip|zone-pgm-explode|zone-pgm-five-oclock-swan-dive|zone-pgm-jitter|zone-pgm-martini-swan-dive|zone-pgm-paragraph-spaz|zone-pgm-putz-with-case|zone-pgm-random-life|zone-pgm-rat-race|zone-pgm-rotate-LR-lockstep|zone-pgm-rotate-LR-variable|zone-pgm-rotate-RL-lockstep|zone-pgm-rotate-RL-variable|zone-pgm-rotate|zone-pgm-stress-destress|zone-pgm-stress|zone-pgm-whack-chars|zone-remove-text|zone-replace-char|zone-shift-down|zone-shift-left|zone-shift-right|zone-shift-up|zone-when-idle|zone|zrgrep)(?=[\\s()]|$)",
+          "match": "(?<=[()]|^)(?:woman-expand-directory-path|woman-expand-locale|woman-file-accessible-directory-p|woman-file-name-all-completions|woman-file-name|woman-file-readable-p|woman-find-file|woman-find-next-control-line-carefully|woman-find-next-control-line|woman-follow-word|woman-follow|woman-forward-arg|woman-get-next-char|woman-get-numeric-arg|woman-get-tab-stop|woman-horizontal-escapes|woman-horizontal-line|woman-if-body|woman-if-ignore|woman-imenu|woman-insert-file-contents|woman-interparagraph-space|woman-interpolate-macro|woman-leave-blank-lines|woman-make-bufname|woman-man-buffer|woman-manpath-add-locales|woman-mark-horizontal-position|woman-match-name|woman-menu|woman-mini-help|woman-mode|woman-monochrome-faces|woman-negative-vertical-space|woman-non-underline-faces|woman-not-member|woman-parse-colon-path|woman-parse-man\\.conf|woman-parse-numeric-arg|woman-parse-numeric-value|woman-pop|woman-pre-process-region|woman-process-buffer|woman-push|woman-read-directory-cache|woman-really-find-file|woman-reformat-last-file|woman-replace-match|woman-reset-emulation|woman-reset-nospace|woman-select-symbol-fonts|woman-select|woman-set-arg|woman-set-buffer-display-table|woman-set-face|woman-set-interparagraph-distance|woman-special-characters|woman-strings|woman-tab-to-tab-stop|woman-tar-extract-file|woman-toggle-fill-frame|woman-toggle-use-extended-font|woman-toggle-use-symbol-font|woman-topic-all-completions-1|woman-topic-all-completions-merge|woman-topic-all-completions|woman-translate|woman-unescape|woman-unquote-args|woman-unquote|woman-write-directory-cache|woman|woman0-de|woman0-el|woman0-if|woman0-ig|woman0-macro|woman0-process-escapes|woman0-rename|woman0-rn|woman0-roff-buffer|woman0-so|woman1-B-or-I|woman1-B|woman1-BI|woman1-BR|woman1-I|woman1-IB|woman1-IR|woman1-IX|woman1-RB|woman1-RI|woman1-SB|woman1-SM|woman1-TP|woman1-TX|woman1-alt-fonts|woman1-bd|woman1-cs|woman1-hc|woman1-hw|woman1-hy|woman1-ne|woman1-nh|woman1-ps|woman1-roff-buffer|woman1-ss|woman1-ul|woman1-vs|woman2-DT|woman2-HP|woman2-IP|woman2-LP|woman2-P|woman2-PD|woman2-PP|woman2-RE|woman2-RS|woman2-SH|woman2-SS|woman2-TE|woman2-TH|woman2-TP|woman2-TS|woman2-ad|woman2-br|woman2-fc|woman2-fi|woman2-format-paragraphs|woman2-get-prevailing-indent|woman2-in|woman2-ll|woman2-na|woman2-nf|woman2-nr|woman2-ns|woman2-process-escapes-to-eol|woman2-process-escapes|woman2-roff-buffer|woman2-rs|woman2-sp|woman2-ta|woman2-tagged-paragraph|woman2-ti|woman2-tr|word-at-point|x-apply-session-resources|x-backspace-delete-keys-p|x-change-window-property|x-clipboard-yank|x-complement-fontset-spec|x-compose-font-name|x-create-frame-with-faces|x-create-frame|x-cut-buffer-or-selection-value|x-decompose-font-name|x-delete-window-property|x-disown-selection-internal|x-display-backing-store|x-display-color-cells|x-display-grayscale-p|x-display-mm-height|x-display-mm-width|x-display-monitor-attributes-list|x-display-pixel-height|x-display-pixel-width|x-display-planes|x-display-save-under|x-display-screens|x-display-visual-class|x-dnd-choose-type|x-dnd-current-type|x-dnd-default-test-function|x-dnd-drop-data|x-dnd-forget-drop|x-dnd-get-drop-width-height|x-dnd-get-drop-x-y|x-dnd-get-motif-value|x-dnd-get-state-cons-for-frame|x-dnd-get-state-for-frame|x-dnd-handle-drag-n-drop-event|x-dnd-handle-file-name|x-dnd-handle-motif|x-dnd-handle-moz-url|x-dnd-handle-old-kde|x-dnd-handle-uri-list|x-dnd-handle-xdnd|x-dnd-init-frame|x-dnd-init-motif-for-frame|x-dnd-init-xdnd-for-frame|x-dnd-insert-ctext|x-dnd-insert-utf16-text|x-dnd-insert-utf8-text|x-dnd-maybe-call-test-function|x-dnd-more-than-3-from-flags|x-dnd-motif-value-to-list|x-dnd-save-state|x-dnd-version-from-flags|x-file-dialog|x-focus-frame|x-frame-geometry|x-get-atom-name|x-get-clipboard|x-get-selection-internal|x-get-selection-value|x-gtk-map-stock|x-handle-args|x-handle-display|x-handle-geometry|x-handle-iconic|x-handle-initial-switch|x-handle-name-switch|x-handle-named-frame-geometry|x-handle-no-bitmap-icon|x-handle-numeric-switch|x-handle-parent-id|x-handle-reverse-video|x-handle-smid|x-handle-switch|x-handle-xrm-switch|x-hide-tip|x-initialize-window-system|x-menu-bar-open-internal|x-menu-bar-open|x-must-resolve-font-name|x-own-selection-internal|x-register-dnd-atom|x-resolve-font-name|x-select-font|x-select-text|x-selection-exists-p|x-selection-owner-p|x-selection-value|x-selection|x-send-client-message|x-server-max-request-size|x-show-tip|x-synchronize|x-uses-old-gtk-dialog|x-win-suspend-error|x-window-property|x-wm-set-size-hint|xdb|xml--entity-replacement-text|xml--parse-buffer|xml-debug-print-internal|xml-debug-print|xml-escape-string|xml-find-file-coding-system|xml-get-attribute-or-nil|xml-get-attribute|xml-get-children|xml-maybe-do-ns|xml-mode|xml-node-attributes|xml-node-children|xml-node-name|xml-parse-attlist|xml-parse-dtd|xml-parse-elem-type|xml-parse-file|xml-parse-region|xml-parse-string|xml-parse-tag-1|xml-parse-tag|xml-print|xml-skip-dtd|xml-substitute-numeric-entities|xml-substitute-special|xmltok-get-declared-encoding-position|xor|xref--alistify|xref--analyze|xref--display-position|xref--find-definitions|xref--goto-location|xref--insert-propertized|xref--insert-xrefs|xref--location-at-point|xref--next-line|xref--pop-to-location|xref--read-identifier|xref--search-property|xref--show-location|xref--show-xref-buffer|xref--show-xrefs|xref--xref-buffer-mode|xref--xref-child-p|xref--xref-description|xref--xref-list-p|xref--xref-location|xref--xref-p|xref--xref|xref-bogus-location-child-p|xref-bogus-location-list-p|xref-bogus-location-message|xref-bogus-location-p|xref-bogus-location|xref-buffer-location-child-p|xref-buffer-location-list-p|xref-buffer-location-p|xref-buffer-location|xref-clear-marker-stack|xref-default-identifier-at-point|xref-elisp-location-child-p|xref-elisp-location-list-p|xref-elisp-location-p|xref-elisp-location|xref-file-location-child-p|xref-file-location-list-p|xref-file-location-p|xref-file-location|xref-find-apropos|xref-find-definitions-other-frame|xref-find-definitions-other-window|xref-find-definitions|xref-find-references|xref-goto-xref|xref-location-child-p|xref-location-group|xref-location-list-p|xref-location-marker|xref-location-p|xref-location|xref-make-bogus-location|xref-make-buffer-location|xref-make-elisp-location|xref-make-file-location|xref-make|xref-next-line|xref-pop-marker-stack|xref-prev-line|xref-push-marker-stack|xscheme-cd|xscheme-coerce-prompt|xscheme-debugger-mode-p|xscheme-default-command-line|xscheme-delete-output|xscheme-display-process-buffer|xscheme-enable-control-g|xscheme-enter-debugger-mode|xscheme-enter-input-wait|xscheme-enter-interaction-mode|xscheme-eval|xscheme-evaluation-commands|xscheme-exit-input-wait|xscheme-finish-gc|xscheme-goto-output-point|xscheme-guarantee-newlines|xscheme-insert-expression|xscheme-interrupt-commands|xscheme-message|xscheme-mode-line-initialize|xscheme-output-goto|xscheme-parse-command-line|xscheme-process-buffer-current-p|xscheme-process-buffer-window|xscheme-process-buffer|xscheme-process-filter-initialize|xscheme-process-filter-output|xscheme-process-filter|xscheme-process-filter:simple-action|xscheme-process-filter:string-action-noexcursion|xscheme-process-filter:string-action|xscheme-process-running-p|xscheme-process-sentinel|xscheme-prompt-for-confirmation|xscheme-prompt-for-expression-exit|xscheme-prompt-for-expression|xscheme-read-command-line|xscheme-region-expression-p|xscheme-rotate-yank-pointer|xscheme-select-process-buffer|xscheme-send-breakpoint-interrupt|xscheme-send-buffer|xscheme-send-char|xscheme-send-control-g-interrupt|xscheme-send-control-u-interrupt|xscheme-send-control-x-interrupt|xscheme-send-current-line|xscheme-send-definition|xscheme-send-interrupt|xscheme-send-next-expression|xscheme-send-previous-expression|xscheme-send-proceed|xscheme-send-region|xscheme-send-string-1|xscheme-send-string-2|xscheme-send-string|xscheme-set-prompt-variable|xscheme-set-prompt|xscheme-set-runlight|xscheme-start-gc|xscheme-start-process|xscheme-start|xscheme-unsolicited-read-char|xscheme-wait-for-process|xscheme-write-message-1|xscheme-write-value|xscheme-yank-pop|xscheme-yank-previous-send|xscheme-yank-push|xscheme-yank|xselect--encode-string|xselect--int-to-cons|xselect--selection-bounds|xselect-convert-to-atom|xselect-convert-to-charpos|xselect-convert-to-class|xselect-convert-to-colno|xselect-convert-to-delete|xselect-convert-to-filename|xselect-convert-to-host|xselect-convert-to-identity|xselect-convert-to-integer|xselect-convert-to-length|xselect-convert-to-lineno|xselect-convert-to-name|xselect-convert-to-os|xselect-convert-to-save-targets|xselect-convert-to-string|xselect-convert-to-targets|xselect-convert-to-user|xterm-mouse--read-event-sequence-1000|xterm-mouse--read-event-sequence-1006|xterm-mouse--set-click-count|xterm-mouse-event|xterm-mouse-mode|xterm-mouse-position-function|xterm-mouse-translate-1|xterm-mouse-translate-extended|xterm-mouse-translate|xterm-mouse-truncate-wrap|xw-color-defined-p|xw-color-values|xw-defined-colors|xw-display-color-p|yank-handle-category-property|yank-handle-font-lock-face-property|yank-menu|yank-rectangle|yenc-decode-region|yenc-extract-filename|zap-to-char|zeroconf-get-domain|zeroconf-get-host-domain|zeroconf-get-host|zeroconf-get-interface-name|zeroconf-get-interface-number|zeroconf-get-service|zeroconf-init|zeroconf-list-service-names|zeroconf-list-service-types|zeroconf-list-services|zeroconf-publish-service|zeroconf-register-service-browser|zeroconf-register-service-resolver|zeroconf-register-service-type-browser|zeroconf-resolve-service|zeroconf-service-add-hook|zeroconf-service-address|zeroconf-service-aprotocol|zeroconf-service-browser-handler|zeroconf-service-domain|zeroconf-service-flags|zeroconf-service-host|zeroconf-service-interface|zeroconf-service-name|zeroconf-service-port|zeroconf-service-protocol|zeroconf-service-remove-hook|zeroconf-service-resolver-handler|zeroconf-service-txt|zeroconf-service-type-browser-handler|zeroconf-service-type|zerop--anon-cmacro|zone-call|zone-cpos|zone-exploding-remove|zone-fall-through-ws|zone-fill-out-screen|zone-fret|zone-hiding-mode-line|zone-leave-me-alone|zone-line-specs|zone-mode|zone-orig|zone-park/sit-for|zone-pgm-2nd-putz-with-case|zone-pgm-dissolve|zone-pgm-drip-fretfully|zone-pgm-drip|zone-pgm-explode|zone-pgm-five-oclock-swan-dive|zone-pgm-jitter|zone-pgm-martini-swan-dive|zone-pgm-paragraph-spaz|zone-pgm-putz-with-case|zone-pgm-random-life|zone-pgm-rat-race|zone-pgm-rotate-LR-lockstep|zone-pgm-rotate-LR-variable|zone-pgm-rotate-RL-lockstep|zone-pgm-rotate-RL-variable|zone-pgm-rotate|zone-pgm-stress-destress|zone-pgm-stress|zone-pgm-whack-chars|zone-remove-text|zone-replace-char|zone-shift-down|zone-shift-left|zone-shift-right|zone-shift-up|zone-when-idle|zone|zrgrep)(?=[\\s()]|$)",
           "name": "support.function.emacs.lisp"
         }
       ]
@@ -1354,7 +1354,7 @@
               ]
             }
           },
-          "match": "(?<=[\\s()\\[]|^)(#)((?:[-'+=*/\\w~!@$%^&:<>{}?]|\\\\.)+)",
+          "match": "(?<=[\\s()\\[]|^)(#)((?:[-'+=*/\\w~!@$%^\\&:<>{}?]|\\\\.)+)",
           "name": "constant.other.symbol.emacs.lisp"
         },
         {
@@ -1363,7 +1363,7 @@
               "name": "punctuation.definition.spliced.symbol.emacs.lisp"
             }
           },
-          "match": "(,@)([-+=*/\\w~!@$%^&:<>{}?]+)",
+          "match": "(,@)([-+=*/\\w~!@$%^\\&:<>{}?]+)",
           "name": "constant.other.spliced.symbol.emacs.lisp"
         },
         {
@@ -1372,7 +1372,7 @@
               "name": "punctuation.definition.inserted.symbol.emacs.lisp"
             }
           },
-          "match": "(,)([-+=*/\\w~!@$%^&:<>{}?]+)",
+          "match": "(,)([-+=*/\\w~!@$%^\\&:<>{}?]+)",
           "name": "constant.other.inserted.symbol.emacs.lisp"
         }
       ]
@@ -1384,7 +1384,7 @@
           "name": "punctuation.section.vector.begin.emacs.lisp"
         },
         {
-          "match": "\\]",
+          "match": "]",
           "name": "punctuation.section.vector.end.emacs.lisp"
         }
       ]
diff --git a/resources/languages/erlang.json b/resources/languages/erlang.json
index fe3c26e..529104a 100644
--- a/resources/languages/erlang.json
+++ b/resources/languages/erlang.json
@@ -283,7 +283,7 @@
               ]
             },
             {
-              "match": "\\|\\||\\||:|;|,|\\.|->",
+              "match": "\\|\\||[|:;,.]|->",
               "name": "punctuation.separator.define.erlang"
             },
             {
@@ -342,7 +342,7 @@
       ]
     },
     "docstring": {
-      "begin": "(?<!\")(([\"]{3,})\\s*)(\\S.*)?$",
+      "begin": "(?<!\")((\"{3,})\\s*)(\\S.*)?$",
       "beginCaptures": {
         "1": {
           "name": "meta.string.quoted.triple.begin.erlang"
@@ -354,7 +354,6 @@
           "name": "invalid.illegal.string.erlang"
         }
       },
-      "comment": "Only whitespace characters are allowed after the beggining and before the closing sequences and those cannot be in the same line",
       "end": "^(\\s*(\\2))(?!\")",
       "endCaptures": {
         "1": {
@@ -528,7 +527,6 @@
               "name": "variable.other.erlang"
             }
           },
-          "comment": "Implicit function expression with optional module qualifier when both module and function can be atom or variable",
           "match": "\\b(fun)\\s+((([a-z][a-zA-Z\\d@_]*+)|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*+(:)\\s*+)?(([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*(/)",
           "name": "meta.expression.fun.implicit.erlang"
         },
@@ -548,7 +546,6 @@
               "name": "punctuation.separator.module-function.erlang"
             }
           },
-          "comment": "Implicit function expression with module qualifier when module can be atom or variable and function can by anything",
           "end": "(/)",
           "endCaptures": {
             "1": {
@@ -569,7 +566,6 @@
               "name": "keyword.control.fun.erlang"
             }
           },
-          "comment": "Implicit function expression when both module and function can by anything",
           "end": "(/)",
           "endCaptures": {
             "1": {
@@ -593,7 +589,6 @@
               "name": "punctuation.definition.parameters.begin.erlang"
             }
           },
-          "comment": "Function type in type specification",
           "end": "(\\))",
           "endCaptures": {
             "1": {
@@ -613,7 +608,6 @@
               "name": "keyword.control.fun.erlang"
             }
           },
-          "comment": "Explicit function expression",
           "end": "\\b(end)\\b",
           "endCaptures": {
             "1": {
@@ -918,7 +912,7 @@
           "name": "punctuation.definition.list.begin.erlang"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.list.end.erlang"
@@ -936,7 +930,7 @@
               "name": "punctuation.separator.function-arity.erlang"
             }
           },
-          "end": "(,)|(?=\\])",
+          "end": "(,)|(?=])",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.list.erlang"
@@ -988,7 +982,7 @@
               ]
             },
             {
-              "match": ",|;",
+              "match": "[,;]",
               "name": "punctuation.separator.guards.erlang"
             },
             {
@@ -1012,7 +1006,7 @@
           "name": "punctuation.definition.class.record.begin.erlang"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.class.record.end.erlang"
@@ -1030,7 +1024,7 @@
               "name": "variable.language.omitted.field.erlang"
             }
           },
-          "end": "(,)|(?=\\})",
+          "end": "(,)|(?=})",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.class.record.erlang"
@@ -1058,7 +1052,6 @@
               "name": "punctuation.definition.escape.erlang"
             }
           },
-          "comment": "escape sequence",
           "match": "(\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_a-z]|[0-7]{1,3}|x[\\da-fA-F]{2})",
           "name": "constant.character.escape.erlang"
         },
@@ -1078,8 +1071,7 @@
               "name": "punctuation.separator.placeholder-parts.erlang"
             }
           },
-          "comment": "io:fwrite format control sequence",
-          "match": "(~)((\\-)?\\d++|(\\*))?((\\.)(\\d++|(\\*))?((\\.)((\\*)|.))?)?[tlkK]*[~cfegswpWPBX#bx\\+ni]",
+          "match": "(~)((-)?\\d++|(\\*))?((\\.)(\\d++|(\\*))?((\\.)((\\*)|.))?)?[tlkK]*[~cfegswpWPBX#bx+ni]",
           "name": "constant.character.format.placeholder.other.erlang"
         },
         {
@@ -1088,7 +1080,6 @@
               "name": "punctuation.definition.placeholder.erlang"
             }
           },
-          "comment": "io:fread format control sequence",
           "match": "(~)(\\*)?(\\d++)?(t)?[~du\\-#fsacl]",
           "name": "constant.character.format.placeholder.other.erlang"
         },
@@ -1105,7 +1096,7 @@
           "name": "punctuation.separator.value-type.erlang"
         }
       },
-      "end": "(?=,|:|>>)",
+      "end": "(?=[,:]|>>)",
       "patterns": [
         {
           "captures": {
@@ -1150,7 +1141,7 @@
           "name": "punctuation.definition.list.begin.erlang"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.list.end.erlang"
@@ -1292,7 +1283,7 @@
               "name": "punctuation.separator.float-exponent.erlang"
             }
           },
-          "match": "\\d++(\\.)\\d++([eE][\\+\\-]?\\d++)?",
+          "match": "\\d++(\\.)\\d++([eE][+-]?\\d++)?",
           "name": "constant.numeric.float.erlang"
         },
         {
@@ -1708,7 +1699,7 @@
               "name": "entity.name.type.class.record.erlang"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "name": "meta.record-usage.erlang",
           "patterns": [
             {
@@ -1719,7 +1710,7 @@
       ]
     },
     "sigil-docstring": {
-      "begin": "(~[bBsS]?)(([\"]{3,})\\s*)(\\S.*)?$",
+      "begin": "(~[bBsS]?)((\"{3,})\\s*)(\\S.*)?$",
       "beginCaptures": {
         "1": {
           "name": "storage.type.string.erlang"
@@ -1734,7 +1725,6 @@
           "name": "invalid.illegal.string.erlang"
         }
       },
-      "comment": "Only whitespace characters are allowed after the beggining and before the closing sequences and those cannot be in the same line",
       "end": "^(\\s*(\\3))(?!\")",
       "endCaptures": {
         "1": {
@@ -1793,7 +1783,7 @@
       ]
     },
     "sigil-string-curly-brackets": {
-      "begin": "(~[bs]?)([{])",
+      "begin": "(~[bs]?)(\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.string.erlang"
@@ -1802,7 +1792,7 @@
           "name": "punctuation.definition.string.begin.erlang"
         }
       },
-      "end": "([}])",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.erlang"
@@ -1816,7 +1806,7 @@
       ]
     },
     "sigil-string-curly-brackets-verbatim": {
-      "begin": "(~[BS])([{])",
+      "begin": "(~[BS])(\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.string.erlang"
@@ -1825,7 +1815,7 @@
           "name": "punctuation.definition.string.begin.erlang"
         }
       },
-      "end": "([}])",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.erlang"
@@ -1916,7 +1906,7 @@
       "name": "string.quoted.less-greater.sigil.erlang"
     },
     "sigil-string-parenthesis": {
-      "begin": "(~[bs]?)([(])",
+      "begin": "(~[bs]?)(\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.string.erlang"
@@ -1925,7 +1915,7 @@
           "name": "punctuation.definition.string.begin.erlang"
         }
       },
-      "end": "([)])",
+      "end": "(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.erlang"
@@ -1939,7 +1929,7 @@
       ]
     },
     "sigil-string-parenthesis-verbatim": {
-      "begin": "(~[BS])([(])",
+      "begin": "(~[BS])(\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.string.erlang"
@@ -1948,7 +1938,7 @@
           "name": "punctuation.definition.string.begin.erlang"
         }
       },
-      "end": "([)])",
+      "end": "(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.erlang"
@@ -1957,7 +1947,7 @@
       "name": "string.quoted.parenthesis.sigil.erlang"
     },
     "sigil-string-single-character": {
-      "begin": "(~[bs]?)([/\\|`#])",
+      "begin": "(~[bs]?)([/|`#])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.string.erlang"
@@ -1980,7 +1970,7 @@
       ]
     },
     "sigil-string-single-character-verbatim": {
-      "begin": "(~[BS])([/\\|`#])",
+      "begin": "(~[BS])([/|`#])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.string.erlang"
@@ -2039,7 +2029,7 @@
       "name": "string.quoted.single.sigil.erlang"
     },
     "sigil-string-square-brackets": {
-      "begin": "(~[bs]?)([\\[])",
+      "begin": "(~[bs]?)(\\[)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.string.erlang"
@@ -2048,7 +2038,7 @@
           "name": "punctuation.definition.string.begin.erlang"
         }
       },
-      "end": "([\\]])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.erlang"
@@ -2062,7 +2052,7 @@
       ]
     },
     "sigil-string-square-brackets-verbatim": {
-      "begin": "(~[BS])([\\[])",
+      "begin": "(~[BS])(\\[)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.string.erlang"
@@ -2071,7 +2061,7 @@
           "name": "punctuation.definition.string.begin.erlang"
         }
       },
-      "end": "([\\]])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.erlang"
@@ -2100,7 +2090,7 @@
       ]
     },
     "symbolic-operator": {
-      "match": "\\+\\+|\\+|--|-|\\*|/=|/|=/=|=:=|==|=<|=|<-|<|>=|>|!|::|\\?=",
+      "match": "\\+\\+|\\+|--|[-*]|/=|/|=/=|=:=|==|=<|=|<-|<|>=|[>!]|::|\\?=",
       "name": "keyword.operator.symbolic.erlang"
     },
     "textual-operator": {
@@ -2114,7 +2104,7 @@
           "name": "punctuation.definition.tuple.begin.erlang"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tuple.end.erlang"
diff --git a/resources/languages/fennel.json b/resources/languages/fennel.json
index c9524c8..2a6fe11 100644
--- a/resources/languages/fennel.json
+++ b/resources/languages/fennel.json
@@ -88,7 +88,7 @@
           "name": "support.function.library.fennel"
         },
         {
-          "match": "\\b(_G|_VERSION)\\b",
+          "match": "\\b(_(?:G|VERSION))\\b",
           "name": "constant.language.fennel"
         }
       ]
@@ -96,7 +96,7 @@
     "methods": {
       "patterns": [
         {
-          "match": "\\w+\\:\\w+",
+          "match": "\\w+:\\w+",
           "name": "entity.name.function.method.fennel"
         }
       ]
@@ -124,15 +124,15 @@
     "special": {
       "patterns": [
         {
-          "match": "\\#|\\%|\\+|\\*|[?][.]|(\\.)?\\.|(\\/)?\\/|:|<=?|=|>=?|\\^",
+          "match": "[#%+*]|\\?\\.|(\\.)?\\.|(/)?/|:|<=?|=|>=?|\\^",
           "name": "keyword.special.fennel"
         },
         {
-          "match": "(\\-\\>(\\>)?)",
+          "match": "(->(>)?)",
           "name": "keyword.special.fennel"
         },
         {
-          "match": "\\-\\?\\>(\\>)?",
+          "match": "-\\?>(>)?",
           "name": "keyword.special.fennel"
         },
         {
@@ -195,7 +195,7 @@
           "name": "punctuation.table.bracket.open.fennel"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.table.bracket.close.fennel"
@@ -215,7 +215,7 @@
           "name": "punctuation.vector.bracket.open.fennel"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.vector.bracket.close.fennel"
diff --git a/resources/languages/fish.json b/resources/languages/fish.json
index c5a87d4..7536fb7 100644
--- a/resources/languages/fish.json
+++ b/resources/languages/fish.json
@@ -15,7 +15,6 @@
           "name": "punctuation.definition.string.begin.fish"
         }
       },
-      "comment": "Double quoted string",
       "end": "\"",
       "endCaptures": {
         "0": {
@@ -28,8 +27,7 @@
           "include": "#variable"
         },
         {
-          "comment": "https://fishshell.com/docs/current/#quotes",
-          "match": "\\\\(\\\"|\\$|$|\\\\)",
+          "match": "\\\\([\"$]|$|\\\\)",
           "name": "constant.character.escape.fish"
         }
       ]
@@ -41,7 +39,6 @@
           "name": "punctuation.definition.string.begin.fish"
         }
       },
-      "comment": "Single quoted string",
       "end": "'",
       "endCaptures": {
         "0": {
@@ -51,8 +48,7 @@
       "name": "string.quoted.single.fish",
       "patterns": [
         {
-          "comment": "https://fishshell.com/docs/current/#quotes",
-          "match": "\\\\('|`|\\\\)",
+          "match": "\\\\(['`\\\\])",
           "name": "constant.character.escape.fish"
         }
       ]
@@ -63,7 +59,6 @@
           "name": "punctuation.definition.comment.fish"
         }
       },
-      "comment": "line comment",
       "match": "(?<!\\$)(#)(?!\\{).*$\\n?",
       "name": "comment.line.number-sign.fish"
     },
@@ -76,11 +71,9 @@
           "name": "support.function.command.fish"
         }
       },
-      "comment": "name of command, either a function or a binary",
-      "match": "(^\\s*|&&\\s*|\\|\\s*|\\(\\s*|[;]\\s*|\\b(if|while)\\b\\s+)(?!(?<!\\.)\\b(function|while|if|else|switch|case|for|in|begin|end|continue|break|return|source|exit|wait|and|or|not)\\b(?![?!]))([a-zA-Z_\\-0-9\\[\\].]+)"
+      "match": "(^\\s*|&&\\s*|\\|\\s*|\\(\\s*|;\\s*|\\b(if|while)\\b\\s+)(?!(?<!\\.)\\b(function|while|if|else|switch|case|for|in|begin|end|continue|break|return|source|exit|wait|and|or|not)\\b(?![?!]))([a-zA-Z_\\-0-9\\[\\].]+)"
     },
     {
-      "comment": "keywords that affect control flow",
       "match": "(?<!\\.)\\b(function|while|if|else|switch|case|for|in|begin|end|continue|break|return|source|exit|wait|and|or|not)\\b(?![?!])",
       "name": "keyword.control.fish"
     },
@@ -93,8 +86,7 @@
       "name": "keyword.operator.pipe.fish"
     },
     {
-      "comment": "IO Redirection",
-      "match": "(?:<|#StandardInput(>|\\^|>>|\\^\\^)(&[012\\-])?|[012](<|>|>>)(&[012\\-])?)",
+      "match": "(?:<|([>^]|>>|\\^\\^)(&[012-])?|[012]([<>]|>>)(&[012-])?)",
       "name": "keyword.operator.redirect.fish"
     },
     {
@@ -102,7 +94,7 @@
       "name": "keyword.operator.background.fish"
     },
     {
-      "match": "\\*\\*|\\*|\\?",
+      "match": "\\*\\*|[*?]",
       "name": "keyword.operator.glob.fish"
     },
     {
@@ -111,7 +103,6 @@
           "name": "source.option.fish"
         }
       },
-      "comment": "command short/long options",
       "match": "\\s(-{1,2}[a-zA-Z_\\-0-9]+|-\\w)\\b"
     },
     {
@@ -125,37 +116,30 @@
     "escape": {
       "patterns": [
         {
-          "comment": "single character character escape sequences",
-          "match": "\\\\[abefnrtv $*?~#(){}\\[\\]<>^&|;\"']",
+          "match": "\\\\[abefnrtv $*?~#(){}\\[\\]<>^\\&|;\"']",
           "name": "constant.character.escape.single.fish"
         },
         {
-          "comment": "escapes the ascii character with the specified value (hexadecimal)",
-          "match": "\\\\x[0-9a-fA-F]{1,2}",
+          "match": "\\\\x\\h{1,2}",
           "name": "constant.character.escape.hex-ascii.fish"
         },
         {
-          "comment": "escapes a byte of data with the specified value (hexadecimal). If you are using mutibyte encoding, this can be used to enter invalid strings. Only use this if you know what are doing.",
-          "match": "\\\\X[0-9a-fA-F]{1,2}",
+          "match": "\\\\X\\h{1,2}",
           "name": "constant.character.escape.hex-byte.fish"
         },
         {
-          "comment": "escapes the ascii character with the specified value (octal)",
           "match": "\\\\[0-7]{1,3}",
           "name": "constant.character.escape.octal.fish"
         },
         {
-          "comment": "escapes the 16-bit unicode character with the specified value (hexadecimal)",
-          "match": "\\\\u[0-9a-fA-F]{1,4}",
+          "match": "\\\\u\\h{1,4}",
           "name": "constant.character.escape.unicode-16-bit.fish"
         },
         {
-          "comment": "escapes the 32-bit unicode character with the specified value (hexadecimal)",
-          "match": "\\\\U[0-9a-fA-F]{1,8}",
+          "match": "\\\\U\\h{1,8}",
           "name": "constant.character.escape.unicode-32-bit.fish"
         },
         {
-          "comment": "escapes the control sequence generated by pressing the control key and the specified letter",
           "match": "\\\\c[a-zA-Z]",
           "name": "constant.character.escape.control.fish"
         }
@@ -169,7 +153,6 @@
               "name": "punctuation.definition.variable.fish"
             }
           },
-          "comment": "Built-in variables visible by pressing $ TAB TAB in a new shell",
           "match": "(\\$)(argv|CMD_DURATION|COLUMNS|fish_bind_mode|fish_color_autosuggestion|fish_color_cancel|fish_color_command|fish_color_comment|fish_color_cwd|fish_color_cwd_root|fish_color_end|fish_color_error|fish_color_escape|fish_color_hg_added|fish_color_hg_clean|fish_color_hg_copied|fish_color_hg_deleted|fish_color_hg_dirty|fish_color_hg_modified|fish_color_hg_renamed|fish_color_hg_unmerged|fish_color_hg_untracked|fish_color_history_current|fish_color_host|fish_color_host_remote|fish_color_match|fish_color_normal|fish_color_operator|fish_color_param|fish_color_quote|fish_color_redirection|fish_color_search_match|fish_color_selection|fish_color_status|fish_color_user|fish_color_valid_path|fish_complete_path|fish_function_path|fish_greeting|fish_key_bindings|fish_pager_color_completion|fish_pager_color_description|fish_pager_color_prefix|fish_pager_color_progress|fish_pid|fish_prompt_hg_status_added|fish_prompt_hg_status_copied|fish_prompt_hg_status_deleted|fish_prompt_hg_status_modified|fish_prompt_hg_status_order|fish_prompt_hg_status_unmerged|fish_prompt_hg_status_untracked|FISH_VERSION|history|hostname|IFS|LINES|pipestatus|status|umask|version)\\b",
           "name": "variable.language.fish"
         },
diff --git a/resources/languages/fluent.json b/resources/languages/fluent.json
index 43dedc7..c993bc3 100644
--- a/resources/languages/fluent.json
+++ b/resources/languages/fluent.json
@@ -20,7 +20,7 @@
           "name": "support.class.attribute-begin.fluent"
         }
       },
-      "end": "^(?=\\s*[^\\.])",
+      "end": "^(?=\\s*[^.])",
       "patterns": [
         {
           "include": "#placeable"
@@ -45,7 +45,7 @@
           "name": "variable.other.named-argument.value.fluent"
         }
       },
-      "end": "(?=\\)|,|\\s)",
+      "end": "(?=[),\\s])",
       "name": "variable.other.named-argument.fluent"
     },
     "function-positional-argument": {
@@ -79,7 +79,7 @@
       ]
     },
     "placeable": {
-      "begin": "({)",
+      "begin": "(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.placeable.begin.fluent"
@@ -143,7 +143,7 @@
       ]
     },
     "placeable-reference-or-number": {
-      "match": "((-|\\$)[a-zA-Z0-9_-]+|[a-zA-Z][a-zA-Z0-9_-]*|[0-9]+)",
+      "match": "(([-$])[a-zA-Z0-9_-]+|[a-zA-Z][a-zA-Z0-9_-]*|[0-9]+)",
       "name": "variable.other.placeable.reference-or-number.fluent"
     },
     "placeable-string": {
@@ -177,7 +177,7 @@
       ]
     },
     "selector-item": {
-      "begin": "(\\s*\\*?\\[)([a-zA-Z0-9_-]+)(\\]\\s*)",
+      "begin": "(\\s*\\*?\\[)([a-zA-Z0-9_-]+)(]\\s*)",
       "beginCaptures": {
         "1": {
           "name": "support.function.selector-item.begin.fluent"
diff --git a/resources/languages/fortran-fixed-form.json b/resources/languages/fortran-fixed-form.json
index a01d1f1..d275703 100644
--- a/resources/languages/fortran-fixed-form.json
+++ b/resources/languages/fortran-fixed-form.json
@@ -36,7 +36,7 @@
     "comments": {
       "patterns": [
         {
-          "begin": "^[cC\\*]",
+          "begin": "^[cC*]",
           "end": "\\n",
           "name": "comment.line.fortran"
         },
diff --git a/resources/languages/fortran-free-form.json b/resources/languages/fortran-free-form.json
index 26aee86..b19f8da 100644
--- a/resources/languages/fortran-free-form.json
+++ b/resources/languages/fortran-free-form.json
@@ -16,7 +16,7 @@
     ".pf",
     ".PF"
   ],
-  "firstLineMatch": "(?i)-[*]- mode: fortran free -[*]-",
+  "firstLineMatch": "(?i)-\\*- mode: fortran free -\\*-",
   "injections": {
     "source.fortran.free - ( string | comment | meta.preprocessor )": {
       "patterns": [
@@ -127,9 +127,8 @@
   "repository": {
     "IO-item-list": {
       "begin": "(?i)(?=\\s*[a-z0-9\"'])",
-      "comment": "Name list.",
       "contentName": "meta.name-list.fortran",
-      "end": "(?=[\\);!\\n])",
+      "end": "(?=[);!\\n])",
       "patterns": [
         {
           "include": "#constants"
@@ -173,7 +172,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "IO generic specification.",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -200,7 +198,7 @@
     "IO-statements": {
       "patterns": [
         {
-          "begin": "(?ix)\\b(?:(backspace)|(close)|(endfile)|(format)|(inquire)|(open)|(read)|(rewind)|(write))\\s*(?=\\()",
+          "begin": "(?i)\\b(?:(backspace)|(close)|(endfile)|(format)|(inquire)|(open)|(read)|(rewind)|(write))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.backspace.fortran"
@@ -233,7 +231,6 @@
               "name": "keyword.control.write.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1977 standard.",
           "end": "(?=[;!\\n])",
           "endCaptures": {
             "1": {
@@ -271,7 +268,6 @@
               "name": "keyword.control.rewind.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1977 standard.",
           "match": "(?i)\\b(?:(backspace)|(endfile)|(format)|(print)|(read)|(rewind))\\b"
         },
         {
@@ -287,7 +283,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 2003 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -306,7 +301,6 @@
               "name": "keyword.control.flush.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 2003 standard.",
           "match": "(?i)\\b(flush)\\b"
         }
       ]
@@ -317,7 +311,6 @@
           "name": "storage.modifier.fortran.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "match": "(?i)\\G\\s*\\b(abstract)\\b"
     },
     "abstract-interface-block-construct": {
@@ -330,7 +323,6 @@
           "name": "keyword.control.interface.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "end": "(?i)\\b(end\\s*interface)\\b",
       "endCaptures": {
         "1": {
@@ -360,7 +352,6 @@
           "name": "storage.modifier.allocatable.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "match": "(?i)\\s*\\b(allocatable)\\b"
     },
     "allocate-statement": {
@@ -373,7 +364,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?<!\\G)",
       "endCaptures": {
         "1": {
@@ -405,11 +395,10 @@
           "name": "keyword.operator.multiplication.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
-      "match": "(\\-)|(\\+)|\\/(?!\\/|\\=|\\\\)|(\\*\\*)|(\\*)"
+      "match": "(-)|(\\+)|/(?![/=\\\\])|(\\*\\*)|(\\*)"
     },
     "array-constructor": {
-      "begin": "(?=\\s*(\\[|\\(\\/))",
+      "begin": "(?=\\s*(\\[|\\(/))",
       "end": "(?<!\\G)",
       "name": "meta.contructor.array",
       "patterns": [
@@ -417,13 +406,13 @@
           "include": "#brackets"
         },
         {
-          "begin": "\\s*(\\(\\/)",
+          "begin": "\\s*(\\(/)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.bracket.left.fortran"
             }
           },
-          "end": "(\\/\\))",
+          "end": "(/\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.bracket.left.fortran"
@@ -464,7 +453,6 @@
               "name": "keyword.control.assign.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1977 standard.",
           "end": "(?=[;!\\n])",
           "name": "meta.statement.control.assign.fortran",
           "patterns": [
@@ -493,7 +481,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Assignment generic specification.",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -510,8 +497,7 @@
       ]
     },
     "assignment-operator": {
-      "comment": "Introduced in the Fortran 1977 standard.",
-      "match": "(?<!\\/|\\=|\\<|\\>)(\\=)(?!\\=|\\>)",
+      "match": "(?<![/=<>])(=)(?![=>])",
       "name": "keyword.operator.assignment.fortran"
     },
     "associate-construct": {
@@ -521,7 +507,6 @@
           "name": "keyword.control.associate.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "contentName": "meta.block.associate.fortran",
       "end": "(?i)\\b(end\\s*associate)\\b",
       "endCaptures": {
@@ -541,11 +526,10 @@
           "name": "storage.modifier.asynchronous.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "match": "(?i)\\G\\s*\\b(asynchronous)\\b"
     },
     "attribute-specification-statement": {
-      "begin": "(?ix)(?=\\b(?:allocatable|asynchronous|contiguous |external|intrinsic|optional|parameter|pointer|private|protected|public|save|target|value|volatile)\\b |(bind|dimension|intent)\\s*\\( |(codimension)\\s*\\[)",
+      "begin": "(?i)(?=\\b(?:allocatable|asynchronous|contiguous|external|intrinsic|optional|parameter|pointer|private|protected|public|save|target|value|volatile)\\b|(bind|dimension|intent)\\s*\\(|(codimension)\\s*\\[)",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.attribute-specification.fortran",
       "patterns": [
@@ -605,7 +589,6 @@
         },
         {
           "begin": "(?=\\s*::)",
-          "comment": "Attribute list.",
           "contentName": "meta.attribute-list.normal.fortran",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
@@ -631,7 +614,6 @@
           "name": "keyword.control.associate.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2008 standard.",
       "contentName": "meta.block.block.fortran",
       "end": "(?i)\\b(end\\s*block)\\b",
       "endCaptures": {
@@ -655,7 +637,7 @@
           "name": "entity.name.block-data.fortran"
         }
       },
-      "end": "(?ix)\\b(?:(end\\s*block\\s*data)(?:\\s+(\\2))?|(end))\\b (?:\\s*(\\S((?!\\n).)*))?",
+      "end": "(?i)\\b(?:(end\\s*block\\s*data)(?:\\s+(\\2))?|(end))\\b(?:\\s*(\\S((?!\\n).)*))?",
       "endCaptures": {
         "1": {
           "name": "keyword.control.end-block-data.fortran"
@@ -684,7 +666,7 @@
           "name": "punctuation.bracket.left.fortran"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.bracket.left.fortran"
@@ -723,12 +705,11 @@
               "name": "keyword.control.call.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1977 standard.",
           "end": "(?=[;!\\n])",
           "name": "meta.statement.control.call.fortran",
           "patterns": [
             {
-              "begin": "(?ix)\\G\\s*([a-z]\\w*)(%)([a-z]\\w*)\\b\\s*(?=\\()",
+              "begin": "(?i)\\G\\s*([a-z]\\w*)(%)([a-z]\\w*)\\b\\s*(?=\\()",
               "beginCaptures": {
                 "1": {
                   "name": "variable.other.fortran"
@@ -740,7 +721,6 @@
                   "name": "entity.name.function.subroutine.fortran"
                 }
               },
-              "comment": "type-bound subroutines",
               "end": "(?<!\\G)",
               "endCaptures": {
                 "1": {
@@ -766,7 +746,6 @@
                   "name": "punctuation.parentheses.left.fortran"
                 }
               },
-              "comment": "User defined subroutine.",
               "end": "(?<!\\G)",
               "endCaptures": {
                 "1": {
@@ -785,7 +764,6 @@
                   "name": "entity.name.function.subroutine.fortran"
                 }
               },
-              "comment": "User defined subroutine.",
               "match": "(?i)\\G\\s*\\b([a-z]\\w*)\\b(?=\\s*[;!\\n])"
             },
             {
@@ -796,7 +774,6 @@
       ]
     },
     "character-type": {
-      "comment": "Introduced in the Fortran 1977 standard.",
       "patterns": [
         {
           "begin": "(?i)\\b(character)\\s*(?=\\()",
@@ -844,7 +821,6 @@
           "name": "storage.modifier.codimension.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2008 standard.",
       "end": "(?<!\\G)",
       "patterns": [
         {
@@ -878,7 +854,6 @@
           "name": "keyword.control.while.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "end": "(?=[;!\\n])",
       "patterns": [
         {
@@ -908,7 +883,6 @@
           "name": "storage.modifier.contigous.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2008 standard.",
       "match": "(?i)\\G\\s*\\b(contiguous)\\b"
     },
     "continue-statement": {
@@ -920,7 +894,6 @@
               "name": "keyword.control.continue.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1977 standard.",
           "end": "(?=[;!\\n])",
           "name": "meta.statement.control.continue.fortran",
           "patterns": [
@@ -942,7 +915,6 @@
       ]
     },
     "control-statements": {
-      "comment": "Statements controlling the flow of the program",
       "patterns": [
         {
           "include": "#assign-statement"
@@ -1006,7 +978,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1021,7 +993,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1036,7 +1008,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1054,7 +1026,7 @@
                       "name": "keyword.operator.minus.exponent.hexadecimal.cpp"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?(?:(?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?((?:\\w(?<![pP\\h])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1062,7 +1034,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1083,7 +1055,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1104,13 +1076,13 @@
                       "name": "constant.numeric.exponent.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
                     }
                   },
-                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
+                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1121,7 +1093,7 @@
                       "name": "constant.numeric.binary.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1136,7 +1108,7 @@
                       "name": "keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
+                  "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1147,7 +1119,7 @@
                       "name": "constant.numeric.octal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1162,7 +1134,7 @@
                       "name": "keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
+                  "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1173,7 +1145,7 @@
                       "name": "constant.numeric.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1194,7 +1166,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1206,7 +1178,7 @@
                       "name": "keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)(?:(?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![pP\\h])\\w*)?$)"
                 },
                 {
                   "captures": {
@@ -1214,7 +1186,7 @@
                       "name": "constant.numeric.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1235,7 +1207,7 @@
                       "name": "constant.numeric.exponent.decimal.cpp",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.cpp"
                         }
                       ]
@@ -1247,10 +1219,10 @@
                       "name": "keyword.other.unit.user-defined.cpp"
                     }
                   },
-                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
+                  "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
                 },
                 {
-                  "match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])+",
                   "name": "invalid.illegal.constant.numeric.cpp"
                 }
               ]
@@ -1258,7 +1230,7 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])*"
     },
     "critical-construct": {
       "begin": "(?i)\\b(critical)\\b",
@@ -1267,7 +1239,6 @@
           "name": "keyword.control.associate.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2008 standard.",
       "contentName": "meta.block.critical.fortran",
       "end": "(?i)\\b(end\\s*critical)\\b",
       "endCaptures": {
@@ -1290,7 +1261,6 @@
               "name": "keyword.control.cycle.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1990 standard.",
           "end": "(?=[;!\\n])",
           "name": "meta.statement.control.fortran",
           "patterns": [
@@ -1322,7 +1292,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?<!\\G)",
       "endCaptures": {
         "1": {
@@ -1342,7 +1311,6 @@
           "name": "storage.modifier.deferred.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "match": "(?i)\\s*\\b(deferred)\\b"
     },
     "derived-type": {
@@ -1361,7 +1329,6 @@
           "name": "entity.name.type.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1995 standard.",
       "contentName": "meta.type-spec.fortran",
       "end": "(\\))",
       "endCaptures": {
@@ -1378,7 +1345,6 @@
     },
     "derived-type-component-attribute-specification": {
       "begin": "(?i)(?=\\s*\\b(?:private|sequence)\\b)",
-      "comment": "Introduced in the Fortran 1995 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.attribute-specification.fortran",
       "patterns": [
@@ -1411,12 +1377,10 @@
           "name": "entity.name.derived-type.parameter.fortran"
         }
       },
-      "comment": "Derived type parameter.",
-      "match": "(?ix)\\b(integer)\\s*(,)\\s*(kind|len)\\s*(?:(::)\\s*([a-z]\\w*)?)?\\s*(?=[;!\\n])"
+      "match": "(?i)\\b(integer)\\s*(,)\\s*(kind|len)\\s*(?:(::)\\s*([a-z]\\w*)?)?\\s*(?=[;!\\n])"
     },
     "derived-type-component-procedure-specification": {
-      "begin": "(?i)(?=\\b(?:procedure)\\b)",
-      "comment": "Introduced in the Fortran 2003 standard.",
+      "begin": "(?i)(?=\\bprocedure\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.procedure.fortran",
       "patterns": [
@@ -1425,7 +1389,6 @@
         },
         {
           "begin": "(?=\\s*(,|::|\\())",
-          "comment": "Attribute list.",
           "contentName": "meta.attribute-list.derived-type-component-procedure.fortran",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
@@ -1468,8 +1431,7 @@
       ]
     },
     "derived-type-component-type-specification": {
-      "begin": "(?ix)(?=\\b(?:character|class|complex|double\\s*precision|double\\s*complex|integer|logical|real|type)\\b(?![^:'\";!\\n]*\\bfunction\\b))",
-      "comment": "Introduced in the Fortran 1995 standard.",
+      "begin": "(?i)(?=\\b(?:character|class|complex|double\\s*precision|double\\s*complex|integer|logical|real|type)\\b(?![^:'\";!\\n]*\\bfunction\\b))",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.derived-type.fortran",
       "patterns": [
@@ -1481,7 +1443,6 @@
         },
         {
           "begin": "(?=\\s*(,|::))",
-          "comment": "Attribute list.",
           "contentName": "meta.attribute-list.derived-type-component-type.fortran",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
@@ -1530,8 +1491,7 @@
       ]
     },
     "derived-type-contains-attribute-specification": {
-      "begin": "(?i)(?=\\b(?:private)\\b)",
-      "comment": "Introduced in the Fortran 1995 standard.",
+      "begin": "(?i)(?=\\bprivate\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.attribute-specification.fortran",
       "patterns": [
@@ -1550,13 +1510,11 @@
           "name": "storage.type.final-procedure.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.procedure.final.fortran",
       "patterns": [
         {
           "begin": "(?=\\s*(::))",
-          "comment": "Attribute list.",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
             "1": {
@@ -1582,13 +1540,11 @@
           "name": "storage.type.procedure.generic.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.procedure.generic.fortran",
       "patterns": [
         {
           "begin": "(?=\\s*(,|::|\\())",
-          "comment": "Attribute list.",
           "contentName": "meta.attribute-list.derived-type-contains-generic-procedure.fortran",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
@@ -1604,7 +1560,7 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "end": "(?=::|[,&;!\\n])",
+              "end": "(?=::|[,\\&;!\\n])",
               "patterns": [
                 {
                   "include": "#access-attribute"
@@ -1618,7 +1574,6 @@
         },
         {
           "begin": "(?=\\s*[a-z])",
-          "comment": "Name list.",
           "contentName": "meta.name-list.fortran",
           "end": "(?=[;!\\n])",
           "patterns": [
@@ -1642,8 +1597,7 @@
       ]
     },
     "derived-type-contains-procedure-specification": {
-      "begin": "(?i)(?=\\b(?:procedure)\\b)",
-      "comment": "Introduced in the Fortran 2003 standard.",
+      "begin": "(?i)(?=\\bprocedure\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.procedure.fortran",
       "patterns": [
@@ -1652,7 +1606,6 @@
         },
         {
           "begin": "(?=\\s*(,|::|\\())",
-          "comment": "Attribute list.",
           "contentName": "meta.attribute-list.derived-type-contains-procedure.fortran",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
@@ -1668,7 +1621,7 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "end": "(?=::|[,&;!\\n])",
+              "end": "(?=::|[,\\&;!\\n])",
               "name": "meta.something.fortran",
               "patterns": [
                 {
@@ -1699,7 +1652,7 @@
       ]
     },
     "derived-type-definition": {
-      "begin": "(?i)\\b(type)\\b(?!\\s*(\\(|is\\b|\\=))",
+      "begin": "(?i)\\b(type)\\b(?!\\s*(\\(|is\\b|=))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.type.fortran"
@@ -1710,7 +1663,6 @@
       "patterns": [
         {
           "begin": "\\G(?=\\s*(,|::))",
-          "comment": "Attribute list.",
           "contentName": "meta.attribute-list.derived-type.fortran",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
@@ -1775,7 +1727,6 @@
             },
             {
               "begin": "(?i)^(?!\\s*\\b(?:contains|end\\s*type)\\b)",
-              "comment": "Derived type specification block.",
               "end": "(?i)^(?=\\s*\\b(?:contains|end\\s*type)\\b)",
               "name": "meta.block.specification.derived-type.fortran",
               "patterns": [
@@ -1803,7 +1754,6 @@
                   "name": "keyword.control.contains.fortran"
                 }
               },
-              "comment": "Derived type contains block.",
               "end": "(?i)(?=\\s*end\\s*type\\b)",
               "name": "meta.block.contains.fortran",
               "patterns": [
@@ -1834,8 +1784,7 @@
           "name": "keyword.other.selector.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1995 standard.",
-      "match": "\\s*(\\%)"
+      "match": "\\s*(%)"
     },
     "dimension-attribute": {
       "begin": "(?i)\\s*\\b(dimension)(?=\\s*\\()",
@@ -1844,7 +1793,6 @@
           "name": "storage.modifier.dimension.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "end": "(?<!\\G)",
       "patterns": [
         {
@@ -1872,7 +1820,6 @@
               "name": "constant.numeric.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1977 standard.",
           "end": "(?i)(?:^|(?<=;))(?=\\s*\\b\\2\\b)",
           "name": "meta.do.labeled.fortran",
           "patterns": [
@@ -1883,7 +1830,6 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "comment": "Loop control.",
               "end": "(?=[;!\\n])",
               "patterns": [
                 {
@@ -1909,7 +1855,6 @@
               "name": "keyword.control.do.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1995 standard.",
           "end": "(?i)\\b(?:(continue)|(end\\s*do))\\b",
           "endCaptures": {
             "1": {
@@ -1928,7 +1873,6 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "comment": "Loop control.",
               "end": "(?=[;!\\n])",
               "name": "meta.loop-control.fortran",
               "patterns": [
@@ -1945,7 +1889,6 @@
             },
             {
               "begin": "(?i)(?!\\s*\\b(continue|end\\s*do)\\b)",
-              "comment": "Loop body.",
               "end": "(?i)(?=\\s*\\b(continue|end\\s*do)\\b)",
               "patterns": [
                 {
@@ -1963,8 +1906,7 @@
           "name": "variable.parameter.fortran"
         }
       },
-      "comment": "dummy variable",
-      "match": "(?i)(?:^|(?<=[&,\\(]))\\s*([a-z]\\w*)"
+      "match": "(?i)(?:^|(?<=[\\&,(]))\\s*([a-z]\\w*)"
     },
     "dummy-variable-list": {
       "begin": "\\G\\s*(\\()",
@@ -1992,7 +1934,6 @@
           "name": "storage.modifier.elemental.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "match": "(?i)\\s*\\b(elemental)\\b"
     },
     "entry-statement": {
@@ -2004,7 +1945,6 @@
               "name": "keyword.control.entry.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1977 standard.",
           "end": "(?=[;!\\n])",
           "name": "meta.statement.control.entry.fortran",
           "patterns": [
@@ -2039,7 +1979,6 @@
           "name": "keyword.control.enum.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "end": "(?i)\\b(end\\s*enum)\\b",
       "endCaptures": {
         "1": {
@@ -2074,7 +2013,7 @@
               "include": "#comments"
             },
             {
-              "begin": "(?ix)\\b(enumerator)\\b",
+              "begin": "(?i)\\b(enumerator)\\b",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.enumerator.fortran"
@@ -2085,7 +2024,6 @@
               "patterns": [
                 {
                   "begin": "(?=\\s*(,|::))",
-                  "comment": "Attribute list.",
                   "contentName": "meta.attribute-list.enum.fortran",
                   "end": "(::)|(?=[;!\\n])",
                   "endCaptures": {
@@ -2143,7 +2081,6 @@
           "name": "keyword.control.errorstop.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2008 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.control.errorstop.fortran",
       "patterns": [
@@ -2162,7 +2099,7 @@
       ]
     },
     "event-statement": {
-      "begin": "(?i)\\b(event post|event wait)\\s*(?=\\()",
+      "begin": "(?i)\\b(event (?:post|wait))\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.event.fortran"
@@ -2171,7 +2108,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2018 standard.",
       "end": "(?<!\\G)",
       "endCaptures": {
         "1": {
@@ -2208,7 +2144,6 @@
           "name": "keyword.control.exit.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.control.exit.fortran",
       "patterns": [
@@ -2221,7 +2156,6 @@
           "name": "keyword.control.interface.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?i)\\b(end\\s*interface)\\b",
       "endCaptures": {
         "1": {
@@ -2256,7 +2190,6 @@
           "name": "storage.modifier.external.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "match": "(?i)\\s*\\b(external)\\b"
     },
     "fail-image-statement": {
@@ -2265,7 +2198,6 @@
           "name": "keyword.control.fail-image.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2018 standard.",
       "match": "\\b(fail image)\\b",
       "name": "meta.statement.fail-image.fortran"
     },
@@ -2277,12 +2209,10 @@
           "name": "keyword.control.forall.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1995 standard.",
       "end": "(?<!\\G)",
       "patterns": [
         {
           "begin": "(?i)\\G(?!\\s*[;!\\n])",
-          "comment": "Loop control.",
           "end": "(?<!\\G)",
           "name": "meta.loop-control.fortran",
           "patterns": [
@@ -2331,7 +2261,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2018 standard.",
       "end": "(?<!\\G)",
       "endCaptures": {
         "1": {
@@ -2347,13 +2276,11 @@
     },
     "function-definition": {
       "begin": "(?i)(?=([^:'\";!\\n](?!\\bend)(?!\\bsubroutine\\b))*\\bfunction\\b)",
-      "comment": "Function program unit. Introduced in the Fortran 1977 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.function.fortran",
       "patterns": [
         {
           "begin": "(?i)(?=\\G\\s*(?!\\bfunction\\b))",
-          "comment": "Function attribute list.",
           "end": "(?i)(?=\\bfunction\\b)",
           "name": "meta.attribute-list.function.fortran",
           "patterns": [
@@ -2384,7 +2311,6 @@
               "name": "keyword.other.function.fortran"
             }
           },
-          "comment": "Captures the function keyword",
           "end": "(?=[;!\\n])",
           "patterns": [
             {
@@ -2394,8 +2320,7 @@
                   "name": "entity.name.function.fortran"
                 }
               },
-              "comment": "Function body.",
-              "end": "(?ix)\\s*\\b(?:(end\\s*function)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+              "end": "(?i)\\s*\\b(?:(end\\s*function)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
               "endCaptures": {
                 "1": {
                   "name": "keyword.other.endfunction.fortran"
@@ -2413,7 +2338,6 @@
               "patterns": [
                 {
                   "begin": "\\G(?!\\s*[;!\\n])",
-                  "comment": "Rest of the first line in function construct.",
                   "end": "(?=[;!\\n])",
                   "name": "meta.function.first-line.fortran",
                   "patterns": [
@@ -2429,9 +2353,8 @@
                   ]
                 },
                 {
-                  "begin": "(?i)(?!\\b(?:end\\s*[;!\\n]|end\\s*function\\b))",
-                  "comment": "Specification and execution block.",
-                  "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*function\\b))",
+                  "begin": "(?i)(?!\\bend(?:\\s*[;!\\n]|\\s*function\\b))",
+                  "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*function\\b))",
                   "name": "meta.block.specification.function.fortran",
                   "patterns": [
                     {
@@ -2441,8 +2364,7 @@
                           "name": "keyword.control.contains.fortran"
                         }
                       },
-                      "comment": "Contains block.",
-                      "end": "(?i)(?=(?:end\\s*[;!\\n]|end\\s*function\\b))",
+                      "end": "(?i)(?=end(?:\\s*[;!\\n]|\\s*function\\b))",
                       "name": "meta.block.contains.fortran",
                       "patterns": [
                         {
@@ -2468,12 +2390,11 @@
           "name": "keyword.control.interface.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.interface.generic.fortran",
       "patterns": [
         {
-          "begin": "(?ix)\\G\\s*\\b(assignment)\\s* (\\()\\s*(?:(\\=)|(\\S.*))\\s*(\\))",
+          "begin": "(?i)\\G\\s*\\b(assignment)\\s*(\\()\\s*(?:(=)|(\\S.*))\\s*(\\))",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.assignment.fortran"
@@ -2491,8 +2412,7 @@
               "name": "punctuation.parentheses.right.fortran"
             }
           },
-          "comment": "Assignment generic interface.",
-          "end": "(?ix)\\b(end\\s*interface)\\b (?:\\s*\\b(\\1)\\b\\s*(\\()\\s*(?:(\\3)|(\\S.*))\\s*(\\)))?",
+          "end": "(?i)\\b(end\\s*interface)\\b(?:\\s*\\b(\\1)\\b\\s*(\\()\\s*(?:(\\3)|(\\S.*))\\s*(\\)))?",
           "endCaptures": {
             "1": {
               "name": "keyword.control.endinterface.fortran"
@@ -2523,7 +2443,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\G\\s*\\b(operator)\\s* (\\()\\s*(?: (\\.[a-z]+\\.|\\=\\=|\\/\\=|\\>\\=|\\>|\\<|\\<\\=|\\-|\\+|\\/|\\/\\/|\\*\\*|\\*) |(\\S.*) )\\s*(\\))",
+          "begin": "(?i)\\G\\s*\\b(operator)\\s*(\\()\\s*(?:(\\.[a-z]+\\.|==|/=|>=|[><]|<=|[-+/]|//|\\*\\*|\\*)|(\\S.*))\\s*(\\))",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.operator.fortran"
@@ -2541,8 +2461,7 @@
               "name": "punctuation.parentheses.right.fortran"
             }
           },
-          "comment": "Operator generic interface.",
-          "end": "(?ix)\\b(end\\s*interface)\\b (?:\\s*\\b(\\1)\\b\\s*(\\()\\s*(?:(\\3)|(\\S.*))\\s*(\\)))?",
+          "end": "(?i)\\b(end\\s*interface)\\b(?:\\s*\\b(\\1)\\b\\s*(\\()\\s*(?:(\\3)|(\\S.*))\\s*(\\)))?",
           "endCaptures": {
             "1": {
               "name": "keyword.control.endinterface.fortran"
@@ -2573,7 +2492,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\G\\s*\\b(?:(read)|(write))\\s* (\\()\\s*(?:(formatted)|(unformatted)|(\\S.*))\\s*(\\))",
+          "begin": "(?i)\\G\\s*\\b(?:(read)|(write))\\s*(\\()\\s*(?:(formatted)|(unformatted)|(\\S.*))\\s*(\\))",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.read.fortran"
@@ -2597,8 +2516,7 @@
               "name": "punctuation.parentheses.right.fortran"
             }
           },
-          "comment": "Read/Write generic interface.",
-          "end": "(?ix)\\b(end\\s*interface)\\b(?:\\s*\\b(?:(\\2)|(\\3))\\b\\s* (\\()\\s*(?:(\\4)|(\\5)|(\\S.*))\\s*(\\)))?",
+          "end": "(?i)\\b(end\\s*interface)\\b(?:\\s*\\b(?:(\\2)|(\\3))\\b\\s*(\\()\\s*(?:(\\4)|(\\5)|(\\S.*))\\s*(\\)))?",
           "endCaptures": {
             "1": {
               "name": "keyword.control.endinterface.fortran"
@@ -2641,7 +2559,6 @@
               "name": "entity.name.function.fortran"
             }
           },
-          "comment": "Generic interface.",
           "end": "(?i)\\b(end\\s*interface)\\b(?:\\s*\\b(\\1)\\b)?",
           "endCaptures": {
             "1": {
@@ -2669,7 +2586,6 @@
           "name": "keyword.control.goto.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.control.goto.fortran",
       "patterns": [
@@ -2714,7 +2630,6 @@
                       "name": "keyword.control.elseif.fortran"
                     }
                   },
-                  "comment": "else if statement",
                   "end": "(?=[;!\\n])",
                   "patterns": [
                     {
@@ -2729,7 +2644,6 @@
                           "name": "meta.label.elseif.fortran"
                         }
                       },
-                      "comment": "capture the label if present",
                       "match": "(?i)\\b(then)\\b(\\s*[a-z]\\w*)?"
                     },
                     {
@@ -2744,12 +2658,10 @@
                       "name": "keyword.control.else.fortran"
                     }
                   },
-                  "comment": "else block",
                   "end": "(?i)(?=\\b(end\\s*if)\\b)",
                   "patterns": [
                     {
-                      "begin": "(?!(\\s*(;|!|\\n)))",
-                      "comment": "rest of else line",
+                      "begin": "(?!(\\s*([;!\\n])))",
                       "end": "(?=[;!\\n])",
                       "patterns": [
                         {
@@ -2761,7 +2673,6 @@
                               "name": "invalid.error.label.else.fortran"
                             }
                           },
-                          "comment": "capture the label if present",
                           "match": "\\s*([a-z]\\w*)?\\s*\\b(\\w*)\\b"
                         },
                         {
@@ -2848,7 +2759,6 @@
           "name": "keyword.control.include.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.include.fortran",
       "patterns": [
@@ -2922,7 +2832,6 @@
           "name": "keyword.control.include.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.include.fortran",
       "patterns": [
@@ -2944,7 +2853,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(\\))|(?=[;!\\n])",
       "endCaptures": {
         "1": {
@@ -2986,13 +2894,11 @@
     },
     "interface-procedure-statement": {
       "begin": "(?i)(?=[^'\";!\\n]*\\bprocedure\\b)",
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.procedure.fortran",
       "patterns": [
         {
           "begin": "(?i)(?=\\G\\s*(?!\\bprocedure\\b))",
-          "comment": "Attribute list.",
           "end": "(?i)(?=\\bprocedure\\b)",
           "name": "meta.attribute-list.interface.fortran",
           "patterns": [
@@ -3011,7 +2917,6 @@
               "name": "keyword.other.procedure.fortran"
             }
           },
-          "comment": "Procedure statement.",
           "end": "(?=[;!\\n])",
           "patterns": [
             {
@@ -3035,13 +2940,12 @@
           "name": "storage.modifier.intrinsic.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "match": "(?i)\\s*\\b(intrinsic)\\b"
     },
     "intrinsic-functions": {
       "patterns": [
         {
-          "begin": "(?ix)\\b(acosh|asinh|atanh|bge|bgt|ble|blt|dshiftl|dshiftr| findloc|hypot|iall|iany|image_index|iparity|is_contiguous|lcobound| leadz|mask[lr]|merge_bits|norm2|num_images|parity|popcnt|poppar| shift[alr]|storage_size|this_image|trailz|ucobound)\\s*(?=\\()",
+          "begin": "(?i)\\b(acosh|asinh|atanh|bge|bgt|ble|blt|dshiftl|dshiftr|findloc|hypot|iall|iany|image_index|iparity|is_contiguous|lcobound|leadz|mask[lr]|merge_bits|norm2|num_images|parity|popcnt|poppar|shift[alr]|storage_size|this_image|trailz|ucobound)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3050,7 +2954,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Intrinsic functions introduced in the Fortran 2008 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3064,7 +2967,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(bessel_[jy][01n]|erf(c(_scaled)?)?|gamma|log_gamma)\\s*(?=\\()",
+          "begin": "(?i)\\b(bessel_[jy][01n]|erf(c(_scaled)?)?|gamma|log_gamma)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3073,7 +2976,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Functions accessable through the intrinsic FORTRAN_SPECIAL_FUNCTIONS module. Introduced in the Fortran 2008 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3087,7 +2989,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(command_argument_count|extends_type_of|is_iostat_end| is_iostat_eor|new_line|same_type_as|selected_char_kind)\\s*(?=\\()",
+          "begin": "(?i)\\b(command_argument_count|extends_type_of|is_iostat_end|is_iostat_eor|new_line|same_type_as|selected_char_kind)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3096,7 +2998,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Intrinsic functions introduced in the Fortran 2003 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3110,7 +3011,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(ieee_( class|copy_sign|is_(finite|nan|negative|normal)|logb|next_after|rem| rint|scalb|selected_real_kind| support_(datatype|denormal|divide|inf|io|nan|rounding|sqrt|standard|underflow_control)| unordered|value))\\s*(?=\\()",
+          "begin": "(?i)\\b(ieee_(class|copy_sign|is_(finite|nan|negative|normal)|logb|next_after|rem|rint|scalb|selected_real_kind|support_(datatype|denormal|divide|inf|io|nan|rounding|sqrt|standard|underflow_control)|unordered|value))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3119,7 +3020,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Functions accessable through the intrinsic IEEE_ARITHMETIC module. Introduced in the Fortran 2003 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3133,7 +3033,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(ieee_support_(flag|halting))\\s*(?=\\()",
+          "begin": "(?i)\\b(ieee_support_(flag|halting))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3142,7 +3042,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Functions accessable through the intrinsic IEEE_EXCEPTIONS module. Introduced in the Fortran 2003 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3156,13 +3055,12 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(c_(associated|funloc|loc|sizeof))\\s*(?=\\()",
+          "begin": "(?i)\\b(c_(associated|funloc|loc|sizeof))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
             }
           },
-          "comment": "Functions accessable through the intrinsic ISO_C_BINDING module. Introduced in the Fortran 2003 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3176,7 +3074,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(compiler_(options|version))\\s*(?=\\()",
+          "begin": "(?i)\\b(compiler_(options|version))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3185,7 +3083,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Functions accessable through the intrinsic ISO_FORTRAN_ENV module. Introduced in the Fortran 2003 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3199,7 +3096,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(null)\\s*(?=\\()",
+          "begin": "(?i)\\b(null)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3208,7 +3105,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Intrinsic functions introduced in the Fortran 1995 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3222,7 +3118,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b(achar|adjustl|adjustr|all|allocated|associated|any|bit_size|btest|ceiling|count|cshift|digits|dot_product|eoshift|epsilon|exponent|floor|fraction|huge|iachar|iand|ibclr|ibits|ibset|ieor|ior|ishftc?| kind|lbound|len_trim|logical|matmul|maxexponent|maxloc|maxval|merge|minexponent|minloc|minval|modulo|nearest|not|pack|precision|present|product|radix|range|repeat|reshape|rrspacing|scale|scan|selected_(int|real)_kind|set_exponent|shape|size|spacing|spread|sum|tiny|transfer|transpose|trim|ubound|unpack|verify)\\s*(?=\\()",
+          "begin": "(?i)\\b(achar|adjustl|adjustr|all|allocated|associated|any|bit_size|btest|ceiling|count|cshift|digits|dot_product|eoshift|epsilon|exponent|floor|fraction|huge|iachar|iand|ibclr|ibits|ibset|ieor|ior|ishftc?|kind|lbound|len_trim|logical|matmul|maxexponent|maxloc|maxval|merge|minexponent|minloc|minval|modulo|nearest|not|pack|precision|present|product|radix|range|repeat|reshape|rrspacing|scale|scan|selected_(int|real)_kind|set_exponent|shape|size|spacing|spread|sum|tiny|transfer|transpose|trim|ubound|unpack|verify)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3231,7 +3127,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Intrinsic functions introduced in the Fortran 1990 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3245,7 +3140,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\b([icd]?abs|acos|[ad]int|[ad]nint|aimag|amax[01]| amin[01]|d?asin|d?atan|d?atan2|char|conjg|[cd]?cos|d?cosh|cmplx|dble| i?dim|dmax1|dmin1|dprod|[cd]?exp|float|ichar|idint|ifix|index|int|len| lge|lgt|lle|llt|[acd]?log|[ad]?log10|max[01]?|min[01]?|[ad]?mod| (id)?nint|real|[di]?sign|[cd]?sin|d?sinh|sngl|[cd]?sqrt|d?tan|d?tanh) \\s*(?=\\()",
+          "begin": "(?i)\\b([icd]?abs|acos|[ad]int|[ad]nint|aimag|amax[01]|amin[01]|d?asin|d?atan|d?atan2|char|conjg|[cd]?cos|d?cosh|cmplx|dble|i?dim|dmax1|dmin1|dprod|[cd]?exp|float|ichar|idint|ifix|index|int|len|lge|lgt|lle|llt|[acd]?log|[ad]?log10|max[01]?|min[01]?|[ad]?mod|(id)?nint|real|[di]?sign|[cd]?sin|d?sinh|sngl|[cd]?sqrt|d?tan|d?tanh)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.intrinsic.fortran"
@@ -3254,7 +3149,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Intrinsic functions introduced in the Fortran 1977 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3272,7 +3166,7 @@
     "intrinsic-subroutines": {
       "patterns": [
         {
-          "begin": "(?ix)\\G\\s*\\b(date_and_time|mvbits|random_number|random_seed| system_clock)\\s*(?=\\()",
+          "begin": "(?i)\\G\\s*\\b(date_and_time|mvbits|random_number|random_seed|system_clock)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.subroutine.fortran"
@@ -3281,7 +3175,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Intrinsic subroutines introduced in the Fortran 1990 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3304,7 +3197,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Intrinsic subroutines introduced in the Fortran 1995 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3327,7 +3219,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Subroutines accessable through the intrinsic IEEE_ARITHMETIC module. Introduced in the Fortran 2003 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3350,7 +3241,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Subroutines accessable through the intrinsic IEEE_EXCEPTIONS module. Introduced in the Fortran 2003 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3364,7 +3254,7 @@
           ]
         },
         {
-          "begin": "(?i)\\G\\s*\\b(c_f_(pointer|procpointer))\\s*(?=\\()",
+          "begin": "(?i)\\G\\s*\\b(c_f_(p(?:ointer|rocpointer)))\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.subroutine.fortran"
@@ -3373,7 +3263,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Subroutines accessable through the intrinsic ISO_C_BINDING module. Introduced in the Fortran 2003 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3387,7 +3276,7 @@
           ]
         },
         {
-          "begin": "(?ix)\\G\\s*\\b(execute_command_line|get_command| get_command_argument|get_environment_variable|move_alloc)\\s*(?=\\()",
+          "begin": "(?i)\\G\\s*\\b(execute_command_line|get_command|get_command_argument|get_environment_variable|move_alloc)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.subroutine.fortran"
@@ -3396,7 +3285,6 @@
               "name": "punctuation.parentheses.left.fortran"
             }
           },
-          "comment": "Intrinsic subroutines introduced in the Fortran 2008 standard.",
           "end": "(?<!\\G)",
           "endCaptures": {
             "1": {
@@ -3426,7 +3314,6 @@
           "name": "storage.modifier.bind.fortran"
         }
       },
-      "comment": "Introduced in Fortran 2003 standard.",
       "end": "(?:\\)|(?=\\n))",
       "patterns": [
         {
@@ -3442,7 +3329,6 @@
       ]
     },
     "line-continuation-operator": {
-      "comment": "Operator that allows a line to be continued on the next line.",
       "patterns": [
         {
           "captures": {
@@ -3487,7 +3373,6 @@
           "name": "constant.language.logical.true.fortran"
         }
       },
-      "comment": "Logical constants",
       "match": "(?i)\\s*(?:(\\.false\\.)|(\\.true\\.))"
     },
     "logical-control-expression": {
@@ -3503,19 +3388,16 @@
     "logical-operators": {
       "patterns": [
         {
-          "comment": "Introduced in the Fortran 1977 standard.",
-          "match": "(?ix)(\\s*\\.(and|eq|eqv|le|lt|ge|gt|ne|neqv|not|or)\\.)",
+          "match": "(?i)(\\s*\\.(and|eq|eqv|le|lt|ge|gt|ne|neqv|not|or)\\.)",
           "name": "keyword.logical.fortran"
         },
         {
-          "comment": "Introduced in the Fortran 1990 standard.",
-          "match": "(\\=\\=|\\/\\=|\\>\\=|(?<!\\=)\\>|\\<\\=|\\<)",
+          "match": "(==|/=|>=|(?<!=)>|<=|<)",
           "name": "keyword.logical.fortran.modern"
         }
       ]
     },
     "logical-type": {
-      "comment": "Introduced in the Fortran 1977 standard.",
       "patterns": [
         {
           "begin": "(?i)\\b(logical)\\s*(?=\\()",
@@ -3562,12 +3444,10 @@
           "name": "storage.modifier.module.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
-      "match": "(?ix)\\s*\\b(module)\\b(?=\\s*(?:[;!\\n]| [^'\";!\\n]*\\b(?:function|procedure|subroutine)\\b))"
+      "match": "(?i)\\s*\\b(module)\\b(?=\\s*(?:[;!\\n]|[^'\";!\\n]*\\b(?:function|procedure|subroutine)\\b))"
     },
     "module-definition": {
-      "begin": "(?ix)(?=\\b(module)\\b)(?![^'\";!\\n]* \\b(?:function|procedure|subroutine)\\b)",
-      "comment": "Introduced in the Fortran 1990 standard.",
+      "begin": "(?i)(?=\\b(module)\\b)(?![^'\";!\\n]*\\b(?:function|procedure|subroutine)\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.module.fortran",
       "patterns": [
@@ -3587,8 +3467,7 @@
               "name": "entity.name.class.module.fortran"
             }
           },
-          "comment": "Module body.",
-          "end": "(?ix)\\b(?:(end\\s*module)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+          "end": "(?i)\\b(?:(end\\s*module)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
           "endCaptures": {
             "1": {
               "name": "keyword.other.endmodule.fortran"
@@ -3606,8 +3485,7 @@
           "patterns": [
             {
               "begin": "\\G",
-              "comment": "Module specification block.",
-              "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*module\\b))",
+              "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*module\\b))",
               "name": "meta.block.specification.module.fortran",
               "patterns": [
                 {
@@ -3617,8 +3495,7 @@
                       "name": "keyword.control.contains.fortran"
                     }
                   },
-                  "comment": "Module contains block.",
-                  "end": "(?i)(?=\\s*(?:end\\s*[;!\\n]|end\\s*module\\b))",
+                  "end": "(?i)(?=\\s*end(?:\\s*[;!\\n]|\\s*module\\b))",
                   "name": "meta.block.contains.fortran",
                   "patterns": [
                     {
@@ -3637,9 +3514,8 @@
     },
     "name-list": {
       "begin": "(?i)(?=\\s*[a-z])",
-      "comment": "Name list.",
       "contentName": "meta.name-list.fortran",
-      "end": "(?=[\\);!\\n])",
+      "end": "(?=[);!\\n])",
       "patterns": [
         {
           "include": "#constants"
@@ -3672,8 +3548,7 @@
     },
     "named-control-constructs": {
       "applyEndPatternLast": 1,
-      "begin": "(?ix)([a-z]\\w*)\\s*(:)(?=\\s*(?:associate|block(?!\\s*data)|critical|do|forall|if|select\\s*case|select\\s*type|select\\s*rank|where)\\b)",
-      "comment": "Introduced in the Fortran 1990 standard.",
+      "begin": "(?i)([a-z]\\w*)\\s*(:)(?=\\s*(?:associate|block(?!\\s*data)|critical|do|forall|if|select\\s*case|select\\s*type|select\\s*rank|where)\\b)",
       "contentName": "meta.named-construct.fortran.modern",
       "end": "(?i)(?!\\s*\\b(?:associate|block(?!\\s*data)|critical|do|forall|if|select\\s*case|select\\s*type|select\\s*rank|where)\\b)(?:\\b(\\1)\\b)?([^\\s;!\\n]*?)?(?=\\s*[;!\\n])",
       "endCaptures": {
@@ -3697,7 +3572,6 @@
           "name": "keyword.control.namelist.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?=[;!\\n])",
       "patterns": [
         {
@@ -3711,7 +3585,6 @@
           "name": "storage.modifier.non-intrinsic.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "match": "(?i)\\s*\\b(non_intrinsic)\\b"
     },
     "non-overridable-attribute": {
@@ -3720,7 +3593,6 @@
           "name": "storage.modifier.non-overridable.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "match": "(?i)\\s*\\b(non_overridable)\\b"
     },
     "nopass-attribute": {
@@ -3729,7 +3601,6 @@
           "name": "storage.modifier.nopass.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "match": "(?i)\\s*\\b(nopass)\\b"
     },
     "nullify-statement": {
@@ -3742,7 +3613,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?<!\\G)",
       "endCaptures": {
         "1": {
@@ -3757,12 +3627,10 @@
       ]
     },
     "numeric-constant": {
-      "comment": "Numeric constants",
-      "match": "(?ix)[\\+\\-]?(\\b\\d+\\.?\\d*|\\.\\d+) (_\\w+|d[\\+\\-]?\\d+|e[\\+\\-]?\\d+(_\\w+)?)?(?![a-z_])",
+      "match": "(?i)[+-]?(\\b\\d+\\.?\\d*|\\.\\d+)(_\\w+|d[+-]?\\d+|e[+-]?\\d+(_\\w+)?)?(?![a-z_])",
       "name": "constant.numeric.fortran"
     },
     "numeric-type": {
-      "comment": "Introduced in the Fortran 1977 standard.",
       "patterns": [
         {
           "begin": "(?i)\\b(?:(complex)|(double\\s*precision)|(double\\s*complex)|(integer)|(real))\\s*(?=\\()",
@@ -3826,7 +3694,7 @@
               "name": "constant.numeric.fortran"
             }
           },
-          "match": "(?ix)\\b(?:(complex)|(double\\s*precision)|(double\\s*complex)|(integer)|(real)|(dimension))\\b(?:\\s*(\\*)\\s*(\\d*))?"
+          "match": "(?i)\\b(?:(complex)|(double\\s*precision)|(double\\s*complex)|(integer)|(real)|(dimension))\\b(?:\\s*(\\*)\\s*(\\d*))?"
         }
       ]
     },
@@ -3840,7 +3708,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Operator generic specification.",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -3893,7 +3760,6 @@
           "name": "storage.modifier.optional.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "match": "(?i)\\s*\\b(optional)\\b"
     },
     "parameter-attribute": {
@@ -3902,7 +3768,6 @@
           "name": "storage.modifier.parameter.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "match": "(?i)\\s*\\b(parameter)\\b"
     },
     "parentheses": {
@@ -3983,7 +3848,6 @@
       ]
     },
     "pass-attribute": {
-      "comment": "Introduced in the Fortran 2003 standard.",
       "patterns": [
         {
           "begin": "(?i)\\s*\\b(pass)\\s*\\(",
@@ -3992,7 +3856,6 @@
               "name": "storage.modifier.pass.fortran"
             }
           },
-          "comment": "Pass attribute with argument.",
           "end": "\\)|(?=\\n)",
           "patterns": [
           ]
@@ -4003,7 +3866,6 @@
               "name": "storage.modifier.pass.fortran"
             }
           },
-          "comment": "Pass attribute without argument.",
           "match": "(?i)\\s*\\b(pass)\\b"
         }
       ]
@@ -4015,7 +3877,6 @@
           "name": "keyword.control.pause.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.control.pause.fortran",
       "patterns": [
@@ -4033,12 +3894,10 @@
           "name": "storage.modifier.pointer.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "match": "(?i)\\s*\\b(pointer)\\b"
     },
     "pointer-operators": {
-      "comment": "Introduced in the Fortran 1990 standard.",
-      "match": "(\\=\\>)",
+      "match": "(=>)",
       "name": "keyword.other.point.fortran"
     },
     "preprocessor": {
@@ -4074,12 +3933,10 @@
           "name": "keyword.operator.multiplication.fortran"
         }
       },
-      "comment": "division regex is different than in main fortran",
-      "match": "(\\-)|(\\+)|(\\/)|(\\*)"
+      "match": "(-)|(\\+)|(/)|(\\*)"
     },
     "preprocessor-assignment-operator": {
-      "comment": "assignments with = are not allowed",
-      "match": "(?<!\\=)(\\=)(?!\\=)",
+      "match": "(?<!=)(=)(?!=)",
       "name": "keyword.operator.assignment.preprocessor.fortran"
     },
     "preprocessor-comments": {
@@ -4380,8 +4237,7 @@
           "name": "keyword.operator.logical.preprocessor.complementary.fortran"
         }
       },
-      "comment": "and:&&, bitand:&, or:||, bitor:|, not eq:!=, not:!, xor:^, compl:~",
-      "match": "(&&)|(==)|(\\!=)|(\\|\\|)|(\\<\\=)|(\\>=)|(\\<)|(\\>)|(~)|(\\^)|(&)|(\\!)|(\\|)",
+      "match": "(&&)|(==)|(!=)|(\\|\\|)|(<=)|(>=)|(<)|(>)|(~)|(\\^)|(&)|(!)|(\\|)",
       "name": "keyword.operator.logical.preprocessor.fortran"
     },
     "preprocessor-operators": {
@@ -4443,7 +4299,6 @@
               "name": "punctuation.definition.string.begin.preprocessor.fortran"
             }
           },
-          "comment": "Double quote string",
           "end": "\"",
           "endCaptures": {
             "0": {
@@ -4459,7 +4314,6 @@
               "name": "punctuation.definition.string.begin.preprocessor.fortran"
             }
           },
-          "comment": "Single quote string",
           "end": "'",
           "endCaptures": {
             "0": {
@@ -4494,16 +4348,14 @@
           "name": "storage.modifier.private.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "match": "(?i)\\s*\\b(private)\\b"
     },
     "procedure-call-dummy-variable": {
-      "match": "(?i)\\s*([a-z]\\w*)(?=\\s*\\=)(?!\\s*\\=\\=)",
+      "match": "(?i)\\s*([a-z]\\w*)(?=\\s*=)(?!\\s*==)",
       "name": "variable.parameter.dummy-variable.fortran.modern"
     },
     "procedure-definition": {
       "begin": "(?i)(?=[^'\";!\\n]*\\bmodule\\s+procedure\\b)",
-      "comment": "Procedure program unit. Introduced in the Fortran 2008 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.procedure.fortran",
       "patterns": [
@@ -4523,8 +4375,7 @@
                   "name": "entity.name.function.procedure.fortran"
                 }
               },
-              "comment": "Procedure body.",
-              "end": "(?ix)\\s*\\b(?:(end\\s*procedure)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+              "end": "(?i)\\s*\\b(?:(end\\s*procedure)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
               "endCaptures": {
                 "1": {
                   "name": "keyword.other.endprocedure.fortran"
@@ -4542,7 +4393,6 @@
               "patterns": [
                 {
                   "begin": "\\G(?!\\s*[;!\\n])",
-                  "comment": "Rest of the first line in procedure construct - should be empty.",
                   "end": "(?=[;!\\n])",
                   "name": "meta.first-line.fortran",
                   "patterns": [
@@ -4553,7 +4403,6 @@
                 },
                 {
                   "begin": "(?i)(?!\\s*(?:contains\\b|end\\s*[;!\\n]|end\\s*procedure\\b))",
-                  "comment": "Specification and execution block.",
                   "end": "(?i)(?=\\s*(?:contains\\b|end\\s*[;!\\n]|end\\s*procedure\\b))",
                   "name": "meta.block.specification.procedure.fortran",
                   "patterns": [
@@ -4569,8 +4418,7 @@
                       "name": "keyword.control.contains.fortran"
                     }
                   },
-                  "comment": "Contains block.",
-                  "end": "(?i)(?=\\s*(?:end\\s*[;!\\n]|end\\s*procedure\\b))",
+                  "end": "(?i)(?=\\s*end(?:\\s*[;!\\n]|\\s*procedure\\b))",
                   "name": "meta.block.contains.fortran",
                   "patterns": [
                     {
@@ -4590,12 +4438,10 @@
           "name": "entity.name.function.procedure.fortran"
         }
       },
-      "comment": "Procedure name.",
       "match": "(?i)\\s*\\b([a-z]\\w*)\\b"
     },
     "procedure-name-list": {
       "begin": "(?i)(?=\\s*[a-z])",
-      "comment": "Name list.",
       "contentName": "meta.name-list.fortran",
       "end": "(?=[;!\\n])",
       "patterns": [
@@ -4619,8 +4465,7 @@
       ]
     },
     "procedure-specification-statement": {
-      "begin": "(?i)(?=\\b(?:procedure)\\b)",
-      "comment": "Introduced in the Fortran 2003 standard.",
+      "begin": "(?i)(?=\\bprocedure\\b)",
       "end": "(?=[;!\\n])",
       "name": "meta.specification.procedure.fortran",
       "patterns": [
@@ -4629,7 +4474,6 @@
         },
         {
           "begin": "(?=\\s*(,|::|\\())",
-          "comment": "Attribute list.",
           "contentName": "meta.attribute-list.procedure.fortran",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
@@ -4645,7 +4489,7 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "end": "(?=::|[,&;!\\n])",
+              "end": "(?=::|[,\\&;!\\n])",
               "patterns": [
                 {
                   "include": "#access-attribute"
@@ -4678,7 +4522,6 @@
       ]
     },
     "procedure-type": {
-      "comment": "Introduced in the Fortran ???? standard.",
       "patterns": [
         {
           "begin": "(?i)\\b(procedure)\\s*(\\()",
@@ -4718,7 +4561,6 @@
     },
     "program-definition": {
       "begin": "(?i)(?=\\b(program)\\b)",
-      "comment": "Introduced in the Fortran 1977 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.program.fortran",
       "patterns": [
@@ -4738,8 +4580,7 @@
               "name": "entity.name.program.fortran"
             }
           },
-          "comment": "Program body.",
-          "end": "(?ix)\\b(?:(end\\s*program)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
+          "end": "(?i)\\b(?:(end\\s*program)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
           "endCaptures": {
             "1": {
               "name": "keyword.control.endprogram.fortran"
@@ -4757,8 +4598,7 @@
           "patterns": [
             {
               "begin": "\\G",
-              "comment": "Program specification block.",
-              "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*program\\b))",
+              "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*program\\b))",
               "name": "meta.block.specification.program.fortran",
               "patterns": [
                 {
@@ -4768,8 +4608,7 @@
                       "name": "keyword.control.contains.fortran"
                     }
                   },
-                  "comment": "Program contains block.",
-                  "end": "(?i)(?=(?:end\\s*[;!\\n]|end\\s*program\\b))",
+                  "end": "(?i)(?=end(?:\\s*[;!\\n]|\\s*program\\b))",
                   "name": "meta.block.contains.fortran",
                   "patterns": [
                     {
@@ -4792,7 +4631,6 @@
           "name": "storage.modifier.protected.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "match": "(?i)\\s*\\b(protected)\\b"
     },
     "public-attribute": {
@@ -4801,7 +4639,6 @@
           "name": "storage.modifier.public.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "match": "(?i)\\s*\\b(public)\\b"
     },
     "pure-attribute": {
@@ -4813,7 +4650,6 @@
           "name": "storage.modifier.pure.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1995 standard.",
       "match": "(?i)\\s*\\b(?:(impure)|(pure))\\b"
     },
     "recursive-attribute": {
@@ -4825,7 +4661,6 @@
           "name": "storage.modifier.recursive.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "match": "(?i)\\s*\\b(?:(non_recursive)|(recursive))\\b"
     },
     "result-statement": {
@@ -4838,7 +4673,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -4858,7 +4692,6 @@
           "name": "keyword.control.return.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.control.return.fortran",
       "patterns": [
@@ -4873,7 +4706,6 @@
           "name": "storage.modifier.save.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "match": "(?i)\\s*\\b(save)\\b"
     },
     "select-case-construct": {
@@ -4883,7 +4715,6 @@
           "name": "keyword.control.selectcase.fortran"
         }
       },
-      "comment": "Select case construct. Introduced in the Fortran 1990 standard.",
       "end": "(?i)\\b(end\\s*select)\\b",
       "endCaptures": {
         "1": {
@@ -4932,7 +4763,6 @@
           "name": "keyword.control.selectrank.fortran"
         }
       },
-      "comment": "Select rank construct. Introduced in the Fortran 2008 standard.",
       "end": "(?i)\\b(end\\s*select)\\b",
       "endCaptures": {
         "1": {
@@ -4981,7 +4811,6 @@
           "name": "keyword.control.selecttype.fortran"
         }
       },
-      "comment": "Select type construct. Introduced in the Fortran 2003 standard.",
       "end": "(?i)\\b(end\\s*select)\\b",
       "endCaptures": {
         "1": {
@@ -5040,7 +4869,6 @@
           "name": "storage.modifier.sequence.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 20?? standard.",
       "match": "(?i)\\s*\\b(sequence)\\b"
     },
     "specification-statements": {
@@ -5078,7 +4906,6 @@
           "name": "meta.label.stop.stop"
         }
       },
-      "comment": "Introduced in the Fortran 1977 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.control.stop.fortran",
       "patterns": [
@@ -5094,7 +4921,6 @@
       ]
     },
     "string-constant": {
-      "comment": "Introduced in the Fortran 1977 standard.",
       "patterns": [
         {
           "applyEndPatternLast": 1,
@@ -5104,7 +4930,6 @@
               "name": "punctuation.definition.string.begin.fortran"
             }
           },
-          "comment": "String",
           "end": "'",
           "endCaptures": {
             "0": {
@@ -5127,7 +4952,6 @@
               "name": "punctuation.definition.string.begin.fortran"
             }
           },
-          "comment": "String",
           "end": "\"",
           "endCaptures": {
             "0": {
@@ -5151,8 +4975,7 @@
           "name": "keyword.operator.line-continuation.fortran"
         }
       },
-      "comment": "Operator that allows a line to be continued on the next line.",
-      "end": "(?i)^(?:(?=\\s*[^\\s!&])|\\s*(&))",
+      "end": "(?i)^(?:(?=\\s*[^\\s!\\&])|\\s*(&))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.line-continuation.fortran"
@@ -5169,13 +4992,11 @@
       ]
     },
     "string-operators": {
-      "comment": "Introduced in the Fortran 19?? standard.",
-      "match": "(\\/\\/)",
+      "match": "(//)",
       "name": "keyword.other.concatination.fortran"
     },
     "submodule-definition": {
       "begin": "(?i)(?=\\b(submodule)\\s*\\()",
-      "comment": "Introduced in the Fortran 2008 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.submodule.fortran",
       "patterns": [
@@ -5209,8 +5030,7 @@
               "name": "entity.name.module.submodule.fortran"
             }
           },
-          "comment": "Submodule body.",
-          "end": "(?ix)\\s*\\b(?:(end\\s*submodule)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+          "end": "(?i)\\s*\\b(?:(end\\s*submodule)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
           "endCaptures": {
             "1": {
               "name": "keyword.other.endsubmodule.fortran"
@@ -5228,8 +5048,7 @@
           "patterns": [
             {
               "begin": "\\G",
-              "comment": "Submodule specification block.",
-              "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*submodule\\b))",
+              "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*submodule\\b))",
               "name": "meta.block.specification.submodule.fortran",
               "patterns": [
                 {
@@ -5239,8 +5058,7 @@
                       "name": "keyword.control.contains.fortran"
                     }
                   },
-                  "comment": "Submodule contains block.",
-                  "end": "(?i)(?=\\s*(?:end\\s*[;!\\n]|end\\s*submodule\\b))",
+                  "end": "(?i)(?=\\s*end(?:\\s*[;!\\n]|\\s*submodule\\b))",
                   "name": "meta.block.contains.fortran",
                   "patterns": [
                     {
@@ -5259,13 +5077,11 @@
     },
     "subroutine-definition": {
       "begin": "(?i)(?=([^:'\";!\\n](?!\\bend))*\\bsubroutine\\b)",
-      "comment": "Subroutine program unit. Introduced in the Fortran 1977 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.subroutine.fortran",
       "patterns": [
         {
           "begin": "(?i)(?=\\G\\s*(?!\\bsubroutine\\b))",
-          "comment": "Attribute list.",
           "end": "(?i)(?=\\bsubroutine\\b)",
           "name": "meta.attribute-list.subroutine.fortran",
           "patterns": [
@@ -5302,8 +5118,7 @@
                   "name": "entity.name.function.subroutine.fortran"
                 }
               },
-              "comment": "Subroutine body.",
-              "end": "(?ix)\\b(?:(end\\s*subroutine)(?:\\s+([a-z_]\\w*))?|(end))\\b \\s*([^;!\\n]+)?(?=[;!\\n])",
+              "end": "(?i)\\b(?:(end\\s*subroutine)(?:\\s+([a-z_]\\w*))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
               "endCaptures": {
                 "1": {
                   "name": "keyword.other.endsubroutine.fortran"
@@ -5321,7 +5136,6 @@
               "patterns": [
                 {
                   "begin": "\\G(?!\\s*[;!\\n])",
-                  "comment": "Rest of the first line in subroutine construct.",
                   "end": "(?=[;!\\n])",
                   "name": "meta.first-line.fortran",
                   "patterns": [
@@ -5334,9 +5148,8 @@
                   ]
                 },
                 {
-                  "begin": "(?i)(?!\\b(?:end\\s*[;!\\n]|end\\s*subroutine\\b))",
-                  "comment": "Specification and execution block.",
-                  "end": "(?i)(?=\\b(?:end\\s*[;!\\n]|end\\s*subroutine\\b))",
+                  "begin": "(?i)(?!\\bend(?:\\s*[;!\\n]|\\s*subroutine\\b))",
+                  "end": "(?i)(?=\\bend(?:\\s*[;!\\n]|\\s*subroutine\\b))",
                   "name": "meta.block.specification.subroutine.fortran",
                   "patterns": [
                     {
@@ -5346,8 +5159,7 @@
                           "name": "keyword.control.contains.fortran"
                         }
                       },
-                      "comment": "Contains block.",
-                      "end": "(?i)(?=(?:end\\s*[;!\\n]|end\\s*subroutine\\b))",
+                      "end": "(?i)(?=end(?:\\s*[;!\\n]|\\s*subroutine\\b))",
                       "name": "meta.block.contains.fortran",
                       "patterns": [
                         {
@@ -5367,7 +5179,7 @@
       ]
     },
     "sync-all-statement": {
-      "begin": "(?i)\\b(sync all|sync memory)(\\s*(?=\\())?",
+      "begin": "(?i)\\b(sync (?:all|memory))(\\s*(?=\\())?",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.sync-all-memory.fortran"
@@ -5376,7 +5188,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2018 standard.",
       "end": "(?<!\\G)",
       "endCaptures": {
         "1": {
@@ -5391,7 +5202,7 @@
       ]
     },
     "sync-statement": {
-      "begin": "(?i)\\b(sync images|sync team)\\s*(?=\\()",
+      "begin": "(?i)\\b(sync (?:images|team))\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.sync-images-team.fortran"
@@ -5400,7 +5211,6 @@
           "name": "punctuation.parentheses.left.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2018 standard.",
       "end": "(?<!\\G)",
       "endCaptures": {
         "1": {
@@ -5420,13 +5230,11 @@
           "name": "storage.modifier.target.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "match": "(?i)\\s*\\b(target)\\b"
     },
     "type-specification-statements": {
-      "begin": "(?ix)(?=\\b(?:character|class|complex|double\\s*precision|double\\s*complex|integer|logical|real|type|dimension)\\b(?![^'\";!\\n:]*\\bfunction\\b))",
-      "comment": "Supported types for function and escape :: if function is used as a variable name (which is bad practice).",
-      "end": "(?=[\\);!\\n])",
+      "begin": "(?i)(?=\\b(?:character|class|complex|double\\s*precision|double\\s*complex|integer|logical|real|type|dimension)\\b(?![^'\";!\\n:]*\\bfunction\\b))",
+      "end": "(?=[);!\\n])",
       "name": "meta.specification.type.fortran",
       "patterns": [
         {
@@ -5434,7 +5242,6 @@
         },
         {
           "begin": "(?=\\s*(,|::))",
-          "comment": "Attribute list.",
           "contentName": "meta.attribute-list.type-specification-statements.fortran",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
@@ -5450,7 +5257,7 @@
                   "name": "punctuation.comma.fortran"
                 }
               },
-              "end": "(?=::|[,&;!\\n])",
+              "end": "(?=::|[,\\&;!\\n])",
               "patterns": [
                 {
                   "include": "#access-attribute"
@@ -5575,13 +5382,11 @@
           "name": "keyword.control.use.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1990 standard.",
       "end": "(?=[;!\\n])",
       "name": "meta.statement.use.fortran",
       "patterns": [
         {
           "begin": "(?=\\s*(,|::|\\())",
-          "comment": "Attribute list.",
           "contentName": "meta.attribute-list.namelist.fortran",
           "end": "(::)|(?=[;!\\n])",
           "endCaptures": {
@@ -5680,7 +5485,6 @@
           "name": "storage.modifier.value.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "match": "(?i)\\s*\\b(value)\\b"
     },
     "variable": {
@@ -5709,7 +5513,6 @@
           "name": "storage.modifier.volatile.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 2003 standard.",
       "match": "(?i)\\s*\\b(volatile)\\b"
     },
     "where-construct": {
@@ -5722,7 +5525,6 @@
               "name": "keyword.control.where.fortran"
             }
           },
-          "comment": "Introduced in the Fortran 1990 standard.",
           "end": "(?<!\\G)",
           "patterns": [
             {
@@ -5781,7 +5583,6 @@
           "name": "keyword.control.while.fortran"
         }
       },
-      "comment": "Introduced in the Fortran 1995 standard.",
       "end": "(?=[;!\\n])",
       "patterns": [
         {
@@ -5795,7 +5596,7 @@
     "word": {
       "patterns": [
         {
-          "match": "(?i)(?:\\G|(?<=\\%))\\s*\\b([a-z]\\w*)\\b"
+          "match": "(?i)(?:\\G|(?<=%))\\s*\\b([a-z]\\w*)\\b"
         }
       ]
     }
diff --git a/resources/languages/fsharp.json b/resources/languages/fsharp.json
index e645d69..2ba1ca1 100644
--- a/resources/languages/fsharp.json
+++ b/resources/languages/fsharp.json
@@ -59,7 +59,7 @@
   ],
   "repository": {
     "abstract_definition": {
-      "begin": "\\b(static\\s+)?(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(<)?",
+      "begin": "\\b(static\\s+)?(abstract)\\s+(member)?(\\s+\\[<.*>])?\\s*([_[:alpha:]0-9,.`\\s]+)(<)?",
       "beginCaptures": {
         "1": {
           "name": "keyword.fsharp"
@@ -106,7 +106,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "(\\?{0,1})([[:alpha:]0-9'`^._ ]+)\\s*(:)((?!with\\b)\\b([\\w0-9'`^._ ]+)){0,1}"
+          "match": "(\\??)([[:alpha:]0-9'`^._ ]+)\\s*(:)((?!with\\b)\\b([\\w0-9'`^._ ]+))?"
         },
         {
           "captures": {
@@ -175,7 +175,7 @@
           "name": "keyword.symbol.fsharp"
         }
       },
-      "end": "(\\|\\})",
+      "end": "(\\|})",
       "endCaptures": {
         "1": {
           "name": "keyword.symbol.fsharp"
@@ -209,8 +209,8 @@
     "attributes": {
       "patterns": [
         {
-          "begin": "\\[\\<",
-          "end": "\\>\\]|\\]",
+          "begin": "\\[<",
+          "end": ">]|]",
           "name": "support.function.attribute.fsharp",
           "patterns": [
             {
@@ -317,17 +317,17 @@
           "name": "comment.block.markdown.fsharp.end"
         },
         {
-          "begin": "(?<![!%&+-.<=>?@^|/])///(?!/)",
+          "begin": "(?<![!%\\&+-.<=>?@^|/])///(?!/)",
           "name": "comment.line.markdown.fsharp",
           "patterns": [
             {
               "include": "text.html.markdown"
             }
           ],
-          "while": "(?<![!%&+-.<=>?@^|/])///(?!/)"
+          "while": "(?<![!%\\&+-.<=>?@^|/])///(?!/)"
         },
         {
-          "match": "(?<![!%&+-.<=>?@^|/])//(.*$)",
+          "match": "(?<![!%\\&+-.<=>?@^|/])//(.*$)",
           "name": "comment.line.double-slash.fsharp"
         }
       ]
@@ -354,7 +354,7 @@
             }
           },
           "comments": "SRTP syntax support",
-          "end": "(\\))\\s*((?=,)|(?=\\=))",
+          "end": "(\\))\\s*((?=,)|(?==))",
           "endCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -432,11 +432,10 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "comment": "Because we first capture the keywords, we can capture what looks like a word and assume it's an entity definition",
               "match": "([[:alpha:]0-9'^._]+)"
             },
             {
-              "match": "(\\(|\\))",
+              "match": "([()])",
               "name": "keyword.symbol.fsharp"
             }
           ]
@@ -514,7 +513,7 @@
           ]
         },
         {
-          "begin": "(<+(?![[:space:]]*\\)))",
+          "begin": "(<+(?!\\s*\\)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -538,7 +537,7 @@
           "include": "#anonymous_record_declaration"
         },
         {
-          "begin": "({)",
+          "begin": "(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -617,7 +616,7 @@
           "include": "#anonymous_record_declaration"
         },
         {
-          "begin": "(\\?{0,1})([[:alpha:]0-9'`^._ ]+)\\s*(:)(\\s*([?[:alpha:]0-9'`^._ ]+)(<))",
+          "begin": "(\\??)([[:alpha:]0-9'`^._ ]+)\\s*(:)(\\s*([?[:alpha:]0-9'`^._ ]+)(<))",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -662,7 +661,7 @@
         {
           "captures": {
           },
-          "match": "\\s?(#if|#elif|#elseif|#else|#endif|#light|#nowarn)",
+          "match": "\\s?(#(?:if|elif|elseif|else|endif|light|nowarn))",
           "name": "keyword.control.directive.fsharp"
         }
       ]
@@ -678,7 +677,7 @@
           "name": "constant.numeric.float.fsharp"
         },
         {
-          "match": "\\b(-?((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(0(o|O)[0-7][0-7_]*)|(0(b|B)[01][01_]*)|([0-9][0-9_]*)))",
+          "match": "\\b(-?((0([xX])\\h[_\\h]*)|(0([oO])[0-7][0-7_]*)|(0([bB])[01][01_]*)|([0-9][0-9_]*)))",
           "name": "constant.numeric.integer.nativeint.fsharp"
         },
         {
@@ -694,7 +693,7 @@
     "definition": {
       "patterns": [
         {
-          "begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|member inline|static member inline|static member val|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|member inline|static member inline|static member val|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)*)?",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -712,7 +711,7 @@
               "name": "variable.fsharp"
             }
           },
-          "end": "\\s*((with\\b)|(=|\\n+=|(?<=\\=)))",
+          "end": "\\s*((with\\b)|(=|\\n+=|(?<==)))",
           "endCaptures": {
             "2": {
               "name": "keyword.fsharp"
@@ -729,7 +728,7 @@
           ]
         },
         {
-          "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)*)?",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -749,13 +748,13 @@
           ]
         },
         {
-          "begin": "(?<=with|and)\\s*\\b((get|set)\\s*(?=\\())(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
+          "begin": "(?<=with|and)\\s*\\b((get|set)\\s*(?=\\())(\\[[^-=]*]|[_[:alpha:]]([_[:alpha:]0-9.]+)*|``[_[:alpha:]]([_[:alpha:]0-9.`\\s]+|(?<=,)\\s)*)?",
           "beginCaptures": {
             "4": {
               "name": "variable.fsharp"
             }
           },
-          "end": "\\s*(=|\\n+=|(?<=\\=))",
+          "end": "\\s*(=|\\n+=|(?<==))",
           "endCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -769,7 +768,7 @@
           ]
         },
         {
-          "begin": "\\b(static val mutable|val mutable|val inline|val)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9,\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9,\\._`\\s]+|(?<=,)\\s)*)?",
+          "begin": "\\b(static val mutable|val mutable|val inline|val)(\\s+rec|mutable)?(\\s+\\[<.*>])?\\s*(private|internal|public)?\\s+(\\[[^-=]*]|[_[:alpha:]]([_[:alpha:]0-9,.]+)*|``[_[:alpha:]]([_[:alpha:]0-9,.`\\s]+|(?<=,)\\s)*)?",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -939,7 +938,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "(('|\\^)[[:alpha:]0-9'._]+)"
+              "match": "((['^])[[:alpha:]0-9'._]+)"
             },
             {
               "include": "#variables"
@@ -950,7 +949,7 @@
           ]
         },
         {
-          "match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|enum|member|try|finally|and|when|or|use|use\\!|struct|while|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b",
+          "match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let!|return!|return|interface|with|abstract|enum|member|try|finally|and|when|or|use|use!|struct|while|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b",
           "name": "keyword.fsharp"
         },
         {
@@ -966,7 +965,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "(('|\\^)[[:alpha:]0-9'._]+)"
+          "match": "((['^])[[:alpha:]0-9'._]+)"
         },
         {
           "begin": "(<)",
@@ -988,7 +987,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "(('|\\^)[[:alpha:]0-9'._]+)"
+              "match": "((['^])[[:alpha:]0-9'._]+)"
             },
             {
               "include": "#tuple_signature"
@@ -1055,7 +1054,7 @@
           "name": "storage.modifier"
         },
         {
-          "match": "\\b(private|to|public|internal|function|class|exception|delegate|of|new|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use\\!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b",
+          "match": "\\b(private|to|public|internal|function|class|exception|delegate|of|new|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b",
           "name": "keyword.fsharp"
         },
         {
@@ -1063,11 +1062,11 @@
           "name": "keyword.control"
         },
         {
-          "match": "(\\->|\\<\\-)",
+          "match": "(->|<-)",
           "name": "keyword.symbol.arrow.fsharp"
         },
         {
-          "match": "[.?]*(&&&|\\|\\|\\||\\^\\^\\^|~~~|~\\+|~\\-|<<<|>>>|\\|>|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|&|%|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)[.?]*",
+          "match": "[.?]*(&&&|\\|\\|\\||\\^\\^\\^|~~~|~\\+|~-|<<<|>>>|\\|>|:>|:\\?>|[:\\[\\];]|<>|[=@]|\\|\\||&&|[\\&%{}|_]|\\.\\.|[,+\\-*/^!>]|>=|>>|<|<=|[()]|<<)[.?]*",
           "name": "keyword.symbol.fsharp"
         }
       ]
@@ -1094,7 +1093,7 @@
             }
           },
           "comments": "SRTP syntax support",
-          "end": "(\\))\\s*((?=,)|(?=\\=))",
+          "end": "(\\))\\s*((?=,)|(?==))",
           "endCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -1149,7 +1148,7 @@
           "name": "keyword.fsharp"
         },
         {
-          "match": "(\\(|\\))",
+          "match": "([()])",
           "name": "keyword.symbol.fsharp"
         },
         {
@@ -1167,7 +1166,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "(\\?{0,1})([[:alpha:]0-9'`^._]+|``[[:alpha:]0-9'`^:,._ ]+``)\\s*(:{0,1})(\\s*([?[:alpha:]0-9'`<>._ ]+)){0,1}"
+          "match": "(\\??)([[:alpha:]0-9'`^._]+|``[[:alpha:]0-9'`^:,._ ]+``)\\s*(:?)(\\s*([?[:alpha:]0-9'`<>._ ]+))?"
         },
         {
           "include": "#keywords"
@@ -1177,7 +1176,7 @@
     "modules": {
       "patterns": [
         {
-          "begin": "\\b(namespace global)|\\b(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]|``][[:alpha:]0-9'_. ]*)",
+          "begin": "\\b(?:(namespace global)|(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]|`][[:alpha:]0-9'_. ]*))",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -1215,7 +1214,7 @@
           ]
         },
         {
-          "begin": "\\b(open type|open)\\s+([[:alpha:]|``][[:alpha:]0-9'_]*)(?=(\\.[A-Z][[:alpha:]0-9_]*)*)",
+          "begin": "\\b(open(?: type|))\\s+([[:alpha:]|`][[:alpha:]0-9'_]*)(?=(\\.[A-Z][[:alpha:]0-9_]*)*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -1236,7 +1235,7 @@
                   "name": "entity.name.section.fsharp"
                 }
               },
-              "match": "(\\.)([[:alpha:]][[:alpha:]0-9'_]*)",
+              "match": "(\\.)(\\p{alpha}[[:alpha:]0-9'_]*)",
               "name": "entity.name.section.fsharp"
             },
             {
@@ -1288,13 +1287,13 @@
               "name": "keyword.symbol.fsharp"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "begin": "(((mutable)\\s[[:alpha:]]+)|[[:alpha:]0-9'`<>^._]*)\\s*((?<!:):(?!:))\\s*",
+              "begin": "(((mutable)\\s\\p{alpha}+)|[[:alpha:]0-9'`<>^._]*)\\s*((?<!:):(?!:))\\s*",
               "beginCaptures": {
                 "3": {
                   "name": "keyword.fsharp"
@@ -1303,7 +1302,7 @@
                   "name": "keyword.symbol.fsharp"
                 }
               },
-              "end": "$|(;|\\})",
+              "end": "$|([;}])",
               "endCaptures": {
                 "1": {
                   "name": "keyword.symbol.fsharp"
@@ -1377,7 +1376,7 @@
           "match": "[[:alpha:]0-9'`^_ ]+(=)([[:alpha:]0-9'`^_ ]+)"
         },
         {
-          "begin": "({)",
+          "begin": "(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -1414,7 +1413,7 @@
     "records": {
       "patterns": [
         {
-          "begin": "\\b(type)[\\s]+(private|internal|public)?\\s*",
+          "begin": "\\b(type)\\s+(private|internal|public)?\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -1480,7 +1479,7 @@
                       "name": "entity.name.type.fsharp"
                     }
                   },
-                  "match": "(('|\\^)``[[:alpha:]0-9`^:,._ ]+``|('|\\^)[[:alpha:]0-9`^:._]+)"
+                  "match": "((['^])``[[:alpha:]0-9`^:,._ ]+``|(['^])[[:alpha:]0-9`^:._]+)"
                 },
                 {
                   "match": "\\b(interface|with|abstract|and|when|or|not|struct|equality|comparison|unmanaged|delegate|enum)\\b",
@@ -1569,7 +1568,7 @@
               "name": "keyword.format.specifier.fsharp"
             }
           },
-          "match": "(%0?-?(\\d+)?((a|t)|(\\.\\d+)?(f|F|e|E|g|G|M)|(b|c|s|d|i|x|X|o|u)|(s|b|O)|(\\+?A)))",
+          "match": "(%0?-?(\\d+)?(([at])|(\\.\\d+)?([fFeEgGM])|([bcsdixXou])|([sbO])|(\\+?A)))",
           "name": "entity.name.type.format.specifier.fsharp"
         }
       ]
@@ -1637,11 +1636,11 @@
               "name": "punctuation.separator.string.ignore-eol.fsharp"
             },
             {
-              "match": "\\\\(['\"\\\\abfnrtv]|([01][0-9][0-9]|2[0-4][0-9]|25[0-5])|(x[0-9a-fA-F]{2})|(u[0-9a-fA-F]{4})|(U00(0[0-9a-fA-F]|10)[0-9a-fA-F]{4}))",
+              "match": "\\\\(['\"\\\\abfnrtv]|([01][0-9][0-9]|2[0-4][0-9]|25[0-5])|(x\\h{2})|(u\\h{4})|(U00(0\\h|10)\\h{4}))",
               "name": "constant.character.string.escape.fsharp"
             },
             {
-              "match": "\\\\(([0-9]{1,3})|(x[^\\s]{0,2})|(u[^\\s]{0,4})|(U[^\\s]{0,8})|[^\\s])",
+              "match": "\\\\(([0-9]{1,3})|(x\\S{0,2})|(u\\S{0,4})|(U\\S{0,8})|\\S)",
               "name": "invalid.illegal.character.string.fsharp"
             },
             {
@@ -1830,7 +1829,7 @@
               "name": "variable.parameter.fsharp"
             }
           },
-          "match": "(\\?{0,1})(``[[:alpha:]0-9'`^:,._ ]+``|(?!private|struct\\b)\\b[\\w[:alpha:]0-9'`<>^._ ]+)"
+          "match": "(\\??)(``[[:alpha:]0-9'`^:,._ ]+``|(?!private|struct\\b)\\b[\\w[:alpha:]0-9'`<>^._ ]+)"
         }
       ]
     }
diff --git a/resources/languages/gdresource.json b/resources/languages/gdresource.json
index a00758a..713be57 100644
--- a/resources/languages/gdresource.json
+++ b/resources/languages/gdresource.json
@@ -40,7 +40,7 @@
               "name": "punctuation.definition.table.inline.gdresource"
             }
           },
-          "end": "\\s*(\\})(?!\\w)",
+          "end": "\\s*(})(?!\\w)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.table.inline.gdresource"
@@ -62,7 +62,7 @@
               "name": "punctuation.definition.array.gdresource"
             }
           },
-          "end": "\\s*(\\])(?!\\w)",
+          "end": "\\s*(])(?!\\w)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.array.gdresource"
@@ -80,7 +80,7 @@
           "name": "string.quoted.triple.basic.block.gdresource",
           "patterns": [
             {
-              "match": "\\\\([btnfr\"\\\\\\n/ ]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\([btnfr\"\\\\\\n/ ]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape.gdresource"
             },
             {
@@ -90,7 +90,7 @@
           ]
         },
         {
-          "match": "\"res:\\/\\/[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"",
+          "match": "\"res://[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"",
           "name": "support.function.any-method.gdresource"
         },
         {
@@ -107,7 +107,7 @@
           "name": "string.quoted.double.basic.line.gdresource",
           "patterns": [
             {
-              "match": "\\\\([btnfr\"\\\\\\n/ ]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\([btnfr\"\\\\\\n/ ]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape.gdresource"
             },
             {
@@ -125,23 +125,23 @@
           "name": "constant.language.gdresource"
         },
         {
-          "match": "(?<!\\w)([\\+\\-]?(0|([1-9](([0-9]|_[0-9])+)?))(?:(?:\\.(0|([1-9](([0-9]|_[0-9])+)?)))?[eE][\\+\\-]?[1-9]_?[0-9]*|(?:\\.[0-9_]*)))(?!\\w)",
+          "match": "(?<!\\w)([+-]?(0|([1-9](([0-9]|_[0-9])+)?))(?:(?:\\.(0|([1-9](([0-9]|_[0-9])+)?)))?[eE][+-]?[1-9]_?[0-9]*|\\.[0-9_]*))(?!\\w)",
           "name": "constant.numeric.float.gdresource"
         },
         {
-          "match": "(?<!\\w)((?:[\\+\\-]?(0|([1-9](([0-9]|_[0-9])+)?))))(?!\\w)",
+          "match": "(?<!\\w)([+-]?(0|([1-9](([0-9]|_[0-9])+)?)))(?!\\w)",
           "name": "constant.numeric.integer.gdresource"
         },
         {
-          "match": "(?<!\\w)([\\+\\-]?inf)(?!\\w)",
+          "match": "(?<!\\w)([+-]?inf)(?!\\w)",
           "name": "constant.numeric.inf.gdresource"
         },
         {
-          "match": "(?<!\\w)([\\+\\-]?nan)(?!\\w)",
+          "match": "(?<!\\w)([+-]?nan)(?!\\w)",
           "name": "constant.numeric.nan.gdresource"
         },
         {
-          "match": "(?<!\\w)((?:0x(([0-9a-fA-F](([0-9a-fA-F]|_[0-9a-fA-F])+)?))))(?!\\w)",
+          "match": "(?<!\\w)(0x((\\h((\\h|_\\h)+)?)))(?!\\w)",
           "name": "constant.numeric.hex.gdresource"
         },
         {
@@ -195,7 +195,6 @@
           "name": "variable.other.property.gdresource"
         }
       },
-      "comment": "meta.embedded.block.gdscript",
       "end": "\"",
       "patterns": [
         {
@@ -225,7 +224,7 @@
           "name": "keyword.control.gdresource"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#heading_properties"
@@ -238,11 +237,11 @@
     "heading_properties": {
       "patterns": [
         {
-          "match": "(\\s*[A-Za-z_\\-][A-Za-z0-9_\\-]*\\s*=)(?=\\s*$)",
+          "match": "(\\s*[A-Za-z_-][A-Za-z0-9_-]*\\s*=)(?=\\s*$)",
           "name": "invalid.illegal.noValue.gdresource"
         },
         {
-          "begin": "\\s*([A-Za-z_-][^\\s]*|\".+\"|'.+'|[0-9]+)\\s*(=)\\s*",
+          "begin": "\\s*([A-Za-z_-]\\S*|\".+\"|'.+'|[0-9]+)\\s*(=)\\s*",
           "beginCaptures": {
             "1": {
               "name": "variable.other.property.gdresource"
@@ -251,7 +250,7 @@
               "name": "punctuation.definition.keyValue.gdresource"
             }
           },
-          "end": "($|(?==)|\\,?|\\s*(?=\\}))",
+          "end": "($|(?==)|,?|\\s*(?=}))",
           "patterns": [
             {
               "include": "#data"
@@ -263,11 +262,11 @@
     "key_value": {
       "patterns": [
         {
-          "match": "(\\s*[A-Za-z_\\-][A-Za-z0-9_\\-]*\\s*=)(?=\\s*$)",
+          "match": "(\\s*[A-Za-z_-][A-Za-z0-9_-]*\\s*=)(?=\\s*$)",
           "name": "invalid.illegal.noValue.gdresource"
         },
         {
-          "begin": "\\s*([A-Za-z_-][^\\s]*|\".+\"|'.+'|[0-9]+)\\s*(=)\\s*",
+          "begin": "\\s*([A-Za-z_-]\\S*|\".+\"|'.+'|[0-9]+)\\s*(=)\\s*",
           "beginCaptures": {
             "1": {
               "name": "variable.other.property.gdresource"
@@ -276,7 +275,7 @@
               "name": "punctuation.definition.keyValue.gdresource"
             }
           },
-          "end": "($|(?==)|\\,|\\s*(?=\\}))",
+          "end": "($|(?==)|,|\\s*(?=}))",
           "patterns": [
             {
               "include": "#data"
diff --git a/resources/languages/gdscript.json b/resources/languages/gdscript.json
index ae76beb..3fab2d4 100644
--- a/resources/languages/gdscript.json
+++ b/resources/languages/gdscript.json
@@ -34,7 +34,7 @@
       },
       "patterns": [
         {
-          "include": "#base_expression"
+          "include": "#expression"
         },
         {
           "match": "=(?!=)",
@@ -54,7 +54,7 @@
       "match": "(@)(export|export_group|export_color_no_alpha|export_custom|export_dir|export_enum|export_exp_easing|export_file|export_flags|export_flags_2d_navigation|export_flags_2d_physics|export_flags_2d_render|export_flags_3d_navigation|export_flags_3d_physics|export_flags_3d_render|export_global_dir|export_global_file|export_multiline|export_node_path|export_placeholder|export_range|export_storage|icon|onready|rpc|tool|warning_ignore|static_unload)\\b"
     },
     "any_method": {
-      "match": "\\b([A-Za-z_]\\w*)\\b(?=\\s*(?:[(]))",
+      "match": "\\b([A-Za-z_]\\w*)\\b(?=\\s*\\()",
       "name": "entity.name.function.other.gdscript"
     },
     "any_property": {
@@ -69,14 +69,14 @@
           "name": "variable.other.property.gdscript"
         }
       },
-      "match": "\\b(\\.)\\s*(?<![@\\$#%])(?:([A-Z_][A-Z_0-9]*)|([A-Za-z_]\\w*))\\b(?![(])"
+      "match": "\\b(\\.)\\s*(?<![@$#%])(?:([A-Z_][A-Z_0-9]*)|([A-Za-z_]\\w*))\\b(?!\\()"
     },
     "any_variable": {
-      "match": "\\b(?<![@\\$#%])([A-Za-z_]\\w*)\\b(?![(])",
+      "match": "\\b(?<![@$#%])([A-Za-z_]\\w*)\\b(?!\\()",
       "name": "variable.other.gdscript"
     },
     "arithmetic_operator": {
-      "match": "->|\\+=|-=|\\*=|\\^=|/=|%=|&=|~=|\\|=|\\*\\*|\\*|/|%|\\+|-",
+      "match": "->|\\+=|-=|\\*\\*=|\\*=|\\^=|/=|%=|&=|~=|\\|=|\\*\\*|[*/%+-]",
       "name": "keyword.operator.arithmetic.gdscript"
     },
     "assignment_operator": {
@@ -154,6 +154,9 @@
         {
           "include": "#function_call"
         },
+        {
+          "include": "#region"
+        },
         {
           "include": "#comment"
         },
@@ -178,7 +181,7 @@
       ]
     },
     "bitwise_operator": {
-      "match": "&|\\||<<=|>>=|<<|>>|\\^|~",
+      "match": "[\\&|]|<<=|>>=|<<|>>|[\\^~]",
       "name": "keyword.operator.bitwise.gdscript"
     },
     "boolean_operator": {
@@ -186,7 +189,7 @@
       "name": "keyword.operator.boolean.gdscript"
     },
     "builtin_classes": {
-      "match": "(?<![^.]\\.|:)\\b(Vector2|Vector2i|Vector3|Vector3i|Vector4|Vector4i|Color|Rect2|Rect2i|Array|Basis|Dictionary|Plane|Quat|RID|Rect3|Transform|Transform2D|Transform3D|AABB|String|Color|NodePath|PoolByteArray|PoolIntArray|PoolRealArray|PoolStringArray|PoolVector2Array|PoolVector3Array|PoolColorArray|bool|int|float|Signal|Callable|StringName|Quaternion|Projection|PackedByteArray|PackedInt32Array|PackedInt64Array|PackedFloat32Array|PackedFloat64Array|PackedStringArray|PackedVector2Array|PackedVector2iArray|PackedVector3Array|PackedVector3iArray|PackedVector4Array|PackedColorArray|super)\\b",
+      "match": "(?<![^.]\\.|:)\\b(Vector2|Vector2i|Vector3|Vector3i|Vector4|Vector4i|Color|Rect2|Rect2i|Array|Basis|Dictionary|Plane|Quat|RID|Rect3|Transform|Transform2D|Transform3D|AABB|String|Color|NodePath|PoolByteArray|PoolIntArray|PoolRealArray|PoolStringArray|PoolVector2Array|PoolVector3Array|PoolColorArray|bool|int|float|Signal|Callable|StringName|Quaternion|Projection|PackedByteArray|PackedInt32Array|PackedInt64Array|PackedFloat32Array|PackedFloat64Array|PackedStringArray|PackedVector2Array|PackedVector2iArray|PackedVector3Array|PackedVector3iArray|PackedVector4Array|PackedColorArray|JSON|UPNP|OS|IP|JSONRPC|XRVRS)\\b",
       "name": "entity.name.type.class.builtin.gdscript"
     },
     "builtin_get_node_shorthand": {
@@ -253,7 +256,7 @@
       ]
     },
     "builtin_get_node_shorthand_quoted": {
-      "begin": "(?:(\\$|%)|(&|\\^|@))(\"|')",
+      "begin": "(?:([$%])|([\\&^@]))([\"'])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.flow.gdscript"
@@ -335,11 +338,11 @@
           "name": "punctuation.definition.comment.number-sign.gdscript"
         }
       },
-      "match": "(##|#).*$\\n?",
+      "match": "(#(?:#|)).*$\\n?",
       "name": "comment.line.number-sign.gdscript"
     },
     "compare_operator": {
-      "match": "<=|>=|==|<|>|!=|!",
+      "match": "<=|>=|==|[<>]|!=|!",
       "name": "keyword.operator.comparison.gdscript"
     },
     "const_vars": {
@@ -357,7 +360,7 @@
           "name": "punctuation.definition.dict.begin.gdscript"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dict.end.gdscript"
@@ -375,10 +378,10 @@
     "expression": {
       "patterns": [
         {
-          "include": "#base_expression"
+          "include": "#getter_setter_godot4"
         },
         {
-          "include": "#getter_setter_godot4"
+          "include": "#base_expression"
         },
         {
           "include": "#assignment_operator"
@@ -486,7 +489,6 @@
     },
     "function_call": {
       "begin": "(?=\\b[a-zA-Z_]\\w*\\b\\()",
-      "comment": "Regular function call of the type \"name(args)\"",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -542,7 +544,6 @@
           "name": "keyword.language.gdscript"
         },
         {
-          "comment": "Some color schemas support meta.function-call.generic scope",
           "match": "\\b([a-zA-Z_]\\w*)\\b",
           "name": "entity.name.function.gdscript"
         }
@@ -554,27 +555,34 @@
           "captures": {
             "1": {
               "name": "entity.name.function.gdscript"
+            },
+            "2": {
+              "name": "punctuation.separator.annotation.gdscript"
             }
           },
-          "match": "\\b(get):"
+          "match": "(get)\\s*(:)",
+          "name": "meta.variable.declaration.getter.gdscript"
         },
         {
-          "begin": "\\s+(set)\\s*(?=\\()",
-          "beginCaptures": {
+          "captures": {
             "1": {
               "name": "entity.name.function.gdscript"
-            }
-          },
-          "end": "(:|(?=[#'\"\\n]))",
-          "name": "meta.function.gdscript",
-          "patterns": [
-            {
-              "include": "#parameters"
             },
-            {
-              "include": "#line_continuation"
+            "2": {
+              "name": "punctuation.definition.arguments.begin.gdscript"
+            },
+            "3": {
+              "name": "variable.other.gdscript"
+            },
+            "4": {
+              "name": "punctuation.definition.arguments.end.gdscript"
+            },
+            "5": {
+              "name": "punctuation.separator.annotation.gdscript"
             }
-          ]
+          },
+          "match": "(set)\\s*(\\()\\s*([A-Za-z_]\\w*)\\s*(\\))\\s*(:)",
+          "name": "meta.variable.declaration.setter.gdscript"
         }
       ]
     },
@@ -611,7 +619,7 @@
       ]
     },
     "keywords": {
-      "match": "\\b(?:class|class_name|abstract|is|onready|tool|static|export|as|void|enum|assert|breakpoint|sync|remote|master|puppet|slave|remotesync|mastersync|puppetsync|trait|namespace)\\b",
+      "match": "\\b(?:class|class_name|abstract|is|onready|tool|static|export|as|void|enum|assert|breakpoint|sync|remote|master|puppet|slave|remotesync|mastersync|puppetsync|trait|namespace|super)\\b",
       "name": "keyword.language.gdscript"
     },
     "lambda_declaration": {
@@ -680,7 +688,7 @@
               "name": "punctuation.separator.continuation.line.gdscript"
             }
           },
-          "end": "(?=^\\s*$)|(?!(\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))|(\\G$))",
+          "end": "(?=^\\s*$)|(?!(\\s*[rR]?('''|\"\"\"|['\"]))|(\\G$))",
           "patterns": [
             {
               "include": "#base_expression"
@@ -704,7 +712,7 @@
       },
       "patterns": [
         {
-          "include": "#base_expression"
+          "include": "#expression"
         }
       ]
     },
@@ -714,7 +722,7 @@
           "name": "keyword.control.gdscript"
         }
       },
-      "match": "^\n\\s*(match)"
+      "match": "^\\n\\s*(match)"
     },
     "nodepath_function": {
       "begin": "(get_node_or_null|has_node|has_node_and_resource|find_node|get_node)\\s*(\\()",
@@ -736,7 +744,7 @@
       "name": "meta.function.gdscript",
       "patterns": [
         {
-          "begin": "(\"|')",
+          "begin": "([\"'])",
           "end": "\\1",
           "name": "string.quoted.gdscript meta.literal.nodepath.gdscript constant.character.escape",
           "patterns": [
@@ -747,22 +755,22 @@
           ]
         },
         {
-          "include": "#base_expression"
+          "include": "#expression"
         }
       ]
     },
     "nodepath_object": {
-      "begin": "(NodePath)\\s*(?:\\()",
+      "begin": "(NodePath)\\s*\\(",
       "beginCaptures": {
         "1": {
           "name": "support.class.library.gdscript"
         }
       },
-      "end": "(?:\\))",
+      "end": "\\)",
       "name": "meta.literal.nodepath.gdscript",
       "patterns": [
         {
-          "begin": "(\"|')",
+          "begin": "([\"'])",
           "end": "\\1",
           "name": "string.quoted.gdscript constant.character.escape.gdscript",
           "patterns": [
@@ -781,7 +789,7 @@
           "name": "constant.numeric.integer.binary.gdscript"
         },
         {
-          "match": "0x[0-9A-Fa-f_]+",
+          "match": "0x[_\\h]+",
           "name": "constant.numeric.integer.hexadecimal.gdscript"
         },
         {
@@ -789,7 +797,11 @@
           "name": "constant.numeric.float.gdscript"
         },
         {
-          "match": "([0-9][0-9_]*)?\\.[0-9_]*([eE][+-]?[0-9_]+)?",
+          "match": "([0-9][0-9_]*)\\.[0-9_]*([eE][+-]?[0-9_]+)?",
+          "name": "constant.numeric.float.gdscript"
+        },
+        {
+          "match": "([0-9][0-9_]*)?\\.[0-9_]*([eE][+-]?[0-9_]+)",
           "name": "constant.numeric.float.gdscript"
         },
         {
@@ -797,7 +809,7 @@
           "name": "constant.numeric.float.gdscript"
         },
         {
-          "match": "[-]?[0-9][0-9_]*",
+          "match": "-?[0-9][0-9_]*",
           "name": "constant.numeric.integer.gdscript"
         }
       ]
@@ -862,6 +874,10 @@
       "match": "\\b([A-Z]+[a-z_0-9]*([A-Z]?[a-z_0-9]+)*[A-Z]?)\\b",
       "name": "entity.name.type.class.gdscript"
     },
+    "region": {
+      "match": "#(end)?region.*$\\n?",
+      "name": "keyword.language.region.gdscript"
+    },
     "round_braces": {
       "begin": "\\(",
       "beginCaptures": {
@@ -928,7 +944,7 @@
           "name": "punctuation.definition.list.begin.gdscript"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.list.end.gdscript"
@@ -984,7 +1000,7 @@
               "name": "storage.type.format.gdscript"
             }
           },
-          "match": "({{|}}|(?:{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?}))",
+          "match": "(\\{\\{|}}|\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?})",
           "name": "meta.format.brace.gdscript"
         },
         {
@@ -999,7 +1015,7 @@
               "name": "storage.type.format.gdscript"
             }
           },
-          "match": "({\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?\\}[^'\"{}\\n]*)*})",
+          "match": "(\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?}[^'\"{}\\n]*)*})",
           "name": "meta.format.brace.gdscript"
         }
       ]
@@ -1014,7 +1030,7 @@
       "name": "meta.format.percent.gdscript"
     },
     "strings": {
-      "begin": "(r)?(\"\"\"|'''|\"|')",
+      "begin": "(r)?(\"\"\"|'''|[\"'])",
       "beginCaptures": {
         "1": {
           "name": "constant.character.escape.gdscript"
@@ -1054,7 +1070,7 @@
               "name": "punctuation.separator.annotation.gdscript"
             },
             "2": {
-              "name": "keyword.language.gdscript storage.type.const.gdscript"
+              "name": "entity.name.function.gdscript"
             },
             "3": {
               "name": "entity.name.function.gdscript"
@@ -1080,7 +1096,7 @@
         {
           "captures": {
             "1": {
-              "name": "keyword.language.gdscript storage.type.const.gdscript"
+              "name": "keyword.language.gdscript"
             },
             "2": {
               "name": "entity.name.function.gdscript"
@@ -1089,7 +1105,7 @@
               "name": "entity.name.function.gdscript"
             }
           },
-          "match": "(setget)\\s+([a-zA-Z_]\\w*)(?:[,]\\s*([a-zA-Z_]\\w*))?"
+          "match": "(setget)\\s+([a-zA-Z_]\\w*)(?:,\\s*([a-zA-Z_]\\w*))?"
         },
         {
           "include": "#expression"
diff --git a/resources/languages/gdshader.json b/resources/languages/gdshader.json
index 9afe929..9e082ba 100644
--- a/resources/languages/gdshader.json
+++ b/resources/languages/gdshader.json
@@ -45,7 +45,7 @@
           "name": "punctuation.bracket.gdshader"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "name": "meta.array-size.gdshader",
       "patterns": [
         {
@@ -110,7 +110,7 @@
       "name": "constant.language.float.gdshader"
     },
     "constructor": {
-      "match": "\\b[a-zA-Z_]\\w*(?=\\s*\\[\\s*\\w*\\s*\\]\\s*[(])|\\b[A-Z]\\w*(?=\\s*[(])",
+      "match": "\\b(?:[a-zA-Z_]\\w*(?=\\s*\\[\\s*\\w*\\s*]\\s*\\()|[A-Z]\\w*(?=\\s*\\())",
       "name": "entity.name.type.constructor.gdshader"
     },
     "controlKeyword": {
@@ -235,14 +235,14 @@
           "name": "entity.name.variable.field.gdshader"
         }
       },
-      "match": "([.])\\s*([a-zA-Z_]\\w*)\\b(?!\\s*\\()"
+      "match": "(\\.)\\s*([a-zA-Z_]\\w*)\\b(?!\\s*\\()"
     },
     "identifierFunction": {
-      "match": "\\b[a-zA-Z_]\\w*(?=(?:\\s|/\\*(?:\\*(?!/)|[^*])*\\*/)*[(])",
+      "match": "\\b[a-zA-Z_]\\w*(?=(?:\\s|/\\*(?:\\*(?!/)|[^*])*\\*/)*\\()",
       "name": "entity.name.function.gdshader"
     },
     "identifierType": {
-      "match": "\\b[a-zA-Z_]\\w*(?=(?:\\s*\\[\\s*\\w*\\s*\\])?\\s+[a-zA-Z_]\\w*\\b)",
+      "match": "\\b[a-zA-Z_]\\w*(?=(?:\\s*\\[\\s*\\w*\\s*])?\\s+[a-zA-Z_]\\w*\\b)",
       "name": "entity.name.type.gdshader"
     },
     "identifierVariable": {
@@ -275,7 +275,7 @@
       ]
     },
     "languageVariable": {
-      "match": "\\b(?:[A-Z][A-Z_0-9]*)\\b",
+      "match": "\\b[A-Z][A-Z_0-9]*\\b",
       "name": "variable.language.gdshader"
     },
     "literalBool": {
@@ -283,11 +283,11 @@
       "name": "constant.language.boolean.gdshader"
     },
     "literalFloat": {
-      "match": "\\b(?:\\d+[eE][-+]?\\d+|(?:\\d*[.]\\d+|\\d+[.])(?:[eE][-+]?\\d+)?)[fF]?",
+      "match": "\\b(?:\\d+[eE][-+]?\\d+|(?:\\d*\\.\\d+|\\d+\\.)(?:[eE][-+]?\\d+)?)[fF]?",
       "name": "constant.numeric.float.gdshader"
     },
     "literalInt": {
-      "match": "\\b(?:0[xX][0-9A-Fa-f]+|\\d+[uU]?)\\b",
+      "match": "\\b(?:0[xX]\\h+|\\d+[uU]?)\\b",
       "name": "constant.numeric.integer.gdshader"
     },
     "modifierKeyword": {
@@ -295,7 +295,7 @@
       "name": "storage.modifier.gdshader"
     },
     "operator": {
-      "match": "\\<\\<\\=?|\\>\\>\\=?|[-+*/&|<>=!]\\=|\\&\\&|[|][|]|[-+~!*/%<>&^|=]",
+      "match": "<<=?|>>=?|[-+*/\\&|<>=!]=|&&|\\|\\||[-+~!*/%<>\\&^|=]",
       "name": "keyword.operator.gdshader"
     },
     "precisionKeyword": {
@@ -303,34 +303,34 @@
       "name": "storage.type.built-in.primitive.precision.gdshader"
     },
     "processorFunction": {
-      "match": "\\b(?:vertex|fragment|light|start|process|sky|fog)(?=(?:\\s|/\\*(?:\\*(?!/)|[^*])*\\*/)*[(])",
+      "match": "\\b(?:vertex|fragment|light|start|process|sky|fog)(?=(?:\\s|/\\*(?:\\*(?!/)|[^*])*\\*/)*\\()",
       "name": "support.function.gdshader"
     },
     "separator": {
       "patterns": [
         {
-          "match": "[.]",
+          "match": "\\.",
           "name": "punctuation.accessor.gdshader"
         },
         {
           "include": "#separatorComma"
         },
         {
-          "match": "[;]",
+          "match": ";",
           "name": "punctuation.terminator.statement.gdshader"
         },
         {
-          "match": "[:]",
+          "match": ":",
           "name": "keyword.operator.type.annotation.gdshader"
         }
       ]
     },
     "separatorComma": {
-      "match": "[,]",
+      "match": ",",
       "name": "punctuation.separator.comma.gdshader"
     },
     "structDefinition": {
-      "begin": "(?=\\b(?:struct)\\b)",
+      "begin": "(?=\\bstruct\\b)",
       "end": "(?<=;)",
       "patterns": [
         {
@@ -357,7 +357,7 @@
           "name": "punctuation.definition.block.struct.gdshader"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.definition.block.struct.gdshader",
       "patterns": [
         {
@@ -378,7 +378,7 @@
       ]
     },
     "structKeyword": {
-      "match": "\\b(?:struct)\\b",
+      "match": "\\bstruct\\b",
       "name": "keyword.other.struct.gdshader"
     },
     "structName": {
@@ -394,7 +394,7 @@
           "name": "variable.other.property.gdshader"
         }
       },
-      "match": "([.])\\s*([xyzw]{2,4}|[rgba]{2,4}|[stpq]{2,4})\\b"
+      "match": "(\\.)\\s*([xyzw]{2,4}|[rgba]{2,4}|[stpq]{2,4})\\b"
     },
     "typeKeyword": {
       "match": "\\b(?:void|bool|[biu]?vec[234]|u?int|float|mat[234]|[iu]?sampler(?:3D|2D(?:Array)?)|samplerCube)\\b",
diff --git a/resources/languages/genie.json b/resources/languages/genie.json
index 224ecc1..daadd63 100644
--- a/resources/languages/genie.json
+++ b/resources/languages/genie.json
@@ -82,7 +82,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
+          "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
           "name": "constant.numeric.vala"
         },
         {
@@ -102,15 +102,15 @@
     "keywords": {
       "patterns": [
         {
-          "match": "(?<=^|[^@\\w\\.])(as|do|if|in|is|of|or|to|and|def|for|get|isa|new|not|out|ref|set|try|var|case|dict|else|enum|init|list|lock|null|pass|prop|self|true|uses|void|weak|when|array|async|break|class|const|event|false|final|owned|print|super|raise|while|yield|assert|delete|downto|except|extern|inline|params|public|raises|return|sealed|sizeof|static|struct|typeof|default|dynamic|ensures|finally|private|unowned|virtual|abstract|continue|delegate|internal|override|readonly|requires|volatile|construct|errordomain|interface|namespace|protected|implements)\\b",
+          "match": "(?<=^|[^@\\w.])(as|do|if|in|is|of|or|to|and|def|for|get|isa|new|not|out|ref|set|try|var|case|dict|else|enum|init|list|lock|null|pass|prop|self|true|uses|void|weak|when|array|async|break|class|const|event|false|final|owned|print|super|raise|while|yield|assert|delete|downto|except|extern|inline|params|public|raises|return|sealed|sizeof|static|struct|typeof|default|dynamic|ensures|finally|private|unowned|virtual|abstract|continue|delegate|internal|override|readonly|requires|volatile|construct|errordomain|interface|namespace|protected|implements)\\b",
           "name": "keyword.vala"
         },
         {
-          "match": "(?<=^|[^@\\w\\.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b",
+          "match": "(?<=^|[^@\\w.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b",
           "name": "keyword.vala"
         },
         {
-          "match": "(#if|#elif|#else|#endif)",
+          "match": "(#(?:if|elif|else|endif))",
           "name": "keyword.vala"
         }
       ]
@@ -164,7 +164,7 @@
           ]
         },
         {
-          "match": "\\/((\\\\\\/)|([^\\/]))*\\/(?=\\s*[,;)\\.\\n])",
+          "match": "/((\\\\/)|([^/]))*/(?=\\s*[,;).\\n])",
           "name": "string.regexp.vala"
         }
       ]
@@ -172,7 +172,7 @@
     "types": {
       "patterns": [
         {
-          "match": "(?<=^|[^@\\w\\.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b",
+          "match": "(?<=^|[^@\\w.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b",
           "name": "storage.type.primitive.vala"
         },
         {
diff --git a/resources/languages/git-commit.json b/resources/languages/git-commit.json
index 6545352..7f7907c 100644
--- a/resources/languages/git-commit.json
+++ b/resources/languages/git-commit.json
@@ -3,8 +3,7 @@
   "name": "git-commit",
   "patterns": [
     {
-      "begin": "(?=^diff\\ \\-\\-git)",
-      "comment": "diff presented at the end of the commit message when using commit -v.",
+      "begin": "(?=^diff --git)",
       "contentName": "source.diff",
       "end": "\\z",
       "name": "meta.embedded.diff.git-commit",
@@ -16,7 +15,6 @@
     },
     {
       "begin": "^(?!#)",
-      "comment": "User supplied message",
       "end": "^(?=#)",
       "name": "meta.scope.message.git-commit",
       "patterns": [
@@ -29,7 +27,6 @@
               "name": "invalid.illegal.line-too-long.git-commit"
             }
           },
-          "comment": "Mark > 50 lines as deprecated, > 72 as illegal",
           "match": "\\G.{0,50}(.{0,22}(.*))$",
           "name": "meta.scope.subject.git-commit"
         }
@@ -37,7 +34,6 @@
     },
     {
       "begin": "^(?=#)",
-      "comment": "Git supplied metadata in a number of lines starting with #",
       "contentName": "comment.line.number-sign.git-commit",
       "end": "^(?!#)",
       "name": "meta.scope.metadata.git-commit",
@@ -75,7 +71,6 @@
               "name": "string.unquoted.filename.git-commit"
             }
           },
-          "comment": "Fallback for non-English git commit template",
           "match": "^#\\t([^:]+): *(.*)$"
         }
       ]
diff --git a/resources/languages/git-rebase.json b/resources/languages/git-rebase.json
index 675525f..1897322 100644
--- a/resources/languages/git-rebase.json
+++ b/resources/languages/git-rebase.json
@@ -48,7 +48,7 @@
           "name": "support.function.git-rebase"
         }
       },
-      "match": "^\\s*(break|b)\\s*$",
+      "match": "^\\s*(b(?:reak|))\\s*$",
       "name": "meta.commit-command.git-rebase"
     }
   ],
diff --git a/resources/languages/gleam.json b/resources/languages/gleam.json
index 4c2dcc3..2ad4408 100644
--- a/resources/languages/gleam.json
+++ b/resources/languages/gleam.json
@@ -1,5 +1,8 @@
 {
   "displayName": "Gleam",
+  "fileTypes": [
+    "gleam"
+  ],
   "name": "gleam",
   "patterns": [
     {
@@ -51,10 +54,7 @@
           "include": "#decimal_number"
         },
         {
-          "include": "#boolean"
-        },
-        {
-          "match": "[[:upper:]][[:alnum:]]*",
+          "match": "\\p{upper}\\p{alnum}*",
           "name": "entity.name.type.gleam"
         }
       ]
@@ -66,13 +66,13 @@
       ]
     },
     "discards": {
-      "match": "\\b_(?:[[:word:]]+)?\\b",
+      "match": "\\b_\\p{word}+{0,1}\\b",
       "name": "comment.unused.gleam"
     },
     "entity": {
       "patterns": [
         {
-          "begin": "\\b([[:lower:]][[:word:]]*)\\b[[:space:]]*\\(",
+          "begin": "\\b(\\p{lower}\\p{word}*)\\b\\s*\\(",
           "captures": {
             "1": {
               "name": "entity.name.function.gleam"
@@ -86,11 +86,11 @@
           ]
         },
         {
-          "match": "\\b([[:lower:]][[:word:]]*):\\s",
+          "match": "\\b(\\p{lower}\\p{word}*):\\s",
           "name": "variable.parameter.gleam"
         },
         {
-          "match": "\\b([[:lower:]][[:word:]]*):",
+          "match": "\\b(\\p{lower}\\p{word}*):",
           "name": "entity.name.namespace.gleam"
         }
       ]
@@ -104,11 +104,11 @@
     "keywords": {
       "patterns": [
         {
-          "match": "\\b(as|use|case|if|fn|import|let|assert|pub|type|opaque|const|todo|panic|else|try)\\b",
+          "match": "\\b(as|use|case|if|fn|import|let|assert|pub|type|opaque|const|todo|panic|else|try|echo)\\b",
           "name": "keyword.control.gleam"
         },
         {
-          "match": "(<\\-|\\->)",
+          "match": "(<-|->)",
           "name": "keyword.operator.arrow.gleam"
         },
         {
@@ -124,11 +124,11 @@
           "name": "keyword.operator.comparison.gleam"
         },
         {
-          "match": "(<=\\.|>=\\.|<\\.|>\\.)",
+          "match": "([<>](?:=\\.|\\.))",
           "name": "keyword.operator.comparison.float.gleam"
         },
         {
-          "match": "(<=|>=|<|>)",
+          "match": "(<=|>=|[<>])",
           "name": "keyword.operator.comparison.int.gleam"
         },
         {
@@ -144,11 +144,11 @@
           "name": "keyword.operator.other.gleam"
         },
         {
-          "match": "(\\+\\.|\\-\\.|/\\.|\\*\\.)",
+          "match": "(\\+\\.|-\\.|/\\.|\\*\\.)",
           "name": "keyword.operator.arithmetic.float.gleam"
         },
         {
-          "match": "(\\+|\\-|/|\\*|%)",
+          "match": "([+\\-/*%])",
           "name": "keyword.operator.arithmetic.int.gleam"
         },
         {
diff --git a/resources/languages/glimmer-js.json b/resources/languages/glimmer-js.json
index 4c2cbb0..44f7fd9 100644
--- a/resources/languages/glimmer-js.json
+++ b/resources/languages/glimmer-js.json
@@ -68,7 +68,7 @@
       ]
     },
     "component-tag": {
-      "begin": "(<\\/?)(@|this.)?([a-zA-Z0-9-_\\$:\\.]+)\\b",
+      "begin": "(</?)(@|this.)?([a-zA-Z0-9\\-_$:.]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -93,13 +93,13 @@
               "include": "#glimmer-component-path"
             },
             {
-              "match": "(@|:|\\$)",
+              "match": "([@:$])",
               "name": "markup.bold"
             }
           ]
         }
       },
-      "end": "(\\/?)(>)",
+      "end": "(/?)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -142,7 +142,7 @@
               "name": "punctuation.definition.entity.html.ember-handlebars"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html.ember-handlebars"
         },
         {
@@ -179,7 +179,7 @@
       ]
     },
     "glimmer-block": {
-      "begin": "({{~?)(#|/)(([@\\$a-zA-Z0-9_/.-]+))",
+      "begin": "(\\{\\{~?)([#/])(([@$a-zA-Z0-9_/.-]+))",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -194,7 +194,7 @@
               "include": "#glimmer-component-path"
             },
             {
-              "match": "(\\/)+",
+              "match": "(/)+",
               "name": "punctuation.definition.tag"
             },
             {
@@ -233,11 +233,11 @@
           "name": "keyword.operator"
         }
       },
-      "match": "({{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
+      "match": "(\\{\\{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-comment-block": {
-      "begin": "{{!--",
+      "begin": "\\{\\{!--",
       "captures": {
         "0": {
           "name": "punctuation.definition.block.comment.glimmer"
@@ -255,7 +255,7 @@
       ]
     },
     "glimmer-comment-inline": {
-      "begin": "{{!",
+      "begin": "\\{\\{!",
       "captures": {
         "0": {
           "name": "punctuation.definition.block.comment.glimmer"
@@ -278,10 +278,10 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "(::|_|\\$|\\.)"
+      "match": "(::|[_$.])"
     },
     "glimmer-control-expression": {
-      "begin": "({{~?)(([-a-zA-Z_0-9/]+)\\s)",
+      "begin": "(\\{\\{~?)(([-a-zA-Z_0-9/]+)\\s)",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -345,11 +345,11 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "({{~?)(else\\s[a-z]+\\s|else)([()@a-zA-Z0-9\\.\\s\\b]+)?(~?}})",
+      "match": "(\\{\\{~?)(else(?:\\s[a-z]+\\s|))([()@a-zA-Z0-9.\\s\\x08]+)?(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-expression": {
-      "begin": "({{~?)(([()\\s@a-zA-Z0-9_.-]+))",
+      "begin": "(\\{\\{~?)(([()\\s@a-zA-Z0-9_.-]+))",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -361,11 +361,11 @@
           "name": "support.function",
           "patterns": [
             {
-              "match": "[(]+",
+              "match": "\\(+",
               "name": "string.regexp"
             },
             {
-              "match": "[)]+",
+              "match": "\\)+",
               "name": "string.regexp"
             },
             {
@@ -387,7 +387,7 @@
       ]
     },
     "glimmer-expression-property": {
-      "begin": "({{~?)((@|this.)([a-zA-Z0-9_.-]+))",
+      "begin": "(\\{\\{~?)((@|this.)([a-zA-Z0-9_.-]+))",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -470,7 +470,7 @@
           "name": "keyword.operator"
         }
       },
-      "match": "({{~?)(yield|outlet)(~?}})",
+      "match": "(\\{\\{~?)(yield|outlet)(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-subexp": {
@@ -520,7 +520,7 @@
       ]
     },
     "glimmer-unescaped-expression": {
-      "begin": "{{{",
+      "begin": "\\{\\{\\{",
       "captures": {
         "0": {
           "name": "keyword.operator"
@@ -580,7 +580,7 @@
       ]
     },
     "html-tag": {
-      "begin": "(<\\/?)([a-z0-9-]+)(?!\\.|:)\\b",
+      "begin": "(</?)([a-z0-9-]+)(?![.:])\\b",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -589,7 +589,7 @@
           "name": "entity.name.tag.html.ember-handlebars"
         }
       },
-      "end": "(\\/?)(>)",
+      "end": "(/?)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -709,8 +709,8 @@
           "name": "meta.js.embeddedTemplateWithArgs",
           "patterns": [
             {
-              "begin": "(?<=\\<template)",
-              "end": "(?=\\>)",
+              "begin": "(?<=<template)",
+              "end": "(?=>)",
               "patterns": [
                 {
                   "include": "#tag-like-content"
@@ -780,7 +780,7 @@
           ]
         },
         {
-          "begin": "(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
+          "begin": "(\\b(?:\\w+\\.)*h(?:bs|tml)\\s*)(`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.js"
@@ -875,7 +875,7 @@
           },
           "patterns": [
             {
-              "begin": "((`|'|\"))",
+              "begin": "(([`'\"]))",
               "beginCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -884,7 +884,7 @@
                   "name": "punctuation.definition.string.template.begin.ts"
                 }
               },
-              "end": "((`|'|\"))",
+              "end": "(([`'\"]))",
               "endCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -967,7 +967,7 @@
           },
           "patterns": [
             {
-              "begin": "((`|'|\"))",
+              "begin": "(([`'\"]))",
               "beginCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -977,7 +977,7 @@
                 }
               },
               "contentName": "meta.embedded.block.html",
-              "end": "((`|'|\"))",
+              "end": "(([`'\"]))",
               "endCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -1191,7 +1191,7 @@
                   ]
                 },
                 {
-                  "begin": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t\t\t\t\t\t\ttype\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\n\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\tx-handlebars\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-(handlebars-)?|ng-)?template\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | html\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+                  "begin": "(?i:(?=type\\s*=\\s*(['\"]|)text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'>]))",
                   "end": "((<))(?=/(?i:script))",
                   "endCaptures": {
                     "0": {
@@ -1490,7 +1490,7 @@
       ]
     },
     "variable": {
-      "match": "\\b([a-zA-Z0-9-_]+)\\b",
+      "match": "\\b([a-zA-Z0-9\\-_]+)\\b",
       "name": "support.function",
       "patterns": [
       ]
diff --git a/resources/languages/glimmer-ts.json b/resources/languages/glimmer-ts.json
index 456b20b..7a1cc91 100644
--- a/resources/languages/glimmer-ts.json
+++ b/resources/languages/glimmer-ts.json
@@ -68,7 +68,7 @@
       ]
     },
     "component-tag": {
-      "begin": "(<\\/?)(@|this.)?([a-zA-Z0-9-_\\$:\\.]+)\\b",
+      "begin": "(</?)(@|this.)?([a-zA-Z0-9\\-_$:.]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -93,13 +93,13 @@
               "include": "#glimmer-component-path"
             },
             {
-              "match": "(@|:|\\$)",
+              "match": "([@:$])",
               "name": "markup.bold"
             }
           ]
         }
       },
-      "end": "(\\/?)(>)",
+      "end": "(/?)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -142,7 +142,7 @@
               "name": "punctuation.definition.entity.html.ember-handlebars"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html.ember-handlebars"
         },
         {
@@ -179,7 +179,7 @@
       ]
     },
     "glimmer-block": {
-      "begin": "({{~?)(#|/)(([@\\$a-zA-Z0-9_/.-]+))",
+      "begin": "(\\{\\{~?)([#/])(([@$a-zA-Z0-9_/.-]+))",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -194,7 +194,7 @@
               "include": "#glimmer-component-path"
             },
             {
-              "match": "(\\/)+",
+              "match": "(/)+",
               "name": "punctuation.definition.tag"
             },
             {
@@ -233,11 +233,11 @@
           "name": "keyword.operator"
         }
       },
-      "match": "({{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
+      "match": "(\\{\\{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-comment-block": {
-      "begin": "{{!--",
+      "begin": "\\{\\{!--",
       "captures": {
         "0": {
           "name": "punctuation.definition.block.comment.glimmer"
@@ -255,7 +255,7 @@
       ]
     },
     "glimmer-comment-inline": {
-      "begin": "{{!",
+      "begin": "\\{\\{!",
       "captures": {
         "0": {
           "name": "punctuation.definition.block.comment.glimmer"
@@ -278,10 +278,10 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "(::|_|\\$|\\.)"
+      "match": "(::|[_$.])"
     },
     "glimmer-control-expression": {
-      "begin": "({{~?)(([-a-zA-Z_0-9/]+)\\s)",
+      "begin": "(\\{\\{~?)(([-a-zA-Z_0-9/]+)\\s)",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -345,11 +345,11 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "({{~?)(else\\s[a-z]+\\s|else)([()@a-zA-Z0-9\\.\\s\\b]+)?(~?}})",
+      "match": "(\\{\\{~?)(else(?:\\s[a-z]+\\s|))([()@a-zA-Z0-9.\\s\\x08]+)?(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-expression": {
-      "begin": "({{~?)(([()\\s@a-zA-Z0-9_.-]+))",
+      "begin": "(\\{\\{~?)(([()\\s@a-zA-Z0-9_.-]+))",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -361,11 +361,11 @@
           "name": "support.function",
           "patterns": [
             {
-              "match": "[(]+",
+              "match": "\\(+",
               "name": "string.regexp"
             },
             {
-              "match": "[)]+",
+              "match": "\\)+",
               "name": "string.regexp"
             },
             {
@@ -387,7 +387,7 @@
       ]
     },
     "glimmer-expression-property": {
-      "begin": "({{~?)((@|this.)([a-zA-Z0-9_.-]+))",
+      "begin": "(\\{\\{~?)((@|this.)([a-zA-Z0-9_.-]+))",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -470,7 +470,7 @@
           "name": "keyword.operator"
         }
       },
-      "match": "({{~?)(yield|outlet)(~?}})",
+      "match": "(\\{\\{~?)(yield|outlet)(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-subexp": {
@@ -520,7 +520,7 @@
       ]
     },
     "glimmer-unescaped-expression": {
-      "begin": "{{{",
+      "begin": "\\{\\{\\{",
       "captures": {
         "0": {
           "name": "keyword.operator"
@@ -580,7 +580,7 @@
       ]
     },
     "html-tag": {
-      "begin": "(<\\/?)([a-z0-9-]+)(?!\\.|:)\\b",
+      "begin": "(</?)([a-z0-9-]+)(?![.:])\\b",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -589,7 +589,7 @@
           "name": "entity.name.tag.html.ember-handlebars"
         }
       },
-      "end": "(\\/?)(>)",
+      "end": "(/?)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -709,8 +709,8 @@
           "name": "meta.js.embeddedTemplateWithArgs",
           "patterns": [
             {
-              "begin": "(?<=\\<template)",
-              "end": "(?=\\>)",
+              "begin": "(?<=<template)",
+              "end": "(?=>)",
               "patterns": [
                 {
                   "include": "#tag-like-content"
@@ -780,7 +780,7 @@
           ]
         },
         {
-          "begin": "(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
+          "begin": "(\\b(?:\\w+\\.)*h(?:bs|tml)\\s*)(`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.js"
@@ -875,7 +875,7 @@
           },
           "patterns": [
             {
-              "begin": "((`|'|\"))",
+              "begin": "(([`'\"]))",
               "beginCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -884,7 +884,7 @@
                   "name": "punctuation.definition.string.template.begin.ts"
                 }
               },
-              "end": "((`|'|\"))",
+              "end": "(([`'\"]))",
               "endCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -967,7 +967,7 @@
           },
           "patterns": [
             {
-              "begin": "((`|'|\"))",
+              "begin": "(([`'\"]))",
               "beginCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -977,7 +977,7 @@
                 }
               },
               "contentName": "meta.embedded.block.html",
-              "end": "((`|'|\"))",
+              "end": "(([`'\"]))",
               "endCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -1191,7 +1191,7 @@
                   ]
                 },
                 {
-                  "begin": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t\t\t\t\t\t\ttype\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\n\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\tx-handlebars\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-(handlebars-)?|ng-)?template\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | html\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+                  "begin": "(?i:(?=type\\s*=\\s*(['\"]|)text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'>]))",
                   "end": "((<))(?=/(?i:script))",
                   "endCaptures": {
                     "0": {
@@ -1490,7 +1490,7 @@
       ]
     },
     "variable": {
-      "match": "\\b([a-zA-Z0-9-_]+)\\b",
+      "match": "\\b([a-zA-Z0-9\\-_]+)\\b",
       "name": "support.function",
       "patterns": [
       ]
diff --git a/resources/languages/glsl.json b/resources/languages/glsl.json
index b8be436..de38ed7 100644
--- a/resources/languages/glsl.json
+++ b/resources/languages/glsl.json
@@ -18,7 +18,7 @@
     "g.glsl"
   ],
   "foldingStartMarker": "/\\*\\*|\\{\\s*$",
-  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
+  "foldingStopMarker": "\\*\\*/|^\\s*}",
   "name": "glsl",
   "patterns": [
     {
@@ -26,7 +26,7 @@
       "name": "keyword.control.glsl"
     },
     {
-      "match": "\\b(void|bool|int|uint|float|vec2|vec3|vec4|bvec2|bvec3|bvec4|ivec2|ivec2|ivec3|uvec2|uvec2|uvec3|mat2|mat3|mat4|mat2x2|mat2x3|mat2x4|mat3x2|mat3x3|mat3x4|mat4x2|mat4x3|mat4x4|sampler[1|2|3]D|samplerCube|sampler2DRect|sampler[1|2]DShadow|sampler2DRectShadow|sampler[1|2]DArray|sampler[1|2]DArrayShadow|samplerBuffer|sampler2DMS|sampler2DMSArray|struct|isampler[1|2|3]D|isamplerCube|isampler2DRect|isampler[1|2]DArray|isamplerBuffer|isampler2DMS|isampler2DMSArray|usampler[1|2|3]D|usamplerCube|usampler2DRect|usampler[1|2]DArray|usamplerBuffer|usampler2DMS|usampler2DMSArray)\\b",
+      "match": "\\b(void|bool|int|uint|float|vec2|vec3|vec4|bvec2|bvec3|bvec4|ivec2|ivec2|ivec3|uvec2|uvec2|uvec3|mat2|mat3|mat4|mat2x2|mat2x3|mat2x4|mat3x2|mat3x3|mat3x4|mat4x2|mat4x3|mat4x4|sampler[1|23]D|samplerCube|sampler2DRect|sampler[1|2]DShadow|sampler2DRectShadow|sampler[1|2]DArray|sampler[1|2]DArrayShadow|samplerBuffer|sampler2DMS|sampler2DMSArray|struct|isampler[1|23]D|isamplerCube|isampler2DRect|isampler[1|2]DArray|isamplerBuffer|isampler2DMS|isampler2DMSArray|usampler[1|23]D|usamplerCube|usampler2DRect|usampler[1|2]DArray|usamplerBuffer|usampler2DMS|usampler2DMSArray)\\b",
       "name": "storage.type.glsl"
     },
     {
@@ -34,11 +34,11 @@
       "name": "storage.modifier.glsl"
     },
     {
-      "match": "\\b(gl_BackColor|gl_BackLightModelProduct|gl_BackLightProduct|gl_BackMaterial|gl_BackSecondaryColor|gl_ClipDistance|gl_ClipPlane|gl_ClipVertex|gl_Color|gl_DepthRange|gl_DepthRangeParameters|gl_EyePlaneQ|gl_EyePlaneR|gl_EyePlaneS|gl_EyePlaneT|gl_Fog|gl_FogCoord|gl_FogFragCoord|gl_FogParameters|gl_FragColor|gl_FragCoord|gl_FragDat|gl_FragDept|gl_FrontColor|gl_FrontFacing|gl_FrontLightModelProduct|gl_FrontLightProduct|gl_FrontMaterial|gl_FrontSecondaryColor|gl_InstanceID|gl_Layer|gl_LightModel|gl_LightModelParameters|gl_LightModelProducts|gl_LightProducts|gl_LightSource|gl_LightSourceParameters|gl_MaterialParameters|gl_ModelViewMatrix|gl_ModelViewMatrixInverse|gl_ModelViewMatrixInverseTranspose|gl_ModelViewMatrixTranspose|gl_ModelViewProjectionMatrix|gl_ModelViewProjectionMatrixInverse|gl_ModelViewProjectionMatrixInverseTranspose|gl_ModelViewProjectionMatrixTranspose|gl_MultiTexCoord[0-7]|gl_Normal|gl_NormalMatrix|gl_NormalScale|gl_ObjectPlaneQ|gl_ObjectPlaneR|gl_ObjectPlaneS|gl_ObjectPlaneT|gl_Point|gl_PointCoord|gl_PointParameters|gl_PointSize|gl_Position|gl_PrimitiveIDIn|gl_ProjectionMatrix|gl_ProjectionMatrixInverse|gl_ProjectionMatrixInverseTranspose|gl_ProjectionMatrixTranspose|gl_SecondaryColor|gl_TexCoord|gl_TextureEnvColor|gl_TextureMatrix|gl_TextureMatrixInverse|gl_TextureMatrixInverseTranspose|gl_TextureMatrixTranspose|gl_Vertex|gl_VertexIDh)\\b",
+      "match": "\\b(gl_(?:BackColor|BackLightModelProduct|BackLightProduct|BackMaterial|BackSecondaryColor|ClipDistance|ClipPlane|ClipVertex|Color|DepthRange|DepthRangeParameters|EyePlaneQ|EyePlaneR|EyePlaneS|EyePlaneT|Fog|FogCoord|FogFragCoord|FogParameters|FragColor|FragCoord|FragDat|FragDept|FrontColor|FrontFacing|FrontLightModelProduct|FrontLightProduct|FrontMaterial|FrontSecondaryColor|InstanceID|Layer|LightModel|LightModelParameters|LightModelProducts|LightProducts|LightSource|LightSourceParameters|MaterialParameters|ModelViewMatrix|ModelViewMatrixInverse|ModelViewMatrixInverseTranspose|ModelViewMatrixTranspose|ModelViewProjectionMatrix|ModelViewProjectionMatrixInverse|ModelViewProjectionMatrixInverseTranspose|ModelViewProjectionMatrixTranspose|MultiTexCoord[0-7]|Normal|NormalMatrix|NormalScale|ObjectPlaneQ|ObjectPlaneR|ObjectPlaneS|ObjectPlaneT|Point|PointCoord|PointParameters|PointSize|Position|PrimitiveIDIn|ProjectionMatrix|ProjectionMatrixInverse|ProjectionMatrixInverseTranspose|ProjectionMatrixTranspose|SecondaryColor|TexCoord|TextureEnvColor|TextureMatrix|TextureMatrixInverse|TextureMatrixInverseTranspose|TextureMatrixTranspose|Vertex|VertexIDh))\\b",
       "name": "support.variable.glsl"
     },
     {
-      "match": "\\b(gl_MaxClipPlanes|gl_MaxCombinedTextureImageUnits|gl_MaxDrawBuffers|gl_MaxFragmentUniformComponents|gl_MaxLights|gl_MaxTextureCoords|gl_MaxTextureImageUnits|gl_MaxTextureUnits|gl_MaxVaryingFloats|gl_MaxVertexAttribs|gl_MaxVertexTextureImageUnits|gl_MaxVertexUniformComponents)\\b",
+      "match": "\\b(gl_Max(?:ClipPlanes|CombinedTextureImageUnits|DrawBuffers|FragmentUniformComponents|Lights|TextureCoords|TextureImageUnits|TextureUnits|VaryingFloats|VertexAttribs|VertexTextureImageUnits|VertexUniformComponents))\\b",
       "name": "support.constant.glsl"
     },
     {
diff --git a/resources/languages/gnuplot.json b/resources/languages/gnuplot.json
index 2356bdd..7cb24cd 100644
--- a/resources/languages/gnuplot.json
+++ b/resources/languages/gnuplot.json
@@ -43,7 +43,7 @@
   ],
   "repository": {
     "ArrayDecl": {
-      "begin": "\\b(?:(array)\\s+([A-Za-z_]\\w*)?)",
+      "begin": "\\b(array)\\s+([A-Za-z_]\\w*)?",
       "beginCaptures": {
         "1": {
           "name": "support.type.array.gnuplot"
@@ -60,7 +60,7 @@
           ]
         }
       },
-      "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+      "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
       "name": "meta.variable.gnuplot",
       "patterns": [
         {
@@ -71,7 +71,7 @@
     "BuiltinFunction": {
       "patterns": [
         {
-          "match": "\\b(?:defined)\\b",
+          "match": "\\bdefined\\b",
           "name": "invalid.deprecated.function.gnuplot"
         },
         {
@@ -95,7 +95,7 @@
           "name": "keyword.operator.logical.gnuplot"
         },
         {
-          "match": "(<<|>>|&|\\||\\^)",
+          "match": "(<<|>>|[\\&|^])",
           "name": "keyword.operator.bitwise.gnuplot"
         },
         {
@@ -107,11 +107,11 @@
           "name": "keyword.operator.assignment.gnuplot"
         },
         {
-          "match": "(\\+|-|~|!)",
+          "match": "([+\\-~!])",
           "name": "keyword.operator.arithmetic.gnuplot"
         },
         {
-          "match": "(\\*\\*|\\+|-|\\*|/|%)",
+          "match": "(\\*\\*|[+\\-*/%])",
           "name": "keyword.operator.arithmetic.gnuplot"
         },
         {
@@ -128,7 +128,7 @@
     "BuiltinVariable": {
       "patterns": [
         {
-          "match": "\\b(?:FIT_LIMIT|FIT_MAXITER|FIT_START_LAMBDA|FIT_LAMBDA_FACTOR|FIT_SKIP|FIT_INDEX)\\b",
+          "match": "\\bFIT_(?:LIMIT|MAXITER|START_LAMBDA|LAMBDA_FACTOR|SKIP|INDEX)\\b",
           "name": "invalid.deprecated.variable.gnuplot"
         },
         {
@@ -142,14 +142,14 @@
       ]
     },
     "ColumnIndexLiteral": {
-      "match": "([$][0-9]+)\\b",
+      "match": "(\\$[0-9]+)\\b",
       "name": "support.constant.columnindex.gnuplot"
     },
     "Command": {
       "patterns": [
         {
-          "begin": "\\b(?:update)\\b",
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "begin": "\\bupdate\\b",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "name": "invalid.deprecated.command.gnuplot"
         },
         {
@@ -159,7 +159,7 @@
               "name": "keyword.other.command.gnuplot"
             }
           },
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "include": "#InvalidWord"
@@ -173,7 +173,7 @@
               "name": "keyword.other.command.gnuplot"
             }
           },
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "include": "#Expression"
@@ -197,7 +197,7 @@
               "name": "keyword.control.import.gnuplot"
             }
           },
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "include": "#SingleQuotedStringLiteral"
@@ -217,7 +217,7 @@
               "name": "keyword.other.command.gnuplot"
             }
           },
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "match": "\\b(bind|error(state)?|session)\\b",
@@ -235,7 +235,7 @@
               "name": "keyword.other.command.gnuplot"
             }
           },
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "include": "#BuiltinVariable"
@@ -244,7 +244,7 @@
               "include": "#BuiltinFunction"
             },
             {
-              "match": "(?<=\\s)([$]?[A-Za-z_]\\w*\\*?)(?=\\s)",
+              "match": "(?<=\\s)(\\$?[A-Za-z_]\\w*\\*?)(?=\\s)",
               "name": "source.gnuplot"
             },
             {
@@ -259,7 +259,7 @@
               "name": "keyword.control.conditional.gnuplot"
             }
           },
-          "end": "(?=(\\{|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([{#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "include": "#Expression"
@@ -273,7 +273,7 @@
               "name": "keyword.control.conditional.gnuplot"
             }
           },
-          "end": "(?=(\\{|#|\\\\(?!\\n)|(?<!\\\\)\\n$))"
+          "end": "(?=([{#]|\\\\(?!\\n)|(?<!\\\\)\\n$))"
         },
         {
           "begin": "\\b(do)\\b",
@@ -282,7 +282,7 @@
               "name": "keyword.control.flow.gnuplot"
             }
           },
-          "end": "(?=(\\{|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([{#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "include": "#ForIterationExpr"
@@ -296,7 +296,7 @@
               "name": "keyword.other.command.gnuplot"
             }
           },
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "match": "\\b(hidden3d|map|transparent|solid)\\b",
@@ -320,7 +320,7 @@
               "name": "keyword.other.command.gnuplot"
             }
           },
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "include": "#SetUnsetOptions"
@@ -340,7 +340,7 @@
               "name": "keyword.other.command.gnuplot"
             }
           },
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "include": "#ExtraShowOptions"
@@ -360,7 +360,7 @@
               "name": "keyword.other.command.gnuplot"
             }
           },
-          "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+          "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
           "patterns": [
             {
               "include": "#ColumnIndexLiteral"
@@ -379,7 +379,7 @@
       ]
     },
     "DataBlock": {
-      "begin": "(?:([$][A-Za-z_]\\w*)\\s*(<<)\\s*([A-Za-z_]\\w*)\\s*(?=(\\#|$)))",
+      "begin": "(\\$[A-Za-z_]\\w*)\\s*(<<)\\s*([A-Za-z_]\\w*)\\s*(?=(#|$))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -415,7 +415,7 @@
       ]
     },
     "DeprecatedScriptArgsLiteral": {
-      "match": "([$][0-9#])",
+      "match": "(\\$[0-9#])",
       "name": "invalid.illegal.scriptargs.gnuplot"
     },
     "DoubleQuotedStringLiteral": {
@@ -481,7 +481,7 @@
       "name": "support.class.options.gnuplot"
     },
     "ForIterationExpr": {
-      "begin": "\\b(?:(for)\\s*(\\[)\\s*(?:([A-Za-z_]\\w*)\\s+(in)\\b)?)",
+      "begin": "\\b(for)\\s*(\\[)\\s*(?:([A-Za-z_]\\w*)\\s+(in)\\b)?",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.flow.gnuplot"
@@ -500,7 +500,7 @@
           "name": "keyword.control.flow.gnuplot"
         }
       },
-      "end": "((\\])|(?=(#|\\\\(?!\\n)|(?<!\\\\)\\n$)))",
+      "end": "((])|(?=(#|\\\\(?!\\n)|(?<!\\\\)\\n$)))",
       "endCaptures": {
         "2": {
           "patterns": [
@@ -548,7 +548,7 @@
       ]
     },
     "FunctionDecl": {
-      "begin": "\\b(?:([A-Za-z_]\\w*)\\s*((\\()\\s*([A-Za-z_]\\w*)\\s*(?:(,)\\s*([A-Za-z_]\\w*)\\s*)*(\\))))",
+      "begin": "\\b([A-Za-z_]\\w*)\\s*((\\()\\s*([A-Za-z_]\\w*)\\s*(?:(,)\\s*([A-Za-z_]\\w*)\\s*)*(\\)))",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.gnuplot",
@@ -577,7 +577,7 @@
           "name": "punctuation.definition.parameters.end.gnuplot"
         }
       },
-      "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+      "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
       "name": "meta.function.gnuplot",
       "patterns": [
         {
@@ -610,7 +610,7 @@
       "name": "invalid.illegal.variable.gnuplot"
     },
     "InvalidWord": {
-      "match": "([^;#\\\\[:space:]]+)",
+      "match": "([^;#\\\\\\s]+)",
       "name": "invalid.illegal.gnuplot"
     },
     "LineComment": {
@@ -648,7 +648,7 @@
       ]
     },
     "MacroExpansion": {
-      "begin": "([@][A-Za-z_]\\w*)",
+      "begin": "(@[A-Za-z_]\\w*)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -658,7 +658,7 @@
           ]
         }
       },
-      "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+      "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
       "patterns": [
         {
           "include": "#Expression"
@@ -668,15 +668,15 @@
     "NumberLiteral": {
       "patterns": [
         {
-          "match": "(?:(((\\b[0-9]+)|(?<!\\d)))([.][0-9]+)([Ee][+-]?[0-9]+)?)(cm|in)?\\b",
+          "match": "(((\\b[0-9]+)|(?<!\\d)))(\\.[0-9]+)([Ee][+-]?[0-9]+)?(cm|in)?\\b",
           "name": "constant.numeric.float.gnuplot"
         },
         {
-          "match": "(?:(\\b[0-9]+)((([Ee][+-]?[0-9]+\\b))|([.]([Ee][+-]?[0-9]+\\b)?)))(cm\\b|in\\b)?",
+          "match": "(\\b[0-9]+)((([Ee][+-]?[0-9]+\\b))|(\\.([Ee][+-]?[0-9]+\\b)?))(cm\\b|in\\b)?",
           "name": "constant.numeric.float.gnuplot"
         },
         {
-          "match": "\\b(0[Xx][0-9a-fA-F]+)(cm|in)?\\b",
+          "match": "\\b(0[Xx]\\h+)(cm|in)?\\b",
           "name": "constant.numeric.hex.gnuplot"
         },
         {
@@ -714,7 +714,7 @@
       ]
     },
     "RGBColorSpec": {
-      "match": "\\G(0x|#)(([0-9a-fA-F]{6})|([0-9a-fA-F]{8}))\\b",
+      "match": "\\G(0x|#)((\\h{6})|(\\h{8}))\\b",
       "name": "constant.other.placeholder.gnuplot"
     },
     "RangeSeparators": {
@@ -728,7 +728,7 @@
           "name": "punctuation.separator.range.gnuplot"
         },
         {
-          "match": "(\\])",
+          "match": "(])",
           "name": "punctuation.section.brackets.end.gnuplot"
         }
       ]
@@ -740,7 +740,7 @@
           "name": "invalid.deprecated.options.gnuplot"
         },
         {
-          "match": "\\G\\s*\\b(?:angles|arrow|autoscale|border|boxwidth|clip|cntr(label|param)|color(box|sequence)?|contour|(dash|line)type|datafile|decimal(sign)?|dgrid3d|dummy|encoding|(error)?bars|fit|fontpath|format|grid|hidden3d|history|(iso)?samples|jitter|key|label|link|loadpath|locale|logscale|mapping|[lrtb]margin|margins|micro|minus(sign)?|mono(chrome)?|mouse|multiplot|nonlinear|object|offsets|origin|output|parametric|(p|r)axis|pm3d|palette|pointintervalbox|pointsize|polar|print|psdir|size|style|surface|table|terminal|termoption|theta|tics|timestamp|timefmt|title|view|xyplane|zero|(no)?(m)?(x|x2|y|y2|z|cb|r|t)tics|(x|x2|y|y2|z|cb)data|(x|x2|y|y2|z|cb|r)label|(x|x2|y|y2|z|cb)dtics|(x|x2|y|y2|z|cb)mtics|(x|x2|y|y2|z|cb|[rtuv])range|(x|x2|y|y2|z)?zeroaxis)\\b",
+          "match": "\\G\\s*\\b(?:angles|arrow|autoscale|border|boxwidth|clip|cntr(label|param)|color(box|sequence)?|contour|(dash|line)type|datafile|decimal(sign)?|dgrid3d|dummy|encoding|(error)?bars|fit|fontpath|format|grid|hidden3d|history|(iso)?samples|jitter|key|label|link|loadpath|locale|logscale|mapping|[lrtb]margin|margins|micro|minus(sign)?|mono(chrome)?|mouse|multiplot|nonlinear|object|offsets|origin|output|parametric|([pr])axis|pm3d|palette|pointintervalbox|pointsize|polar|print|psdir|size|style|surface|table|terminal|termoption|theta|tics|timestamp|timefmt|title|view|xyplane|zero|(no)?(m)?(x|x2|y|y2|z|cb|[rt])tics|(x|x2|y|y2|z|cb)data|(x|x2|y|y2|z|cb|r)label|(x|x2|y|y2|z|cb)dtics|(x|x2|y|y2|z|cb)mtics|(x|x2|y|y2|z|cb|[rtuv])range|(x|x2|y|y2|z)?zeroaxis)\\b",
           "name": "support.class.options.gnuplot"
         }
       ]
@@ -819,7 +819,7 @@
           ]
         }
       },
-      "end": "((\\])|(?=(#|\\\\(?!\\n)|(?<!\\\\)\\n$)))",
+      "end": "((])|(?=(#|\\\\(?!\\n)|(?<!\\\\)\\n$)))",
       "endCaptures": {
         "2": {
           "patterns": [
@@ -858,7 +858,7 @@
       ]
     },
     "VariableDecl": {
-      "begin": "\\b(?:([A-Za-z_]\\w*)\\s*(?:(\\[)\\s*(.*)\\s*(\\])\\s*)?(?=(=)(?!\\s*=)))",
+      "begin": "\\b([A-Za-z_]\\w*)\\s*(?:(\\[)\\s*(.*)\\s*(])\\s*)?(?=(=)(?!\\s*=))",
       "beginCaptures": {
         "1": {
           "name": "entity.name.variable.gnuplot",
@@ -879,7 +879,7 @@
           ]
         }
       },
-      "end": "(?=(;|#|\\\\(?!\\n)|(?<!\\\\)\\n$))",
+      "end": "(?=([;#]|\\\\(?!\\n)|(?<!\\\\)\\n$))",
       "name": "meta.variable.gnuplot",
       "patterns": [
         {
diff --git a/resources/languages/go.json b/resources/languages/go.json
index 3998aeb..a148c99 100644
--- a/resources/languages/go.json
+++ b/resources/languages/go.json
@@ -19,18 +19,17 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             },
             {
-              "match": "\\]",
+              "match": "]",
               "name": "punctuation.definition.end.bracket.square.go"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\w+",
               "name": "variable.other.go"
             }
           ]
         }
       },
-      "comment": "After control variables, to not highlight as a struct/interface (before formatting with gofmt)",
-      "match": "(?:(?<=\\brange\\b|\\bswitch\\b|\\;|\\bif\\b|\\bfor\\b|\\<|\\>|\\<\\=|\\>\\=|\\=\\=|\\!\\=|\\w(?:\\+|/|\\-|\\*|\\%)|\\w(?:\\+|/|\\-|\\*|\\%)\\=|\\|\\||\\&\\&)(?:\\s*)((?![\\[\\]]+)[[:alnum:]\\-\\_\\!\\.\\[\\]\\<\\>\\=\\*/\\+\\%\\:]+)(?:\\s*)(?=\\{))"
+      "match": "(?<=\\brange\\b|\\bswitch\\b|;|\\bif\\b|\\bfor\\b|[<>]|<=|>=|==|!=|\\w[+/\\-*%]|\\w[+/\\-*%]=|\\|\\||&&)\\s*((?![\\[\\]]+)[[:alnum:]\\-_!.\\[\\]<>=*/+%:]+)\\s*(?=\\{)"
     },
     "brackets": {
       "patterns": [
@@ -41,7 +40,7 @@
               "name": "punctuation.definition.begin.bracket.curly.go"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.curly.go"
@@ -79,7 +78,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.go"
@@ -94,14 +93,13 @@
       ]
     },
     "built_in_functions": {
-      "comment": "Built-in functions",
       "patterns": [
         {
           "match": "\\b(append|cap|close|complex|copy|delete|imag|len|panic|print|println|real|recover|min|max|clear)\\b(?=\\()",
           "name": "entity.name.function.support.builtin.go"
         },
         {
-          "begin": "(?:(\\bnew\\b)(\\())",
+          "begin": "(\\bnew\\b)(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.support.builtin.go"
@@ -110,7 +108,6 @@
               "name": "punctuation.definition.begin.bracket.round.go"
             }
           },
-          "comment": "new keyword",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -131,7 +128,7 @@
               "include": "#generic_types"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\w+",
               "name": "entity.name.type.go"
             },
             {
@@ -140,7 +137,7 @@
           ]
         },
         {
-          "begin": "(?:(\\bmake\\b)(?:(\\()((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?:[\\[\\]\\*]+)?(?:(?!\\bmap\\b)(?:[\\w\\.]+))?(\\[(?:(?:[\\S]+)(?:(?:\\,\\s*(?:[\\S]+))*))?\\])?(?:\\,)?)?))",
+          "begin": "(\\bmake\\b)(\\()((?:(?:[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+(?:\\([^)]+\\))?)?[\\[\\]*]+{0,1}(?:(?!\\bmap\\b)[\\w.]+)?(\\[(?:\\S+(?:,\\s*\\S+)*)?])?,?)?",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.support.builtin.go"
@@ -163,7 +160,6 @@
               ]
             }
           },
-          "comment": "make keyword",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -181,13 +177,13 @@
     "comments": {
       "patterns": [
         {
-          "begin": "(\\/\\*)",
+          "begin": "(/\\*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.go"
             }
           },
-          "end": "(\\*\\/)",
+          "end": "(\\*/)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.comment.go"
@@ -196,7 +192,7 @@
           "name": "comment.block.go"
         },
         {
-          "begin": "(\\/\\/)",
+          "begin": "(//)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.go"
@@ -208,7 +204,6 @@
       ]
     },
     "const_assignment": {
-      "comment": "constant assignment with const keyword",
       "patterns": [
         {
           "captures": {
@@ -244,7 +239,7 @@
                   "name": "punctuation.definition.begin.bracket.square.go"
                 },
                 {
-                  "match": "\\]",
+                  "match": "]",
                   "name": "punctuation.definition.end.bracket.square.go"
                 },
                 {
@@ -254,17 +249,15 @@
               ]
             }
           },
-          "comment": "single assignment",
-          "match": "(?:(?<=\\bconst\\b)(?:\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)"
+          "match": "(?<=\\bconst\\b)\\s*(\\b[\\w.]+(?:,\\s*[\\w.]+)*)\\s*((?:(?:[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+(?:\\([^)]+\\))?)?(?![\\[\\]*]+{0,1}\\b(?:struct|func|map)\\b)(?:[\\w.\\[\\]*]+(?:,\\s*[\\w.\\[\\]*]+)*)?\\s*=?)?"
         },
         {
-          "begin": "(?:(?<=\\bconst\\b)(?:\\s*)(\\())",
+          "begin": "(?<=\\bconst\\b)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.begin.bracket.round.go"
             }
           },
-          "comment": "multi assignment",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -306,7 +299,7 @@
                       "name": "punctuation.definition.begin.bracket.square.go"
                     },
                     {
-                      "match": "\\]",
+                      "match": "]",
                       "name": "punctuation.definition.end.bracket.square.go"
                     },
                     {
@@ -316,7 +309,7 @@
                   ]
                 }
               },
-              "match": "(?:(?:^\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)"
+              "match": "^\\s*(\\b[\\w.]+(?:,\\s*[\\w.]+)*)\\s*((?:(?:[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+(?:\\([^)]+\\))?)?(?![\\[\\]*]+{0,1}\\b(?:struct|func|map)\\b)(?:[\\w.\\[\\]*]+(?:,\\s*[\\w.\\[\\]*]+)*)?\\s*=?)?"
             },
             {
               "include": "$self"
@@ -328,7 +321,7 @@
     "delimiters": {
       "patterns": [
         {
-          "match": "\\,",
+          "match": ",",
           "name": "punctuation.other.comma.go"
         },
         {
@@ -361,9 +354,17 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             },
             {
-              "match": "\\]",
+              "match": "]",
               "name": "punctuation.definition.end.bracket.square.go"
             },
+            {
+              "match": "\\{",
+              "name": "punctuation.definition.begin.bracket.curly.go"
+            },
+            {
+              "match": "}",
+              "name": "punctuation.definition.end.bracket.curly.go"
+            },
             {
               "match": "\\w+",
               "name": "entity.name.type.go"
@@ -371,8 +372,7 @@
           ]
         }
       },
-      "comment": "double parentheses types",
-      "match": "(?:(?<!\\w)(\\((?:[\\w\\.\\[\\]\\*\\&]+)\\))(?=\\())"
+      "match": "(?<!\\w)(\\([\\[\\]*]+{0,1}[\\w.]+(?:\\[(?:[\\w.*\\[\\]{}]+(?:,\\s*[\\w.*\\[\\]{}]+)*)?])?\\))(?=\\()"
     },
     "field_hover": {
       "captures": {
@@ -406,11 +406,10 @@
           ]
         }
       },
-      "comment": "struct field property and types when hovering with the mouse",
-      "match": "(?:(?<=^\\bfield\\b)\\s+([\\w\\*\\.]+)\\s+([\\s\\S]+))"
+      "match": "(?<=^\\bfield\\b)\\s+([\\w*.]+)\\s+([\\s\\S]+)"
     },
     "function_declaration": {
-      "begin": "(?:^(\\bfunc\\b)(?:\\s*(\\([^\\)]+\\)\\s*)?(?:(\\w+)(?=\\(|\\[))?))",
+      "begin": "^(\\bfunc\\b)\\s*(\\([^)]+\\)\\s*)?(?:(\\w+)(?=[(\\[]))?",
       "beginCaptures": {
         "1": {
           "name": "keyword.function.go"
@@ -445,13 +444,13 @@
                           "include": "#parameter-variable-types"
                         },
                         {
-                          "match": "(?:\\w+)",
+                          "match": "\\w+",
                           "name": "entity.name.type.go"
                         }
                       ]
                     }
                   },
-                  "match": "(?:(\\w+(?:\\s+))?((?:[\\w\\.\\*]+)(?:\\[(?:(?:(?:[\\w\\.\\*]+)(?:\\,\\s+)?)+)?\\])?))"
+                  "match": "(\\w+\\s+)?([\\w.*]+(?:\\[(?:[\\w.*]+(?:,\\s+)?)+{0,1}])?)"
                 },
                 {
                   "include": "$self"
@@ -473,8 +472,7 @@
           ]
         }
       },
-      "comment": "Function declarations",
-      "end": "(?:(?<=\\))\\s*((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:[\\[\\]\\*]+)?(?:\\bstruct\\b|\\binterface\\b))[\\w\\.\\-\\*\\[\\]]+)?\\s*(?=\\{))",
+      "end": "(?<=\\))\\s*((?:[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}(?![\\[\\]*]+{0,1}\\b(?:struct\\b|interface\\b))[\\w.\\-*\\[\\]]+)?\\s*(?=\\{)",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -485,7 +483,7 @@
               "include": "#parameter-variable-types"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\w+",
               "name": "entity.name.type.go"
             }
           ]
@@ -512,7 +510,7 @@
           ]
         },
         {
-          "begin": "(?:([\\w\\.\\*]+)?(\\[))",
+          "begin": "([\\w.*]+)?(\\[)",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -520,7 +518,7 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
@@ -529,7 +527,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.go"
@@ -558,8 +556,7 @@
               ]
             }
           },
-          "comment": "single function as a type returned type(s) declaration",
-          "match": "(?:(?<=\\))(?:\\s*)((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?[\\w\\*\\.\\[\\]\\<\\>\\-]+(?:\\s*)(?:\\/(?:\\/|\\*).*)?)$)"
+          "match": "(?<=\\))\\s*((?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}[\\w*.\\[\\]<>-]+\\s*(?:/[/*].*)?)$"
         },
         {
           "include": "$self"
@@ -567,7 +564,6 @@
       ]
     },
     "function_param_types": {
-      "comment": "function parameter variables and types",
       "patterns": [
         {
           "include": "#struct_variables_types"
@@ -592,8 +588,7 @@
               ]
             }
           },
-          "comment": "struct/interface type declaration",
-          "match": "((?:(?:\\b\\w+\\,\\s*)+)?\\b\\w+)\\s+(?=(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\[\\]\\*]+)?\\b(?:struct|interface)\\b\\s*\\{)"
+          "match": "((?:\\b\\w+,\\s*)+{0,1}\\b\\w+)\\s+(?=(?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}[\\[\\]*]+{0,1}\\b(?:struct|interface)\\b\\s*\\{)"
         },
         {
           "captures": {
@@ -609,8 +604,7 @@
               ]
             }
           },
-          "comment": "multiple parameters one type -with multilines",
-          "match": "(?:(?:(?<=\\()|^\\s*)((?:(?:\\b\\w+\\,\\s*)+)(?:/(?:/|\\*).*)?)$)"
+          "match": "(?:(?<=\\()|^\\s*)((?:\\b\\w+,\\s*)+(?:/[/*].*)?)$"
         },
         {
           "captures": {
@@ -634,17 +628,16 @@
                   "include": "#parameter-variable-types"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
-          "comment": "multiple params and types | multiple params one type | one param one type",
-          "match": "(?:((?:(?:\\b\\w+\\,\\s*)+)?\\b\\w+)(?:\\s+)((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:(?:(?:[\\w\\[\\]\\.\\*]+)?(?:(?:\\bfunc\\b\\((?:[^\\)]+)?\\))(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s*))+(?:(?:(?:[\\w\\*\\.\\[\\]]+)|(?:\\((?:[^\\)]+)?\\))))?)|(?:(?:[\\[\\]\\*]+)?[\\w\\*\\.]+(?:\\[(?:[^\\]]+)\\])?(?:[\\w\\.\\*]+)?)+)))"
+          "match": "((?:\\b\\w+,\\s*)+{0,1}\\b\\w+)\\s+((?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}(?:[\\w\\[\\].*]+{0,1}(?:\\bfunc\\b\\([^)]+{0,1}\\)(?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}\\s*)+(?:[\\w*.\\[\\]]+|\\([^)]+{0,1}\\))?|(?:[\\[\\]*]+{0,1}[\\w*.]+(?:\\[[^\\]]+])?[\\w.*]+{0,1})+))"
         },
         {
-          "begin": "(?:([\\w\\.\\*]+)?(\\[))",
+          "begin": "([\\w.*]+)?(\\[)",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -652,7 +645,7 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
@@ -661,7 +654,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.go"
@@ -700,14 +693,13 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
-          "comment": "other types",
-          "match": "([\\w\\.]+)"
+          "match": "([\\w.]+)"
         },
         {
           "include": "$self"
@@ -715,14 +707,13 @@
       ]
     },
     "functions": {
-      "begin": "(?:(\\bfunc\\b)(?=\\())",
+      "begin": "(\\bfunc\\b)(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.function.go"
         }
       },
-      "comment": "Functions",
-      "end": "(?:(?<=\\))(\\s*(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?((?:(?:\\s*(?:(?:[\\[\\]\\*]+)?[\\w\\.\\*]+)?(?:(?:\\[(?:(?:[\\w\\.\\*]+)?(?:\\[(?:[^\\]]+)?\\])?(?:\\,\\s+)?)+\\])|(?:\\((?:[^\\)]+)?\\)))?(?:[\\w\\.\\*]+)?)(?:\\s*)(?=\\{))|(?:\\s*(?:(?:(?:[\\[\\]\\*]+)?(?!\\bfunc\\b)(?:[\\w\\.\\*]+)(?:\\[(?:(?:[\\w\\.\\*]+)?(?:\\[(?:[^\\]]+)?\\])?(?:\\,\\s+)?)+\\])?(?:[\\w\\.\\*]+)?)|(?:\\((?:[^\\)]+)?\\)))))?)",
+      "end": "(?<=\\))(\\s*(?:[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+)?(\\s*(?:[\\[\\]*]+{0,1}[\\w.*]+)?(?:\\[(?:[\\w.*]+{0,1}(?:\\[[^\\]]+{0,1}])?(?:,\\s+)?)+]|\\([^)]+{0,1}\\))?[\\w.*]+{0,1}\\s*(?=\\{)|\\s*(?:[\\[\\]*]+{0,1}(?!\\bfunc\\b)[\\w.*]+(?:\\[(?:[\\w.*]+{0,1}(?:\\[[^\\]]+{0,1}])?(?:,\\s+)?)+])?[\\w.*]+{0,1}|\\([^)]+{0,1}\\)))?",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -740,7 +731,7 @@
               "include": "#parameter-variable-types"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\w+",
               "name": "entity.name.type.go"
             }
           ]
@@ -789,7 +780,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             },
             {
-              "match": "\\]",
+              "match": "]",
               "name": "punctuation.definition.end.bracket.square.go"
             },
             {
@@ -797,21 +788,19 @@
               "name": "punctuation.definition.begin.bracket.curly.go"
             },
             {
-              "match": "\\}",
+              "match": "}",
               "name": "punctuation.definition.end.bracket.curly.go"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\w+",
               "name": "entity.name.type.go"
             }
           ]
         }
       },
-      "comment": "functions in-line with multi return types",
-      "match": "(?:(\\bfunc\\b)((?:\\((?:[^/]*?)\\))(?:\\s+)(?:\\((?:[^/]*?)\\)))(?:\\s+)(?=\\{))"
+      "match": "(\\bfunc\\b)(\\([^/]*?\\)\\s+\\([^/]*?\\))\\s+(?=\\{)"
     },
     "generic_param_types": {
-      "comment": "generic parameter variables and types",
       "patterns": [
         {
           "include": "#struct_variables_types"
@@ -836,8 +825,7 @@
               ]
             }
           },
-          "comment": "struct/interface type declaration",
-          "match": "((?:(?:\\b\\w+\\,\\s*)+)?\\b\\w+)\\s+(?=(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\[\\]\\*]+)?\\b(?:struct|interface)\\b\\s*\\{)"
+          "match": "((?:\\b\\w+,\\s*)+{0,1}\\b\\w+)\\s+(?=(?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}[\\[\\]*]+{0,1}\\b(?:struct|interface)\\b\\s*\\{)"
         },
         {
           "captures": {
@@ -853,8 +841,7 @@
               ]
             }
           },
-          "comment": "multiple parameters one type -with multilines",
-          "match": "(?:(?:(?<=\\()|^\\s*)((?:(?:\\b\\w+\\,\\s*)+)(?:/(?:/|\\*).*)?)$)"
+          "match": "(?:(?<=\\()|^\\s*)((?:\\b\\w+,\\s*)+(?:/[/*].*)?)$"
         },
         {
           "captures": {
@@ -878,7 +865,7 @@
                   "include": "#parameter-variable-types"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
@@ -889,17 +876,16 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
-          "comment": "multiple params and types | multiple types one param",
-          "match": "(?:((?:(?:\\b\\w+\\,\\s*)+)?\\b\\w+)(?:\\s+)((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:(?:(?:[\\w\\[\\]\\.\\*]+)?(?:(?:\\bfunc\\b\\((?:[^\\)]+)?\\))(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s*))+(?:(?:(?:[\\w\\*\\.]+)|(?:\\((?:[^\\)]+)?\\))))?)|(?:(?:(?:[\\w\\*\\.\\~]+)|(?:\\[(?:(?:[\\w\\.\\*]+)?(?:\\[(?:[^\\]]+)?\\])?(?:\\,\\s+)?)+\\]))(?:[\\w\\.\\*]+)?)+)))"
+          "match": "((?:\\b\\w+,\\s*)+{0,1}\\b\\w+)\\s+((?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}(?:[\\w\\[\\].*]+{0,1}(?:\\bfunc\\b\\([^)]+{0,1}\\)(?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}\\s*)+(?:[\\w*.]+|\\([^)]+{0,1}\\))?|(?:(?:[\\w*.~]+|\\[(?:[\\w.*]+{0,1}(?:\\[[^\\]]+{0,1}])?(?:,\\s+)?)+])[\\w.*]+{0,1})+))"
         },
         {
-          "begin": "(?:([\\w\\.\\*]+)?(\\[))",
+          "begin": "([\\w.*]+)?(\\[)",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -907,7 +893,7 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
@@ -916,7 +902,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.go"
@@ -955,14 +941,13 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
-          "comment": "other types",
-          "match": "(?:\\b([\\w\\.]+))"
+          "match": "\\b([\\w.]+)"
         },
         {
           "include": "$self"
@@ -990,11 +975,9 @@
           ]
         }
       },
-      "comment": "Generic support for all types",
-      "match": "(?:([\\w\\.\\*]+)(\\[(?:[^\\]]+)?\\]))"
+      "match": "([\\w.*]+)(\\[[^\\]]+{0,1}])"
     },
     "group-functions": {
-      "comment": "all statements related to functions",
       "patterns": [
         {
           "include": "#function_declaration"
@@ -1014,7 +997,6 @@
       ]
     },
     "group-types": {
-      "comment": "all statements related to types",
       "patterns": [
         {
           "include": "#other_struct_interface_expressions"
@@ -1049,7 +1031,6 @@
       ]
     },
     "group-variables": {
-      "comment": "all statements related to variables",
       "patterns": [
         {
           "include": "#const_assignment"
@@ -1078,7 +1059,6 @@
       ]
     },
     "import": {
-      "comment": "import",
       "patterns": [
         {
           "begin": "\\b(import)\\s+",
@@ -1087,7 +1067,6 @@
               "name": "keyword.control.import.go"
             }
           },
-          "comment": "import",
           "end": "(?!\\G)",
           "patterns": [
             {
@@ -1098,7 +1077,6 @@
       ]
     },
     "imports": {
-      "comment": "import package(s)",
       "patterns": [
         {
           "captures": {
@@ -1108,7 +1086,7 @@
                   "include": "#delimiters"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "variable.other.import.go"
                 }
               ]
@@ -1126,7 +1104,7 @@
               "name": "punctuation.definition.string.end.go"
             }
           },
-          "match": "(\\s*[\\w\\.]+)?\\s*((\")([^\"]*)(\"))"
+          "match": "(\\s*[\\w.]+)?\\s*((\")([^\"]*)(\"))"
         },
         {
           "begin": "\\(",
@@ -1165,8 +1143,7 @@
           "name": "punctuation.definition.begin.bracket.curly.go"
         }
       },
-      "comment": "interface variable types",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.end.bracket.curly.go"
@@ -1182,7 +1159,6 @@
       ]
     },
     "interface_variables_types_field": {
-      "comment": "interface variable type fields",
       "patterns": [
         {
           "include": "#support_functions"
@@ -1191,7 +1167,7 @@
           "include": "#type-declarations-without-brackets"
         },
         {
-          "begin": "(?:([\\w\\.\\*]+)?(\\[))",
+          "begin": "([\\w.*]+)?(\\[)",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1199,7 +1175,7 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
@@ -1208,7 +1184,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.go"
@@ -1253,15 +1229,13 @@
               ]
             }
           },
-          "comment": "other types",
-          "match": "([\\w\\.]+)"
+          "match": "([\\w.]+)"
         }
       ]
     },
     "keywords": {
       "patterns": [
         {
-          "comment": "Flow control keywords",
           "match": "\\b(break|case|continue|default|defer|else|fallthrough|for|go|goto|if|range|return|select|switch)\\b",
           "name": "keyword.control.go"
         },
@@ -1317,8 +1291,7 @@
           ]
         }
       },
-      "comment": "labeled loop variable name",
-      "match": "((?:^\\s*\\w+:\\s*$)|(?:^\\s*(?:\\bbreak\\b|\\bgoto\\b|\\bcontinue\\b)\\s+\\w+(?:\\s*/(?:/|\\*)\\s*.*)?$))"
+      "match": "(^(?:\\s*\\w+:\\s*$|\\s*\\b(?:break\\b|goto\\b|continue\\b)\\s+\\w+(?:\\s*/[/*]\\s*.*)?$))"
     },
     "language_constants": {
       "captures": {
@@ -1332,11 +1305,10 @@
           "name": "constant.language.iota.go"
         }
       },
-      "comment": "Language constants",
       "match": "\\b(?:(true|false)|(nil)|(iota))\\b"
     },
     "map_types": {
-      "begin": "(?:(\\bmap\\b)(\\[))",
+      "begin": "(\\bmap\\b)(\\[)",
       "beginCaptures": {
         "1": {
           "name": "keyword.map.go"
@@ -1345,8 +1317,7 @@
           "name": "punctuation.definition.begin.bracket.square.go"
         }
       },
-      "comment": "map types",
-      "end": "(?:(\\])((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:[\\[\\]\\*]+)?\\b(?:func|struct|map)\\b)(?:[\\*\\[\\]]+)?(?:[\\w\\.]+)(?:\\[(?:(?:[\\w\\.\\*\\[\\]\\{\\}]+)(?:(?:\\,\\s*(?:[\\w\\.\\*\\[\\]\\{\\}]+))*))?\\])?)?)",
+      "end": "(])((?:[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}(?![\\[\\]*]+{0,1}\\b(?:func|struct|map)\\b)[*\\[\\]]+{0,1}[\\w.]+(?:\\[(?:[\\w.*\\[\\]{}]+(?:,\\s*[\\w.*\\[\\]{}]+)*)?])?)?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.end.bracket.square.go"
@@ -1361,7 +1332,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             },
             {
-              "match": "\\]",
+              "match": "]",
               "name": "punctuation.definition.end.bracket.square.go"
             },
             {
@@ -1386,7 +1357,7 @@
           "name": "punctuation.definition.begin.bracket.square.go"
         },
         {
-          "match": "\\]",
+          "match": "]",
           "name": "punctuation.definition.end.bracket.square.go"
         },
         {
@@ -1394,7 +1365,7 @@
           "name": "punctuation.definition.begin.bracket.curly.go"
         },
         {
-          "match": "\\}",
+          "match": "}",
           "name": "punctuation.definition.end.bracket.curly.go"
         },
         {
@@ -1421,7 +1392,6 @@
           "name": "punctuation.definition.begin.bracket.round.go"
         }
       },
-      "comment": "multi type declaration",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -1442,7 +1412,7 @@
           "include": "#parameter-variable-types"
         },
         {
-          "match": "(?:\\w+)",
+          "match": "\\w+",
           "name": "entity.name.type.go"
         }
       ]
@@ -1461,7 +1431,7 @@
                       "name": "constant.numeric.decimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1473,7 +1443,7 @@
                       "name": "constant.numeric.decimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1494,7 +1464,7 @@
                       "name": "constant.numeric.exponent.decimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1509,7 +1479,7 @@
                       "name": "constant.numeric.decimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1533,7 +1503,7 @@
                       "name": "constant.numeric.exponent.decimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1548,7 +1518,7 @@
                       "name": "constant.numeric.hexadecimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1566,7 +1536,7 @@
                       "name": "constant.numeric.hexadecimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1587,7 +1557,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1602,7 +1572,7 @@
                       "name": "constant.numeric.hexadecimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1614,7 +1584,7 @@
                       "name": "constant.numeric.decimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1632,7 +1602,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1650,7 +1620,7 @@
                       "name": "constant.numeric.hexadecimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1674,7 +1644,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1695,13 +1665,13 @@
                       "name": "constant.numeric.exponent.decimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
                     }
                   },
-                  "match": "(?:(?:(?:(?:(?:\\G(?=[0-9.])(?!0[xXbBoO])([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)?(?:(?<!_)([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)))?(i(?!\\w))?(?:\\n|$)|\\G(?=[0-9.])(?!0[xXbBoO])([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)(?<!_)([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*))(i(?!\\w))?(?:\\n|$))|\\G((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)(?:(?<!_)([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)))?(i(?!\\w))?(?:\\n|$))|(\\G0[xX])_?([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)?(?<!_)([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*))(i(?!\\w))?(?:\\n|$))|(\\G0[xX])_?([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)(?<!_)([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*))(i(?!\\w))?(?:\\n|$))|(\\G0[xX])((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)(?<!_)([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*))(i(?!\\w))?(?:\\n|$))"
+                  "match": "(?:(?:(?:\\G(?:(?:(?=[0-9.])(?!0[xXbBoO])([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)?(?:(?<!_)([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*))?(i(?!\\w))?(?:\\n|$)|(?=[0-9.])(?!0[xXbBoO])([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)(?<!_)([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*)(i(?!\\w))?(?:\\n|$))|((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)(?:(?<!_)([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*))?(i(?!\\w))?(?:\\n|$))|(\\G0[xX])_?(\\h(?:\\h|((?<=\\h)_(?=\\h)))*)((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)_(?=\\h)))*)?(?<!_)([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*)(i(?!\\w))?(?:\\n|$))|(\\G0[xX])_?(\\h(?:\\h|((?<=\\h)_(?=\\h)))*)(?<!_)([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*)(i(?!\\w))?(?:\\n|$))|(\\G0[xX])((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)_(?=\\h)))*)(?<!_)([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*)(i(?!\\w))?(?:\\n|$))"
                 },
                 {
                   "captures": {
@@ -1709,7 +1679,7 @@
                       "name": "constant.numeric.decimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1727,7 +1697,7 @@
                       "name": "constant.numeric.hexadecimal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1751,7 +1721,7 @@
                       "name": "constant.numeric.binary.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
@@ -1769,16 +1739,16 @@
                       "name": "constant.numeric.octal.go",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "punctuation.separator.constant.numeric.go"
                         }
                       ]
                     }
                   },
-                  "match": "(?:(?:(?:\\G(?=[0-9.])(?!0[xXbBoO])([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)(i(?!\\w))?(?:\\n|$)|(\\G0[bB])_?([01](?:[01]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)(i(?!\\w))?(?:\\n|$))|(\\G0[oO]?)_?((?:[0-7]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))+)(i(?!\\w))?(?:\\n|$))|(\\G0[xX])_?([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)(i(?!\\w))?(?:\\n|$))"
+                  "match": "(?:(?:(?:\\G(?=[0-9.])(?!0[xXbBoO])([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)(i(?!\\w))?(?:\\n|$)|(\\G0[bB])_?([01](?:[01]|((?<=\\h)_(?=\\h)))*)(i(?!\\w))?(?:\\n|$))|(\\G0[oO]?)_?((?:[0-7]|((?<=\\h)_(?=\\h)))+)(i(?!\\w))?(?:\\n|$))|(\\G0[xX])_?(\\h(?:\\h|((?<=\\h)_(?=\\h)))*)(i(?!\\w))?(?:\\n|$))"
                 },
                 {
-                  "match": "(?:(?:[0-9a-zA-Z_\\.])|(?<=[eEpP])[+-])+",
+                  "match": "(?:[0-9a-zA-Z_.]|(?<=[eEpP])[+-])+",
                   "name": "invalid.illegal.constant.numeric.go"
                 }
               ]
@@ -1786,21 +1756,20 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.])|(?<=[eEpP])[+-])*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.]|(?<=[eEpP])[+-])*"
     },
     "operators": {
-      "comment": "Note that the order here is very important!",
       "patterns": [
         {
-          "match": "((?:\\*|\\&)+)(?:(?!\\d)(?=(?:[\\w\\[\\]])|(?:\\<\\-)))",
+          "match": "([*\\&]+)(?!\\d)(?=[\\w\\[\\]]|<-)",
           "name": "keyword.operator.address.go"
         },
         {
-          "match": "<\\-",
+          "match": "<-",
           "name": "keyword.operator.channel.go"
         },
         {
-          "match": "\\-\\-",
+          "match": "--",
           "name": "keyword.operator.decrement.go"
         },
         {
@@ -1816,15 +1785,15 @@
           "name": "keyword.operator.logical.go"
         },
         {
-          "match": "(=|\\+=|\\-=|\\|=|\\^=|\\*=|/=|:=|%=|<<=|>>=|&\\^=|&=)",
+          "match": "(=|\\+=|-=|\\|=|\\^=|\\*=|/=|:=|%=|<<=|>>=|&\\^=|&=)",
           "name": "keyword.operator.assignment.go"
         },
         {
-          "match": "(\\+|\\-|\\*|/|%)",
+          "match": "([+\\-*/%])",
           "name": "keyword.operator.arithmetic.go"
         },
         {
-          "match": "(&(?!\\^)|\\||\\^|&\\^|<<|>>|\\~)",
+          "match": "(&(?!\\^)|[|^]|&\\^|<<|>>|~)",
           "name": "keyword.operator.arithmetic.bitwise.go"
         },
         {
@@ -1834,10 +1803,8 @@
       ]
     },
     "other_struct_interface_expressions": {
-      "comment": "struct and interface expression in-line (before curly bracket)",
       "patterns": [
         {
-          "comment": "after control variables must be added exactly here, do not move it! (changing may not affect tests, so be careful!)",
           "include": "#after_control_variables"
         },
         {
@@ -1856,40 +1823,36 @@
             "2": {
               "patterns": [
                 {
-                  "begin": "\\[",
-                  "beginCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.begin.bracket.square.go"
-                    }
-                  },
-                  "end": "\\]",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.end.bracket.square.go"
-                    }
-                  },
-                  "patterns": [
-                    {
-                      "include": "#type-declarations"
-                    },
-                    {
-                      "match": "\\w+",
-                      "name": "entity.name.type.go"
-                    },
-                    {
-                      "include": "$self"
-                    }
-                  ]
+                  "include": "#type-declarations-without-brackets"
+                },
+                {
+                  "match": "\\[",
+                  "name": "punctuation.definition.begin.bracket.square.go"
+                },
+                {
+                  "match": "]",
+                  "name": "punctuation.definition.end.bracket.square.go"
+                },
+                {
+                  "match": "\\{",
+                  "name": "punctuation.definition.begin.bracket.curly.go"
+                },
+                {
+                  "match": "}",
+                  "name": "punctuation.definition.end.bracket.curly.go"
+                },
+                {
+                  "match": "\\w+",
+                  "name": "entity.name.type.go"
                 }
               ]
             }
           },
-          "match": "(\\b[\\w\\.]+)(\\[(?:[^\\]]+)?\\])?(?=\\{)(?<!\\bstruct\\b|\\binterface\\b)"
+          "match": "(\\b[\\w.]+)(\\[(?:[\\w.*\\[\\]{}]+(?:,\\s*[\\w.*\\[\\]{}]+)*)?])?(?=\\{)(?<!\\b(?:struct\\b|interface\\b))"
         }
       ]
     },
     "other_variables": {
-      "comment": "all other variables",
       "match": "\\w+",
       "name": "variable.other.go"
     },
@@ -1902,7 +1865,6 @@
               "name": "keyword.package.go"
             }
           },
-          "comment": "package name",
           "end": "(?!\\G)",
           "patterns": [
             {
@@ -1918,18 +1880,17 @@
       ]
     },
     "parameter-variable-types": {
-      "comment": "function and generic parameter types",
       "patterns": [
         {
           "match": "\\{",
           "name": "punctuation.definition.begin.bracket.curly.go"
         },
         {
-          "match": "\\}",
+          "match": "}",
           "name": "punctuation.definition.end.bracket.curly.go"
         },
         {
-          "begin": "(?:([\\w\\.\\*]+)?(\\[))",
+          "begin": "([\\w.*]+)?(\\[)",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1937,7 +1898,7 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
@@ -1946,7 +1907,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.go"
@@ -1993,8 +1954,7 @@
           ]
         }
       },
-      "comment": "Property variables in struct",
-      "match": "((?:\\b[\\w\\.]+)(?:\\:(?!\\=)))"
+      "match": "(\\b[\\w.]+:(?!=))"
     },
     "raw_string_literals": {
       "begin": "`",
@@ -2003,7 +1963,6 @@
           "name": "punctuation.definition.string.begin.go"
         }
       },
-      "comment": "Raw string literals",
       "end": "`",
       "endCaptures": {
         "0": {
@@ -2035,7 +1994,7 @@
           "name": "string.quoted.rune.go",
           "patterns": [
             {
-              "match": "\\G(\\\\([0-7]{3}|[abfnrtv\\\\'\"]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})|.)(?=')",
+              "match": "\\G(\\\\([0-7]{3}|[abfnrtv\\\\'\"]|x\\h{2}|u\\h{4}|U\\h{8})|.)(?=')",
               "name": "constant.other.rune.go"
             },
             {
@@ -2101,11 +2060,10 @@
               ]
             }
           },
-          "comment": "single type declaration",
-          "match": "(?:(?:^\\s*)(\\btype\\b)(?:\\s*)([\\w\\.\\*]+)(?:\\s+)(?!(?:\\=\\s*)?(?:[\\[\\]\\*]+)?\\b(?:struct|interface)\\b)([\\s\\S]+))"
+          "match": "^\\s*(\\btype\\b)\\s*([\\w.*]+)\\s+(?!(?:=\\s*)?[\\[\\]*]+{0,1}\\b(?:struct|interface)\\b)([\\s\\S]+)"
         },
         {
-          "begin": "(?:(?:^|\\s+)(\\btype\\b)(?:\\s*)([\\w\\.\\*]+)(?=\\[))",
+          "begin": "(?:^|\\s+)(\\btype\\b)\\s*([\\w.*]+)(?=\\[)",
           "beginCaptures": {
             "1": {
               "name": "keyword.type.go"
@@ -2122,8 +2080,7 @@
               ]
             }
           },
-          "comment": "single type declaration with generics",
-          "end": "(?:(?<=\\])((?:\\s+)(?:\\=\\s*)?(?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:(?!(?:[\\[\\]\\*]+)?(?:\\bstruct\\b|\\binterface\\b|\\bfunc\\b))[\\w\\.\\-\\*\\[\\]]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*))?)",
+          "end": "(?<=])(\\s+(?:=\\s*)?(?:[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}(?![\\[\\]*]+{0,1}\\b(?:struct\\b|interface\\b|func\\b))[\\w.\\-*\\[\\]]+(?:,\\s*[\\w.\\[\\]*]+)*)?",
           "endCaptures": {
             "1": {
               "patterns": [
@@ -2135,7 +2092,7 @@
                   "name": "punctuation.definition.begin.bracket.square.go"
                 },
                 {
-                  "match": "\\]",
+                  "match": "]",
                   "name": "punctuation.definition.end.bracket.square.go"
                 },
                 {
@@ -2160,7 +2117,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             },
             {
-              "match": "\\]",
+              "match": "]",
               "name": "punctuation.definition.end.bracket.square.go"
             },
             {
@@ -2168,7 +2125,7 @@
               "name": "punctuation.definition.begin.bracket.curly.go"
             },
             {
-              "match": "\\}",
+              "match": "}",
               "name": "punctuation.definition.end.bracket.curly.go"
             },
             {
@@ -2201,8 +2158,7 @@
           ]
         }
       },
-      "comment": "slice index and capacity variables, to not scope them as property variables",
-      "match": "(?<=\\w\\[)((?:(?:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+\\:)|(?:\\:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+))(?:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+)?(?:\\:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+)?)(?=\\])"
+      "match": "(?<=\\w\\[)((?:\\b[\\w.*+/\\-%<>|\\&]+:|:\\b[\\w.*+/\\-%<>|\\&]+)(?:\\b[\\w.*+/\\-%<>|\\&]+)?(?::\\b[\\w.*+/\\-%<>|\\&]+)?)(?=])"
     },
     "statements": {
       "patterns": [
@@ -2262,17 +2218,21 @@
         {
           "match": "\\bany\\b",
           "name": "entity.name.type.any.go"
+        },
+        {
+          "match": "\\bcomparable\\b",
+          "name": "entity.name.type.comparable.go"
         }
       ]
     },
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\\\([0-7]{3}|[abfnrtv\\\\'\"]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})",
+          "match": "\\\\([0-7]{3}|[abfnrtv\\\\'\"]|x\\h{2}|u\\h{4}|U\\h{8})",
           "name": "constant.character.escape.go"
         },
         {
-          "match": "\\\\[^0-7xuUabfnrtv\\'\"]",
+          "match": "\\\\[^0-7xuUabfnrtv'\"]",
           "name": "invalid.illegal.unknown-escape.go"
         }
       ]
@@ -2286,7 +2246,6 @@
               "name": "punctuation.definition.string.begin.go"
             }
           },
-          "comment": "Interpreted string literals",
           "end": "\"",
           "endCaptures": {
             "0": {
@@ -2308,7 +2267,7 @@
     "string_placeholder": {
       "patterns": [
         {
-          "match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGspw]",
+          "match": "%(\\[\\d+])?([+#\\-0 ]{0,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+])\\*?)?(\\[\\d+])?)?))?[vT%tbcdoqxXUeEfFgGspw]",
           "name": "constant.other.placeholder.go"
         }
       ]
@@ -2330,14 +2289,12 @@
           ]
         }
       },
-      "comment": "struct, interface type declarations (related to: struct_variables_types, interface_variables_types)",
-      "match": "(?:(?:^\\s*)(\\btype\\b)(?:\\s*)([\\w\\.]+))"
+      "match": "^\\s*(\\btype\\b)\\s*([\\w.]+)"
     },
     "struct_variable_types_fields_multi": {
-      "comment": "struct variable and type fields with multi lines",
       "patterns": [
         {
-          "begin": "(?:((?:\\w+(?:\\,\\s*\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s+)(?:[\\[\\]\\*]+)?)(\\bstruct\\b)(?:\\s*)(\\{))",
+          "begin": "(\\w+(?:,\\s*\\w+)*(?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}\\s+[\\[\\]*]+{0,1})(\\bstruct\\b)\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -2357,8 +2314,7 @@
               "name": "punctuation.definition.begin.bracket.curly.go"
             }
           },
-          "comment": "struct in struct types",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.curly.go"
@@ -2374,7 +2330,7 @@
           ]
         },
         {
-          "begin": "(?:((?:\\w+(?:\\,\\s*\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s+)(?:[\\[\\]\\*]+)?)(\\binterface\\b)(?:\\s*)(\\{))",
+          "begin": "(\\w+(?:,\\s*\\w+)*(?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}\\s+[\\[\\]*]+{0,1})(\\binterface\\b)\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -2394,8 +2350,7 @@
               "name": "punctuation.definition.begin.bracket.curly.go"
             }
           },
-          "comment": "interface in struct types",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.curly.go"
@@ -2411,7 +2366,7 @@
           ]
         },
         {
-          "begin": "(?:((?:\\w+(?:\\,\\s*\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s+)(?:[\\[\\]\\*]+)?)(\\bfunc\\b)(?:\\s*)(\\())",
+          "begin": "(\\w+(?:,\\s*\\w+)*(?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}\\s+[\\[\\]*]+{0,1})(\\bfunc\\b)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -2431,7 +2386,6 @@
               "name": "punctuation.definition.begin.bracket.round.go"
             }
           },
-          "comment": "function in struct types",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -2462,8 +2416,7 @@
           "name": "punctuation.definition.begin.bracket.curly.go"
         }
       },
-      "comment": "Struct variable type",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.end.bracket.curly.go"
@@ -2479,7 +2432,6 @@
       ]
     },
     "struct_variables_types_fields": {
-      "comment": "Struct variable type fields",
       "patterns": [
         {
           "include": "#struct_variable_types_fields_multi"
@@ -2492,14 +2444,13 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
-          "comment": "one line - single type",
-          "match": "(?:(?<=\\{)\\s*((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\w\\.\\*\\[\\]]+))\\s*(?=\\}))"
+          "match": "(?<=\\{)\\s*((?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}[\\w.*\\[\\]]+)\\s*(?=})"
         },
         {
           "captures": {
@@ -2509,7 +2460,7 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "variable.other.property.go"
                 }
               ]
@@ -2520,14 +2471,13 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
-          "comment": "one line - property variables and types",
-          "match": "(?:(?<=\\{)\\s*((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\w\\.\\*\\[\\]]+))\\s*(?=\\}))"
+          "match": "(?<=\\{)\\s*((?:\\w+,\\s*)+{0,1}\\w+\\s+)((?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}[\\w.*\\[\\]]+)\\s*(?=})"
         },
         {
           "captures": {
@@ -2541,7 +2491,7 @@
                           "include": "#type-declarations"
                         },
                         {
-                          "match": "(?:\\w+)",
+                          "match": "\\w+",
                           "name": "variable.other.property.go"
                         }
                       ]
@@ -2552,19 +2502,18 @@
                           "include": "#type-declarations"
                         },
                         {
-                          "match": "(?:\\w+)",
+                          "match": "\\w+",
                           "name": "entity.name.type.go"
                         }
                       ]
                     }
                   },
-                  "match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\S]+)(?:\\;)?))"
+                  "match": "((?:\\w+,\\s*)+{0,1}\\w+\\s+)?((?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}\\S+;?)"
                 }
               ]
             }
           },
-          "comment": "one line with semicolon(;) without formatting gofmt - single type | property variables and types",
-          "match": "(?:(?<=\\{)((?:\\s*(?:(?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?(?:(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\S]+)(?:\\;)?))+)\\s*(?=\\}))"
+          "match": "(?<=\\{)((?:\\s*(?:(?:\\w+,\\s*)+{0,1}\\w+\\s+)?(?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}\\S+;?)+)\\s*(?=})"
         },
         {
           "captures": {
@@ -2574,14 +2523,13 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
-          "comment": "one type only",
-          "match": "(?:((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\w\\.\\*]+)\\s*)(?:(?=\\`|\\/|\")|$))"
+          "match": "((?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}[\\w.*]+\\s*)(?:(?=[`/\"])|$)"
         },
         {
           "captures": {
@@ -2591,7 +2539,7 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "variable.other.property.go"
                 }
               ]
@@ -2605,14 +2553,13 @@
                   "include": "#parameter-variable-types"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
-          "comment": "property variables and types",
-          "match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))([^\\`\"\\/]+))"
+          "match": "((?:\\w+,\\s*)+{0,1}\\w+\\s+)([^`\"/]+)"
         }
       ]
     },
@@ -2646,7 +2593,7 @@
               "name": "punctuation.definition.begin.bracket.square.go"
             },
             {
-              "match": "\\]",
+              "match": "]",
               "name": "punctuation.definition.end.bracket.square.go"
             },
             {
@@ -2654,7 +2601,7 @@
               "name": "punctuation.definition.begin.bracket.curly.go"
             },
             {
-              "match": "\\}",
+              "match": "}",
               "name": "punctuation.definition.end.bracket.curly.go"
             },
             {
@@ -2664,8 +2611,7 @@
           ]
         }
       },
-      "comment": "Support Functions",
-      "match": "(?:(?:((?<=\\.)\\b\\w+)|(\\b\\w+))(\\[(?:(?:[\\w\\.\\*\\[\\]\\{\\}\"\\']+)(?:(?:\\,\\s*(?:[\\w\\.\\*\\[\\]\\{\\}]+))*))?\\])?(?=\\())"
+      "match": "(?:((?<=\\.)\\b\\w+)|(\\b\\w+))(\\[(?:[\\w.*\\[\\]{}\"']+(?:,\\s*[\\w.*\\[\\]{}]+)*)?])?(?=\\()"
     },
     "switch_select_case_variables": {
       "captures": {
@@ -2690,11 +2636,10 @@
           ]
         }
       },
-      "comment": "variables after case control keyword in switch/select expression, to not scope them as property variables",
-      "match": "(?:(?:^\\s*(\\bcase\\b))(?:\\s+)([\\s\\S]+(?:\\:)\\s*(?:/(?:/|\\*).*)?)$)"
+      "match": "^\\s*(\\bcase\\b)\\s+([\\s\\S]+:\\s*(?:/[/*].*)?)$"
     },
     "switch_types": {
-      "begin": "(?<=\\bswitch\\b)(?:\\s*)(?:(\\w+\\s*\\:\\=)?\\s*([\\w\\.\\*\\(\\)\\[\\]\\+/\\-\\%\\<\\>\\|\\&]+))(\\.\\(\\btype\\b\\)\\s*)(\\{)",
+      "begin": "(?<=\\bswitch\\b)\\s*(\\w+\\s*:=)?\\s*([\\w.*()\\[\\]+/\\-%<>|\\&]+)(\\.\\(\\btype\\b\\)\\s*)(\\{)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -2739,8 +2684,7 @@
           "name": "punctuation.definition.begin.bracket.curly.go"
         }
       },
-      "comment": "switch type assertions, only highlights types after case keyword",
-      "end": "(?:\\})",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.end.bracket.curly.go"
@@ -2774,8 +2718,7 @@
               ]
             }
           },
-          "comment": "types after case keyword with single line",
-          "match": "(?:^\\s*(\\bcase\\b))(?:\\s+)([\\w\\.\\,\\*\\=\\<\\>\\!\\s]+)(:)(\\s*/(?:/|\\*)\\s*.*)?$"
+          "match": "^\\s*(\\bcase\\b)\\s+([\\w.,*=<>!\\s]+)(:)(\\s*/[/*]\\s*.*)?$"
         },
         {
           "begin": "\\bcase\\b",
@@ -2784,8 +2727,7 @@
               "name": "keyword.control.go"
             }
           },
-          "comment": "types after case keyword with multi lines",
-          "end": "\\:",
+          "end": ":",
           "endCaptures": {
             "0": {
               "name": "punctuation.other.colon.go"
@@ -2814,23 +2756,19 @@
               "name": "invalid.illegal.slice.go"
             }
           },
-          "comment": "Syntax error using slices",
-          "match": "\\[\\](\\s+)"
+          "match": "\\[](\\s+)"
         },
         {
-          "comment": "Syntax error numeric literals",
           "match": "\\b0[0-7]*[89]\\d*\\b",
           "name": "invalid.illegal.numeric.go"
         }
       ]
     },
     "terminators": {
-      "comment": "Terminators",
       "match": ";",
       "name": "punctuation.terminator.go"
     },
     "type-declarations": {
-      "comment": "includes all type declarations",
       "patterns": [
         {
           "include": "#language_constants"
@@ -2874,7 +2812,6 @@
       ]
     },
     "type-declarations-without-brackets": {
-      "comment": "includes all type declarations without brackets (in some cases, brackets need to be captured manually)",
       "patterns": [
         {
           "include": "#language_constants"
@@ -2925,17 +2862,15 @@
               "include": "#type-declarations"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\w+",
               "name": "entity.name.type.go"
             }
           ]
         }
       },
-      "comment": "struct/interface types in-line (type assertion) | switch type keyword",
-      "match": "(?:(?<=\\.\\()(?:(\\btype\\b)|((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?[\\w\\.\\[\\]\\*]+))(?=\\)))"
+      "match": "(?<=\\.\\()(?:(\\btype\\b)|((?:\\s*[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+{0,1}[\\w.\\[\\]*]+))(?=\\))"
     },
     "var_assignment": {
-      "comment": "variable assignment with var keyword",
       "patterns": [
         {
           "captures": {
@@ -2971,7 +2906,7 @@
                   "name": "punctuation.definition.begin.bracket.square.go"
                 },
                 {
-                  "match": "\\]",
+                  "match": "]",
                   "name": "punctuation.definition.end.bracket.square.go"
                 },
                 {
@@ -2981,17 +2916,15 @@
               ]
             }
           },
-          "comment": "single assignment",
-          "match": "(?:(?<=\\bvar\\b)(?:\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)"
+          "match": "(?<=\\bvar\\b)\\s*(\\b[\\w.]+(?:,\\s*[\\w.]+)*)\\s*((?:(?:[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+(?:\\([^)]+\\))?)?(?![\\[\\]*]+{0,1}\\b(?:struct|func|map)\\b)(?:[\\w.\\[\\]*]+(?:,\\s*[\\w.\\[\\]*]+)*)?\\s*=?)?"
         },
         {
-          "begin": "(?:(?<=\\bvar\\b)(?:\\s*)(\\())",
+          "begin": "(?<=\\bvar\\b)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.begin.bracket.round.go"
             }
           },
-          "comment": "multi assignment",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -3033,7 +2966,7 @@
                       "name": "punctuation.definition.begin.bracket.square.go"
                     },
                     {
-                      "match": "\\]",
+                      "match": "]",
                       "name": "punctuation.definition.end.bracket.square.go"
                     },
                     {
@@ -3043,7 +2976,7 @@
                   ]
                 }
               },
-              "match": "(?:(?:^\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)"
+              "match": "^\\s*(\\b[\\w.]+(?:,\\s*[\\w.]+)*)\\s*((?:(?:[*\\[\\]]+{0,1}(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+(?:\\([^)]+\\))?)?(?![\\[\\]*]+{0,1}\\b(?:struct|func|map)\\b)(?:[\\w.\\[\\]*]+(?:,\\s*[\\w.\\[\\]*]+)*)?\\s*=?)?"
             },
             {
               "include": "$self"
@@ -3053,7 +2986,6 @@
       ]
     },
     "variable_assignment": {
-      "comment": "variable assignment",
       "patterns": [
         {
           "captures": {
@@ -3073,8 +3005,7 @@
               ]
             }
           },
-          "comment": "variable assignment with :=",
-          "match": "\\b\\w+(?:\\,\\s*\\w+)*(?=\\s*:=)"
+          "match": "\\b\\w+(?:,\\s*\\w+)*(?=\\s*:=)"
         },
         {
           "captures": {
@@ -3097,8 +3028,7 @@
               ]
             }
           },
-          "comment": "variable assignment with =",
-          "match": "\\b[\\w\\.\\*]+(?:\\,\\s*[\\w\\.\\*]+)*(?=\\s*=(?!=))"
+          "match": "\\b[\\w.*]+(?:,\\s*[\\w.*]+)*(?=\\s*=(?!=))"
         }
       ]
     }
diff --git a/resources/languages/graphql.json b/resources/languages/graphql.json
index 21f9aeb..be6ff1b 100644
--- a/resources/languages/graphql.json
+++ b/resources/languages/graphql.json
@@ -86,7 +86,7 @@
           "include": "#graphql-description-singleline"
         },
         {
-          "begin": "\\s*([_A-Za-z][_0-9A-Za-z]*)(?:\\s*(:))",
+          "begin": "\\s*([_A-Za-z][_0-9A-Za-z]*)\\s*(:)",
           "beginCaptures": {
             "1": {
               "name": "variable.parameter.graphql"
@@ -95,7 +95,7 @@
               "name": "punctuation.colon.graphql"
             }
           },
-          "end": "(?=\\s*(?:(?:([_A-Za-z][_0-9A-Za-z]*)\\s*(:))|\\)))|\\s*(,)",
+          "end": "(?=\\s*(?:([_A-Za-z][_0-9A-Za-z]*)\\s*(:)|\\)))|\\s*(,)",
           "endCaptures": {
             "3": {
               "name": "punctuation.comma.graphql"
@@ -159,7 +159,6 @@
               "name": "punctuation.whitespace.comment.leading.graphql"
             }
           },
-          "comment": "need to prefix comment space with a scope else Atom's reflow cmd doesn't work",
           "match": "(\\s*)(#).*",
           "name": "comment.line.graphql.js"
         },
@@ -303,7 +302,7 @@
       "name": "meta.enum.graphql",
       "patterns": [
         {
-          "begin": "\\s*({)",
+          "begin": "\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.operation.graphql"
@@ -402,10 +401,10 @@
           "name": "constant.numeric.float.graphql"
         }
       },
-      "match": "\\s*(-?(0|[1-9][0-9]*)(\\.[0-9]+)?((e|E)(\\+|-)?[0-9]+)?)"
+      "match": "\\s*(-?(0|[1-9][0-9]*)(\\.[0-9]+)?(([eE])([+-])?[0-9]+)?)"
     },
     "graphql-fragment-definition": {
-      "begin": "\\s*(?:(\\bfragment\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)?\\s*(?:(\\bon\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)))",
+      "begin": "\\s*(\\bfragment\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)?\\s*(\\bon\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)",
       "captures": {
         "1": {
           "name": "keyword.fragment.graphql"
@@ -550,7 +549,7 @@
               "name": "keyword.operator.nulltype.graphql"
             }
           },
-          "end": "\\s*(\\])(?:\\s*(!))?",
+          "end": "\\s*(])(?:\\s*(!))?",
           "name": "meta.type.list.graphql",
           "patterns": [
             {
@@ -584,7 +583,7 @@
               "name": "meta.brace.square.graphql"
             }
           },
-          "end": "\\s*(\\])",
+          "end": "\\s*(])",
           "endCaptures": {
             "1": {
               "name": "meta.brace.square.graphql"
@@ -632,7 +631,7 @@
     "graphql-object-value": {
       "patterns": [
         {
-          "begin": "\\s*+({)",
+          "begin": "\\s*+(\\{)",
           "beginCaptures": {
             "1": {
               "name": "meta.brace.curly.graphql"
@@ -715,7 +714,7 @@
       "end": "(?<=})",
       "patterns": [
         {
-          "begin": "\\s*({)",
+          "begin": "\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.operation.graphql"
@@ -735,7 +734,7 @@
                   "name": "variable.arguments.graphql"
                 }
               },
-              "end": "(?=\\s*(([_A-Za-z][_0-9A-Za-z]*)\\s*(\\(|:)|(})))|\\s*(,)",
+              "end": "(?=\\s*(([_A-Za-z][_0-9A-Za-z]*)\\s*([(:])|(})))|\\s*(,)",
               "endCaptures": {
                 "5": {
                   "name": "punctuation.comma.graphql"
@@ -799,7 +798,7 @@
       ]
     },
     "graphql-selection-set": {
-      "begin": "\\s*({)",
+      "begin": "\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.operation.graphql"
@@ -843,7 +842,7 @@
       ]
     },
     "graphql-skip-newlines": {
-      "match": "\\s*\n"
+      "match": "\\s*\\n"
     },
     "graphql-string-content": {
       "patterns": [
@@ -852,7 +851,7 @@
           "name": "constant.character.escape.graphql"
         },
         {
-          "match": "\\\\u([0-9a-fA-F]{4})",
+          "match": "\\\\u(\\h{4})",
           "name": "constant.character.escape.graphql"
         }
       ]
@@ -868,7 +867,7 @@
         }
       },
       "contentName": "string.quoted.double.graphql",
-      "end": "\\s*+(?:((\"))|(\n))",
+      "end": "\\s*+(?:((\"))|(\\n))",
       "endCaptures": {
         "1": {
           "name": "string.quoted.double.graphql"
@@ -896,8 +895,7 @@
           "name": "variable.graphql"
         }
       },
-      "comment": "key (optionalArgs): Type",
-      "end": "(?=\\s*(([_A-Za-z][_0-9A-Za-z]*)\\s*(\\(|:)|(})))|\\s*(,)",
+      "end": "(?=\\s*(([_A-Za-z][_0-9A-Za-z]*)\\s*([(:])|(})))|\\s*(,)",
       "endCaptures": {
         "5": {
           "name": "punctuation.comma.graphql"
@@ -963,7 +961,7 @@
               "name": "keyword.implements.graphql"
             }
           },
-          "end": "\\s*(?={)",
+          "end": "\\s*(?=\\{)",
           "patterns": [
             {
               "captures": {
@@ -1017,7 +1015,7 @@
       ]
     },
     "graphql-type-object": {
-      "begin": "\\s*({)",
+      "begin": "\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.operation.graphql"
@@ -1175,7 +1173,7 @@
           "name": "punctuation.assignment.graphql"
         }
       },
-      "end": "(?=[\n,)])",
+      "end": "(?=[\\n,)])",
       "patterns": [
         {
           "include": "#graphql-value"
@@ -1189,8 +1187,7 @@
           "name": "variable.parameter.graphql"
         }
       },
-      "comment": "variable: type = value,.... which may be a list",
-      "end": "(?=\\s*((\\$?[_A-Za-z][_0-9A-Za-z]*)\\s*(\\(|:)|(}|\\))))|\\s*(,)",
+      "end": "(?=\\s*((\\$?[_A-Za-z][_0-9A-Za-z]*)\\s*([(:])|([})])))|\\s*(,)",
       "endCaptures": {
         "5": {
           "name": "punctuation.comma.graphql"
@@ -1262,7 +1259,7 @@
       "match": "\\s*(\\$[_A-Za-z][_0-9A-Za-z]*)"
     },
     "native-interpolation": {
-      "begin": "\\s*(\\${)",
+      "begin": "\\s*(\\$\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.substitution.begin"
diff --git a/resources/languages/groovy.json b/resources/languages/groovy.json
index d884cd1..6df9b33 100644
--- a/resources/languages/groovy.json
+++ b/resources/languages/groovy.json
@@ -115,7 +115,7 @@
           "name": "punctuation.terminator.groovy"
         }
       },
-      "match": "^\\s*(import)(?:\\s+(static)\\s+)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
+      "match": "^\\s*(import)\\s+(static)\\s+\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
       "name": "meta.import.groovy"
     },
     {
@@ -176,7 +176,7 @@
           "name": "keyword.control.new.groovy"
         }
       },
-      "end": "(?<=\\)|\\])(?!\\s*{)|(?<=})|(?=[;])|$",
+      "end": "(?<=[)\\]])(?!\\s*\\{)|(?<=})|(?=;)|$",
       "patterns": [
         {
           "begin": "(\\w+)\\s*(?=\\[)",
@@ -185,11 +185,11 @@
               "name": "storage.type.groovy"
             }
           },
-          "end": "}|(?=\\s*(?:,|;|\\)))|$",
+          "end": "}|(?=\\s*[,;)])|$",
           "patterns": [
             {
               "begin": "\\[",
-              "end": "\\]",
+              "end": "]",
               "patterns": [
                 {
                   "include": "#groovy"
@@ -197,7 +197,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "end": "(?=})",
               "patterns": [
                 {
@@ -231,7 +231,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}",
           "name": "meta.inner-class.groovy",
           "patterns": [
@@ -244,7 +244,7 @@
     },
     "braces": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#groovy-code"
@@ -252,7 +252,7 @@
       ]
     },
     "class": {
-      "begin": "(?=\\w?[\\w\\s]*(?:class|(?:@)?interface|enum)\\s+\\w+)",
+      "begin": "(?=\\w?[\\w\\s]*(?:class|@?interface|enum)\\s+\\w+)",
       "end": "}",
       "endCaptures": {
         "0": {
@@ -276,7 +276,7 @@
               "name": "entity.name.type.class.groovy"
             }
           },
-          "match": "(class|(?:@)?interface|enum)\\s+(\\w+)",
+          "match": "(class|@?interface|enum)\\s+(\\w+)",
           "name": "meta.class.identifier.groovy"
         },
         {
@@ -286,7 +286,7 @@
               "name": "storage.modifier.extends.groovy"
             }
           },
-          "end": "(?={|implements)",
+          "end": "(?=\\{|implements)",
           "name": "meta.definition.class.inherited.classes.groovy",
           "patterns": [
             {
@@ -316,7 +316,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "(?=})",
           "name": "meta.class.body.groovy",
           "patterns": [
@@ -342,10 +342,10 @@
     },
     "closures": {
       "begin": "\\{(?=.*?->)",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
-          "begin": "(?<=\\{)(?=[^\\}]*?->)",
+          "begin": "(?<=\\{)(?=[^}]*?->)",
           "end": "->",
           "endCaptures": {
             "0": {
@@ -389,7 +389,7 @@
         },
         {
           "begin": "(?=[^}])",
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "#groovy-code"
@@ -461,13 +461,13 @@
     "enum-values": {
       "patterns": [
         {
-          "begin": "(?<=;|^)\\s*\\b([A-Z0-9_]+)(?=\\s*(?:,|;|}|\\(|$))",
+          "begin": "(?<=;|^)\\s*\\b([A-Z0-9_]+)(?=\\s*(?:[,;}(]|$))",
           "beginCaptures": {
             "1": {
               "name": "constant.enum.name.groovy"
             }
           },
-          "end": ",|;|(?=})|^(?!\\s*\\w+\\s*(?:,|$))",
+          "end": "[,;]|(?=})|^(?!\\s*\\w+\\s*(?:,|$))",
           "patterns": [
             {
               "begin": "\\(",
@@ -520,7 +520,6 @@
       ]
     },
     "groovy-code-minus-map-keys": {
-      "comment": "In some situations, maps can't be declared without enclosing []'s, \n\t\t\t\ttherefore we create a collection of everything but that",
       "patterns": [
         {
           "include": "#comments"
@@ -607,7 +606,7 @@
               "name": "keyword.control.assert.groovy"
             }
           },
-          "end": "$|;|}",
+          "end": "$|[;}]",
           "name": "meta.declaration.assertion.groovy",
           "patterns": [
             {
@@ -636,11 +635,11 @@
           "name": "keyword.operator.in.groovy"
         },
         {
-          "match": "\\?\\:",
+          "match": "\\?:",
           "name": "keyword.operator.elvis.groovy"
         },
         {
-          "match": "\\*\\:",
+          "match": "\\*:",
           "name": "keyword.operator.spreadmap.groovy"
         },
         {
@@ -648,7 +647,7 @@
           "name": "keyword.operator.range.groovy"
         },
         {
-          "match": "\\->",
+          "match": "->",
           "name": "keyword.operator.arrow.groovy"
         },
         {
@@ -670,7 +669,7 @@
               "name": "keyword.operator.ternary.groovy"
             }
           },
-          "end": "(?=$|\\)|}|])",
+          "end": "(?=$|[)}\\]])",
           "name": "meta.evaluation.ternary.groovy",
           "patterns": [
             {
@@ -695,7 +694,7 @@
           "name": "keyword.operator.instanceof.groovy"
         },
         {
-          "match": "(===|==|!=|<=|>=|<=>|<>|<|>|<<)",
+          "match": "(===|==|!=|<=|>=|<=>|<>|[<>]|<<)",
           "name": "keyword.operator.comparison.groovy"
         },
         {
@@ -703,11 +702,11 @@
           "name": "keyword.operator.assignment.groovy"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
+          "match": "(--|\\+\\+)",
           "name": "keyword.operator.increment-decrement.groovy"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%)",
+          "match": "([-+*/%])",
           "name": "keyword.operator.arithmetic.groovy"
         },
         {
@@ -775,7 +774,7 @@
           "include": "#annotations"
         },
         {
-          "begin": "(?=(?:\\w|<)[^\\(]*\\s+(?:[\\w$]|<)+\\s*\\()",
+          "begin": "(?=[\\w<][^(]*\\s+[\\w$<]+\\s*\\()",
           "end": "(?=[\\w$]+\\s*\\()",
           "name": "meta.method.return-type.java",
           "patterns": [
@@ -804,7 +803,7 @@
               "patterns": [
                 {
                   "begin": "(?=[^,)])",
-                  "end": "(?=,|\\))",
+                  "end": "(?=[,)])",
                   "name": "meta.method.parameter.groovy",
                   "patterns": [
                     {
@@ -818,7 +817,7 @@
                           "name": "keyword.operator.assignment.groovy"
                         }
                       },
-                      "end": "(?=,|\\))",
+                      "end": "(?=[,)])",
                       "name": "meta.parameter.default.groovy",
                       "patterns": [
                         {
@@ -863,7 +862,7 @@
               "name": "storage.modifier.groovy"
             }
           },
-          "end": "(?={|;)|^(?=\\s*(?:[^{\\s]|$))",
+          "end": "(?=[{;])|^(?=\\s*(?:[^{\\s]|$))",
           "name": "meta.throwables.groovy",
           "patterns": [
             {
@@ -872,7 +871,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "(?=})",
           "name": "meta.method.body.java",
           "patterns": [
@@ -885,7 +884,7 @@
     },
     "methods": {
       "applyEndPatternLast": 1,
-      "begin": "(?:(?<=;|^|{)(?=\\s*(?:(?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)|(?:def)|(?:(?:(?:void|boolean|byte|char|short|int|float|long|double)|(?:@?(?:[a-zA-Z]\\w*\\.)*[A-Z]+\\w*))[\\[\\]]*(?:<.*>)?))\\s+([^=]+\\s+)?\\w+\\s*\\())",
+      "begin": "(?<=;|^|\\{)(?=\\s*(?:(?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)|def|(?:(?:void|boolean|byte|char|short|int|float|long|double)|@?(?:[a-zA-Z]\\w*\\.)*[A-Z]+\\w*)[\\[\\]]*(?:<.*>)?)\\s+([^=]+\\s+)?\\w+\\s*\\()",
       "end": "}|(?=[^{])",
       "name": "meta.definition.method.groovy",
       "patterns": [
@@ -901,7 +900,7 @@
           "name": "punctuation.section.scope.groovy"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#nest_curly"
@@ -911,7 +910,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "((0(x|X)[0-9a-fA-F]*)|(\\+|-)?\\b(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDdg]|UL|ul)?\\b",
+          "match": "((0([xX])\\h*)|([+-])?\\b(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([LlFfUuDdg]|UL|ul)?\\b",
           "name": "constant.numeric.groovy"
         }
       ]
@@ -920,7 +919,7 @@
       "patterns": [
         {
           "begin": "\\b((?:[a-z]\\w*\\.)*(?:[A-Z]+\\w*[a-z]+\\w*|UR[LI]))<",
-          "end": ">|[^\\w\\s,\\?<\\[\\]]",
+          "end": "[>[^\\w\\s,?<\\[\\]]]",
           "name": "storage.type.generic.groovy",
           "patterns": [
             {
@@ -928,8 +927,7 @@
             },
             {
               "begin": "<",
-              "comment": "This is just to support <>'s with no actual type prefix",
-              "end": ">|[^\\w\\s,\\[\\]<]",
+              "end": "[>[^\\w\\s,\\[\\]<]]",
               "name": "storage.type.generic.groovy"
             }
           ]
@@ -941,7 +939,7 @@
           "patterns": [
             {
               "begin": "\\[",
-              "end": "\\]",
+              "end": "]",
               "patterns": [
                 {
                   "include": "#groovy"
@@ -960,7 +958,7 @@
       "patterns": [
         {
           "begin": "\\b((?:[a-zA-Z]\\w*\\.)*[A-Z]+\\w*[a-z]+\\w*)<",
-          "end": ">|[^\\w\\s,\\?<\\[\\]]",
+          "end": "[>[^\\w\\s,?<\\[\\]]]",
           "name": "entity.other.inherited-class.groovy",
           "patterns": [
             {
@@ -968,8 +966,7 @@
             },
             {
               "begin": "<",
-              "comment": "This is just to support <>'s with no actual type prefix",
-              "end": ">|[^\\w\\s,\\[\\]<]",
+              "end": "[>[^\\w\\s,\\[\\]<]]",
               "name": "storage.type.generic.groovy"
             }
           ]
@@ -1014,7 +1011,7 @@
     "primitive-arrays": {
       "patterns": [
         {
-          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[\\])*\\b",
+          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[])*\\b",
           "name": "storage.type.primitive.array.groovy"
         }
       ]
@@ -1076,7 +1073,7 @@
     "storage-modifiers": {
       "patterns": [
         {
-          "match": "\\b(private|protected|public)\\b",
+          "match": "\\b(p(?:rivate|rotected|ublic))\\b",
           "name": "storage.modifier.access-control.groovy"
         },
         {
@@ -1142,7 +1139,7 @@
               "name": "punctuation.section.embedded.groovy"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "source.groovy.embedded.source",
           "patterns": [
             {
@@ -1246,7 +1243,7 @@
           "name": "punctuation.definition.structure.begin.groovy"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.structure.end.groovy"
@@ -1321,7 +1318,7 @@
       "applyEndPatternLast": 1,
       "patterns": [
         {
-          "begin": "(?:(?=(?:(?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)|(?:def)|(?:void|boolean|byte|char|short|int|float|long|double)|(?:(?:[a-z]\\w*\\.)*[A-Z]+\\w*))\\s+[\\w\\d_<>\\[\\],\\s]+(?:=|$)))",
+          "begin": "(?=(?:(?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)|def|(?:void|boolean|byte|char|short|int|float|long|double)|(?:[a-z]\\w*\\.)*[A-Z]+\\w*)\\s+[\\w\\d_<>\\[\\],\\s]+(?:=|$))",
           "end": ";|$",
           "name": "meta.definition.variable.groovy",
           "patterns": [
@@ -1334,7 +1331,7 @@
                   "name": "constant.variable.groovy"
                 }
               },
-              "match": "([A-Z_0-9]+)\\s+(?=\\=)"
+              "match": "([A-Z_0-9]+)\\s+(?==)"
             },
             {
               "captures": {
@@ -1342,7 +1339,7 @@
                   "name": "meta.definition.variable.name.groovy"
                 }
               },
-              "match": "(\\w[^\\s,]*)\\s+(?=\\=)"
+              "match": "(\\w[^\\s,]*)\\s+(?==)"
             },
             {
               "begin": "=",
diff --git a/resources/languages/hack.json b/resources/languages/hack.json
index 09a3128..067f3b4 100644
--- a/resources/languages/hack.json
+++ b/resources/languages/hack.json
@@ -6,7 +6,7 @@
     "hack"
   ],
   "foldingStartMarker": "(/\\*|\\{\\s*$|<<<HTML)",
-  "foldingStopMarker": "(\\*/|^\\s*\\}|^HTML;)",
+  "foldingStopMarker": "(\\*/|^\\s*}|^HTML;)",
   "name": "hack",
   "patterns": [
     {
@@ -121,7 +121,6 @@
               "name": "punctuation.definition.comment.php"
             }
           },
-          "comment": "This now only highlights a docblock if the first line contains only /**\n- this is to stop highlighting everything as invalid when people do comment banners with /******** ...\n- Now matches /**#@+ too - used for docblock templates:\n  http://manual.phpdoc.org/HTMLframesConverter/default/phpDocumentor/tutorial_phpDocumentor.howto.pkg.html#basics.docblocktemplate",
           "end": "\\*/",
           "name": "comment.block.documentation.phpdoc.php",
           "patterns": [
@@ -166,7 +165,7 @@
     "constants": {
       "patterns": [
         {
-          "begin": "(?xi)\n(?=\n  (\n    (\\\\[a-z_][a-z_0-9]*\\\\[a-z_][a-z_0-9\\\\]*)\n    |\n    ([a-z_][a-z_0-9]*\\\\[a-z_][a-z_0-9\\\\]*)\n  )\n  [^a-z_0-9\\\\]\n)",
+          "begin": "(?i)(?=((\\\\[a-z_][a-z_0-9]*\\\\[a-z_][a-z_0-9\\\\]*)|([a-z_][a-z_0-9]*\\\\[a-z_][a-z_0-9\\\\]*))[^a-z_0-9\\\\])",
           "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
           "endCaptures": {
             "1": {
@@ -180,8 +179,8 @@
           ]
         },
         {
-          "begin": "(?=\\\\?[a-zA-Z_\\x{7f}-\\x{ff}])",
-          "end": "(?=[^\\\\a-zA-Z_\\x{7f}-\\x{ff}])",
+          "begin": "(?=\\\\?[a-zA-Z_\\x7F-ÿ])",
+          "end": "(?=[^\\\\a-zA-Z_\\x7F-ÿ])",
           "patterns": [
             {
               "match": "(?i)\\b(TRUE|FALSE|NULL|__(FILE|DIR|FUNCTION|CLASS|METHOD|LINE|NAMESPACE)__)\\b",
@@ -202,7 +201,7 @@
                   "name": "punctuation.separator.inheritance.php"
                 }
               },
-              "match": "(\\\\)?\\b(RADIXCHAR|GROUPING|M(_(1_PI|SQRT(1_2|2|3|PI)|2_(SQRTPI|PI)|PI(_(2|4))?|E(ULER)?|L(N(10|2|PI)|OG(10E|2E)))|ON_(GROUPING|1(1|2|0)?|7|2|8|THOUSANDS_SEP|3|DECIMAL_POINT|9|4|5|6))|S(TR_PAD_(RIGHT|BOTH|LEFT)|ORT_(REGULAR|STRING|NUMERIC|DESC|LOCALE_STRING|ASC)|EEK_(SET|CUR|END))|H(TML_(SPECIALCHARS|ENTITIES)|ASH_HMAC)|YES(STR|EXPR)|N(_(S(IGN_POSN|EP_BY_SPACE)|CS_PRECEDES)|O(STR|EXPR)|EGATIVE_SIGN|AN)|C(R(YPT_(MD5|BLOWFISH|S(HA(256|512)|TD_DES|ALT_LENGTH)|EXT_DES)|NCYSTR|EDITS_(G(ROUP|ENERAL)|MODULES|SAPI|DOCS|QA|FULLPAGE|ALL))|HAR_MAX|O(NNECTION_(NORMAL|TIMEOUT|ABORTED)|DESET|UNT_(RECURSIVE|NORMAL))|URRENCY_SYMBOL|ASE_(UPPER|LOWER))|__COMPILER_HALT_OFFSET__|T(HOUS(EP|ANDS_SEP)|_FMT(_AMPM)?)|IN(T_(CURR_SYMBOL|FRAC_DIGITS)|I_(S(YSTEM|CANNER_(RAW|NORMAL))|USER|PERDIR|ALL)|F(O_(GENERAL|MODULES|C(REDITS|ONFIGURATION)|ENVIRONMENT|VARIABLES|LICENSE|ALL))?)|D(_(T_FMT|FMT)|IRECTORY_SEPARATOR|ECIMAL_POINT|A(Y_(1|7|2|3|4|5|6)|TE_(R(SS|FC(1(123|036)|2822|8(22|50)|3339))|COOKIE|ISO8601|W3C|ATOM)))|UPLOAD_ERR_(NO_(TMP_DIR|FILE)|CANT_WRITE|INI_SIZE|OK|PARTIAL|EXTENSION|FORM_SIZE)|P(M_STR|_(S(IGN_POSN|EP_BY_SPACE)|CS_PRECEDES)|OSITIVE_SIGN|ATH(_SEPARATOR|INFO_(BASENAME|DIRNAME|EXTENSION|FILENAME)))|E(RA(_(YEAR|T_FMT|D_(T_FMT|FMT)))?|XTR_(REFS|SKIP|IF_EXISTS|OVERWRITE|PREFIX_(SAME|I(NVALID|F_EXISTS)|ALL))|NT_(NOQUOTES|COMPAT|IGNORE|QUOTES))|FRAC_DIGITS|L(C_(M(ONETARY|ESSAGES)|NUMERIC|C(TYPE|OLLATE)|TIME|ALL)|O(G_(MAIL|SYSLOG|N(O(TICE|WAIT)|DELAY|EWS)|C(R(IT|ON)|ONS)|INFO|ODELAY|D(EBUG|AEMON)|U(SER|UCP)|P(ID|ERROR)|E(RR|MERG)|KERN|WARNING|L(OCAL(1|7|2|3|4|5|0|6)|PR)|A(UTH(PRIV)?|LERT))|CK_(SH|NB|UN|EX)))|A(M_STR|B(MON_(1(1|2|0)?|7|2|8|3|9|4|5|6)|DAY_(1|7|2|3|4|5|6))|SSERT_(BAIL|CALLBACK|QUIET_EVAL|WARNING|ACTIVE)|LT_DIGITS))\\b",
+              "match": "(\\\\)?\\b(RADIXCHAR|GROUPING|M(_(1_PI|SQRT(1_2|[23]|PI)|2_(SQRTPI|PI)|PI(_([24]))?|E(ULER)?|L(N(10|2|PI)|OG(10E|2E)))|ON_(GROUPING|1([120])?|[728]|THOUSANDS_SEP|3|DECIMAL_POINT|[9456]))|S(TR_PAD_(RIGHT|BOTH|LEFT)|ORT_(REGULAR|STRING|NUMERIC|DESC|LOCALE_STRING|ASC)|EEK_(SET|CUR|END))|H(TML_(SPECIALCHARS|ENTITIES)|ASH_HMAC)|YES(STR|EXPR)|N(_(S(IGN_POSN|EP_BY_SPACE)|CS_PRECEDES)|O(STR|EXPR)|EGATIVE_SIGN|AN)|C(R(YPT_(MD5|BLOWFISH|S(HA(256|512)|TD_DES|ALT_LENGTH)|EXT_DES)|NCYSTR|EDITS_(G(ROUP|ENERAL)|MODULES|SAPI|DOCS|QA|FULLPAGE|ALL))|HAR_MAX|O(NNECTION_(NORMAL|TIMEOUT|ABORTED)|DESET|UNT_(RECURSIVE|NORMAL))|URRENCY_SYMBOL|ASE_(UPPER|LOWER))|__COMPILER_HALT_OFFSET__|T(HOUS(EP|ANDS_SEP)|_FMT(_AMPM)?)|IN(T_(CURR_SYMBOL|FRAC_DIGITS)|I_(S(YSTEM|CANNER_(RAW|NORMAL))|USER|PERDIR|ALL)|F(O_(GENERAL|MODULES|C(REDITS|ONFIGURATION)|ENVIRONMENT|VARIABLES|LICENSE|ALL))?)|D(_(T_FMT|FMT)|IRECTORY_SEPARATOR|ECIMAL_POINT|A(Y_([1723456])|TE_(R(SS|FC(1(123|036)|2822|8(22|50)|3339))|COOKIE|ISO8601|W3C|ATOM)))|UPLOAD_ERR_(NO_(TMP_DIR|FILE)|CANT_WRITE|INI_SIZE|OK|PARTIAL|EXTENSION|FORM_SIZE)|P(M_STR|_(S(IGN_POSN|EP_BY_SPACE)|CS_PRECEDES)|OSITIVE_SIGN|ATH(_SEPARATOR|INFO_(BASENAME|DIRNAME|EXTENSION|FILENAME)))|E(RA(_(YEAR|T_FMT|D_(T_FMT|FMT)))?|XTR_(REFS|SKIP|IF_EXISTS|OVERWRITE|PREFIX_(SAME|I(NVALID|F_EXISTS)|ALL))|NT_(NOQUOTES|COMPAT|IGNORE|QUOTES))|FRAC_DIGITS|L(C_(M(ONETARY|ESSAGES)|NUMERIC|C(TYPE|OLLATE)|TIME|ALL)|O(G_(MAIL|SYSLOG|N(O(TICE|WAIT)|DELAY|EWS)|C(R(IT|ON)|ONS)|INFO|ODELAY|D(EBUG|AEMON)|U(SER|UCP)|P(ID|ERROR)|E(RR|MERG)|KERN|WARNING|L(OCAL([17234506])|PR)|A(UTH(PRIV)?|LERT))|CK_(SH|NB|UN|EX)))|A(M_STR|B(MON_(1([120])?|[72839456])|DAY_([1723456]))|SSERT_(BAIL|CALLBACK|QUIET_EVAL|WARNING|ACTIVE)|LT_DIGITS))\\b",
               "name": "support.constant.std.php"
             },
             {
@@ -211,7 +210,7 @@
                   "name": "punctuation.separator.inheritance.php"
                 }
               },
-              "match": "(\\\\)?\\b(GLOB_(MARK|BRACE|NO(SORT|CHECK|ESCAPE)|ONLYDIR|ERR|AVAILABLE_FLAGS)|XML_(SAX_IMPL|HTML_DOCUMENT_NODE|N(OTATION_NODE|AMESPACE_DECL_NODE)|C(OMMENT_NODE|DATA_SECTION_NODE)|TEXT_NODE|OPTION_(SKIP_(TAGSTART|WHITE)|CASE_FOLDING|TARGET_ENCODING)|D(TD_NODE|OCUMENT_(NODE|TYPE_NODE|FRAG_NODE))|PI_NODE|E(RROR_(RECURSIVE_ENTITY_REF|MISPLACED_XML_PI|B(INARY_ENTITY_REF|AD_CHAR_REF)|SYNTAX|NO(NE|_(MEMORY|ELEMENTS))|TAG_MISMATCH|IN(CORRECT_ENCODING|VALID_TOKEN)|DUPLICATE_ATTRIBUTE|UN(CLOSED_(CDATA_SECTION|TOKEN)|DEFINED_ENTITY|KNOWN_ENCODING)|JUNK_AFTER_DOC_ELEMENT|PAR(TIAL_CHAR|AM_ENTITY_REF)|EXTERNAL_ENTITY_HANDLING|A(SYNC_ENTITY|TTRIBUTE_EXTERNAL_ENTITY_REF))|NTITY_(REF_NODE|NODE|DECL_NODE)|LEMENT_(NODE|DECL_NODE))|LOCAL_NAMESPACE|ATTRIBUTE_(N(MTOKEN(S)?|O(TATION|DE))|CDATA|ID(REF(S)?)?|DECL_NODE|EN(TITY|UMERATION)))|M(HASH_(RIPEMD(1(28|60)|256|320)|GOST|MD(2|4|5)|S(HA(1|2(24|56)|384|512)|NEFRU256)|HAVAL(1(28|92|60)|2(24|56))|CRC32(B)?|TIGER(1(28|60))?|WHIRLPOOL|ADLER32)|YSQL(_(BOTH|NUM|CLIENT_(SSL|COMPRESS|I(GNORE_SPACE|NTERACTIVE))|ASSOC)|I_(RE(PORT_(STRICT|INDEX|OFF|ERROR|ALL)|FRESH_(GRANT|MASTER|BACKUP_LOG|S(TATUS|LAVE)|HOSTS|T(HREADS|ABLES)|LOG)|AD_DEFAULT_(GROUP|FILE))|GROUP_FLAG|MULTIPLE_KEY_FLAG|B(INARY_FLAG|OTH|LOB_FLAG)|S(T(MT_ATTR_(CURSOR_TYPE|UPDATE_MAX_LENGTH|PREFETCH_ROWS)|ORE_RESULT)|E(RVER_QUERY_(NO_(GOOD_INDEX_USED|INDEX_USED)|WAS_SLOW)|T_(CHARSET_NAME|FLAG)))|N(O(_D(EFAULT_VALUE_FLAG|ATA)|T_NULL_FLAG)|UM(_FLAG)?)|C(URSOR_TYPE_(READ_ONLY|SCROLLABLE|NO_CURSOR|FOR_UPDATE)|LIENT_(SSL|NO_SCHEMA|COMPRESS|I(GNORE_SPACE|NTERACTIVE)|FOUND_ROWS))|T(YPE_(GEOMETRY|MEDIUM_BLOB|B(IT|LOB)|S(HORT|TRING|ET)|YEAR|N(ULL|EWD(ECIMAL|ATE))|CHAR|TI(ME(STAMP)?|NY(_BLOB)?)|INT(24|ERVAL)|D(OUBLE|ECIMAL|ATE(TIME)?)|ENUM|VAR_STRING|FLOAT|LONG(_BLOB|LONG)?)|IMESTAMP_FLAG)|INIT_COMMAND|ZEROFILL_FLAG|O(N_UPDATE_NOW_FLAG|PT_(NET_(READ_BUFFER_SIZE|CMD_BUFFER_SIZE)|CONNECT_TIMEOUT|INT_AND_FLOAT_NATIVE|LOCAL_INFILE))|D(EBUG_TRACE_ENABLED|ATA_TRUNCATED)|U(SE_RESULT|N(SIGNED_FLAG|IQUE_KEY_FLAG))|P(RI_KEY_FLAG|ART_KEY_FLAG)|ENUM_FLAG|A(S(SOC|YNC)|UTO_INCREMENT_FLAG)))|CRYPT_(R(C(2|6)|IJNDAEL_(1(28|92)|256)|AND)|GOST|XTEA|M(ODE_(STREAM|NOFB|C(BC|FB)|OFB|ECB)|ARS)|BLOWFISH(_COMPAT)?|S(ERPENT|KIPJACK|AFER(128|PLUS|64))|C(RYPT|AST_(128|256))|T(RIPLEDES|HREEWAY|WOFISH)|IDEA|3DES|DE(S|CRYPT|V_(RANDOM|URANDOM))|PANAMA|EN(CRYPT|IGNA)|WAKE|LOKI97|ARCFOUR(_IV)?))|S(TREAM_(REPORT_ERRORS|M(UST_SEEK|KDIR_RECURSIVE)|BUFFER_(NONE|FULL|LINE)|S(HUT_(RD(WR)?|WR)|OCK_(R(DM|AW)|S(TREAM|EQPACKET)|DGRAM)|ERVER_(BIND|LISTEN))|NOTIFY_(RE(SOLVE|DIRECTED)|MIME_TYPE_IS|SEVERITY_(INFO|ERR|WARN)|CO(MPLETED|NNECT)|PROGRESS|F(ILE_SIZE_IS|AILURE)|AUTH_RE(SULT|QUIRED))|C(RYPTO_METHOD_(SSLv(2(_(SERVER|CLIENT)|3_(SERVER|CLIENT))|3_(SERVER|CLIENT))|TLS_(SERVER|CLIENT))|LIENT_(CONNECT|PERSISTENT|ASYNC_CONNECT)|AST_(FOR_SELECT|AS_STREAM))|I(GNORE_URL|S_URL|PPROTO_(RAW|TCP|I(CMP|P)|UDP))|O(OB|PTION_(READ_(BUFFER|TIMEOUT)|BLOCKING|WRITE_BUFFER))|U(RL_STAT_(QUIET|LINK)|SE_PATH)|P(EEK|F_(INET(6)?|UNIX))|ENFORCE_SAFE_MODE|FILTER_(READ|WRITE|ALL))|UNFUNCS_RET_(STRING|TIMESTAMP|DOUBLE)|QLITE(_(R(OW|EADONLY)|MIS(MATCH|USE)|B(OTH|USY)|SCHEMA|N(O(MEM|T(FOUND|ADB)|LFS)|UM)|C(O(RRUPT|NSTRAINT)|ANTOPEN)|TOOBIG|I(NTER(RUPT|NAL)|OERR)|OK|DONE|P(ROTOCOL|ERM)|E(RROR|MPTY)|F(ORMAT|ULL)|LOCKED|A(BORT|SSOC|UTH))|3_(B(OTH|LOB)|NU(M|LL)|TEXT|INTEGER|OPEN_(READ(ONLY|WRITE)|CREATE)|FLOAT|ASSOC)))|CURL(M(SG_DONE|_(BAD_(HANDLE|EASY_HANDLE)|CALL_MULTI_PERFORM|INTERNAL_ERROR|O(UT_OF_MEMORY|K)))|SSH_AUTH_(HOST|NONE|DEFAULT|P(UBLICKEY|ASSWORD)|KEYBOARD)|CLOSEPOLICY_(SLOWEST|CALLBACK|OLDEST|LEAST_(RECENTLY_USED|TRAFFIC))|_(HTTP_VERSION_(1_(1|0)|NONE)|NETRC_(REQUIRED|IGNORED|OPTIONAL)|TIMECOND_(IF(MODSINCE|UNMODSINCE)|LASTMOD)|IPRESOLVE_(V(4|6)|WHATEVER)|VERSION_(SSL|IPV6|KERBEROS4|LIBZ))|INFO_(RE(DIRECT_(COUNT|TIME)|QUEST_SIZE)|S(SL_VERIFYRESULT|TARTTRANSFER_TIME|IZE_(DOWNLOAD|UPLOAD)|PEED_(DOWNLOAD|UPLOAD))|H(TTP_CODE|EADER_(SIZE|OUT))|NAMELOOKUP_TIME|C(ON(NECT_TIME|TENT_(TYPE|LENGTH_(DOWNLOAD|UPLOAD)))|ERTINFO)|TOTAL_TIME|PR(IVATE|ETRANSFER_TIME)|EFFECTIVE_URL|FILETIME)|OPT_(R(E(SUME_FROM|TURNTRANSFER|DIR_PROTOCOLS|FERER|AD(DATA|FUNCTION))|AN(GE|DOM_FILE))|MAX(REDIRS|CONNECTS)|B(INARYTRANSFER|UFFERSIZE)|S(S(H_(HOST_PUBLIC_KEY_MD5|P(RIVATE_KEYFILE|UBLIC_KEYFILE)|AUTH_TYPES)|L(CERT(TYPE|PASSWD)?|_(CIPHER_LIST|VERIFY(HOST|PEER))|ENGINE(_DEFAULT)?|VERSION|KEY(TYPE|PASSWD)?))|TDERR)|H(TTP(GET|HEADER|200ALIASES|_VERSION|PROXYTUNNEL|AUTH)|EADER(FUNCTION)?)|N(O(BODY|SIGNAL|PROGRESS)|ETRC)|C(RLF|O(NNECTTIMEOUT(_MS)?|OKIE(SESSION|JAR|FILE)?)|USTOMREQUEST|ERTINFO|LOSEPOLICY|A(INFO|PATH))|T(RANSFERTEXT|CP_NODELAY|IME(CONDITION|OUT(_MS)?|VALUE))|I(N(TERFACE|FILE(SIZE)?)|PRESOLVE)|DNS_(CACHE_TIMEOUT|USE_GLOBAL_CACHE)|U(RL|SER(PWD|AGENT)|NRESTRICTED_AUTH|PLOAD)|P(R(IVATE|O(GRESSFUNCTION|XY(TYPE|USERPWD|PORT|AUTH)?|TOCOLS))|O(RT|ST(REDIR|QUOTE|FIELDS)?)|UT)|E(GDSOCKET|NCODING)|VERBOSE|K(RB4LEVEL|EYPASSWD)|QUOTE|F(RESH_CONNECT|TP(SSLAUTH|_(S(SL|KIP_PASV_IP)|CREATE_MISSING_DIRS|USE_EP(RT|SV)|FILEMETHOD)|PORT|LISTONLY|APPEND)|ILE(TIME)?|O(RBID_REUSE|LLOWLOCATION)|AILONERROR)|WRITE(HEADER|FUNCTION)|LOW_SPEED_(TIME|LIMIT)|AUTOREFERER)|PRO(XY_(SOCKS(4|5)|HTTP)|TO_(S(CP|FTP)|HTTP(S)?|T(ELNET|FTP)|DICT|F(TP(S)?|ILE)|LDAP(S)?|ALL))|E_(RE(CV_ERROR|AD_ERROR)|GOT_NOTHING|MALFORMAT_USER|BAD_(C(ONTENT_ENCODING|ALLING_ORDER)|PASSWORD_ENTERED|FUNCTION_ARGUMENT)|S(S(H|L_(C(IPHER|ONNECT_ERROR|ERTPROBLEM|ACERT)|PEER_CERTIFICATE|ENGINE_(SETFAILED|NOTFOUND)))|HARE_IN_USE|END_ERROR)|HTTP_(RANGE_ERROR|NOT_FOUND|PO(RT_FAILED|ST_ERROR))|COULDNT_(RESOLVE_(HOST|PROXY)|CONNECT)|T(OO_MANY_REDIRECTS|ELNET_OPTION_SYNTAX)|O(BSOLETE|UT_OF_MEMORY|PERATION_TIMEOUTED|K)|U(RL_MALFORMAT(_USER)?|N(SUPPORTED_PROTOCOL|KNOWN_TELNET_OPTION))|PARTIAL_FILE|F(TP_(BAD_DOWNLOAD_RESUME|SSL_FAILED|C(OULDNT_(RETR_FILE|GET_SIZE|S(TOR_FILE|ET_(BINARY|ASCII))|USE_REST)|ANT_(RECONNECT|GET_HOST))|USER_PASSWORD_INCORRECT|PORT_FAILED|QUOTE_ERROR|W(RITE_ERROR|EIRD_(SERVER_REPLY|227_FORMAT|USER_REPLY|PAS(S_REPLY|V_REPLY)))|ACCESS_DENIED)|ILE(SIZE_EXCEEDED|_COULDNT_READ_FILE)|UNCTION_NOT_FOUND|AILED_INIT)|WRITE_ERROR|L(IBRARY_NOT_FOUND|DAP_(SEARCH_FAILED|CANNOT_BIND|INVALID_URL))|ABORTED_BY_CALLBACK)|VERSION_NOW|FTP(METHOD_(MULTICWD|SINGLECWD|NOCWD)|SSL_(NONE|CONTROL|TRY|ALL)|AUTH_(SSL|TLS|DEFAULT))|AUTH_(GSSNEGOTIATE|BASIC|NTLM|DIGEST|ANY(SAFE)?))|I(MAGETYPE_(GIF|XBM|BMP|SWF|COUNT|TIFF_(MM|II)|I(CO|FF)|UNKNOWN|J(B2|P(X|2|C|EG(2000)?))|P(SD|NG)|WBMP)|NPUT_(REQUEST|GET|SE(RVER|SSION)|COOKIE|POST|ENV)|CONV_(MIME_DECODE_(STRICT|CONTINUE_ON_ERROR)|IMPL|VERSION))|D(NS_(MX|S(RV|OA)|HINFO|N(S|APTR)|CNAME|TXT|PTR|A(NY|LL|AAA|6)?)|OM(STRING_SIZE_ERR|_(SYNTAX_ERR|HIERARCHY_REQUEST_ERR|N(O(_(MODIFICATION_ALLOWED_ERR|DATA_ALLOWED_ERR)|T_(SUPPORTED_ERR|FOUND_ERR))|AMESPACE_ERR)|IN(DEX_SIZE_ERR|USE_ATTRIBUTE_ERR|VALID_(MODIFICATION_ERR|STATE_ERR|CHARACTER_ERR|ACCESS_ERR))|PHP_ERR|VALIDATION_ERR|WRONG_DOCUMENT_ERR)))|JSON_(HEX_(TAG|QUOT|A(MP|POS))|NUMERIC_CHECK|ERROR_(S(YNTAX|TATE_MISMATCH)|NONE|CTRL_CHAR|DEPTH|UTF8)|FORCE_OBJECT)|P(REG_(RECURSION_LIMIT_ERROR|GREP_INVERT|BA(CKTRACK_LIMIT_ERROR|D_UTF8_(OFFSET_ERROR|ERROR))|S(PLIT_(NO_EMPTY|OFFSET_CAPTURE|DELIM_CAPTURE)|ET_ORDER)|NO_ERROR|INTERNAL_ERROR|OFFSET_CAPTURE|PATTERN_ORDER)|SFS_(PASS_ON|ERR_FATAL|F(EED_ME|LAG_(NORMAL|FLUSH_(CLOSE|INC))))|CRE_VERSION|OSIX_(R_OK|X_OK|S_IF(REG|BLK|SOCK|CHR|IFO)|F_OK|W_OK))|F(NM_(NOESCAPE|CASEFOLD|P(ERIOD|ATHNAME))|IL(TER_(REQUIRE_(SCALAR|ARRAY)|SANITIZE_(MAGIC_QUOTES|S(TRI(NG|PPED)|PECIAL_CHARS)|NUMBER_(INT|FLOAT)|URL|E(MAIL|NCODED)|FULL_SPECIAL_CHARS)|NULL_ON_FAILURE|CALLBACK|DEFAULT|UNSAFE_RAW|VALIDATE_(REGEXP|BOOLEAN|I(NT|P)|URL|EMAIL|FLOAT)|F(ORCE_ARRAY|LAG_(S(CHEME_REQUIRED|TRIP_(BACKTICK|HIGH|LOW))|HOST_REQUIRED|NO(NE|_(RES_RANGE|PRIV_RANGE|ENCODE_QUOTES))|IPV(4|6)|PATH_REQUIRED|E(MPTY_STRING_NULL|NCODE_(HIGH|LOW|AMP))|QUERY_REQUIRED|ALLOW_(SCIENTIFIC|HEX|THOUSAND|OCTAL|FRACTION))))|E(_(BINARY|SKIP_EMPTY_LINES|NO_DEFAULT_CONTEXT|TEXT|IGNORE_NEW_LINES|USE_INCLUDE_PATH|APPEND)|INFO_(RAW|MIME(_(TYPE|ENCODING))?|SYMLINK|NONE|CONTINUE|DEVICES|PRESERVE_ATIME)))|ORCE_(GZIP|DEFLATE))|LIBXML_(XINCLUDE|N(SCLEAN|O(XMLDECL|BLANKS|NET|CDATA|E(RROR|MPTYTAG|NT)|WARNING))|COMPACT|D(TD(VALID|LOAD|ATTR)|OTTED_VERSION)|PARSEHUGE|ERR_(NONE|ERROR|FATAL|WARNING)|VERSION|LOADED_VERSION))\\b",
+              "match": "(\\\\)?\\b(GLOB_(MARK|BRACE|NO(SORT|CHECK|ESCAPE)|ONLYDIR|ERR|AVAILABLE_FLAGS)|XML_(SAX_IMPL|HTML_DOCUMENT_NODE|N(OTATION_NODE|AMESPACE_DECL_NODE)|C(OMMENT_NODE|DATA_SECTION_NODE)|TEXT_NODE|OPTION_(SKIP_(TAGSTART|WHITE)|CASE_FOLDING|TARGET_ENCODING)|D(TD_NODE|OCUMENT_(NODE|TYPE_NODE|FRAG_NODE))|PI_NODE|E(RROR_(RECURSIVE_ENTITY_REF|MISPLACED_XML_PI|B(INARY_ENTITY_REF|AD_CHAR_REF)|SYNTAX|NO(NE|_(MEMORY|ELEMENTS))|TAG_MISMATCH|IN(CORRECT_ENCODING|VALID_TOKEN)|DUPLICATE_ATTRIBUTE|UN(CLOSED_(CDATA_SECTION|TOKEN)|DEFINED_ENTITY|KNOWN_ENCODING)|JUNK_AFTER_DOC_ELEMENT|PAR(TIAL_CHAR|AM_ENTITY_REF)|EXTERNAL_ENTITY_HANDLING|A(SYNC_ENTITY|TTRIBUTE_EXTERNAL_ENTITY_REF))|NTITY_(REF_NODE|NODE|DECL_NODE)|LEMENT_(NODE|DECL_NODE))|LOCAL_NAMESPACE|ATTRIBUTE_(N(MTOKEN(S)?|O(TATION|DE))|CDATA|ID(REF(S)?)?|DECL_NODE|EN(TITY|UMERATION)))|M(HASH_(RIPEMD(1(28|60)|256|320)|GOST|MD([245])|S(HA(1|2(24|56)|384|512)|NEFRU256)|HAVAL(1(28|92|60)|2(24|56))|CRC32(B)?|TIGER(1(28|60))?|WHIRLPOOL|ADLER32)|YSQL(_(BOTH|NUM|CLIENT_(SSL|COMPRESS|I(GNORE_SPACE|NTERACTIVE))|ASSOC)|I_(RE(PORT_(STRICT|INDEX|OFF|ERROR|ALL)|FRESH_(GRANT|MASTER|BACKUP_LOG|S(TATUS|LAVE)|HOSTS|T(HREADS|ABLES)|LOG)|AD_DEFAULT_(GROUP|FILE))|GROUP_FLAG|MULTIPLE_KEY_FLAG|B(INARY_FLAG|OTH|LOB_FLAG)|S(T(MT_ATTR_(CURSOR_TYPE|UPDATE_MAX_LENGTH|PREFETCH_ROWS)|ORE_RESULT)|E(RVER_QUERY_(NO_(GOOD_INDEX_USED|INDEX_USED)|WAS_SLOW)|T_(CHARSET_NAME|FLAG)))|N(O(_D(EFAULT_VALUE_FLAG|ATA)|T_NULL_FLAG)|UM(_FLAG)?)|C(URSOR_TYPE_(READ_ONLY|SCROLLABLE|NO_CURSOR|FOR_UPDATE)|LIENT_(SSL|NO_SCHEMA|COMPRESS|I(GNORE_SPACE|NTERACTIVE)|FOUND_ROWS))|T(YPE_(GEOMETRY|MEDIUM_BLOB|B(IT|LOB)|S(HORT|TRING|ET)|YEAR|N(ULL|EWD(ECIMAL|ATE))|CHAR|TI(ME(STAMP)?|NY(_BLOB)?)|INT(24|ERVAL)|D(OUBLE|ECIMAL|ATE(TIME)?)|ENUM|VAR_STRING|FLOAT|LONG(_BLOB|LONG)?)|IMESTAMP_FLAG)|INIT_COMMAND|ZEROFILL_FLAG|O(N_UPDATE_NOW_FLAG|PT_(NET_(READ_BUFFER_SIZE|CMD_BUFFER_SIZE)|CONNECT_TIMEOUT|INT_AND_FLOAT_NATIVE|LOCAL_INFILE))|D(EBUG_TRACE_ENABLED|ATA_TRUNCATED)|U(SE_RESULT|N(SIGNED_FLAG|IQUE_KEY_FLAG))|P(RI_KEY_FLAG|ART_KEY_FLAG)|ENUM_FLAG|A(S(SOC|YNC)|UTO_INCREMENT_FLAG)))|CRYPT_(R(C([26])|IJNDAEL_(1(28|92)|256)|AND)|GOST|XTEA|M(ODE_(STREAM|NOFB|C(BC|FB)|OFB|ECB)|ARS)|BLOWFISH(_COMPAT)?|S(ERPENT|KIPJACK|AFER(128|PLUS|64))|C(RYPT|AST_(128|256))|T(RIPLEDES|HREEWAY|WOFISH)|IDEA|3DES|DE(S|CRYPT|V_(RANDOM|URANDOM))|PANAMA|EN(CRYPT|IGNA)|WAKE|LOKI97|ARCFOUR(_IV)?))|S(TREAM_(REPORT_ERRORS|M(UST_SEEK|KDIR_RECURSIVE)|BUFFER_(NONE|FULL|LINE)|S(HUT_(RD(WR)?|WR)|OCK_(R(DM|AW)|S(TREAM|EQPACKET)|DGRAM)|ERVER_(BIND|LISTEN))|NOTIFY_(RE(SOLVE|DIRECTED)|MIME_TYPE_IS|SEVERITY_(INFO|ERR|WARN)|CO(MPLETED|NNECT)|PROGRESS|F(ILE_SIZE_IS|AILURE)|AUTH_RE(SULT|QUIRED))|C(RYPTO_METHOD_(SSLv(2(_(SERVER|CLIENT)|3_(SERVER|CLIENT))|3_(SERVER|CLIENT))|TLS_(SERVER|CLIENT))|LIENT_(CONNECT|PERSISTENT|ASYNC_CONNECT)|AST_(FOR_SELECT|AS_STREAM))|I(GNORE_URL|S_URL|PPROTO_(RAW|TCP|I(CMP|P)|UDP))|O(OB|PTION_(READ_(BUFFER|TIMEOUT)|BLOCKING|WRITE_BUFFER))|U(RL_STAT_(QUIET|LINK)|SE_PATH)|P(EEK|F_(INET(6)?|UNIX))|ENFORCE_SAFE_MODE|FILTER_(READ|WRITE|ALL))|UNFUNCS_RET_(STRING|TIMESTAMP|DOUBLE)|QLITE(_(R(OW|EADONLY)|MIS(MATCH|USE)|B(OTH|USY)|SCHEMA|N(O(MEM|T(FOUND|ADB)|LFS)|UM)|C(O(RRUPT|NSTRAINT)|ANTOPEN)|TOOBIG|I(NTER(RUPT|NAL)|OERR)|OK|DONE|P(ROTOCOL|ERM)|E(RROR|MPTY)|F(ORMAT|ULL)|LOCKED|A(BORT|SSOC|UTH))|3_(B(OTH|LOB)|NU(M|LL)|TEXT|INTEGER|OPEN_(READ(ONLY|WRITE)|CREATE)|FLOAT|ASSOC)))|CURL(M(SG_DONE|_(BAD_(HANDLE|EASY_HANDLE)|CALL_MULTI_PERFORM|INTERNAL_ERROR|O(UT_OF_MEMORY|K)))|SSH_AUTH_(HOST|NONE|DEFAULT|P(UBLICKEY|ASSWORD)|KEYBOARD)|CLOSEPOLICY_(SLOWEST|CALLBACK|OLDEST|LEAST_(RECENTLY_USED|TRAFFIC))|_(HTTP_VERSION_(1_([10])|NONE)|NETRC_(REQUIRED|IGNORED|OPTIONAL)|TIMECOND_(IF(MODSINCE|UNMODSINCE)|LASTMOD)|IPRESOLVE_(V([46])|WHATEVER)|VERSION_(SSL|IPV6|KERBEROS4|LIBZ))|INFO_(RE(DIRECT_(COUNT|TIME)|QUEST_SIZE)|S(SL_VERIFYRESULT|TARTTRANSFER_TIME|IZE_(DOWNLOAD|UPLOAD)|PEED_(DOWNLOAD|UPLOAD))|H(TTP_CODE|EADER_(SIZE|OUT))|NAMELOOKUP_TIME|C(ON(NECT_TIME|TENT_(TYPE|LENGTH_(DOWNLOAD|UPLOAD)))|ERTINFO)|TOTAL_TIME|PR(IVATE|ETRANSFER_TIME)|EFFECTIVE_URL|FILETIME)|OPT_(R(E(SUME_FROM|TURNTRANSFER|DIR_PROTOCOLS|FERER|AD(DATA|FUNCTION))|AN(GE|DOM_FILE))|MAX(REDIRS|CONNECTS)|B(INARYTRANSFER|UFFERSIZE)|S(S(H_(HOST_PUBLIC_KEY_MD5|P(RIVATE_KEYFILE|UBLIC_KEYFILE)|AUTH_TYPES)|L(CERT(TYPE|PASSWD)?|_(CIPHER_LIST|VERIFY(HOST|PEER))|ENGINE(_DEFAULT)?|VERSION|KEY(TYPE|PASSWD)?))|TDERR)|H(TTP(GET|HEADER|200ALIASES|_VERSION|PROXYTUNNEL|AUTH)|EADER(FUNCTION)?)|N(O(BODY|SIGNAL|PROGRESS)|ETRC)|C(RLF|O(NNECTTIMEOUT(_MS)?|OKIE(SESSION|JAR|FILE)?)|USTOMREQUEST|ERTINFO|LOSEPOLICY|A(INFO|PATH))|T(RANSFERTEXT|CP_NODELAY|IME(CONDITION|OUT(_MS)?|VALUE))|I(N(TERFACE|FILE(SIZE)?)|PRESOLVE)|DNS_(CACHE_TIMEOUT|USE_GLOBAL_CACHE)|U(RL|SER(PWD|AGENT)|NRESTRICTED_AUTH|PLOAD)|P(R(IVATE|O(GRESSFUNCTION|XY(TYPE|USERPWD|PORT|AUTH)?|TOCOLS))|O(RT|ST(REDIR|QUOTE|FIELDS)?)|UT)|E(GDSOCKET|NCODING)|VERBOSE|K(RB4LEVEL|EYPASSWD)|QUOTE|F(RESH_CONNECT|TP(SSLAUTH|_(S(SL|KIP_PASV_IP)|CREATE_MISSING_DIRS|USE_EP(RT|SV)|FILEMETHOD)|PORT|LISTONLY|APPEND)|ILE(TIME)?|O(RBID_REUSE|LLOWLOCATION)|AILONERROR)|WRITE(HEADER|FUNCTION)|LOW_SPEED_(TIME|LIMIT)|AUTOREFERER)|PRO(XY_(SOCKS([45])|HTTP)|TO_(S(CP|FTP)|HTTP(S)?|T(ELNET|FTP)|DICT|F(TP(S)?|ILE)|LDAP(S)?|ALL))|E_(RE(CV_ERROR|AD_ERROR)|GOT_NOTHING|MALFORMAT_USER|BAD_(C(ONTENT_ENCODING|ALLING_ORDER)|PASSWORD_ENTERED|FUNCTION_ARGUMENT)|S(S(H|L_(C(IPHER|ONNECT_ERROR|ERTPROBLEM|ACERT)|PEER_CERTIFICATE|ENGINE_(SETFAILED|NOTFOUND)))|HARE_IN_USE|END_ERROR)|HTTP_(RANGE_ERROR|NOT_FOUND|PO(RT_FAILED|ST_ERROR))|COULDNT_(RESOLVE_(HOST|PROXY)|CONNECT)|T(OO_MANY_REDIRECTS|ELNET_OPTION_SYNTAX)|O(BSOLETE|UT_OF_MEMORY|PERATION_TIMEOUTED|K)|U(RL_MALFORMAT(_USER)?|N(SUPPORTED_PROTOCOL|KNOWN_TELNET_OPTION))|PARTIAL_FILE|F(TP_(BAD_DOWNLOAD_RESUME|SSL_FAILED|C(OULDNT_(RETR_FILE|GET_SIZE|S(TOR_FILE|ET_(BINARY|ASCII))|USE_REST)|ANT_(RECONNECT|GET_HOST))|USER_PASSWORD_INCORRECT|PORT_FAILED|QUOTE_ERROR|W(RITE_ERROR|EIRD_(SERVER_REPLY|227_FORMAT|USER_REPLY|PAS(S_REPLY|V_REPLY)))|ACCESS_DENIED)|ILE(SIZE_EXCEEDED|_COULDNT_READ_FILE)|UNCTION_NOT_FOUND|AILED_INIT)|WRITE_ERROR|L(IBRARY_NOT_FOUND|DAP_(SEARCH_FAILED|CANNOT_BIND|INVALID_URL))|ABORTED_BY_CALLBACK)|VERSION_NOW|FTP(METHOD_(MULTICWD|SINGLECWD|NOCWD)|SSL_(NONE|CONTROL|TRY|ALL)|AUTH_(SSL|TLS|DEFAULT))|AUTH_(GSSNEGOTIATE|BASIC|NTLM|DIGEST|ANY(SAFE)?))|I(MAGETYPE_(GIF|XBM|BMP|SWF|COUNT|TIFF_(MM|II)|I(CO|FF)|UNKNOWN|J(B2|P([X2C]|EG(2000)?))|P(SD|NG)|WBMP)|NPUT_(REQUEST|GET|SE(RVER|SSION)|COOKIE|POST|ENV)|CONV_(MIME_DECODE_(STRICT|CONTINUE_ON_ERROR)|IMPL|VERSION))|D(NS_(MX|S(RV|OA)|HINFO|N(S|APTR)|CNAME|TXT|PTR|A(NY|LL|AAA|6)?)|OM(STRING_SIZE_ERR|_(SYNTAX_ERR|HIERARCHY_REQUEST_ERR|N(O(_(MODIFICATION_ALLOWED_ERR|DATA_ALLOWED_ERR)|T_(SUPPORTED_ERR|FOUND_ERR))|AMESPACE_ERR)|IN(DEX_SIZE_ERR|USE_ATTRIBUTE_ERR|VALID_(MODIFICATION_ERR|STATE_ERR|CHARACTER_ERR|ACCESS_ERR))|PHP_ERR|VALIDATION_ERR|WRONG_DOCUMENT_ERR)))|JSON_(HEX_(TAG|QUOT|A(MP|POS))|NUMERIC_CHECK|ERROR_(S(YNTAX|TATE_MISMATCH)|NONE|CTRL_CHAR|DEPTH|UTF8)|FORCE_OBJECT)|P(REG_(RECURSION_LIMIT_ERROR|GREP_INVERT|BA(CKTRACK_LIMIT_ERROR|D_UTF8_(OFFSET_ERROR|ERROR))|S(PLIT_(NO_EMPTY|OFFSET_CAPTURE|DELIM_CAPTURE)|ET_ORDER)|NO_ERROR|INTERNAL_ERROR|OFFSET_CAPTURE|PATTERN_ORDER)|SFS_(PASS_ON|ERR_FATAL|F(EED_ME|LAG_(NORMAL|FLUSH_(CLOSE|INC))))|CRE_VERSION|OSIX_(R_OK|X_OK|S_IF(REG|BLK|SOCK|CHR|IFO)|F_OK|W_OK))|F(NM_(NOESCAPE|CASEFOLD|P(ERIOD|ATHNAME))|IL(TER_(REQUIRE_(SCALAR|ARRAY)|SANITIZE_(MAGIC_QUOTES|S(TRI(NG|PPED)|PECIAL_CHARS)|NUMBER_(INT|FLOAT)|URL|E(MAIL|NCODED)|FULL_SPECIAL_CHARS)|NULL_ON_FAILURE|CALLBACK|DEFAULT|UNSAFE_RAW|VALIDATE_(REGEXP|BOOLEAN|I(NT|P)|URL|EMAIL|FLOAT)|F(ORCE_ARRAY|LAG_(S(CHEME_REQUIRED|TRIP_(BACKTICK|HIGH|LOW))|HOST_REQUIRED|NO(NE|_(RES_RANGE|PRIV_RANGE|ENCODE_QUOTES))|IPV([46])|PATH_REQUIRED|E(MPTY_STRING_NULL|NCODE_(HIGH|LOW|AMP))|QUERY_REQUIRED|ALLOW_(SCIENTIFIC|HEX|THOUSAND|OCTAL|FRACTION))))|E(_(BINARY|SKIP_EMPTY_LINES|NO_DEFAULT_CONTEXT|TEXT|IGNORE_NEW_LINES|USE_INCLUDE_PATH|APPEND)|INFO_(RAW|MIME(_(TYPE|ENCODING))?|SYMLINK|NONE|CONTINUE|DEVICES|PRESERVE_ATIME)))|ORCE_(GZIP|DEFLATE))|LIBXML_(XINCLUDE|N(SCLEAN|O(XMLDECL|BLANKS|NET|CDATA|E(RROR|MPTYTAG|NT)|WARNING))|COMPACT|D(TD(VALID|LOAD|ATTR)|OTTED_VERSION)|PARSEHUGE|ERR_(NONE|ERROR|FATAL|WARNING)|VERSION|LOADED_VERSION))\\b",
               "name": "support.constant.ext.php"
             },
             {
@@ -224,8 +223,7 @@
               "name": "support.constant.parser-token.php"
             },
             {
-              "comment": "In PHP, any identifier which is not a variable is taken to be a constant.\nHowever, if there is no constant defined with the given name then a notice\nis generated and the constant is assumed to have the value of its name.",
-              "match": "[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*",
+              "match": "[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*",
               "name": "constant.other.php"
             }
           ]
@@ -244,7 +242,7 @@
           "include": "#type-annotation"
         },
         {
-          "begin": "(?xi)((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)  # The variable name",
+          "begin": "(?i)((\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)",
           "beginCaptures": {
             "1": {
               "name": "variable.other.php"
@@ -253,7 +251,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "end": "(?xi)\n\\s*(?=,|\\)|$) # A closing parentheses (end of argument list) or a comma",
+          "end": "(?i)\\s*(?=[,)]|$)",
           "patterns": [
             {
               "begin": "(=)",
@@ -262,7 +260,7 @@
                   "name": "keyword.operator.assignment.php"
                 }
               },
-              "end": "(?=,|\\))",
+              "end": "(?=[,)])",
               "patterns": [
                 {
                   "include": "#language"
@@ -277,7 +275,6 @@
       "patterns": [
         {
           "begin": "(?i)(?=\\\\?[a-z_0-9\\\\]+\\\\[a-z_][a-z0-9_]*\\s*\\()",
-          "comment": "Functions in a user-defined namespace (overrides any built-ins)",
           "end": "(?=\\s*\\()",
           "patterns": [
             {
@@ -296,7 +293,6 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "comment": "Root namespace function calls (built-in or user)",
           "end": "(?=\\s*\\()",
           "patterns": [
             {
@@ -427,7 +423,7 @@
             {
               "begin": "(?i)(?=[a-z0-9_\\\\]+)",
               "contentName": "meta.other.inherited-class.php",
-              "end": "(?i)(?:\\s*(?:,|(?=[^a-z0-9_\\\\\\s]))\\s*)",
+              "end": "(?i)\\s*(?:,|(?=[^a-z0-9_\\\\\\s]))\\s*",
               "patterns": [
                 {
                   "begin": "(?i)(?=\\\\?[a-z_0-9]+\\\\)",
@@ -517,31 +513,25 @@
       ]
     },
     "interpolation": {
-      "comment": "http://www.php.net/manual/en/language.types.string.php#language.types.string.parsing",
       "patterns": [
         {
-          "comment": "Interpolating octal values e.g. \\01 or \\07.",
           "match": "\\\\[0-7]{1,3}",
           "name": "constant.numeric.octal.php"
         },
         {
-          "comment": "Interpolating hex values e.g. \\x1 or \\xFF.",
-          "match": "\\\\x[0-9A-Fa-f]{1,2}",
+          "match": "\\\\x\\h{1,2}",
           "name": "constant.numeric.hex.php"
         },
         {
-          "comment": "Escaped characters in double-quoted strings e.g. \\n or \\t.",
-          "match": "\\\\[nrt\\\\\\$\\\"]",
+          "match": "\\\\[nrt\\\\$\"]",
           "name": "constant.character.escape.php"
         },
         {
-          "comment": "Interpolating expressions in double-quoted strings with {} e.g. {$x->y->z[0][1]}.",
-          "match": "(\\{\\$.*?\\})",
+          "match": "(\\{\\$.*?})",
           "name": "variable.other.php"
         },
         {
-          "comment": "Interpolating simple variables, e.g. $x, $x->y, $x[z] but not $x->y->z.",
-          "match": "(\\$[a-zA-Z_][a-zA-Z0-9_]*((->[a-zA-Z_][a-zA-Z0-9_]*)|(\\[[a-zA-Z0-9_]+\\]))?)",
+          "match": "(\\$[a-zA-Z_][a-zA-Z0-9_]*((->[a-zA-Z_][a-zA-Z0-9_]*)|(\\[[a-zA-Z0-9_]+]))?)",
           "name": "variable.other.php"
         }
       ]
@@ -579,7 +569,7 @@
           "include": "#interface"
         },
         {
-          "begin": "(?xi)\n^\\s*\n(?:(module)\\s*)?(type|newtype)\n\\s+\n([a-z0-9_]+)",
+          "begin": "(?i)^\\s*(?:(module)\\s*)?(type|newtype)\\s+([a-z0-9_]+)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.php"
@@ -630,7 +620,7 @@
               "name": "entity.name.type.class.enum.php"
             }
           },
-          "end": "(?=[{])",
+          "end": "(?=\\{)",
           "name": "meta.class.enum.php",
           "patterns": [
             {
@@ -679,7 +669,7 @@
               "name": "entity.name.type.class.php"
             }
           },
-          "end": "(?=[{])",
+          "end": "(?=\\{)",
           "name": "meta.trait.php",
           "patterns": [
             {
@@ -694,7 +684,7 @@
           ]
         },
         {
-          "begin": "^\\s*(new)\\s+(module)\\s+([A-Za-z0-9_\\.]+)\\b",
+          "begin": "^\\s*(new)\\s+(module)\\s+([A-Za-z0-9_.]+)\\b",
           "beginCaptures": {
             "1": {
               "name": "storage.type.module.php"
@@ -706,7 +696,7 @@
               "name": "entity.name.type.module.php"
             }
           },
-          "end": "(?=[{])",
+          "end": "(?=\\{)",
           "name": "meta.module.php",
           "patterns": [
             {
@@ -715,7 +705,7 @@
           ]
         },
         {
-          "begin": "^\\s*(module)\\s+([A-Za-z0-9_\\.]+)\\b",
+          "begin": "^\\s*(module)\\s+([A-Za-z0-9_.]+)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.module.php"
@@ -733,7 +723,7 @@
           ]
         },
         {
-          "begin": "(?i)(?:^\\s*|\\s*)(namespace)\\b\\s+(?=([a-z0-9_\\\\]*\\s*($|[;{]|(\\/[\\/*])))|$)",
+          "begin": "(?i)(?:^\\s*|\\s*)(namespace)\\b\\s+(?=([a-z0-9_\\\\]*\\s*($|[;{]|(/[/*])))|$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.namespace.php"
@@ -756,7 +746,7 @@
               "name": "keyword.other.use.php"
             }
           },
-          "end": "(?=;|(?:^\\s*$))",
+          "end": "(?=;|^\\s*$)",
           "name": "meta.use.php",
           "patterns": [
             {
@@ -764,7 +754,7 @@
             },
             {
               "begin": "(?i)\\s*(?=[a-z_0-9\\\\])",
-              "end": "(?xi)\n(?:\n  (?:\\s*(as)\\b\\s*([a-z_0-9]*)\\s*(?=,|;|$))|\n  (?=,|;|$)\n)",
+              "end": "(?i)(?:\\s*(as)\\b\\s*([a-z_0-9]*)\\s*(?=[,;]|$)|(?=[,;]|$))",
               "endCaptures": {
                 "1": {
                   "name": "keyword.other.use-as.php"
@@ -878,7 +868,7 @@
               "name": "keyword.control.import.include.php"
             }
           },
-          "end": "(?=\\s|;|$)",
+          "end": "(?=[\\s;]|$)",
           "name": "meta.include.php",
           "patterns": [
             {
@@ -915,7 +905,7 @@
                 "2": {
                   "patterns": [
                     {
-                      "match": "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
+                      "match": "(?i)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*",
                       "name": "support.class.exception.php"
                     },
                     {
@@ -931,7 +921,7 @@
                   "name": "punctuation.definition.variable.php"
                 }
               },
-              "match": "(?xi)\n([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)                 # Exception class\n((?:\\s*\\|\\s*[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)*) # Optional additional exception classes\n\\s*\n((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)           # Variable"
+              "match": "(?i)([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)((?:\\s*\\|\\s*[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)*)\\s*((\\$+)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)"
             }
           ]
         },
@@ -949,7 +939,7 @@
               "name": "storage.type.function.php"
             }
           },
-          "end": "\\{|\\)",
+          "end": "[{)]",
           "name": "meta.function.closure.php",
           "patterns": [
             {
@@ -1001,7 +991,7 @@
                       "name": "punctuation.definition.variable.php"
                     }
                   },
-                  "match": "(?:\\s*(&))?\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\\s*(?=,|\\))",
+                  "match": "(?:\\s*(&))?\\s*((\\$+)[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)\\s*(?=[,)])",
                   "name": "meta.function.closure.use.php"
                 }
               ]
@@ -1009,7 +999,7 @@
           ]
         },
         {
-          "begin": "\\s*((?:(?:final|abstract|public|private|protected|internal|static|async)\\s+)*)(function)(?:\\s+)(?:(__(?:call|construct|destruct|get|set|isset|unset|tostring|clone|set_state|sleep|wakeup|autoload|invoke|callStatic|dispose|disposeAsync)(?=[^a-zA-Z0-9_\\x{7f}-\\x{ff}]))|([a-zA-Z0-9_]+))",
+          "begin": "\\s*((?:(?:final|abstract|public|private|protected|internal|static|async)\\s+)*)(function)\\s+(?:(__(?:call|construct|destruct|get|set|isset|unset|tostring|clone|set_state|sleep|wakeup|autoload|invoke|callStatic|dispose|disposeAsync)(?=[^a-zA-Z0-9_\\x7F-ÿ]))|([a-zA-Z0-9_]+))",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1073,8 +1063,8 @@
           "include": "#invoke-call"
         },
         {
-          "begin": "(?xi)\n\\s*\n  (?=\n    [a-z_0-9$\\\\]+(::)\n    (?:\n      ([a-z_][a-z_0-9]*)\\s*\\(\n      |\n      ((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n      |\n      ([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n    )?\n  )",
-          "end": "(::)(?:([A-Za-z_][A-Za-z_0-9]*)\\s*\\(|((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)|([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))?",
+          "begin": "(?i)\\s*(?=[a-z_0-9$\\\\]+(::)(?:([a-z_][a-z_0-9]*)\\s*\\(|((\\$+)[a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)|([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*))?)",
+          "end": "(::)(?:([A-Za-z_][A-Za-z_0-9]*)\\s*\\(|((\\$+)[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)|([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*))?",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -1196,19 +1186,19 @@
           "name": "keyword.operator.comparison.php"
         },
         {
-          "match": "=|\\+=|\\-=|\\*=|/=|%=|&=|\\|=|\\^=|<<=|>>=",
+          "match": "=|\\+=|-=|\\*=|/=|%=|&=|\\|=|\\^=|<<=|>>=",
           "name": "keyword.operator.assignment.php"
         },
         {
-          "match": "(<=|>=|<|>)",
+          "match": "(<=|>=|[<>])",
           "name": "keyword.operator.comparison.php"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
+          "match": "(--|\\+\\+)",
           "name": "keyword.operator.increment-decrement.php"
         },
         {
-          "match": "(\\-|\\+|\\*|/|%)",
+          "match": "([-+*/%])",
           "name": "keyword.operator.arithmetic.php"
         },
         {
@@ -1240,7 +1230,7 @@
           "include": "#function-call"
         },
         {
-          "match": "<<|>>|~|\\^|&|\\|",
+          "match": "<<|>>|[~^\\&|]",
           "name": "keyword.operator.bitwise.php"
         },
         {
@@ -1256,7 +1246,7 @@
               "name": "punctuation.section.array.begin.php"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.array.end.php"
@@ -1278,7 +1268,7 @@
               "name": "punctuation.section.scope.begin.php"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.scope.end.php"
@@ -1298,7 +1288,7 @@
     "literal-collections": {
       "patterns": [
         {
-          "begin": "(Vector|ImmVector|Set|ImmSet|Map|ImmMap|Pair)\\s*({)",
+          "begin": "(Vector|ImmVector|Set|ImmSet|Map|ImmMap|Pair)\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "name": "support.class.php"
@@ -1350,7 +1340,7 @@
       ]
     },
     "numbers": {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
+      "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)\\b",
       "name": "constant.numeric.php"
     },
     "object": {
@@ -1365,7 +1355,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.variable.php"
@@ -1392,7 +1382,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(->)(?:([A-Za-z_][A-Za-z_0-9]*)\\s*\\(|((\\$+)?[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))?"
+          "match": "(->)(?:([A-Za-z_][A-Za-z_0-9]*)\\s*\\(|((\\$+)?[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*))?"
         }
       ]
     },
@@ -1419,8 +1409,8 @@
           "include": "#instantiation"
         },
         {
-          "begin": "(?xi)\n\\s*\n(?=\n  [a-z_0-9\\\\]+(::)\n  ([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?\n)",
-          "end": "(?i)(::)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?",
+          "begin": "(?i)\\s*(?=[a-z_0-9\\\\]+(::)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)?)",
+          "end": "(?i)(::)([a-z_\\x7F-ÿ][a-z0-9_\\x7F-ÿ]*)?",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -1443,7 +1433,6 @@
     "php_doc": {
       "patterns": [
         {
-          "comment": "PHPDocumentor only recognises lines with an asterisk as the first non-whitespaces character",
           "match": "^(?!\\s*\\*).*$\\n?",
           "name": "invalid.illegal.missing-asterisk.phpdoc.php"
         },
@@ -1473,7 +1462,7 @@
           "match": "(@xlink)\\s+(.+)\\s*$"
         },
         {
-          "match": "\\@(a(bstract|uthor)|c(ategory|opyright)|example|global|internal|li(cense|nk)|pa(ckage|ram)|return|s(ee|ince|tatic|ubpackage)|t(hrows|odo)|v(ar|ersion)|uses|deprecated|final|ignore)\\b",
+          "match": "@(a(bstract|uthor)|c(ategory|opyright)|example|global|internal|li(cense|nk)|pa(ckage|ram)|return|s(ee|ince|tatic|ubpackage)|t(hrows|odo)|v(ar|ersion)|uses|deprecated|final|ignore)\\b",
           "name": "keyword.other.phpdoc.php"
         },
         {
@@ -1482,7 +1471,7 @@
               "name": "keyword.other.phpdoc.php"
             }
           },
-          "match": "\\{(@(link)).+?\\}",
+          "match": "\\{(@(link)).+?}",
           "name": "meta.tag.inline.phpdoc.php"
         }
       ]
@@ -1503,7 +1492,6 @@
       "name": "string.regexp.double-quoted.php",
       "patterns": [
         {
-          "comment": "Escaped from the regexp – there can also be 2 backslashes (since 1 will escape the first)",
           "match": "(\\\\){1,2}[.$^\\[\\]{}]",
           "name": "constant.character.escape.regex.php"
         },
@@ -1519,17 +1507,17 @@
               "name": "punctuation.definition.arbitrary-repetition.php"
             }
           },
-          "match": "(\\{)\\d+(,\\d+)?(\\})",
+          "match": "(\\{)\\d+(,\\d+)?(})",
           "name": "string.regexp.arbitrary-repetition.php"
         },
         {
-          "begin": "\\[(?:\\^?\\])?",
+          "begin": "\\[(?:\\^?])?",
           "captures": {
             "0": {
               "name": "punctuation.definition.character-class.php"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.character-class.php",
           "patterns": [
             {
@@ -1567,27 +1555,25 @@
               "name": "punctuation.definition.arbitrary-repetition.php"
             }
           },
-          "match": "(\\{)\\d+(,\\d+)?(\\})",
+          "match": "(\\{)\\d+(,\\d+)?(})",
           "name": "string.regexp.arbitrary-repetition.php"
         },
         {
-          "comment": "Escaped from the regexp – there can also be 2 backslashes (since 1 will escape the first)",
           "match": "(\\\\){1,2}[.$^\\[\\]{}]",
           "name": "constant.character.escape.regex.php"
         },
         {
-          "comment": "Escaped from the PHP string – there can also be 2 backslashes (since 1 will escape the first)",
           "match": "\\\\{1,2}[\\\\']",
           "name": "constant.character.escape.php"
         },
         {
-          "begin": "\\[(?:\\^?\\])?",
+          "begin": "\\[(?:\\^?])?",
           "captures": {
             "0": {
               "name": "punctuation.definition.character-class.php"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.character-class.php",
           "patterns": [
             {
@@ -1619,7 +1605,6 @@
       "name": "string.quoted.double.sql.php",
       "patterns": [
         {
-          "comment": "Open parens cause the next escaped character to not be captured as an\nescape character. Example: $x = \"SELECT (\")\";",
           "match": "\\(",
           "name": "punctuation.definition.parameters.begin.bracket.round.php"
         },
@@ -1636,12 +1621,10 @@
           "name": "constant.character.escape.php"
         },
         {
-          "comment": "Unclosed strings must be captured to avoid them eating the remainder of the PHP script\nSample case: $sql = \"SELECT * FROM bar WHERE foo = '\" . $variable . \"'\"",
           "match": "'(?=((\\\\')|[^'\"])*(\"|$))",
           "name": "string.quoted.single.unclosed.sql"
         },
         {
-          "comment": "Unclosed strings must be captured to avoid them eating the remainder of the PHP script\nSample case: $sql = \"SELECT * FROM bar WHERE foo = '\" . $variable . \"'\"",
           "match": "`(?=((\\\\`)|[^`\"])*(\"|$))",
           "name": "string.quoted.other.backtick.unclosed.sql"
         },
@@ -1690,7 +1673,6 @@
       "name": "string.quoted.single.sql.php",
       "patterns": [
         {
-          "comment": "Open parens cause the next escaped character to not be captured as an\nescape character. Example: $x = 'SELECT (')';",
           "match": "\\(",
           "name": "punctuation.definition.parameters.begin.bracket.round.php"
         },
@@ -1707,12 +1689,10 @@
           "name": "constant.character.escape.php"
         },
         {
-          "comment": "Unclosed strings must be captured to avoid them eating the remainder of the PHP script\nSample case: $sql = \"SELECT * FROM bar WHERE foo = '\" . $variable . \"'\"",
           "match": "`(?=((\\\\`)|[^`'])*('|$))",
           "name": "string.quoted.other.backtick.unclosed.sql"
         },
         {
-          "comment": "Unclosed strings must be captured to avoid them eating the remainder of the PHP script\nSample case: $sql = \"SELECT * FROM bar WHERE foo = '\" . $variable . \"'\"",
           "match": "\"(?=((\\\\\")|[^\"'])*('|$))",
           "name": "string.quoted.double.unclosed.sql"
         },
@@ -1728,7 +1708,6 @@
           "name": "punctuation.definition.string.begin.php"
         }
       },
-      "comment": "This contentName is just to allow the usage of “select scope” to select the string contents first, then the string with quotes",
       "contentName": "meta.string-contents.quoted.double.php",
       "end": "\"",
       "endCaptures": {
@@ -1894,7 +1873,7 @@
           "name": "support.function.gettext.php"
         },
         {
-          "match": "(?i)\\bgmp_(s(can(1|0)|trval|ign|ub|etbit|qrt(rem)?)|hamdist|ne(g|xtprime)|c(om|lrbit|mp)|testbit|in(tval|it|vert)|or|div(_(q(r)?|r)|exact)?|jacobi|p(o(pcount|w(m)?)|erfect_square|rob_prime)|fact|legendre|a(nd|dd|bs)|random|gcd(ext)?|xor|m(od|ul))\\b",
+          "match": "(?i)\\bgmp_(s(can([10])|trval|ign|ub|etbit|qrt(rem)?)|hamdist|ne(g|xtprime)|c(om|lrbit|mp)|testbit|in(tval|it|vert)|or|div(_(q(r)?|r)|exact)?|jacobi|p(o(pcount|w(m)?)|erfect_square|rob_prime)|fact|legendre|a(nd|dd|bs)|random|gcd(ext)?|xor|m(od|ul))\\b",
           "name": "support.function.gmp.php"
         },
         {
@@ -1946,7 +1925,7 @@
           "name": "support.function.mail.php"
         },
         {
-          "match": "(?i)\\b(s(in(h)?|qrt|rand)|h(ypot|exdec)|c(os(h)?|eil)|tan(h)?|is_(nan|infinite|finite)|octdec|de(c(hex|oct|bin)|g2rad)|p(i|ow)|exp(m1)?|f(loor|mod)|l(cg_value|og(1(p|0))?)|a(sin(h)?|cos(h)?|tan(h|2)?|bs)|r(ound|a(nd|d2deg))|getrandmax|m(t_(srand|rand|getrandmax)|in|ax)|b(indec|ase_convert))\\b",
+          "match": "(?i)\\b(s(in(h)?|qrt|rand)|h(ypot|exdec)|c(os(h)?|eil)|tan(h)?|is_(nan|infinite|finite)|octdec|de(c(hex|oct|bin)|g2rad)|p(i|ow)|exp(m1)?|f(loor|mod)|l(cg_value|og(1([p0]))?)|a(sin(h)?|cos(h)?|tan([h2])?|bs)|r(ound|a(nd|d2deg))|getrandmax|m(t_(srand|rand|getrandmax)|in|ax)|b(indec|ase_convert))\\b",
           "name": "support.function.math.php"
         },
         {
@@ -2126,7 +2105,7 @@
           "name": "support.function.sqlsrv.php"
         },
         {
-          "match": "(?i)\\bstats_(s(ta(ndard_deviation|t_(noncentral_t|correlation|in(nerproduct|dependent_t)|p(owersum|ercentile|aired_t)|gennch|binomial_coef))|kew)|harmonic_mean|c(ovariance|df_(n(oncentral_(chisquare|f)|egative_binomial)|c(hisquare|auchy)|t|uniform|poisson|exponential|f|weibull|l(ogistic|aplace)|gamma|b(inomial|eta)))|den(s_(n(ormal|egative_binomial)|c(hisquare|auchy)|t|pmf_(hypergeometric|poisson|binomial)|exponential|f|weibull|l(ogistic|aplace)|gamma|beta)|_uniform)|variance|kurtosis|absolute_deviation|rand_(setall|phrase_to_seeds|ranf|ge(n_(no(ncen(tral_(t|f)|ral_chisquare)|rmal)|chisquare|t|i(nt|uniform|poisson|binomial(_negative)?)|exponential|f(uniform)?|gamma|beta)|t_seeds)))\\b",
+          "match": "(?i)\\bstats_(s(ta(ndard_deviation|t_(noncentral_t|correlation|in(nerproduct|dependent_t)|p(owersum|ercentile|aired_t)|gennch|binomial_coef))|kew)|harmonic_mean|c(ovariance|df_(n(oncentral_(chisquare|f)|egative_binomial)|c(hisquare|auchy)|t|uniform|poisson|exponential|f|weibull|l(ogistic|aplace)|gamma|b(inomial|eta)))|den(s_(n(ormal|egative_binomial)|c(hisquare|auchy)|t|pmf_(hypergeometric|poisson|binomial)|exponential|f|weibull|l(ogistic|aplace)|gamma|beta)|_uniform)|variance|kurtosis|absolute_deviation|rand_(setall|phrase_to_seeds|ranf|ge(n_(no(ncen(tral_([tf])|ral_chisquare)|rmal)|chisquare|t|i(nt|uniform|poisson|binomial(_negative)?)|exponential|f(uniform)?|gamma|beta)|t_seeds)))\\b",
           "name": "support.function.stats.php"
         },
         {
@@ -2154,7 +2133,7 @@
           "name": "support.function.tokenizer.php"
         },
         {
-          "match": "(?i)\\btrader_(s(t(och(f|rsi)?|ddev)|in(h)?|u(m|b)|et_(compat|unstable_period)|qrt|ar(ext)?|ma)|ht_(sine|trend(line|mode)|dcp(hase|eriod)|phasor)|natr|c(ci|o(s(h)?|rrel)|dl(s(ho(otingstar|rtline)|t(icksandwich|alledpattern)|pinningtop|eparatinglines)|h(i(kkake(mod)?|ghwave)|omingpigeon|a(ngingman|rami(cross)?|mmer))|c(o(ncealbabyswall|unterattack)|losingmarubozu)|t(hrusting|a(sukigap|kuri)|ristar)|i(n(neck|vertedhammer)|dentical3crows)|2crows|onneck|d(oji(star)?|arkcloudcover|ragonflydoji)|u(nique3river|psidegap2crows)|3(starsinsouth|inside|outside|whitesoldiers|linestrike|blackcrows)|piercing|e(ngulfing|vening(star|dojistar))|kicking(bylength)?|l(ongl(ine|eggeddoji)|adderbottom)|a(dvanceblock|bandonedbaby)|ri(sefall3methods|ckshawman)|g(apsidesidewhite|ravestonedoji)|xsidegap3methods|m(orning(star|dojistar)|a(t(hold|chinglow)|rubozu))|b(elthold|reakaway))|eil|mo)|t(sf|ypprice|3|ema|an(h)?|r(i(x|ma)|ange))|obv|d(iv|ema|x)|ultosc|p(po|lus_d(i|m))|e(rrno|xp|ma)|var|kama|floor|w(clprice|illr|ma)|l(n|inearreg(_(slope|intercept|angle))?|og10)|a(sin|cos|t(an|r)|d(osc|d|x(r)?)?|po|vgprice|roon(osc)?)|r(si|oc(p|r(100)?)?)|get_(compat|unstable_period)|m(i(n(index|us_d(i|m)|max(index)?)?|dp(oint|rice))|om|ult|edprice|fi|a(cd(ext|fix)?|vp|x(index)?|ma)?)|b(op|eta|bands))\\b",
+          "match": "(?i)\\btrader_(s(t(och(f|rsi)?|ddev)|in(h)?|u([mb])|et_(compat|unstable_period)|qrt|ar(ext)?|ma)|ht_(sine|trend(line|mode)|dcp(hase|eriod)|phasor)|natr|c(ci|o(s(h)?|rrel)|dl(s(ho(otingstar|rtline)|t(icksandwich|alledpattern)|pinningtop|eparatinglines)|h(i(kkake(mod)?|ghwave)|omingpigeon|a(ngingman|rami(cross)?|mmer))|c(o(ncealbabyswall|unterattack)|losingmarubozu)|t(hrusting|a(sukigap|kuri)|ristar)|i(n(neck|vertedhammer)|dentical3crows)|2crows|onneck|d(oji(star)?|arkcloudcover|ragonflydoji)|u(nique3river|psidegap2crows)|3(starsinsouth|inside|outside|whitesoldiers|linestrike|blackcrows)|piercing|e(ngulfing|vening(star|dojistar))|kicking(bylength)?|l(ongl(ine|eggeddoji)|adderbottom)|a(dvanceblock|bandonedbaby)|ri(sefall3methods|ckshawman)|g(apsidesidewhite|ravestonedoji)|xsidegap3methods|m(orning(star|dojistar)|a(t(hold|chinglow)|rubozu))|b(elthold|reakaway))|eil|mo)|t(sf|ypprice|3|ema|an(h)?|r(i(x|ma)|ange))|obv|d(iv|ema|x)|ultosc|p(po|lus_d([im]))|e(rrno|xp|ma)|var|kama|floor|w(clprice|illr|ma)|l(n|inearreg(_(slope|intercept|angle))?|og10)|a(sin|cos|t(an|r)|d(osc|d|x(r)?)?|po|vgprice|roon(osc)?)|r(si|oc(p|r(100)?)?)|get_(compat|unstable_period)|m(i(n(index|us_d([im])|max(index)?)?|dp(oint|rice))|om|ult|edprice|fi|a(cd(ext|fix)?|vp|x(index)?|ma)?)|b(op|eta|bands))\\b",
           "name": "support.function.trader.php"
         },
         {
@@ -2281,7 +2260,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*?\\b",
+          "match": "(\\$+)[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*?\\b",
           "name": "variable.other.php"
         }
       ]
@@ -2292,7 +2271,7 @@
           "name": "punctuation.definition.variable.php"
         }
       },
-      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg(v|c))\\b",
+      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg([vc]))\\b",
       "name": "variable.other.global.php"
     },
     "var_global_safer": {
@@ -2345,8 +2324,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "comment": "Simple syntax: $foo, $foo[0], $foo[$bar], $foo->bar",
-          "match": "((\\$)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))(?:(->)(\\g<name>)|(\\[)(?:(\\d+)|((\\$)\\g<name>)|(\\w+))(\\]))?"
+          "match": "((\\$)(?<name>[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*))(?:(->)(\\g<name>)|(\\[)(?:(\\d+)|((\\$)\\g<name>)|(\\w+))(]))?"
         },
         {
           "captures": {
@@ -2360,8 +2338,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "comment": "Simple syntax with braces: \"foo${bar}baz\"",
-          "match": "((\\$\\{)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\}))"
+          "match": "((\\$\\{)(?<name>[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)(}))"
         }
       ]
     },
@@ -2377,13 +2354,13 @@
           "include": "#var_basic"
         },
         {
-          "begin": "(\\$\\{)(?=.*?\\})",
+          "begin": "(\\$\\{)(?=.*?})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.variable.php"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.variable.php"
@@ -2398,11 +2375,10 @@
       ]
     },
     "xhp": {
-      "comment": "Avoid < operator expressions as best we can using Zertosh's regex",
       "patterns": [
         {
           "applyEndPatternLast": 1,
-          "begin": "(?<=\\(|\\{|\\[|,|&&|\\|\\||\\?|:|=|=>|\\Wreturn|^return|^)\\s*(?=<[_\\p{L}])",
+          "begin": "(?<=[({\\[,]|&&|\\|\\||[?:=]|=>|\\Wreturn|^return|^)\\s*(?=<[_\\p{L}])",
           "contentName": "source.xhp",
           "end": "(?=.)",
           "patterns": [
@@ -2416,8 +2392,7 @@
     "xhp-assignment": {
       "patterns": [
         {
-          "comment": "look for attribute assignment",
-          "match": "=(?=\\s*(?:'|\"|{|/\\*|<|//|\\n))",
+          "match": "=(?=\\s*(?:['\"{]|/\\*|<|//|\\n))",
           "name": "keyword.operator.assignment.xhp"
         }
       ]
@@ -2430,8 +2405,7 @@
               "name": "entity.other.attribute-name.xhp"
             }
           },
-          "comment": "look for attribute name",
-          "match": "(?<!\\S)([_\\p{L}](?:[\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}-](?<!\\.\\.))*+)(?<!\\.)(?=//|/\\*|=|\\s|>|/>)"
+          "match": "(?<!\\S)([_\\p{L}](?:[\\p{L}\\p{Mn}\\p{Mc}\\d\\p{Nl}\\p{Pc}-](?<!\\.\\.))*+)(?<!\\.)(?=//|/\\*|[=\\s>]|/>)"
         }
       ]
     },
@@ -2452,18 +2426,16 @@
               "name": "punctuation.definition.entity.xhp"
             }
           },
-          "comment": "Embeded HTML entities &blah",
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)"
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)"
         },
         {
-          "comment": "Entity with & and invalid name",
           "match": "&\\S*;",
           "name": "invalid.illegal.bad-ampersand.xhp"
         }
       ]
     },
     "xhp-evaluated-code": {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.embedded.begin.xhp"
@@ -2567,7 +2539,7 @@
     "xhp-tag-element-name": {
       "patterns": [
         {
-          "begin": "\\s*(<)([_\\p{L}](?:[:\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}-])*+)(?=[/>\\s])(?<![\\:])",
+          "begin": "\\s*(<)([_\\p{L}][:\\p{L}\\p{Mn}\\p{Mc}\\d\\p{Nl}\\p{Pc}-]*+)(?=[/>\\s])(?<!:)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.xhp"
@@ -2576,7 +2548,6 @@
               "name": "entity.name.tag.open.xhp"
             }
           },
-          "comment": "Tags that end > are trapped in #xhp-tag-termination",
           "end": "\\s*(?<=</)(\\2)(>)|(/>)|((?<=</)[\\S ]*?)>",
           "endCaptures": {
             "1": {
@@ -2618,7 +2589,6 @@
               "name": "XHPStartTagEnd"
             }
           },
-          "comment": "uses non consuming search for </ in </tag>",
           "end": "(</)",
           "endCaptures": {
             "0": {
diff --git a/resources/languages/haml.json b/resources/languages/haml.json
index 6faaefe..8bfd8a5 100644
--- a/resources/languages/haml.json
+++ b/resources/languages/haml.json
@@ -4,7 +4,7 @@
     "haml",
     "html.haml"
   ],
-  "foldingStartMarker": "^\\s*([-%#\\:\\.\\w\\=].*)\\s$",
+  "foldingStartMarker": "^\\s*([-%#:.\\w=].*)\\s$",
   "foldingStopMarker": "^\\s*$",
   "name": "haml",
   "patterns": [
@@ -73,11 +73,11 @@
           "name": "punctuation.section.comment.haml"
         }
       },
-      "match": "^(\\s*)(\\/\\[[^\\]].*?$\\n?)",
+      "match": "^(\\s*)(/\\[[^\\]].*?$\\n?)",
       "name": "comment.line.slash.haml"
     },
     {
-      "begin": "^(\\s*)(\\-\\#|\\/|\\-\\s*\\/\\*+)",
+      "begin": "^(\\s*)(-#|/|-\\s*/\\*+)",
       "beginCaptures": {
         "2": {
           "name": "punctuation.section.comment.haml"
@@ -92,7 +92,7 @@
       ]
     },
     {
-      "begin": "^\\s*(?:((%)([-\\w:]+))|(?=\\.|#))",
+      "begin": "^\\s*(?:((%)([-\\w:]+))|(?=[.#]))",
       "captures": {
         "1": {
           "name": "meta.tag.haml"
@@ -104,7 +104,7 @@
           "name": "entity.name.tag.haml"
         }
       },
-      "end": "$|(?!\\.|#|\\{|\\(|\\[|&amp;|=|-|~|!=|&=|/)",
+      "end": "$|(?![.#{(\\[]|&amp;|[=\\-~]|!=|&=|/)",
       "patterns": [
         {
           "begin": "==",
@@ -122,7 +122,7 @@
               "name": "entity.other.attribute-name.class"
             }
           },
-          "match": "(\\.[\\w\\-\\:]+)",
+          "match": "(\\.[\\w\\-:]+)",
           "name": "meta.selector.css"
         },
         {
@@ -135,8 +135,8 @@
           "name": "meta.selector.css"
         },
         {
-          "begin": "(?<!\\#)\\{(?=.*(,|(do)|\\{|\\}|\\||(\\#.*)|\\R)\\s*)",
-          "end": "\\s*\\}(?!\\s*\\,)(?!\\s*\\|)(?!\\#\\{.*\\})",
+          "begin": "(?<!#)\\{(?=.*(,|(do)|[{}|]|(#.*)|\\R)\\s*)",
+          "end": "\\s*}(?!\\s*,)(?!\\s*\\|)(?!#\\{.*})",
           "name": "meta.section.attributes.haml",
           "patterns": [
             {
@@ -160,7 +160,7 @@
               "name": "constant.other.symbol.ruby"
             },
             {
-              "match": "\\=",
+              "match": "=",
               "name": "punctuation"
             },
             {
@@ -186,8 +186,8 @@
           ]
         },
         {
-          "begin": "\\[(?=.+(,|\\[|\\]|\\||(\\#.*))\\s*)",
-          "end": "\\s*\\](?!.*(?!\\#\\[)\\])",
+          "begin": "\\[(?=.+([,\\[\\]|]|(#.*))\\s*)",
+          "end": "\\s*](?!.*(?!#\\[)])",
           "name": "meta.section.object.haml",
           "patterns": [
             {
@@ -234,7 +234,7 @@
       ]
     },
     {
-      "begin": "^(\\s*):(style|sass)$",
+      "begin": "^(\\s*):(s(?:tyle|ass))$",
       "end": "^(?=\\1\\s+|$\\n*)",
       "name": "source.sass.embedded.filter.haml",
       "patterns": [
@@ -294,7 +294,7 @@
       ]
     },
     {
-      "begin": "^(\\s*):(styles|sass)$",
+      "begin": "^(\\s*):(s(?:tyles|ass))$",
       "end": "^(?=\\1\\s+|$\\n*)",
       "name": "source.sass.embedded.filter.haml",
       "patterns": [
@@ -322,7 +322,7 @@
       "match": "^\\s*(\\.)"
     },
     {
-      "begin": "^\\s*(?==|-|~|!=|&=)",
+      "begin": "^\\s*(?=[=\\-~]|!=|&=)",
       "end": "$",
       "patterns": [
         {
@@ -429,7 +429,7 @@
               "name": "source.ruby.embedded.source.empty"
             }
           },
-          "match": "#\\{(\\})",
+          "match": "#\\{(})",
           "name": "source.ruby.embedded.source"
         },
         {
@@ -439,7 +439,7 @@
               "name": "punctuation.section.embedded.ruby"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "name": "source.ruby.embedded.source",
           "patterns": [
             {
@@ -478,7 +478,7 @@
               "name": "punctuation.section.scope.ruby"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#nest_curly_and_self"
@@ -491,7 +491,7 @@
       ]
     },
     "rubyline": {
-      "begin": "(&amp|!)?(=|-|~)",
+      "begin": "(&amp|!)?([=\\-~])",
       "contentName": "source.ruby.embedded.haml",
       "end": "((do|\\{)( \\|[.*]+\\|)?)$|$|^(?!.*\\|\\s*)$\\n?",
       "endCaptures": {
@@ -510,7 +510,7 @@
               "name": "keyword.control.php"
             }
           },
-          "match": "\\s+((elseif|foreach|switch|declare|default|use))(?=\\s|\\()"
+          "match": "\\s+((elseif|foreach|switch|declare|default|use))(?=[\\s(])"
         },
         {
           "captures": {
@@ -518,10 +518,10 @@
               "name": "keyword.control.import.include.php"
             }
           },
-          "match": "\\s+(require_once|include_once)(?=\\s|\\()"
+          "match": "\\s+(require_once|include_once)(?=[\\s(])"
         },
         {
-          "match": "\\s+(catch|try|throw|exception|finally|die)(?=\\s|\\(|\\n*)",
+          "match": "\\s+(catch|try|throw|exception|finally|die)(?=[\\s(]|\\n*)",
           "name": "keyword.control.exception.php"
         },
         {
@@ -541,7 +541,7 @@
           "match": "\\s+(use\\s*)((?=\\())"
         },
         {
-          "match": "(\\||,|<|do|\\{)\\s*(\\#.*)?$\\n*",
+          "match": "([|,<]|do|\\{)\\s*(#.*)?$\\n*",
           "name": "source.ruby",
           "patterns": [
             {
@@ -550,7 +550,6 @@
           ]
         },
         {
-          "comment": "Hack to let ruby comments work in this context properly",
           "match": "#.*$",
           "name": "comment.line.number-sign.ruby"
         },
diff --git a/resources/languages/handlebars.json b/resources/languages/handlebars.json
index 4f62a59..c45d2c0 100644
--- a/resources/languages/handlebars.json
+++ b/resources/languages/handlebars.json
@@ -41,7 +41,7 @@
       "patterns": [
         {
           "begin": "\\{\\{!--",
-          "end": "--\\}\\}",
+          "end": "--}}",
           "name": "comment.block.handlebars",
           "patterns": [
             {
@@ -72,7 +72,7 @@
       ]
     },
     "block_helper": {
-      "begin": "(\\{\\{)(~?\\#)([-a-zA-Z0-9_\\./>]+)\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*",
+      "begin": "(\\{\\{)(~?#)([-a-zA-Z0-9_./>]+)\\s?(@?[-a-zA-Z0-9_./]+)*\\s?(@?[-a-zA-Z0-9_./]+)*\\s?(@?[-a-zA-Z0-9_./]+)*",
       "beginCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -96,7 +96,7 @@
           "name": "support.constant.handlebars"
         }
       },
-      "end": "(~?\\}\\})",
+      "end": "(~?}})",
       "endCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -116,7 +116,7 @@
       "patterns": [
         {
           "begin": "\\{\\{!",
-          "end": "\\}\\}",
+          "end": "}}",
           "name": "comment.block.handlebars",
           "patterns": [
             {
@@ -147,7 +147,7 @@
       ]
     },
     "else_token": {
-      "begin": "(\\{\\{)(~?else)(@?\\s(if)\\s([-a-zA-Z0-9_\\.\\(\\s\\)/]+))?",
+      "begin": "(\\{\\{)(~?else)(@?\\s(if)\\s([-a-zA-Z0-9_.(\\s)/]+))?",
       "beginCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -162,7 +162,7 @@
           "name": "variable.parameter.handlebars"
         }
       },
-      "end": "(~?\\}\\}\\}*)",
+      "end": "(~?}}}*)",
       "endCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -171,7 +171,7 @@
       "name": "meta.function.inline.else.handlebars"
     },
     "end_block": {
-      "begin": "(\\{\\{)(~?/)([a-zA-Z0-9/_\\.-]+)\\s*",
+      "begin": "(\\{\\{)(~?/)([a-zA-Z0-9/_.-]+)\\s*",
       "beginCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -183,7 +183,7 @@
           "name": "support.constant.handlebars keyword.control"
         }
       },
-      "end": "(~?\\}\\})",
+      "end": "(~?}})",
       "endCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -204,7 +204,7 @@
               "name": "punctuation.definition.entity.html"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html"
         },
         {
@@ -224,7 +224,7 @@
     "extends": {
       "patterns": [
         {
-          "begin": "(\\{\\{!<)\\s([-a-zA-Z0-9_\\./]+)",
+          "begin": "(\\{\\{!<)\\s([-a-zA-Z0-9_./]+)",
           "beginCaptures": {
             "1": {
               "name": "support.function.handlebars"
@@ -233,7 +233,7 @@
               "name": "support.class.handlebars"
             }
           },
-          "end": "(\\}\\})",
+          "end": "(}})",
           "endCaptures": {
             "1": {
               "name": "support.function.handlebars"
@@ -254,23 +254,23 @@
       ]
     },
     "handlebars_attribute_name": {
-      "begin": "\\b([-a-zA-Z0-9_\\.]+)\\b=",
+      "begin": "\\b([-a-zA-Z0-9_.]+)\\b=",
       "captures": {
         "1": {
           "name": "variable.parameter.handlebars"
         }
       },
-      "end": "(?='|\"|)",
+      "end": "(?=['\"]|)",
       "name": "entity.other.attribute-name.handlebars"
     },
     "handlebars_attribute_value": {
-      "begin": "([-a-zA-Z0-9_\\./]+)\\b",
+      "begin": "([-a-zA-Z0-9_./]+)\\b",
       "captures": {
         "1": {
           "name": "variable.parameter.handlebars"
         }
       },
-      "end": "('|\"|)",
+      "end": "(['\"]|)",
       "name": "entity.other.attribute-value.handlebars",
       "patterns": [
         {
@@ -517,7 +517,7 @@
           ]
         },
         {
-          "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)",
+          "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|[qs]|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.html"
@@ -584,7 +584,7 @@
       ]
     },
     "inline_script": {
-      "begin": "(?:^\\s+)?(<)((?i:script))\\b(?:.*(type)=([\"'](?:text/x-handlebars-template|text/x-handlebars|text/template|x-tmpl-handlebars)[\"']))(?![^>]*/>)",
+      "begin": "(?:^\\s+)?(<)((?i:script))\\b.*(type)=([\"'](?:text/x-handlebars-template|text/x-handlebars|text/template|x-tmpl-handlebars)[\"'])(?![^>]*/>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.html"
@@ -651,7 +651,7 @@
       ]
     },
     "partial_and_var": {
-      "begin": "(\\{\\{~?\\{*(>|!<)*)\\s*(@?[-a-zA-Z0-9$_\\./]+)*",
+      "begin": "(\\{\\{~?\\{*(>|!<)*)\\s*(@?[-a-zA-Z0-9$_./]+)*",
       "beginCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -660,7 +660,7 @@
           "name": "variable.parameter.handlebars"
         }
       },
-      "end": "(~?\\}\\}\\}*)",
+      "end": "(~?}}}*)",
       "endCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -803,7 +803,7 @@
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?<='|\"|)",
+      "end": "(?<=['\"]|)",
       "name": "entity.other.attribute-name.html",
       "patterns": [
         {
@@ -821,7 +821,7 @@
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?<='|\"|)",
+      "end": "(?<=['\"]|)",
       "name": "meta.attribute-with-value.id.html",
       "patterns": [
         {
diff --git a/resources/languages/haskell.json b/resources/languages/haskell.json
index 31cf945..5fa7642 100644
--- a/resources/languages/haskell.json
+++ b/resources/languages/haskell.json
@@ -23,7 +23,7 @@
       "include": "#char_literal"
     },
     {
-      "match": "(?<!@|#)-\\}",
+      "match": "(?<![@#])-}",
       "name": "invalid"
     },
     {
@@ -95,7 +95,7 @@
           "name": "punctuation.bracket.haskell"
         }
       },
-      "match": "(\\[)\\s*(\\])",
+      "match": "(\\[)\\s*(])",
       "name": "constant.language.empty-list.haskell"
     },
     {
@@ -136,7 +136,7 @@
           "name": "keyword.other.class.haskell"
         }
       },
-      "end": "(?=(?<!')\\bwhere\\b(?!'))|(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=(?<!')\\bwhere\\b(?!'))|(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.declaration.class.haskell",
       "patterns": [
         {
@@ -151,7 +151,7 @@
       ]
     },
     {
-      "begin": "^(\\s*)(data|newtype)(?:\\s+(instance))?\\s+((?:(?!(?:(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:=|--+)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))|(?:\\b(?<!')(?:where|deriving)\\b(?!'))|{-).)*)(?=\\b(?<!'')where\\b(?!''))",
+      "begin": "^(\\s*)(data|newtype)(?:\\s+(instance))?\\s+((?:(?!(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(?:=|--+)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])|\\b(?<!')(?:where|deriving)\\b(?!')|\\{-).)*)(?=\\b(?<!'')where\\b(?!''))",
       "beginCaptures": {
         "2": {
           "name": "keyword.other.$2.haskell"
@@ -167,7 +167,7 @@
           ]
         }
       },
-      "end": "(?=(?<!')\\bderiving\\b(?!'))|(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=(?<!')\\bderiving\\b(?!'))|(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.declaration.$2.generalized.haskell",
       "patterns": [
         {
@@ -183,7 +183,7 @@
               "name": "punctuation.brace.haskell"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.brace.haskell"
@@ -218,7 +218,7 @@
       "include": "#role_annotation"
     },
     {
-      "begin": "^(\\s*)(pattern)\\s+(.*?)\\s+(::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])",
+      "begin": "^(\\s*)(pattern)\\s+(.*?)\\s+(::|∷)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])",
       "beginCaptures": {
         "2": {
           "name": "keyword.other.pattern.haskell"
@@ -237,7 +237,7 @@
           "name": "keyword.operator.double-colon.haskell"
         }
       },
-      "end": "(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.declaration.pattern.type.haskell",
       "patterns": [
         {
@@ -252,7 +252,7 @@
           "name": "keyword.other.pattern.haskell"
         }
       },
-      "end": "(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.declaration.pattern.haskell",
       "patterns": [
         {
@@ -261,7 +261,7 @@
       ]
     },
     {
-      "begin": "^(\\s*)(data|newtype)(?:\\s+(family|instance))?\\s+(((?!(?:(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:=|--+)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))|(?:\\b(?<!')(?:where|deriving)\\b(?!'))|{-).)*)",
+      "begin": "^(\\s*)(data|newtype)(?:\\s+(family|instance))?\\s+(((?!(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(?:=|--+)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])|\\b(?<!')(?:where|deriving)\\b(?!')|\\{-).)*)",
       "beginCaptures": {
         "2": {
           "name": "keyword.other.$2.haskell"
@@ -277,7 +277,7 @@
           ]
         }
       },
-      "end": "(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.declaration.$2.algebraic.haskell",
       "patterns": [
         {
@@ -304,7 +304,7 @@
       ]
     },
     {
-      "begin": "^(\\s*)(type)\\s+(family)\\b(?!')(((?!(?:(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:=|--+)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))|\\b(?<!')where\\b(?!')|{-).)*)",
+      "begin": "^(\\s*)(type)\\s+(family)\\b(?!')(((?!(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(?:=|--+)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])|\\b(?<!')where\\b(?!')|\\{-).)*)",
       "beginCaptures": {
         "2": {
           "name": "keyword.other.type.haskell"
@@ -326,7 +326,7 @@
           ]
         }
       },
-      "end": "(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.declaration.type.family.haskell",
       "patterns": [
         {
@@ -341,7 +341,7 @@
       ]
     },
     {
-      "begin": "^(\\s*)(type)(?:\\s+(instance))?\\s+(((?!(?:(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:=|--+|::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))|{-).)*)",
+      "begin": "^(\\s*)(type)(?:\\s+(instance))?\\s+(((?!(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(?:=|--+|::|∷)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])|\\{-).)*)",
       "beginCaptures": {
         "2": {
           "name": "keyword.other.type.haskell"
@@ -357,7 +357,7 @@
           ]
         }
       },
-      "end": "(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.declaration.type.haskell",
       "patterns": [
         {
@@ -372,7 +372,7 @@
           "name": "keyword.other.instance.haskell"
         }
       },
-      "end": "(?=\\b(?<!')(where)\\b(?!'))|(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=\\b(?<!')(where)\\b(?!'))|(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.declaration.instance.haskell",
       "patterns": [
         {
@@ -393,7 +393,7 @@
           "name": "keyword.other.import.haskell"
         }
       },
-      "end": "(?=\\b(?<!')(where)\\b(?!'))|(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=\\b(?<!')(where)\\b(?!'))|(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.import.haskell",
       "patterns": [
         {
@@ -536,7 +536,7 @@
           "name": "punctuation.bracket.haskell"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.bracket.haskell"
@@ -562,7 +562,7 @@
           "include": "#comment_like"
         },
         {
-          "begin": "(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:(=)|(\\|))(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])",
+          "begin": "(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(?:(=)|(\\|))(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.eq.haskell"
@@ -571,7 +571,7 @@
               "name": "keyword.operator.pipe.haskell"
             }
           },
-          "end": "(?:\\G|^)\\s*(?:(?:(?<!')\\b((?:[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'\\.])+)|('?(?<paren>\\((?:[^\\(\\)]*|\\g<paren>)*\\)))|('?(?<brac>\\((?:[^\\[\\]]*|\\g<brac>)*\\])))\\s*(?:(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(:[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]*)|(`)([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)(`)))|(?:(?<!')\\b([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))|(\\()\\s*(:[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]*)\\s*(\\))",
+          "end": "(?:\\G|^)\\s*(?:(?<!')\\b([\\p{Ll}_\\p{Lu}\\p{Lt}\\d'.]+)|('?(?<paren>\\((?:[^()]?|\\g<paren>)*\\)))|('?(?<brac>\\((?:[^\\[\\]]?|\\g<brac>)*])))\\s*(?:(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(:[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]*)|(`)([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)(`))|(?<!')\\b([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)|(\\()\\s*(:[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]*)\\s*(\\))",
           "endCaptures": {
             "1": {
               "patterns": [
@@ -647,7 +647,7 @@
           "name": "punctuation.definition.comment.haskell"
         }
       },
-      "end": "-\\}",
+      "end": "-}",
       "name": "comment.block.haskell",
       "patterns": [
         {
@@ -676,7 +676,7 @@
           "name": "punctuation.definition.string.end.haskell"
         }
       },
-      "match": "(?<![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(')(?:[\\ -\\[\\]-~]|(\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\\\&]))|(\\\\o[0-7]+)|(\\\\x[0-9A-Fa-f]+)|(\\\\\\^[A-Z@\\[\\]\\\\\\^_]))(')",
+      "match": "(?<![\\p{Ll}_\\p{Lu}\\p{Lt}\\d'])(')(?:[ -\\[\\]-~]|(\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\"'\\&]))|(\\\\o[0-7]+)|(\\\\x\\h+)|(\\\\\\^[A-Z@\\[\\]\\\\^_]))(')",
       "name": "string.quoted.single.haskell"
     },
     "comma": {
@@ -699,17 +699,17 @@
     "comments": {
       "patterns": [
         {
-          "begin": "^(\\s*)(--\\s[\\|\\$])",
+          "begin": "^(\\s*)(--\\s[|$])",
           "beginCaptures": {
             "2": {
               "name": "punctuation.whitespace.comment.leading.haskell"
             }
           },
-          "end": "(?=^(?!\\1--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])))",
+          "end": "(?=^(?!\\1--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])))",
           "name": "comment.block.documentation.haskell"
         },
         {
-          "begin": "(^[ \\t]+)?(--\\s[\\^\\*])",
+          "begin": "(^[ \\t]+)?(--\\s[\\^*])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.whitespace.comment.leading.haskell"
@@ -720,13 +720,13 @@
         },
         {
           "applyEndPatternLast": 1,
-          "begin": "\\{-\\s?[\\|\\$\\*\\^]",
+          "begin": "\\{-\\s?[|$*^]",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.haskell"
             }
           },
-          "end": "-\\}",
+          "end": "-}",
           "name": "comment.block.documentation.haskell",
           "patterns": [
             {
@@ -735,13 +735,12 @@
           ]
         },
         {
-          "begin": "(^[ \\t]+)?(?=--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))",
+          "begin": "(^[ \\t]+)?(?=--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.whitespace.comment.leading.haskell"
             }
           },
-          "comment": "Operators may begin with '--' as long as they are not entirely composed of '-' characters. This means comments can't be immediately followed by an allowable operator character.",
           "end": "(?!\\G)",
           "patterns": [
             {
@@ -777,7 +776,7 @@
           "name": "keyword.operator.big-arrow.haskell"
         }
       },
-      "match": "(.*)(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(=>|⇒)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])"
+      "match": "(.*)(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(=>|⇒)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])"
     },
     "cpp": {
       "captures": {
@@ -785,12 +784,11 @@
           "name": "punctuation.definition.preprocessor.c"
         }
       },
-      "comment": "In addition to Haskell's \"native\" syntax, GHC permits the C preprocessor to be run on a source file.",
       "match": "^(#).*$",
       "name": "meta.preprocessor.c"
     },
     "data_constructor": {
-      "match": "\\b(?<!')[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?![\\.'\\w])",
+      "match": "\\b(?<!')[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?![.'\\w])",
       "name": "constant.other.haskell"
     },
     "deriving": {
@@ -805,7 +803,7 @@
               "name": "keyword.other.deriving.strategy.$3.haskell"
             }
           },
-          "end": "(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+          "end": "(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
           "name": "meta.deriving.haskell",
           "patterns": [
             {
@@ -880,7 +878,7 @@
               ]
             }
           },
-          "match": "(deriving)(?:\\s+(stock|newtype|anyclass))?\\s+([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)(\\s+(via)\\s+(.*)$)?",
+          "match": "(deriving)(?:\\s+(stock|newtype|anyclass))?\\s+([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)(\\s+(via)\\s+(.*)$)?",
           "name": "meta.deriving.haskell"
         },
         {
@@ -895,7 +893,7 @@
           "name": "keyword.operator.double-colon.haskell"
         }
       },
-      "match": "\\s*(::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])\\s*"
+      "match": "\\s*(::|∷)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])\\s*"
     },
     "export_constructs": {
       "patterns": [
@@ -909,7 +907,7 @@
               "name": "keyword.other.pattern.haskell"
             }
           },
-          "end": "([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)|(\\()\\s*(:[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\))",
+          "end": "([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)|(\\()\\s*(:[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\))",
           "endCaptures": {
             "1": {
               "name": "constant.other.haskell"
@@ -937,7 +935,7 @@
               "name": "keyword.other.type.haskell"
             }
           },
-          "end": "([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)|(\\()\\s*([\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\))",
+          "end": "([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)|(\\()\\s*([[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\))",
           "endCaptures": {
             "1": {
               "name": "storage.type.haskell"
@@ -959,11 +957,11 @@
           ]
         },
         {
-          "match": "(?<!')\\b[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*",
+          "match": "(?<!')\\b[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*",
           "name": "entity.name.function.haskell"
         },
         {
-          "match": "(?<!')\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*",
+          "match": "(?<!')\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*",
           "name": "storage.type.haskell"
         },
         {
@@ -987,7 +985,7 @@
           "name": "keyword.other.$3.haskell"
         }
       },
-      "end": "(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.$3.foreign.haskell",
       "patterns": [
         {
@@ -1002,8 +1000,8 @@
           "match": "\\b(?<!')(ccall|cplusplus|dotnet|jvm|stdcall|prim|capi)\\s+"
         },
         {
-          "begin": "(?=\")|(?=\\b(?<!')([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)\\b(?!'))",
-          "end": "(?=(::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))",
+          "begin": "(?=\")|(?=\\b(?<!')([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\\b(?!'))",
+          "end": "(?=(::|∷)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]))",
           "patterns": [
             {
               "include": "#comment_like"
@@ -1028,7 +1026,7 @@
                   "name": "entity.name.function.infix.haskell"
                 }
               },
-              "match": "\\b(?<!')(safe|unsafe|interruptible)\\b(?!')\\s*(\"(?:\\\\\"|[^\"])*\")?\\s*(?:(?:\\b(?<!'')([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)\\b(?!'))|(?:\\(\\s*(?!--+\\))([\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+)\\s*\\)))"
+              "match": "\\b(?<!')(safe|unsafe|interruptible)\\b(?!')\\s*(\"(?:\\\\\"|[^\"])*\")?\\s*(?:\\b(?<!'')([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\\b(?!')|\\(\\s*(?!--+\\))([[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+)\\s*\\))"
             },
             {
               "captures": {
@@ -1074,7 +1072,7 @@
                   "name": "punctuation.paren.haskell"
                 }
               },
-              "match": "(?:\\b(?<!'')([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)\\b(?!'))|(?:(\\()\\s*(?!--+\\))([\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\)))"
+              "match": "\\b(?<!'')([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\\b(?!')|(\\()\\s*(?!--+\\))([[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\))"
             }
           ]
         },
@@ -1095,8 +1093,7 @@
           "name": "constant.numeric.floating.hexadecimal.haskell"
         }
       },
-      "comment": "Floats are decimal or hexadecimal",
-      "match": "\\b(?<!')(?:([0-9][_0-9]*\\.[0-9][_0-9]*(?:[eE][-+]?[0-9][_0-9]*)?|[0-9][_0-9]*[eE][-+]?[0-9][_0-9]*)|(0[xX]_*[0-9a-fA-F][_0-9a-fA-F]*\\.[0-9a-fA-F][_0-9a-fA-F]*(?:[pP][-+]?[0-9][_0-9]*)?|0[xX]_*[0-9a-fA-F][_0-9a-fA-F]*[pP][-+]?[0-9][_0-9]*))\\b(?!')"
+      "match": "\\b(?<!')(?:([0-9][_0-9]*\\.[0-9][_0-9]*(?:[eE][-+]?[0-9][_0-9]*)?|[0-9][_0-9]*[eE][-+]?[0-9][_0-9]*)|(0(?:[xX]_*\\h[_\\h]*\\.\\h[_\\h]*(?:[pP][-+]?[0-9][_0-9]*)?|[xX]_*\\h[_\\h]*[pP][-+]?[0-9][_0-9]*)))\\b(?!')"
     },
     "forall": {
       "begin": "\\b(?<!')(forall|∀)\\b(?!')",
@@ -1127,7 +1124,7 @@
       ]
     },
     "fun_decl": {
-      "begin": "^(\\s*)(?<fn>(?:[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*\\#*|\\(\\s*(?!--+\\))[\\p{S}\\p{P}&&[^(),:;\\[\\]`{}_\"']][\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]*\\s*\\))(?:\\s*,\\s*\\g<fn>)?)\\s*(?<![\\p{S}\\p{P}&&[^\\),;\\]`}_\"']])(::|∷)(?![\\p{S}\\p{P}&&[^\\(,;\\[`{_\"']])",
+      "begin": "^(\\s*)(?<fn>(?:[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*#*|\\(\\s*(?!--+\\))[[\\p{S}\\p{P}]&&[^(),:;\\[\\]`{}_\"']][[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]*\\s*\\))(?:\\s*,\\s*\\g<fn>)?)\\s*(?<![[\\p{S}\\p{P}]&&[^),;\\]`}_\"']])(::|∷)(?![[\\p{S}\\p{P}]&&[^(,;\\[`{_\"']])",
       "beginCaptures": {
         "2": {
           "name": "entity.name.function.haskell",
@@ -1144,7 +1141,7 @@
           "name": "keyword.operator.double-colon.haskell"
         }
       },
-      "end": "(?=(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])((<-|←)|(=)|(-<|↢)|(-<<|⤛))([(),;\\[\\]`{}_\"']|[^\\p{S}\\p{P}]))|(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+      "end": "(?=(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])((<-|←)|(=)|(-<|↢)|(-<<|⤛))([(),;\\[\\]`{}_\"'[^\\p{S}\\p{P}]]))|(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
       "name": "meta.function.type-declaration.haskell",
       "patterns": [
         {
@@ -1155,7 +1152,7 @@
     "gadt_constructor": {
       "patterns": [
         {
-          "begin": "^(\\s*)(?:(\\b(?<!')[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)|(\\()\\s*(:[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]*)\\s*(\\)))",
+          "begin": "^(\\s*)(?:(\\b(?<!')[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)|(\\()\\s*(:[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]*)\\s*(\\)))",
           "beginCaptures": {
             "2": {
               "name": "constant.other.haskell"
@@ -1170,7 +1167,7 @@
               "name": "punctuation.paren.haskell"
             }
           },
-          "end": "(?=\\b(?<!'')deriving\\b(?!'))|(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+          "end": "(?=\\b(?<!'')deriving\\b(?!'))|(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
           "patterns": [
             {
               "include": "#comment_like"
@@ -1190,7 +1187,7 @@
           ]
         },
         {
-          "begin": "(\\b(?<!')[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}]*)|(\\()\\s*(:[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]*)\\s*(\\))",
+          "begin": "(\\b(?<!')[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d]*)|(\\()\\s*(:[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]*)\\s*(\\))",
           "beginCaptures": {
             "1": {
               "name": "constant.other.haskell"
@@ -1240,8 +1237,7 @@
               "name": "keyword.operator.infix.haskell"
             }
           },
-          "comment": "In case this regex seems overly general, note that Haskell permits  the definition of new operators which can be nearly any string of  punctuation characters, such as $%^&*.\n",
-          "match": "((?:(?<!'')('')?[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'']*\\.)*)(\\#+|[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+(?<!\\#))"
+          "match": "((?:(?<!'')('')?[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*\\.)*)(#+|[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+(?<!#))"
         },
         {
           "captures": {
@@ -1262,8 +1258,7 @@
               "name": "punctuation.backtick.haskell"
             }
           },
-          "comment": "In case this regex seems unusual for an infix operator, note that Haskell\nallows any ordinary function application (elem 4 [1..10]) to be rewritten\nas an infix expression (4 `elem` [1..10]).\n",
-          "match": "(`)((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'']*\\.)*)([\\p{Ll}\\p{Lu}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'']*)(`)",
+          "match": "(`)((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*\\.)*)([\\p{Ll}\\p{Lu}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)(`)",
           "name": "keyword.operator.function.infix.haskell"
         }
       ]
@@ -1275,7 +1270,7 @@
           "name": "punctuation.bracket.haskell"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.bracket.haskell"
@@ -1311,7 +1306,7 @@
           "name": "constant.numeric.integral.binary.haskell"
         }
       },
-      "match": "\\b(?<!')(?:([0-9][_0-9]*)|(0[xX]_*[0-9a-fA-F][_0-9a-fA-F]*)|(0[oO]_*[0-7][_0-7]*)|(0[bB]_*[01][_01]*))\\b(?!')"
+      "match": "\\b(?<!')(?:([0-9][_0-9]*)|(0[xX]_*\\h[_\\h]*)|(0[oO]_*[0-7][_0-7]*)|(0[bB]_*[01][_01]*))\\b(?!')"
     },
     "keyword": {
       "captures": {
@@ -1337,7 +1332,7 @@
           "name": "punctuation.brace.haskell"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.brace.haskell"
@@ -1355,7 +1350,7 @@
     },
     "liquid_haskell": {
       "begin": "\\{-@",
-      "end": "@-\\}",
+      "end": "@-}",
       "name": "block.liquidhaskell.haskell",
       "patterns": [
         {
@@ -1427,7 +1422,7 @@
       ]
     },
     "module_name": {
-      "match": "(?<conid>[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(\\.\\g<conid>)?)",
+      "match": "(?<conid>[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(\\.\\g<conid>)?)",
       "name": "entity.name.namespace.haskell"
     },
     "numeric_literals": {
@@ -1455,24 +1450,24 @@
               ]
             }
           },
-          "match": "(?<![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}\\p{S}\\p{P}&&[^(,;\\[`{]])(\\#)(?:(\"(?:\\\\\"|[^\"])*\")|[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'\\.]+)",
+          "match": "(?<![[\\p{Ll}_\\p{Lu}\\p{Lt}\\d\\p{S}\\p{P}]&&[^(,;\\[`{]])(#)(?:(\"(?:\\\\\"|[^\"])*\")|[\\p{Ll}_\\p{Lu}\\p{Lt}\\d'.]+)",
           "name": "entity.name.label.haskell"
         }
       ]
     },
     "pragma": {
       "begin": "\\{-#",
-      "end": "#-\\}",
+      "end": "#-}",
       "name": "meta.preprocessor.haskell",
       "patterns": [
         {
-          "begin": "(?xi) \\b(?<!')(LANGUAGE)\\b(?!')",
+          "begin": "(?i)\\b(?<!')(LANGUAGE)\\b(?!')",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.preprocessor.pragma.haskell"
             }
           },
-          "end": "(?=#-\\})",
+          "end": "(?=#-})",
           "patterns": [
             {
               "match": "(?:No)?(?:AutoDeriveTypeable|DatatypeContexts|DoRec|IncoherentInstances|MonadFailDesugaring|MonoPatBinds|NullaryTypeClasses|OverlappingInstances|PatternSignatures|RecordPuns|RelaxedPolyRec)",
@@ -1484,7 +1479,7 @@
                   "name": "keyword.other.preprocessor.extension.haskell"
                 }
               },
-              "match": "((?:No)?(?:AllowAmbiguousTypes|AlternativeLayoutRule|AlternativeLayoutRuleTransitional|Arrows|BangPatterns|BinaryLiterals|CApiFFI|CPP|CUSKs|ConstrainedClassMethods|ConstraintKinds|DataKinds|DefaultSignatures|DeriveAnyClass|DeriveDataTypeable|DeriveFoldable|DeriveFunctor|DeriveGeneric|DeriveLift|DeriveTraversable|DerivingStrategies|DerivingVia|DisambiguateRecordFields|DoAndIfThenElse|BlockArguments|DuplicateRecordFields|EmptyCase|EmptyDataDecls|EmptyDataDeriving|ExistentialQuantification|ExplicitForAll|ExplicitNamespaces|ExtendedDefaultRules|FlexibleContexts|FlexibleInstances|ForeignFunctionInterface|FunctionalDependencies|GADTSyntax|GADTs|GHCForeignImportPrim|Generali(?:s|z)edNewtypeDeriving|ImplicitParams|ImplicitPrelude|ImportQualifiedPost|ImpredicativeTypes|TypeFamilyDependencies|InstanceSigs|ApplicativeDo|InterruptibleFFI|JavaScriptFFI|KindSignatures|LambdaCase|LiberalTypeSynonyms|MagicHash|MonadComprehensions|MonoLocalBinds|MonomorphismRestriction|MultiParamTypeClasses|MultiWayIf|NumericUnderscores|NPlusKPatterns|NamedFieldPuns|NamedWildCards|NegativeLiterals|HexFloatLiterals|NondecreasingIndentation|NumDecimals|OverloadedLabels|OverloadedLists|OverloadedStrings|PackageImports|ParallelArrays|ParallelListComp|PartialTypeSignatures|PatternGuards|PatternSynonyms|PolyKinds|PolymorphicComponents|QuantifiedConstraints|PostfixOperators|QuasiQuotes|Rank2Types|RankNTypes|RebindableSyntax|RecordWildCards|RecursiveDo|RelaxedLayout|RoleAnnotations|ScopedTypeVariables|StandaloneDeriving|StarIsType|StaticPointers|Strict|StrictData|TemplateHaskell|TemplateHaskellQuotes|StandaloneKindSignatures|TraditionalRecordSyntax|TransformListComp|TupleSections|TypeApplications|TypeInType|TypeFamilies|TypeOperators|TypeSynonymInstances|UnboxedTuples|UnboxedSums|UndecidableInstances|UndecidableSuperClasses|UnicodeSyntax|UnliftedFFITypes|UnliftedNewtypes|ViewPatterns))"
+              "match": "((?:No)?(?:AllowAmbiguousTypes|AlternativeLayoutRule|AlternativeLayoutRuleTransitional|Arrows|BangPatterns|BinaryLiterals|CApiFFI|CPP|CUSKs|ConstrainedClassMethods|ConstraintKinds|DataKinds|DefaultSignatures|DeriveAnyClass|DeriveDataTypeable|DeriveFoldable|DeriveFunctor|DeriveGeneric|DeriveLift|DeriveTraversable|DerivingStrategies|DerivingVia|DisambiguateRecordFields|DoAndIfThenElse|BlockArguments|DuplicateRecordFields|EmptyCase|EmptyDataDecls|EmptyDataDeriving|ExistentialQuantification|ExplicitForAll|ExplicitNamespaces|ExtendedDefaultRules|FlexibleContexts|FlexibleInstances|ForeignFunctionInterface|FunctionalDependencies|GADTSyntax|GADTs|GHCForeignImportPrim|Generali[sz]edNewtypeDeriving|ImplicitParams|ImplicitPrelude|ImportQualifiedPost|ImpredicativeTypes|TypeFamilyDependencies|InstanceSigs|ApplicativeDo|InterruptibleFFI|JavaScriptFFI|KindSignatures|LambdaCase|LiberalTypeSynonyms|MagicHash|MonadComprehensions|MonoLocalBinds|MonomorphismRestriction|MultiParamTypeClasses|MultiWayIf|NumericUnderscores|NPlusKPatterns|NamedFieldPuns|NamedWildCards|NegativeLiterals|HexFloatLiterals|NondecreasingIndentation|NumDecimals|OverloadedLabels|OverloadedLists|OverloadedStrings|PackageImports|ParallelArrays|ParallelListComp|PartialTypeSignatures|PatternGuards|PatternSynonyms|PolyKinds|PolymorphicComponents|QuantifiedConstraints|PostfixOperators|QuasiQuotes|Rank2Types|RankNTypes|RebindableSyntax|RecordWildCards|RecursiveDo|RelaxedLayout|RoleAnnotations|ScopedTypeVariables|StandaloneDeriving|StarIsType|StaticPointers|Strict|StrictData|TemplateHaskell|TemplateHaskellQuotes|StandaloneKindSignatures|TraditionalRecordSyntax|TransformListComp|TupleSections|TypeApplications|TypeInType|TypeFamilies|TypeOperators|TypeSynonymInstances|UnboxedTuples|UnboxedSums|UndecidableInstances|UndecidableSuperClasses|UnicodeSyntax|UnliftedFFITypes|UnliftedNewtypes|ViewPatterns))"
             },
             {
               "include": "#comma"
@@ -1492,7 +1487,7 @@
           ]
         },
         {
-          "begin": "(?xi)\n  \\b(?<!')(SPECIALI(?:S|Z)E)\n  (?:\n  \\s*( \\[ [^\\[\\]]* \\])?\\s*\n  |\\s+\n  )\n  (instance)\\b(?!')",
+          "begin": "(?i)\\b(?<!')(SPECIALI[SZ]E)(?:\\s*(\\[[^\\[\\]]*])?\\s*|\\s+)(instance)\\b(?!')",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.preprocessor.pragma.haskell"
@@ -1508,7 +1503,7 @@
               "name": "keyword.other.instance.haskell"
             }
           },
-          "end": "(?=#-\\})",
+          "end": "(?=#-})",
           "patterns": [
             {
               "include": "#type_signature"
@@ -1516,7 +1511,7 @@
           ]
         },
         {
-          "begin": "(?xi)\n  \\b(?<!')(SPECIALI(?:S|Z)E)\\b(?!')\n  (?:\\s+(INLINE)\\b(?!'))?\n  (?:\\s*(\\[ [^\\[\\]]* \\])?)\n  \\s*",
+          "begin": "(?i)\\b(?<!')(SPECIALI[SZ]E)\\b(?!')(?:\\s+(INLINE)\\b(?!'))?\\s*(\\[[^\\[\\]]*])?\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.preprocessor.pragma.haskell"
@@ -1532,7 +1527,7 @@
               ]
             }
           },
-          "end": "(?=#-\\})",
+          "end": "(?=#-})",
           "patterns": [
             {
               "include": "$self"
@@ -1540,7 +1535,7 @@
           ]
         },
         {
-          "match": "(?xi) \\b(?<!')\n  (LANGUAGE|OPTIONS_GHC|INCLUDE\n  |MINIMAL|UNPACK|OVERLAPS|INCOHERENT\n  |NOUNPACK|SOURCE|OVERLAPPING|OVERLAPPABLE|INLINE\n  |NOINLINE|INLINE?ABLE|CONLIKE|LINE|COLUMN|RULES\n  |COMPLETE)\\b(?!')",
+          "match": "(?i)\\b(?<!')(LANGUAGE|OPTIONS_GHC|INCLUDE|MINIMAL|UNPACK|OVERLAPS|INCOHERENT|NOUNPACK|SOURCE|OVERLAPPING|OVERLAPPABLE|INLINE|NOINLINE|INLINE?ABLE|CONLIKE|LINE|COLUMN|RULES|COMPLETE)\\b(?!')",
           "name": "keyword.other.preprocessor.haskell"
         },
         {
@@ -1550,7 +1545,7 @@
               "name": "keyword.other.preprocessor.pragma.haskell"
             }
           },
-          "end": "(?=#-\\})",
+          "end": "(?=#-})",
           "patterns": [
             {
               "include": "#string_literal"
@@ -1573,19 +1568,18 @@
               "name": "punctuation.paren.haskell"
             }
           },
-          "comment": "An operator cannot be composed entirely of '-' characters;  instead, it should be matched as a comment.\n",
-          "match": "(\\()\\s*(?!(?:--+|\\.\\.)\\))(\\#+|[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+(?<!\\#))\\s*(\\))"
+          "match": "(\\()\\s*(?!(?:--+|\\.\\.)\\))(#+|[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+(?<!#))\\s*(\\))"
         }
       ]
     },
     "qualifier": {
-      "match": "\\b(?<!')[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*\\.",
+      "match": "\\b(?<!')[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*\\.",
       "name": "entity.name.namespace.haskell"
     },
     "quasi_quote": {
       "patterns": [
         {
-          "begin": "(\\[)(e|d|p)?(\\|\\|?)",
+          "begin": "(\\[)([edp])?(\\|\\|?)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.quasi-quotation.begin.haskell"
@@ -1597,7 +1591,7 @@
               "name": "keyword.operator.quasi-quotation.begin.haskell"
             }
           },
-          "end": "\\3\\]",
+          "end": "\\3]",
           "endCaptures": {
             "0": {
               "name": "keyword.operator.quasi-quotation.end.haskell"
@@ -1623,7 +1617,7 @@
               "name": "keyword.operator.quasi-quotation.begin.haskell"
             }
           },
-          "end": "\\3\\]",
+          "end": "\\3]",
           "endCaptures": {
             "0": {
               "name": "keyword.operator.quasi-quotation.end.haskell"
@@ -1637,7 +1631,7 @@
           ]
         },
         {
-          "begin": "(\\[)(?:(\\$\\$)|(\\$))?((?:[^\\s\\p{S}\\p{P}]|[\\.'_])*)(\\|\\|?)",
+          "begin": "(\\[)(?:(\\$\\$)|(\\$))?([[^\\s\\p{S}\\p{P}].'_]*)(\\|\\|?)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.quasi-quotation.begin.haskell"
@@ -1660,7 +1654,7 @@
               "name": "keyword.operator.quasi-quotation.begin.haskell"
             }
           },
-          "end": "\\5\\]",
+          "end": "\\5]",
           "endCaptures": {
             "0": {
               "name": "keyword.operator.quasi-quotation.end.haskell"
@@ -1671,7 +1665,7 @@
       ]
     },
     "record": {
-      "begin": "({)(?!-)",
+      "begin": "(\\{)(?!-)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.brace.haskell"
@@ -1694,7 +1688,7 @@
       ]
     },
     "record_decl": {
-      "begin": "({)(?!-)",
+      "begin": "(\\{)(?!-)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.brace.haskell"
@@ -1717,7 +1711,7 @@
       ]
     },
     "record_decl_field": {
-      "begin": "(?:([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)|(\\()\\s*([\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\)))",
+      "begin": "(?:([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)|(\\()\\s*([[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\)))",
       "beginCaptures": {
         "1": {
           "name": "variable.other.member.definition.haskell"
@@ -1759,7 +1753,7 @@
     "record_field": {
       "patterns": [
         {
-          "begin": "(?:([\\p{Ll}\\p{Lu}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}\\.']*)|(\\()\\s*([\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\)))",
+          "begin": "(?:([\\p{Ll}\\p{Lu}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d.']*)|(\\()\\s*([[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\)))",
           "beginCaptures": {
             "1": {
               "name": "variable.other.member.haskell",
@@ -1808,7 +1802,7 @@
           "name": "variable.other.member.wildcard.haskell"
         }
       },
-      "match": "(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(\\.\\.)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])"
+      "match": "(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(\\.\\.)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])"
     },
     "reserved_symbol": {
       "patterns": [
@@ -1851,7 +1845,7 @@
               "name": "keyword.operator.arrow.left.tail.double.haskell"
             }
           },
-          "match": "(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"'']])(?:(\\.\\.)|(:)|(=)|(\\\\)|(\\|)|(<-|←)|(->|→)|(-<|↢)|(-<<|⤛)|(>-|⤚)|(>>-|⤜)|(∀))(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"'']])"
+          "match": "(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(?:(\\.\\.)|(:)|(=)|(\\\\)|(\\|)|(<-|←)|(->|→)|(-<|↢)|(-<<|⤛)|(>-|⤚)|(>>-|⤜)|(∀))(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])"
         },
         {
           "captures": {
@@ -1859,7 +1853,7 @@
               "name": "keyword.operator.postfix.hash.haskell"
             }
           },
-          "match": "(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}\\p{S}\\p{P}&&[^\\#,;\\[`{]])(\\#+)(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}\\p{S}\\p{P}&&[^),;\\]`}]])"
+          "match": "(?<=[[\\p{Ll}_\\p{Lu}\\p{Lt}\\d\\p{S}\\p{P}]&&[^#,;\\[`{]])(#+)(?![[\\p{Ll}_\\p{Lu}\\p{Lt}\\d\\p{S}\\p{P}]&&[^),;\\]`}]])"
         },
         {
           "captures": {
@@ -1867,7 +1861,7 @@
               "name": "keyword.operator.infix.tight.at.haskell"
             }
           },
-          "match": "(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}\\)\\}\\]])(@)(?=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}\\(\\[\\{])"
+          "match": "(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\d)}\\]])(@)(?=[\\p{Ll}_\\p{Lu}\\p{Lt}\\d(\\[{])"
         },
         {
           "captures": {
@@ -1887,7 +1881,7 @@
               "name": "keyword.operator.prefix.double-dollar.haskell"
             }
           },
-          "match": "(?<![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}\\p{S}\\p{P}&&[^(,;\\[`{]])(?:(~)|(!)|(-)|(\\$)|(\\$\\$))(?=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}\\(\\{\\[])"
+          "match": "(?<![[\\p{Ll}_\\p{Lu}\\p{Lt}\\d\\p{S}\\p{P}]&&[^(,;\\[`{]])(?:(~)|(!)|(-)|(\\$)|(\\$\\$))(?=[\\p{Ll}_\\p{Lu}\\p{Lt}\\d({\\[])"
         }
       ]
     },
@@ -1903,7 +1897,7 @@
               "name": "keyword.other.role.haskell"
             }
           },
-          "end": "(?=\\}|;)|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$))",
+          "end": "(?=[};])|^(?!\\1\\s+\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$))",
           "name": "meta.role-annotation.haskell",
           "patterns": [
             {
@@ -1927,13 +1921,13 @@
     "start_type_signature": {
       "patterns": [
         {
-          "begin": "^(\\s*)(::|∷)(?![\\p{S}\\p{P}&&[^\\(,;\\[`{_\"']])\\s*",
+          "begin": "^(\\s*)(::|∷)(?![[\\p{S}\\p{P}]&&[^(,;\\[`{_\"']])\\s*",
           "beginCaptures": {
             "2": {
               "name": "keyword.operator.double-colon.haskell"
             }
           },
-          "end": "(?=\\#?\\)|\\]|,|(?<!')\\b(in|then|else|of)\\b(?!')|(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:(\\\\|λ)|(<-|←)|(=)|(-<|↢)|(-<<|⤛))([(),;\\[\\]`{}_\"']|[^\\p{S}\\p{P}])|(\\#|@)-\\}|(?=\\}|;)|^(?!\\1\\s*\\S|\\s*(?:$|\\{-[^@]|--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]{}`_\"']]).*$)))",
+          "end": "(?=#?\\)|[\\],]|(?<!')\\b(in|then|else|of)\\b(?!')|(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(?:([\\\\λ])|(<-|←)|(=)|(-<|↢)|(-<<|⤛))([(),;\\[\\]`{}_\"'[^\\p{S}\\p{P}]])|([#@])-}|(?=[};])|^(?!\\1\\s*\\S|\\s*(?:$|\\{-[^@]|--+(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]{}`_\"']]).*$)))",
           "name": "meta.type-declaration.haskell",
           "patterns": [
             {
@@ -1942,13 +1936,13 @@
           ]
         },
         {
-          "begin": "(?<![\\p{S}\\p{P}&&[^\\(,;\\[`{_\"']])(::|∷)(?![\\p{S}\\p{P}&&[^\\(,;\\[`{_\"']])",
+          "begin": "(?<![[\\p{S}\\p{P}]&&[^(,;\\[`{_\"']])(::|∷)(?![[\\p{S}\\p{P}]&&[^(,;\\[`{_\"']])",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.double-colon.haskell"
             }
           },
-          "end": "(?=\\#?\\)|\\]|,|\\b(?<!')(in|then|else|of)\\b(?!')|(\\#|@)-\\}|(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:(\\\\|λ)|(<-|←)|(=)|(-<|↢)|(-<<|⤛))([(),;\\[\\]`{}_\"']|[^\\p{S}\\p{P}])|(?=\\}|;)|$)",
+          "end": "(?=#?\\)|[\\],]|\\b(?<!')(in|then|else|of)\\b(?!')|([#@])-}|(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(?:([\\\\λ])|(<-|←)|(=)|(-<|↢)|(-<<|⤛))([(),;\\[\\]`{}_\"'[^\\p{S}\\p{P}]])|(?=[};])|$)",
           "patterns": [
             {
               "include": "#type_signature"
@@ -1973,15 +1967,15 @@
       "name": "string.quoted.double.haskell",
       "patterns": [
         {
-          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&])",
+          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\"'\\&])",
           "name": "constant.character.escape.haskell"
         },
         {
-          "match": "\\\\o[0-7]+|\\\\x[0-9A-Fa-f]+|\\\\[0-9]+",
+          "match": "\\\\(?:o[0-7]+|x\\h+|[0-9]+)",
           "name": "constant.character.escape.octal.haskell"
         },
         {
-          "match": "\\\\\\^[A-Z@\\[\\]\\\\\\^_]",
+          "match": "\\\\\\^[A-Z@\\[\\]\\\\^_]",
           "name": "constant.character.escape.control.haskell"
         },
         {
@@ -2047,7 +2041,7 @@
               "name": "punctuation.bracket.haskell"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.bracket.haskell"
@@ -2061,13 +2055,13 @@
           ]
         },
         {
-          "begin": "(?<=[\\s,;\\[\\]{}\"])(@)(?=\\\")",
+          "begin": "(?<=[\\s,;\\[\\]{}\"])(@)(?=\")",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.prefix.at.haskell"
             }
           },
-          "end": "(?<=\\\")",
+          "end": "(?<=\")",
           "name": "meta.type-application.haskell",
           "patterns": [
             {
@@ -2076,13 +2070,13 @@
           ]
         },
         {
-          "begin": "(?<=[\\s,;\\[\\]{}\"])(@)(?=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])",
+          "begin": "(?<=[\\s,;\\[\\]{}\"])(@)(?=[\\p{Ll}_\\p{Lu}\\p{Lt}\\d'])",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.prefix.at.haskell"
             }
           },
-          "end": "(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])",
+          "end": "(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\d'])",
           "name": "meta.type-application.haskell",
           "patterns": [
             {
@@ -2106,7 +2100,7 @@
               "name": "storage.type.haskell"
             }
           },
-          "match": "(')?((?:\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*\\.)*)(\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)"
+          "match": "(')?((?:\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*\\.)*)(\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)"
         },
         {
           "captures": {
@@ -2126,7 +2120,7 @@
               "name": "punctuation.paren.haskell"
             }
           },
-          "match": "(')?(\\()\\s*((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*\\.)*)([\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\))"
+          "match": "(')?(\\()\\s*((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*\\.)*)([[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+)\\s*(\\))"
         }
       ]
     },
@@ -2144,7 +2138,7 @@
               "name": "storage.type.operator.infix.haskell"
             }
           },
-          "match": "(?:(?<!')('))?((?:\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*\\.)*)(?![#@]?-})(\\#+|[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+(?<!\\#))"
+          "match": "(?:(?<!')('))?((?:\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*\\.)*)(?![#@]?-})(#+|[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+(?<!#))"
         },
         {
           "captures": {
@@ -2164,7 +2158,7 @@
               "name": "punctuation.backtick.haskell"
             }
           },
-          "match": "(')?(\\`)((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*\\.)*)([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)(`)"
+          "match": "(')?(`)((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*\\.)*)([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)(`)"
         }
       ]
     },
@@ -2269,14 +2263,14 @@
               "name": "punctuation.bracket.haskell"
             }
           },
-          "match": "(')?(\\[)\\s*(\\])",
+          "match": "(')?(\\[)\\s*(])",
           "name": "support.constant.empty-list.haskell"
         },
         {
           "include": "#integer_literals"
         },
         {
-          "match": "(::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])",
+          "match": "(::|∷)(?![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])",
           "name": "keyword.operator.double-colon.haskell"
         },
         {
@@ -2368,7 +2362,7 @@
               "name": "punctuation.bracket.haskell"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.bracket.haskell"
@@ -2389,7 +2383,7 @@
       ]
     },
     "type_variable": {
-      "match": "\\b(?<!')(?!(?:forall|deriving)\\b(?!'))[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*",
+      "match": "\\b(?<!')(?!(?:forall|deriving)\\b(?!'))[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*",
       "name": "variable.other.generic-type.haskell"
     },
     "where": {
@@ -2404,7 +2398,7 @@
               "name": "punctuation.brace.haskell"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.brace.haskell"
diff --git a/resources/languages/haxe.json b/resources/languages/haxe.json
index f43dd5e..6f38763 100644
--- a/resources/languages/haxe.json
+++ b/resources/languages/haxe.json
@@ -13,7 +13,7 @@
   "repository": {
     "abstract": {
       "begin": "(?=abstract\\s+[A-Z])",
-      "end": "(?<=\\})|(;)",
+      "end": "(?<=})|(;)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.hx"
@@ -34,7 +34,7 @@
     },
     "abstract-block": {
       "begin": "(?<=\\{)",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.hx"
@@ -80,7 +80,7 @@
     },
     "abstract-name-post": {
       "begin": "(?<=\\w)",
-      "end": "([\\{;])",
+      "end": "([{;])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.hx"
@@ -98,7 +98,7 @@
           "include": "#type"
         },
         {
-          "match": "[\\(\\)]",
+          "match": "[()]",
           "name": "punctuation.definition.other.hx"
         }
       ]
@@ -159,7 +159,7 @@
           "name": "punctuation.definition.array.begin.hx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.array.end.hx"
@@ -199,8 +199,8 @@
       ]
     },
     "arrow-function-parameter": {
-      "begin": "(?<=\\(|,)",
-      "end": "(?=\\)|,)",
+      "begin": "(?<=[(,])",
+      "end": "(?=[),])",
       "patterns": [
         {
           "include": "#parameter-name"
@@ -226,7 +226,7 @@
           "name": "keyword.operator.type.annotation.hx"
         }
       },
-      "end": "(?=\\)|,|=)",
+      "end": "(?=[),=])",
       "patterns": [
         {
           "include": "#type"
@@ -240,7 +240,7 @@
           "name": "punctuation.definition.block.begin.hx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.end.hx"
@@ -330,7 +330,7 @@
     },
     "class": {
       "begin": "(?=class)",
-      "end": "(?<=\\})|(;)",
+      "end": "(?<=})|(;)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.hx"
@@ -351,7 +351,7 @@
     },
     "class-block": {
       "begin": "(?<=\\{)",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.hx"
@@ -398,7 +398,7 @@
     },
     "class-name-post": {
       "begin": "(?<=\\w)",
-      "end": "([\\{;])",
+      "end": "([{;])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.hx"
@@ -483,7 +483,7 @@
               "name": "punctuation.definition.tag"
             }
           },
-          "end": "(?<=\\)|\\n)",
+          "end": "(?<=[)\\n])",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag"
@@ -534,7 +534,7 @@
               "name": "constant.numeric.suffix.hx"
             }
           },
-          "match": "\\b(?:0[xX][0-9a-fA-F][_0-9a-fA-F]*([iu][0-9][0-9_]*)?)\\b"
+          "match": "\\b0[xX]\\h[_\\h]*([iu][0-9][0-9_]*)?\\b"
         },
         {
           "captures": {
@@ -545,7 +545,7 @@
               "name": "constant.numeric.suffix.hx"
             }
           },
-          "match": "\\b(?:0[bB][01][_01]*([iu][0-9][0-9_]*)?)\\b"
+          "match": "\\b0[bB][01][_01]*([iu][0-9][0-9_]*)?\\b"
         },
         {
           "captures": {
@@ -595,13 +595,13 @@
               "name": "constant.numeric.suffix.hx"
             }
           },
-          "match": "(?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9_]+[eE][+-]?[0-9_]+([fiu][0-9][0-9_]*)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9_]+([fiu][0-9][0-9_]*)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9_]+([fiu][0-9][0-9_]*)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*([fiu][0-9][0-9_]*)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9_]+([fiu][0-9][0-9_]*)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(?!\\.)(?:\\B|([fiu][0-9][0-9_]*)\\b))|(?:\\B(\\.)[0-9][0-9_]*([fiu][0-9][0-9_]*)?\\b)|(?:\\b[0-9][0-9_]*([fiu][0-9][0-9_]*)?\\b))(?!\\$)"
+          "match": "(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9_]+[eE][+-]?[0-9_]+([fiu][0-9][0-9_]*)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9_]+([fiu][0-9][0-9_]*)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9_]+([fiu][0-9][0-9_]*)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*([fiu][0-9][0-9_]*)?\\b|\\b[0-9][0-9_]*(\\.)[0-9_]+([fiu][0-9][0-9_]*)?\\b|\\b[0-9][0-9_]*(\\.)(?!\\.)(?:\\B|([fiu][0-9][0-9_]*)\\b)|\\B(\\.)[0-9][0-9_]*([fiu][0-9][0-9_]*)?\\b|\\b[0-9][0-9_]*([fiu][0-9][0-9_]*)?\\b)(?!\\$)"
         }
       ]
     },
     "enum": {
       "begin": "(?=enum\\s+[A-Z])",
-      "end": "(?<=\\})|(;)",
+      "end": "(?<=})|(;)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.hx"
@@ -622,7 +622,7 @@
     },
     "enum-block": {
       "begin": "(?<=\\{)",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.hx"
@@ -699,7 +699,7 @@
     },
     "enum-name-post": {
       "begin": "(?<=\\w)",
-      "end": "([\\{;])",
+      "end": "([{;])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.hx"
@@ -760,8 +760,8 @@
       ]
     },
     "function-type-parameter": {
-      "begin": "(?<=\\(|,)",
-      "end": "(?=\\)|,)",
+      "begin": "(?<=[(,])",
+      "end": "(?=[),])",
       "patterns": [
         {
           "include": "#global"
@@ -807,7 +807,7 @@
           "name": "keyword.operator.type.annotation.hx"
         }
       },
-      "end": "(?=\\)|,|=)",
+      "end": "(?=[),=])",
       "patterns": [
         {
           "include": "#type"
@@ -881,7 +881,7 @@
     },
     "interface": {
       "begin": "(?=interface)",
-      "end": "(?<=\\})|(;)",
+      "end": "(?<=})|(;)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.hx"
@@ -902,7 +902,7 @@
     },
     "interface-block": {
       "begin": "(?<=\\{)",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.hx"
@@ -945,7 +945,7 @@
     },
     "interface-name-post": {
       "begin": "(?<=\\w)",
-      "end": "([\\{;])",
+      "end": "([{;])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.hx"
@@ -985,7 +985,7 @@
               "name": "constant.numeric.javadoc"
             }
           },
-          "match": "(@since)\\s+([\\w\\.-]+)\\s+"
+          "match": "(@since)\\s+([\\w.-]+)\\s+"
         },
         {
           "captures": {
@@ -1156,7 +1156,7 @@
           "name": "keyword.other.type.hx"
         },
         {
-          "match": "\\__(global|this)__\\b",
+          "match": "__(global|this)__\\b",
           "name": "keyword.other.untyped-property.hx"
         },
         {
@@ -1300,7 +1300,7 @@
     },
     "method": {
       "begin": "(?=\\bfunction\\b)",
-      "end": "(?<=[\\};])",
+      "end": "(?<=[};])",
       "name": "meta.method.hx",
       "patterns": [
         {
@@ -1324,7 +1324,7 @@
           "name": "punctuation.definition.block.begin.hx"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.hx"
@@ -1424,7 +1424,7 @@
           "name": "keyword.operator.type.annotation.hx"
         }
       },
-      "end": "(?=\\{|;|[a-z0-9])",
+      "end": "(?=[{;a-z0-9])",
       "patterns": [
         {
           "include": "#type"
@@ -1485,11 +1485,11 @@
           "name": "keyword.operator.logical.hx"
         },
         {
-          "match": "(~|&|\\||\\^|>>>|<<|>>)",
+          "match": "([~\\&|^]|>>>|<<|>>)",
           "name": "keyword.operator.bitwise.hx"
         },
         {
-          "match": "(==|!=|<=|>=|<|>)",
+          "match": "(==|!=|<=|>=|[<>])",
           "name": "keyword.operator.comparison.hx"
         },
         {
@@ -1497,11 +1497,11 @@
           "name": "keyword.operator.logical.hx"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
+          "match": "(--|\\+\\+)",
           "name": "keyword.operator.increment-decrement.hx"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%)",
+          "match": "([-+*/%])",
           "name": "keyword.operator.arithmetic.hx"
         },
         {
@@ -1568,7 +1568,7 @@
       ]
     },
     "parameter": {
-      "begin": "(?<=\\(|,)",
+      "begin": "(?<=[(,])",
       "end": "(?=\\)(?!\\s*->)|,)",
       "patterns": [
         {
@@ -1595,7 +1595,7 @@
           "name": "keyword.operator.assignment.hx"
         }
       },
-      "end": "(?=\\)|,)",
+      "end": "(?=[),])",
       "patterns": [
         {
           "include": "#block"
@@ -1606,7 +1606,7 @@
       ]
     },
     "parameter-name": {
-      "begin": "(?<=\\(|,)",
+      "begin": "(?<=[(,])",
       "end": "([_a-zA-Z]\\w*)",
       "endCaptures": {
         "1": {
@@ -1632,7 +1632,7 @@
           "name": "keyword.operator.type.annotation.hx"
         }
       },
-      "end": "(?=\\)(?!\\s*->)|,|=)",
+      "end": "(?=\\)(?!\\s*->)|[,=])",
       "patterns": [
         {
           "include": "#type"
@@ -1745,7 +1745,7 @@
     "regexp": {
       "patterns": [
         {
-          "match": "\\\\[bB]|\\^|\\$",
+          "match": "\\\\[bB]|[\\^$]",
           "name": "keyword.control.anchor.regexp"
         },
         {
@@ -1753,7 +1753,7 @@
           "name": "keyword.other.back-reference.regexp"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.regexp"
         },
         {
@@ -1822,7 +1822,7 @@
               "name": "keyword.operator.negation.regexp"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.regexp"
@@ -1851,7 +1851,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))",
               "name": "constant.other.character-class.range.regexp"
             },
             {
@@ -1871,7 +1871,7 @@
           "name": "constant.character.escape.hx"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f]{2}",
+          "match": "\\\\x\\h{2}",
           "name": "constant.character.escape.hx"
         },
         {
@@ -1879,7 +1879,7 @@
           "name": "constant.character.escape.hx"
         },
         {
-          "match": "\\\\u\\{[0-9A-Fa-f]{1,}\\}",
+          "match": "\\\\u\\{\\h+}",
           "name": "constant.character.escape.hx"
         },
         {
@@ -1953,7 +1953,7 @@
               "include": "#string-escape-sequences"
             },
             {
-              "begin": "(\\${)",
+              "begin": "(\\$\\{)",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.block.begin.hx"
@@ -2031,7 +2031,7 @@
               "name": "punctuation.definition.block.begin.hx"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#typedef-block"
@@ -2189,7 +2189,7 @@
     },
     "typedef": {
       "begin": "(?=typedef)",
-      "end": "(?<=\\})|(;)",
+      "end": "(?<=})|(;)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.hx"
@@ -2210,7 +2210,7 @@
     },
     "typedef-block": {
       "begin": "(?<=\\{)",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.hx"
@@ -2314,7 +2314,7 @@
           "name": "keyword.operator.type.annotation.hx"
         }
       },
-      "end": "(?=\\}|,|;)",
+      "end": "(?=[},;])",
       "patterns": [
         {
           "include": "#type"
@@ -2402,7 +2402,7 @@
           "name": "keyword.operator.assignment.hx"
         }
       },
-      "end": "(?=;|,)",
+      "end": "(?=[;,])",
       "patterns": [
         {
           "include": "#block"
@@ -2472,7 +2472,7 @@
           "name": "keyword.operator.type.annotation.hx"
         }
       },
-      "end": "(?=$|;|,|=)",
+      "end": "(?=$|[;,=])",
       "patterns": [
         {
           "include": "#type"
diff --git a/resources/languages/hcl.json b/resources/languages/hcl.json
index fe43243..8e28eca 100644
--- a/resources/languages/hcl.json
+++ b/resources/languages/hcl.json
@@ -26,18 +26,15 @@
           "name": "keyword.operator.accessor.hcl"
         }
       },
-      "comment": "Matches traversal attribute access such as .attr",
-      "end": "[[:alpha:]][\\w-]*|\\d*",
+      "end": "\\p{alpha}[\\w-]*|\\d*",
       "endCaptures": {
         "0": {
           "patterns": [
             {
-              "comment": "Attribute name",
-              "match": "(?!null|false|true)[[:alpha:]][\\w-]*",
+              "match": "(?!null|false|true)\\p{alpha}[\\w-]*",
               "name": "variable.other.member.hcl"
             },
             {
-              "comment": "Optional attribute index",
               "match": "\\d+",
               "name": "constant.numeric.integer.hcl"
             }
@@ -60,8 +57,7 @@
           "name": "keyword.operator.assignment.hcl"
         }
       },
-      "comment": "Identifier \"=\" with optional parens",
-      "match": "(\\()?(\\b(?!null\\b|false\\b|true\\b)[[:alpha:]][[:alnum:]_-]*)(\\))?\\s*(\\=(?!\\=|\\>))\\s*",
+      "match": "(\\()?(\\b(?!null\\b|false\\b|true\\b)\\p{alpha}[[:alnum:]_-]*)(\\))?\\s*(=(?![=>]))\\s*",
       "name": "variable.declaration.hcl"
     },
     "attribute_splat": {
@@ -71,7 +67,6 @@
           "name": "keyword.operator.accessor.hcl"
         }
       },
-      "comment": "Legacy attribute-only splat",
       "end": "\\*",
       "endCaptures": {
         "0": {
@@ -80,13 +75,12 @@
       }
     },
     "block": {
-      "begin": "([\\w][\\-\\w]*)(([^\\S\\r\\n]+([\\w][\\-_\\w]*|\\\"[^\\\"\\r\\n]*\\\"))*)[^\\S\\r\\n]*(\\{)",
+      "begin": "(\\w[-\\w]*)(([^\\S\\r\\n]+(\\w[-_\\w]*|\"[^\"\\r\\n]*\"))*)[^\\S\\r\\n]*(\\{)",
       "beginCaptures": {
         "1": {
           "patterns": [
             {
-              "comment": "Block type",
-              "match": "\\b(?!null|false|true)[[:alpha:]][[:alnum:]_-]*\\b",
+              "match": "\\b(?!null|false|true)\\p{alpha}[[:alnum:]_-]*\\b",
               "name": "entity.name.type.hcl"
             }
           ]
@@ -94,13 +88,11 @@
         "2": {
           "patterns": [
             {
-              "comment": "Block label (String Literal)",
-              "match": "\\\"[^\\\"\\r\\n]*\\\"",
+              "match": "\"[^\"\\r\\n]*\"",
               "name": "variable.other.enummember.hcl"
             },
             {
-              "comment": "Block label (Identifier)",
-              "match": "[[:alpha:]][[:alnum:]_-]*",
+              "match": "\\p{alpha}[[:alnum:]_-]*",
               "name": "variable.other.enummember.hcl"
             }
           ]
@@ -109,8 +101,7 @@
           "name": "punctuation.section.block.begin.hcl"
         }
       },
-      "comment": "This will match HCL blocks like `thing1 \"one\" \"two\" {` or `thing2 {`",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.block.end.hcl"
@@ -139,7 +130,6 @@
           "name": "punctuation.definition.comment.hcl"
         }
       },
-      "comment": "Inline comments start with the /* sequence and end with the */ sequence, and may have any characters within except the ending sequence. An inline comment is considered equivalent to a whitespace sequence",
       "end": "\\*/",
       "name": "comment.block.hcl"
     },
@@ -150,7 +140,7 @@
           "name": "punctuation.section.brackets.begin.hcl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.hcl"
@@ -158,7 +148,6 @@
       },
       "patterns": [
         {
-          "comment": "Splat operator",
           "match": "\\*",
           "name": "keyword.operator.splat.hcl"
         },
@@ -183,13 +172,11 @@
       ]
     },
     "char_escapes": {
-      "comment": "Character Escapes",
-      "match": "\\\\[nrt\"\\\\]|\\\\u(\\h{8}|\\h{4})",
+      "match": "\\\\(?:[nrt\"\\\\]|u(\\h{8}|\\h{4}))",
       "name": "constant.character.escape.hcl"
     },
     "comma": {
-      "comment": "Commas - used in certain expressions",
-      "match": "\\,",
+      "match": ",",
       "name": "punctuation.separator.hcl"
     },
     "comments": {
@@ -212,7 +199,6 @@
           "name": "punctuation.definition.comment.hcl"
         }
       },
-      "comment": "Line comments start with // sequence and end with the next newline sequence. A line comment is considered equivalent to a newline sequence",
       "end": "$\\n?",
       "name": "comment.line.double-slash.hcl"
     },
@@ -253,17 +239,15 @@
     "for_expression_body": {
       "patterns": [
         {
-          "comment": "in keyword",
           "match": "\\bin\\b",
           "name": "keyword.operator.word.hcl"
         },
         {
-          "comment": "if keyword",
           "match": "\\bif\\b",
           "name": "keyword.control.conditional.hcl"
         },
         {
-          "match": "\\:",
+          "match": ":",
           "name": "keyword.operator.hcl"
         },
         {
@@ -286,11 +270,11 @@
         "1": {
           "patterns": [
             {
-              "match": "\\b[[:alpha:]][\\w_-]*::([[:alpha:]][\\w_-]*::)?[[:alpha:]][\\w_-]*\\b",
+              "match": "\\b\\p{alpha}[\\w_-]*::(\\p{alpha}[\\w_-]*::)?\\p{alpha}[\\w_-]*\\b",
               "name": "support.function.namespaced.hcl"
             },
             {
-              "match": "\\b[[:alpha:]][\\w_-]*\\b",
+              "match": "\\b\\p{alpha}[\\w_-]*\\b",
               "name": "support.function.builtin.hcl"
             }
           ]
@@ -299,7 +283,6 @@
           "name": "punctuation.section.parens.begin.hcl"
         }
       },
-      "comment": "Built-in function calls",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -326,17 +309,15 @@
           "name": "punctuation.definition.comment.hcl"
         }
       },
-      "comment": "Line comments start with # sequence and end with the next newline sequence. A line comment is considered equivalent to a newline sequence",
       "end": "$\\n?",
       "name": "comment.line.number-sign.hcl"
     },
     "hcl_type_keywords": {
-      "comment": "Type keywords known to HCL.",
       "match": "\\b(any|string|number|bool|list|set|map|tuple|object)\\b",
       "name": "storage.type.hcl"
     },
     "heredoc": {
-      "begin": "(\\<\\<\\-?)\\s*(\\w+)\\s*$",
+      "begin": "(<<-?)\\s*(\\w+)\\s*$",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.heredoc.hcl"
@@ -345,7 +326,6 @@
           "name": "keyword.control.heredoc.hcl"
         }
       },
-      "comment": "String Heredoc",
       "end": "^\\s*\\2\\s*$",
       "endCaptures": {
         "0": {
@@ -367,7 +347,7 @@
         "2": {
           "patterns": [
             {
-              "match": "\\=\\>",
+              "match": "=>",
               "name": "storage.type.function.hcl"
             },
             {
@@ -402,7 +382,6 @@
       ]
     },
     "language_constants": {
-      "comment": "Language Constants",
       "match": "\\b(true|false|null)\\b",
       "name": "constant.language.hcl"
     },
@@ -426,8 +405,7 @@
       ]
     },
     "local_identifiers": {
-      "comment": "Local Identifiers",
-      "match": "\\b(?!null|false|true)[[:alpha:]][[:alnum:]_-]*\\b",
+      "match": "\\b(?!null|false|true)\\p{alpha}[[:alnum:]_-]*\\b",
       "name": "variable.other.readwrite.hcl"
     },
     "numeric_literals": {
@@ -438,7 +416,6 @@
               "name": "punctuation.separator.exponent.hcl"
             }
           },
-          "comment": "Integer, no fraction, optional exponent",
           "match": "\\b\\d+([Ee][+-]?)\\d+\\b",
           "name": "constant.numeric.float.hcl"
         },
@@ -451,12 +428,10 @@
               "name": "punctuation.separator.exponent.hcl"
             }
           },
-          "comment": "Integer, fraction, optional exponent",
           "match": "\\b\\d+(\\.)\\d+(?:([Ee][+-]?)\\d+)?\\b",
           "name": "constant.numeric.float.hcl"
         },
         {
-          "comment": "Integers",
           "match": "\\b\\d+\\b",
           "name": "constant.numeric.integer.hcl"
         }
@@ -472,7 +447,7 @@
           "name": "keyword.control.hcl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.braces.end.hcl"
@@ -480,7 +455,7 @@
       },
       "patterns": [
         {
-          "match": "\\=\\>",
+          "match": "=>",
           "name": "storage.type.function.hcl"
         },
         {
@@ -520,7 +495,7 @@
           "name": "punctuation.section.braces.begin.hcl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.braces.end.hcl"
@@ -549,8 +524,7 @@
               "name": "keyword.operator.assignment.hcl"
             }
           },
-          "comment": "Literal, named object key",
-          "match": "\\b((?!null|false|true)[[:alpha:]][[:alnum:]_-]*)\\s*(\\=(?!=))\\s*"
+          "match": "\\b((?!null|false|true)\\p{alpha}[[:alnum:]_-]*)\\s*(=(?!=))\\s*"
         },
         {
           "captures": {
@@ -567,8 +541,7 @@
               "name": "keyword.operator.hcl"
             }
           },
-          "comment": "String object key",
-          "match": "^\\s*((\").*(\"))\\s*(\\=)\\s*"
+          "match": "^\\s*((\").*(\"))\\s*(=)\\s*"
         },
         {
           "begin": "^\\s*\\(",
@@ -577,8 +550,7 @@
               "name": "punctuation.section.parens.begin.hcl"
             }
           },
-          "comment": "Computed object key (any expression between parens)",
-          "end": "(\\))\\s*(=|:)\\s*",
+          "end": "(\\))\\s*([=:])\\s*",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.parens.end.hcl"
@@ -605,19 +577,19 @@
     "operators": {
       "patterns": [
         {
-          "match": "\\>\\=",
+          "match": ">=",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\<\\=",
+          "match": "<=",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\=\\=",
+          "match": "==",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\!\\=",
+          "match": "!=",
           "name": "keyword.operator.hcl"
         },
         {
@@ -625,7 +597,7 @@
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\-",
+          "match": "-",
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
@@ -633,15 +605,15 @@
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\/",
+          "match": "/",
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\%",
+          "match": "%",
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\&\\&",
+          "match": "&&",
           "name": "keyword.operator.logical.hcl"
         },
         {
@@ -649,15 +621,15 @@
           "name": "keyword.operator.logical.hcl"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "keyword.operator.logical.hcl"
         },
         {
-          "match": "\\>",
+          "match": ">",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\<",
+          "match": "<",
           "name": "keyword.operator.hcl"
         },
         {
@@ -669,11 +641,11 @@
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\:",
+          "match": ":",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\=\\>",
+          "match": "=>",
           "name": "keyword.operator.hcl"
         }
       ]
@@ -685,7 +657,6 @@
           "name": "punctuation.section.parens.begin.hcl"
         }
       },
-      "comment": "Parens - matched *after* function syntax",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -702,14 +673,13 @@
       ]
     },
     "string_interpolation": {
-      "begin": "(?<![%$])([%$]{)",
+      "begin": "(?<![%$])([%$]\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.interpolation.begin.hcl"
         }
       },
-      "comment": "String interpolation",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.other.interpolation.end.hcl"
@@ -718,17 +688,14 @@
       "name": "meta.interpolation.hcl",
       "patterns": [
         {
-          "comment": "Trim left whitespace",
-          "match": "\\~\\s",
+          "match": "~\\s",
           "name": "keyword.operator.template.left.trim.hcl"
         },
         {
-          "comment": "Trim right whitespace",
-          "match": "\\s\\~",
+          "match": "\\s~",
           "name": "keyword.operator.template.right.trim.hcl"
         },
         {
-          "comment": "if/else/endif and for/in/endfor directives",
           "match": "\\b(if|else|endif|for|in|endfor)\\b",
           "name": "keyword.control.hcl"
         },
@@ -747,7 +714,6 @@
           "name": "punctuation.definition.string.begin.hcl"
         }
       },
-      "comment": "Strings",
       "end": "\"",
       "endCaptures": {
         "0": {
@@ -774,7 +740,7 @@
           "name": "keyword.control.hcl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.hcl"
diff --git a/resources/languages/hjson.json b/resources/languages/hjson.json
index 475d6ec..b6aacd4 100644
--- a/resources/languages/hjson.json
+++ b/resources/languages/hjson.json
@@ -4,7 +4,7 @@
     "hjson"
   ],
   "foldingStartMarker": "(?:^\\s*[{\\[](?!.*[}\\]],?\\s*$)|[{\\[]\\s*$)",
-  "foldingStopMarker": "(?:^\\s*[}\\]])",
+  "foldingStopMarker": "^\\s*[}\\]]",
   "name": "hjson",
   "patterns": [
     {
@@ -14,7 +14,7 @@
       "include": "#value"
     },
     {
-      "match": "[^\\s]",
+      "match": "\\S",
       "name": "invalid.illegal.excess-characters.hjson"
     }
   ],
@@ -26,7 +26,7 @@
           "name": "punctuation.definition.array.begin.hjson"
         }
       },
-      "end": "(\\])(?:\\s*([^,\\s]+))?",
+      "end": "(])(?:\\s*([^,\\s]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.array.end.hjson"
@@ -49,7 +49,7 @@
           "name": "punctuation.definition.array.begin.hjson"
         }
       },
-      "end": "(\\])(?:\\s*([^,\\s\\]]+))?",
+      "end": "(])(?:\\s*([^,\\s\\]]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.array.end.hjson"
@@ -74,7 +74,7 @@
           "name": "punctuation.separator.array.after-const.hjson"
         }
       },
-      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
+      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|]))"
     },
     "arrayContent": {
       "name": "meta.structure.array.hjson",
@@ -190,7 +190,7 @@
           "name": "punctuation.separator.array.after-num.hjson"
         }
       },
-      "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
+      "match": "(-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|]))"
     },
     "arrayObject": {
       "begin": "\\{",
@@ -199,7 +199,7 @@
           "name": "punctuation.definition.dictionary.begin.hjson"
         }
       },
-      "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s\\]]+))?",
+      "end": "(}|(?<=}))(?:\\s*([^,\\s\\]]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.dictionary.end.hjson"
@@ -255,7 +255,7 @@
               "name": "punctuation.definition.comment.hjson"
             }
           },
-          "match": "^\\s*(#).*(?:\\n)?",
+          "match": "^\\s*(#).*\\n?",
           "name": "comment.line.hash"
         },
         {
@@ -264,7 +264,7 @@
               "name": "punctuation.definition.comment.hjson"
             }
           },
-          "match": "^\\s*(//).*(?:\\n)?",
+          "match": "^\\s*(//).*\\n?",
           "name": "comment.line.double-slash"
         },
         {
@@ -360,7 +360,7 @@
           "name": "constant.language.hjson"
         }
       },
-      "match": "\\b(true|false|null)[\\t ]*(?=$|#|/\\*|//|\\])"
+      "match": "\\b(true|false|null)[\\t ]*(?=$|#|/\\*|//|])"
     },
     "jstring": {
       "patterns": [
@@ -415,7 +415,7 @@
     "jstringDoubleContent": {
       "patterns": [
         {
-          "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+          "match": "\\\\(?:[\"'\\\\/bfnrt]|u\\h{4})",
           "name": "constant.character.escape.hjson"
         },
         {
@@ -431,7 +431,7 @@
     "jstringSingleContent": {
       "patterns": [
         {
-          "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+          "match": "\\\\(?:[\"'\\\\/bfnrt]|u\\h{4})",
           "name": "constant.character.escape.hjson"
         },
         {
@@ -445,7 +445,7 @@
       ]
     },
     "key": {
-      "begin": "(?:((?:[^:,\\{\\}\\[\\]\\s\"'][^:,\\{\\}\\[\\]\\s]*)|(?:'(?:[^\\\\']|(\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4}))|(\\\\.))*')|(?:\"(?:[^\\\\\"]|(\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4}))|(\\\\.))*\"))\\s*(?!\\n)([,\\{\\}\\[\\]]*))",
+      "begin": "([^:,{}\\[\\]\\s\"'][^:,{}\\[\\]\\s]*|'(?:[^\\\\']|(\\\\(?:[\"'\\\\/bfnrt]|u\\h{4}))|(\\\\.))*'|\"(?:[^\\\\\"]|(\\\\(?:[\"'\\\\/bfnrt]|u\\h{4}))|(\\\\.))*\")\\s*(?!\\n)([,{}\\[\\]]*)",
       "beginCaptures": {
         "0": {
           "name": "meta.structure.key-value.begin.hjson"
@@ -486,13 +486,13 @@
           "include": "#keyValue"
         },
         {
-          "match": "[^\\s]",
+          "match": "\\S",
           "name": "invalid.illegal.object-property.hjson"
         }
       ]
     },
     "keyValue": {
-      "begin": "(?:\\s*(:)\\s*([,\\}\\]]*))",
+      "begin": "\\s*(:)\\s*([,}\\]]*)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.separator.dictionary.key-value.hjson"
@@ -519,10 +519,10 @@
               "name": "invalid.illegal.object-property.closing-bracket.hjson"
             }
           },
-          "match": "^\\s*(\\})"
+          "match": "^\\s*(})"
         },
         {
-          "match": "[^\\s]",
+          "match": "\\S",
           "name": "invalid.illegal.object-property.hjson"
         }
       ]
@@ -551,7 +551,7 @@
           "name": "constant.numeric.hjson"
         }
       },
-      "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)[\\t ]*(?=$|#|/\\*|//|\\])"
+      "match": "(-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)[\\t ]*(?=$|#|/\\*|//|])"
     },
     "object": {
       "begin": "\\{",
@@ -560,7 +560,7 @@
           "name": "punctuation.definition.dictionary.begin.hjson"
         }
       },
-      "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s]+))?",
+      "end": "(}|(?<=}))(?:\\s*([^,\\s]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.dictionary.end.hjson"
@@ -583,7 +583,7 @@
           "name": "punctuation.definition.array.begin.hjson"
         }
       },
-      "end": "(\\])(?:\\s*([^,\\s\\}]+))?",
+      "end": "(])(?:\\s*([^,\\s}]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.array.end.hjson"
@@ -608,7 +608,7 @@
           "name": "punctuation.separator.dictionary.pair.after-const.hjson"
         }
       },
-      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
+      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|}))"
     },
     "objectContent": {
       "patterns": [
@@ -623,7 +623,7 @@
           "name": "invalid.illegal.object-property.hjson"
         },
         {
-          "begin": "(?<=\\{|,)|,",
+          "begin": "(?<=[{,])|,",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.dictionary.pair.hjson"
@@ -641,7 +641,7 @@
           ]
         },
         {
-          "match": "[^\\s]",
+          "match": "\\S",
           "name": "invalid.illegal.object-property.hjson"
         }
       ]
@@ -655,7 +655,7 @@
               "name": "punctuation.definition.string.begin.hjson"
             }
           },
-          "end": "(\")(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+          "end": "(\")(?:\\s*((?:[^,\\s}#/]|/[^/*])+))?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.hjson"
@@ -678,7 +678,7 @@
               "name": "punctuation.definition.string.begin.hjson"
             }
           },
-          "end": "(')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+          "end": "(')(?:\\s*((?:[^,\\s}#/]|/[^/*])+))?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.hjson"
@@ -703,7 +703,7 @@
           "name": "punctuation.definition.string.begin.hjson"
         }
       },
-      "end": "(''')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+      "end": "(''')(?:\\s*((?:[^,\\s}#/]|/[^/*])+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.hjson"
@@ -723,7 +723,7 @@
           "name": "punctuation.separator.dictionary.pair.after-num.hjson"
         }
       },
-      "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
+      "match": "(-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|}))"
     },
     "objectObject": {
       "begin": "\\{",
@@ -732,7 +732,7 @@
           "name": "punctuation.definition.dictionary.begin.hjson"
         }
       },
-      "end": "(\\}|(?<=\\})\\}?)(?:\\s*([^,\\s}]+))?",
+      "end": "(}|(?<=})}?)(?:\\s*([^,\\s}]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.dictionary.end.hjson"
@@ -794,7 +794,7 @@
       ]
     },
     "ustring": {
-      "match": "([^:,\\{\\[\\}\\]\\s].*)$",
+      "match": "([^:,{\\[}\\]\\s].*)$",
       "name": "string.quoted.none.hjson"
     },
     "value": {
diff --git a/resources/languages/hlsl.json b/resources/languages/hlsl.json
index 771ebc1..9c6b9c8 100644
--- a/resources/languages/hlsl.json
+++ b/resources/languages/hlsl.json
@@ -13,19 +13,19 @@
       "name": "comment.line.double-slash.hlsl"
     },
     {
-      "match": "\\b[0-9]+\\.[0-9]*(F|f)?\\b",
+      "match": "\\b[0-9]+\\.[0-9]*([Ff])?\\b",
       "name": "constant.numeric.decimal.hlsl"
     },
     {
-      "match": "(\\.([0-9]+)(F|f)?)\\b",
+      "match": "(\\.([0-9]+)([Ff])?)\\b",
       "name": "constant.numeric.decimal.hlsl"
     },
     {
-      "match": "\\b([0-9]+(F|f)?)\\b",
+      "match": "\\b([0-9]+([Ff])?)\\b",
       "name": "constant.numeric.decimal.hlsl"
     },
     {
-      "match": "\\b(0(x|X)[0-9a-fA-F]+)\\b",
+      "match": "\\b(0([xX])\\h+)\\b",
       "name": "constant.numeric.hex.hlsl"
     },
     {
@@ -53,23 +53,23 @@
       "name": "storage.type.basic.hlsl"
     },
     {
-      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)(?=[\\s]*\\()",
+      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)(?=\\s*\\()",
       "name": "support.function.hlsl"
     },
     {
-      "match": "(?<=\\:\\s|\\:)(?i:BINORMAL[0-9]*|BLENDINDICES[0-9]*|BLENDWEIGHT[0-9]*|COLOR[0-9]*|NORMAL[0-9]*|POSITIONT|POSITION|PSIZE[0-9]*|TANGENT[0-9]*|TEXCOORD[0-9]*|FOG|TESSFACTOR[0-9]*|VFACE|VPOS|DEPTH[0-9]*)\\b",
+      "match": "(?<=:(?:\\s|))(?i:BINORMAL[0-9]*|BLENDINDICES[0-9]*|BLENDWEIGHT[0-9]*|COLOR[0-9]*|NORMAL[0-9]*|POSITIONT|POSITION|PSIZE[0-9]*|TANGENT[0-9]*|TEXCOORD[0-9]*|FOG|TESSFACTOR[0-9]*|VFACE|VPOS|DEPTH[0-9]*)\\b",
       "name": "support.variable.semantic.hlsl"
     },
     {
-      "match": "(?<=\\:\\s|\\:)(?i:SV_ClipDistance[0-9]*|SV_CullDistance[0-9]*|SV_Coverage|SV_Depth|SV_DepthGreaterEqual[0-9]*|SV_DepthLessEqual[0-9]*|SV_InstanceID|SV_IsFrontFace|SV_Position|SV_RenderTargetArrayIndex|SV_SampleIndex|SV_StencilRef|SV_Target[0-7]?|SV_VertexID|SV_ViewportArrayIndex)\\b",
+      "match": "(?<=:(?:\\s|))(?i:SV_(?:ClipDistance[0-9]*|CullDistance[0-9]*|Coverage|Depth|DepthGreaterEqual[0-9]*|DepthLessEqual[0-9]*|InstanceID|IsFrontFace|Position|RenderTargetArrayIndex|SampleIndex|StencilRef|Target[0-7]?|VertexID|ViewportArrayIndex))\\b",
       "name": "support.variable.semantic.sm4.hlsl"
     },
     {
-      "match": "(?<=\\:\\s|\\:)(?i:SV_DispatchThreadID|SV_DomainLocation|SV_GroupID|SV_GroupIndex|SV_GroupThreadID|SV_GSInstanceID|SV_InsideTessFactor|SV_OutputControlPointID|SV_TessFactor)\\b",
+      "match": "(?<=:(?:\\s|))(?i:SV_(?:DispatchThreadID|DomainLocation|GroupID|GroupIndex|GroupThreadID|GSInstanceID|InsideTessFactor|OutputControlPointID|TessFactor))\\b",
       "name": "support.variable.semantic.sm5.hlsl"
     },
     {
-      "match": "(?<=\\:\\s|\\:)(?i:SV_InnerCoverage|SV_StencilRef)\\b",
+      "match": "(?<=:(?:\\s|))(?i:SV_(?:InnerCoverage|StencilRef))\\b",
       "name": "support.variable.semantic.sm5_1.hlsl"
     },
     {
@@ -101,11 +101,11 @@
       "name": "support.type.object.hlsl"
     },
     {
-      "match": "\\b(RasterizerOrderedBuffer|RasterizerOrderedByteAddressBuffer|RasterizerOrderedStructuredBuffer|RasterizerOrderedTexture1D|RasterizerOrderedTexture1DArray|RasterizerOrderedTexture2D|RasterizerOrderedTexture2DArray|RasterizerOrderedTexture3D)\\b",
+      "match": "\\b(RasterizerOrdered(?:Buffer|ByteAddressBuffer|StructuredBuffer|Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture3D))\\b",
       "name": "support.type.object.rasterizerordered.hlsl"
     },
     {
-      "match": "\\b(RWBuffer|RWByteAddressBuffer|RWStructuredBuffer|RWTexture1D|RWTexture1DArray|RWTexture2D|RWTexture2DArray|RWTexture3D)\\b",
+      "match": "\\b(RW(?:Buffer|ByteAddressBuffer|StructuredBuffer|Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture3D))\\b",
       "name": "support.type.object.rw.hlsl"
     },
     {
@@ -113,19 +113,19 @@
       "name": "support.type.object.geometryshader.hlsl"
     },
     {
-      "match": "\\b(sampler|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler_state)\\b",
+      "match": "\\b(sampler(?:|1D|2D|3D|CUBE|_state))\\b",
       "name": "support.type.sampler.legacy.hlsl"
     },
     {
-      "match": "\\b(SamplerState|SamplerComparisonState)\\b",
+      "match": "\\b(Sampler(?:State|ComparisonState))\\b",
       "name": "support.type.sampler.hlsl"
     },
     {
-      "match": "\\b(texture2D|textureCUBE)\\b",
+      "match": "\\b(texture(?:2D|CUBE))\\b",
       "name": "support.type.texture.legacy.hlsl"
     },
     {
-      "match": "\\b(Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture2DMS|Texture2DMSArray|Texture3D|TextureCube|TextureCubeArray)\\b",
+      "match": "\\b(Texture(?:1D|1DArray|2D|2DArray|2DMS|2DMSArray|3D|Cube|CubeArray))\\b",
       "name": "support.type.texture.hlsl"
     },
     {
diff --git a/resources/languages/html-derivative.json b/resources/languages/html-derivative.json
index 034b9e2..4b1c67b 100644
--- a/resources/languages/html-derivative.json
+++ b/resources/languages/html-derivative.json
@@ -2,7 +2,6 @@
   "displayName": "HTML (Derivative)",
   "injections": {
     "R:text.html - (comment.block, text.html meta.embedded, meta.tag.*.*.html, meta.tag.*.*.*.html, meta.tag.*.*.*.*.html)": {
-      "comment": "Uses R: to ensure this matches after any other injections.",
       "patterns": [
         {
           "match": "<",
@@ -17,7 +16,7 @@
       "include": "text.html.basic#core-minus-invalid"
     },
     {
-      "begin": "(</?)(\\w[^\\s>]*)(?<!/)",
+      "begin": "(</?)(\\w[^\\s<>]*)(?<!/)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
diff --git a/resources/languages/html.json b/resources/languages/html.json
index 75b453b..d7a5452 100644
--- a/resources/languages/html.json
+++ b/resources/languages/html.json
@@ -2,7 +2,6 @@
   "displayName": "HTML",
   "injections": {
     "R:text.html - (comment.block, text.html meta.embedded, meta.tag.*.*.html, meta.tag.*.*.*.html, meta.tag.*.*.*.*.html)": {
-      "comment": "Uses R: to ensure this matches after any other injections.",
       "patterns": [
         {
           "match": "<",
@@ -45,7 +44,6 @@
               "name": "entity.other.attribute-name.html"
             }
           },
-          "comment": "HTML5 attributes, not event handlers",
           "end": "(?=\\s*+[^=\\s])",
           "name": "meta.attribute.$1.html",
           "patterns": [
@@ -61,7 +59,6 @@
               "name": "entity.other.attribute-name.html"
             }
           },
-          "comment": "HTML5 style attribute",
           "end": "(?=\\s*+[^=\\s])",
           "name": "meta.attribute.style.html",
           "patterns": [
@@ -153,7 +150,6 @@
               "name": "entity.other.attribute-name.html"
             }
           },
-          "comment": "HTML5 attributes, event handlers",
           "end": "(?=\\s*+[^=\\s])",
           "name": "meta.attribute.event-handler.$1.html",
           "patterns": [
@@ -314,13 +310,12 @@
           ]
         },
         {
-          "begin": "(data-[a-z\\-]+)(?![\\w:-])",
+          "begin": "(data-[a-z-]+)(?![\\w:-])",
           "beginCaptures": {
             "0": {
               "name": "entity.other.attribute-name.html"
             }
           },
-          "comment": "HTML5 attributes, data-*",
           "end": "(?=\\s*+[^=\\s])",
           "name": "meta.attribute.data-x.$1.html",
           "patterns": [
@@ -336,7 +331,6 @@
               "name": "invalid.deprecated.entity.other.attribute-name.html"
             }
           },
-          "comment": "HTML attributes, deprecated",
           "end": "(?=\\s*+[^=\\s])",
           "name": "meta.attribute.$1.html",
           "patterns": [
@@ -346,13 +340,12 @@
           ]
         },
         {
-          "begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
+          "begin": "([^ \"'<>/=\\x00-\\x1F\\x7F-\\x{9F}﷐-﷯￾￿🿾🿿𯿾𯿿𿿾𿿿\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
           "beginCaptures": {
             "0": {
               "name": "entity.other.attribute-name.html"
             }
           },
-          "comment": "Anything else that is valid",
           "end": "(?=\\s*+[^=\\s])",
           "name": "meta.attribute.unrecognized.$1.html",
           "patterns": [
@@ -461,7 +454,7 @@
           "name": "invalid.illegal.characters-not-allowed-here.html"
         },
         {
-          "match": "<!--(?!>)|<!-(?=-->)",
+          "match": "<!-(?:-(?!>)|(?=-->))",
           "name": "invalid.illegal.characters-not-allowed-here.html"
         },
         {
@@ -471,7 +464,6 @@
       ]
     },
     "core-minus-invalid": {
-      "comment": "This should be the root pattern array includes minus #tags-invalid",
       "patterns": [
         {
           "include": "#xml-processing"
@@ -534,8 +526,7 @@
               "name": "punctuation.definition.entity.html"
             }
           },
-          "comment": "Yes this is a bit ridiculous, there are quite a lot of these",
-          "match": "(&)(?=[a-zA-Z])((a(s(ymp(eq)?|cr|t)|n(d(slope|d|v|and)?|g(s(t|ph)|zarr|e|le|rt(vb(d)?)?|msd(a(h|c|d|e|f|a|g|b))?)?)|c(y|irc|d|ute|E)?|tilde|o(pf|gon)|uml|p(id|os|prox(eq)?|e|E|acir)?|elig|f(r)?|w(conint|int)|l(pha|e(ph|fsym))|acute|ring|grave|m(p|a(cr|lg))|breve)|A(s(sign|cr)|nd|MP|c(y|irc)|tilde|o(pf|gon)|uml|pplyFunction|fr|Elig|lpha|acute|ring|grave|macr|breve))|(B(scr|cy|opf|umpeq|e(cause|ta|rnoullis)|fr|a(ckslash|r(v|wed))|reve)|b(s(cr|im(e)?|ol(hsub|b)?|emi)|n(ot|e(quiv)?)|c(y|ong)|ig(s(tar|qcup)|c(irc|up|ap)|triangle(down|up)|o(times|dot|plus)|uplus|vee|wedge)|o(t(tom)?|pf|wtie|x(h(d|u|D|U)?|times|H(d|u|D|U)?|d(R|l|r|L)|u(R|l|r|L)|plus|D(R|l|r|L)|v(R|h|H|l|r|L)?|U(R|l|r|L)|V(R|h|H|l|r|L)?|minus|box))|Not|dquo|u(ll(et)?|mp(e(q)?|E)?)|prime|e(caus(e)?|t(h|ween|a)|psi|rnou|mptyv)|karow|fr|l(ock|k(1(2|4)|34)|a(nk|ck(square|triangle(down|left|right)?|lozenge)))|a(ck(sim(eq)?|cong|prime|epsilon)|r(vee|wed(ge)?))|r(eve|vbar)|brk(tbrk)?))|(c(s(cr|u(p(e)?|b(e)?))|h(cy|i|eck(mark)?)|ylcty|c(irc|ups(sm)?|edil|a(ps|ron))|tdot|ir(scir|c(eq|le(d(R|circ|S|dash|ast)|arrow(left|right)))?|e|fnint|E|mid)?|o(n(int|g(dot)?)|p(y(sr)?|f|rod)|lon(e(q)?)?|m(p(fn|le(xes|ment))?|ma(t)?))|dot|u(darr(l|r)|p(s|c(up|ap)|or|dot|brcap)?|e(sc|pr)|vee|wed|larr(p)?|r(vearrow(left|right)|ly(eq(succ|prec)|vee|wedge)|arr(m)?|ren))|e(nt(erdot)?|dil|mptyv)|fr|w(conint|int)|lubs(uit)?|a(cute|p(s|c(up|ap)|dot|and|brcup)?|r(on|et))|r(oss|arr))|C(scr|hi|c(irc|onint|edil|aron)|ircle(Minus|Times|Dot|Plus)|Hcy|o(n(tourIntegral|int|gruent)|unterClockwiseContourIntegral|p(f|roduct)|lon(e)?)|dot|up(Cap)?|OPY|e(nterDot|dilla)|fr|lo(seCurly(DoubleQuote|Quote)|ckwiseContourIntegral)|a(yleys|cute|p(italDifferentialD)?)|ross))|(d(s(c(y|r)|trok|ol)|har(l|r)|c(y|aron)|t(dot|ri(f)?)|i(sin|e|v(ide(ontimes)?|onx)?|am(s|ond(suit)?)?|gamma)|Har|z(cy|igrarr)|o(t(square|plus|eq(dot)?|minus)?|ublebarwedge|pf|wn(harpoon(left|right)|downarrows|arrow)|llar)|d(otseq|a(rr|gger))?|u(har|arr)|jcy|e(lta|g|mptyv)|f(isht|r)|wangle|lc(orn|rop)|a(sh(v)?|leth|rr|gger)|r(c(orn|rop)|bkarow)|b(karow|lac)|Arr)|D(s(cr|trok)|c(y|aron)|Scy|i(fferentialD|a(critical(Grave|Tilde|Do(t|ubleAcute)|Acute)|mond))|o(t(Dot|Equal)?|uble(Right(Tee|Arrow)|ContourIntegral|Do(t|wnArrow)|Up(DownArrow|Arrow)|VerticalBar|L(ong(RightArrow|Left(RightArrow|Arrow))|eft(RightArrow|Tee|Arrow)))|pf|wn(Right(TeeVector|Vector(Bar)?)|Breve|Tee(Arrow)?|arrow|Left(RightVector|TeeVector|Vector(Bar)?)|Arrow(Bar|UpArrow)?))|Zcy|el(ta)?|D(otrahd)?|Jcy|fr|a(shv|rr|gger)))|(e(s(cr|im|dot)|n(sp|g)|c(y|ir(c)?|olon|aron)|t(h|a)|o(pf|gon)|dot|u(ro|ml)|p(si(v|lon)?|lus|ar(sl)?)|e|D(ot|Dot)|q(s(im|lant(less|gtr))|c(irc|olon)|u(iv(DD)?|est|als)|vparsl)|f(Dot|r)|l(s(dot)?|inters|l)?|a(ster|cute)|r(Dot|arr)|g(s(dot)?|rave)?|x(cl|ist|p(onentiale|ectation))|m(sp(1(3|4))?|pty(set|v)?|acr))|E(s(cr|im)|c(y|irc|aron)|ta|o(pf|gon)|NG|dot|uml|TH|psilon|qu(ilibrium|al(Tilde)?)|fr|lement|acute|grave|x(ists|ponentialE)|m(pty(SmallSquare|VerySmallSquare)|acr)))|(f(scr|nof|cy|ilig|o(pf|r(k(v)?|all))|jlig|partint|emale|f(ilig|l(ig|lig)|r)|l(tns|lig|at)|allingdotseq|r(own|a(sl|c(1(2|8|3|4|5|6)|78|2(3|5)|3(8|4|5)|45|5(8|6)))))|F(scr|cy|illed(SmallSquare|VerySmallSquare)|o(uriertrf|pf|rAll)|fr))|(G(scr|c(y|irc|edil)|t|opf|dot|T|Jcy|fr|amma(d)?|reater(Greater|SlantEqual|Tilde|Equal(Less)?|FullEqual|Less)|g|breve)|g(s(cr|im(e|l)?)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|irc)|t(c(c|ir)|dot|quest|lPar|r(sim|dot|eq(qless|less)|less|a(pprox|rr)))?|imel|opf|dot|jcy|e(s(cc|dot(o(l)?)?|l(es)?)?|q(slant|q)?|l)?|v(nE|ertneqq)|fr|E(l)?|l(j|E|a)?|a(cute|p|mma(d)?)|rave|g(g)?|breve))|(h(s(cr|trok|lash)|y(phen|bull)|circ|o(ok(leftarrow|rightarrow)|pf|arr|rbar|mtht)|e(llip|arts(uit)?|rcon)|ks(earow|warow)|fr|a(irsp|lf|r(dcy|r(cir|w)?)|milt)|bar|Arr)|H(s(cr|trok)|circ|ilbertSpace|o(pf|rizontalLine)|ump(DownHump|Equal)|fr|a(cek|t)|ARDcy))|(i(s(cr|in(s(v)?|dot|v|E)?)|n(care|t(cal|prod|e(rcal|gers)|larhk)?|odot|fin(tie)?)?|c(y|irc)?|t(ilde)?|i(nfin|i(nt|int)|ota)?|o(cy|ta|pf|gon)|u(kcy|ml)|jlig|prod|e(cy|xcl)|quest|f(f|r)|acute|grave|m(of|ped|a(cr|th|g(part|e|line))))|I(scr|n(t(e(rsection|gral))?|visible(Comma|Times))|c(y|irc)|tilde|o(ta|pf|gon)|dot|u(kcy|ml)|Ocy|Jlig|fr|Ecy|acute|grave|m(plies|a(cr|ginaryI))?))|(j(s(cr|ercy)|c(y|irc)|opf|ukcy|fr|math)|J(s(cr|ercy)|c(y|irc)|opf|ukcy|fr))|(k(scr|hcy|c(y|edil)|opf|jcy|fr|appa(v)?|green)|K(scr|c(y|edil)|Hcy|opf|Jcy|fr|appa))|(l(s(h|cr|trok|im(e|g)?|q(uo(r)?|b)|aquo)|h(ar(d|u(l)?)|blk)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|ub|e(il|dil)|aron)|Barr|t(hree|c(c|ir)|imes|dot|quest|larr|r(i(e|f)?|Par))?|Har|o(ng(left(arrow|rightarrow)|rightarrow|mapsto)|times|z(enge|f)?|oparrow(left|right)|p(f|lus|ar)|w(ast|bar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|r(dhar|ushar))|ur(dshar|uhar)|jcy|par(lt)?|e(s(s(sim|dot|eq(qgtr|gtr)|approx|gtr)|cc|dot(o(r)?)?|g(es)?)?|q(slant|q)?|ft(harpoon(down|up)|threetimes|leftarrows|arrow(tail)?|right(squigarrow|harpoons|arrow(s)?))|g)?|v(nE|ertneqq)|f(isht|loor|r)|E(g)?|l(hard|corner|tri|arr)?|a(ng(d|le)?|cute|t(e(s)?|ail)?|p|emptyv|quo|rr(sim|hk|tl|pl|fs|lp|b(fs)?)?|gran|mbda)|r(har(d)?|corner|tri|arr|m)|g(E)?|m(idot|oust(ache)?)|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr))|L(s(h|cr|trok)|c(y|edil|aron)|t|o(ng(RightArrow|left(arrow|rightarrow)|rightarrow|Left(RightArrow|Arrow))|pf|wer(RightArrow|LeftArrow))|T|e(ss(Greater|SlantEqual|Tilde|EqualGreater|FullEqual|Less)|ft(Right(Vector|Arrow)|Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|rightarrow|Floor|A(ngleBracket|rrow(RightArrow|Bar)?)))|Jcy|fr|l(eftarrow)?|a(ng|cute|placetrf|rr|mbda)|midot))|(M(scr|cy|inusPlus|opf|u|e(diumSpace|llintrf)|fr|ap)|m(s(cr|tpos)|ho|nplus|c(y|omma)|i(nus(d(u)?|b)?|cro|d(cir|dot|ast)?)|o(dels|pf)|dash|u(ltimap|map)?|p|easuredangle|DDot|fr|l(cp|dr)|a(cr|p(sto(down|up|left)?)?|l(t(ese)?|e)|rker)))|(n(s(hort(parallel|mid)|c(cue|e|r)?|im(e(q)?)?|u(cc(eq)?|p(set(eq(q)?)?|e|E)?|b(set(eq(q)?)?|e|E)?)|par|qsu(pe|be)|mid)|Rightarrow|h(par|arr|Arr)|G(t(v)?|g)|c(y|ong(dot)?|up|edil|a(p|ron))|t(ilde|lg|riangle(left(eq)?|right(eq)?)|gl)|i(s(d)?|v)?|o(t(ni(v(c|a|b))?|in(dot|v(c|a|b)|E)?)?|pf)|dash|u(m(sp|ero)?)?|jcy|p(olint|ar(sl|t|allel)?|r(cue|e(c(eq)?)?)?)|e(s(im|ear)|dot|quiv|ar(hk|r(ow)?)|xist(s)?|Arr)?|v(sim|infin|Harr|dash|Dash|l(t(rie)?|e|Arr)|ap|r(trie|Arr)|g(t|e))|fr|w(near|ar(hk|r(ow)?)|Arr)|V(dash|Dash)|l(sim|t(ri(e)?)?|dr|e(s(s)?|q(slant|q)?|ft(arrow|rightarrow))?|E|arr|Arr)|a(ng|cute|tur(al(s)?)?|p(id|os|prox|E)?|bla)|r(tri(e)?|ightarrow|arr(c|w)?|Arr)|g(sim|t(r)?|e(s|q(slant|q)?)?|E)|mid|L(t(v)?|eft(arrow|rightarrow)|l)|b(sp|ump(e)?))|N(scr|c(y|edil|aron)|tilde|o(nBreakingSpace|Break|t(R(ightTriangle(Bar|Equal)?|everseElement)|Greater(Greater|SlantEqual|Tilde|Equal|FullEqual|Less)?|S(u(cceeds(SlantEqual|Tilde|Equal)?|perset(Equal)?|bset(Equal)?)|quareSu(perset(Equal)?|bset(Equal)?))|Hump(DownHump|Equal)|Nested(GreaterGreater|LessLess)|C(ongruent|upCap)|Tilde(Tilde|Equal|FullEqual)?|DoubleVerticalBar|Precedes(SlantEqual|Equal)?|E(qual(Tilde)?|lement|xists)|VerticalBar|Le(ss(Greater|SlantEqual|Tilde|Equal|Less)?|ftTriangle(Bar|Equal)?))?|pf)|u|e(sted(GreaterGreater|LessLess)|wLine|gative(MediumSpace|Thi(nSpace|ckSpace)|VeryThinSpace))|Jcy|fr|acute))|(o(s(cr|ol|lash)|h(m|bar)|c(y|ir(c)?)|ti(lde|mes(as)?)|S|int|opf|d(sold|iv|ot|ash|blac)|uml|p(erp|lus|ar)|elig|vbar|f(cir|r)|l(c(ir|ross)|t|ine|arr)|a(st|cute)|r(slope|igof|or|d(er(of)?|f|m)?|v|arr)?|g(t|on|rave)|m(i(nus|cron|d)|ega|acr))|O(s(cr|lash)|c(y|irc)|ti(lde|mes)|opf|dblac|uml|penCurly(DoubleQuote|Quote)|ver(B(ar|rac(e|ket))|Parenthesis)|fr|Elig|acute|r|grave|m(icron|ega|acr)))|(p(s(cr|i)|h(i(v)?|one|mmat)|cy|i(tchfork|v)?|o(intint|und|pf)|uncsp|er(cnt|tenk|iod|p|mil)|fr|l(us(sim|cir|two|d(o|u)|e|acir|mn|b)?|an(ck(h)?|kv))|ar(s(im|l)|t|a(llel)?)?|r(sim|n(sim|E|ap)|cue|ime(s)?|o(d|p(to)?|f(surf|line|alar))|urel|e(c(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?)?|E|ap)?|m)|P(s(cr|i)|hi|cy|i|o(incareplane|pf)|fr|lusMinus|artialD|r(ime|o(duct|portion(al)?)|ecedes(SlantEqual|Tilde|Equal)?)?))|(q(scr|int|opf|u(ot|est(eq)?|at(int|ernions))|prime|fr)|Q(scr|opf|UOT|fr))|(R(s(h|cr)|ho|c(y|edil|aron)|Barr|ight(Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|Floor|A(ngleBracket|rrow(Bar|LeftArrow)?))|o(undImplies|pf)|uleDelayed|e(verse(UpEquilibrium|E(quilibrium|lement)))?|fr|EG|a(ng|cute|rr(tl)?)|rightarrow)|r(s(h|cr|q(uo(r)?|b)|aquo)|h(o(v)?|ar(d|u(l)?))|nmid|c(y|ub|e(il|dil)|aron)|Barr|t(hree|imes|ri(e|f|ltri)?)|i(singdotseq|ng|ght(squigarrow|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(tail)?|rightarrows))|Har|o(times|p(f|lus|ar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|ldhar)|uluhar|p(polint|ar(gt)?)|e(ct|al(s|ine|part)?|g)|f(isht|loor|r)|l(har|arr|m)|a(ng(d|e|le)?|c(ute|e)|t(io(nals)?|ail)|dic|emptyv|quo|rr(sim|hk|c|tl|pl|fs|w|lp|ap|b(fs)?)?)|rarr|x|moust(ache)?|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr)))|(s(s(cr|tarf|etmn|mile)|h(y|c(hcy|y)|ort(parallel|mid)|arp)|c(sim|y|n(sim|E|ap)|cue|irc|polint|e(dil)?|E|a(p|ron))?|t(ar(f)?|r(ns|aight(phi|epsilon)))|i(gma(v|f)?|m(ne|dot|plus|e(q)?|l(E)?|rarr|g(E)?)?)|zlig|o(pf|ftcy|l(b(ar)?)?)|dot(e|b)?|u(ng|cc(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?|p(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|hs(ol|ub)|1|n(e|E)|2|d(sub|ot)|3|plus|e(dot)?|E|larr|mult)?|m|b(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|n(e|E)|dot|plus|e(dot)?|E|rarr|mult)?)|pa(des(uit)?|r)|e(swar|ct|tm(n|inus)|ar(hk|r(ow)?)|xt|mi|Arr)|q(su(p(set(eq)?|e)?|b(set(eq)?|e)?)|c(up(s)?|ap(s)?)|u(f|ar(e|f))?)|fr(own)?|w(nwar|ar(hk|r(ow)?)|Arr)|larr|acute|rarr|m(t(e(s)?)?|i(d|le)|eparsl|a(shp|llsetminus))|bquo)|S(scr|hort(RightArrow|DownArrow|UpArrow|LeftArrow)|c(y|irc|edil|aron)?|tar|igma|H(cy|CHcy)|opf|u(c(hThat|ceeds(SlantEqual|Tilde|Equal)?)|p(set|erset(Equal)?)?|m|b(set(Equal)?)?)|OFTcy|q(uare(Su(perset(Equal)?|bset(Equal)?)|Intersection|Union)?|rt)|fr|acute|mallCircle))|(t(s(hcy|c(y|r)|trok)|h(i(nsp|ck(sim|approx))|orn|e(ta(sym|v)?|re(4|fore))|k(sim|ap))|c(y|edil|aron)|i(nt|lde|mes(d|b(ar)?)?)|o(sa|p(cir|f(ork)?|bot)?|ea)|dot|prime|elrec|fr|w(ixt|ohead(leftarrow|rightarrow))|a(u|rget)|r(i(sb|time|dot|plus|e|angle(down|q|left(eq)?|right(eq)?)?|minus)|pezium|ade)|brk)|T(s(cr|trok)|RADE|h(i(nSpace|ckSpace)|e(ta|refore))|c(y|edil|aron)|S(cy|Hcy)|ilde(Tilde|Equal|FullEqual)?|HORN|opf|fr|a(u|b)|ripleDot))|(u(scr|h(ar(l|r)|blk)|c(y|irc)|t(ilde|dot|ri(f)?)|Har|o(pf|gon)|d(har|arr|blac)|u(arr|ml)|p(si(h|lon)?|harpoon(left|right)|downarrow|uparrows|lus|arrow)|f(isht|r)|wangle|l(c(orn(er)?|rop)|tri)|a(cute|rr)|r(c(orn(er)?|rop)|tri|ing)|grave|m(l|acr)|br(cy|eve)|Arr)|U(scr|n(ion(Plus)?|der(B(ar|rac(e|ket))|Parenthesis))|c(y|irc)|tilde|o(pf|gon)|dblac|uml|p(si(lon)?|downarrow|Tee(Arrow)?|per(RightArrow|LeftArrow)|DownArrow|Equilibrium|arrow|Arrow(Bar|DownArrow)?)|fr|a(cute|rr(ocir)?)|ring|grave|macr|br(cy|eve)))|(v(s(cr|u(pn(e|E)|bn(e|E)))|nsu(p|b)|cy|Bar(v)?|zigzag|opf|dash|prop|e(e(eq|bar)?|llip|r(t|bar))|Dash|fr|ltri|a(ngrt|r(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|t(heta|riangle(left|right))|p(hi|i|ropto)|epsilon|kappa|r(ho)?))|rtri|Arr)|V(scr|cy|opf|dash(l)?|e(e|r(yThinSpace|t(ical(Bar|Separator|Tilde|Line))?|bar))|Dash|vdash|fr|bar))|(w(scr|circ|opf|p|e(ierp|d(ge(q)?|bar))|fr|r(eath)?)|W(scr|circ|opf|edge|fr))|(X(scr|i|opf|fr)|x(s(cr|qcup)|h(arr|Arr)|nis|c(irc|up|ap)|i|o(time|dot|p(f|lus))|dtri|u(tri|plus)|vee|fr|wedge|l(arr|Arr)|r(arr|Arr)|map))|(y(scr|c(y|irc)|icy|opf|u(cy|ml)|en|fr|ac(y|ute))|Y(scr|c(y|irc)|opf|uml|Icy|Ucy|fr|acute|Acy))|(z(scr|hcy|c(y|aron)|igrarr|opf|dot|e(ta|etrf)|fr|w(nj|j)|acute)|Z(scr|c(y|aron)|Hcy|opf|dot|e(ta|roWidthSpace)|fr|acute)))(;)",
+          "match": "(&)(?=[a-zA-Z])((a(s(ymp(eq)?|cr|t)|n(d(slope|[dv]|and)?|g(s(t|ph)|zarr|e|le|rt(vb(d)?)?|msd(a([hcdefagb]))?)?)|c(y|irc|d|ute|E)?|tilde|o(pf|gon)|uml|p(id|os|prox(eq)?|[eE]|acir)?|elig|f(r)?|w(conint|int)|l(pha|e(ph|fsym))|acute|ring|grave|m(p|a(cr|lg))|breve)|A(s(sign|cr)|nd|MP|c(y|irc)|tilde|o(pf|gon)|uml|pplyFunction|fr|Elig|lpha|acute|ring|grave|macr|breve))|(B(scr|cy|opf|umpeq|e(cause|ta|rnoullis)|fr|a(ckslash|r(v|wed))|reve)|b(s(cr|im(e)?|ol(hsub|b)?|emi)|n(ot|e(quiv)?)|c(y|ong)|ig(s(tar|qcup)|c(irc|up|ap)|triangle(down|up)|o(times|dot|plus)|uplus|vee|wedge)|o(t(tom)?|pf|wtie|x(h([duDU])?|times|H([duDU])?|d([RlrL])|u([RlrL])|plus|D([RlrL])|v([RhHlrL])?|U([RlrL])|V([RhHlrL])?|minus|box))|Not|dquo|u(ll(et)?|mp(e(q)?|E)?)|prime|e(caus(e)?|t(h|ween|a)|psi|rnou|mptyv)|karow|fr|l(ock|k(1([24])|34)|a(nk|ck(square|triangle(down|left|right)?|lozenge)))|a(ck(sim(eq)?|cong|prime|epsilon)|r(vee|wed(ge)?))|r(eve|vbar)|brk(tbrk)?))|(c(s(cr|u(p(e)?|b(e)?))|h(cy|i|eck(mark)?)|ylcty|c(irc|ups(sm)?|edil|a(ps|ron))|tdot|ir(scir|c(eq|le(d(R|circ|S|dash|ast)|arrow(left|right)))?|e|fnint|E|mid)?|o(n(int|g(dot)?)|p(y(sr)?|f|rod)|lon(e(q)?)?|m(p(fn|le(xes|ment))?|ma(t)?))|dot|u(darr([lr])|p(s|c(up|ap)|or|dot|brcap)?|e(sc|pr)|vee|wed|larr(p)?|r(vearrow(left|right)|ly(eq(succ|prec)|vee|wedge)|arr(m)?|ren))|e(nt(erdot)?|dil|mptyv)|fr|w(conint|int)|lubs(uit)?|a(cute|p(s|c(up|ap)|dot|and|brcup)?|r(on|et))|r(oss|arr))|C(scr|hi|c(irc|onint|edil|aron)|ircle(Minus|Times|Dot|Plus)|Hcy|o(n(tourIntegral|int|gruent)|unterClockwiseContourIntegral|p(f|roduct)|lon(e)?)|dot|up(Cap)?|OPY|e(nterDot|dilla)|fr|lo(seCurly(DoubleQuote|Quote)|ckwiseContourIntegral)|a(yleys|cute|p(italDifferentialD)?)|ross))|(d(s(c([yr])|trok|ol)|har([lr])|c(y|aron)|t(dot|ri(f)?)|i(sin|e|v(ide(ontimes)?|onx)?|am(s|ond(suit)?)?|gamma)|Har|z(cy|igrarr)|o(t(square|plus|eq(dot)?|minus)?|ublebarwedge|pf|wn(harpoon(left|right)|downarrows|arrow)|llar)|d(otseq|a(rr|gger))?|u(har|arr)|jcy|e(lta|g|mptyv)|f(isht|r)|wangle|lc(orn|rop)|a(sh(v)?|leth|rr|gger)|r(c(orn|rop)|bkarow)|b(karow|lac)|Arr)|D(s(cr|trok)|c(y|aron)|Scy|i(fferentialD|a(critical(Grave|Tilde|Do(t|ubleAcute)|Acute)|mond))|o(t(Dot|Equal)?|uble(Right(Tee|Arrow)|ContourIntegral|Do(t|wnArrow)|Up(DownArrow|Arrow)|VerticalBar|L(ong(RightArrow|Left(RightArrow|Arrow))|eft(RightArrow|Tee|Arrow)))|pf|wn(Right(TeeVector|Vector(Bar)?)|Breve|Tee(Arrow)?|arrow|Left(RightVector|TeeVector|Vector(Bar)?)|Arrow(Bar|UpArrow)?))|Zcy|el(ta)?|D(otrahd)?|Jcy|fr|a(shv|rr|gger)))|(e(s(cr|im|dot)|n(sp|g)|c(y|ir(c)?|olon|aron)|t([ha])|o(pf|gon)|dot|u(ro|ml)|p(si(v|lon)?|lus|ar(sl)?)|e|D(ot|Dot)|q(s(im|lant(less|gtr))|c(irc|olon)|u(iv(DD)?|est|als)|vparsl)|f(Dot|r)|l(s(dot)?|inters|l)?|a(ster|cute)|r(Dot|arr)|g(s(dot)?|rave)?|x(cl|ist|p(onentiale|ectation))|m(sp(1([34]))?|pty(set|v)?|acr))|E(s(cr|im)|c(y|irc|aron)|ta|o(pf|gon)|NG|dot|uml|TH|psilon|qu(ilibrium|al(Tilde)?)|fr|lement|acute|grave|x(ists|ponentialE)|m(pty(SmallSquare|VerySmallSquare)|acr)))|(f(scr|nof|cy|ilig|o(pf|r(k(v)?|all))|jlig|partint|emale|f(ilig|l(ig|lig)|r)|l(tns|lig|at)|allingdotseq|r(own|a(sl|c(1([283456])|78|2([35])|3([845])|45|5([86])))))|F(scr|cy|illed(SmallSquare|VerySmallSquare)|o(uriertrf|pf|rAll)|fr))|(G(scr|c(y|irc|edil)|t|opf|dot|T|Jcy|fr|amma(d)?|reater(Greater|SlantEqual|Tilde|Equal(Less)?|FullEqual|Less)|g|breve)|g(s(cr|im([el])?)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|irc)|t(c(c|ir)|dot|quest|lPar|r(sim|dot|eq(qless|less)|less|a(pprox|rr)))?|imel|opf|dot|jcy|e(s(cc|dot(o(l)?)?|l(es)?)?|q(slant|q)?|l)?|v(nE|ertneqq)|fr|E(l)?|l([jEa])?|a(cute|p|mma(d)?)|rave|g(g)?|breve))|(h(s(cr|trok|lash)|y(phen|bull)|circ|o(ok(leftarrow|rightarrow)|pf|arr|rbar|mtht)|e(llip|arts(uit)?|rcon)|ks(earow|warow)|fr|a(irsp|lf|r(dcy|r(cir|w)?)|milt)|bar|Arr)|H(s(cr|trok)|circ|ilbertSpace|o(pf|rizontalLine)|ump(DownHump|Equal)|fr|a(cek|t)|ARDcy))|(i(s(cr|in(s(v)?|dot|[vE])?)|n(care|t(cal|prod|e(rcal|gers)|larhk)?|odot|fin(tie)?)?|c(y|irc)?|t(ilde)?|i(nfin|i(nt|int)|ota)?|o(cy|ta|pf|gon)|u(kcy|ml)|jlig|prod|e(cy|xcl)|quest|f([fr])|acute|grave|m(of|ped|a(cr|th|g(part|e|line))))|I(scr|n(t(e(rsection|gral))?|visible(Comma|Times))|c(y|irc)|tilde|o(ta|pf|gon)|dot|u(kcy|ml)|Ocy|Jlig|fr|Ecy|acute|grave|m(plies|a(cr|ginaryI))?))|(j(s(cr|ercy)|c(y|irc)|opf|ukcy|fr|math)|J(s(cr|ercy)|c(y|irc)|opf|ukcy|fr))|(k(scr|hcy|c(y|edil)|opf|jcy|fr|appa(v)?|green)|K(scr|c(y|edil)|Hcy|opf|Jcy|fr|appa))|(l(s(h|cr|trok|im([eg])?|q(uo(r)?|b)|aquo)|h(ar(d|u(l)?)|blk)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|ub|e(il|dil)|aron)|Barr|t(hree|c(c|ir)|imes|dot|quest|larr|r(i([ef])?|Par))?|Har|o(ng(left(arrow|rightarrow)|rightarrow|mapsto)|times|z(enge|f)?|oparrow(left|right)|p(f|lus|ar)|w(ast|bar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|r(dhar|ushar))|ur(dshar|uhar)|jcy|par(lt)?|e(s(s(sim|dot|eq(qgtr|gtr)|approx|gtr)|cc|dot(o(r)?)?|g(es)?)?|q(slant|q)?|ft(harpoon(down|up)|threetimes|leftarrows|arrow(tail)?|right(squigarrow|harpoons|arrow(s)?))|g)?|v(nE|ertneqq)|f(isht|loor|r)|E(g)?|l(hard|corner|tri|arr)?|a(ng(d|le)?|cute|t(e(s)?|ail)?|p|emptyv|quo|rr(sim|hk|tl|pl|fs|lp|b(fs)?)?|gran|mbda)|r(har(d)?|corner|tri|arr|m)|g(E)?|m(idot|oust(ache)?)|b(arr|r(k(sl([du])|e)|ac([ek]))|brk)|A(tail|arr|rr))|L(s(h|cr|trok)|c(y|edil|aron)|t|o(ng(RightArrow|left(arrow|rightarrow)|rightarrow|Left(RightArrow|Arrow))|pf|wer(RightArrow|LeftArrow))|T|e(ss(Greater|SlantEqual|Tilde|EqualGreater|FullEqual|Less)|ft(Right(Vector|Arrow)|Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|rightarrow|Floor|A(ngleBracket|rrow(RightArrow|Bar)?)))|Jcy|fr|l(eftarrow)?|a(ng|cute|placetrf|rr|mbda)|midot))|(M(scr|cy|inusPlus|opf|u|e(diumSpace|llintrf)|fr|ap)|m(s(cr|tpos)|ho|nplus|c(y|omma)|i(nus(d(u)?|b)?|cro|d(cir|dot|ast)?)|o(dels|pf)|dash|u(ltimap|map)?|p|easuredangle|DDot|fr|l(cp|dr)|a(cr|p(sto(down|up|left)?)?|l(t(ese)?|e)|rker)))|(n(s(hort(parallel|mid)|c(cue|[er])?|im(e(q)?)?|u(cc(eq)?|p(set(eq(q)?)?|[eE])?|b(set(eq(q)?)?|[eE])?)|par|qsu(pe|be)|mid)|Rightarrow|h(par|arr|Arr)|G(t(v)?|g)|c(y|ong(dot)?|up|edil|a(p|ron))|t(ilde|lg|riangle(left(eq)?|right(eq)?)|gl)|i(s(d)?|v)?|o(t(ni(v([cab]))?|in(dot|v([cab])|E)?)?|pf)|dash|u(m(sp|ero)?)?|jcy|p(olint|ar(sl|t|allel)?|r(cue|e(c(eq)?)?)?)|e(s(im|ear)|dot|quiv|ar(hk|r(ow)?)|xist(s)?|Arr)?|v(sim|infin|Harr|dash|Dash|l(t(rie)?|e|Arr)|ap|r(trie|Arr)|g([te]))|fr|w(near|ar(hk|r(ow)?)|Arr)|V(dash|Dash)|l(sim|t(ri(e)?)?|dr|e(s(s)?|q(slant|q)?|ft(arrow|rightarrow))?|E|arr|Arr)|a(ng|cute|tur(al(s)?)?|p(id|os|prox|E)?|bla)|r(tri(e)?|ightarrow|arr([cw])?|Arr)|g(sim|t(r)?|e(s|q(slant|q)?)?|E)|mid|L(t(v)?|eft(arrow|rightarrow)|l)|b(sp|ump(e)?))|N(scr|c(y|edil|aron)|tilde|o(nBreakingSpace|Break|t(R(ightTriangle(Bar|Equal)?|everseElement)|Greater(Greater|SlantEqual|Tilde|Equal|FullEqual|Less)?|S(u(cceeds(SlantEqual|Tilde|Equal)?|perset(Equal)?|bset(Equal)?)|quareSu(perset(Equal)?|bset(Equal)?))|Hump(DownHump|Equal)|Nested(GreaterGreater|LessLess)|C(ongruent|upCap)|Tilde(Tilde|Equal|FullEqual)?|DoubleVerticalBar|Precedes(SlantEqual|Equal)?|E(qual(Tilde)?|lement|xists)|VerticalBar|Le(ss(Greater|SlantEqual|Tilde|Equal|Less)?|ftTriangle(Bar|Equal)?))?|pf)|u|e(sted(GreaterGreater|LessLess)|wLine|gative(MediumSpace|Thi(nSpace|ckSpace)|VeryThinSpace))|Jcy|fr|acute))|(o(s(cr|ol|lash)|h(m|bar)|c(y|ir(c)?)|ti(lde|mes(as)?)|S|int|opf|d(sold|iv|ot|ash|blac)|uml|p(erp|lus|ar)|elig|vbar|f(cir|r)|l(c(ir|ross)|t|ine|arr)|a(st|cute)|r(slope|igof|or|d(er(of)?|[fm])?|v|arr)?|g(t|on|rave)|m(i(nus|cron|d)|ega|acr))|O(s(cr|lash)|c(y|irc)|ti(lde|mes)|opf|dblac|uml|penCurly(DoubleQuote|Quote)|ver(B(ar|rac(e|ket))|Parenthesis)|fr|Elig|acute|r|grave|m(icron|ega|acr)))|(p(s(cr|i)|h(i(v)?|one|mmat)|cy|i(tchfork|v)?|o(intint|und|pf)|uncsp|er(cnt|tenk|iod|p|mil)|fr|l(us(sim|cir|two|d([ou])|e|acir|mn|b)?|an(ck(h)?|kv))|ar(s(im|l)|t|a(llel)?)?|r(sim|n(sim|E|ap)|cue|ime(s)?|o(d|p(to)?|f(surf|line|alar))|urel|e(c(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?)?|E|ap)?|m)|P(s(cr|i)|hi|cy|i|o(incareplane|pf)|fr|lusMinus|artialD|r(ime|o(duct|portion(al)?)|ecedes(SlantEqual|Tilde|Equal)?)?))|(q(scr|int|opf|u(ot|est(eq)?|at(int|ernions))|prime|fr)|Q(scr|opf|UOT|fr))|(R(s(h|cr)|ho|c(y|edil|aron)|Barr|ight(Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|Floor|A(ngleBracket|rrow(Bar|LeftArrow)?))|o(undImplies|pf)|uleDelayed|e(verse(UpEquilibrium|E(quilibrium|lement)))?|fr|EG|a(ng|cute|rr(tl)?)|rightarrow)|r(s(h|cr|q(uo(r)?|b)|aquo)|h(o(v)?|ar(d|u(l)?))|nmid|c(y|ub|e(il|dil)|aron)|Barr|t(hree|imes|ri([ef]|ltri)?)|i(singdotseq|ng|ght(squigarrow|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(tail)?|rightarrows))|Har|o(times|p(f|lus|ar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|ldhar)|uluhar|p(polint|ar(gt)?)|e(ct|al(s|ine|part)?|g)|f(isht|loor|r)|l(har|arr|m)|a(ng([de]|le)?|c(ute|e)|t(io(nals)?|ail)|dic|emptyv|quo|rr(sim|hk|c|tl|pl|fs|w|lp|ap|b(fs)?)?)|rarr|x|moust(ache)?|b(arr|r(k(sl([du])|e)|ac([ek]))|brk)|A(tail|arr|rr)))|(s(s(cr|tarf|etmn|mile)|h(y|c(hcy|y)|ort(parallel|mid)|arp)|c(sim|y|n(sim|E|ap)|cue|irc|polint|e(dil)?|E|a(p|ron))?|t(ar(f)?|r(ns|aight(phi|epsilon)))|i(gma([vf])?|m(ne|dot|plus|e(q)?|l(E)?|rarr|g(E)?)?)|zlig|o(pf|ftcy|l(b(ar)?)?)|dot([eb])?|u(ng|cc(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?|p(s(im|u([pb])|et(neq(q)?|eq(q)?)?)|hs(ol|ub)|1|n([eE])|2|d(sub|ot)|3|plus|e(dot)?|E|larr|mult)?|m|b(s(im|u([pb])|et(neq(q)?|eq(q)?)?)|n([eE])|dot|plus|e(dot)?|E|rarr|mult)?)|pa(des(uit)?|r)|e(swar|ct|tm(n|inus)|ar(hk|r(ow)?)|xt|mi|Arr)|q(su(p(set(eq)?|e)?|b(set(eq)?|e)?)|c(up(s)?|ap(s)?)|u(f|ar([ef]))?)|fr(own)?|w(nwar|ar(hk|r(ow)?)|Arr)|larr|acute|rarr|m(t(e(s)?)?|i(d|le)|eparsl|a(shp|llsetminus))|bquo)|S(scr|hort(RightArrow|DownArrow|UpArrow|LeftArrow)|c(y|irc|edil|aron)?|tar|igma|H(cy|CHcy)|opf|u(c(hThat|ceeds(SlantEqual|Tilde|Equal)?)|p(set|erset(Equal)?)?|m|b(set(Equal)?)?)|OFTcy|q(uare(Su(perset(Equal)?|bset(Equal)?)|Intersection|Union)?|rt)|fr|acute|mallCircle))|(t(s(hcy|c([yr])|trok)|h(i(nsp|ck(sim|approx))|orn|e(ta(sym|v)?|re(4|fore))|k(sim|ap))|c(y|edil|aron)|i(nt|lde|mes(d|b(ar)?)?)|o(sa|p(cir|f(ork)?|bot)?|ea)|dot|prime|elrec|fr|w(ixt|ohead(leftarrow|rightarrow))|a(u|rget)|r(i(sb|time|dot|plus|e|angle(down|q|left(eq)?|right(eq)?)?|minus)|pezium|ade)|brk)|T(s(cr|trok)|RADE|h(i(nSpace|ckSpace)|e(ta|refore))|c(y|edil|aron)|S(cy|Hcy)|ilde(Tilde|Equal|FullEqual)?|HORN|opf|fr|a([ub])|ripleDot))|(u(scr|h(ar([lr])|blk)|c(y|irc)|t(ilde|dot|ri(f)?)|Har|o(pf|gon)|d(har|arr|blac)|u(arr|ml)|p(si(h|lon)?|harpoon(left|right)|downarrow|uparrows|lus|arrow)|f(isht|r)|wangle|l(c(orn(er)?|rop)|tri)|a(cute|rr)|r(c(orn(er)?|rop)|tri|ing)|grave|m(l|acr)|br(cy|eve)|Arr)|U(scr|n(ion(Plus)?|der(B(ar|rac(e|ket))|Parenthesis))|c(y|irc)|tilde|o(pf|gon)|dblac|uml|p(si(lon)?|downarrow|Tee(Arrow)?|per(RightArrow|LeftArrow)|DownArrow|Equilibrium|arrow|Arrow(Bar|DownArrow)?)|fr|a(cute|rr(ocir)?)|ring|grave|macr|br(cy|eve)))|(v(s(cr|u(pn([eE])|bn([eE])))|nsu([pb])|cy|Bar(v)?|zigzag|opf|dash|prop|e(e(eq|bar)?|llip|r(t|bar))|Dash|fr|ltri|a(ngrt|r(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|t(heta|riangle(left|right))|p(hi|i|ropto)|epsilon|kappa|r(ho)?))|rtri|Arr)|V(scr|cy|opf|dash(l)?|e(e|r(yThinSpace|t(ical(Bar|Separator|Tilde|Line))?|bar))|Dash|vdash|fr|bar))|(w(scr|circ|opf|p|e(ierp|d(ge(q)?|bar))|fr|r(eath)?)|W(scr|circ|opf|edge|fr))|(X(scr|i|opf|fr)|x(s(cr|qcup)|h(arr|Arr)|nis|c(irc|up|ap)|i|o(time|dot|p(f|lus))|dtri|u(tri|plus)|vee|fr|wedge|l(arr|Arr)|r(arr|Arr)|map))|(y(scr|c(y|irc)|icy|opf|u(cy|ml)|en|fr|ac(y|ute))|Y(scr|c(y|irc)|opf|uml|Icy|Ucy|fr|acute|Acy))|(z(scr|hcy|c(y|aron)|igrarr|opf|dot|e(ta|etrf)|fr|w(nj|j)|acute)|Z(scr|c(y|aron)|Hcy|opf|dot|e(ta|roWidthSpace)|fr|acute)))(;)",
           "name": "constant.character.entity.named.$2.html"
         },
         {
@@ -559,7 +550,7 @@
               "name": "punctuation.definition.entity.html"
             }
           },
-          "match": "(&)#[xX][0-9a-fA-F]+(;)",
+          "match": "(&)#[xX]\\h+(;)",
           "name": "constant.character.entity.numeric.hexadecimal.html"
         },
         {
@@ -650,13 +641,12 @@
               ]
             },
             {
-              "begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
+              "begin": "([^ \"'<>/=\\x00-\\x1F\\x7F-\\x{9F}﷐-﷯￾￿🿾🿿𯿾𯿿𿿾𿿿\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
               "beginCaptures": {
                 "0": {
                   "name": "entity.other.attribute-name.html"
                 }
               },
-              "comment": "Anything else that is valid",
               "end": "(?=\\s*+[^=\\s])",
               "name": "meta.attribute.unrecognized.$1.html",
               "patterns": [
@@ -701,7 +691,7 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)(annotation|annotation-xml|semantics|menclose|merror|mfenced|mfrac|mpadded|mphantom|mroot|mrow|msqrt|mstyle|mmultiscripts|mover|mprescripts|msub|msubsup|msup|munder|munderover|none|mlabeledtr|mtable|mtd|mtr|mlongdiv|mscarries|mscarry|msgroup|msline|msrow|mstack|maction)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)(annotation|annotation-xml|semantics|menclose|merror|mfenced|mfrac|mpadded|mphantom|mroot|mrow|msqrt|mstyle|mmultiscripts|mover|mprescripts|msub|msubsup|msup|munder|munderover|none|mlabeledtr|mtable|mtd|mtr|mlongdiv|mscarries|mscarry|msgroup|msline|msrow|mstack|maction)(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.structure.math.$2.html"
             },
             {
@@ -789,11 +779,11 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)(mi|mn|mo|ms|mspace|mtext|maligngroup|malignmark)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)(m(?:[inos]|space|text|aligngroup|alignmark))(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.inline.math.$2.html"
             },
             {
-              "begin": "(?i)(<)(mi|mn|mo|ms|mspace|mtext|maligngroup|malignmark)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
+              "begin": "(?i)(<)(m(?:[inos]|space|text|aligngroup|alignmark))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
               "beginCaptures": {
                 "0": {
                   "name": "meta.tag.inline.math.$2.start.html"
@@ -877,7 +867,7 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)(mglyph)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)(mglyph)(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.object.math.$2.html"
             },
             {
@@ -968,7 +958,7 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.other.invalid.html"
             },
             {
@@ -1114,7 +1104,7 @@
         "attribute": {
           "patterns": [
             {
-              "begin": "(s(hape-rendering|ystemLanguage|cale|t(yle|itchTiles|op-(color|opacity)|dDeviation|em(h|v)|artOffset|r(i(ng|kethrough-(thickness|position))|oke(-(opacity|dash(offset|array)|width|line(cap|join)|miterlimit))?))|urfaceScale|p(e(cular(Constant|Exponent)|ed)|acing|readMethod)|eed|lope)|h(oriz-(origin-x|adv-x)|eight|anging|ref(lang)?)|y(1|2|ChannelSelector)?|n(umOctaves|ame)|c(y|o(ntentS(criptType|tyleType)|lor(-(interpolation(-filters)?|profile|rendering))?)|ursor|l(ip(-(path|rule)|PathUnits)?|ass)|a(p-height|lcMode)|x)|t(ype|o|ext(-(decoration|anchor|rendering)|Length)|a(rget(X|Y)?|b(index|leValues))|ransform)|i(n(tercept|2)?|d(eographic)?|mage-rendering)|z(oomAndPan)?|o(p(erator|acity)|ver(flow|line-(thickness|position))|ffset|r(i(ent(ation)?|gin)|der))|d(y|i(splay|visor|ffuseConstant|rection)|ominant-baseline|ur|e(scent|celerate)|x)?|u(1|n(i(code(-(range|bidi))?|ts-per-em)|derline-(thickness|position))|2)|p(ing|oint(s(At(X|Y|Z))?|er-events)|a(nose-1|t(h(Length)?|tern(ContentUnits|Transform|Units))|int-order)|r(imitiveUnits|eserveA(spectRatio|lpha)))|e(n(d|able-background)|dgeMode|levation|x(ternalResourcesRequired|ponent))|v(i(sibility|ew(Box|Target))|-(hanging|ideographic|alphabetic|mathematical)|e(ctor-effect|r(sion|t-(origin-(y|x)|adv-y)))|alues)|k(1|2|3|e(y(Splines|Times|Points)|rn(ing|el(Matrix|UnitLength)))|4)?|f(y|il(ter(Res|Units)?|l(-(opacity|rule))?)|o(nt-(s(t(yle|retch)|ize(-adjust)?)|variant|family|weight)|rmat)|lood-(color|opacity)|r(om)?|x)|w(idth(s)?|ord-spacing|riting-mode)|l(i(ghting-color|mitingConeAngle)|ocal|e(ngthAdjust|tter-spacing)|ang)|a(scent|cc(umulate|ent-height)|ttribute(Name|Type)|zimuth|dditive|utoReverse|l(ignment-baseline|phabetic|lowReorder)|rabic-form|mplitude)|r(y|otate|e(s(tart|ult)|ndering-intent|peat(Count|Dur)|quired(Extensions|Features)|f(X|Y|errerPolicy)|l)|adius|x)?|g(1|2|lyph(Ref|-(name|orientation-(horizontal|vertical)))|radient(Transform|Units))|x(1|2|ChannelSelector|-height|link:(show|href|t(ype|itle)|a(ctuate|rcrole)|role)|ml:(space|lang|base))?|m(in|ode|e(thod|dia)|a(sk(ContentUnits|Units)?|thematical|rker(Height|-(start|end|mid)|Units|Width)|x))|b(y|ias|egin|ase(Profile|line-shift|Frequency)|box))(?![\\w:-])",
+              "begin": "(s(hape-rendering|ystemLanguage|cale|t(yle|itchTiles|op-(color|opacity)|dDeviation|em([hv])|artOffset|r(i(ng|kethrough-(thickness|position))|oke(-(opacity|dash(offset|array)|width|line(cap|join)|miterlimit))?))|urfaceScale|p(e(cular(Constant|Exponent)|ed)|acing|readMethod)|eed|lope)|h(oriz-(origin-x|adv-x)|eight|anging|ref(lang)?)|y([12]|ChannelSelector)?|n(umOctaves|ame)|c(y|o(ntentS(criptType|tyleType)|lor(-(interpolation(-filters)?|profile|rendering))?)|ursor|l(ip(-(path|rule)|PathUnits)?|ass)|a(p-height|lcMode)|x)|t(ype|o|ext(-(decoration|anchor|rendering)|Length)|a(rget([XY])?|b(index|leValues))|ransform)|i(n(tercept|2)?|d(eographic)?|mage-rendering)|z(oomAndPan)?|o(p(erator|acity)|ver(flow|line-(thickness|position))|ffset|r(i(ent(ation)?|gin)|der))|d(y|i(splay|visor|ffuseConstant|rection)|ominant-baseline|ur|e(scent|celerate)|x)?|u(1|n(i(code(-(range|bidi))?|ts-per-em)|derline-(thickness|position))|2)|p(ing|oint(s(At([XYZ]))?|er-events)|a(nose-1|t(h(Length)?|tern(ContentUnits|Transform|Units))|int-order)|r(imitiveUnits|eserveA(spectRatio|lpha)))|e(n(d|able-background)|dgeMode|levation|x(ternalResourcesRequired|ponent))|v(i(sibility|ew(Box|Target))|-(hanging|ideographic|alphabetic|mathematical)|e(ctor-effect|r(sion|t-(origin-([yx])|adv-y)))|alues)|k([123]|e(y(Splines|Times|Points)|rn(ing|el(Matrix|UnitLength)))|4)?|f(y|il(ter(Res|Units)?|l(-(opacity|rule))?)|o(nt-(s(t(yle|retch)|ize(-adjust)?)|variant|family|weight)|rmat)|lood-(color|opacity)|r(om)?|x)|w(idth(s)?|ord-spacing|riting-mode)|l(i(ghting-color|mitingConeAngle)|ocal|e(ngthAdjust|tter-spacing)|ang)|a(scent|cc(umulate|ent-height)|ttribute(Name|Type)|zimuth|dditive|utoReverse|l(ignment-baseline|phabetic|lowReorder)|rabic-form|mplitude)|r(y|otate|e(s(tart|ult)|ndering-intent|peat(Count|Dur)|quired(Extensions|Features)|f([XY]|errerPolicy)|l)|adius|x)?|g([12]|lyph(Ref|-(name|orientation-(horizontal|vertical)))|radient(Transform|Units))|x([12]|ChannelSelector|-height|link:(show|href|t(ype|itle)|a(ctuate|rcrole)|role)|ml:(space|lang|base))?|m(in|ode|e(thod|dia)|a(sk(ContentUnits|Units)?|thematical|rker(Height|-(start|end|mid)|Units|Width)|x))|b(y|ias|egin|ase(Profile|line-shift|Frequency)|box))(?![\\w:-])",
               "beginCaptures": {
                 "0": {
                   "name": "entity.other.attribute-name.html"
@@ -1129,13 +1119,12 @@
               ]
             },
             {
-              "begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
+              "begin": "([^ \"'<>/=\\x00-\\x1F\\x7F-\\x{9F}﷐-﷯￾￿🿾🿿𯿾𯿿𿿾𿿿\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
               "beginCaptures": {
                 "0": {
                   "name": "entity.other.attribute-name.html"
                 }
               },
-              "comment": "Anything else that is valid",
               "end": "(?=\\s*+[^=\\s])",
               "name": "meta.attribute.unrecognized.$1.html",
               "patterns": [
@@ -1180,7 +1169,7 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)(color-profile|desc|metadata|script|style|title)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)(color-profile|desc|metadata|script|style|title)(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.metadata.svg.$2.html"
             },
             {
@@ -1268,7 +1257,7 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.structure.svg.$2.html"
             },
             {
@@ -1356,7 +1345,7 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.inline.svg.$2.html"
             },
             {
@@ -1444,7 +1433,7 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)(circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)(circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.object.svg.$2.html"
             },
             {
@@ -1535,7 +1524,7 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.other.svg.$2.html"
             },
             {
@@ -1632,7 +1621,7 @@
                   "name": "punctuation.definition.tag.end.html"
                 }
               },
-              "match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
+              "match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>)",
               "name": "meta.element.other.invalid.html"
             },
             {
@@ -1935,7 +1924,7 @@
                     },
                     {
                       "begin": "\\G",
-                      "end": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=>\t\t\t\t\t\t\t\t\t\t\t# Tag without type attribute\n\t\t\t\t\t\t\t\t\t\t\t\t  | type(?=[\\s=])\n\t\t\t\t\t\t\t\t\t\t\t\t  \t(?!\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t''\t\t\t\t\t\t\t\t# Empty\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | \"\"\t\t\t\t\t\t\t\t\t#   Values\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | ('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\t\t\t\t\t\t\t# Text mime-types\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tjavascript(1\\.[0-5])?\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | x-javascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | jscript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | livescript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-)?ecmascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | babel\t\t\t\t\t\t# Javascript variant currently\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t\t\t\t\t\t\t\t#   recognized as such\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | application/\t\t\t\t\t# Application mime-types\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(x-)?javascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-)?ecmascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | module\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+                      "end": "(?i:(?=>|type(?=[\\s=])(?!\\s*=\\s*(''|\"\"|(['\"]|)(text/(javascript(1\\.[0-5])?|x-javascript|jscript|livescript|(x-)?ecmascript|babel)|application/((x-)?javascript|(x-)?ecmascript)|module)[\\s\"'>]))))",
                       "name": "meta.tag.metadata.script.start.html",
                       "patterns": [
                         {
@@ -1944,7 +1933,7 @@
                       ]
                     },
                     {
-                      "begin": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t\t\t\t\t\t\ttype\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\n\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\tx-handlebars\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-(handlebars-)?|ng-)?template\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | html\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+                      "begin": "(?i:(?=type\\s*=\\s*(['\"]|)text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'>]))",
                       "end": "((<))(?=/(?i:script))",
                       "endCaptures": {
                         "0": {
@@ -2568,7 +2557,7 @@
           "include": "#svg"
         },
         {
-          "begin": "(<)([a-zA-Z][.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*-[\\-.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*)(?=\\s|/?>)",
+          "begin": "(<)([a-zA-Z][.0-9_a-zA-Z·À-ÖØ-öø-ͽͿ-῿‌-‍‿-⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]*-[-.0-9_a-zA-Z·À-ÖØ-öø-ͽͿ-῿‌-‍‿-⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]*)(?=\\s|/?>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.html"
@@ -2591,7 +2580,7 @@
           ]
         },
         {
-          "begin": "(</)([a-zA-Z][.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*-[\\-.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*)(?=\\s|/?>)",
+          "begin": "(</)([a-zA-Z][.0-9_a-zA-Z·À-ÖØ-öø-ͽͿ-῿‌-‍‿-⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]*-[-.0-9_a-zA-Z·À-ÖØ-öø-ͽͿ-῿‌-‍‿-⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]*)(?=\\s|/?>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.html"
diff --git a/resources/languages/http.json b/resources/languages/http.json
index 10659c7..7087871 100644
--- a/resources/languages/http.json
+++ b/resources/languages/http.json
@@ -8,7 +8,7 @@
   "patterns": [
     {
       "begin": "^\\s*(?=curl)",
-      "end": "^\\s*(\\#{3,}.*?)?\\s*$",
+      "end": "^\\s*(#{3,}.*?)?\\s*$",
       "endCaptures": {
         "0": {
           "name": "comment.line.sharp.http"
@@ -22,8 +22,8 @@
       ]
     },
     {
-      "begin": "\\s*(?=(\\[|{[^{]))",
-      "end": "^\\s*(\\#{3,}.*?)?\\s*$",
+      "begin": "\\s*(?=(\\[|\\{[^{]))",
+      "end": "^\\s*(#{3,}.*?)?\\s*$",
       "endCaptures": {
         "0": {
           "name": "comment.line.sharp.http"
@@ -38,7 +38,7 @@
     },
     {
       "begin": "^\\s*(?=<\\S)",
-      "end": "^\\s*(\\#{3,}.*?)?\\s*$",
+      "end": "^\\s*(#{3,}.*?)?\\s*$",
       "endCaptures": {
         "0": {
           "name": "comment.line.sharp.http"
@@ -53,7 +53,7 @@
     },
     {
       "begin": "\\s*(?=(query|mutation))",
-      "end": "^\\s*(\\#{3,}.*?)?\\s*$",
+      "end": "^\\s*(#{3,}.*?)?\\s*$",
       "endCaptures": {
         "0": {
           "name": "comment.line.sharp.http"
@@ -109,7 +109,7 @@
           "name": "string.other.http"
         }
       },
-      "match": "^\\s*(\\?|&)([^=\\s]+)=(.*)$",
+      "match": "^\\s*([?\\&])([^=\\s]+)=(.*)$",
       "name": "http.query"
     },
     {
@@ -124,7 +124,7 @@
           "name": "string.other.http"
         }
       },
-      "match": "^([\\w\\-]+)\\s*(\\:)\\s*([^/].*?)\\s*$",
+      "match": "^([\\w-]+)\\s*(:)\\s*([^/].*?)\\s*$",
       "name": "http.headers"
     },
     {
@@ -138,11 +138,11 @@
     "comments": {
       "patterns": [
         {
-          "match": "^\\s*\\#{1,}.*$",
+          "match": "^\\s*#+.*$",
           "name": "comment.line.sharp.http"
         },
         {
-          "match": "^\\s*\\/{2,}.*$",
+          "match": "^\\s*/{2,}.*$",
           "name": "comment.line.double-slash.http"
         }
       ]
@@ -161,7 +161,7 @@
               "name": "entity.name.type.http"
             }
           },
-          "match": "^\\s*\\#{1,}\\s+(?:((@)name)\\s+([^\\s\\.]+))$",
+          "match": "^\\s*#+\\s+((@)name)\\s+([^\\s.]+)$",
           "name": "comment.line.sharp.http"
         },
         {
@@ -176,7 +176,7 @@
               "name": "entity.name.type.http"
             }
           },
-          "match": "^\\s*\\/{2,}\\s+(?:((@)name)\\s+([^\\s\\.]+))$",
+          "match": "^\\s*/{2,}\\s+((@)name)\\s+([^\\s.]+)$",
           "name": "comment.line.double-slash.http"
         },
         {
@@ -188,7 +188,7 @@
               "name": "punctuation.definition.block.tag.metadata"
             }
           },
-          "match": "^\\s*\\#{1,}\\s+((@)note)\\s*$",
+          "match": "^\\s*#+\\s+((@)note)\\s*$",
           "name": "comment.line.sharp.http"
         },
         {
@@ -200,7 +200,7 @@
               "name": "punctuation.definition.block.tag.metadata"
             }
           },
-          "match": "^\\s*\\/{2,}\\s+((@)note)\\s*$",
+          "match": "^\\s*/{2,}\\s+((@)note)\\s*$",
           "name": "comment.line.double-slash.http"
         },
         {
@@ -218,7 +218,7 @@
               "name": "string.other.http"
             }
           },
-          "match": "^\\s*\\#{1,}\\s+(?:((@)prompt)\\s+([^\\s]+)(?:\\s+(.*))?\\s*)$",
+          "match": "^\\s*#+\\s+((@)prompt)\\s+(\\S+)(?:\\s+(.*))?\\s*$",
           "name": "comment.line.sharp.http"
         },
         {
@@ -236,7 +236,7 @@
               "name": "string.other.http"
             }
           },
-          "match": "^\\s*\\/{2,}\\s+(?:((@)prompt)\\s+([^\\s]+)(?:\\s+(.*))?\\s*)$",
+          "match": "^\\s*/{2,}\\s+((@)prompt)\\s+(\\S+)(?:\\s+(.*))?\\s*$",
           "name": "comment.line.double-slash.http"
         }
       ]
@@ -273,7 +273,7 @@
           ]
         }
       },
-      "match": "(?i)^(?:(get|post|put|delete|patch|head|options|connect|trace|lock|unlock|propfind|proppatch|copy|move|mkcol|mkcalendar|acl|search)\\s+)\\s*(.+?)(?:\\s+(HTTP\\/\\S+))?$",
+      "match": "(?i)^(get|post|put|delete|patch|head|options|connect|trace|lock|unlock|propfind|proppatch|copy|move|mkcol|mkcalendar|acl|search)\\s+\\s*(.+?)(?:\\s+(HTTP/\\S+))?$",
       "name": "http.requestline"
     },
     "response-line": {
@@ -292,7 +292,7 @@
           "name": "string.other.http"
         }
       },
-      "match": "(?i)^\\s*(HTTP\\/\\S+)\\s([1-5][0-9][0-9])\\s(.*)$",
+      "match": "(?i)^\\s*(HTTP/\\S+)\\s([1-5][0-9][0-9])\\s(.*)$",
       "name": "http.responseLine"
     }
   },
diff --git a/resources/languages/hxml.json b/resources/languages/hxml.json
index 802bc39..57ffda4 100644
--- a/resources/languages/hxml.json
+++ b/resources/languages/hxml.json
@@ -42,7 +42,7 @@
           "name": "entity.name.type.hx"
         }
       },
-      "match": "(?<!\\w)(-m|-main|--main|--run)\\b\\s*\\b(?:(([a-z][a-zA-Z0-9]*\\.)*)(_*[A-Z]\\w*))?\\b"
+      "match": "(?<!\\w)(-(?:m|main|-main|-run))\\b\\s*\\b(?:(([a-z][a-zA-Z0-9]*\\.)*)(_*[A-Z]\\w*))?\\b"
     },
     {
       "captures": {
@@ -50,7 +50,7 @@
           "name": "keyword.other.hxml"
         }
       },
-      "match": "(?<!\\w)(-cppia|-cpp?|-js|-as3|-swf-(header|version|lib(-extern)?)|-swf9?|-neko|-python|-php|-cs|-java-lib|-java|-xml|-lua|-hl|-x|-lib|-D|-resource|-exclude|-version|-v|-debug|-prompt|-cmd|-dce\\s+(std|full|no)?|--flash-strict|--no-traces|--flash-use-stage|--neko-source|--gen-hx-classes|-net-lib|-net-std|-c-arg|--each|--next|--display|--no-output|--times|--no-inline|--no-opt|--php-front|--php-lib|--php-prefix|--remap|--help-defines|--help-metas|-help|--help|-java|-cs|--js-modern|--interp|--eval|--dce|--wait|--connect|--cwd|--run).*$"
+      "match": "(?<!\\w)(-(?:cppia|cpp?|js|as3|swf-(header|version|lib(-extern)?)|swf9?|neko|python|php|cs|java-lib|java|xml|lua|hl|x|lib|D|resource|exclude|version|v|debug|prompt|cmd|dce\\s+(std|full|no)?|-flash-strict|-no-traces|-flash-use-stage|-neko-source|-gen-hx-classes|net-lib|net-std|c-arg|-each|-next|-display|-no-output|-times|-no-inline|-no-opt|-php-front|-php-lib|-php-prefix|-remap|-help-defines|-help-metas|help|-help|java|cs|-js-modern|-interp|-eval|-dce|-wait|-connect|-cwd|-run)).*$"
     },
     {
       "captures": {
@@ -58,7 +58,7 @@
           "name": "keyword.other.hxml"
         }
       },
-      "match": "(?<!\\w)(--js(on)?|--lua|--swf-(header|version|lib(-extern)?)|--swf|--as3|--neko|--php|--cppia|--cpp|--cppia|--cs|--java-lib(-extern)?|--java|--jvm|--python|--hl|-p|--class-path|-L|--library|--define|-r|--resource|--cmd|-C|--verbose|--debug|--prompt|--xml|--json|--net-lib|--net-std|--c-arg|--version|--haxelib-global|-h|--main|--server-connect|--server-listen).*$"
+      "match": "(?<!\\w)(-(?:-js(on)?|-lua|-swf-(header|version|lib(-extern)?)|-swf|-as3|-neko|-php|-cppia|-cpp|-cppia|-cs|-java-lib(-extern)?|-java|-jvm|-python|-hl|p|-class-path|L|-library|-define|r|-resource|-cmd|C|-verbose|-debug|-prompt|-xml|-json|-net-lib|-net-std|-c-arg|-version|-haxelib-global|h|-main|-server-connect|-server-listen)).*$"
     }
   ],
   "scopeName": "source.hxml"
diff --git a/resources/languages/hy.json b/resources/languages/hy.json
index a4f7abc..3f5dd42 100644
--- a/resources/languages/hy.json
+++ b/resources/languages/hy.json
@@ -38,11 +38,11 @@
     "builtin": {
       "patterns": [
         {
-          "match": "(?<![\\.:\\w_\\-=!@\\$%^&?/<>*])(abs|all|any|ascii|bin|breakpoint|callable|chr|compile|delattr|dir|divmod|eval|exec|format|getattr|globals|hasattr|hash|hex|id|input|isinstance|issubclass|iter|aiter|len|locals|max|min|next|anext|oct|ord|pow|print|repr|round|setattr|sorted|sum|vars|False|None|True|NotImplemented|bool|memoryview|bytearray|bytes|classmethod|complex|dict|enumerate|filter|float|frozenset|property|int|list|map|object|range|reversed|set|slice|staticmethod|str|super|tuple|type|zip|open|quit|exit|copyright|credits|help)(?![\\.:\\w_\\-=!@\\$%^&?/<>*])",
+          "match": "(?<![.:\\w_\\-=!@$%^\\&?/<>*])(abs|all|any|ascii|bin|breakpoint|callable|chr|compile|delattr|dir|divmod|eval|exec|format|getattr|globals|hasattr|hash|hex|id|input|isinstance|issubclass|iter|aiter|len|locals|max|min|next|anext|oct|ord|pow|print|repr|round|setattr|sorted|sum|vars|False|None|True|NotImplemented|bool|memoryview|bytearray|bytes|classmethod|complex|dict|enumerate|filter|float|frozenset|property|int|list|map|object|range|reversed|set|slice|staticmethod|str|super|tuple|type|zip|open|quit|exit|copyright|credits|help)(?![.:\\w_\\-=!@$%^\\&?/<>*])",
           "name": "storage.builtin.hy"
         },
         {
-          "match": "(?<=\\(\\s{0,254})\\.\\.\\.(?![\\.:\\w_\\-=!@\\$%^&?/<>*])",
+          "match": "(?<=\\(\\s*)\\.\\.\\.(?![.:\\w_\\-=!@$%^\\&?/<>*])",
           "name": "storage.builtin.dots.hy"
         }
       ]
@@ -58,23 +58,23 @@
     "constants": {
       "patterns": [
         {
-          "match": "(?<=[\\{\\[\\(\\s])([0-9]+(\\.[0-9]+)?|(#x)[0-9a-fA-F]+|(#o)[0-7]+|(#b)[01]+)(?=[\\s;()'\",\\[\\]\\{\\}])",
+          "match": "(?<=[{\\[(\\s])([0-9]+(\\.[0-9]+)?|(#x)\\h+|(#o)[0-7]+|(#b)[01]+)(?=[\\s;()'\",\\[\\]{}])",
           "name": "constant.numeric.hy"
         }
       ]
     },
     "keysym": {
-      "match": "(?<![\\.:\\w_\\-=!@\\$%^&?\\/<>*]):[\\.:\\w_\\-=!@\\$%^&?\\/<>*]*",
+      "match": "(?<![.:\\w_\\-=!@$%^\\&?/<>*]):[.:\\w_\\-=!@$%^\\&?/<>*]*",
       "name": "variable.other.constant"
     },
     "keywords": {
       "patterns": [
         {
-          "match": "(?<![\\.:\\w_\\-=!@\\$%^&?/<>*])(and|await|match|let|annotate|assert|break|chainc|cond|continue|deftype|do|except\\*?|finally|else|defreader|([dgls])?for|set[vx]|defclass|defmacro|del|export|eval-and-compile|eval-when-compile|get|global|if|import|(de)?fn|nonlocal|not-in|or|(quasi)?quote|require|return|cut|raise|try|unpack-iterable|unpack-mapping|unquote|unquote-splice|when|while|with|yield|local-macros|in|is|py(s)?|pragma|nonlocal|(is-)?not)(?![\\.:\\w_\\-=!@\\$%^&?/<>*])",
+          "match": "(?<![.:\\w_\\-=!@$%^\\&?/<>*])(and|await|match|let|annotate|assert|break|chainc|cond|continue|deftype|do|except\\*?|finally|else|defreader|([dgls])?for|set[vx]|defclass|defmacro|del|export|eval-and-compile|eval-when-compile|get|global|if|import|(de)?fn|nonlocal|not-in|or|(quasi)?quote|require|return|cut|raise|try|unpack-iterable|unpack-mapping|unquote|unquote-splice|when|while|with|yield|local-macros|in|is|py(s)?|pragma|nonlocal|(is-)?not)(?![.:\\w_\\-=!@$%^\\&?/<>*])",
           "name": "keyword.control.hy"
         },
         {
-          "match": "(?<=\\(\\s{0,254})\\.(?![\\.:\\w_\\-=!@\\$%^&?/<>*])",
+          "match": "(?<=\\(\\s*)\\.(?![.:\\w_\\-=!@$%^\\&?/<>*])",
           "name": "keyword.control.dot.hy"
         }
       ]
@@ -82,14 +82,14 @@
     "operators": {
       "patterns": [
         {
-          "match": "(?<![\\.:\\w_\\-=!@\\$%^&?/<>*])(\\+=?|\\/\\/?=?|\\*\\*?=?|--?=?|[!<>]?=|@=?|%=?|<<?=?|>>?=?|&=?|\\|=?|\\^|~@|~=?|#\\*\\*?)(?![\\.:\\w_\\-=!@\\$%^&?/<>*])",
+          "match": "(?<![.:\\w_\\-=!@$%^\\&?/<>*])(\\+=?|//?=?|\\*\\*?=?|--?=?|[!<>]?=|@=?|%=?|<<?=?|>>?=?|&=?|\\|=?|\\^|~@|~=?|#\\*\\*?)(?![.:\\w_\\-=!@$%^\\&?/<>*])",
           "name": "keyword.control.hy"
         }
       ]
     },
     "strings": {
-      "begin": "(f?\"|}(?=[^\n]*?[{\"]))",
-      "end": "(\"|(?<=[\"}][^\n]{0,254}?){)",
+      "begin": "(f?\"|}(?=\\N*?[{\"]))",
+      "end": "(\"|(?<=[\"}]\\N*?)\\{)",
       "name": "string.quoted.double.hy",
       "patterns": [
         {
@@ -99,7 +99,7 @@
       ]
     },
     "symbol": {
-      "match": "(?<![\\.:\\w_\\-=!@\\$%^&?/<>*#])[\\.a-zA-ZΑ-Ωα-ω_\\-=!@\\$%^<?/<>*#][\\.:\\w_\\-=!@\\$%^&?/<>*#]*",
+      "match": "(?<![.:\\w_\\-=!@$%^\\&?/<>*#])[.a-zA-ZΑ-Ωα-ω_\\-=!@$%^<?/>*#][.:\\w_\\-=!@$%^\\&?/<>*#]*",
       "name": "variable.other.hy"
     }
   },
diff --git a/resources/languages/imba.json b/resources/languages/imba.json
index 699c031..12a40f7 100644
--- a/resources/languages/imba.json
+++ b/resources/languages/imba.json
@@ -27,7 +27,7 @@
           "name": "meta.brace.square.imba"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.imba"
@@ -89,11 +89,11 @@
     "boolean-literal": {
       "patterns": [
         {
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(true|yes)(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(true|yes)(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "constant.language.boolean.true.imba"
         },
         {
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(false|no)(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(false|no)(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "constant.language.boolean.false.imba"
         }
       ]
@@ -101,7 +101,7 @@
     "brackets": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}|(?=\\*/)",
           "patterns": [
             {
@@ -111,7 +111,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]|(?=\\*/)",
+          "end": "]|(?=\\*/)",
           "patterns": [
             {
               "include": "#brackets"
@@ -164,7 +164,7 @@
           "name": "comment.block.imba"
         },
         {
-          "begin": "(### \\@ts(?=\\s|$))",
+          "begin": "(### @ts(?=\\s|$))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.imba"
@@ -177,12 +177,7 @@
               "name": "punctuation.definition.comment.imba"
             }
           },
-          "name": "ts.block.imba",
-          "patterns": [
-            {
-              "include": "source.ts"
-            }
-          ]
+          "name": "ts.block.imba"
         },
         {
           "begin": "(###)",
@@ -191,7 +186,7 @@
               "name": "punctuation.definition.comment.imba"
             }
           },
-          "end": "###(?:[ \\t]*\\n)",
+          "end": "###[ \\t]*\\n",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.imba"
@@ -200,7 +195,7 @@
           "name": "comment.block.imba"
         },
         {
-          "begin": "(^[ \\t]+)?((//|\\#\\s)(?:\\s*((@)internal)(?=\\s|$))?)",
+          "begin": "(^[ \\t]+)?((//|#\\s)(?:\\s*((@)internal)(?=\\s|$))?)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.whitespace.comment.leading.imba"
@@ -230,7 +225,7 @@
           "name": "support.constant.color.w3c-standard-color-name.css"
         },
         {
-          "match": "(?xi) (?<![\\w-])\n(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood\n|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan\n|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange\n|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise\n|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen\n|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki\n|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow\n|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray\n|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue\n|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise\n|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered\n|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum\n|powderblue|rebeccapurple|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell\n|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato\n|transparent|turquoise|violet|wheat|whitesmoke|yellowgreen)\n(?![\\w-])",
+          "match": "(?i)(?<![\\w-])(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|rebeccapurple|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato|transparent|turquoise|violet|wheat|whitesmoke|yellowgreen)(?![\\w-])",
           "name": "support.constant.color.w3c-extended-color-name.css"
         },
         {
@@ -242,7 +237,7 @@
     "css-combinators": {
       "patterns": [
         {
-          "match": ">>>|>>|>|\\+|~",
+          "match": ">>>|>>|[>+~]",
           "name": "punctuation.separator.combinator.css"
         },
         {
@@ -258,11 +253,11 @@
     "css-comment": {
       "patterns": [
         {
-          "match": "\\#(\\s.+)?(\\n|$)",
+          "match": "#(\\s.+)?(\\n|$)",
           "name": "comment.line.imba"
         },
         {
-          "match": "(^\\t+)(\\#(\\s.+)?(\\n|$))",
+          "match": "(^\\t+)(#(\\s.+)?(\\n|$))",
           "name": "comment.line.imba"
         }
       ]
@@ -270,7 +265,7 @@
     "css-escapes": {
       "patterns": [
         {
-          "match": "\\\\[0-9a-fA-F]{1,6}",
+          "match": "\\\\\\h{1,6}",
           "name": "constant.character.escape.codepoint.css"
         },
         {
@@ -337,7 +332,7 @@
           ]
         },
         {
-          "begin": "(?xi) (?<![\\w-])\n(\n  (?:-webkit-|-moz-|-o-)?    # Accept prefixed/historical variants\n  (?:repeating-)?            # \"Repeating\"-type gradient\n  (?:linear|radial|conic)    # Shape\n  -gradient\n)\n(\\()",
+          "begin": "(?i)(?<![\\w-])((?:-(?:webkit-|moz-|o-))?(?:repeating-)?(?:linear|radial|conic)-gradient)(\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.gradient.css"
@@ -409,7 +404,7 @@
           ]
         },
         {
-          "begin": "(?xi) (?<![\\w-])\n(annotation|attr|blur|brightness|character-variant|contrast|counters?\n|cross-fade|drop-shadow|element|fit-content|format|grayscale|hue-rotate\n|image-set|invert|local|minmax|opacity|ornaments|repeat|saturate|sepia\n|styleset|stylistic|swash|symbols)\n(\\()",
+          "begin": "(?i)(?<![\\w-])(annotation|attr|blur|brightness|character-variant|contrast|counters?|cross-fade|drop-shadow|element|fit-content|format|grayscale|hue-rotate|image-set|invert|local|minmax|opacity|ornaments|repeat|saturate|sepia|styleset|stylistic|swash|symbols)(\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.misc.css"
@@ -494,7 +489,7 @@
           ]
         },
         {
-          "begin": "(?xi) (?<![\\w-])\n( (?:translate|scale|rotate)(?:[XYZ]|3D)?\n| matrix(?:3D)?\n| skew[XY]?\n| perspective\n)\n(\\()",
+          "begin": "(?i)(?<![\\w-])((?:translate|scale|rotate)(?:[XYZ]|3D)?|matrix(?:3D)?|skew[XY]?|perspective)(\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.transform.css"
@@ -525,7 +520,7 @@
               "name": "punctuation.definition.constant.css"
             }
           },
-          "match": "(#)(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})\\b",
+          "match": "(#)(?:\\h{3,4}|\\h{6}|\\h{8})\\b",
           "name": "constant.other.color.rgb-value.hex.css"
         },
         {
@@ -537,7 +532,7 @@
               "name": "keyword.other.unit.${2:/downcase}.css"
             }
           },
-          "match": "(?xi) (?<![\\w-])\n[-+]?                               # Sign indicator\n\n(?:                                 # Numerals\n    [0-9]+ (?:\\.[0-9]+)?           # Integer/float with leading digits\n  | \\.[0-9]+                       # Float without leading digits\n)\n\n(?:                                 # Scientific notation\n  (?<=[0-9])                        # Exponent must follow a digit\n  E                                 # Exponent indicator\n  [-+]?                             # Possible sign indicator\n  [0-9]+                            # Exponent value\n)?\n\n(?:                                 # Possible unit for data-type:\n  (%)                               # - Percentage\n  | ( deg|grad|rad|turn             # - Angle\n    | Hz|kHz                        # - Frequency\n    | ch|cm|em|ex|fr|in|mm|mozmm|   # - Length\n      pc|pt|px|q|rem|vh|vmax|vmin|\n      vw\n    | dpi|dpcm|dppx                 # - Resolution\n    | s|ms                          # - Time\n    )\n  \\b                               # Boundary checking intentionally lax to\n)?                                  # facilitate embedding in CSS-like grammars",
+          "match": "(?i)(?<![\\w-])[-+]?(?:[0-9]+(?:\\.[0-9]+)?|\\.[0-9]+)(?:(?<=[0-9])E[-+]?[0-9]+)?(?:(%)|(deg|grad|rad|turn|Hz|kHz|ch|cm|em|ex|fr|in|mm|mozmm|pc|pt|px|q|rem|vh|vmax|vmin|vw|dpi|dpcm|dppx|s|ms)\\b)?",
           "name": "constant.numeric.css"
         }
       ]
@@ -580,7 +575,7 @@
           "name": "invalid.illegal.colon.css"
         }
       },
-      "match": "(?xi)\n(:)(:*)\n(?: active|any-link|checked|default|defined|disabled|empty|enabled|first\n  | (?:first|last|only)-(?:child|of-type)|focus|focus-visible|focus-within\n  | fullscreen|host|hover|in-range|indeterminate|invalid|left|link\n  | optional|out-of-range|placeholder-shown|read-only|read-write\n  | required|right|root|scope|target|unresolved\n  | valid|visited\n)(?![\\w-]|\\s*[;}])",
+      "match": "(?i)(:)(:*)(?:active|any-link|checked|default|defined|disabled|empty|enabled|first|(?:first|last|only)-(?:child|of-type)|focus|focus-visible|focus-within|fullscreen|host|hover|in-range|indeterminate|invalid|left|link|optional|out-of-range|placeholder-shown|read-only|read-write|required|right|root|scope|target|unresolved|valid|visited)(?![\\w-]|\\s*[;}])",
       "name": "entity.other.attribute-name.pseudo-class.css"
     },
     "css-pseudo-elements": {
@@ -592,12 +587,12 @@
           "name": "punctuation.definition.entity.css"
         }
       },
-      "match": "(?xi)\n(?:\n  (::?)                       # Elements using both : and :: notation\n  (?: after\n    | before\n    | first-letter\n    | first-line\n    | (?:-(?:ah|apple|atsc|epub|hp|khtml|moz\n            |ms|o|rim|ro|tc|wap|webkit|xv)\n        | (?:mso|prince))\n      -[a-z-]+\n  )\n  |\n  (::)                        # Double-colon only\n  (?: backdrop\n    | content\n    | grammar-error\n    | marker\n    | placeholder\n    | selection\n    | shadow\n    | spelling-error\n  )\n)\n(?![\\w-]|\\s*[;}])",
+      "match": "(?i)(?:(::?)(?:after|before|first-letter|first-line|(?:-(?:ah|apple|atsc|epub|hp|khtml|moz|ms|o|rim|ro|tc|wap|webkit|xv)|(?:mso|prince))-[a-z-]+)|(::)(?:backdrop|content|grammar-error|marker|placeholder|selection|shadow|spelling-error))(?![\\w-]|\\s*[;}])",
       "name": "entity.other.attribute-name.pseudo-element.css"
     },
     "css-selector": {
-      "begin": "(?<=css\\s)(?!(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=])[^\\:])",
-      "end": "(\\s*(?=(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=])[^\\:])|\\s*$|(?=\\s+\\#\\s))",
+      "begin": "(?<=css\\s)(?![\\^@.%\\w$!-]+\\s*[:=][^:])",
+      "end": "(\\s*(?=[\\^@.%\\w$!-]+\\s*[:=][^:])|\\s*$|(?=\\s+#\\s))",
       "endCaptures": {
         "0": {
           "name": "punctuation.separator.sel-properties.css"
@@ -622,7 +617,7 @@
           "include": "#css-combinators"
         },
         {
-          "match": "(\\%[\\w\\-]+)",
+          "match": "(%[\\w-]+)",
           "name": "entity.other.attribute-name.mixin.css"
         },
         {
@@ -636,7 +631,7 @@
               "name": "punctuation.definition.entity.begin.bracket.square.css"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.entity.end.bracket.square.css"
@@ -680,7 +675,7 @@
                   "name": "entity.other.namespace-prefix.css"
                 }
               },
-              "match": "(-?(?!\\d)(?:[\\w-]|[^\\\\x00-\\\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))+|\\*)(?=\\|(?!\\s|=|$|\\])(?:-?(?!\\d)|[\\\\\\w-]|[^\\\\x00-\\\\x7F]))"
+              "match": "(-?(?!\\d)(?:[\\w\\-[^\\\\x00-\\\\7F]]|\\\\(?:\\h{1,6}|.))+|\\*)(?=\\|(?![\\s=]|$|])(?:-?(?!\\d)|[\\\\\\w\\-[^\\\\x00-\\\\7F]]))"
             },
             {
               "captures": {
@@ -688,7 +683,7 @@
                   "name": "entity.other.attribute-name.css"
                 }
               },
-              "match": "(-?(?!\\d)(?>[\\w-]|[^\\\\x00-\\\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))+)\\s*(?=[~|^\\]$*=]|/\\*)"
+              "match": "(-?(?!\\d)(?>[\\w\\-[^\\\\x00-\\\\7F]]|\\\\(?:\\h{1,6}|.))+)\\s*(?=[~|^\\]$*=]|/\\*)"
             }
           ]
         },
@@ -718,7 +713,7 @@
           "name": "meta.brace.curly.imba"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "meta.brace.curly.imba"
@@ -734,7 +729,7 @@
       ]
     },
     "decorator": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\@(?!\\@)",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))@(?!@)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.decorator.imba"
@@ -749,7 +744,7 @@
       ]
     },
     "directives": {
-      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)",
+      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))+\\s*/>\\s*$)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.imba"
@@ -805,7 +800,7 @@
               "name": "constant.language.access-type.jsdoc"
             }
           },
-          "match": "((@)(?:access|api))\\s+(private|protected|public)\\b"
+          "match": "((@)a(?:ccess|pi))\\s+(p(?:rivate|rotected|ublic))\\b"
         },
         {
           "captures": {
@@ -932,7 +927,7 @@
               "name": "entity.name.type.instance.jsdoc"
             }
           },
-          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*\\])?{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
+          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*])?\\{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
         },
         {
           "captures": {
@@ -963,7 +958,7 @@
           "match": "((@)(?:arg|argument|const|constant|member|namespace|param|var))\\s+([A-Za-z_$][\\w$.\\[\\]]*)"
         },
         {
-          "begin": "((@)typedef)\\s+(?={)",
+          "begin": "((@)typedef)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -984,7 +979,7 @@
           ]
         },
         {
-          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?={)",
+          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1020,13 +1015,13 @@
                   "name": "invalid.illegal.syntax.jsdoc"
                 }
               },
-              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[\\])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:(?:\\*(?!/))|(?:\\\\(?!\"))|[^*\\\\])*?\"|'(?:(?:\\*(?!/))|(?:\\\\(?!'))|[^*\\\\])*?'|\\[(?:(?:\\*(?!/))|[^*])*?\\]|(?:(?:\\*(?!/))|\\s(?!\\s*\\])|\\[.*?(?:\\]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(\\])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
+              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:\\*(?!/)|\\\\(?!\")|[^*\\\\])*?\"|'(?:\\*(?!/)|\\\\(?!')|[^*\\\\])*?'|\\[(?:\\*(?!/)|[^*])*?]|(?:\\*(?!/)|\\s(?!\\s*])|\\[.*?(?:]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
               "name": "variable.other.jsdoc"
             }
           ]
         },
         {
-          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|suppress|this|throws|type|yields?))\\s+(?={)",
+          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|suppress|this|throws|type|yields?))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1057,7 +1052,7 @@
           "match": "((@)(?:alias|augments|callback|constructs|emits|event|fires|exports?|extends|external|function|func|host|lends|listens|interface|memberof!?|method|module|mixes|mixin|name|requires|see|this|typedef|uses))\\s+((?:[^{}@\\s*]|\\*[^/])+)"
         },
         {
-          "begin": "((@)(?:default(?:value)?|license|version))\\s+(([''\"]))",
+          "begin": "((@)(?:default(?:value)?|license|version))\\s+((['\"]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1118,7 +1113,7 @@
               "name": "punctuation.definition.block.tag.jsdoc"
             }
           },
-          "match": "((@)(?:[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?))(?=\\s+)"
+          "match": "((@)[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?)(?=\\s+)"
         }
       ]
     },
@@ -1245,13 +1240,13 @@
       ]
     },
     "generics-literal": {
-      "begin": "(?<=[\\w\\]\\)])\\<",
+      "begin": "(?<=[\\w\\])])<",
       "beginCaptures": {
         "1": {
           "name": "meta.generics.annotation.open.imba"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "meta.generics.annotation.close.imba"
@@ -1282,7 +1277,7 @@
               "name": "entity.name.function.property.imba"
             }
           },
-          "match": "(?:(?:(\\.)|(\\.\\.(?!\\s*[[:digit:]]|\\s+)))\\s*)?([_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?)(?=\\s*={{functionOrArrowLookup}})"
+          "match": "(?:(?:(\\.)|(\\.\\.(?!\\s*\\d|\\s+)))\\s*)?([_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?)(?=\\s*=\\{\\{functionOrArrowLookup}})"
         },
         {
           "captures": {
@@ -1296,7 +1291,7 @@
               "name": "variable.other.constant.property.imba"
             }
           },
-          "match": "(?:(\\.)|(\\.\\.(?!\\s*[[:digit:]]|\\s+)))\\s*(\\#?[[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
+          "match": "(?:(\\.)|(\\.\\.(?!\\s*\\d|\\s+)))\\s*(#?\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])"
         },
         {
           "captures": {
@@ -1310,7 +1305,7 @@
               "name": "variable.other.class.property.imba"
             }
           },
-          "match": "(?:(\\.)|(\\.\\.(?!\\s*[[:digit:]]|\\s+)))([[:upper:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\!]?)"
+          "match": "(?:(\\.)|(\\.\\.(?!\\s*\\d|\\s+)))(\\p{upper}[_$[:alnum:]]*(?:-[_$[:alnum:]]+)*!?)"
         },
         {
           "captures": {
@@ -1324,7 +1319,7 @@
               "name": "variable.other.property.imba"
             }
           },
-          "match": "(?:(\\.)|(\\.\\.(?!\\s*[[:digit:]]|\\s+)))(\\#?[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?)"
+          "match": "(?:(\\.)|(\\.\\.(?!\\s*\\d|\\s+)))(#?[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?)"
         },
         {
           "match": "(for own|for|if|unless|when)\\b",
@@ -1346,8 +1341,8 @@
       ]
     },
     "inline-css-selector": {
-      "begin": "(^\\t+)(?!(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=]))",
-      "end": "(\\s*(?=(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=])|\\)|\\])|\\s*$)",
+      "begin": "(^\\t+)(?![\\^@.%\\w$!-]+\\s*[:=])",
+      "end": "(\\s*(?=[\\^@.%\\w$!-]+\\s*[:=]|[)\\]])|\\s*$)",
       "endCaptures": {
         "0": {
           "name": "punctuation.separator.sel-properties.css"
@@ -1384,11 +1379,11 @@
               "name": "punctuation.definition.bracket.square.end.jsdoc"
             }
           },
-          "match": "(\\[)[^\\]]+(\\])(?={@(?:link|linkcode|linkplain|tutorial))",
+          "match": "(\\[)[^\\]]+(])(?=\\{@(?:link|linkcode|linkplain|tutorial))",
           "name": "constant.other.description.jsdoc"
         },
         {
-          "begin": "({)((@)(?:link(?:code|plain)?|tutorial))\\s*",
+          "begin": "(\\{)((@)(?:link(?:code|plain)?|tutorial))\\s*",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.bracket.curly.begin.jsdoc"
@@ -1417,7 +1412,7 @@
                   "name": "punctuation.separator.pipe.jsdoc"
                 }
               },
-              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*[/])+)(\\|)?"
+              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*/)+)(\\|)?"
             },
             {
               "captures": {
@@ -1437,7 +1432,7 @@
     "invalid-indentation": {
       "patterns": [
         {
-          "match": "^[\\ ]+",
+          "match": "^ +",
           "name": "invalid.whitespace"
         },
         {
@@ -1449,11 +1444,11 @@
     "jsdoctype": {
       "patterns": [
         {
-          "match": "\\G{(?:[^}*]|\\*[^/}])+$",
+          "match": "\\G\\{(?:[^}*]|\\*[^/}])+$",
           "name": "invalid.illegal.type.jsdoc"
         },
         {
-          "begin": "\\G({)",
+          "begin": "\\G(\\{)",
           "beginCaptures": {
             "0": {
               "name": "entity.name.type.instance.jsdoc"
@@ -1483,15 +1478,15 @@
     "keywords": {
       "patterns": [
         {
-          "match": "(if|elif|else|unless|switch|when|then|do|import|export|for own|for|while|until|return|yield|try|catch|await|rescue|finally|throw|as|continue|break|extend|augment)(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(if|elif|else|unless|switch|when|then|do|import|export|for own|for|while|until|return|yield|try|catch|await|rescue|finally|throw|as|continue|break|extend|augment)(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "keyword.control.imba"
         },
         {
-          "match": "(?<=export)\\s+(default)(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(?<=export)\\s+(default)(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "keyword.control.imba"
         },
         {
-          "match": "(?<=import)\\s+(type)(?=\\s+[\\w\\{\\$\\_])",
+          "match": "(?<=import)\\s+(type)(?=\\s+[\\w{$_])",
           "name": "keyword.control.imba"
         },
         {
@@ -1499,27 +1494,27 @@
           "name": "keyword.control.imba"
         },
         {
-          "match": "(?<=[\\*\\}\\w\\$])\\s+(from)(?=\\s+[\\\"\\'])",
+          "match": "(?<=[*}\\w$])\\s+(from)(?=\\s+[\"'])",
           "name": "keyword.control.imba"
         },
         {
-          "match": "(def|get|set)(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(def|get|set)(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "storage.type.function.imba"
         },
         {
-          "match": "(protected|private)\\s+(?=def|get|set)",
+          "match": "(pr(?:otected|ivate))\\s+(?=def|get|set)",
           "name": "keyword.control.imba"
         },
         {
-          "match": "(tag|class|struct|mixin|interface)(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(tag|class|struct|mixin|interface)(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "storage.type.class.imba"
         },
         {
-          "match": "(let|const|constructor)(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(let|const|constructor)(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "storage.type.imba"
         },
         {
-          "match": "(prop|attr)(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(prop|attr)(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "storage.type.imba"
         },
         {
@@ -1534,15 +1529,15 @@
           "include": "#ops"
         },
         {
-          "match": "(=|\\|\\|=|\\?\\?=|\\&\\&=|\\+=|\\-=|\\*=|\\^=|\\%=)",
+          "match": "(=|\\|\\|=|\\?\\?=|&&=|\\+=|-=|\\*=|\\^=|%=)",
           "name": "keyword.operator.assignment.imba"
         },
         {
-          "match": "(\\>\\=?|\\<\\=?)",
+          "match": "(>=?|<=?)",
           "name": "keyword.operator.imba"
         },
         {
-          "match": "(of|delete|\\!?isa|typeof|\\!?in|new|\\!?is|isnt)(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(of|delete|!?isa|typeof|!?in|new|!?is|isnt)(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "keyword.operator.imba"
         }
       ]
@@ -1588,13 +1583,13 @@
       ]
     },
     "mixin-css-selector": {
-      "begin": "(\\%[\\w\\-]+)",
+      "begin": "(%[\\w-]+)",
       "beginCaptures": {
         "1": {
           "name": "entity.other.attribute-name.mixin.css"
         }
       },
-      "end": "(\\s*(?=(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=])[^\\:])|\\s*$|(?=\\s+\\#\\s))",
+      "end": "(\\s*(?=[\\^@.%\\w$!-]+\\s*[:=][^:])|\\s*$|(?=\\s+#\\s))",
       "endCaptures": {
         "0": {
           "name": "punctuation.separator.sel-properties.css"
@@ -1608,8 +1603,8 @@
       ]
     },
     "mixin-css-selector-after": {
-      "begin": "(?<=%[\\w\\-]+)(?!(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=])[^\\:])",
-      "end": "(\\s*(?=(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=])[^\\:])|\\s*$|(?=\\s+\\#\\s))",
+      "begin": "(?<=%[\\w-]+)(?![\\^@.%\\w$!-]+\\s*[:=][^:])",
+      "end": "(\\s*(?=[\\^@.%\\w$!-]+\\s*[:=][^:])|\\s*$|(?=\\s+#\\s))",
       "endCaptures": {
         "0": {
           "name": "punctuation.separator.sel-properties.css"
@@ -1623,7 +1618,7 @@
       ]
     },
     "mixin-declaration": {
-      "begin": "^(\\t*)(\\%[\\w\\-]+)",
+      "begin": "^(\\t*)(%[\\w-]+)",
       "beginCaptures": {
         "2": {
           "name": "entity.other.attribute-name.mixin.css"
@@ -1647,8 +1642,8 @@
       ]
     },
     "nested-css-selector": {
-      "begin": "(^\\t+)(?!(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=])[^\\:])",
-      "end": "(\\s*(?=(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=])[^\\:])|\\s*$|(?=\\s+\\#\\s))",
+      "begin": "(^\\t+)(?![\\^@.%\\w$!-]+\\s*[:=][^:])",
+      "end": "(\\s*(?=[\\^@.%\\w$!-]+\\s*[:=][^:])|\\s*$|(?=\\s+#\\s))",
       "endCaptures": {
         "0": {
           "name": "punctuation.separator.sel-properties.css"
@@ -1662,7 +1657,7 @@
       ]
     },
     "nested-style-declaration": {
-      "begin": "^(\\t+)(?=[\\n^]*\\&)",
+      "begin": "^(\\t+)(?=[\\n^]*&)",
       "end": "^(?!(\\1\\t|\\s*$))",
       "name": "meta.style.imba",
       "patterns": [
@@ -1675,7 +1670,7 @@
       ]
     },
     "null-literal": {
-      "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))null(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))null(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "name": "constant.language.null.imba"
     },
     "number-with-unit-literal": {
@@ -1689,7 +1684,7 @@
               "name": "keyword.other.unit.imba"
             }
           },
-          "match": "([0-9]+)([a-z]+|\\%)"
+          "match": "([0-9]+)([a-z]+|%)"
         },
         {
           "captures": {
@@ -1700,7 +1695,7 @@
               "name": "keyword.other.unit.imba"
             }
           },
-          "match": "([0-9]*\\.[0-9]+(?:[eE][\\-+]?[0-9]+)?)([a-z]+|\\%)"
+          "match": "([0-9]*\\.[0-9]+(?:[eE][-+]?[0-9]+)?)([a-z]+|%)"
         }
       ]
     },
@@ -1712,7 +1707,7 @@
               "name": "storage.type.numeric.bigint.imba"
             }
           },
-          "match": "\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.hex.imba"
         },
         {
@@ -1721,7 +1716,7 @@
               "name": "storage.type.numeric.bigint.imba"
             }
           },
-          "match": "\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.binary.imba"
         },
         {
@@ -1730,7 +1725,7 @@
               "name": "storage.type.numeric.bigint.imba"
             }
           },
-          "match": "\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.octal.imba"
         },
         {
@@ -1781,18 +1776,18 @@
               "name": "storage.type.numeric.bigint.imba"
             }
           },
-          "match": "(?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b))(?!\\$)"
+          "match": "(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b)(?!\\$)"
         }
       ]
     },
     "numericConstant-literal": {
       "patterns": [
         {
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))NaN(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))NaN(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "constant.language.nan.imba"
         },
         {
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Infinity(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Infinity(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "constant.language.infinity.imba"
         }
       ]
@@ -1800,7 +1795,7 @@
     "object-keys": {
       "patterns": [
         {
-          "match": "[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?\\:",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?:",
           "name": "meta.object-literal.key"
         }
       ]
@@ -1812,11 +1807,11 @@
           "name": "keyword.operator.spread.imba"
         },
         {
-          "match": "\\*=|(?<!\\()/=|%=|\\+=|\\-=|\\?=|\\?\\?=|=\\?",
+          "match": "\\*=|(?<!\\()/=|%=|\\+=|-=|\\?=|\\?\\?=|=\\?",
           "name": "keyword.operator.assignment.compound.imba"
         },
         {
-          "match": "\\^=\\?|\\|=\\?|\\~=\\?|\\&=|\\^=|<<=|>>=|>>>=|\\|=",
+          "match": "\\^=\\?|\\|=\\?|~=\\?|&=|\\^=|<<=|>>=|>>>=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.imba"
         },
         {
@@ -1828,7 +1823,7 @@
           "name": "keyword.operator.comparison.imba"
         },
         {
-          "match": "<=|>=|<>|<|>",
+          "match": "<=|>=|<>|[<>]",
           "name": "keyword.operator.relational.imba"
         },
         {
@@ -1840,10 +1835,10 @@
               "name": "keyword.operator.arithmetic.imba"
             }
           },
-          "match": "(\\!)\\s*(/)(?![/*])"
+          "match": "(!)\\s*(/)(?![/*])"
         },
         {
-          "match": "\\!|&&|\\|\\||\\?\\?|or\\b(?=\\s|$)|and\\b(?=\\s|$)|\\@\\b(?=\\s|$)",
+          "match": "!|&&|\\|\\||\\?\\?|or\\b(?=\\s|$)|and\\b(?=\\s|$)|@\\b(?=\\s|$)",
           "name": "keyword.operator.logical.imba"
         },
         {
@@ -1851,11 +1846,11 @@
           "name": "keyword.operator.bitwise.imba"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.ternary.imba"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.imba"
         },
         {
@@ -1867,7 +1862,7 @@
           "name": "keyword.operator.increment.imba"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.imba"
         }
       ]
@@ -1896,18 +1891,18 @@
               "name": "variable.other.property.imba"
             }
           },
-          "match": "(\\.\\.?)([_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?)"
+          "match": "(\\.\\.?)([_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?)"
         }
       ]
     },
     "plain-identifiers": {
       "patterns": [
         {
-          "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+          "match": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])",
           "name": "variable.other.constant.imba"
         },
         {
-          "match": "[[:upper:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\!]?",
+          "match": "\\p{upper}[_$[:alnum:]]*(?:-[_$[:alnum:]]+)*!?",
           "name": "variable.other.class.imba"
         },
         {
@@ -1915,27 +1910,27 @@
           "name": "variable.special.imba"
         },
         {
-          "match": "\\$[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?",
+          "match": "\\$[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?",
           "name": "variable.other.internal.imba"
         },
         {
-          "match": "\\@\\@+[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?",
+          "match": "@@+[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?",
           "name": "variable.other.symbol.imba"
         },
         {
-          "match": "[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?",
           "name": "variable.other.readwrite.imba"
         },
         {
-          "match": "\\@[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?",
+          "match": "@[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?",
           "name": "variable.other.instance.imba"
         },
         {
-          "match": "\\#+[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?",
+          "match": "#+[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?",
           "name": "variable.other.private.imba"
         },
         {
-          "match": "\\:[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?",
+          "match": ":[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?",
           "name": "string.symbol.imba"
         }
       ]
@@ -1949,7 +1944,7 @@
           "name": "punctuation.accessor.optional.imba"
         }
       },
-      "match": "(?:(\\.)|(\\.\\.(?!\\s*[[:digit:]]|\\s+)))"
+      "match": "(?:(\\.)|(\\.\\.(?!\\s*\\d|\\s+)))"
     },
     "punctuation-comma": {
       "match": ",",
@@ -1989,7 +1984,7 @@
           "name": "punctuation.definition.string.begin.imba"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.imba"
@@ -2028,7 +2023,7 @@
     "regex": {
       "patterns": [
         {
-          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[\\()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\]|\\(([^\\)\\\\]|\\\\.)+\\))+\\/([gimsuy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case|=>|&&|\\|\\||\\*/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+]|\\(([^)\\\\]|\\\\.)+\\))+/([gimsuy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.imba"
@@ -2051,7 +2046,7 @@
           ]
         },
         {
-          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*\\/)|((?<=^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case))\\s*)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/([gimsuy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*/)|((?<=^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case))\\s*)/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+])+/([gimsuy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.imba"
@@ -2082,7 +2077,7 @@
           "name": "constant.other.character-class.regexp"
         },
         {
-          "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})",
+          "match": "\\\\([0-7]{3}|x\\h{2}|u\\h{4})",
           "name": "constant.character.numeric.regexp"
         },
         {
@@ -2098,7 +2093,7 @@
     "regexp": {
       "patterns": [
         {
-          "match": "\\\\[bB]|\\^|\\$",
+          "match": "\\\\[bB]|[\\^$]",
           "name": "keyword.control.anchor.regexp"
         },
         {
@@ -2110,10 +2105,10 @@
               "name": "variable.other.regexp"
             }
           },
-          "match": "\\\\[1-9]\\d*|\\\\k<([a-zA-Z_$][\\w$]*)>"
+          "match": "\\\\(?:[1-9]\\d*|k<([a-zA-Z_$][\\w$]*)>)"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.regexp"
         },
         {
@@ -2156,7 +2151,7 @@
           ]
         },
         {
-          "begin": "\\((?:(\\?:)|(?:\\?<([a-zA-Z_$][\\w$]*)>))?",
+          "begin": "\\((?:(\\?:)|\\?<([a-zA-Z_$][\\w$]*)>)?",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.regexp"
@@ -2191,7 +2186,7 @@
               "name": "keyword.operator.negation.regexp"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.regexp"
@@ -2220,7 +2215,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))",
               "name": "constant.other.character-class.range.regexp"
             },
             {
@@ -2263,7 +2258,7 @@
       ]
     },
     "single-line-comment-consuming-line-ending": {
-      "begin": "(^[ \\t]+)?((//|\\#\\s)(?:\\s*((@)internal)(?=\\s|$))?)",
+      "begin": "(^[ \\t]+)?((//|#\\s)(?:\\s*((@)internal)(?=\\s|$))?)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.whitespace.comment.leading.imba"
@@ -2291,7 +2286,7 @@
           "name": "meta.brace.square.imba"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.imba"
@@ -2326,7 +2321,7 @@
       ]
     },
     "string-character-escape": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
+      "match": "\\\\(x\\h{2}|u\\h{4}|u\\{\\h+}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
       "name": "constant.character.escape.imba"
     },
     "style-declaration": {
@@ -2373,7 +2368,7 @@
           "match": "(\\b[0-9][0-9_]*)(\\w+|%)?"
         },
         {
-          "match": "--[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?",
+          "match": "--[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?",
           "name": "support.constant.property-value.var.css"
         },
         {
@@ -2381,7 +2376,7 @@
           "name": "support.constant.property-value.size.css"
         },
         {
-          "match": "[_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?",
           "name": "support.constant.property-value.css"
         },
         {
@@ -2404,7 +2399,7 @@
     "style-property": {
       "patterns": [
         {
-          "begin": "(?=(?:[\\^\\@\\.\\%\\w\\$\\!\\-]+)(?:\\s*[\\:\\=]))",
+          "begin": "(?=[\\^@.%\\w$!-]+\\s*[:=])",
           "beginCaptures": {
             "1": {
               "name": "support.function.calc.css"
@@ -2413,7 +2408,7 @@
               "name": "punctuation.section.function.begin.bracket.round.css"
             }
           },
-          "end": "\\s*[\\:\\=]",
+          "end": "\\s*[:=]",
           "endCaptures": {
             "0": {
               "name": "punctuation.separator.key-value.css"
@@ -2422,35 +2417,35 @@
           "name": "meta.property-name.css",
           "patterns": [
             {
-              "match": "(?:--|\\$)[\\w\\-\\$]+",
+              "match": "(?:--|\\$)[\\w\\-$]+",
               "name": "support.type.property-name.variable.css"
             },
             {
-              "match": "\\@[\\!\\<\\>]?[0-9]+",
+              "match": "@[!<>]?[0-9]+",
               "name": "support.type.property-name.modifier.breakpoint.css"
             },
             {
-              "match": "\\^?\\@+[\\w\\-\\$]+",
+              "match": "\\^?@+[\\w\\-$]+",
               "name": "support.type.property-name.modifier.css"
             },
             {
-              "match": "\\^?\\.+[\\w\\-\\$]+",
+              "match": "\\^?\\.+[\\w\\-$]+",
               "name": "support.type.property-name.modifier.flag.css"
             },
             {
-              "match": "\\^?\\%+[\\w\\-\\$]+",
+              "match": "\\^?%+[\\w\\-$]+",
               "name": "support.type.property-name.modifier.state.css"
             },
             {
-              "match": "\\.\\.[\\w\\-\\$]+|\\^+[\\.\\@\\%][\\w\\-\\$]+",
+              "match": "\\.\\.[\\w\\-$]+|\\^+[.@%][\\w\\-$]+",
               "name": "support.type.property-name.modifier.up.css"
             },
             {
-              "match": "\\.[\\w\\-\\$]+",
+              "match": "\\.[\\w\\-$]+",
               "name": "support.type.property-name.modifier.is.css"
             },
             {
-              "match": "[\\w\\-\\$]+",
+              "match": "[\\w\\-$]+",
               "name": "support.type.property-name.css"
             }
           ]
@@ -2462,24 +2457,24 @@
       "name": "variable.language.super.imba"
     },
     "tag-attr-name": {
-      "begin": "([\\w$_]+(?:\\-[\\w$_]+)*)",
+      "begin": "([\\w$_]+(?:-[\\w$_]+)*)",
       "beginCaptures": {
         "0": {
           "name": "entity.other.attribute-name.imba"
         }
       },
       "contentName": "entity.other.attribute-name.imba",
-      "end": "(?=[\\s\\.\\[\\>\\=])"
+      "end": "(?=[\\s.\\[>=])"
     },
     "tag-attr-value": {
-      "begin": "(\\=)",
+      "begin": "(=)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.tag.assignment"
         }
       },
       "contentName": "meta.tag.attribute-value.imba",
-      "end": "(?=>|\\s)",
+      "end": "(?=[>\\s])",
       "patterns": [
         {
           "include": "#expr"
@@ -2489,7 +2484,7 @@
     "tag-classname": {
       "begin": "\\.",
       "contentName": "entity.other.attribute-name.class.css",
-      "end": "(?=[\\.\\[\\>\\s\\(\\=])",
+      "end": "(?=[.\\[>\\s(=])",
       "patterns": [
         {
           "include": "#tag-interpolated-content"
@@ -2537,14 +2532,14 @@
       ]
     },
     "tag-event-handler": {
-      "begin": "(\\@[\\w$_]+(?:\\-[\\w$_]+)*)",
+      "begin": "(@[\\w$_]+(?:-[\\w$_]+)*)",
       "beginCaptures": {
         "0": {
           "name": "entity.other.event-name.imba"
         }
       },
       "contentName": "entity.other.tag.event",
-      "end": "(?=[\\[\\>\\s\\=])",
+      "end": "(?=[\\[>\\s=])",
       "patterns": [
         {
           "include": "#tag-interpolated-content"
@@ -2559,7 +2554,7 @@
               "name": "punctuation.section.tag"
             }
           },
-          "end": "(?=[\\.\\[\\>\\s\\=]|$)",
+          "end": "(?=[.\\[>\\s=]|$)",
           "name": "entity.other.event-modifier.imba",
           "patterns": [
             {
@@ -2573,9 +2568,9 @@
       ]
     },
     "tag-expr-name": {
-      "begin": "(?<=<)(?=[\\w\\{])",
+      "begin": "(?<=<)(?=[\\w{])",
       "contentName": "entity.name.tag.imba",
-      "end": "(?=[\\%\\$\\#\\.\\[\\>\\s\\(])",
+      "end": "(?=[%$#.\\[>\\s(])",
       "patterns": [
         {
           "include": "#tag-interpolated-content"
@@ -2590,7 +2585,7 @@
         }
       },
       "contentName": "meta.embedded.line.imba",
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.tag.imba"
@@ -2614,7 +2609,7 @@
         }
       },
       "contentName": "meta.embedded.line.imba",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.tag.imba"
@@ -2651,7 +2646,7 @@
     "tag-literal": {
       "patterns": [
         {
-          "begin": "(<)(?=[\\%\\~\\w\\{\\[\\.\\#\\$\\@\\(])",
+          "begin": "(<)(?=[%~\\w{\\[.#$@(])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.tag.open.imba"
@@ -2674,34 +2669,34 @@
       ]
     },
     "tag-mixin-name": {
-      "match": "(\\%[\\w\\-]+)",
+      "match": "(%[\\w-]+)",
       "name": "entity.other.tag-mixin.imba"
     },
     "tag-name": {
       "patterns": [
         {
-          "match": "(?<=<)(self|global|slot)(?=[\\.\\[\\>\\s\\(])",
+          "match": "(?<=<)(self|global|slot)(?=[.\\[>\\s(])",
           "name": "entity.name.tag.special.imba"
         }
       ]
     },
     "tag-ref": {
-      "match": "(\\$[\\w\\-]+)",
+      "match": "(\\$[\\w-]+)",
       "name": "entity.other.tag-ref.imba"
     },
     "template": {
       "patterns": [
         {
-          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?)({{typeArguments}}\\s*)?`)",
+          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?)(\\{\\{typeArguments}}\\s*)?`)",
           "end": "(?=`)",
           "name": "string.template.imba",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?))",
-              "end": "(?=({{typeArguments}}\\s*)?`)",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?))",
+              "end": "(?=(\\{\\{typeArguments}}\\s*)?`)",
               "patterns": [
                 {
-                  "match": "([_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?)",
+                  "match": "([_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?)",
                   "name": "entity.name.function.tagged-template.imba"
                 }
               ]
@@ -2709,7 +2704,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?)\\s*(?=({{typeArguments}}\\s*)`)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?)\\s*(?=(\\{\\{typeArguments}}\\s*)`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.imba"
@@ -2724,7 +2719,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*(?:\\-[_$[:alnum:]]+)*[\\?\\!]?)?(`)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*(?:-[_$[:alnum:]]+)*[?!]?)?(`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.imba"
@@ -2759,7 +2754,7 @@
         }
       },
       "contentName": "meta.embedded.line.imba",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.imba"
@@ -2786,7 +2781,7 @@
     "type-brackets": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}",
           "patterns": [
             {
@@ -2796,7 +2791,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "patterns": [
             {
               "include": "#type-brackets"
@@ -2804,8 +2799,8 @@
           ]
         },
         {
-          "begin": "\\<",
-          "end": "\\>",
+          "begin": "<",
+          "end": ">",
           "patterns": [
             {
               "include": "#type-brackets"
@@ -2830,7 +2825,7 @@
           "name": "meta.type.annotation.open.imba"
         }
       },
-      "end": "(?=[\\s\\]\\)\\,\\.\\=\\}]|$)",
+      "end": "(?=[\\s\\]),.=}]|$)",
       "name": "meta.type.annotation.imba",
       "patterns": [
         {
@@ -2839,7 +2834,7 @@
       ]
     },
     "undefined-literal": {
-      "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))undefined(?![\\?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))undefined(?![?_\\-$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "name": "constant.language.undefined.imba"
     }
   },
diff --git a/resources/languages/ini.json b/resources/languages/ini.json
index ef13d85..2e47cbb 100644
--- a/resources/languages/ini.json
+++ b/resources/languages/ini.json
@@ -64,7 +64,7 @@
           "name": "punctuation.definition.entity.ini"
         }
       },
-      "match": "^(\\[)(.*?)(\\])",
+      "match": "^(\\[)(.*?)(])",
       "name": "entity.name.section.group-title.ini"
     },
     {
diff --git a/resources/languages/java.json b/resources/languages/java.json
index 8e2d6f3..e74ae23 100644
--- a/resources/languages/java.json
+++ b/resources/languages/java.json
@@ -26,7 +26,7 @@
           "name": "invalid.illegal.character_not_allowed_here.java"
         },
         {
-          "match": "(?<!_)_(?=\\s*(\\.|;))|\\b\\d+|-+",
+          "match": "(?<!_)_(?=\\s*([.;]))|\\b\\d+|-+",
           "name": "invalid.illegal.character_not_allowed_here.java"
         },
         {
@@ -74,7 +74,7 @@
           "name": "invalid.illegal.character_not_allowed_here.java"
         },
         {
-          "match": "(?<!_)_(?=\\s*(\\.|;))|\\b\\d+|-+",
+          "match": "(?<!_)_(?=\\s*([.;]))|\\b\\d+|-+",
           "name": "invalid.illegal.character_not_allowed_here.java"
         },
         {
@@ -178,7 +178,7 @@
       ]
     },
     "anonymous-block-and-instance-initializer": {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.block.begin.bracket.curly.java"
@@ -203,7 +203,7 @@
           "name": "keyword.control.new.java"
         }
       },
-      "end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
+      "end": "(?=[;)\\].,?:}+\\-*]|/(?![/*])|[%!\\&|^=])",
       "patterns": [
         {
           "include": "#comments"
@@ -216,13 +216,13 @@
         },
         {
           "begin": "(?<=\\))",
-          "end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
+          "end": "(?=[;)\\].,?:}+\\-*]|/(?![/*])|[%!\\&|^=])",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.inner-class.begin.bracket.curly.java"
@@ -244,14 +244,14 @@
           ]
         },
         {
-          "begin": "(?<=\\])",
-          "end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
+          "begin": "(?<=])",
+          "end": "(?=[;)\\].,?:}+\\-*]|/(?![/*])|[%!\\&|^=])",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.array-initializer.begin.bracket.curly.java"
@@ -338,7 +338,7 @@
               "name": "storage.modifier.extends.java"
             }
           },
-          "end": "(?={|implements|permits)",
+          "end": "(?=\\{|implements|permits)",
           "name": "meta.definition.class.inherited.classes.java",
           "patterns": [
             {
@@ -386,7 +386,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.class.begin.bracket.curly.java"
@@ -442,7 +442,7 @@
     "class-fields-and-methods": {
       "patterns": [
         {
-          "begin": "(?=\\=)",
+          "begin": "(?==)",
           "end": "(?=;)",
           "patterns": [
             {
@@ -646,7 +646,7 @@
                   "name": "variable.parameter.java"
                 }
               },
-              "match": "{(@link)\\s+(\\S+)?#([\\w$]+\\s*\\([^\\(\\)]*\\)).*?}"
+              "match": "\\{(@link)\\s+(\\S+)?#([\\w$]+\\s*\\([^()]*\\)).*?}"
             }
           ]
         }
@@ -700,7 +700,7 @@
               "name": "storage.modifier.extends.java"
             }
           },
-          "end": "(?={|\\bimplements\\b)",
+          "end": "(?=\\{|\\bimplements\\b)",
           "name": "meta.definition.class.inherited.classes.java",
           "patterns": [
             {
@@ -718,7 +718,7 @@
               "name": "storage.modifier.implements.java"
             }
           },
-          "end": "(?={|\\bextends\\b)",
+          "end": "(?=\\{|\\bextends\\b)",
           "name": "meta.definition.class.implemented.interfaces.java",
           "patterns": [
             {
@@ -730,7 +730,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.enum.begin.bracket.curly.java"
@@ -739,8 +739,8 @@
           "end": "(?=})",
           "patterns": [
             {
-              "begin": "(?<={)",
-              "end": "(?=;|})",
+              "begin": "(?<=\\{)",
+              "end": "(?=[;}])",
               "patterns": [
                 {
                   "include": "#comments-javadoc"
@@ -755,7 +755,7 @@
                       "name": "constant.other.enum.java"
                     }
                   },
-                  "end": "(,)|(?=;|})",
+                  "end": "(,)|(?=[;}])",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.separator.delimiter.java"
@@ -788,7 +788,7 @@
                       ]
                     },
                     {
-                      "begin": "{",
+                      "begin": "\\{",
                       "beginCaptures": {
                         "0": {
                           "name": "punctuation.bracket.curly.java"
@@ -907,7 +907,7 @@
           "name": "keyword.control.throw.java"
         },
         {
-          "match": "\\?|:",
+          "match": "[?:]",
           "name": "keyword.control.ternary.java"
         },
         {
@@ -919,15 +919,15 @@
           "name": "keyword.operator.instanceof.java"
         },
         {
-          "match": "(<<|>>>?|~|\\^)",
+          "match": "(<<|>>>?|[~^])",
           "name": "keyword.operator.bitwise.java"
         },
         {
-          "match": "((&|\\^|\\||<<|>>>?)=)",
+          "match": "(([\\&^|]|<<|>>>?)=)",
           "name": "keyword.operator.assignment.bitwise.java"
         },
         {
-          "match": "(===?|!=|<=|>=|<>|<|>)",
+          "match": "(===?|!=|<=|>=|<>|[<>])",
           "name": "keyword.operator.comparison.java"
         },
         {
@@ -939,11 +939,11 @@
           "name": "keyword.operator.assignment.java"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
+          "match": "(--|\\+\\+)",
           "name": "keyword.operator.increment-decrement.java"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%)",
+          "match": "([-+*/%])",
           "name": "keyword.operator.arithmetic.java"
         },
         {
@@ -951,7 +951,7 @@
           "name": "keyword.operator.logical.java"
         },
         {
-          "match": "(\\||&)",
+          "match": "([|\\&])",
           "name": "keyword.operator.bitwise.java"
         },
         {
@@ -970,7 +970,7 @@
     },
     "member-variables": {
       "begin": "(?=private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)",
-      "end": "(?=\\=|;)",
+      "end": "(?=[=;])",
       "patterns": [
         {
           "include": "#storage-modifiers"
@@ -1077,7 +1077,7 @@
           "include": "#throws"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.method.begin.bracket.curly.java"
@@ -1118,7 +1118,7 @@
       "name": "meta.module.java",
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.module.begin.bracket.curly.java"
@@ -1144,11 +1144,11 @@
     "numbers": {
       "patterns": [
         {
-          "match": "\\b(?<!\\$)0(x|X)((?<!\\.)[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?[Ll]?(?!\\.)|([0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?\\.?|([0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?)?\\.[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?)[Pp][+-]?[0-9]([0-9_]*[0-9])?[FfDd]?)\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0([xX])((?<!\\.)\\h([_\\h]*\\h)?[Ll]?(?!\\.)|(\\h([_\\h]*\\h)?\\.?|(\\h([_\\h]*\\h)?)?\\.\\h([_\\h]*\\h)?)[Pp][+-]?[0-9]([0-9_]*[0-9])?[FfDd]?)\\b(?!\\$)",
           "name": "constant.numeric.hex.java"
         },
         {
-          "match": "\\b(?<!\\$)0(b|B)[01]([01_]*[01])?[Ll]?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0([bB])[01]([01_]*[01])?[Ll]?\\b(?!\\$)",
           "name": "constant.numeric.binary.java"
         },
         {
@@ -1312,7 +1312,7 @@
               "name": "punctuation.bracket.square.java"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.bracket.square.java"
@@ -1325,7 +1325,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.bracket.curly.java"
@@ -1419,7 +1419,7 @@
       ]
     },
     "record": {
-      "begin": "(?=\\w?[\\w\\s]*\\b(?:record)\\s+[\\w$]+)",
+      "begin": "(?=\\w?[\\w\\s]*\\brecord\\s+[\\w$]+)",
       "end": "}",
       "endCaptures": {
         "0": {
@@ -1494,7 +1494,7 @@
       ]
     },
     "record-body": {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.class.begin.bracket.curly.java"
@@ -1512,7 +1512,7 @@
       ]
     },
     "record-constructor": {
-      "begin": "(?!new)(?=[\\w<].*\\s+)(?=([^\\(=/]|/(?!/))+(?={))",
+      "begin": "(?!new)(?=[\\w<].*\\s+)(?=([^(=/]|/(?!/))+(?=\\{))",
       "end": "(})|(?=;)",
       "endCaptures": {
         "1": {
@@ -1531,7 +1531,7 @@
               "name": "entity.name.function.java"
             }
           },
-          "end": "(?=\\s*{)",
+          "end": "(?=\\s*\\{)",
           "name": "meta.method.identifier.java",
           "patterns": [
             {
@@ -1543,7 +1543,7 @@
           "include": "#comments"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.method.begin.bracket.curly.java"
@@ -1648,7 +1648,7 @@
           "name": "storage.modifier.java"
         }
       },
-      "end": "(?={|;)",
+      "end": "(?=[{;])",
       "name": "meta.throwables.java",
       "patterns": [
         {
@@ -1656,7 +1656,7 @@
           "name": "punctuation.separator.delimiter.java"
         },
         {
-          "match": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
+          "match": "[a-zA-Z$_][.a-zA-Z0-9$_]*",
           "name": "storage.type.java"
         },
         {
@@ -1702,7 +1702,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.try.begin.bracket.curly.java"
@@ -1758,7 +1758,7 @@
                   "include": "#storage-modifiers"
                 },
                 {
-                  "begin": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
+                  "begin": "[a-zA-Z$_][.a-zA-Z0-9$_]*",
                   "beginCaptures": {
                     "0": {
                       "name": "storage.type.java"
@@ -1787,7 +1787,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.catch.begin.bracket.curly.java"
@@ -1819,7 +1819,7 @@
           "name": "meta.finally.java",
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.finally.begin.bracket.curly.java"
@@ -1838,8 +1838,8 @@
       ]
     },
     "variables": {
-      "begin": "(?=\\b((void|boolean|byte|char|short|int|float|long|double)|(?>(\\w+\\.)*[A-Z_]+\\w*))\\b\\s*(<[\\w<>,\\.?\\s\\[\\]]*>)?\\s*((\\[\\])*)?\\s+[A-Za-z_$][\\w$]*([\\w\\[\\],$][\\w\\[\\],\\s]*)?\\s*(=|:|;))",
-      "end": "(?=\\=|:|;)",
+      "begin": "(?=\\b((void|boolean|byte|char|short|int|float|long|double)|(?>(\\w+\\.)*[A-Z_]+\\w*))\\b\\s*(<[\\w<>,.?\\s\\[\\]]*>)?\\s*((\\[])*)?\\s+[A-Za-z_$][\\w$]*([\\w\\[\\],$][\\w\\[\\],\\s]*)?\\s*([=:;]))",
+      "end": "(?=[=:;])",
       "name": "meta.definition.variable.java",
       "patterns": [
         {
@@ -1848,7 +1848,7 @@
               "name": "variable.other.definition.java"
             }
           },
-          "match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(;|:|=|,))"
+          "match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[])*\\s*([;:=,]))"
         },
         {
           "include": "#all-types"
@@ -1859,8 +1859,8 @@
       ]
     },
     "variables-local": {
-      "begin": "(?=\\b(var)\\b\\s+[A-Za-z_$][\\w$]*\\s*(=|:|;))",
-      "end": "(?=\\=|:|;)",
+      "begin": "(?=\\b(var)\\b\\s+[A-Za-z_$][\\w$]*\\s*([=:;]))",
+      "end": "(?=[=:;])",
       "name": "meta.definition.variable.local.java",
       "patterns": [
         {
@@ -1873,7 +1873,7 @@
               "name": "variable.other.definition.java"
             }
           },
-          "match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(=|:|;))"
+          "match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[])*\\s*([=:;]))"
         },
         {
           "include": "#code"
diff --git a/resources/languages/javascript.json b/resources/languages/javascript.json
index 4df2e06..bd863c3 100644
--- a/resources/languages/javascript.json
+++ b/resources/languages/javascript.json
@@ -18,13 +18,13 @@
       "name": "storage.modifier.js"
     },
     "after-operator-block-as-object-literal": {
-      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^yield|[^._$[:alnum:]]yield|^throw|[^._$[:alnum:]]throw|^in|[^._$[:alnum:]]in|^of|[^._$[:alnum:]]of|^typeof|[^._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js"
@@ -47,7 +47,7 @@
           "name": "punctuation.definition.binding-pattern.array.js"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.js"
@@ -72,7 +72,7 @@
           "name": "punctuation.definition.binding-pattern.array.js"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.js"
@@ -94,7 +94,7 @@
           "name": "meta.brace.square.js"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.js"
@@ -125,13 +125,13 @@
           "name": "meta.arrow.js"
         },
         {
-          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))",
+          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js"
             }
           },
-          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
           "name": "meta.arrow.js",
           "patterns": [
             {
@@ -158,7 +158,7 @@
               "name": "storage.type.function.arrow.js"
             }
           },
-          "end": "((?<=\\}|\\S)(?<!=>)|((?!\\{)(?=\\S)))(?!\\/[\\/\\*])",
+          "end": "((?<=[}\\S])(?<!=>)|((?!\\{)(?=\\S)))(?!/[/*])",
           "name": "meta.arrow.js",
           "patterns": [
             {
@@ -181,7 +181,7 @@
           "name": "keyword.operator.type.annotation.js"
         }
       },
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "name": "meta.return.type.arrow.js",
       "patterns": [
         {
@@ -192,8 +192,8 @@
     "arrow-return-type-body": {
       "patterns": [
         {
-          "begin": "(?<=[:])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=:)(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -283,7 +283,7 @@
     "brackets": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}|(?=\\*/)",
           "patterns": [
             {
@@ -293,7 +293,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]|(?=\\*/)",
+          "end": "]|(?=\\*/)",
           "patterns": [
             {
               "include": "#brackets"
@@ -325,7 +325,7 @@
           "name": "storage.type.class.js"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.js",
       "patterns": [
         {
@@ -358,7 +358,7 @@
       ]
     },
     "class-expression": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|\\/[\\/*])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|/[/*])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.js"
@@ -367,7 +367,7 @@
           "name": "storage.type.class.js"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.js",
       "patterns": [
         {
@@ -382,7 +382,7 @@
           "name": "punctuation.definition.block.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js"
@@ -397,7 +397,7 @@
         },
         {
           "begin": "(?<=:)\\s*",
-          "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[\\s;),}\\]:\\-+]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -449,7 +449,7 @@
       ]
     },
     "class-or-interface-heritage": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(extends|implements)\\b)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\b(extends|implements)\\b(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.js"
@@ -481,7 +481,7 @@
               "name": "punctuation.accessor.optional.js"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
         },
         {
           "captures": {
@@ -597,7 +597,7 @@
               "name": "keyword.control.flow.js"
             }
           },
-          "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[;}]|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -636,7 +636,7 @@
           "name": "punctuation.definition.block.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js"
@@ -691,7 +691,7 @@
       ]
     },
     "decorator": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\@",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))@",
       "beginCaptures": {
         "0": {
           "name": "punctuation.decorator.js"
@@ -708,7 +708,7 @@
     "destructuring-const": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.js",
           "patterns": [
@@ -724,7 +724,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.js",
           "patterns": [
@@ -744,7 +744,7 @@
     "destructuring-parameter": {
       "patterns": [
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.js"
@@ -753,7 +753,7 @@
               "name": "punctuation.definition.binding-pattern.object.js"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.object.js"
@@ -767,7 +767,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.js"
@@ -776,7 +776,7 @@
               "name": "punctuation.definition.binding-pattern.array.js"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.array.js"
@@ -808,7 +808,7 @@
     "destructuring-variable": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.js",
           "patterns": [
@@ -824,7 +824,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.js",
           "patterns": [
@@ -864,7 +864,7 @@
       "match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)"
     },
     "directives": {
-      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)",
+      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))+\\s*/>\\s*$)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.js"
@@ -920,7 +920,7 @@
               "name": "constant.language.access-type.jsdoc"
             }
           },
-          "match": "((@)(?:access|api))\\s+(private|protected|public)\\b"
+          "match": "((@)a(?:ccess|pi))\\s+(p(?:rivate|rotected|ublic))\\b"
         },
         {
           "captures": {
@@ -1047,7 +1047,7 @@
               "name": "entity.name.type.instance.jsdoc"
             }
           },
-          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*\\])?{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
+          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*])?\\{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
         },
         {
           "captures": {
@@ -1064,7 +1064,7 @@
           "match": "((@)template)\\s+([A-Za-z_$][\\w$.\\[\\]]*(?:\\s*,\\s*[A-Za-z_$][\\w$.\\[\\]]*)*)"
         },
         {
-          "begin": "((@)template)\\s+(?={)",
+          "begin": "((@)template)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1099,7 +1099,7 @@
           "match": "((@)(?:arg|argument|const|constant|member|namespace|param|var))\\s+([A-Za-z_$][\\w$.\\[\\]]*)"
         },
         {
-          "begin": "((@)typedef)\\s+(?={)",
+          "begin": "((@)typedef)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1120,7 +1120,7 @@
           ]
         },
         {
-          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?={)",
+          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1156,13 +1156,13 @@
                   "name": "invalid.illegal.syntax.jsdoc"
                 }
               },
-              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[\\])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:(?:\\*(?!/))|(?:\\\\(?!\"))|[^*\\\\])*?\"|'(?:(?:\\*(?!/))|(?:\\\\(?!'))|[^*\\\\])*?'|\\[(?:(?:\\*(?!/))|[^*])*?\\]|(?:(?:\\*(?!/))|\\s(?!\\s*\\])|\\[.*?(?:\\]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(\\])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
+              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:\\*(?!/)|\\\\(?!\")|[^*\\\\])*?\"|'(?:\\*(?!/)|\\\\(?!')|[^*\\\\])*?'|\\[(?:\\*(?!/)|[^*])*?]|(?:\\*(?!/)|\\s(?!\\s*])|\\[.*?(?:]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
               "name": "variable.other.jsdoc"
             }
           ]
         },
         {
-          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?={)",
+          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1193,7 +1193,7 @@
           "match": "((@)(?:alias|augments|callback|constructs|emits|event|fires|exports?|extends|external|function|func|host|lends|listens|interface|memberof!?|method|module|mixes|mixin|name|requires|see|this|typedef|uses))\\s+((?:[^{}@\\s*]|\\*[^/])+)"
         },
         {
-          "begin": "((@)(?:default(?:value)?|license|version))\\s+(([''\"]))",
+          "begin": "((@)(?:default(?:value)?|license|version))\\s+((['\"]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1254,7 +1254,7 @@
               "name": "punctuation.definition.block.tag.jsdoc"
             }
           },
-          "match": "((@)(?:[_$[:alpha:]][_$[:alnum:]]*))(?=\\s+)"
+          "match": "((@)[_$[:alpha:]][_$[:alnum:]]*)(?=\\s+)"
         }
       ]
     },
@@ -1277,7 +1277,7 @@
           "name": "entity.name.type.enum.js"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.enum.declaration.js",
       "patterns": [
         {
@@ -1290,7 +1290,7 @@
               "name": "punctuation.definition.block.js"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.js"
@@ -1307,7 +1307,7 @@
                   "name": "variable.other.enummember.js"
                 }
               },
-              "end": "(?=,|\\}|$)",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#comment"
@@ -1318,8 +1318,8 @@
               ]
             },
             {
-              "begin": "(?=((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\])))",
-              "end": "(?=,|\\}|$)",
+              "begin": "(?=(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+])))",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#string"
@@ -1362,7 +1362,7 @@
           "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)\\s+(as)\\s+(namespace)\\s+([_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:(?:\\s*(=))|(?:\\s+(default)(?=\\s+)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:\\s*(=)|\\s+(default)(?=\\s+))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.js"
@@ -1377,7 +1377,7 @@
               "name": "keyword.control.default.js"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.default.js",
           "patterns": [
             {
@@ -1389,7 +1389,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*([\\s,]))(?!\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.js"
@@ -1398,7 +1398,7 @@
               "name": "keyword.control.type.js"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.js",
           "patterns": [
             {
@@ -1464,7 +1464,7 @@
               "name": "keyword.operator.optional.js"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -1484,7 +1484,7 @@
               "name": "keyword.operator.optional.js"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
         },
         {
           "include": "#type-annotation"
@@ -1511,7 +1511,7 @@
           "name": "keyword.control.flow.js"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*\\*)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*\\*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.flow.js"
@@ -1588,7 +1588,7 @@
               "name": "keyword.control.satisfies.js"
             }
           },
-          "end": "(?=^|[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+\\<))",
+          "end": "(?=^|[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+<))",
           "patterns": [
             {
               "include": "#type"
@@ -1600,11 +1600,11 @@
           "name": "keyword.operator.spread.js"
         },
         {
-          "match": "\\*=|(?<!\\()/=|%=|\\+=|\\-=",
+          "match": "\\*=|(?<!\\()/=|%=|\\+=|-=",
           "name": "keyword.operator.assignment.compound.js"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>=|>>>=|\\|=",
+          "match": "&=|\\^=|<<=|>>=|>>>=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.js"
         },
         {
@@ -1612,11 +1612,11 @@
           "name": "keyword.operator.bitwise.shift.js"
         },
         {
-          "match": "===|!==|==|!=",
+          "match": "(?:==|!=)(?:=|)",
           "name": "keyword.operator.comparison.js"
         },
         {
-          "match": "<=|>=|<>|<|>",
+          "match": "<=|>=|<>|[<>]",
           "name": "keyword.operator.relational.js"
         },
         {
@@ -1631,18 +1631,18 @@
               "name": "keyword.operator.arithmetic.js"
             }
           },
-          "match": "(?<=[_$[:alnum:]])(\\!)\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:]])(!)\\s*(?:(/=)|(/)(?![/*]))"
         },
         {
-          "match": "\\!|&&|\\|\\||\\?\\?",
+          "match": "!|&&|\\|\\||\\?\\?",
           "name": "keyword.operator.logical.js"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.js"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.js"
         },
         {
@@ -1654,12 +1654,12 @@
           "name": "keyword.operator.increment.js"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.js"
         },
         {
-          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(?:(/=)|(?:(/)(?![/*]))))",
-          "end": "(?:(/=)|(?:(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)))",
+          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)+(?:(/=)|(/)(?![/*])))",
+          "end": "(?:(/=)|(/)(?!\\*([^*]|(\\*[^/]))*\\*/))",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.assignment.compound.js"
@@ -1683,7 +1683,7 @@
               "name": "keyword.operator.arithmetic.js"
             }
           },
-          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(/)(?![/*]))"
         }
       ]
     },
@@ -1756,13 +1756,13 @@
       ]
     },
     "field-declaration": {
-      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|\\}|$))",
+      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,}]|$))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.js"
         }
       },
-      "end": "(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|$))))|(?<=\\})",
+      "end": "(?=[};,]|$|(^(?!\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,]|$))))|(?<=})",
       "name": "meta.field.declaration.js",
       "patterns": [
         {
@@ -1795,10 +1795,10 @@
               "name": "keyword.operator.definiteassignment.js"
             }
           },
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
-          "match": "\\#?[_$[:alpha:]][_$[:alnum:]]*",
+          "match": "#?[_$[:alpha:]][_$[:alnum:]]*",
           "name": "meta.definition.property.js variable.object.property.js"
         },
         {
@@ -1806,13 +1806,13 @@
           "name": "keyword.operator.optional.js"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "keyword.operator.definiteassignment.js"
         }
       ]
     },
     "for-loop": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*))await)?\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)?(\\())",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*))await)?\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)?(\\())",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.loop.js"
@@ -1883,12 +1883,12 @@
     "function-call": {
       "patterns": [
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
-          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
+          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
               "name": "meta.function-call.js",
               "patterns": [
                 {
@@ -1911,12 +1911,12 @@
           ]
         },
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
-          "end": "(?<=\\>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
+          "end": "(?<=>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*[\\{\\[\\(]\\s*$))",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=(<\\s*[{\\[(]\\s*$))",
               "name": "meta.function-call.js",
               "patterns": [
                 {
@@ -1944,7 +1944,7 @@
           "name": "meta.function-call.js punctuation.accessor.optional.js"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "meta.function-call.js keyword.operator.definiteassignment.js"
         }
       ]
@@ -1955,7 +1955,7 @@
           "include": "#support-function-call-identifiers"
         },
         {
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)",
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)",
           "name": "entity.name.function.js"
         }
       ]
@@ -1982,7 +1982,7 @@
           "name": "meta.definition.function.js entity.name.function.js"
         }
       },
-      "end": "(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|(?<=\\})",
+      "end": "(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|(?<=})",
       "name": "meta.function.js",
       "patterns": [
         {
@@ -2009,7 +2009,7 @@
           "name": "meta.definition.function.js entity.name.function.js"
         }
       },
-      "end": "(?=;)|(?<=\\})",
+      "end": "(?=;)|(?<=})",
       "name": "meta.function.expression.js",
       "patterns": [
         {
@@ -2093,7 +2093,7 @@
               "name": "entity.name.function.js"
             }
           },
-          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))"
+          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))"
         },
         {
           "captures": {
@@ -2107,7 +2107,7 @@
               "name": "variable.other.constant.property.js"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])"
         },
         {
           "captures": {
@@ -2121,10 +2121,10 @@
               "name": "variable.other.property.js"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+          "match": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])",
           "name": "variable.other.constant.js"
         },
         {
@@ -2136,8 +2136,8 @@
     "if-statement": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
-          "end": "(?=;|$|\\})",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))\\s*(?!\\{))",
+          "end": "(?=;|$|})",
           "patterns": [
             {
               "include": "#comment"
@@ -2165,7 +2165,7 @@
               ]
             },
             {
-              "begin": "(?<=\\))\\s*\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+              "begin": "(?<=\\))\\s*/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.js"
@@ -2195,7 +2195,7 @@
       ]
     },
     "import-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.js"
@@ -2210,7 +2210,7 @@
           "name": "keyword.control.type.js"
         }
       },
-      "end": "(?<!^import|[^\\._$[:alnum:]]import)(?=;|$|^)",
+      "end": "(?<!^import|[^._$[:alnum:]]import)(?=;|$|^)",
       "name": "meta.import.js",
       "patterns": [
         {
@@ -2223,7 +2223,7 @@
           "include": "#string"
         },
         {
-          "begin": "(?<=^import|[^\\._$[:alnum:]]import)(?!\\s*[\"'])",
+          "begin": "(?<=^import|[^._$[:alnum:]]import)(?!\\s*[\"'])",
           "end": "\\bfrom\\b",
           "endCaptures": {
             "0": {
@@ -2330,7 +2330,7 @@
                   "name": "punctuation.accessor.optional.js"
                 }
               },
-              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
             },
             {
               "match": "([_$[:alpha:]][_$[:alnum:]]*)",
@@ -2353,7 +2353,7 @@
           "name": "punctuation.definition.block.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js"
@@ -2367,7 +2367,7 @@
           "include": "#string"
         },
         {
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object-literal.key.js"
         },
         {
@@ -2383,7 +2383,7 @@
           "name": "punctuation.definition.block.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js"
@@ -2431,7 +2431,7 @@
               "name": "string.quoted.alias.js"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         },
         {
           "include": "#punctuation-comma"
@@ -2456,7 +2456,7 @@
               "name": "string.quoted.alias.js"
             }
           },
-          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         }
       ]
     },
@@ -2496,7 +2496,7 @@
           "name": "variable.parameter.js"
         }
       },
-      "end": "(\\])\\s*(\\?\\s*)?|$",
+      "end": "(])\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.js"
@@ -2531,7 +2531,7 @@
           "name": "keyword.operator.expression.in.js"
         }
       },
-      "end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
+      "end": "(])([+-])?\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.js"
@@ -2569,11 +2569,11 @@
               "name": "punctuation.definition.bracket.square.end.jsdoc"
             }
           },
-          "match": "(\\[)[^\\]]+(\\])(?={@(?:link|linkcode|linkplain|tutorial))",
+          "match": "(\\[)[^\\]]+(])(?=\\{@(?:link|linkcode|linkplain|tutorial))",
           "name": "constant.other.description.jsdoc"
         },
         {
-          "begin": "({)((@)(?:link(?:code|plain)?|tutorial))\\s*",
+          "begin": "(\\{)((@)(?:link(?:code|plain)?|tutorial))\\s*",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.bracket.curly.begin.jsdoc"
@@ -2602,7 +2602,7 @@
                   "name": "punctuation.separator.pipe.jsdoc"
                 }
               },
-              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*[/])+)(\\|)?"
+              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*/)+)(\\|)?"
             },
             {
               "captures": {
@@ -2626,7 +2626,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"
@@ -2649,7 +2649,7 @@
           "name": "storage.type.interface.js"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.interface.js",
       "patterns": [
         {
@@ -2677,7 +2677,7 @@
     "jsdoctype": {
       "patterns": [
         {
-          "begin": "\\G({)",
+          "begin": "\\G(\\{)",
           "beginCaptures": {
             "0": {
               "name": "entity.name.type.instance.jsdoc"
@@ -2741,7 +2741,7 @@
               "name": "punctuation.definition.entity.js"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.js"
         }
       ]
@@ -2754,7 +2754,7 @@
         }
       },
       "contentName": "meta.embedded.expression.js",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.embedded.end.js"
@@ -2807,8 +2807,8 @@
       ]
     },
     "jsx-tag": {
-      "begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
-      "end": "(/>)|(?:(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+      "begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
+      "end": "(/>)|(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.js"
@@ -2835,7 +2835,7 @@
       "name": "meta.tag.js",
       "patterns": [
         {
-          "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
+          "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.js"
@@ -2853,7 +2853,7 @@
               "name": "support.class.component.js"
             }
           },
-          "end": "(?=[/]?>)",
+          "end": "(?=/?>)",
           "patterns": [
             {
               "include": "#comment"
@@ -2884,7 +2884,7 @@
       ]
     },
     "jsx-tag-attribute-assignment": {
-      "match": "=(?=\\s*(?:'|\"|{|/\\*|//|\\n))",
+      "match": "=(?=\\s*(?:['\"{]|/\\*|//|\\n))",
       "name": "keyword.operator.assignment.js"
     },
     "jsx-tag-attribute-name": {
@@ -2899,11 +2899,11 @@
           "name": "entity.other.attribute-name.js"
         }
       },
-      "match": "\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?([_$[:alpha:]][-_$[:alnum:]]*)(?=\\s|=|/?>|/\\*|//)"
+      "match": "\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?([_$[:alpha:]][-_$[:alnum:]]*)(?=[\\s=]|/?>|/\\*|//)"
     },
     "jsx-tag-attributes": {
       "begin": "\\s+",
-      "end": "(?=[/]?>)",
+      "end": "(?=/?>)",
       "name": "meta.tag.attributes.js",
       "patterns": [
         {
@@ -2934,8 +2934,8 @@
       "name": "invalid.illegal.attribute.js"
     },
     "jsx-tag-in-expression": {
-      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,))(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
-      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,))(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
+      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
       "patterns": [
         {
           "include": "#jsx-tag"
@@ -2943,7 +2943,7 @@
       ]
     },
     "jsx-tag-without-attributes": {
-      "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+      "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.js"
@@ -2965,7 +2965,7 @@
         }
       },
       "contentName": "meta.jsx.children.js",
-      "end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+      "end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.js"
@@ -2994,8 +2994,8 @@
       ]
     },
     "jsx-tag-without-attributes-in-expression": {
-      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
-      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>))",
+      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>))",
       "patterns": [
         {
           "include": "#jsx-tag-without-attributes"
@@ -3014,7 +3014,7 @@
               "name": "punctuation.separator.label.js"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#decl-block"
@@ -3065,7 +3065,7 @@
     "method-declaration": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.js"
@@ -3083,7 +3083,7 @@
               "name": "storage.type.js"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.js",
           "patterns": [
             {
@@ -3095,7 +3095,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.js"
@@ -3116,7 +3116,7 @@
               "name": "keyword.generator.asterisk.js"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.js",
           "patterns": [
             {
@@ -3128,7 +3128,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.js"
@@ -3149,7 +3149,7 @@
               "name": "keyword.generator.asterisk.js"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.js",
           "patterns": [
             {
@@ -3163,8 +3163,8 @@
       ]
     },
     "method-declaration-name": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??)\\s*[\\(\\<])",
-      "end": "(?=\\(|\\<)",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??)\\s*[(<])",
+      "end": "(?=[(<])",
       "patterns": [
         {
           "include": "#string"
@@ -3186,7 +3186,7 @@
       ]
     },
     "namespace-declaration": {
-      "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.js"
@@ -3198,7 +3198,7 @@
           "name": "storage.type.namespace.js"
         }
       },
-      "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?<=})|(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.namespace.declaration.js",
       "patterns": [
         {
@@ -3226,7 +3226,7 @@
           "name": "keyword.operator.new.js"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*\\())))",
       "name": "new.expr.js",
       "patterns": [
         {
@@ -3246,7 +3246,7 @@
               "name": "storage.type.numeric.bigint.js"
             }
           },
-          "match": "\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.hex.js"
         },
         {
@@ -3255,7 +3255,7 @@
               "name": "storage.type.numeric.bigint.js"
             }
           },
-          "match": "\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.binary.js"
         },
         {
@@ -3264,7 +3264,7 @@
               "name": "storage.type.numeric.bigint.js"
             }
           },
-          "match": "\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.octal.js"
         },
         {
@@ -3315,7 +3315,7 @@
               "name": "storage.type.numeric.bigint.js"
             }
           },
-          "match": "(?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)"
+          "match": "(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)"
         }
       ]
     },
@@ -3337,8 +3337,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3368,8 +3368,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3394,7 +3394,7 @@
       ]
     },
     "object-binding-element-propertyName": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
       "end": "(:)",
       "endCaptures": {
         "0": {
@@ -3427,7 +3427,7 @@
           "name": "punctuation.definition.binding-pattern.object.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.js"
@@ -3449,7 +3449,7 @@
           "name": "punctuation.definition.binding-pattern.object.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.js"
@@ -3482,7 +3482,7 @@
               "name": "variable.other.object.property.js"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(\\#?[[:upper:]][_$[:digit:][:upper:]]*)|(\\#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(#?\\p{upper}[_$\\d[:upper:]]*)|(#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
           "captures": {
@@ -3493,7 +3493,7 @@
               "name": "variable.other.object.js"
             }
           },
-          "match": "(?:([[:upper:]][_$[:digit:][:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\p{upper}[_$\\d[:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         }
       ]
     },
@@ -3504,7 +3504,7 @@
           "name": "punctuation.definition.block.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js"
@@ -3518,7 +3518,7 @@
       ]
     },
     "object-literal-method-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.async.js"
@@ -3530,7 +3530,7 @@
           "name": "keyword.generator.asterisk.js"
         }
       },
-      "end": "(?=\\}|;|,)|(?<=\\})",
+      "end": "(?=[};,])|(?<=})",
       "name": "meta.method.declaration.js",
       "patterns": [
         {
@@ -3540,7 +3540,7 @@
           "include": "#function-body"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js"
@@ -3552,7 +3552,7 @@
               "name": "keyword.generator.asterisk.js"
             }
           },
-          "end": "(?=\\(|\\<)",
+          "end": "(?=[(<])",
           "patterns": [
             {
               "include": "#method-declaration-name"
@@ -3571,7 +3571,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?=:)|((?<=[\\]])(?=\\s*[\\(\\<]))",
+          "end": "(?=:)|((?<=])(?=\\s*[(<]))",
           "name": "meta.object.member.js meta.object-literal.key.js",
           "patterns": [
             {
@@ -3583,8 +3583,8 @@
           ]
         },
         {
-          "begin": "(?=[\\'\\\"\\`])",
-          "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as|satisifies)\\s+))))",
+          "begin": "(?=['\"`])",
+          "end": "(?=:)|((?<=['\"`])(?=((\\s*[(<,}])|(\\s+(as|satisifies)\\s+))))",
           "name": "meta.object.member.js meta.object-literal.key.js",
           "patterns": [
             {
@@ -3596,8 +3596,8 @@
           ]
         },
         {
-          "begin": "(?=(\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)))",
-          "end": "(?=:)|(?=\\s*([\\(\\<,}])|(\\s+as|satisifies\\s+))",
+          "begin": "(?=(\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)))",
+          "end": "(?=:)|(?=\\s*([(<,}])|(\\s+as|satisifies\\s+))",
           "name": "meta.object.member.js meta.object-literal.key.js",
           "patterns": [
             {
@@ -3609,8 +3609,8 @@
           ]
         },
         {
-          "begin": "(?<=[\\]\\'\\\"\\`])(?=\\s*[\\(\\<])",
-          "end": "(?=\\}|;|,)|(?<=\\})",
+          "begin": "(?<=[\\]'\"`])(?=\\s*[(<])",
+          "end": "(?=[};,])|(?<=})",
           "name": "meta.method.declaration.js",
           "patterns": [
             {
@@ -3627,7 +3627,7 @@
               "name": "constant.numeric.decimal.js"
             }
           },
-          "match": "(?![_$[:alpha:]])([[:digit:]]+)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "(?![_$[:alpha:]])(\\d+)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.js"
         },
         {
@@ -3639,7 +3639,7 @@
               "name": "entity.name.function.js"
             }
           },
-          "match": "(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:(\\s*/\\*([^*]|(\\*[^/]))*\\*/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))",
           "name": "meta.object.member.js"
         },
         {
@@ -3648,7 +3648,7 @@
               "name": "meta.object-literal.key.js"
             }
           },
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.js"
         },
         {
@@ -3658,7 +3658,7 @@
               "name": "keyword.operator.spread.js"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.js",
           "patterns": [
             {
@@ -3672,7 +3672,7 @@
               "name": "variable.other.readwrite.js"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.js"
         },
         {
@@ -3697,7 +3697,7 @@
               "name": "keyword.control.satisfies.js"
             }
           },
-          "end": "(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
+          "end": "(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
           "name": "meta.object.member.js",
           "patterns": [
             {
@@ -3707,7 +3707,7 @@
         },
         {
           "begin": "(?=[_$[:alpha:]][_$[:alnum:]]*\\s*=)",
-          "end": "(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "end": "(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.js",
           "patterns": [
             {
@@ -3722,11 +3722,11 @@
               "name": "meta.object-literal.key.js punctuation.separator.key-value.js"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.js",
           "patterns": [
             {
-              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.js"
@@ -3759,7 +3759,7 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.js"
@@ -3781,13 +3781,13 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(?=\\<\\s*$)",
+              "begin": "(?<=:)\\s*(async)?\\s*(?=<\\s*$)",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.js"
                 }
               },
-              "end": "(?<=\\>)",
+              "end": "(?<=>)",
               "patterns": [
                 {
                   "include": "#type-parameters"
@@ -3795,7 +3795,7 @@
               ]
             },
             {
-              "begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=>)\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "meta.brace.round.js"
@@ -3839,7 +3839,7 @@
           "name": "punctuation.definition.binding-pattern.array.js"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.js"
@@ -3910,7 +3910,7 @@
               "name": "keyword.operator.optional.js"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -3930,7 +3930,7 @@
               "name": "keyword.operator.optional.js"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
         }
       ]
     },
@@ -3940,8 +3940,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3978,7 +3978,7 @@
           "name": "punctuation.definition.binding-pattern.object.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.js"
@@ -4031,7 +4031,7 @@
     "paren-expression-possibly-arrow": {
       "patterns": [
         {
-          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js"
@@ -4045,7 +4045,7 @@
           ]
         },
         {
-          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
+          "begin": "(?<=[(=,]|=>|^return|[^._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)))\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js"
@@ -4090,14 +4090,14 @@
       ]
     },
     "possibly-arrow-return-type": {
-      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*=>)",
       "beginCaptures": {
         "1": {
           "name": "meta.arrow.js meta.return.type.arrow.js keyword.operator.type.annotation.js"
         }
       },
       "contentName": "meta.arrow.js meta.return.type.arrow.js",
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "patterns": [
         {
           "include": "#arrow-return-type-body"
@@ -4117,7 +4117,7 @@
           "name": "punctuation.accessor.optional.js"
         }
       },
-      "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+      "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
     },
     "punctuation-comma": {
       "match": ",",
@@ -4134,7 +4134,7 @@
           "name": "punctuation.definition.string.begin.js"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.js"
@@ -4157,7 +4157,7 @@
           "name": "punctuation.definition.string.begin.js"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.js"
@@ -4176,7 +4176,7 @@
     "regex": {
       "patterns": [
         {
-          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[\\()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\]|\\(([^\\)\\\\]|\\\\.)+\\))+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case|=>|&&|\\|\\||\\*/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+]|\\(([^)\\\\]|\\\\.)+\\))+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.js"
@@ -4199,7 +4199,7 @@
           ]
         },
         {
-          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*\\/)|((?<=^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case))\\s*)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*/)|((?<=^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case))\\s*)/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.js"
@@ -4230,7 +4230,7 @@
           "name": "constant.other.character-class.regexp"
         },
         {
-          "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})",
+          "match": "\\\\([0-7]{3}|x\\h{2}|u\\h{4})",
           "name": "constant.character.numeric.regexp"
         },
         {
@@ -4246,7 +4246,7 @@
     "regexp": {
       "patterns": [
         {
-          "match": "\\\\[bB]|\\^|\\$",
+          "match": "\\\\[bB]|[\\^$]",
           "name": "keyword.control.anchor.regexp"
         },
         {
@@ -4258,10 +4258,10 @@
               "name": "variable.other.regexp"
             }
           },
-          "match": "\\\\[1-9]\\d*|\\\\k<([a-zA-Z_$][\\w$]*)>"
+          "match": "\\\\(?:[1-9]\\d*|k<([a-zA-Z_$][\\w$]*)>)"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.regexp"
         },
         {
@@ -4304,7 +4304,7 @@
           ]
         },
         {
-          "begin": "\\((?:(\\?:)|(?:\\?<([a-zA-Z_$][\\w$]*)>))?",
+          "begin": "\\((?:(\\?:)|\\?<([a-zA-Z_$][\\w$]*)>)?",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.regexp"
@@ -4339,7 +4339,7 @@
               "name": "keyword.operator.negation.regexp"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.regexp"
@@ -4368,7 +4368,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))",
               "name": "constant.other.character-class.range.regexp"
             },
             {
@@ -4390,7 +4390,7 @@
               "name": "keyword.operator.type.annotation.js"
             }
           },
-          "end": "(?<![:|&])(?=$|^|[{};,]|//)",
+          "end": "(?<![:|\\&])(?=$|^|[{};,]|//)",
           "name": "meta.return.type.js",
           "patterns": [
             {
@@ -4405,7 +4405,7 @@
               "name": "keyword.operator.type.annotation.js"
             }
           },
-          "end": "(?<![:|&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<![:|\\&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.return.type.js",
           "patterns": [
             {
@@ -4421,8 +4421,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?<=[:|&])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=[:|\\&])(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -4513,7 +4513,7 @@
       ]
     },
     "string-character-escape": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
+      "match": "\\\\(x\\h{2}|u\\h{4}|u\\{\\h+}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
       "name": "constant.character.escape.js"
     },
     "super-literal": {
@@ -4535,7 +4535,7 @@
           "include": "#punctuation-accessor"
         },
         {
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*[\\(]\\s*[\\\"\\'\\`]))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*\\(\\s*[\"'`])",
           "name": "keyword.operator.expression.import.js"
         }
       ]
@@ -4565,7 +4565,7 @@
               "name": "support.variable.property.importmeta.js"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(meta)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(meta)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4582,7 +4582,7 @@
               "name": "support.variable.property.target.js"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(target)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(target)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4599,7 +4599,7 @@
               "name": "support.constant.js"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())|(?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\()|(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$))"
         },
         {
           "captures": {
@@ -4619,13 +4619,13 @@
               "name": "support.type.object.module.js"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
         }
       ]
     },
     "switch-statement": {
       "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bswitch\\s*\\()",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js"
@@ -4666,7 +4666,7 @@
               "name": "punctuation.definition.block.js"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "name": "switch-block.expr.js",
           "patterns": [
             {
@@ -4695,7 +4695,7 @@
                 }
               },
               "contentName": "meta.block.js",
-              "end": "\\}",
+              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "meta.block.js punctuation.definition.block.js"
@@ -4758,12 +4758,12 @@
     "template-call": {
       "patterns": [
         {
-          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
           "end": "(?=`)",
           "patterns": [
             {
               "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
               "patterns": [
                 {
                   "include": "#support-function-call-identifiers"
@@ -4780,7 +4780,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.js"
@@ -4803,7 +4803,7 @@
         }
       },
       "contentName": "meta.embedded.line.js",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.js"
@@ -4857,7 +4857,7 @@
         }
       },
       "contentName": "meta.embedded.line.js",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.js"
@@ -4871,7 +4871,7 @@
       ]
     },
     "ternary-expression": {
-      "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
+      "begin": "(?!\\?\\.\\s*\\D)(\\?)(?!\\?)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.ternary.js"
@@ -4963,7 +4963,7 @@
           "name": "entity.name.type.alias.js"
         }
       },
-      "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.type.declaration.js",
       "patterns": [
         {
@@ -4982,7 +4982,7 @@
               "name": "keyword.control.intrinsic.js"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -4996,7 +4996,7 @@
               "name": "keyword.operator.assignment.js"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -5014,7 +5014,7 @@
               "name": "keyword.operator.type.annotation.js"
             }
           },
-          "end": "(?<![:|&])(?!\\s*[|&]\\s+)((?=^|[,);\\}\\]]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])(?!\\s*[|\\&]\\s+)((?=^|[,);}\\]]|//)|(?==[^>])|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.js",
           "patterns": [
             {
@@ -5029,7 +5029,7 @@
               "name": "keyword.operator.type.annotation.js"
             }
           },
-          "end": "(?<![:|&])((?=[,);\\}\\]]|\\/\\/)|(?==[^>])|(?=^\\s*$)|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])((?=[,);}\\]]|//)|(?==[^>])|(?=^\\s*$)|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.js",
           "patterns": [
             {
@@ -5040,13 +5040,13 @@
       ]
     },
     "type-arguments": {
-      "begin": "\\<",
+      "begin": "<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.begin.js"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.end.js"
@@ -5121,7 +5121,7 @@
     "type-fn-type-parameters": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*\\<)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*<)",
           "beginCaptures": {
             "1": {
               "name": "meta.type.constructor.js storage.modifier.js"
@@ -5159,7 +5159,7 @@
           ]
         },
         {
-          "begin": "((?=[(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>))))))",
+          "begin": "((?=\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>))))))",
           "end": "(?<=\\))",
           "name": "meta.type.function.js",
           "patterns": [
@@ -5179,7 +5179,7 @@
               "name": "storage.type.function.arrow.js"
             }
           },
-          "end": "(?<!=>)(?<![|&])(?=[,\\]\\)\\{\\}=;>:\\?]|//|$)",
+          "end": "(?<!=>)(?<![|\\&])(?=[,\\]){}=;>:?]|//|$)",
           "name": "meta.type.function.return.js",
           "patterns": [
             {
@@ -5194,7 +5194,7 @@
               "name": "storage.type.function.arrow.js"
             }
           },
-          "end": "(?<!=>)(?<![|&])((?=[,\\]\\)\\{\\}=;:\\?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<!=>)(?<![|\\&])((?=[,\\]){}=;:?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.type.function.return.js",
           "patterns": [
             {
@@ -5211,7 +5211,7 @@
         },
         {
           "begin": "(?<==>)(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -5248,7 +5248,7 @@
     "type-name": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(<)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(<)",
           "captures": {
             "1": {
               "name": "entity.name.type.module.js"
@@ -5311,7 +5311,7 @@
               "name": "punctuation.accessor.optional.js"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
         },
         {
           "match": "[_$[:alpha:]][_$[:alnum:]]*",
@@ -5326,7 +5326,7 @@
           "name": "punctuation.definition.block.js"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js"
@@ -5359,7 +5359,7 @@
               "name": "keyword.operator.spread.js"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "patterns": [
             {
               "include": "#type"
@@ -5386,13 +5386,13 @@
           "include": "#type-infer"
         },
         {
-          "begin": "([&|])(?=\\s*\\{)",
+          "begin": "([\\&|])(?=\\s*\\{)",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.js"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -5400,7 +5400,7 @@
           ]
         },
         {
-          "begin": "[&|]",
+          "begin": "[\\&|]",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.js"
@@ -5413,7 +5413,7 @@
           "name": "keyword.operator.expression.keyof.js"
         },
         {
-          "match": "(\\?|\\:)",
+          "match": "([?:])",
           "name": "keyword.operator.ternary.js"
         },
         {
@@ -5489,7 +5489,7 @@
               "name": "keyword.operator.optional.js"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))))"
         },
         {
           "captures": {
@@ -5509,7 +5509,7 @@
               "name": "keyword.operator.optional.js"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
         },
         {
           "include": "#type-annotation"
@@ -5590,7 +5590,7 @@
           "name": "meta.brace.square.js"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.js"
@@ -5631,7 +5631,7 @@
           "name": "keyword.operator.expression.typeof.js"
         }
       },
-      "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[,);}\\]=>:\\&|{?]|(extends\\s+)|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "patterns": [
         {
           "include": "#type-arguments"
@@ -5649,7 +5649,7 @@
       "patterns": [
         {
           "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^let|[^._$[:alnum:]]let|^var|[^._$[:alnum:]]var)(?=\\s*$)))",
           "name": "meta.var.expr.js",
           "patterns": [
             {
@@ -5680,13 +5680,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.js"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5723,7 +5723,7 @@
               "name": "storage.type.js"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^const|[^._$[:alnum:]]const)(?=\\s*$)))",
           "name": "meta.var.expr.js",
           "patterns": [
             {
@@ -5754,13 +5754,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.js"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5785,7 +5785,7 @@
           ]
         },
         {
-          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.js"
@@ -5797,11 +5797,11 @@
               "name": "storage.type.js"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^using|[^\\._$[:alnum:]]using|^await\\s+using|[^\\._$[:alnum:]]await\\s+using)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^using|[^._$[:alnum:]]using|^await\\s+using|[^._$[:alnum:]]await\\s+using)(?=\\s*$)))",
           "name": "meta.var.expr.js",
           "patterns": [
             {
-              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control.export.js"
@@ -5825,13 +5825,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+              "begin": "(,)\\s*((?!\\S)|(?=//))",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.js"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5857,13 +5857,13 @@
     "var-single-const": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.js variable.other.constant.js entity.name.function.js"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js",
           "patterns": [
             {
@@ -5878,7 +5878,7 @@
               "name": "meta.definition.variable.js variable.other.constant.js"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js",
           "patterns": [
             {
@@ -5891,7 +5891,7 @@
     "var-single-variable": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.js entity.name.function.js"
@@ -5900,7 +5900,7 @@
               "name": "keyword.operator.definiteassignment.js"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js",
           "patterns": [
             {
@@ -5909,7 +5909,7 @@
           ]
         },
         {
-          "begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])(\\!)?",
+          "begin": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.js variable.other.constant.js"
@@ -5918,7 +5918,7 @@
               "name": "keyword.operator.definiteassignment.js"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js",
           "patterns": [
             {
@@ -5927,7 +5927,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.js variable.other.readwrite.js"
@@ -5936,7 +5936,7 @@
               "name": "keyword.operator.definiteassignment.js"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js",
           "patterns": [
             {
@@ -5962,7 +5962,7 @@
     "variable-initializer": {
       "patterns": [
         {
-          "begin": "(?<!=|!)(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
+          "begin": "(?<![=!])(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.js"
@@ -5976,13 +5976,13 @@
           ]
         },
         {
-          "begin": "(?<!=|!)(=)(?!=)",
+          "begin": "(?<![=!])(=)(?!=)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.js"
             }
           },
-          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![\\|\\&\\+\\-\\*\\/])(?<=\\S)(?<!=)(?=\\s*$)",
+          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![|\\&+\\-*/])(?<=\\S)(?<!=)(?=\\s*$)",
           "patterns": [
             {
               "include": "#expression"
diff --git a/resources/languages/jinja-html.json b/resources/languages/jinja-html.json
index e393968..6b41115 100644
--- a/resources/languages/jinja-html.json
+++ b/resources/languages/jinja-html.json
@@ -1,8 +1,8 @@
 {
   "displayName": "jinja-html",
-  "firstLineMatch": "^{% extends [\"'][^\"']+[\"'] %}",
-  "foldingStartMarker": "(<(?i:(head|table|tr|div|style|script|ul|ol|form|dl))\\b.*?>|{%\\s*(block|filter|for|if|macro|raw))",
-  "foldingStopMarker": "(</(?i:(head|table|tr|div|style|script|ul|ol|form|dl))\\b.*?>|{%\\s*(endblock|endfilter|endfor|endif|endmacro|endraw)\\s*%})",
+  "firstLineMatch": "^\\{% extends [\"'][^\"']+[\"'] %}",
+  "foldingStartMarker": "(<(?i:(head|table|tr|div|style|script|ul|ol|form|dl))\\b.*?>|\\{%\\s*(block|filter|for|if|macro|raw))",
+  "foldingStopMarker": "(</(?i:(head|table|tr|div|style|script|ul|ol|form|dl))\\b.*?>|\\{%\\s*(end(?:block|filter|for|if|macro|raw))\\s*%})",
   "name": "jinja-html",
   "patterns": [
     {
diff --git a/resources/languages/jinja.json b/resources/languages/jinja.json
index 62aafd1..28607b3 100644
--- a/resources/languages/jinja.json
+++ b/resources/languages/jinja.json
@@ -1,11 +1,11 @@
 {
   "displayName": "Jinja",
-  "foldingStartMarker": "({%\\s*(block|filter|for|if|macro|raw))",
-  "foldingStopMarker": "({%\\s*(endblock|endfilter|endfor|endif|endmacro|endraw)\\s*%})",
+  "foldingStartMarker": "(\\{%\\s*(block|filter|for|if|macro|raw))",
+  "foldingStopMarker": "(\\{%\\s*(end(?:block|filter|for|if|macro|raw))\\s*%})",
   "name": "jinja",
   "patterns": [
     {
-      "begin": "({%)\\s*(raw)\\s*(%})",
+      "begin": "(\\{%)\\s*(raw)\\s*(%})",
       "captures": {
         "1": {
           "name": "entity.other.jinja.delimiter.tag"
@@ -17,14 +17,14 @@
           "name": "entity.other.jinja.delimiter.tag"
         }
       },
-      "end": "({%)\\s*(endraw)\\s*(%})",
+      "end": "(\\{%)\\s*(endraw)\\s*(%})",
       "name": "comment.block.jinja.raw"
     },
     {
       "include": "#comments"
     },
     {
-      "begin": "{{-?",
+      "begin": "\\{\\{-?",
       "captures": [
         {
           "name": "variable.entity.other.jinja.delimiter"
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "begin": "{%-?",
+      "begin": "\\{%-?",
       "captures": [
         {
           "name": "entity.other.jinja.delimiter.tag"
@@ -56,7 +56,7 @@
   ],
   "repository": {
     "comments": {
-      "begin": "{#-?",
+      "begin": "\\{#-?",
       "captures": [
         {
           "name": "entity.other.jinja.delimiter.comment"
@@ -86,7 +86,7 @@
           "name": "constant.character.escape.unicode.name.jinja"
         }
       },
-      "match": "(\\\\U[0-9A-Fa-f]{8})|(\\\\u[0-9A-Fa-f]{4})|(\\\\N\\{[a-zA-Z ]+\\})"
+      "match": "(\\\\U\\h{8})|(\\\\u\\h{4})|(\\\\N\\{[a-zA-Z ]+})"
     },
     "expression": {
       "patterns": [
@@ -129,7 +129,7 @@
               "name": "keyword.control.jinja"
             }
           },
-          "match": "(?<=\\{\\%-|\\{\\%)\\s*\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?!\\s*[,=])"
+          "match": "(?<=\\{%(?:-|))\\s*\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?!\\s*[,=])"
         },
         {
           "match": "\\b(and|else|if|in|import|not|or|recursive|with(out)?\\s+context)\\b",
@@ -148,7 +148,7 @@
           "name": "variable.other.jinja"
         },
         {
-          "match": "(\\+|\\-|\\*\\*|\\*|//|/|%)",
+          "match": "([+-]|\\*\\*|\\*|//|[/%])",
           "name": "keyword.operator.arithmetic.jinja"
         },
         {
@@ -180,7 +180,7 @@
               "name": "punctuation.other.jinja"
             }
           ],
-          "end": "\\]",
+          "end": "]",
           "patterns": [
             {
               "include": "#expression"
@@ -208,7 +208,7 @@
               "name": "punctuation.other.jinja"
             }
           ],
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#expression"
@@ -216,11 +216,11 @@
           ]
         },
         {
-          "match": "(\\.|:|\\||,)",
+          "match": "([.:|,])",
           "name": "punctuation.other.jinja"
         },
         {
-          "match": "(==|<=|=>|<|>|!=)",
+          "match": "(==|<=|=>|[<>]|!=)",
           "name": "keyword.operator.comparison.jinja"
         },
         {
@@ -325,7 +325,7 @@
           "name": "constant.character.escape.return.jinja"
         }
       },
-      "match": "(\\\\\\n)|(\\\\\\\\)|(\\\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)"
+      "match": "(\\\\\\n)|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)"
     },
     "string": {
       "patterns": [
diff --git a/resources/languages/jison.json b/resources/languages/jison.json
index 2753d9c..be5ef46 100644
--- a/resources/languages/jison.json
+++ b/resources/languages/jison.json
@@ -120,7 +120,7 @@
             }
           },
           "contentName": "source.js.embedded.jison",
-          "end": "\\}\\}",
+          "end": "}}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.action.end.jison"
@@ -135,7 +135,7 @@
         },
         {
           "begin": "(?=%\\{)",
-          "end": "(?<=%\\})",
+          "end": "(?<=%})",
           "name": "meta.action.jison",
           "patterns": [
             {
@@ -250,7 +250,7 @@
         },
         {
           "begin": "(?=%\\{)",
-          "end": "(?<=%\\})",
+          "end": "(?<=%})",
           "name": "meta.section.prologue.jison",
           "patterns": [
             {
@@ -430,7 +430,7 @@
               "name": "constant.numeric.integer.hexadecimal.jison"
             }
           },
-          "match": "(0[Xx])([0-9A-Fa-f]+)"
+          "match": "(0[Xx])(\\h+)"
         },
         {
           "match": "\\d+",
@@ -529,7 +529,7 @@
             }
           },
           "contentName": "source.js.embedded.jison",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.action.end.jison"
@@ -620,7 +620,7 @@
                       "name": "punctuation.definition.named-reference.end.jison"
                     }
                   },
-                  "match": "(\\[)([[:alpha:]_](?:[\\w-]*\\w)?)(\\])"
+                  "match": "(\\[)([[:alpha:]_](?:[\\w-]*\\w)?)(])"
                 },
                 {
                   "begin": "(%(prec))\\s*",
@@ -654,7 +654,7 @@
                   "name": "keyword.other.$0.jison"
                 },
                 {
-                  "match": "(?:%(?:e(?:mpty|psilon))|\\b[Ɛɛεϵ])\\b",
+                  "match": "(?:%e(?:mpty|psilon)|\\b[Ɛɛεϵ])\\b",
                   "name": "keyword.other.empty.jison"
                 },
                 {
@@ -676,7 +676,7 @@
             }
           },
           "contentName": "source.js.embedded.jison",
-          "end": "%\\}",
+          "end": "%}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.user-code-block.end.jison"
diff --git a/resources/languages/json.json b/resources/languages/json.json
index e5c2d5b..7c44cef 100644
--- a/resources/languages/json.json
+++ b/resources/languages/json.json
@@ -14,7 +14,7 @@
           "name": "punctuation.definition.array.begin.json"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.array.end.json"
@@ -83,7 +83,7 @@
           "name": "punctuation.definition.dictionary.begin.json"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dictionary.end.json"
@@ -92,7 +92,6 @@
       "name": "meta.structure.dictionary.json",
       "patterns": [
         {
-          "comment": "the JSON object key",
           "include": "#objectkey"
         },
         {
@@ -105,7 +104,7 @@
               "name": "punctuation.separator.dictionary.key-value.json"
             }
           },
-          "end": "(,)|(?=\\})",
+          "end": "(,)|(?=})",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.dictionary.pair.json"
@@ -114,7 +113,6 @@
           "name": "meta.structure.dictionary.value.json",
           "patterns": [
             {
-              "comment": "the JSON object value",
               "include": "#value"
             },
             {
@@ -124,7 +122,7 @@
           ]
         },
         {
-          "match": "[^\\s\\}]",
+          "match": "[^\\s}]",
           "name": "invalid.illegal.expected-dictionary-separator.json"
         }
       ]
@@ -172,7 +170,7 @@
     "stringcontent": {
       "patterns": [
         {
-          "match": "\\\\(?:[\"\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+          "match": "\\\\(?:[\"\\\\/bfnrt]|u\\h{4})",
           "name": "constant.character.escape.json"
         },
         {
diff --git a/resources/languages/json5.json b/resources/languages/json5.json
index 7167d6b..c2232db 100644
--- a/resources/languages/json5.json
+++ b/resources/languages/json5.json
@@ -20,7 +20,7 @@
           "name": "punctuation.definition.array.begin.json5"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.array.end.json5"
@@ -98,12 +98,10 @@
     "number": {
       "patterns": [
         {
-          "comment": "handles hexadecimal numbers",
           "match": "(0x)[0-9a-fA-f]*",
           "name": "constant.hex.numeric.json5"
         },
         {
-          "comment": "handles integer and decimal numbers",
           "match": "[+-.]?(?=[1-9]|0(?!\\d))\\d+(\\.\\d+)?([eE][+-]?\\d+)?",
           "name": "constant.dec.numeric.json5"
         }
@@ -116,8 +114,7 @@
           "name": "punctuation.definition.dictionary.begin.json5"
         }
       },
-      "comment": "a json5 object",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dictionary.end.json5"
@@ -129,7 +126,6 @@
           "include": "#comments"
         },
         {
-          "comment": "the json5 object key",
           "include": "#key"
         },
         {
@@ -139,7 +135,7 @@
               "name": "punctuation.separator.dictionary.key-value.json5"
             }
           },
-          "end": "(,)|(?=\\})",
+          "end": "(,)|(?=})",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.dictionary.pair.json5"
@@ -148,7 +144,6 @@
           "name": "meta.structure.dictionary.value.json5",
           "patterns": [
             {
-              "comment": "the json5 object value",
               "include": "#value"
             },
             {
@@ -158,19 +153,19 @@
           ]
         },
         {
-          "match": "[^\\s\\}]",
+          "match": "[^\\s}]",
           "name": "invalid.illegal.expected-dictionary-separator.json5"
         }
       ]
     },
     "stringDouble": {
-      "begin": "[\"]",
+      "begin": "\"",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.json5"
         }
       },
-      "end": "[\"]",
+      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.json5"
@@ -179,7 +174,7 @@
       "name": "string.quoted.json5",
       "patterns": [
         {
-          "match": "(?:\\\\(?:[\"\\\\\\/bfnrt]|u[0-9a-fA-F]{4}))",
+          "match": "\\\\(?:[\"\\\\/bfnrt]|u\\h{4})",
           "name": "constant.character.escape.json5"
         },
         {
@@ -189,13 +184,13 @@
       ]
     },
     "stringSingle": {
-      "begin": "[']",
+      "begin": "'",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.json5"
         }
       },
-      "end": "[']",
+      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.json5"
@@ -204,7 +199,7 @@
       "name": "string.quoted.json5",
       "patterns": [
         {
-          "match": "(?:\\\\(?:[\"\\\\\\/bfnrt]|u[0-9a-fA-F]{4}))",
+          "match": "\\\\(?:[\"\\\\/bfnrt]|u\\h{4})",
           "name": "constant.character.escape.json5"
         },
         {
@@ -214,7 +209,6 @@
       ]
     },
     "value": {
-      "comment": "the 'value' diagram at http://json.org",
       "patterns": [
         {
           "include": "#constant"
diff --git a/resources/languages/jsonc.json b/resources/languages/jsonc.json
index e531c05..b07cb2f 100644
--- a/resources/languages/jsonc.json
+++ b/resources/languages/jsonc.json
@@ -14,7 +14,7 @@
           "name": "punctuation.definition.array.begin.json.comments"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.array.end.json.comments"
@@ -83,7 +83,7 @@
           "name": "punctuation.definition.dictionary.begin.json.comments"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dictionary.end.json.comments"
@@ -92,7 +92,6 @@
       "name": "meta.structure.dictionary.json.comments",
       "patterns": [
         {
-          "comment": "the JSON object key",
           "include": "#objectkey"
         },
         {
@@ -105,7 +104,7 @@
               "name": "punctuation.separator.dictionary.key-value.json.comments"
             }
           },
-          "end": "(,)|(?=\\})",
+          "end": "(,)|(?=})",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.dictionary.pair.json.comments"
@@ -114,7 +113,6 @@
           "name": "meta.structure.dictionary.value.json.comments",
           "patterns": [
             {
-              "comment": "the JSON object value",
               "include": "#value"
             },
             {
@@ -124,7 +122,7 @@
           ]
         },
         {
-          "match": "[^\\s\\}]",
+          "match": "[^\\s}]",
           "name": "invalid.illegal.expected-dictionary-separator.json.comments"
         }
       ]
@@ -172,7 +170,7 @@
     "stringcontent": {
       "patterns": [
         {
-          "match": "\\\\(?:[\"\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+          "match": "\\\\(?:[\"\\\\/bfnrt]|u\\h{4})",
           "name": "constant.character.escape.json.comments"
         },
         {
diff --git a/resources/languages/jsonl.json b/resources/languages/jsonl.json
index d5357e9..017b250 100644
--- a/resources/languages/jsonl.json
+++ b/resources/languages/jsonl.json
@@ -14,7 +14,7 @@
           "name": "punctuation.definition.array.begin.json.lines"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.array.end.json.lines"
@@ -83,7 +83,7 @@
           "name": "punctuation.definition.dictionary.begin.json.lines"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dictionary.end.json.lines"
@@ -92,7 +92,6 @@
       "name": "meta.structure.dictionary.json.lines",
       "patterns": [
         {
-          "comment": "the JSON object key",
           "include": "#objectkey"
         },
         {
@@ -105,7 +104,7 @@
               "name": "punctuation.separator.dictionary.key-value.json.lines"
             }
           },
-          "end": "(,)|(?=\\})",
+          "end": "(,)|(?=})",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.dictionary.pair.json.lines"
@@ -114,7 +113,6 @@
           "name": "meta.structure.dictionary.value.json.lines",
           "patterns": [
             {
-              "comment": "the JSON object value",
               "include": "#value"
             },
             {
@@ -124,7 +122,7 @@
           ]
         },
         {
-          "match": "[^\\s\\}]",
+          "match": "[^\\s}]",
           "name": "invalid.illegal.expected-dictionary-separator.json.lines"
         }
       ]
@@ -172,7 +170,7 @@
     "stringcontent": {
       "patterns": [
         {
-          "match": "\\\\(?:[\"\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+          "match": "\\\\(?:[\"\\\\/bfnrt]|u\\h{4})",
           "name": "constant.character.escape.json.lines"
         },
         {
diff --git a/resources/languages/jsonnet.json b/resources/languages/jsonnet.json
index d857f77..790f855 100644
--- a/resources/languages/jsonnet.json
+++ b/resources/languages/jsonnet.json
@@ -13,39 +13,39 @@
     "builtin-functions": {
       "patterns": [
         {
-          "match": "\\bstd[.](acos|asin|atan|ceil|char|codepoint|cos|exp|exponent)\\b",
+          "match": "\\bstd\\.(acos|asin|atan|ceil|char|codepoint|cos|exp|exponent)\\b",
           "name": "support.function.jsonnet"
         },
         {
-          "match": "\\bstd[.](filter|floor|force|length|log|makeArray|mantissa)\\b",
+          "match": "\\bstd\\.(filter|floor|force|length|log|makeArray|mantissa)\\b",
           "name": "support.function.jsonnet"
         },
         {
-          "match": "\\bstd[.](objectFields|objectHas|pow|sin|sqrt|tan|type|thisFile)\\b",
+          "match": "\\bstd\\.(objectFields|objectHas|pow|sin|sqrt|tan|type|thisFile)\\b",
           "name": "support.function.jsonnet"
         },
         {
-          "match": "\\bstd[.](acos|asin|atan|ceil|char|codepoint|cos|exp|exponent)\\b",
+          "match": "\\bstd\\.(acos|asin|atan|ceil|char|codepoint|cos|exp|exponent)\\b",
           "name": "support.function.jsonnet"
         },
         {
-          "match": "\\bstd[.](abs|assertEqual|escapeString(Bash|Dollars|Json|Python))\\b",
+          "match": "\\bstd\\.(abs|assertEqual|escapeString(Bash|Dollars|Json|Python))\\b",
           "name": "support.function.jsonnet"
         },
         {
-          "match": "\\bstd[.](filterMap|flattenArrays|foldl|foldr|format|join)\\b",
+          "match": "\\bstd\\.(filterMap|flattenArrays|foldl|foldr|format|join)\\b",
           "name": "support.function.jsonnet"
         },
         {
-          "match": "\\bstd[.](lines|manifest(Ini|Python(Vars)?)|map|max|min|mod)\\b",
+          "match": "\\bstd\\.(lines|manifest(Ini|Python(Vars)?)|map|max|min|mod)\\b",
           "name": "support.function.jsonnet"
         },
         {
-          "match": "\\bstd[.](set|set(Diff|Inter|Member|Union)|sort)\\b",
+          "match": "\\bstd\\.(s(?:et|et(Diff|Inter|Member|Union)|ort))\\b",
           "name": "support.function.jsonnet"
         },
         {
-          "match": "\\bstd[.](range|split|stringChars|substr|toString|uniq)\\b",
+          "match": "\\bstd\\.(range|split|stringChars|substr|toString|uniq)\\b",
           "name": "support.function.jsonnet"
         }
       ]
@@ -73,7 +73,7 @@
       "name": "string.quoted.double.jsonnet",
       "patterns": [
         {
-          "match": "\\\\([\"\\\\\\/bfnrt]|(u[0-9a-fA-F]{4}))",
+          "match": "\\\\([\"\\\\/bfnrt]|(u\\h{4}))",
           "name": "constant.character.escape.jsonnet"
         },
         {
@@ -129,7 +129,7 @@
     "keywords": {
       "patterns": [
         {
-          "match": "[!:~\\+\\-&\\|\\^=<>\\*\\/%]",
+          "match": "[!:~+\\-\\&|^=<>*/%]",
           "name": "keyword.operator.jsonnet"
         },
         {
@@ -173,11 +173,11 @@
           "name": "constant.numeric.jsonnet"
         },
         {
-          "match": "\\b\\d+[.]\\d*([Ee][+-]?\\d+)?\\b",
+          "match": "\\b\\d+\\.\\d*([Ee][+-]?\\d+)?\\b",
           "name": "constant.numeric.jsonnet"
         },
         {
-          "match": "\\b[.]\\d+([Ee][+-]?\\d+)?\\b",
+          "match": "\\b\\.\\d+([Ee][+-]?\\d+)?\\b",
           "name": "constant.numeric.jsonnet"
         }
       ]
@@ -188,7 +188,7 @@
       "name": "string.quoted.double.jsonnet",
       "patterns": [
         {
-          "match": "\\\\(['\\\\\\/bfnrt]|(u[0-9a-fA-F]{4}))",
+          "match": "\\\\(['\\\\/bfnrt]|(u\\h{4}))",
           "name": "constant.character.escape.jsonnet"
         },
         {
diff --git a/resources/languages/jssm.json b/resources/languages/jssm.json
index 98c42fd..683c9d5 100644
--- a/resources/languages/jssm.json
+++ b/resources/languages/jssm.json
@@ -13,145 +13,118 @@
           "name": "punctuation.definition.comment.mn"
         }
       },
-      "comment": "block comment",
       "end": "\\*/",
       "name": "comment.block.jssm"
     },
     {
       "begin": "//",
-      "comment": "block comment",
       "end": "$",
       "name": "comment.line.jssm"
     },
     {
-      "begin": "\\${",
+      "begin": "\\$\\{",
       "captures": {
         "0": {
           "name": "entity.name.function"
         }
       },
-      "comment": "js outcalls",
       "end": "}",
       "name": "keyword.other"
     },
     {
-      "comment": "semver",
       "match": "([0-9]*)(\\.)([0-9]*)(\\.)([0-9]*)",
       "name": "constant.numeric"
     },
     {
-      "comment": "jssm language tokens",
       "match": "graph_layout(\\s*)(:)",
       "name": "constant.language.jssmLanguage"
     },
     {
-      "comment": "jssm language tokens",
       "match": "machine_name(\\s*)(:)",
       "name": "constant.language.jssmLanguage"
     },
     {
-      "comment": "jssm language tokens",
       "match": "machine_version(\\s*)(:)",
       "name": "constant.language.jssmLanguage"
     },
     {
-      "comment": "jssm language tokens",
       "match": "jssm_version(\\s*)(:)",
       "name": "constant.language.jssmLanguage"
     },
     {
-      "comment": "transitions",
       "match": "<->",
       "name": "keyword.control.transition.jssmArrow.legal_legal"
     },
     {
-      "comment": "transitions",
       "match": "<-",
       "name": "keyword.control.transition.jssmArrow.legal_none"
     },
     {
-      "comment": "transitions",
       "match": "->",
       "name": "keyword.control.transition.jssmArrow.none_legal"
     },
     {
-      "comment": "transitions",
       "match": "<=>",
       "name": "keyword.control.transition.jssmArrow.main_main"
     },
     {
-      "comment": "transitions",
       "match": "=>",
       "name": "keyword.control.transition.jssmArrow.none_main"
     },
     {
-      "comment": "transitions",
       "match": "<=",
       "name": "keyword.control.transition.jssmArrow.main_none"
     },
     {
-      "comment": "transitions",
       "match": "<~>",
       "name": "keyword.control.transition.jssmArrow.forced_forced"
     },
     {
-      "comment": "transitions",
       "match": "~>",
       "name": "keyword.control.transition.jssmArrow.none_forced"
     },
     {
-      "comment": "transitions",
       "match": "<~",
       "name": "keyword.control.transition.jssmArrow.forced_none"
     },
     {
-      "comment": "transitions",
       "match": "<-=>",
       "name": "keyword.control.transition.jssmArrow.legal_main"
     },
     {
-      "comment": "transitions",
       "match": "<=->",
       "name": "keyword.control.transition.jssmArrow.main_legal"
     },
     {
-      "comment": "transitions",
       "match": "<-~>",
       "name": "keyword.control.transition.jssmArrow.legal_forced"
     },
     {
-      "comment": "transitions",
       "match": "<~->",
       "name": "keyword.control.transition.jssmArrow.forced_legal"
     },
     {
-      "comment": "transitions",
       "match": "<=~>",
       "name": "keyword.control.transition.jssmArrow.main_forced"
     },
     {
-      "comment": "transitions",
       "match": "<~=>",
       "name": "keyword.control.transition.jssmArrow.forced_main"
     },
     {
-      "comment": "edge probability annotation",
       "match": "([0-9]+)%",
       "name": "constant.numeric.jssmProbability"
     },
     {
-      "comment": "action annotation",
-      "match": "\\'[^']*\\'",
+      "match": "'[^']*'",
       "name": "constant.character.jssmAction"
     },
     {
-      "comment": "jssm label annotation",
-      "match": "\\\"[^\"]*\\\"",
+      "match": "\"[^\"]*\"",
       "name": "entity.name.tag.jssmLabel.doublequoted"
     },
     {
-      "comment": "jssm label annotation",
-      "match": "([a-zA-Z0-9_.+&()#@!?,])",
+      "match": "([a-zA-Z0-9_.+\\&()#@!?,])",
       "name": "entity.name.tag.jssmLabel.atom"
     }
   ],
diff --git a/resources/languages/jsx.json b/resources/languages/jsx.json
index 647cbae..1926259 100644
--- a/resources/languages/jsx.json
+++ b/resources/languages/jsx.json
@@ -18,13 +18,13 @@
       "name": "storage.modifier.js.jsx"
     },
     "after-operator-block-as-object-literal": {
-      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^yield|[^._$[:alnum:]]yield|^throw|[^._$[:alnum:]]throw|^in|[^._$[:alnum:]]in|^of|[^._$[:alnum:]]of|^typeof|[^._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js.jsx"
@@ -47,7 +47,7 @@
           "name": "punctuation.definition.binding-pattern.array.js.jsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.js.jsx"
@@ -72,7 +72,7 @@
           "name": "punctuation.definition.binding-pattern.array.js.jsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.js.jsx"
@@ -94,7 +94,7 @@
           "name": "meta.brace.square.js.jsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.js.jsx"
@@ -125,13 +125,13 @@
           "name": "meta.arrow.js.jsx"
         },
         {
-          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))",
+          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js.jsx"
             }
           },
-          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
           "name": "meta.arrow.js.jsx",
           "patterns": [
             {
@@ -158,7 +158,7 @@
               "name": "storage.type.function.arrow.js.jsx"
             }
           },
-          "end": "((?<=\\}|\\S)(?<!=>)|((?!\\{)(?=\\S)))(?!\\/[\\/\\*])",
+          "end": "((?<=[}\\S])(?<!=>)|((?!\\{)(?=\\S)))(?!/[/*])",
           "name": "meta.arrow.js.jsx",
           "patterns": [
             {
@@ -181,7 +181,7 @@
           "name": "keyword.operator.type.annotation.js.jsx"
         }
       },
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "name": "meta.return.type.arrow.js.jsx",
       "patterns": [
         {
@@ -192,8 +192,8 @@
     "arrow-return-type-body": {
       "patterns": [
         {
-          "begin": "(?<=[:])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=:)(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -283,7 +283,7 @@
     "brackets": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}|(?=\\*/)",
           "patterns": [
             {
@@ -293,7 +293,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]|(?=\\*/)",
+          "end": "]|(?=\\*/)",
           "patterns": [
             {
               "include": "#brackets"
@@ -325,7 +325,7 @@
           "name": "storage.type.class.js.jsx"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.js.jsx",
       "patterns": [
         {
@@ -358,7 +358,7 @@
       ]
     },
     "class-expression": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|\\/[\\/*])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|/[/*])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.js.jsx"
@@ -367,7 +367,7 @@
           "name": "storage.type.class.js.jsx"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.js.jsx",
       "patterns": [
         {
@@ -382,7 +382,7 @@
           "name": "punctuation.definition.block.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js.jsx"
@@ -397,7 +397,7 @@
         },
         {
           "begin": "(?<=:)\\s*",
-          "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[\\s;),}\\]:\\-+]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -449,7 +449,7 @@
       ]
     },
     "class-or-interface-heritage": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(extends|implements)\\b)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\b(extends|implements)\\b(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.js.jsx"
@@ -481,7 +481,7 @@
               "name": "punctuation.accessor.optional.js.jsx"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
         },
         {
           "captures": {
@@ -597,7 +597,7 @@
               "name": "keyword.control.flow.js.jsx"
             }
           },
-          "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[;}]|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -636,7 +636,7 @@
           "name": "punctuation.definition.block.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js.jsx"
@@ -691,7 +691,7 @@
       ]
     },
     "decorator": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\@",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))@",
       "beginCaptures": {
         "0": {
           "name": "punctuation.decorator.js.jsx"
@@ -708,7 +708,7 @@
     "destructuring-const": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.js.jsx",
           "patterns": [
@@ -724,7 +724,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.js.jsx",
           "patterns": [
@@ -744,7 +744,7 @@
     "destructuring-parameter": {
       "patterns": [
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.js.jsx"
@@ -753,7 +753,7 @@
               "name": "punctuation.definition.binding-pattern.object.js.jsx"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.object.js.jsx"
@@ -767,7 +767,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.js.jsx"
@@ -776,7 +776,7 @@
               "name": "punctuation.definition.binding-pattern.array.js.jsx"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.array.js.jsx"
@@ -808,7 +808,7 @@
     "destructuring-variable": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.js.jsx",
           "patterns": [
@@ -824,7 +824,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.js.jsx",
           "patterns": [
@@ -864,7 +864,7 @@
       "match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)"
     },
     "directives": {
-      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)",
+      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))+\\s*/>\\s*$)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.js.jsx"
@@ -920,7 +920,7 @@
               "name": "constant.language.access-type.jsdoc"
             }
           },
-          "match": "((@)(?:access|api))\\s+(private|protected|public)\\b"
+          "match": "((@)a(?:ccess|pi))\\s+(p(?:rivate|rotected|ublic))\\b"
         },
         {
           "captures": {
@@ -1047,7 +1047,7 @@
               "name": "entity.name.type.instance.jsdoc"
             }
           },
-          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*\\])?{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
+          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*])?\\{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
         },
         {
           "captures": {
@@ -1064,7 +1064,7 @@
           "match": "((@)template)\\s+([A-Za-z_$][\\w$.\\[\\]]*(?:\\s*,\\s*[A-Za-z_$][\\w$.\\[\\]]*)*)"
         },
         {
-          "begin": "((@)template)\\s+(?={)",
+          "begin": "((@)template)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1099,7 +1099,7 @@
           "match": "((@)(?:arg|argument|const|constant|member|namespace|param|var))\\s+([A-Za-z_$][\\w$.\\[\\]]*)"
         },
         {
-          "begin": "((@)typedef)\\s+(?={)",
+          "begin": "((@)typedef)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1120,7 +1120,7 @@
           ]
         },
         {
-          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?={)",
+          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1156,13 +1156,13 @@
                   "name": "invalid.illegal.syntax.jsdoc"
                 }
               },
-              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[\\])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:(?:\\*(?!/))|(?:\\\\(?!\"))|[^*\\\\])*?\"|'(?:(?:\\*(?!/))|(?:\\\\(?!'))|[^*\\\\])*?'|\\[(?:(?:\\*(?!/))|[^*])*?\\]|(?:(?:\\*(?!/))|\\s(?!\\s*\\])|\\[.*?(?:\\]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(\\])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
+              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:\\*(?!/)|\\\\(?!\")|[^*\\\\])*?\"|'(?:\\*(?!/)|\\\\(?!')|[^*\\\\])*?'|\\[(?:\\*(?!/)|[^*])*?]|(?:\\*(?!/)|\\s(?!\\s*])|\\[.*?(?:]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
               "name": "variable.other.jsdoc"
             }
           ]
         },
         {
-          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?={)",
+          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1193,7 +1193,7 @@
           "match": "((@)(?:alias|augments|callback|constructs|emits|event|fires|exports?|extends|external|function|func|host|lends|listens|interface|memberof!?|method|module|mixes|mixin|name|requires|see|this|typedef|uses))\\s+((?:[^{}@\\s*]|\\*[^/])+)"
         },
         {
-          "begin": "((@)(?:default(?:value)?|license|version))\\s+(([''\"]))",
+          "begin": "((@)(?:default(?:value)?|license|version))\\s+((['\"]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1254,7 +1254,7 @@
               "name": "punctuation.definition.block.tag.jsdoc"
             }
           },
-          "match": "((@)(?:[_$[:alpha:]][_$[:alnum:]]*))(?=\\s+)"
+          "match": "((@)[_$[:alpha:]][_$[:alnum:]]*)(?=\\s+)"
         }
       ]
     },
@@ -1277,7 +1277,7 @@
           "name": "entity.name.type.enum.js.jsx"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.enum.declaration.js.jsx",
       "patterns": [
         {
@@ -1290,7 +1290,7 @@
               "name": "punctuation.definition.block.js.jsx"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.js.jsx"
@@ -1307,7 +1307,7 @@
                   "name": "variable.other.enummember.js.jsx"
                 }
               },
-              "end": "(?=,|\\}|$)",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#comment"
@@ -1318,8 +1318,8 @@
               ]
             },
             {
-              "begin": "(?=((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\])))",
-              "end": "(?=,|\\}|$)",
+              "begin": "(?=(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+])))",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#string"
@@ -1362,7 +1362,7 @@
           "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)\\s+(as)\\s+(namespace)\\s+([_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:(?:\\s*(=))|(?:\\s+(default)(?=\\s+)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:\\s*(=)|\\s+(default)(?=\\s+))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.js.jsx"
@@ -1377,7 +1377,7 @@
               "name": "keyword.control.default.js.jsx"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.default.js.jsx",
           "patterns": [
             {
@@ -1389,7 +1389,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*([\\s,]))(?!\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.js.jsx"
@@ -1398,7 +1398,7 @@
               "name": "keyword.control.type.js.jsx"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.js.jsx",
           "patterns": [
             {
@@ -1464,7 +1464,7 @@
               "name": "keyword.operator.optional.js.jsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -1484,7 +1484,7 @@
               "name": "keyword.operator.optional.js.jsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
         },
         {
           "include": "#type-annotation"
@@ -1511,7 +1511,7 @@
           "name": "keyword.control.flow.js.jsx"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*\\*)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*\\*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.flow.js.jsx"
@@ -1588,7 +1588,7 @@
               "name": "keyword.control.satisfies.js.jsx"
             }
           },
-          "end": "(?=^|[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+\\<))",
+          "end": "(?=^|[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+<))",
           "patterns": [
             {
               "include": "#type"
@@ -1600,11 +1600,11 @@
           "name": "keyword.operator.spread.js.jsx"
         },
         {
-          "match": "\\*=|(?<!\\()/=|%=|\\+=|\\-=",
+          "match": "\\*=|(?<!\\()/=|%=|\\+=|-=",
           "name": "keyword.operator.assignment.compound.js.jsx"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>=|>>>=|\\|=",
+          "match": "&=|\\^=|<<=|>>=|>>>=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.js.jsx"
         },
         {
@@ -1612,11 +1612,11 @@
           "name": "keyword.operator.bitwise.shift.js.jsx"
         },
         {
-          "match": "===|!==|==|!=",
+          "match": "(?:==|!=)(?:=|)",
           "name": "keyword.operator.comparison.js.jsx"
         },
         {
-          "match": "<=|>=|<>|<|>",
+          "match": "<=|>=|<>|[<>]",
           "name": "keyword.operator.relational.js.jsx"
         },
         {
@@ -1631,18 +1631,18 @@
               "name": "keyword.operator.arithmetic.js.jsx"
             }
           },
-          "match": "(?<=[_$[:alnum:]])(\\!)\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:]])(!)\\s*(?:(/=)|(/)(?![/*]))"
         },
         {
-          "match": "\\!|&&|\\|\\||\\?\\?",
+          "match": "!|&&|\\|\\||\\?\\?",
           "name": "keyword.operator.logical.js.jsx"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.js.jsx"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.js.jsx"
         },
         {
@@ -1654,12 +1654,12 @@
           "name": "keyword.operator.increment.js.jsx"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.js.jsx"
         },
         {
-          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(?:(/=)|(?:(/)(?![/*]))))",
-          "end": "(?:(/=)|(?:(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)))",
+          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)+(?:(/=)|(/)(?![/*])))",
+          "end": "(?:(/=)|(/)(?!\\*([^*]|(\\*[^/]))*\\*/))",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.assignment.compound.js.jsx"
@@ -1683,7 +1683,7 @@
               "name": "keyword.operator.arithmetic.js.jsx"
             }
           },
-          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(/)(?![/*]))"
         }
       ]
     },
@@ -1756,13 +1756,13 @@
       ]
     },
     "field-declaration": {
-      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|\\}|$))",
+      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,}]|$))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.js.jsx"
         }
       },
-      "end": "(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|$))))|(?<=\\})",
+      "end": "(?=[};,]|$|(^(?!\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,]|$))))|(?<=})",
       "name": "meta.field.declaration.js.jsx",
       "patterns": [
         {
@@ -1795,10 +1795,10 @@
               "name": "keyword.operator.definiteassignment.js.jsx"
             }
           },
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
-          "match": "\\#?[_$[:alpha:]][_$[:alnum:]]*",
+          "match": "#?[_$[:alpha:]][_$[:alnum:]]*",
           "name": "meta.definition.property.js.jsx variable.object.property.js.jsx"
         },
         {
@@ -1806,13 +1806,13 @@
           "name": "keyword.operator.optional.js.jsx"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "keyword.operator.definiteassignment.js.jsx"
         }
       ]
     },
     "for-loop": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*))await)?\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)?(\\())",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*))await)?\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)?(\\())",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.loop.js.jsx"
@@ -1883,12 +1883,12 @@
     "function-call": {
       "patterns": [
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
-          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
+          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
               "name": "meta.function-call.js.jsx",
               "patterns": [
                 {
@@ -1911,12 +1911,12 @@
           ]
         },
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
-          "end": "(?<=\\>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
+          "end": "(?<=>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*[\\{\\[\\(]\\s*$))",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=(<\\s*[{\\[(]\\s*$))",
               "name": "meta.function-call.js.jsx",
               "patterns": [
                 {
@@ -1944,7 +1944,7 @@
           "name": "meta.function-call.js.jsx punctuation.accessor.optional.js.jsx"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "meta.function-call.js.jsx keyword.operator.definiteassignment.js.jsx"
         }
       ]
@@ -1955,7 +1955,7 @@
           "include": "#support-function-call-identifiers"
         },
         {
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)",
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)",
           "name": "entity.name.function.js.jsx"
         }
       ]
@@ -1982,7 +1982,7 @@
           "name": "meta.definition.function.js.jsx entity.name.function.js.jsx"
         }
       },
-      "end": "(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|(?<=\\})",
+      "end": "(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|(?<=})",
       "name": "meta.function.js.jsx",
       "patterns": [
         {
@@ -2009,7 +2009,7 @@
           "name": "meta.definition.function.js.jsx entity.name.function.js.jsx"
         }
       },
-      "end": "(?=;)|(?<=\\})",
+      "end": "(?=;)|(?<=})",
       "name": "meta.function.expression.js.jsx",
       "patterns": [
         {
@@ -2093,7 +2093,7 @@
               "name": "entity.name.function.js.jsx"
             }
           },
-          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))"
+          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))"
         },
         {
           "captures": {
@@ -2107,7 +2107,7 @@
               "name": "variable.other.constant.property.js.jsx"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])"
         },
         {
           "captures": {
@@ -2121,10 +2121,10 @@
               "name": "variable.other.property.js.jsx"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+          "match": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])",
           "name": "variable.other.constant.js.jsx"
         },
         {
@@ -2136,8 +2136,8 @@
     "if-statement": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
-          "end": "(?=;|$|\\})",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))\\s*(?!\\{))",
+          "end": "(?=;|$|})",
           "patterns": [
             {
               "include": "#comment"
@@ -2165,7 +2165,7 @@
               ]
             },
             {
-              "begin": "(?<=\\))\\s*\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+              "begin": "(?<=\\))\\s*/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.js.jsx"
@@ -2195,7 +2195,7 @@
       ]
     },
     "import-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.js.jsx"
@@ -2210,7 +2210,7 @@
           "name": "keyword.control.type.js.jsx"
         }
       },
-      "end": "(?<!^import|[^\\._$[:alnum:]]import)(?=;|$|^)",
+      "end": "(?<!^import|[^._$[:alnum:]]import)(?=;|$|^)",
       "name": "meta.import.js.jsx",
       "patterns": [
         {
@@ -2223,7 +2223,7 @@
           "include": "#string"
         },
         {
-          "begin": "(?<=^import|[^\\._$[:alnum:]]import)(?!\\s*[\"'])",
+          "begin": "(?<=^import|[^._$[:alnum:]]import)(?!\\s*[\"'])",
           "end": "\\bfrom\\b",
           "endCaptures": {
             "0": {
@@ -2330,7 +2330,7 @@
                   "name": "punctuation.accessor.optional.js.jsx"
                 }
               },
-              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
             },
             {
               "match": "([_$[:alpha:]][_$[:alnum:]]*)",
@@ -2353,7 +2353,7 @@
           "name": "punctuation.definition.block.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js.jsx"
@@ -2367,7 +2367,7 @@
           "include": "#string"
         },
         {
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object-literal.key.js.jsx"
         },
         {
@@ -2383,7 +2383,7 @@
           "name": "punctuation.definition.block.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js.jsx"
@@ -2431,7 +2431,7 @@
               "name": "string.quoted.alias.js.jsx"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         },
         {
           "include": "#punctuation-comma"
@@ -2456,7 +2456,7 @@
               "name": "string.quoted.alias.js.jsx"
             }
           },
-          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         }
       ]
     },
@@ -2496,7 +2496,7 @@
           "name": "variable.parameter.js.jsx"
         }
       },
-      "end": "(\\])\\s*(\\?\\s*)?|$",
+      "end": "(])\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.js.jsx"
@@ -2531,7 +2531,7 @@
           "name": "keyword.operator.expression.in.js.jsx"
         }
       },
-      "end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
+      "end": "(])([+-])?\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.js.jsx"
@@ -2569,11 +2569,11 @@
               "name": "punctuation.definition.bracket.square.end.jsdoc"
             }
           },
-          "match": "(\\[)[^\\]]+(\\])(?={@(?:link|linkcode|linkplain|tutorial))",
+          "match": "(\\[)[^\\]]+(])(?=\\{@(?:link|linkcode|linkplain|tutorial))",
           "name": "constant.other.description.jsdoc"
         },
         {
-          "begin": "({)((@)(?:link(?:code|plain)?|tutorial))\\s*",
+          "begin": "(\\{)((@)(?:link(?:code|plain)?|tutorial))\\s*",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.bracket.curly.begin.jsdoc"
@@ -2602,7 +2602,7 @@
                   "name": "punctuation.separator.pipe.jsdoc"
                 }
               },
-              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*[/])+)(\\|)?"
+              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*/)+)(\\|)?"
             },
             {
               "captures": {
@@ -2626,7 +2626,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"
@@ -2649,7 +2649,7 @@
           "name": "storage.type.interface.js.jsx"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.interface.js.jsx",
       "patterns": [
         {
@@ -2677,7 +2677,7 @@
     "jsdoctype": {
       "patterns": [
         {
-          "begin": "\\G({)",
+          "begin": "\\G(\\{)",
           "beginCaptures": {
             "0": {
               "name": "entity.name.type.instance.jsdoc"
@@ -2741,7 +2741,7 @@
               "name": "punctuation.definition.entity.js.jsx"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.js.jsx"
         }
       ]
@@ -2754,7 +2754,7 @@
         }
       },
       "contentName": "meta.embedded.expression.js.jsx",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.embedded.end.js.jsx"
@@ -2807,8 +2807,8 @@
       ]
     },
     "jsx-tag": {
-      "begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
-      "end": "(/>)|(?:(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+      "begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
+      "end": "(/>)|(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.js.jsx"
@@ -2835,7 +2835,7 @@
       "name": "meta.tag.js.jsx",
       "patterns": [
         {
-          "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
+          "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.js.jsx"
@@ -2853,7 +2853,7 @@
               "name": "support.class.component.js.jsx"
             }
           },
-          "end": "(?=[/]?>)",
+          "end": "(?=/?>)",
           "patterns": [
             {
               "include": "#comment"
@@ -2884,7 +2884,7 @@
       ]
     },
     "jsx-tag-attribute-assignment": {
-      "match": "=(?=\\s*(?:'|\"|{|/\\*|//|\\n))",
+      "match": "=(?=\\s*(?:['\"{]|/\\*|//|\\n))",
       "name": "keyword.operator.assignment.js.jsx"
     },
     "jsx-tag-attribute-name": {
@@ -2899,11 +2899,11 @@
           "name": "entity.other.attribute-name.js.jsx"
         }
       },
-      "match": "\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?([_$[:alpha:]][-_$[:alnum:]]*)(?=\\s|=|/?>|/\\*|//)"
+      "match": "\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?([_$[:alpha:]][-_$[:alnum:]]*)(?=[\\s=]|/?>|/\\*|//)"
     },
     "jsx-tag-attributes": {
       "begin": "\\s+",
-      "end": "(?=[/]?>)",
+      "end": "(?=/?>)",
       "name": "meta.tag.attributes.js.jsx",
       "patterns": [
         {
@@ -2934,8 +2934,8 @@
       "name": "invalid.illegal.attribute.js.jsx"
     },
     "jsx-tag-in-expression": {
-      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,))(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
-      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,))(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
+      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
       "patterns": [
         {
           "include": "#jsx-tag"
@@ -2943,7 +2943,7 @@
       ]
     },
     "jsx-tag-without-attributes": {
-      "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+      "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.js.jsx"
@@ -2965,7 +2965,7 @@
         }
       },
       "contentName": "meta.jsx.children.js.jsx",
-      "end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+      "end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.js.jsx"
@@ -2994,8 +2994,8 @@
       ]
     },
     "jsx-tag-without-attributes-in-expression": {
-      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
-      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>))",
+      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>))",
       "patterns": [
         {
           "include": "#jsx-tag-without-attributes"
@@ -3014,7 +3014,7 @@
               "name": "punctuation.separator.label.js.jsx"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#decl-block"
@@ -3065,7 +3065,7 @@
     "method-declaration": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.js.jsx"
@@ -3083,7 +3083,7 @@
               "name": "storage.type.js.jsx"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.js.jsx",
           "patterns": [
             {
@@ -3095,7 +3095,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.js.jsx"
@@ -3116,7 +3116,7 @@
               "name": "keyword.generator.asterisk.js.jsx"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.js.jsx",
           "patterns": [
             {
@@ -3128,7 +3128,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.js.jsx"
@@ -3149,7 +3149,7 @@
               "name": "keyword.generator.asterisk.js.jsx"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.js.jsx",
           "patterns": [
             {
@@ -3163,8 +3163,8 @@
       ]
     },
     "method-declaration-name": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??)\\s*[\\(\\<])",
-      "end": "(?=\\(|\\<)",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??)\\s*[(<])",
+      "end": "(?=[(<])",
       "patterns": [
         {
           "include": "#string"
@@ -3186,7 +3186,7 @@
       ]
     },
     "namespace-declaration": {
-      "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.js.jsx"
@@ -3198,7 +3198,7 @@
           "name": "storage.type.namespace.js.jsx"
         }
       },
-      "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?<=})|(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.namespace.declaration.js.jsx",
       "patterns": [
         {
@@ -3226,7 +3226,7 @@
           "name": "keyword.operator.new.js.jsx"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*\\())))",
       "name": "new.expr.js.jsx",
       "patterns": [
         {
@@ -3246,7 +3246,7 @@
               "name": "storage.type.numeric.bigint.js.jsx"
             }
           },
-          "match": "\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.hex.js.jsx"
         },
         {
@@ -3255,7 +3255,7 @@
               "name": "storage.type.numeric.bigint.js.jsx"
             }
           },
-          "match": "\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.binary.js.jsx"
         },
         {
@@ -3264,7 +3264,7 @@
               "name": "storage.type.numeric.bigint.js.jsx"
             }
           },
-          "match": "\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.octal.js.jsx"
         },
         {
@@ -3315,7 +3315,7 @@
               "name": "storage.type.numeric.bigint.js.jsx"
             }
           },
-          "match": "(?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)"
+          "match": "(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)"
         }
       ]
     },
@@ -3337,8 +3337,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3368,8 +3368,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3394,7 +3394,7 @@
       ]
     },
     "object-binding-element-propertyName": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
       "end": "(:)",
       "endCaptures": {
         "0": {
@@ -3427,7 +3427,7 @@
           "name": "punctuation.definition.binding-pattern.object.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.js.jsx"
@@ -3449,7 +3449,7 @@
           "name": "punctuation.definition.binding-pattern.object.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.js.jsx"
@@ -3482,7 +3482,7 @@
               "name": "variable.other.object.property.js.jsx"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(\\#?[[:upper:]][_$[:digit:][:upper:]]*)|(\\#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(#?\\p{upper}[_$\\d[:upper:]]*)|(#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
           "captures": {
@@ -3493,7 +3493,7 @@
               "name": "variable.other.object.js.jsx"
             }
           },
-          "match": "(?:([[:upper:]][_$[:digit:][:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\p{upper}[_$\\d[:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         }
       ]
     },
@@ -3504,7 +3504,7 @@
           "name": "punctuation.definition.block.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js.jsx"
@@ -3518,7 +3518,7 @@
       ]
     },
     "object-literal-method-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.async.js.jsx"
@@ -3530,7 +3530,7 @@
           "name": "keyword.generator.asterisk.js.jsx"
         }
       },
-      "end": "(?=\\}|;|,)|(?<=\\})",
+      "end": "(?=[};,])|(?<=})",
       "name": "meta.method.declaration.js.jsx",
       "patterns": [
         {
@@ -3540,7 +3540,7 @@
           "include": "#function-body"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js.jsx"
@@ -3552,7 +3552,7 @@
               "name": "keyword.generator.asterisk.js.jsx"
             }
           },
-          "end": "(?=\\(|\\<)",
+          "end": "(?=[(<])",
           "patterns": [
             {
               "include": "#method-declaration-name"
@@ -3571,7 +3571,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?=:)|((?<=[\\]])(?=\\s*[\\(\\<]))",
+          "end": "(?=:)|((?<=])(?=\\s*[(<]))",
           "name": "meta.object.member.js.jsx meta.object-literal.key.js.jsx",
           "patterns": [
             {
@@ -3583,8 +3583,8 @@
           ]
         },
         {
-          "begin": "(?=[\\'\\\"\\`])",
-          "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as|satisifies)\\s+))))",
+          "begin": "(?=['\"`])",
+          "end": "(?=:)|((?<=['\"`])(?=((\\s*[(<,}])|(\\s+(as|satisifies)\\s+))))",
           "name": "meta.object.member.js.jsx meta.object-literal.key.js.jsx",
           "patterns": [
             {
@@ -3596,8 +3596,8 @@
           ]
         },
         {
-          "begin": "(?=(\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)))",
-          "end": "(?=:)|(?=\\s*([\\(\\<,}])|(\\s+as|satisifies\\s+))",
+          "begin": "(?=(\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)))",
+          "end": "(?=:)|(?=\\s*([(<,}])|(\\s+as|satisifies\\s+))",
           "name": "meta.object.member.js.jsx meta.object-literal.key.js.jsx",
           "patterns": [
             {
@@ -3609,8 +3609,8 @@
           ]
         },
         {
-          "begin": "(?<=[\\]\\'\\\"\\`])(?=\\s*[\\(\\<])",
-          "end": "(?=\\}|;|,)|(?<=\\})",
+          "begin": "(?<=[\\]'\"`])(?=\\s*[(<])",
+          "end": "(?=[};,])|(?<=})",
           "name": "meta.method.declaration.js.jsx",
           "patterns": [
             {
@@ -3627,7 +3627,7 @@
               "name": "constant.numeric.decimal.js.jsx"
             }
           },
-          "match": "(?![_$[:alpha:]])([[:digit:]]+)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "(?![_$[:alpha:]])(\\d+)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.js.jsx"
         },
         {
@@ -3639,7 +3639,7 @@
               "name": "entity.name.function.js.jsx"
             }
           },
-          "match": "(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:(\\s*/\\*([^*]|(\\*[^/]))*\\*/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))",
           "name": "meta.object.member.js.jsx"
         },
         {
@@ -3648,7 +3648,7 @@
               "name": "meta.object-literal.key.js.jsx"
             }
           },
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.js.jsx"
         },
         {
@@ -3658,7 +3658,7 @@
               "name": "keyword.operator.spread.js.jsx"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.js.jsx",
           "patterns": [
             {
@@ -3672,7 +3672,7 @@
               "name": "variable.other.readwrite.js.jsx"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.js.jsx"
         },
         {
@@ -3697,7 +3697,7 @@
               "name": "keyword.control.satisfies.js.jsx"
             }
           },
-          "end": "(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
+          "end": "(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
           "name": "meta.object.member.js.jsx",
           "patterns": [
             {
@@ -3707,7 +3707,7 @@
         },
         {
           "begin": "(?=[_$[:alpha:]][_$[:alnum:]]*\\s*=)",
-          "end": "(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "end": "(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.js.jsx",
           "patterns": [
             {
@@ -3722,11 +3722,11 @@
               "name": "meta.object-literal.key.js.jsx punctuation.separator.key-value.js.jsx"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.js.jsx",
           "patterns": [
             {
-              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.js.jsx"
@@ -3759,7 +3759,7 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.js.jsx"
@@ -3781,13 +3781,13 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(?=\\<\\s*$)",
+              "begin": "(?<=:)\\s*(async)?\\s*(?=<\\s*$)",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.js.jsx"
                 }
               },
-              "end": "(?<=\\>)",
+              "end": "(?<=>)",
               "patterns": [
                 {
                   "include": "#type-parameters"
@@ -3795,7 +3795,7 @@
               ]
             },
             {
-              "begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=>)\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "meta.brace.round.js.jsx"
@@ -3839,7 +3839,7 @@
           "name": "punctuation.definition.binding-pattern.array.js.jsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.js.jsx"
@@ -3910,7 +3910,7 @@
               "name": "keyword.operator.optional.js.jsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -3930,7 +3930,7 @@
               "name": "keyword.operator.optional.js.jsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
         }
       ]
     },
@@ -3940,8 +3940,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3978,7 +3978,7 @@
           "name": "punctuation.definition.binding-pattern.object.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.js.jsx"
@@ -4031,7 +4031,7 @@
     "paren-expression-possibly-arrow": {
       "patterns": [
         {
-          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js.jsx"
@@ -4045,7 +4045,7 @@
           ]
         },
         {
-          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
+          "begin": "(?<=[(=,]|=>|^return|[^._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)))\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js.jsx"
@@ -4090,14 +4090,14 @@
       ]
     },
     "possibly-arrow-return-type": {
-      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*=>)",
       "beginCaptures": {
         "1": {
           "name": "meta.arrow.js.jsx meta.return.type.arrow.js.jsx keyword.operator.type.annotation.js.jsx"
         }
       },
       "contentName": "meta.arrow.js.jsx meta.return.type.arrow.js.jsx",
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "patterns": [
         {
           "include": "#arrow-return-type-body"
@@ -4117,7 +4117,7 @@
           "name": "punctuation.accessor.optional.js.jsx"
         }
       },
-      "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+      "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
     },
     "punctuation-comma": {
       "match": ",",
@@ -4134,7 +4134,7 @@
           "name": "punctuation.definition.string.begin.js.jsx"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.js.jsx"
@@ -4157,7 +4157,7 @@
           "name": "punctuation.definition.string.begin.js.jsx"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.js.jsx"
@@ -4176,7 +4176,7 @@
     "regex": {
       "patterns": [
         {
-          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[\\()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\]|\\(([^\\)\\\\]|\\\\.)+\\))+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case|=>|&&|\\|\\||\\*/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+]|\\(([^)\\\\]|\\\\.)+\\))+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.js.jsx"
@@ -4199,7 +4199,7 @@
           ]
         },
         {
-          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*\\/)|((?<=^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case))\\s*)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*/)|((?<=^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case))\\s*)/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.js.jsx"
@@ -4230,7 +4230,7 @@
           "name": "constant.other.character-class.regexp"
         },
         {
-          "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})",
+          "match": "\\\\([0-7]{3}|x\\h{2}|u\\h{4})",
           "name": "constant.character.numeric.regexp"
         },
         {
@@ -4246,7 +4246,7 @@
     "regexp": {
       "patterns": [
         {
-          "match": "\\\\[bB]|\\^|\\$",
+          "match": "\\\\[bB]|[\\^$]",
           "name": "keyword.control.anchor.regexp"
         },
         {
@@ -4258,10 +4258,10 @@
               "name": "variable.other.regexp"
             }
           },
-          "match": "\\\\[1-9]\\d*|\\\\k<([a-zA-Z_$][\\w$]*)>"
+          "match": "\\\\(?:[1-9]\\d*|k<([a-zA-Z_$][\\w$]*)>)"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.regexp"
         },
         {
@@ -4304,7 +4304,7 @@
           ]
         },
         {
-          "begin": "\\((?:(\\?:)|(?:\\?<([a-zA-Z_$][\\w$]*)>))?",
+          "begin": "\\((?:(\\?:)|\\?<([a-zA-Z_$][\\w$]*)>)?",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.regexp"
@@ -4339,7 +4339,7 @@
               "name": "keyword.operator.negation.regexp"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.regexp"
@@ -4368,7 +4368,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))",
               "name": "constant.other.character-class.range.regexp"
             },
             {
@@ -4390,7 +4390,7 @@
               "name": "keyword.operator.type.annotation.js.jsx"
             }
           },
-          "end": "(?<![:|&])(?=$|^|[{};,]|//)",
+          "end": "(?<![:|\\&])(?=$|^|[{};,]|//)",
           "name": "meta.return.type.js.jsx",
           "patterns": [
             {
@@ -4405,7 +4405,7 @@
               "name": "keyword.operator.type.annotation.js.jsx"
             }
           },
-          "end": "(?<![:|&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<![:|\\&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.return.type.js.jsx",
           "patterns": [
             {
@@ -4421,8 +4421,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?<=[:|&])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=[:|\\&])(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -4513,7 +4513,7 @@
       ]
     },
     "string-character-escape": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
+      "match": "\\\\(x\\h{2}|u\\h{4}|u\\{\\h+}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
       "name": "constant.character.escape.js.jsx"
     },
     "super-literal": {
@@ -4535,7 +4535,7 @@
           "include": "#punctuation-accessor"
         },
         {
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*[\\(]\\s*[\\\"\\'\\`]))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*\\(\\s*[\"'`])",
           "name": "keyword.operator.expression.import.js.jsx"
         }
       ]
@@ -4565,7 +4565,7 @@
               "name": "support.variable.property.importmeta.js.jsx"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(meta)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(meta)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4582,7 +4582,7 @@
               "name": "support.variable.property.target.js.jsx"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(target)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(target)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4599,7 +4599,7 @@
               "name": "support.constant.js.jsx"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())|(?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\()|(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$))"
         },
         {
           "captures": {
@@ -4619,13 +4619,13 @@
               "name": "support.type.object.module.js.jsx"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
         }
       ]
     },
     "switch-statement": {
       "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bswitch\\s*\\()",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js.jsx"
@@ -4666,7 +4666,7 @@
               "name": "punctuation.definition.block.js.jsx"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "name": "switch-block.expr.js.jsx",
           "patterns": [
             {
@@ -4695,7 +4695,7 @@
                 }
               },
               "contentName": "meta.block.js.jsx",
-              "end": "\\}",
+              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "meta.block.js.jsx punctuation.definition.block.js.jsx"
@@ -4758,12 +4758,12 @@
     "template-call": {
       "patterns": [
         {
-          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
           "end": "(?=`)",
           "patterns": [
             {
               "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
               "patterns": [
                 {
                   "include": "#support-function-call-identifiers"
@@ -4780,7 +4780,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.js.jsx"
@@ -4803,7 +4803,7 @@
         }
       },
       "contentName": "meta.embedded.line.js.jsx",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.js.jsx"
@@ -4857,7 +4857,7 @@
         }
       },
       "contentName": "meta.embedded.line.js.jsx",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.js.jsx"
@@ -4871,7 +4871,7 @@
       ]
     },
     "ternary-expression": {
-      "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
+      "begin": "(?!\\?\\.\\s*\\D)(\\?)(?!\\?)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.ternary.js.jsx"
@@ -4963,7 +4963,7 @@
           "name": "entity.name.type.alias.js.jsx"
         }
       },
-      "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.type.declaration.js.jsx",
       "patterns": [
         {
@@ -4982,7 +4982,7 @@
               "name": "keyword.control.intrinsic.js.jsx"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -4996,7 +4996,7 @@
               "name": "keyword.operator.assignment.js.jsx"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -5014,7 +5014,7 @@
               "name": "keyword.operator.type.annotation.js.jsx"
             }
           },
-          "end": "(?<![:|&])(?!\\s*[|&]\\s+)((?=^|[,);\\}\\]]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])(?!\\s*[|\\&]\\s+)((?=^|[,);}\\]]|//)|(?==[^>])|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.js.jsx",
           "patterns": [
             {
@@ -5029,7 +5029,7 @@
               "name": "keyword.operator.type.annotation.js.jsx"
             }
           },
-          "end": "(?<![:|&])((?=[,);\\}\\]]|\\/\\/)|(?==[^>])|(?=^\\s*$)|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])((?=[,);}\\]]|//)|(?==[^>])|(?=^\\s*$)|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.js.jsx",
           "patterns": [
             {
@@ -5040,13 +5040,13 @@
       ]
     },
     "type-arguments": {
-      "begin": "\\<",
+      "begin": "<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.begin.js.jsx"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.end.js.jsx"
@@ -5121,7 +5121,7 @@
     "type-fn-type-parameters": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*\\<)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*<)",
           "beginCaptures": {
             "1": {
               "name": "meta.type.constructor.js.jsx storage.modifier.js.jsx"
@@ -5159,7 +5159,7 @@
           ]
         },
         {
-          "begin": "((?=[(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>))))))",
+          "begin": "((?=\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>))))))",
           "end": "(?<=\\))",
           "name": "meta.type.function.js.jsx",
           "patterns": [
@@ -5179,7 +5179,7 @@
               "name": "storage.type.function.arrow.js.jsx"
             }
           },
-          "end": "(?<!=>)(?<![|&])(?=[,\\]\\)\\{\\}=;>:\\?]|//|$)",
+          "end": "(?<!=>)(?<![|\\&])(?=[,\\]){}=;>:?]|//|$)",
           "name": "meta.type.function.return.js.jsx",
           "patterns": [
             {
@@ -5194,7 +5194,7 @@
               "name": "storage.type.function.arrow.js.jsx"
             }
           },
-          "end": "(?<!=>)(?<![|&])((?=[,\\]\\)\\{\\}=;:\\?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<!=>)(?<![|\\&])((?=[,\\]){}=;:?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.type.function.return.js.jsx",
           "patterns": [
             {
@@ -5211,7 +5211,7 @@
         },
         {
           "begin": "(?<==>)(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -5248,7 +5248,7 @@
     "type-name": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(<)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(<)",
           "captures": {
             "1": {
               "name": "entity.name.type.module.js.jsx"
@@ -5311,7 +5311,7 @@
               "name": "punctuation.accessor.optional.js.jsx"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
         },
         {
           "match": "[_$[:alpha:]][_$[:alnum:]]*",
@@ -5326,7 +5326,7 @@
           "name": "punctuation.definition.block.js.jsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.js.jsx"
@@ -5359,7 +5359,7 @@
               "name": "keyword.operator.spread.js.jsx"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "patterns": [
             {
               "include": "#type"
@@ -5386,13 +5386,13 @@
           "include": "#type-infer"
         },
         {
-          "begin": "([&|])(?=\\s*\\{)",
+          "begin": "([\\&|])(?=\\s*\\{)",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.js.jsx"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -5400,7 +5400,7 @@
           ]
         },
         {
-          "begin": "[&|]",
+          "begin": "[\\&|]",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.js.jsx"
@@ -5413,7 +5413,7 @@
           "name": "keyword.operator.expression.keyof.js.jsx"
         },
         {
-          "match": "(\\?|\\:)",
+          "match": "([?:])",
           "name": "keyword.operator.ternary.js.jsx"
         },
         {
@@ -5489,7 +5489,7 @@
               "name": "keyword.operator.optional.js.jsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))))"
         },
         {
           "captures": {
@@ -5509,7 +5509,7 @@
               "name": "keyword.operator.optional.js.jsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
         },
         {
           "include": "#type-annotation"
@@ -5590,7 +5590,7 @@
           "name": "meta.brace.square.js.jsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.js.jsx"
@@ -5631,7 +5631,7 @@
           "name": "keyword.operator.expression.typeof.js.jsx"
         }
       },
-      "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[,);}\\]=>:\\&|{?]|(extends\\s+)|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "patterns": [
         {
           "include": "#type-arguments"
@@ -5649,7 +5649,7 @@
       "patterns": [
         {
           "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^let|[^._$[:alnum:]]let|^var|[^._$[:alnum:]]var)(?=\\s*$)))",
           "name": "meta.var.expr.js.jsx",
           "patterns": [
             {
@@ -5680,13 +5680,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.js.jsx"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5723,7 +5723,7 @@
               "name": "storage.type.js.jsx"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^const|[^._$[:alnum:]]const)(?=\\s*$)))",
           "name": "meta.var.expr.js.jsx",
           "patterns": [
             {
@@ -5754,13 +5754,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.js.jsx"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5785,7 +5785,7 @@
           ]
         },
         {
-          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.js.jsx"
@@ -5797,11 +5797,11 @@
               "name": "storage.type.js.jsx"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^using|[^\\._$[:alnum:]]using|^await\\s+using|[^\\._$[:alnum:]]await\\s+using)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^using|[^._$[:alnum:]]using|^await\\s+using|[^._$[:alnum:]]await\\s+using)(?=\\s*$)))",
           "name": "meta.var.expr.js.jsx",
           "patterns": [
             {
-              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control.export.js.jsx"
@@ -5825,13 +5825,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+              "begin": "(,)\\s*((?!\\S)|(?=//))",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.js.jsx"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5857,13 +5857,13 @@
     "var-single-const": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.js.jsx variable.other.constant.js.jsx entity.name.function.js.jsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js.jsx",
           "patterns": [
             {
@@ -5878,7 +5878,7 @@
               "name": "meta.definition.variable.js.jsx variable.other.constant.js.jsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js.jsx",
           "patterns": [
             {
@@ -5891,7 +5891,7 @@
     "var-single-variable": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.js.jsx entity.name.function.js.jsx"
@@ -5900,7 +5900,7 @@
               "name": "keyword.operator.definiteassignment.js.jsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js.jsx",
           "patterns": [
             {
@@ -5909,7 +5909,7 @@
           ]
         },
         {
-          "begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])(\\!)?",
+          "begin": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.js.jsx variable.other.constant.js.jsx"
@@ -5918,7 +5918,7 @@
               "name": "keyword.operator.definiteassignment.js.jsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js.jsx",
           "patterns": [
             {
@@ -5927,7 +5927,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.js.jsx variable.other.readwrite.js.jsx"
@@ -5936,7 +5936,7 @@
               "name": "keyword.operator.definiteassignment.js.jsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.js.jsx",
           "patterns": [
             {
@@ -5962,7 +5962,7 @@
     "variable-initializer": {
       "patterns": [
         {
-          "begin": "(?<!=|!)(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
+          "begin": "(?<![=!])(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.js.jsx"
@@ -5976,13 +5976,13 @@
           ]
         },
         {
-          "begin": "(?<!=|!)(=)(?!=)",
+          "begin": "(?<![=!])(=)(?!=)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.js.jsx"
             }
           },
-          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![\\|\\&\\+\\-\\*\\/])(?<=\\S)(?<!=)(?=\\s*$)",
+          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![|\\&+\\-*/])(?<=\\S)(?<!=)(?=\\s*$)",
           "patterns": [
             {
               "include": "#expression"
diff --git a/resources/languages/julia.json b/resources/languages/julia.json
index 51408e4..499f7e4 100644
--- a/resources/languages/julia.json
+++ b/resources/languages/julia.json
@@ -55,7 +55,7 @@
               "name": "meta.bracket.julia"
             }
           },
-          "end": "(\\])((?:\\.)?'*)",
+          "end": "(])(\\.?'*)",
           "endCaptures": {
             "1": {
               "name": "meta.bracket.julia"
@@ -90,7 +90,7 @@
               "name": "meta.bracket.julia"
             }
           },
-          "end": "(\\})((?:\\.)?'*)",
+          "end": "(})(\\.?'*)",
           "endCaptures": {
             "1": {
               "name": "meta.bracket.julia"
@@ -177,7 +177,6 @@
       ]
     },
     "for_block": {
-      "comment": "for blocks need to be special-cased to support tokenizing 'outer' properly",
       "patterns": [
         {
           "begin": "\\b(for)\\b",
@@ -186,7 +185,7 @@
               "name": "keyword.control.julia"
             }
           },
-          "end": "(?<!,|\\s)(\\s*\\n)",
+          "end": "(?<![,\\s])(\\s*\\n)",
           "patterns": [
             {
               "match": "\\bouter\\b",
@@ -202,7 +201,7 @@
     "function_call": {
       "patterns": [
         {
-          "begin": "((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?\\.?(\\()",
+          "begin": "([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)(\\{(?:[^{}]|\\{(?:[^{}]|\\{[^{}]*})*})*})?\\.?(\\()",
           "beginCaptures": {
             "1": {
               "name": "support.function.julia"
@@ -242,8 +241,7 @@
               "name": "support.type.julia"
             }
           },
-          "comment": "first group is function name\nSecond group is type parameters (e.g. {T<:Number, S})\nThen open parens\nThen a lookahead ensures that we are followed by:\n  - anything (function arguments)\n  - 0 or more spaces\n  - Finally an equal sign\nNegative lookahead ensures we don't have another equal sign (not `==`)",
-          "match": "((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?(?=\\([^#]*\\)(::[^\\s]+)?(\\s*\\bwhere\\b\\s+.+?)?\\s*?=(?![=>]))"
+          "match": "([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)(\\{(?:[^{}]|\\{(?:[^{}]|\\{[^{}]*})*})*})?(?=\\([^#]*\\)(::\\S+)?(\\s*\\bwhere\\b\\s+.+?)?\\s*?=(?![=>]))"
         },
         {
           "captures": {
@@ -260,15 +258,14 @@
               "name": "support.type.julia"
             }
           },
-          "comment": "similar regex to previous, but with keyword not 1-line syntax",
-          "match": "\\b(function|macro)(?:\\s+(?:(?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*(\\.))?((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?|\\s*)(?=\\()"
+          "match": "\\b(function|macro)(?:\\s+(?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*(\\.))?([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)(\\{(?:[^{}]|\\{(?:[^{}]|\\{[^{}]*})*})*})?|\\s*)(?=\\()"
         }
       ]
     },
     "keyword": {
       "patterns": [
         {
-          "match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|module|baremodule|where)\\b",
+          "match": "\\b(?<![:_.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|module|baremodule|where)\\b",
           "name": "keyword.other.julia"
         },
         {
@@ -284,19 +281,19 @@
           "name": "keyword.storage.modifier.julia"
         },
         {
-          "match": "\\b(?<![:_])(?:export)\\b",
+          "match": "\\b(?<![:_])export\\b",
           "name": "keyword.control.export.julia"
         },
         {
-          "match": "^(?:public)\\b",
+          "match": "^public\\b",
           "name": "keyword.control.public.julia"
         },
         {
-          "match": "\\b(?<![:_])(?:import)\\b",
+          "match": "\\b(?<![:_])import\\b",
           "name": "keyword.control.import.julia"
         },
         {
-          "match": "\\b(?<![:_])(?:using)\\b",
+          "match": "\\b(?<![:_])using\\b",
           "name": "keyword.control.using.julia"
         },
         {
@@ -304,7 +301,7 @@
           "name": "keyword.control.as.julia"
         },
         {
-          "match": "(@(\\.|(?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*))",
+          "match": "(@(\\.|[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*))",
           "name": "support.function.macro.julia"
         }
       ]
@@ -320,14 +317,14 @@
               "name": "keyword.operator.conjugate-number.julia"
             }
           },
-          "match": "((?<!(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿]))(?:(?:\\b0(?:x|X)[0-9a-fA-F](?:_?[0-9a-fA-F])*)|(?:\\b0o[0-7](?:_?[0-7])*)|(?:\\b0b[0-1](?:_?[0-1])*)|(?:(?:\\b[0-9](?:_?[0-9])*\\.?(?!\\.)(?:[_0-9]*))|(?:\\b\\.[0-9](?:_?[0-9])*))(?:[efE][+-]?[0-9](?:_?[0-9])*)?(?:im\\b|Inf(?:16|32|64)?\\b|NaN(?:16|32|64)?\\b|π\\b|pi\\b|ℯ\\b)?|\\b[0-9]+|\\bInf(?:16|32|64)?\\b|\\bNaN(?:16|32|64)?\\b|\\bπ\\b|\\bpi\\b|\\bℯ\\b))('*)"
+          "match": "((?<![[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]])\\b(?:0[xX]\\h(?:_?\\h)*|0o[0-7](?:_?[0-7])*|0b[0-1](?:_?[0-1])*|(?:[0-9](?:_?[0-9])*\\.?(?!\\.)[_0-9]*|\\.[0-9](?:_?[0-9])*)(?:[efE][+-]?[0-9](?:_?[0-9])*)?(?:im\\b|Inf(?:16|32|64)?\\b|NaN(?:16|32|64)?\\b|π\\b|pi\\b|ℯ\\b)?|[0-9]+|Inf(?:16|32|64)?\\b|NaN(?:16|32|64)?\\b|π\\b|pi\\b|ℯ\\b))('*)"
         },
         {
-          "match": "\\bARGS\\b|\\bC_NULL\\b|\\bDEPOT_PATH\\b|\\bENDIAN_BOM\\b|\\bENV\\b|\\bLOAD_PATH\\b|\\bPROGRAM_FILE\\b|\\bstdin\\b|\\bstdout\\b|\\bstderr\\b|\\bVERSION\\b|\\bdevnull\\b",
+          "match": "\\b(?:ARGS\\b|C_NULL\\b|DEPOT_PATH\\b|ENDIAN_BOM\\b|ENV\\b|LOAD_PATH\\b|PROGRAM_FILE\\b|stdin\\b|stdout\\b|stderr\\b|VERSION\\b|devnull\\b)",
           "name": "constant.global.julia"
         },
         {
-          "match": "\\btrue\\b|\\bfalse\\b|\\bnothing\\b|\\bmissing\\b",
+          "match": "\\b(?:true\\b|false\\b|nothing\\b|missing\\b)",
           "name": "constant.language.julia"
         }
       ]
@@ -335,7 +332,7 @@
     "operator": {
       "patterns": [
         {
-          "match": "\\.?(?:<-->|->|-->|<--|←|→|↔|↚|↛|↞|↠|↢|↣|↦|↤|↮|⇎|⇍|⇏|⇐|⇒|⇔|⇴|⇶|⇷|⇸|⇹|⇺|⇻|⇼|⇽|⇾|⇿|⟵|⟶|⟷|⟹|⟺|⟻|⟼|⟽|⟾|⟿|⤀|⤁|⤂|⤃|⤄|⤅|⤆|⤇|⤌|⤍|⤎|⤏|⤐|⤑|⤔|⤕|⤖|⤗|⤘|⤝|⤞|⤟|⤠|⥄|⥅|⥆|⥇|⥈|⥊|⥋|⥎|⥐|⥒|⥓|⥖|⥗|⥚|⥛|⥞|⥟|⥢|⥤|⥦|⥧|⥨|⥩|⥪|⥫|⥬|⥭|⥰|⧴|⬱|⬰|⬲|⬳|⬴|⬵|⬶|⬷|⬸|⬹|⬺|⬻|⬼|⬽|⬾|⬿|⭀|⭁|⭂|⭃|⥷|⭄|⥺|⭇|⭈|⭉|⭊|⭋|⭌|￩|￫|⇜|⇝|↜|↝|↩|↪|↫|↬|↼|↽|⇀|⇁|⇄|⇆|⇇|⇉|⇋|⇌|⇚|⇛|⇠|⇢|↷|↶|↺|↻|=>)",
+          "match": "\\.?(?:<-->|->|-->|<--|[←→↔↚↛↞↠↢↣↦↤↮⇎⇍⇏⇐⇒⇔⇴⇶⇷⇸⇹⇺⇻⇼⇽⇾⇿⟵⟶⟷⟹⟺⟻⟼⟽⟾⟿⤀⤁⤂⤃⤄⤅⤆⤇⤌⤍⤎⤏⤐⤑⤔⤕⤖⤗⤘⤝⤞⤟⤠⥄⥅⥆⥇⥈⥊⥋⥎⥐⥒⥓⥖⥗⥚⥛⥞⥟⥢⥤⥦⥧⥨⥩⥪⥫⥬⥭⥰⧴⬱⬰⬲⬳⬴⬵⬶⬷⬸⬹⬺⬻⬼⬽⬾⬿⭀⭁⭂⭃⥷⭄⥺⭇⭈⭉⭊⭋⭌￩￫⇜⇝↜↝↩↪↫↬↼↽⇀⇁⇄⇆⇇⇉⇋⇌⇚⇛⇠⇢↷↶↺↻]|=>)",
           "name": "keyword.operator.arrow.julia"
         },
         {
@@ -358,42 +355,42 @@
               "name": "keyword.operator.transpose.julia"
             }
           },
-          "match": "(?:\\s*(::|>:|<:)\\s*((?:(?:Union)?\\([^)]*\\)|[[:alpha:]_$∇][[:word:]⁺-ₜ!′\\.]*(?:(?:{(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})|(?:\".+?(?<!\\\\)\"))?)))(?:\\.\\.\\.)?((?:\\.)?'*)"
+          "match": "\\s*(::|>:|<:)\\s*((?:(?:Union)?\\([^)]*\\)|[[:alpha:]_$∇][[:word:]⁺-ₜ!′.]*(?:\\{(?:[^{}]|\\{(?:[^{}]|\\{[^{}]*})*})*}|\".+?(?<!\\\\)\")?))(?:\\.\\.\\.)?(\\.?'*)"
         },
         {
-          "match": "(\\.?((?<!<)<=|(?<!>)>=|>|<|≥|≤|===|==|≡|!=|≠|!==|≢|∈|∉|∋|∌|⊆|⊈|⊂|⊄|⊊|∝|∊|∍|∥|∦|∷|∺|∻|∽|∾|≁|≃|≂|≄|≅|≆|≇|≈|≉|≊|≋|≌|≍|≎|≐|≑|≒|≓|≖|≗|≘|≙|≚|≛|≜|≝|≞|≟|≣|≦|≧|≨|≩|≪|≫|≬|≭|≮|≯|≰|≱|≲|≳|≴|≵|≶|≷|≸|≹|≺|≻|≼|≽|≾|≿|⊀|⊁|⊃|⊅|⊇|⊉|⊋|⊏|⊐|⊑|⊒|⊜|⊩|⊬|⊮|⊰|⊱|⊲|⊳|⊴|⊵|⊶|⊷|⋍|⋐|⋑|⋕|⋖|⋗|⋘|⋙|⋚|⋛|⋜|⋝|⋞|⋟|⋠|⋡|⋢|⋣|⋤|⋥|⋦|⋧|⋨|⋩|⋪|⋫|⋬|⋭|⋲|⋳|⋴|⋵|⋶|⋷|⋸|⋹|⋺|⋻|⋼|⋽|⋾|⋿|⟈|⟉|⟒|⦷|⧀|⧁|⧡|⧣|⧤|⧥|⩦|⩧|⩪|⩫|⩬|⩭|⩮|⩯|⩰|⩱|⩲|⩳|⩵|⩶|⩷|⩸|⩹|⩺|⩻|⩼|⩽|⩾|⩿|⪀|⪁|⪂|⪃|⪄|⪅|⪆|⪇|⪈|⪉|⪊|⪋|⪌|⪍|⪎|⪏|⪐|⪑|⪒|⪓|⪔|⪕|⪖|⪗|⪘|⪙|⪚|⪛|⪜|⪝|⪞|⪟|⪠|⪡|⪢|⪣|⪤|⪥|⪦|⪧|⪨|⪩|⪪|⪫|⪬|⪭|⪮|⪯|⪰|⪱|⪲|⪳|⪴|⪵|⪶|⪷|⪸|⪹|⪺|⪻|⪼|⪽|⪾|⪿|⫀|⫁|⫂|⫃|⫄|⫅|⫆|⫇|⫈|⫉|⫊|⫋|⫌|⫍|⫎|⫏|⫐|⫑|⫒|⫓|⫔|⫕|⫖|⫗|⫘|⫙|⫷|⫸|⫹|⫺|⊢|⊣|⟂|⫪|⫫|<:|>:))",
+          "match": "(\\.?((?<!<)<=|(?<!>)>=|[><≥≤]|===|==|≡|!=|≠|!==|[≢∈∉∋∌⊆⊈⊂⊄⊊∝∊∍∥∦∷∺∻∽∾≁≃≂≄≅≆≇≈≉≊≋≌≍≎≐≑≒≓≖≗≘≙≚≛≜≝≞≟≣≦≧≨≩≪≫≬≭≮≯≰≱≲≳≴≵≶≷≸≹≺≻≼≽≾≿⊀⊁⊃⊅⊇⊉⊋⊏⊐⊑⊒⊜⊩⊬⊮⊰⊱⊲⊳⊴⊵⊶⊷⋍⋐⋑⋕⋖⋗⋘⋙⋚⋛⋜⋝⋞⋟⋠⋡⋢⋣⋤⋥⋦⋧⋨⋩⋪⋫⋬⋭⋲⋳⋴⋵⋶⋷⋸⋹⋺⋻⋼⋽⋾⋿⟈⟉⟒⦷⧀⧁⧡⧣⧤⧥⩦⩧⩪⩫⩬⩭⩮⩯⩰⩱⩲⩳⩵⩶⩷⩸⩹⩺⩻⩼⩽⩾⩿⪀⪁⪂⪃⪄⪅⪆⪇⪈⪉⪊⪋⪌⪍⪎⪏⪐⪑⪒⪓⪔⪕⪖⪗⪘⪙⪚⪛⪜⪝⪞⪟⪠⪡⪢⪣⪤⪥⪦⪧⪨⪩⪪⪫⪬⪭⪮⪯⪰⪱⪲⪳⪴⪵⪶⪷⪸⪹⪺⪻⪼⪽⪾⪿⫀⫁⫂⫃⫄⫅⫆⫇⫈⫉⫊⫋⫌⫍⫎⫏⫐⫑⫒⫓⫔⫕⫖⫗⫘⫙⫷⫸⫹⫺⊢⊣⟂⫪⫫]|<:|>:))",
           "name": "keyword.operator.relation.julia"
         },
         {
-          "match": "(?<=\\s)(?:\\?)(?=\\s)",
+          "match": "(?<=\\s)\\?(?=\\s)",
           "name": "keyword.operator.ternary.julia"
         },
         {
-          "match": "(?<=\\s)(?:\\:)(?=\\s)",
+          "match": "(?<=\\s):(?=\\s)",
           "name": "keyword.operator.ternary.julia"
         },
         {
-          "match": "(?:\\|\\||&&|(?<!(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿]))!)",
+          "match": "(?:\\|\\||&&|(?<![[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]])!)",
           "name": "keyword.operator.boolean.julia"
         },
         {
-          "match": "(?<=[[:word:]⁺-ₜ!′∇\\)\\]\\}])(?::)",
+          "match": "(?<=[[:word:]⁺-ₜ!′∇)\\]}]):",
           "name": "keyword.operator.range.julia"
         },
         {
-          "match": "(?:\\|>)",
+          "match": "\\|>",
           "name": "keyword.operator.applies.julia"
         },
         {
-          "match": "(?:\\||\\.\\||\\&|\\.\\&|~|¬|\\.~|⊻|\\.⊻)",
+          "match": "(?:\\||\\.\\||&|\\.&|[~¬]|\\.~|⊻|\\.⊻)",
           "name": "keyword.operator.bitwise.julia"
         },
         {
-          "match": "\\.?(?:\\+\\+|\\-\\-|\\+|\\-|−|¦|\\||⊕|⊖|⊞|⊟|∪|∨|⊔|±|∓|∔|∸|≏|⊎|⊻|⊽|⋎|⋓|⟇|⧺|⧻|⨈|⨢|⨣|⨤|⨥|⨦|⨧|⨨|⨩|⨪|⨫|⨬|⨭|⨮|⨹|⨺|⩁|⩂|⩅|⩊|⩌|⩏|⩐|⩒|⩔|⩖|⩗|⩛|⩝|⩡|⩢|⩣|\\*|//?|⌿|÷|%|&|·|·|⋅|∘|×|\\\\|∩|∧|⊗|⊘|⊙|⊚|⊛|⊠|⊡|⊓|∗|∙|∤|⅋|≀|⊼|⋄|⋆|⋇|⋉|⋊|⋋|⋌|⋏|⋒|⟑|⦸|⦼|⦾|⦿|⧶|⧷|⨇|⨰|⨱|⨲|⨳|⨴|⨵|⨶|⨷|⨸|⨻|⨼|⨽|⩀|⩃|⩄|⩋|⩍|⩎|⩑|⩓|⩕|⩘|⩚|⩜|⩞|⩟|⩠|⫛|⊍|▷|⨝|⟕|⟖|⟗|⨟|\\^|↑|↓|⇵|⟰|⟱|⤈|⤉|⤊|⤋|⤒|⤓|⥉|⥌|⥍|⥏|⥑|⥔|⥕|⥘|⥙|⥜|⥝|⥠|⥡|⥣|⥥|⥮|⥯|￪|￬|√|∛|∜|⋆|±|∓)",
+          "match": "\\.?(?:\\+\\+|--|[+\\-−¦|⊕⊖⊞⊟∪∨⊔±∓∔∸≏⊎⊻⊽⋎⋓⟇⧺⧻⨈⨢⨣⨤⨥⨦⨧⨨⨩⨪⨫⨬⨭⨮⨹⨺⩁⩂⩅⩊⩌⩏⩐⩒⩔⩖⩗⩛⩝⩡⩢⩣*]|//?|[⌿÷%\\&··⋅∘×\\\\∩∧⊗⊘⊙⊚⊛⊠⊡⊓∗∙∤⅋≀⊼⋄⋆⋇⋉⋊⋋⋌⋏⋒⟑⦸⦼⦾⦿⧶⧷⨇⨰⨱⨲⨳⨴⨵⨶⨷⨸⨻⨼⨽⩀⩃⩄⩋⩍⩎⩑⩓⩕⩘⩚⩜⩞⩟⩠⫛⊍▷⨝⟕⟖⟗⨟^↑↓⇵⟰⟱⤈⤉⤊⤋⤒⤓⥉⥌⥍⥏⥑⥔⥕⥘⥙⥜⥝⥠⥡⥣⥥⥮⥯￪￬√∛∜±∓])",
           "name": "keyword.operator.arithmetic.julia"
         },
         {
-          "match": "(?:∘)",
+          "match": "∘",
           "name": "keyword.operator.compose.julia"
         },
         {
@@ -401,15 +398,15 @@
           "name": "keyword.operator.isa.julia"
         },
         {
-          "match": "(?:(?<=\\s)in(?=\\s))",
+          "match": "(?<=\\s)in(?=\\s)",
           "name": "keyword.operator.relation.in.julia"
         },
         {
-          "match": "(?:\\.(?=(?:@|_|\\p{L}))|\\.\\.+|…|⁝|⋮|⋱|⋰|⋯)",
+          "match": "(?:\\.(?=[@_\\p{L}])|\\.\\.+|[…⁝⋮⋱⋰⋯])",
           "name": "keyword.operator.dots.julia"
         },
         {
-          "match": "(?:\\$)(?=.+)",
+          "match": "\\$(?=.+)",
           "name": "keyword.operator.interpolation.julia"
         },
         {
@@ -418,7 +415,7 @@
               "name": "keyword.operator.transposed-variable.julia"
             }
           },
-          "match": "((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)(('|(\\.'))*\\.?')"
+          "match": "([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)(('|(\\.'))*\\.?')"
         },
         {
           "captures": {
@@ -429,7 +426,7 @@
               "name": "keyword.operator.transposed-matrix.julia"
             }
           },
-          "match": "(\\])((?:'|(?:\\.'))*\\.?')"
+          "match": "(])((?:'|\\.')*\\.?')"
         },
         {
           "captures": {
@@ -440,7 +437,7 @@
               "name": "keyword.operator.transposed-parens.julia"
             }
           },
-          "match": "(\\))((?:'|(?:\\.'))*\\.?')"
+          "match": "(\\))((?:'|\\.')*\\.?')"
         }
       ]
     },
@@ -453,7 +450,7 @@
               "name": "meta.bracket.julia"
             }
           },
-          "end": "(\\))((?:\\.)?'*)",
+          "end": "(\\))(\\.?'*)",
           "endCaptures": {
             "1": {
               "name": "meta.bracket.julia"
@@ -483,7 +480,6 @@
       ]
     },
     "self_no_for_block": {
-      "comment": "Same as $self, but does not contain #for_block. 'outer' is not valid in some contexts (e.g. generators, comprehensions, indexing), so use this when matching those in begin/end patterns. Keep this up-to-date with $self!",
       "patterns": [
         {
           "include": "#operator"
@@ -768,7 +764,6 @@
               "name": "punctuation.definition.string.begin.julia"
             }
           },
-          "comment": "This only matches docstrings that start and end with triple quotes on\ntheir own line in the void",
           "end": "(\"\"\")",
           "endCaptures": {
             "1": {
@@ -812,7 +807,6 @@
               "name": "punctuation.definition.string.multiline.begin.julia"
             }
           },
-          "comment": "multi-line string with triple double quotes",
           "end": "\"\"\"",
           "endCaptures": {
             "0": {
@@ -836,7 +830,6 @@
               "name": "punctuation.definition.string.begin.julia"
             }
           },
-          "comment": "String with single pair of double quotes. Regex matches isolated double quote",
           "end": "\"",
           "endCaptures": {
             "0": {
@@ -866,7 +859,6 @@
               "name": "punctuation.definition.string.regexp.end.julia"
             },
             "2": {
-              "comment": "I took this scope name from python regex grammar",
               "name": "keyword.other.option-toggle.regexp.julia"
             }
           },
@@ -890,7 +882,6 @@
               "name": "punctuation.definition.string.regexp.end.julia"
             },
             "2": {
-              "comment": "I took this scope name from python regex grammar",
               "name": "keyword.other.option-toggle.regexp.julia"
             }
           },
@@ -902,7 +893,7 @@
           ]
         },
         {
-          "begin": "(?<!\")((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)\"\"\"",
+          "begin": "(?<!\")([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)\"\"\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.julia"
@@ -911,7 +902,7 @@
               "name": "support.function.macro.julia"
             }
           },
-          "end": "(\"\"\")((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)?",
+          "end": "(\"\"\")([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.julia"
@@ -928,7 +919,7 @@
           ]
         },
         {
-          "begin": "(?<!\")((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)\"",
+          "begin": "(?<!\")([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.julia"
@@ -937,7 +928,7 @@
               "name": "support.function.macro.julia"
             }
           },
-          "end": "(?<![^\\\\]\\\\)(\")((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)?",
+          "end": "(?<![^\\\\]\\\\)(\")([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.julia"
@@ -954,7 +945,7 @@
           ]
         },
         {
-          "begin": "(?<!`)((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)?```",
+          "begin": "(?<!`)([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)?```",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.julia"
@@ -963,7 +954,7 @@
               "name": "support.function.macro.julia"
             }
           },
-          "end": "(```)((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)?",
+          "end": "(```)([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.julia"
@@ -983,7 +974,7 @@
           ]
         },
         {
-          "begin": "(?<!`)((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)?`",
+          "begin": "(?<!`)([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)?`",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.julia"
@@ -992,7 +983,7 @@
               "name": "support.function.macro.julia"
             }
           },
-          "end": "(?<![^\\\\]\\\\)(`)((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)?",
+          "end": "(?<![^\\\\]\\\\)(`)([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.julia"
@@ -1016,7 +1007,7 @@
     "string_dollar_sign_interpolate": {
       "patterns": [
         {
-          "match": "\\$(?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿]|[^\\p{^Sc}$])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿]|[^\\p{^Sc}$])*",
+          "match": "\\$[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿][^\\P{Sc}$]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿][^\\P{Sc}$]]*",
           "name": "variable.interpolation.julia"
         },
         {
@@ -1026,7 +1017,6 @@
               "name": "meta.bracket.julia"
             }
           },
-          "comment": "`punctuation.section.embedded`, `constant.escape`,\n& `meta.embedded.line` were considered but appear to have even spottier\nsupport among popular syntaxes.",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -1045,7 +1035,7 @@
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8}|.)",
+          "match": "\\\\(\\\\|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8}|.)",
           "name": "constant.character.escape.julia"
         }
       ]
@@ -1053,8 +1043,7 @@
     "symbol": {
       "patterns": [
         {
-          "comment": "This is string.quoted.symbol.julia in tpoisot's package",
-          "match": "(?<![[:word:]⁺-ₜ!′∇\\)\\]\\}]):(?:(?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)(?!(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿]))(?![\"`])",
+          "match": "(?<![[:word:]⁺-ₜ!′∇)\\]}]):[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*(?![[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]])(?![\"`])",
           "name": "constant.other.symbol.julia"
         }
       ]
@@ -1073,7 +1062,7 @@
               "name": "punctuation.separator.inheritance.julia"
             }
           },
-          "match": "(?>!:_)(?:struct|mutable\\s+struct|abstract\\s+type|primitive\\s+type)\\s+((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)(\\s*(<:)\\s*(?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*(?:{.*})?)?",
+          "match": "!:_(?:struct|mutable\\s+struct|abstract\\s+type|primitive\\s+type)\\s+([[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*)(\\s*(<:)\\s*[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{So}←-⇿]][[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡[^\\P{Mn}\\x01-¡][^\\P{Mc}\\x01-¡][^\\D\\x01-¡][^\\P{Pc}\\x01-¡][^\\P{Sk}\\x01-¡][^\\P{Me}\\x01-¡][^\\P{No}\\x01-¡]′-‷⁗[^\\P{So}←-⇿]]*(?:\\{.*})?)?",
           "name": "meta.type.julia"
         }
       ]
diff --git a/resources/languages/kotlin.json b/resources/languages/kotlin.json
index db0a505..c936965 100644
--- a/resources/languages/kotlin.json
+++ b/resources/languages/kotlin.json
@@ -18,7 +18,7 @@
   ],
   "repository": {
     "annotation-simple": {
-      "match": "(?<!\\w)@[\\w\\.]+\\b(?!:)",
+      "match": "(?<!\\w)@[\\w.]+\\b(?!:)",
       "name": "entity.name.type.annotation.kotlin"
     },
     "annotation-site": {
@@ -42,7 +42,7 @@
           "name": "entity.name.type.annotation-site.kotlin"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#unescaped-annotation"
@@ -50,7 +50,7 @@
       ]
     },
     "binary-literal": {
-      "match": "0(b|B)[01][01_]*",
+      "match": "0([bB])[01][01_]*",
       "name": "constant.numeric.binary.kotlin"
     },
     "boolean-literal": {
@@ -196,7 +196,7 @@
                   "name": "variable.parameter.kotlin"
                 }
               },
-              "match": "(@param|@property)\\s+(\\S+)"
+              "match": "(@p(?:aram|roperty))\\s+(\\S+)"
             },
             {
               "captures": {
@@ -207,7 +207,7 @@
                   "name": "variable.parameter.kotlin"
                 }
               },
-              "match": "(@param)\\[(\\S+)\\]"
+              "match": "(@param)\\[(\\S+)]"
             },
             {
               "captures": {
@@ -232,7 +232,7 @@
                   "name": "variable.parameter.kotlin"
                 }
               },
-              "match": "{(@link)\\s+(\\S+)?#([\\w$]+\\s*\\([^\\(\\)]*\\)).*}"
+              "match": "\\{(@link)\\s+(\\S+)?#([\\w$]+\\s*\\([^()]*\\)).*}"
             }
           ]
         }
@@ -261,7 +261,7 @@
       "name": "keyword.control.kotlin"
     },
     "decimal-literal": {
-      "match": "\\b\\d[\\d_]*(\\.[\\d_]+)?((e|E)\\d+)?(u|U)?(L|F|f)?\\b",
+      "match": "\\b\\d[\\d_]*(\\.[\\d_]+)?(([eE])\\d+)?([uU])?([LFf])?\\b",
       "name": "constant.numeric.decimal.kotlin"
     },
     "function": {
@@ -305,7 +305,7 @@
       "name": "keyword.hard.kotlin"
     },
     "hex-literal": {
-      "match": "0(x|X)[A-Fa-f0-9][A-Fa-f0-9_]*(u|U)?",
+      "match": "0([xX])\\h[_\\h]*([uU])?",
       "name": "constant.numeric.hex.kotlin"
     },
     "import": {
@@ -391,7 +391,7 @@
     "operators": {
       "patterns": [
         {
-          "match": "(===?|\\!==?|<=|>=|<|>)",
+          "match": "(===?|!==?|<=|>=|[<>])",
           "name": "keyword.operator.comparison.kotlin"
         },
         {
@@ -480,7 +480,7 @@
           "name": "punctuation.definition.template-expression.begin"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.template-expression.end"
@@ -542,7 +542,7 @@
           ]
         }
       },
-      "match": "(?<![:?]):\\s*(\\w|\\?|\\s|->|(?<GROUP>[<(]([^<>()\"']|\\g<GROUP>)+[)>]))+"
+      "match": "(?<![:?]):\\s*([\\w?\\s]|->|(?<GROUP>[<(]([^<>()\"']|\\g<GROUP>)+[)>]))+"
     },
     "type-parameter": {
       "patterns": [
@@ -557,7 +557,7 @@
       ]
     },
     "unescaped-annotation": {
-      "match": "\\b[\\w\\.]+\\b",
+      "match": "\\b[\\w.]+\\b",
       "name": "entity.name.type.annotation.kotlin"
     },
     "variable-declaration": {
@@ -573,7 +573,7 @@
           ]
         }
       },
-      "match": "\\b(val|var)\\b\\s*(?<GROUP><([^<>]|\\g<GROUP>)+>)?"
+      "match": "\\b(va[lr])\\b\\s*(?<GROUP><([^<>]|\\g<GROUP>)+>)?"
     }
   },
   "scopeName": "source.kotlin"
diff --git a/resources/languages/kusto.json b/resources/languages/kusto.json
index 27c3c9d..18556f9 100644
--- a/resources/languages/kusto.json
+++ b/resources/languages/kusto.json
@@ -8,17 +8,14 @@
   "name": "kusto",
   "patterns": [
     {
-      "comment": "Tabular operators: common helper operators",
       "match": "\\b(by|from|of|to|step|with)\\b",
       "name": "keyword.other.operator.kusto"
     },
     {
-      "comment": "Query statements: https://docs.microsoft.com/en-us/azure/kusto/query/statements",
       "match": "\\b(let|set|alias|declare|pattern|query_parameters|restrict|access|set)\\b",
       "name": "keyword.control.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/datatypes-string-operators",
       "match": "\\b(and|or|has_all|has_any|matches|regex)\\b",
       "name": "keyword.other.operator.kusto"
     },
@@ -35,17 +32,14 @@
           ]
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/clusterfunction",
       "match": "\\b(cluster|database)(?:\\s*\\(\\s*(.+?)\\s*\\))?(?!\\w)",
       "name": "meta.special.database.kusto"
     },
     {
-      "comment": "Special functions: https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/tablefunction",
       "match": "\\b(external_table|materialized_view|materialize|table|toscalar)\\b",
       "name": "support.function.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/betweenoperator",
       "match": "(?<!\\w)(!?between)\\b",
       "name": "keyword.other.operator.kusto"
     },
@@ -69,8 +63,7 @@
           ]
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/binoperators",
-      "match": "\\b(binary_and|binary_or|binary_shift_left|binary_shift_right|binary_xor)(?:\\s*\\(\\s*(\\w+)\\s*,\\s*(\\w+)\\s*\\))?(?!\\w)",
+      "match": "\\b(binary_(?:and|or|shift_left|shift_right|xor))(?:\\s*\\(\\s*(\\w+)\\s*,\\s*(\\w+)\\s*\\))?(?!\\w)",
       "name": "meta.scalar.bitwise.kusto"
     },
     {
@@ -86,17 +79,14 @@
           ]
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/binary-notfunction",
-      "match": "\\b(binary_not|bitset_count_ones)(?:\\s*\\(\\s*(\\w+)\\s*\\))?(?!\\w)",
+      "match": "\\b(bi(?:nary_not|tset_count_ones))(?:\\s*\\(\\s*(\\w+)\\s*\\))?(?!\\w)",
       "name": "meta.scalar.bitwise.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/in-cs-operator",
       "match": "(?<!\\w)(!?in~?)(?!\\w)",
       "name": "keyword.other.operator.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/datatypes-string-operators",
       "match": "(?<!\\w)(!?(?:contains|endswith|hasprefix|hassuffix|has|startswith)(?:_cs)?)(?!\\w)",
       "name": "keyword.other.operator.kusto"
     },
@@ -154,12 +144,10 @@
           ]
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/rangefunction",
-      "match": "\\b(range)\\s*\\((?:\\s*(\\w+(?:\\(.*?\\))?)\\s*,\\s*(\\w+(?:\\(.*?\\))?)\\s*,?(?:\\s*)?(\\w+(?:\\(.*?\\))?)?\\s*\\))?(?!\\w)",
+      "match": "\\b(range)\\s*\\((?:\\s*(\\w+(?:\\(.*?\\))?)\\s*,\\s*(\\w+(?:\\(.*?\\))?)\\s*,?\\s*{0,1}(\\w+(?:\\(.*?\\))?)?\\s*\\))?(?!\\w)",
       "name": "meta.scalar.function.range.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/scalarfunctions",
       "match": "\\b(abs|acos|around|array_concat|array_iff|array_index_of|array_length|array_reverse|array_rotate_left|array_rotate_right|array_shift_left|array_shift_right|array_slice|array_sort_asc|array_sort_desc|array_split|array_sum|asin|assert|atan2|atan|bag_has_key|bag_keys|bag_merge|bag_remove_keys|base64_decode_toarray|base64_decode_tostring|base64_decode_toguid|base64_encode_fromarray|base64_encode_tostring|base64_encode_fromguid|beta_cdf|beta_inv|beta_pdf|bin_at|bin_auto|case|ceiling|coalesce|column_ifexists|convert_angle|convert_energy|convert_force|convert_length|convert_mass|convert_speed|convert_temperature|convert_volume|cos|cot|countof|current_cluster_endpoint|current_database|current_principal_details|current_principal_is_member_of|current_principal|cursor_after|cursor_before_or_at|cursor_current|current_cursor|dcount_hll|degrees|dynamic_to_json|estimate_data_size|exp10|exp2|exp|extent_id|extent_tags|extract_all|extract_json|extractjson|extract|floor|format_bytes|format_ipv4_mask|format_ipv4|gamma|gettype|gzip_compress_to_base64_string|gzip_decompress_from_base64_string|has_any_index|has_any_ipv4_prefix|has_any_ipv4|has_ipv4_prefix|has_ipv4|hash_combine|hash_many|hash_md5|hash_sha1|hash_sha256|hash_xxhash64|hash|iff|iif|indexof_regex|indexof|ingestion_time|ipv4_compare|ipv4_is_in_range|ipv4_is_in_any_range|ipv4_is_match|ipv4_is_private|ipv4_netmask_suffix|ipv6_compare|ipv6_is_match|isascii|isempty|isfinite|isinf|isnan|isnotempty|notempty|isnotnull|notnull|isnull|isutf8|jaccard_index|log10|log2|loggamma|log|make_string|max_of|min_of|new_guid|not|bag_pack|pack_all|pack_array|pack_dictionary|pack|parse_command_line|parse_csv|parse_ipv4_mask|parse_ipv4|parse_ipv6_mask|parse_ipv6|parse_path|parse_urlquery|parse_url|parse_user_agent|parse_version|parse_xml|percentile_tdigest|percentile_array_tdigest|percentrank_tdigest|pi|pow|radians|rand|rank_tdigest|regex_quote|repeat|replace_regex|replace_string|reverse|round|set_difference|set_has_element|set_intersect|set_union|sign|sin|split|sqrt|strcat_array|strcat_delim|strcmp|strcat|string_size|strlen|strrep|substring|tan|to_utf8|tobool|todecimal|todouble|toreal|toguid|tohex|toint|tolong|tolower|tostring|toupper|translate|treepath|trim_end|trim_start|trim|unixtime_microseconds_todatetime|unixtime_milliseconds_todatetime|unixtime_nanoseconds_todatetime|unixtime_seconds_todatetime|url_decode|url_encode_component|url_encode|welch_test|zip|zlib_compress_to_base64_string|zlib_decompress_from_base64_string)\\b",
       "name": "support.function.kusto"
     },
@@ -195,42 +183,34 @@
           ]
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/binfunction",
       "match": "\\b(bin)(?:\\s*\\(\\s*(.+?)\\s*,\\s*(.+?)\\s*\\))?(?!\\w)",
       "name": "meta.scalar.function.bin.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/count-aggfunction",
       "match": "\\b(count)\\s*\\(\\s*\\)(?!\\w)",
       "name": "support.function.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/aggregation-functions",
       "match": "\\b(arg_max|arg_min|avgif|avg|binary_all_and|binary_all_or|binary_all_xor|buildschema|countif|dcount|dcountif|hll|hll_merge|make_bag_if|make_bag|make_list_with_nulls|make_list_if|make_list|make_set_if|make_set|maxif|max|minif|min|percentilesw_array|percentiles_array|percentilesw|percentilew|percentiles|percentile|stdevif|stdevp|stdev|sumif|sum|take_anyif|take_any|tdigest_merge|merge_tdigest|tdigest|varianceif|variancep|variance)\\b",
       "name": "support.function.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/geospatial-grid-systems",
-      "match": "\\b(geo_distance_2points|geo_distance_point_to_line|geo_distance_point_to_polygon|geo_intersects_2lines|geo_intersects_2polygons|geo_intersects_line_with_polygon|geo_intersection_2lines|geo_intersection_2polygons|geo_intersection_line_with_polygon|geo_line_centroid|geo_line_densify|geo_line_length|geo_line_simplify|geo_polygon_area|geo_polygon_centroid|geo_polygon_densify|geo_polygon_perimeter|geo_polygon_simplify|geo_polygon_to_s2cells|geo_point_in_circle|geo_point_in_polygon|geo_point_to_geohash|geo_point_to_h3cell|geo_point_to_s2cell|geo_geohash_to_central_point|geo_geohash_neighbors|geo_geohash_to_polygon|geo_s2cell_to_central_point|geo_s2cell_neighbors|geo_s2cell_to_polygon|geo_h3cell_to_central_point|geo_h3cell_neighbors|geo_h3cell_to_polygon|geo_h3cell_parent|geo_h3cell_children|geo_h3cell_level|geo_h3cell_rings|geo_simplify_polygons_array|geo_union_lines_array|geo_union_polygons_array)\\b",
+      "match": "\\b(geo_(?:distance_2points|distance_point_to_line|distance_point_to_polygon|intersects_2lines|intersects_2polygons|intersects_line_with_polygon|intersection_2lines|intersection_2polygons|intersection_line_with_polygon|line_centroid|line_densify|line_length|line_simplify|polygon_area|polygon_centroid|polygon_densify|polygon_perimeter|polygon_simplify|polygon_to_s2cells|point_in_circle|point_in_polygon|point_to_geohash|point_to_h3cell|point_to_s2cell|geohash_to_central_point|geohash_neighbors|geohash_to_polygon|s2cell_to_central_point|s2cell_neighbors|s2cell_to_polygon|h3cell_to_central_point|h3cell_neighbors|h3cell_to_polygon|h3cell_parent|h3cell_children|h3cell_level|h3cell_rings|simplify_polygons_array|union_lines_array|union_polygons_array))\\b",
       "name": "support.function.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/windowsfunctions",
       "match": "\\b(next|prev|row_cumsum|row_number|row_rank|row_window_session)\\b",
       "name": "support.function.kusto"
     },
     {
-      "comment": "User-defined functions: https://docs.microsoft.com/en-us/azure/kusto/query/functions/user-defined-functions",
       "match": "\\.(create-or-alter|replace)",
       "name": "keyword.control.kusto"
     },
     {
-      "comment": "User-defined functions: https://docs.microsoft.com/en-us/azure/kusto/query/functions/user-defined-functions",
       "match": "(?<=let )[^\\n]+(?=\\W*=)",
       "name": "entity.function.name.lambda.kusto"
     },
     {
-      "comment": "User-defined functions: https://docs.microsoft.com/en-us/azure/kusto/query/functions/user-defined-functions",
       "match": "\\b(folder|docstring|skipvalidation)\\b",
       "name": "keyword.other.operator.kusto"
     },
@@ -239,7 +219,6 @@
       "name": "storage.type.kusto"
     },
     {
-      "comment": "Data types: https://docs.microsoft.com/en-us/azure/kusto/query/scalar-data-types",
       "match": "\\b(bool|decimal|dynamic|guid|int|long|real|string)\\b",
       "name": "storage.type.kusto"
     },
@@ -252,12 +231,10 @@
           "name": "variable.other.kusto"
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/asoperator",
       "match": "\\b(as)\\s+(\\w+)\\b",
       "name": "meta.query.as.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/datatableoperator",
       "match": "\\b(datatable)(?=\\W*\\()",
       "name": "keyword.other.query.kusto"
     },
@@ -270,7 +247,6 @@
           "name": "keyword.other.operator.kusto"
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/facetoperator",
       "match": "\\b(facet)(?:\\s+(by))?\\b",
       "name": "meta.query.facet.kusto"
     },
@@ -283,7 +259,6 @@
           "name": "entity.name.function.kusto"
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/invokeoperator",
       "match": "\\b(invoke)(?:\\s+(\\w+))?\\b",
       "name": "meta.query.invoke.kusto"
     },
@@ -299,7 +274,6 @@
           "name": "variable.other.column.kusto"
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/orderoperator",
       "match": "\\b(order)(?:\\s+(by)\\s+(\\w+))?\\b",
       "name": "meta.query.order.kusto"
     },
@@ -360,7 +334,6 @@
           ]
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/rangeoperator",
       "match": "\\b(range)\\s+(\\w+)\\s+(from)\\s+(\\w+(?:\\(\\w*\\))?)\\s+(to)\\s+(\\w+(?:\\(\\w*\\))?)\\s+(step)\\s+(\\w+(?:\\(\\w*\\))?)\\b",
       "name": "meta.query.range.kusto"
     },
@@ -377,7 +350,6 @@
           ]
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/sampleoperator",
       "match": "\\b(sample)(?:\\s+(\\d+))?(?![\\w-])",
       "name": "meta.query.sample.kusto"
     },
@@ -400,7 +372,6 @@
           "name": "variable.other.column.kusto"
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/sampledistinctoperator",
       "match": "\\b(sample-distinct)(?:\\s+(\\d+)\\s+(of)\\s+(\\w+))?\\b",
       "name": "meta.query.sample-distinct.kusto"
     },
@@ -413,7 +384,6 @@
           "name": "keyword.other.operator.kusto"
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/sortoperator",
       "match": "\\b(sort)(?:\\s+(by))?\\b",
       "name": "meta.query.sort.kusto"
     },
@@ -430,8 +400,7 @@
           ]
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/takeoperator",
-      "match": "\\b(take|limit)(?:\\s+(\\d+))\\b",
+      "match": "\\b(take|limit)\\s+(\\d+)\\b",
       "name": "meta.query.take.kusto"
     },
     {
@@ -453,7 +422,6 @@
           "name": "variable.other.column.kusto"
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/topoperator",
       "match": "\\b(top)(?:\\s+(\\d+)\\s+(by)\\s+(\\w+))?(?![\\w-])\\b",
       "name": "meta.query.top.kusto"
     },
@@ -482,52 +450,42 @@
           "name": "variable.other.column.kusto"
         }
       },
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/tophittersoperator",
       "match": "\\b(top-hitters)(?:\\s+(\\d+)\\s+(of)\\s+(\\w+)(?:\\s+(by)\\s+(\\w+))?)?\\b",
       "name": "meta.query.top-hitters.kusto"
     },
     {
-      "comment": "Tabular operators: https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/queries",
       "match": "\\b(consume|count|distinct|evaluate|extend|externaldata|find|fork|getschema|join|lookup|make-series|mv-apply|mv-expand|project-away|project-keep|project-rename|project-reorder|project|parse|parse-where|parse-kv|partition|print|reduce|render|scan|search|serialize|shuffle|summarize|top-nested|union|where)\\b",
       "name": "keyword.other.query.kusto"
     },
     {
-      "comment": "Tabular operators: evalute (plugins): https://docs.microsoft.com/en-us/azure/kusto/query/evaluateoperator",
       "match": "\\b(active_users_count|activity_counts_metrics|activity_engagement|new_activity_metrics|activity_metrics|autocluster|azure_digital_twins_query_request|bag_unpack|basket|cosmosdb_sql_request|dcount_intersect|diffpatterns|funnel_sequence_completion|funnel_sequence|http_request_post|http_request|infer_storage_schema|ipv4_lookup|mysql_request|narrow|pivot|preview|rolling_percentile|rows_near|schema_merge|session_count|sequence_detect|sliding_window_counts|sql_request)\\b",
       "name": "support.function.kusto"
     },
     {
-      "comment": "Tabular operators: join: https://docs.microsoft.com/en-us/azure/kusto/query/joinoperator",
       "match": "\\b(on|kind|hint\\.remote|hint\\.strategy)\\b",
       "name": "keyword.other.operator.kusto"
     },
     {
-      "comment": "Tabular operators: join ($left, $right): https://docs.microsoft.com/en-us/azure/kusto/query/joinoperator",
-      "match": "(\\$left|\\$right)\\b",
+      "match": "(\\$(?:left|right))\\b",
       "name": "keyword.other.kusto"
     },
     {
-      "comment": "Tabular operators: join (kinds, strategies): https://docs.microsoft.com/en-us/azure/kusto/query/joinoperator",
       "match": "\\b(innerunique|inner|leftouter|rightouter|fullouter|leftanti|anti|leftantisemi|rightanti|rightantisemi|leftsemi|rightsemi|broadcast)\\b",
       "name": "keyword.other.kusto"
     },
     {
-      "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/machine-learning-and-tsa",
-      "match": "\\b(series_abs|series_acos|series_add|series_asin|series_atan|series_cos|series_decompose|series_decompose_anomalies|series_decompose_forecast|series_divide|series_equals|series_exp|series_fft|series_fill_backward|series_fill_const|series_fill_forward|series_fill_linear|series_fir|series_fit_2lines_dynamic|series_fit_2lines|series_fit_line_dynamic|series_fit_line|series_fit_poly|series_greater_equals|series_greater|series_ifft|series_iir|series_less_equals|series_less|series_multiply|series_not_equals|series_outliers|series_pearson_correlation|series_periods_detect|series_periods_validate|series_pow|series_seasonal|series_sign|series_sin|series_stats|series_stats_dynamic|series_subtract|series_tan)\\b",
+      "match": "\\b(series_(?:abs|acos|add|asin|atan|cos|decompose|decompose_anomalies|decompose_forecast|divide|equals|exp|fft|fill_backward|fill_const|fill_forward|fill_linear|fir|fit_2lines_dynamic|fit_2lines|fit_line_dynamic|fit_line|fit_poly|greater_equals|greater|ifft|iir|less_equals|less|multiply|not_equals|outliers|pearson_correlation|periods_detect|periods_validate|pow|seasonal|sign|sin|stats|stats_dynamic|subtract|tan))\\b",
       "name": "support.function.kusto"
     },
     {
-      "comment": "Tabular operators: mv-expand (bagexpand options): https://docs.microsoft.com/en-us/azure/kusto/query/mvexpandoperator",
       "match": "\\b(bag|array)\\b",
       "name": "keyword.other.operator.kusto"
     },
     {
-      "comment": "Tabular operators: order: https://docs.microsoft.com/en-us/azure/kusto/query/orderoperator",
       "match": "\\b(asc|desc|nulls first|nulls last)\\b",
       "name": "keyword.other.kusto"
     },
     {
-      "comment": "Tabular operators: parse: https://docs.microsoft.com/en-us/azure/kusto/query/parseoperator",
       "match": "\\b(regex|simple|relaxed)\\b",
       "name": "keyword.other.kusto"
     },
@@ -539,11 +497,10 @@
       "include": "#Strings"
     },
     {
-      "match": "\\{.*?\\}",
+      "match": "\\{.*?}",
       "name": "string.other.kusto"
     },
     {
-      "comment": "Comments",
       "match": "//.*",
       "name": "comment.line.kusto"
     },
@@ -564,7 +521,6 @@
       "name": "constant.language.kusto"
     },
     {
-      "comment": "Deprecated functions",
       "match": "\\b(anyif|any|array_strcat|base64_decodestring|base64_encodestring|make_dictionary|makelist|makeset|mvexpand|todynamic|parse_json|replace|weekofyear)(?=\\W*\\(|\\b)",
       "name": "invalid.deprecated.kusto"
     }
@@ -600,12 +556,10 @@
               ]
             }
           },
-          "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/format-datetimefunction",
           "match": "\\b(format_datetime)(?:\\s*\\(\\s*(.+?)\\s*,\\s*(['\"].*?['\"])\\s*\\))?(?!\\w)",
           "name": "meta.scalar.function.format_datetime.kusto"
         },
         {
-          "comment": "Scalar function: DateTime/Timespan Functions: https://docs.microsoft.com/en-us/azure/kusto/query/scalarfunctions#datetimetimespan-functions",
           "match": "\\b(ago|datetime_add|datetime_diff|datetime_local_to_utc|datetime_part|datetime_utc_to_local|dayofmonth|dayofweek|dayofyear|endofday|endofmonth|endofweek|endofyear|format_timespan|getmonth|getyear|hourofday|make_datetime|make_timespan|monthofyear|now|startofday|startofmonth|startofweek|startofyear|todatetime|totimespan|week_of_year)(?=\\W*\\()",
           "name": "support.function.kusto"
         }
@@ -614,7 +568,7 @@
     "Escapes": {
       "patterns": [
         {
-          "match": "(\\\\['\"]|\\\\\\\\)",
+          "match": "(\\\\['\"\\\\])",
           "name": "constant.character.escape.kusto"
         }
       ]
@@ -622,7 +576,7 @@
     "Numeric": {
       "patterns": [
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*+)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?(?=\\b|\\w)",
+          "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*+)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([Ll]|UL|ul|[uUFf]|ll|LL|ull|ULL)?(?=\\b|\\w)",
           "name": "constant.numeric.kusto"
         }
       ]
@@ -636,7 +590,6 @@
               "name": "punctuation.definition.string.kusto"
             }
           },
-          "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/string",
           "end": "\"",
           "endCaptures": {
             "0": {
@@ -657,7 +610,6 @@
               "name": "punctuation.definition.string.kusto"
             }
           },
-          "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/string",
           "end": "'",
           "endCaptures": {
             "0": {
@@ -678,7 +630,6 @@
               "name": "punctuation.definition.string.kusto"
             }
           },
-          "comment": "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/string#multi-line-string-literals",
           "end": "```",
           "endCaptures": {
             "0": {
@@ -697,8 +648,7 @@
     "TimeSpanLiterals": {
       "patterns": [
         {
-          "comment": "timespan literals: https://docs.microsoft.com/en-us/azure/kusto/query/scalar-data-types/timespan#timespan-literals",
-          "match": "[+-]?(?:\\d*\\.)?\\d+(?:microseconds?|ticks?|seconds?|ms|d|h|m|s)\\b",
+          "match": "[+-]?(?:\\d*\\.)?\\d+(?:microseconds?|ticks?|seconds?|ms|[dhms])\\b",
           "name": "constant.numeric.kusto"
         }
       ]
diff --git a/resources/languages/latex.json b/resources/languages/latex.json
index 6e798c8..c5b60fa 100644
--- a/resources/languages/latex.json
+++ b/resources/languages/latex.json
@@ -3,12 +3,11 @@
   "name": "latex",
   "patterns": [
     {
-      "comment": "This scope identifies partially typed commands such as `\\tab`. We use this to trigger “Command Completion” only when it makes sense.",
-      "match": "(?<=\\\\[\\w@]|\\\\[\\w@]{2}|\\\\[\\w@]{3}|\\\\[\\w@]{4}|\\\\[\\w@]{5}|\\\\[\\w@]{6})\\s",
+      "match": "(?<=\\\\(?:[\\w@]|[\\w@]{2}|[\\w@]{3}|[\\w@]{4}|[\\w@]{5}|[\\w@]{6}))\\s",
       "name": "meta.space-after-command.latex"
     },
     {
-      "begin": "((\\\\)(?:usepackage|documentclass))\\b(?=\\[|\\{)",
+      "begin": "((\\\\)(?:usepackage|documentclass))\\b(?=[\\[{])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.preamble.latex"
@@ -17,7 +16,7 @@
           "name": "punctuation.definition.function.latex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.end.latex"
@@ -29,14 +28,14 @@
           "include": "#multiline-optional-arg"
         },
         {
-          "begin": "((?:\\G|(?<=\\]))\\{)",
+          "begin": "((?:\\G|(?<=]))\\{)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "support.class.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -51,7 +50,7 @@
       ]
     },
     {
-      "begin": "((\\\\)(?:include|input))(\\{)",
+      "begin": "((\\\\)in(?:clude|put))(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.include.latex"
@@ -63,7 +62,7 @@
           "name": "punctuation.definition.arguments.begin.latex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.end.latex"
@@ -77,7 +76,7 @@
       ]
     },
     {
-      "begin": "((\\\\)((?:sub){0,2}section|(?:sub)?paragraph|chapter|part|addpart|addchap|addsec|minisec|frametitle)(?:\\*)?)((?:\\[[^\\[]*?\\]){0,2})(\\{)",
+      "begin": "((\\\\)((?:sub){0,2}section|(?:sub)?paragraph|chapter|part|addpart|addchap|addsec|minisec|frametitle)\\*?)((?:\\[[^\\[]*?]){0,2})(\\{)",
       "beginCaptures": {
         "1": {
           "name": "support.function.section.latex"
@@ -96,9 +95,8 @@
           "name": "punctuation.definition.arguments.begin.latex"
         }
       },
-      "comment": "this works OK with all kinds of crazy stuff as long as section is one line",
       "contentName": "entity.name.section.latex",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.end.latex"
@@ -115,7 +113,7 @@
       ]
     },
     {
-      "begin": "((?:\\s*)\\\\begin\\{songs\\}\\{.*\\})",
+      "begin": "(\\s*\\\\begin\\{songs}\\{.*})",
       "captures": {
         "1": {
           "patterns": [
@@ -126,30 +124,53 @@
         }
       },
       "contentName": "meta.data.environment.songs.latex",
-      "end": "(\\\\end\\{songs\\}(?:\\s*\\n)?)",
+      "end": "(\\\\end\\{songs}(?:\\s*\\n)?)",
       "name": "meta.function.environment.songs.latex",
       "patterns": [
         {
-          "begin": "\\\\\\[",
-          "end": "\\]",
-          "name": "meta.chord.block.latex support.class.chord.block.environment.latex",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          "include": "text.tex.latex#songs-chords"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*((\\\\)beginsong)(?=\\{)",
+      "captures": {
+        "1": {
+          "name": "support.function.be.latex"
         },
+        "2": {
+          "name": "punctuation.definition.function.latex"
+        },
+        "3": {
+          "name": "punctuation.definition.arguments.begin.latex"
+        },
+        "4": {
+          "name": "punctuation.definition.arguments.end.latex"
+        }
+      },
+      "end": "((\\\\)endsong)(?:\\s*\\n)?",
+      "name": "meta.function.environment.song.latex",
+      "patterns": [
         {
-          "match": "\\^",
-          "name": "meta.chord.block.latex support.class.chord.block.environment.latex"
+          "include": "#multiline-arg-no-highlight"
         },
         {
-          "include": "$self"
+          "include": "#multiline-optional-arg-no-highlight"
+        },
+        {
+          "begin": "(?:\\G|(?<=[\\]}]))\\s*",
+          "contentName": "meta.data.environment.song.latex",
+          "end": "\\s*(?=\\\\endsong)",
+          "patterns": [
+            {
+              "include": "text.tex.latex#songs-chords"
+            }
+          ]
         }
       ]
     },
     {
-      "begin": "(?:^\\s*)?\\\\begin\\{(lstlisting|minted|pyglist)\\}(?=\\[|\\{)",
+      "begin": "(?:^\\s*)?\\\\begin\\{(lstlisting|minted|pyglist)}(?=[\\[{])",
       "captures": {
         "0": {
           "patterns": [
@@ -159,13 +180,13 @@
           ]
         }
       },
-      "end": "\\\\end\\{\\1\\}",
+      "end": "\\\\end\\{\\1}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:asy|asymptote))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(asy(?:|mptote))(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -178,7 +199,7 @@
             }
           },
           "contentName": "source.asy",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.asy"
@@ -186,7 +207,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:bash))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(bash)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -199,7 +220,7 @@
             }
           },
           "contentName": "source.shell",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.shell"
@@ -207,7 +228,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:c|cpp))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(c(?:|pp))(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -220,7 +241,7 @@
             }
           },
           "contentName": "source.cpp.embedded.latex",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.cpp.embedded.latex"
@@ -228,7 +249,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:css))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(css)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -241,7 +262,7 @@
             }
           },
           "contentName": "source.css",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.css"
@@ -249,7 +270,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:gnuplot))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(gnuplot)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -262,7 +283,7 @@
             }
           },
           "contentName": "source.gnuplot",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.gnuplot"
@@ -270,7 +291,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:hs|haskell))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(h(?:s|askell))(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -283,7 +304,7 @@
             }
           },
           "contentName": "source.haskell",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.haskell"
@@ -291,7 +312,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:html))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(html)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -304,7 +325,7 @@
             }
           },
           "contentName": "text.html",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "text.html.basic"
@@ -312,7 +333,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:java))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(java)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -325,7 +346,7 @@
             }
           },
           "contentName": "source.java",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.java"
@@ -333,7 +354,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:jl|julia))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(j(?:l|ulia))(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -346,7 +367,7 @@
             }
           },
           "contentName": "source.julia",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.julia"
@@ -354,7 +375,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:js|javascript))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(j(?:s|avascript))(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -367,7 +388,7 @@
             }
           },
           "contentName": "source.js",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.js"
@@ -375,7 +396,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:lua))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(lua)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -388,7 +409,7 @@
             }
           },
           "contentName": "source.lua",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.lua"
@@ -396,7 +417,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:py|python|sage))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)((?:py|python|sage))(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -409,7 +430,7 @@
             }
           },
           "contentName": "source.python",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.python"
@@ -417,7 +438,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:rb|ruby))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(r(?:b|uby))(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -430,7 +451,7 @@
             }
           },
           "contentName": "source.ruby",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.ruby"
@@ -438,7 +459,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:rust))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(rust)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -451,7 +472,7 @@
             }
           },
           "contentName": "source.rust",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.rust"
@@ -459,7 +480,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:ts|typescript))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(t(?:s|ypescript))(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -472,7 +493,7 @@
             }
           },
           "contentName": "source.ts",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.ts"
@@ -480,7 +501,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:xml))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(xml)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -493,7 +514,7 @@
             }
           },
           "contentName": "text.xml",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "text.xml"
@@ -501,7 +522,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)((?:yaml))(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)(yaml)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -514,7 +535,7 @@
             }
           },
           "contentName": "source.yaml",
-          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:minted|lstlisting|pyglist)})",
           "patterns": [
             {
               "include": "source.yaml"
@@ -522,7 +543,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)([a-zA-Z]*)(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)([a-zA-Z]*)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -535,13 +556,13 @@
             }
           },
           "contentName": "meta.function.embedded.latex",
-          "end": "^\\s*(?=\\\\end\\{(?:lstlisting|minted|pyglist)\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:lstlisting|minted|pyglist)})",
           "name": "meta.embedded.block.generic.latex"
         }
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:asy|asycode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{asy(?:|code)\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -551,20 +572,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:asy|asycode)\\*?\\}",
+      "end": "\\s*\\\\end\\{asy(?:|code)\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -574,7 +595,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.asymptote",
-          "end": "^\\s*(?=\\\\end\\{(?:asy|asycode)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{asy(?:|code)\\*?})",
           "patterns": [
             {
               "include": "source.asymptote"
@@ -584,7 +605,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:cppcode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{cppcode\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -594,20 +615,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:cppcode)\\*?\\}",
+      "end": "\\s*\\\\end\\{cppcode\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -617,7 +638,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.cpp.embedded.latex",
-          "end": "^\\s*(?=\\\\end\\{(?:cppcode)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{cppcode\\*?})",
           "patterns": [
             {
               "include": "source.cpp.embedded.latex"
@@ -627,7 +648,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:dot2tex|dotcode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{dot(?:2tex|code)\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -637,20 +658,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:dot2tex|dotcode)\\*?\\}",
+      "end": "\\s*\\\\end\\{dot(?:2tex|code)\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -660,7 +681,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.dot",
-          "end": "^\\s*(?=\\\\end\\{(?:dot2tex|dotcode)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{dot(?:2tex|code)\\*?})",
           "patterns": [
             {
               "include": "source.dot"
@@ -670,7 +691,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:gnuplot)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{gnuplot\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -680,20 +701,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:gnuplot)\\*?\\}",
+      "end": "\\s*\\\\end\\{gnuplot\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -703,7 +724,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.gnuplot",
-          "end": "^\\s*(?=\\\\end\\{(?:gnuplot)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{gnuplot\\*?})",
           "patterns": [
             {
               "include": "source.gnuplot"
@@ -713,7 +734,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:hscode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{hscode\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -723,20 +744,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:hscode)\\*?\\}",
+      "end": "\\s*\\\\end\\{hscode\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -746,7 +767,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.haskell",
-          "end": "^\\s*(?=\\\\end\\{(?:hscode)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{hscode\\*?})",
           "patterns": [
             {
               "include": "source.haskell"
@@ -756,7 +777,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:jlcode|jlverbatim|jlblock|jlconcode|jlconsole|jlconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{java(?:code|verbatim|block|concode|console|converbatim)\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -766,20 +787,63 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:jlcode|jlverbatim|jlblock|jlconcode|jlconsole|jlconverbatim)\\*?\\}",
+      "end": "\\s*\\\\end\\{java(?:code|verbatim|block|concode|console|converbatim)\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.arguments.end.latex"
+            }
+          }
+        },
+        {
+          "begin": "^(?=\\s*)",
+          "contentName": "source.java",
+          "end": "^\\s*(?=\\\\end\\{java(?:code|verbatim|block|concode|console|converbatim)\\*?})",
+          "patterns": [
+            {
+              "include": "source.java"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "begin": "\\s*\\\\begin\\{jl(?:code|verbatim|block|concode|console|converbatim)\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
+      "captures": {
+        "0": {
+          "patterns": [
+            {
+              "include": "#begin-env-tokenizer"
+            }
+          ]
+        }
+      },
+      "end": "\\s*\\\\end\\{jl(?:code|verbatim|block|concode|console|converbatim)\\*?}",
+      "patterns": [
+        {
+          "include": "#multiline-optional-arg-no-highlight"
+        },
+        {
+          "begin": "(?:\\G|(?<=]))(\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.arguments.begin.latex"
+            }
+          },
+          "contentName": "variable.parameter.function.latex",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -789,7 +853,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.julia",
-          "end": "^\\s*(?=\\\\end\\{(?:jlcode|jlverbatim|jlblock|jlconcode|jlconsole|jlconverbatim)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{jl(?:code|verbatim|block|concode|console|converbatim)\\*?})",
           "patterns": [
             {
               "include": "source.julia"
@@ -799,7 +863,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:juliacode|juliaverbatim|juliablock|juliaconcode|juliaconsole|juliaconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{julia(?:code|verbatim|block|concode|console|converbatim)\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -809,20 +873,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:juliacode|juliaverbatim|juliablock|juliaconcode|juliaconsole|juliaconverbatim)\\*?\\}",
+      "end": "\\s*\\\\end\\{julia(?:code|verbatim|block|concode|console|converbatim)\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -832,7 +896,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.julia",
-          "end": "^\\s*(?=\\\\end\\{(?:juliacode|juliaverbatim|juliablock|juliaconcode|juliaconsole|juliaconverbatim)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{julia(?:code|verbatim|block|concode|console|converbatim)\\*?})",
           "patterns": [
             {
               "include": "source.julia"
@@ -842,7 +906,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:luacode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{luacode\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -852,20 +916,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:luacode)\\*?\\}",
+      "end": "\\s*\\\\end\\{luacode\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -875,7 +939,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.lua",
-          "end": "^\\s*(?=\\\\end\\{(?:luacode)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{luacode\\*?})",
           "patterns": [
             {
               "include": "source.lua"
@@ -885,7 +949,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:pycode|pyverbatim|pyblock|pyconcode|pyconsole|pyconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{py(?:code|verbatim|block|concode|console|converbatim)\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -895,20 +959,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:pycode|pyverbatim|pyblock|pyconcode|pyconsole|pyconverbatim)\\*?\\}",
+      "end": "\\s*\\\\end\\{py(?:code|verbatim|block|concode|console|converbatim)\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -918,7 +982,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.python",
-          "end": "^\\s*(?=\\\\end\\{(?:pycode|pyverbatim|pyblock|pyconcode|pyconsole|pyconverbatim)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{py(?:code|verbatim|block|concode|console|converbatim)\\*?})",
           "patterns": [
             {
               "include": "source.python"
@@ -928,7 +992,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:pylabcode|pylabverbatim|pylabblock|pylabconcode|pylabconsole|pylabconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{pylab(?:code|verbatim|block|concode|console|converbatim)\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -938,20 +1002,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:pylabcode|pylabverbatim|pylabblock|pylabconcode|pylabconsole|pylabconverbatim)\\*?\\}",
+      "end": "\\s*\\\\end\\{pylab(?:code|verbatim|block|concode|console|converbatim)\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -961,7 +1025,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.python",
-          "end": "^\\s*(?=\\\\end\\{(?:pylabcode|pylabverbatim|pylabblock|pylabconcode|pylabconsole|pylabconverbatim)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{pylab(?:code|verbatim|block|concode|console|converbatim)\\*?})",
           "patterns": [
             {
               "include": "source.python"
@@ -971,7 +1035,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{(?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -981,20 +1045,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?\\}",
+      "end": "\\s*\\\\end\\{(?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -1004,7 +1068,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.python",
-          "end": "^\\s*(?=\\\\end\\{(?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{(?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?})",
           "patterns": [
             {
               "include": "source.python"
@@ -1014,7 +1078,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:scalacode)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{scalacode\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -1024,20 +1088,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:scalacode)\\*?\\}",
+      "end": "\\s*\\\\end\\{scalacode\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -1047,7 +1111,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.scala",
-          "end": "^\\s*(?=\\\\end\\{(?:scalacode)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{scalacode\\*?})",
           "patterns": [
             {
               "include": "source.scala"
@@ -1057,7 +1121,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{(?:sympycode|sympyverbatim|sympyblock|sympyconcode|sympyconsole|sympyconverbatim)\\*?\\}(?:\\[[a-zA-Z0-9_-]*\\])?(?=\\[|\\{|\\s*$)",
+      "begin": "\\s*\\\\begin\\{sympy(?:code|verbatim|block|concode|console|converbatim)\\*?}(?:\\[[a-zA-Z0-9_-]*])?(?=[\\[{]|\\s*$)",
       "captures": {
         "0": {
           "patterns": [
@@ -1067,20 +1131,20 @@
           ]
         }
       },
-      "end": "\\s*\\\\end\\{(?:sympycode|sympyverbatim|sympyblock|sympyconcode|sympyconsole|sympyconverbatim)\\*?\\}",
+      "end": "\\s*\\\\end\\{sympy(?:code|verbatim|block|concode|console|converbatim)\\*?}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
           "contentName": "variable.parameter.function.latex",
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.latex"
@@ -1090,7 +1154,7 @@
         {
           "begin": "^(?=\\s*)",
           "contentName": "source.python",
-          "end": "^\\s*(?=\\\\end\\{(?:sympycode|sympyverbatim|sympyblock|sympyconcode|sympyconsole|sympyconverbatim)\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{sympy(?:code|verbatim|block|concode|console|converbatim)\\*?})",
           "patterns": [
             {
               "include": "source.python"
@@ -1100,7 +1164,7 @@
       ]
     },
     {
-      "begin": "\\s*\\\\begin\\{([a-zA-Z]*code|lstlisting|minted|pyglist)\\*?\\}(?:\\[.*\\])?(?:\\{.*\\})?",
+      "begin": "\\s*\\\\begin\\{((?:[a-zA-Z]*code|lstlisting|minted|pyglist)\\*?)}(?:\\[.*])?(?:\\{.*})?",
       "captures": {
         "0": {
           "patterns": [
@@ -1111,11 +1175,11 @@
         }
       },
       "contentName": "meta.function.embedded.latex",
-      "end": "\\\\end\\{\\1\\}(?:\\s*\\n)?",
+      "end": "\\\\end\\{\\1}(?:\\s*\\n)?",
       "name": "meta.embedded.block.generic.latex"
     },
     {
-      "begin": "((?:^\\s*)?\\\\begin\\{((?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?))\\})(?:\\[[^\\]]*\\]){,2}(?=\\{)",
+      "begin": "((?:^\\s*)?\\\\begin\\{((?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?))})(?:\\[[^\\]]*]){0,2}(?=\\{)",
       "captures": {
         "1": {
           "patterns": [
@@ -1125,20 +1189,20 @@
           ]
         }
       },
-      "end": "(\\\\end\\{\\2\\})",
+      "end": "(\\\\end\\{\\2})",
       "patterns": [
         {
-          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:asy|asymptote)",
+          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:asy(?:|mptote))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1156,7 +1220,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.asy",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.asy"
@@ -1172,11 +1236,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1194,7 +1258,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.shell",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.shell"
@@ -1204,17 +1268,17 @@
           ]
         },
         {
-          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:c|cpp)",
+          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:c(?:|pp))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1232,7 +1296,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.cpp.embedded.latex",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.cpp.embedded.latex"
@@ -1248,11 +1312,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1270,7 +1334,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.css",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.css"
@@ -1286,11 +1350,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1308,7 +1372,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.gnuplot",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.gnuplot"
@@ -1318,17 +1382,17 @@
           ]
         },
         {
-          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:hs|haskell)",
+          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:h(?:s|askell))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1346,7 +1410,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.haskell",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.haskell"
@@ -1362,11 +1426,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1384,7 +1448,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "text.html",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "text.html.basic"
@@ -1400,11 +1464,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1422,7 +1486,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.java",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.java"
@@ -1432,17 +1496,17 @@
           ]
         },
         {
-          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:jl|julia)",
+          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:j(?:l|ulia))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1460,7 +1524,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.julia",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.julia"
@@ -1470,17 +1534,17 @@
           ]
         },
         {
-          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:js|javascript)",
+          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:j(?:s|avascript))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1498,7 +1562,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.js",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.js"
@@ -1514,11 +1578,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1536,7 +1600,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.lua",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.lua"
@@ -1552,11 +1616,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1574,7 +1638,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.python",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.python"
@@ -1584,17 +1648,17 @@
           ]
         },
         {
-          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:rb|ruby)",
+          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:r(?:b|uby))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1612,7 +1676,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.ruby",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.ruby"
@@ -1628,11 +1692,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1650,7 +1714,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.rust",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.rust"
@@ -1660,17 +1724,17 @@
           ]
         },
         {
-          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:ts|typescript)",
+          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:t(?:s|ypescript))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1688,7 +1752,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.ts",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.ts"
@@ -1704,11 +1768,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1726,7 +1790,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "text.xml",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "text.xml"
@@ -1742,11 +1806,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1764,7 +1828,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "source.yaml",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "source.yaml"
@@ -1774,17 +1838,17 @@
           ]
         },
         {
-          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:tikz|tikzpicture)",
+          "begin": "\\G(\\{)(?:__|[a-z\\s]*)(?i:tikz(?:|picture))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1802,7 +1866,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "text.tex.latex",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "patterns": [
                 {
                   "include": "text.tex.latex"
@@ -1818,11 +1882,11 @@
               "name": "punctuation.definition.arguments.begin.latex"
             }
           },
-          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+          "end": "(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(\\})\\s*$",
+              "end": "(})\\s*$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.end.latex"
@@ -1840,7 +1904,7 @@
             {
               "begin": "^(\\s*)",
               "contentName": "meta.function.embedded.latex",
-              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)\\})",
+              "end": "^\\s*(?=\\\\end\\{(?:RobExt)?(?:CacheMeCode|PlaceholderPathFromCode\\*?|PlaceholderFromCode\\*?|SetPlaceholderCode\\*?)})",
               "name": "meta.embedded.block.generic.latex"
             }
           ]
@@ -1848,7 +1912,7 @@
       ]
     },
     {
-      "begin": "(?:^\\s*)?\\\\begin\\{(terminal\\*?)\\}(?=\\[|\\{)",
+      "begin": "(?:^\\s*)?\\\\begin\\{(terminal\\*?)}(?=[\\[{])",
       "captures": {
         "0": {
           "patterns": [
@@ -1858,13 +1922,13 @@
           ]
         }
       },
-      "end": "\\\\end\\{\\1\\}",
+      "end": "\\\\end\\{\\1}",
       "patterns": [
         {
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)([a-zA-Z]*)(\\})",
+          "begin": "(?:\\G|(?<=]))(\\{)([a-zA-Z]*)(})",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -1877,13 +1941,13 @@
             }
           },
           "contentName": "meta.function.embedded.latex",
-          "end": "^\\s*(?=\\\\end\\{terminal\\*?\\})",
+          "end": "^\\s*(?=\\\\end\\{terminal\\*?})",
           "name": "meta.embedded.block.generic.latex"
         }
       ]
     },
     {
-      "begin": "((\\\\)addplot)(?:\\+?)((?:\\[[^\\[]*\\]))*\\s*(gnuplot)\\s*((?:\\[[^\\[]*\\]))*\\s*(\\{)",
+      "begin": "((\\\\)addplot)\\+?(\\[[^\\[]*])*\\s*(gnuplot)\\s*(\\[[^\\[]*])*\\s*(\\{)",
       "captures": {
         "1": {
           "name": "support.function.be.latex"
@@ -1912,7 +1976,7 @@
           "name": "punctuation.definition.arguments.begin.latex"
         }
       },
-      "end": "\\s*(\\};)",
+      "end": "\\s*(};)",
       "patterns": [
         {
           "begin": "%",
@@ -1930,7 +1994,7 @@
       ]
     },
     {
-      "begin": "(\\s*\\\\begin\\{((?:fboxv|boxedv|V|v|spv)erbatim\\*?)\\})",
+      "begin": "(\\s*\\\\begin\\{((?:fboxv|boxedv|[Vv]|spv)erbatim\\*?)})",
       "captures": {
         "1": {
           "patterns": [
@@ -1941,11 +2005,11 @@
         }
       },
       "contentName": "markup.raw.verbatim.latex",
-      "end": "(\\\\end\\{\\2\\})",
+      "end": "(\\\\end\\{\\2})",
       "name": "meta.function.verbatim.latex"
     },
     {
-      "begin": "(\\s*\\\\begin\\{VerbatimOut\\}\\{[^\\}]*\\})",
+      "begin": "(\\s*\\\\begin\\{VerbatimOut}\\{[^}]*})",
       "captures": {
         "1": {
           "patterns": [
@@ -1956,11 +2020,11 @@
         }
       },
       "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": {
           "patterns": [
@@ -1971,7 +2035,7 @@
         }
       },
       "contentName": "markup.raw.verbatim.latex",
-      "end": "(\\\\end\\{alltt\\})",
+      "end": "(\\\\end\\{alltt})",
       "name": "meta.function.alltt.latex",
       "patterns": [
         {
@@ -1986,7 +2050,7 @@
       ]
     },
     {
-      "begin": "(\\s*\\\\begin\\{([Cc]omment)\\})",
+      "begin": "(\\s*\\\\begin\\{([Cc]omment)})",
       "captures": {
         "1": {
           "patterns": [
@@ -1997,18 +2061,17 @@
         }
       },
       "contentName": "comment.line.percentage.latex",
-      "end": "(\\\\end\\{\\2\\})",
+      "end": "(\\\\end\\{\\2})",
       "name": "meta.function.verbatim.latex"
     },
     {
-      "begin": "(?:\\s*)((\\\\)(?:href|hyperref|hyperimage))(?=\\[|\\{)",
+      "begin": "\\s*((\\\\)h(?:ref|yperref|yperimage))(?=[\\[{])",
       "beginCaptures": {
         "1": {
           "name": "support.function.url.latex"
         }
       },
-      "comment": "Captures \\command[option]{url}{optional category}{optional name}{text}",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.arguments.end.latex"
@@ -2020,7 +2083,7 @@
           "include": "#multiline-optional-arg-no-highlight"
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(\\{)([^}]*)(\\})(?:\\{[^}]*\\}){2}?(\\{)",
+          "begin": "(?:\\G|(?<=]))(\\{)([^}]*)(})(?:\\{[^}]*}){2}?(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -2036,7 +2099,7 @@
             }
           },
           "contentName": "meta.variable.parameter.function.latex",
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "$self"
@@ -2044,7 +2107,7 @@
           ]
         },
         {
-          "begin": "(?:\\G|(?<=\\]))(?:(\\{)[^}]*(\\}))?(\\{)",
+          "begin": "(?:\\G|(?<=]))(?:(\\{)[^}]*(}))?(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.latex"
@@ -2057,7 +2120,7 @@
             }
           },
           "contentName": "meta.variable.parameter.function.latex",
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "$self"
@@ -2084,7 +2147,7 @@
           "name": "punctuation.definition.arguments.end.latex"
         }
       },
-      "match": "(?:\\s*)((\\\\)url)(\\{)([^}]*)(\\})",
+      "match": "\\s*((\\\\)url)(\\{)([^}]*)(})",
       "name": "meta.function.link.url.latex"
     },
     {
@@ -2097,8 +2160,7 @@
           ]
         }
       },
-      "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\\})",
+      "match": "(\\s*\\\\begin\\{document})",
       "name": "meta.function.begin-document.latex"
     },
     {
@@ -2111,11 +2173,11 @@
           ]
         }
       },
-      "match": "(\\s*\\\\end\\{document\\})",
+      "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)?",
+      "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)?m(?:ini|axi))[*!]?)(})(\\s*\\n)?",
       "captures": {
         "1": {
           "name": "support.function.be.latex"
@@ -2134,7 +2196,7 @@
         }
       },
       "contentName": "meta.math.block.latex support.class.math.block.environment.latex",
-      "end": "(?:\\s*)((\\\\)end)(\\{)(\\4)(\\})(?:\\s*\\n)?",
+      "end": "\\s*((\\\\)end)(\\{)(\\4)(})(?:\\s*\\n)?",
       "name": "meta.function.environment.math.latex",
       "patterns": [
         {
@@ -2149,7 +2211,7 @@
           "include": "#definition-label"
         },
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -2157,7 +2219,7 @@
       ]
     },
     {
-      "begin": "(?:\\s*)(\\\\begin\\{empheq\\}(?:\\[.*\\])?)",
+      "begin": "\\s*(\\\\begin\\{empheq}(?:\\[.*])?)",
       "captures": {
         "1": {
           "patterns": [
@@ -2168,7 +2230,7 @@
         }
       },
       "contentName": "meta.math.block.latex support.class.math.block.environment.latex",
-      "end": "(?:\\s*)(\\\\end\\{empheq\\})",
+      "end": "\\s*(\\\\end\\{empheq})",
       "name": "meta.function.environment.math.latex",
       "patterns": [
         {
@@ -2183,7 +2245,7 @@
           "include": "#definition-label"
         },
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -2191,7 +2253,7 @@
       ]
     },
     {
-      "begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?|booktabs)\\}(\\s*\\n)?)",
+      "begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?|booktabs)}(\\s*\\n)?)",
       "captures": {
         "1": {
           "patterns": [
@@ -2202,7 +2264,7 @@
         }
       },
       "contentName": "meta.data.environment.tabular.latex",
-      "end": "(\\s*\\\\end\\{(\\2)\\}(?:\\s*\\n)?)",
+      "end": "(\\s*\\\\end\\{(\\2)}(?:\\s*\\n)?)",
       "name": "meta.function.environment.tabular.latex",
       "patterns": [
         {
@@ -2219,7 +2281,7 @@
       ]
     },
     {
-      "begin": "(\\s*\\\\begin\\{(itemize|enumerate|description|list)\\})",
+      "begin": "(\\s*\\\\begin\\{(itemize|enumerate|description|list)})",
       "captures": {
         "1": {
           "patterns": [
@@ -2229,7 +2291,7 @@
           ]
         }
       },
-      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)",
+      "end": "(\\\\end\\{\\2}(?:\\s*\\n)?)",
       "name": "meta.function.environment.list.latex",
       "patterns": [
         {
@@ -2238,7 +2300,7 @@
       ]
     },
     {
-      "begin": "(\\s*\\\\begin\\{tikzpicture\\})",
+      "begin": "(\\s*\\\\begin\\{tikzpicture})",
       "captures": {
         "1": {
           "patterns": [
@@ -2248,7 +2310,7 @@
           ]
         }
       },
-      "end": "(\\\\end\\{tikzpicture\\}(?:\\s*\\n)?)",
+      "end": "(\\\\end\\{tikzpicture}(?:\\s*\\n)?)",
       "name": "meta.function.environment.latex.tikz",
       "patterns": [
         {
@@ -2257,7 +2319,7 @@
       ]
     },
     {
-      "begin": "(\\s*\\\\begin\\{frame\\})",
+      "begin": "(\\s*\\\\begin\\{frame})",
       "captures": {
         "1": {
           "patterns": [
@@ -2267,7 +2329,7 @@
           ]
         }
       },
-      "end": "(\\\\end\\{frame\\})",
+      "end": "(\\\\end\\{frame})",
       "name": "meta.function.environment.frame.latex",
       "patterns": [
         {
@@ -2276,7 +2338,7 @@
       ]
     },
     {
-      "begin": "(\\s*\\\\begin\\{(mpost\\*?)\\})",
+      "begin": "(\\s*\\\\begin\\{(mpost\\*?)})",
       "captures": {
         "1": {
           "patterns": [
@@ -2286,11 +2348,11 @@
           ]
         }
       },
-      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)",
+      "end": "(\\\\end\\{\\2}(?:\\s*\\n)?)",
       "name": "meta.function.environment.latex.mpost"
     },
     {
-      "begin": "(\\s*\\\\begin\\{markdown\\})",
+      "begin": "(\\s*\\\\begin\\{markdown})",
       "captures": {
         "1": {
           "patterns": [
@@ -2301,7 +2363,7 @@
         }
       },
       "contentName": "meta.embedded.markdown_latex_combined",
-      "end": "(\\\\end\\{markdown\\})",
+      "end": "(\\\\end\\{markdown})",
       "patterns": [
         {
           "include": "text.tex.markdown_latex_combined"
@@ -2309,7 +2371,7 @@
       ]
     },
     {
-      "begin": "(\\s*\\\\begin\\{(\\w+\\*?)\\})",
+      "begin": "(\\s*\\\\begin\\{(\\p{Alphabetic}+\\*?)})",
       "captures": {
         "1": {
           "patterns": [
@@ -2319,7 +2381,7 @@
           ]
         }
       },
-      "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)",
+      "end": "(\\\\end\\{\\2}(?:\\s*\\n)?)",
       "name": "meta.function.environment.general.latex",
       "patterns": [
         {
@@ -2348,10 +2410,10 @@
           "name": "punctuation.definition.end.latex"
         }
       },
-      "match": "((\\\\)(?:newcommand|renewcommand|(?:re)?newrobustcmd|DeclareRobustCommand))\\*?({)((\\\\)[^}]*)(})"
+      "match": "((\\\\)(?:newcommand|renewcommand|(?:re)?newrobustcmd|DeclareRobustCommand))\\*?(\\{)((\\\\)[^}]*)(})"
     },
     {
-      "begin": "((\\\\)marginpar)((?:\\[[^\\[]*?\\])*)(\\{)",
+      "begin": "((\\\\)marginpar)((?:\\[[^\\[]*?])*)(\\{)",
       "beginCaptures": {
         "1": {
           "name": "support.function.marginpar.latex"
@@ -2371,7 +2433,7 @@
         }
       },
       "contentName": "meta.paragraph.margin.latex",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.marginpar.end.latex"
@@ -2387,7 +2449,7 @@
       ]
     },
     {
-      "begin": "((\\\\)footnote)((?:\\[[^\\[]*?\\])*)(\\{)",
+      "begin": "((\\\\)footnote)((?:\\[[^\\[]*?])*)(\\{)",
       "beginCaptures": {
         "1": {
           "name": "support.function.footnote.latex"
@@ -2407,7 +2469,7 @@
         }
       },
       "contentName": "entity.name.footnote.latex",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.footnote.end.latex"
@@ -2436,7 +2498,7 @@
         }
       },
       "contentName": "markup.italic.emph.latex",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.emph.end.latex"
@@ -2465,9 +2527,8 @@
           "name": "punctuation.definition.textit.begin.latex"
         }
       },
-      "comment": "We put the keyword in a capture and name this capture, so that disabling spell checking for “keyword” won't be inherited by the argument to \\textit{...}.\n\nPut specific matches for particular LaTeX keyword.functions before the last two more general functions",
       "contentName": "markup.italic.textit.latex",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.textit.end.latex"
@@ -2497,7 +2558,7 @@
         }
       },
       "contentName": "markup.bold.textbf.latex",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.textbf.end.latex"
@@ -2527,7 +2588,7 @@
         }
       },
       "contentName": "markup.raw.texttt.latex",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.texttt.end.latex"
@@ -2556,7 +2617,7 @@
       "name": "meta.scope.item.latex"
     },
     {
-      "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}\\p{Number}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
+      "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:[pst]|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^)]*\\)){0,2}(?:\\[[^\\]]*]){0,2}\\{[\\p{Alphabetic}\\p{N}_:.-]*})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*])*)(\\{)",
       "captures": {
         "1": {
           "name": "keyword.control.cite.latex"
@@ -2589,7 +2650,7 @@
           "name": "punctuation.definition.arguments.begin.latex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.end.latex"
@@ -2609,7 +2670,7 @@
           "match": "((%).*)$"
         },
         {
-          "match": "[\\p{Alphabetic}\\p{Number}:.-]+",
+          "match": "[\\p{Alphabetic}\\p{N}:.-]+",
           "name": "constant.other.reference.citation.latex"
         }
       ]
@@ -2627,7 +2688,7 @@
           "name": "punctuation.definition.arguments.begin.latex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.end.latex"
@@ -2636,13 +2697,13 @@
       "name": "meta.citation.latex",
       "patterns": [
         {
-          "match": "[\\p{Alphabetic}\\p{Number}:.]+",
+          "match": "[\\p{Alphabetic}\\p{N}:.]+",
           "name": "constant.other.reference.citation.latex"
         }
       ]
     },
     {
-      "begin": "((\\\\)(?:\\w*[rR]ef\\*?))(?:\\[[^\\]]*\\])?(\\{)",
+      "begin": "((\\\\)\\w*[rR]ef\\*?)(?:\\[[^\\]]*])?(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.ref.latex"
@@ -2654,7 +2715,7 @@
           "name": "punctuation.definition.arguments.begin.latex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.end.latex"
@@ -2663,7 +2724,7 @@
       "name": "meta.reference.label.latex",
       "patterns": [
         {
-          "match": "[\\p{Alphabetic}\\p{Number}\\.,:/*!^_-]",
+          "match": "[\\p{Alphabetic}\\p{N}.,:/*!^_-]",
           "name": "constant.other.reference.label.latex"
         }
       ]
@@ -2691,7 +2752,7 @@
         }
       },
       "contentName": "markup.raw.verb.latex",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.end.latex"
@@ -2765,7 +2826,7 @@
           "name": "punctuation.definition.verb.latex"
         }
       },
-      "match": "((\\\\)(?:mint|mintinline))((?:\\[[^\\[]*?\\])?)(\\{)[a-zA-Z]*(\\})(?:(?:([^a-zA-Z\\{])(.*?)(\\6))|(?:(\\{)(.*?)(\\})))",
+      "match": "((\\\\)mint(?:|inline))((?:\\[[^\\[]*?])?)(\\{)[a-zA-Z]*(})(?:([^a-zA-Z{])(.*?)(\\6)|(\\{)(.*?)(}))",
       "name": "meta.function.verb.latex"
     },
     {
@@ -2802,7 +2863,7 @@
           "name": "punctuation.definition.verb.latex"
         }
       },
-      "match": "((\\\\)[a-z]+inline)((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))",
+      "match": "((\\\\)[a-z]+inline)((?:\\[[^\\[]*?])?)(?:([^a-zA-Z{])(.*?)(\\4)|(\\{)(.*?)(}))",
       "name": "meta.function.verb.latex"
     },
     {
@@ -2849,7 +2910,7 @@
           "name": "punctuation.definition.verb.latex"
         }
       },
-      "match": "((\\\\)(?:(?:py|pycon|pylab|pylabcon|sympy|sympycon)[cv]?|pyq|pycq|pyif))((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))",
+      "match": "((\\\\)(?:(?:py|pycon|pylab|pylabcon|sympy|sympycon)[cv]?|pyq|pycq|pyif))((?:\\[[^\\[]*?])?)(?:([^a-zA-Z{])(.*?)(\\4)|(\\{)(.*?)(}))",
       "name": "meta.function.verb.latex"
     },
     {
@@ -2896,11 +2957,11 @@
           "name": "punctuation.definition.verb.latex"
         }
       },
-      "match": "((\\\\)(?:jl|julia)[cv]?)((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))",
+      "match": "((\\\\)j(?:l|ulia)[cv]?)((?:\\[[^\\[]*?])?)(?:([^a-zA-Z{])(.*?)(\\4)|(\\{)(.*?)(}))",
       "name": "meta.function.verb.latex"
     },
     {
-      "begin": "((\\\\)(?:directlua|luadirect))(\\{)",
+      "begin": "((\\\\)(?:directlua|luadirect|luaexec))(\\{)",
       "beginCaptures": {
         "1": {
           "name": "support.function.verb.latex"
@@ -2913,7 +2974,7 @@
         }
       },
       "contentName": "source.lua",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.end.latex"
@@ -2926,7 +2987,7 @@
       ]
     },
     {
-      "match": "\\\\(?:newline|pagebreak|clearpage|linebreak|pause)(?:\\b)",
+      "match": "\\\\(?:newline|pagebreak|clearpage|linebreak|pause)\\b",
       "name": "keyword.control.layout.latex"
     },
     {
@@ -2945,7 +3006,7 @@
       "name": "meta.math.block.latex support.class.math.block.environment.latex",
       "patterns": [
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -2972,7 +3033,7 @@
           "name": "constant.character.escape.latex"
         },
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -2999,7 +3060,7 @@
           "name": "constant.character.escape.latex"
         },
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -3013,7 +3074,7 @@
           "name": "punctuation.definition.string.begin.latex"
         }
       },
-      "end": "\\\\\\]",
+      "end": "\\\\]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.latex"
@@ -3022,7 +3083,7 @@
       "name": "meta.math.block.latex support.class.math.block.environment.latex",
       "patterns": [
         {
-          "include": "text.tex#math"
+          "include": "text.tex#math-content"
         },
         {
           "include": "$self"
@@ -3056,7 +3117,7 @@
           "name": "punctuation.definition.column-specials.end.latex"
         }
       },
-      "match": "(?:<|>)(\\{)\\$(\\})",
+      "match": "[<>](\\{)\\$(})",
       "name": "meta.column-specials.latex"
     },
     {
@@ -3099,7 +3160,7 @@
               ]
             }
           },
-          "match": "((?:\\([^\\)]*\\)){0,2})((?:\\[[^\\]]*\\]){0,2})(\\{)([\\p{Alphabetic}\\p{Number}_:.-]+)(\\})(.*)"
+          "match": "((?:\\([^)]*\\)){0,2})((?:\\[[^\\]]*]){0,2})(\\{)([\\p{Alphabetic}\\p{N}_:.-]+)(})(.*)"
         }
       ]
     },
@@ -3143,10 +3204,10 @@
           "name": "punctuation.definition.arguments.begin.latex"
         }
       },
-      "match": "\\s*((\\\\)(?:begin|end))(\\{)([a-zA-Z]*\\*?)(\\})(?:(\\[)([^\\]]*)(\\])){,2}(?:(\\{)([^{}]*)(\\}))?"
+      "match": "\\s*((\\\\)(?:begin|end))(\\{)(\\p{Alphabetic}+\\*?)(})(?:(\\[)([^\\]]*)(])){0,2}(?:(\\{)([^{}]*)(}))?"
     },
     "definition-label": {
-      "begin": "((\\\\)z?label)((?:\\[[^\\[]*?\\])*)(\\{)",
+      "begin": "((\\\\)z?label)((?:\\[[^\\[]*?])*)(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.label.latex"
@@ -3165,7 +3226,7 @@
           "name": "punctuation.definition.arguments.begin.latex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.end.latex"
@@ -3174,11 +3235,31 @@
       "name": "meta.definition.label.latex",
       "patterns": [
         {
-          "match": "[\\p{Alphabetic}\\p{Number}\\.,:/*!^_-]",
+          "match": "[\\p{Alphabetic}\\p{N}.,:/*!^_-]",
           "name": "variable.parameter.definition.label.latex"
         }
       ]
     },
+    "multiline-arg-no-highlight": {
+      "begin": "\\G\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.arguments.begin.latex"
+        }
+      },
+      "end": "}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.arguments.end.latex"
+        }
+      },
+      "name": "meta.parameter.latex",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ]
+    },
     "multiline-optional-arg": {
       "begin": "\\G\\[",
       "beginCaptures": {
@@ -3187,7 +3268,7 @@
         }
       },
       "contentName": "variable.parameter.function.latex",
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.optional.end.latex"
@@ -3201,13 +3282,13 @@
       ]
     },
     "multiline-optional-arg-no-highlight": {
-      "begin": "\\G\\[",
+      "begin": "(?:\\G|(?<=}))\\s*\\[",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.optional.begin.latex"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.optional.end.latex"
@@ -3250,7 +3331,7 @@
               "name": "punctuation.definition.arguments.optional.end.latex"
             }
           },
-          "match": "(\\[)([^\\[]*?)(\\])",
+          "match": "(\\[)([^\\[]*?)(])",
           "name": "meta.parameter.optional.latex"
         }
       ]
@@ -3266,7 +3347,7 @@
               "name": "punctuation.definition.arguments.optional.end.latex"
             }
           },
-          "match": "(\\[)[^\\[]*?(\\])",
+          "match": "(\\[)[^\\[]*?(])",
           "name": "meta.parameter.optional.latex"
         }
       ]
@@ -3285,7 +3366,7 @@
               "name": "punctuation.definition.arguments.optional.end.latex"
             }
           },
-          "match": "(\\()([^\\(]*?)(\\))",
+          "match": "(\\()([^(]*?)(\\))",
           "name": "meta.parameter.optional.latex"
         }
       ]
@@ -3301,10 +3382,31 @@
               "name": "punctuation.definition.arguments.optional.end.latex"
             }
           },
-          "match": "(\\()[^\\(]*?(\\))",
+          "match": "(\\()[^(]*?(\\))",
           "name": "meta.parameter.optional.latex"
         }
       ]
+    },
+    "songs-chords": {
+      "patterns": [
+        {
+          "begin": "\\\\\\[",
+          "end": "]",
+          "name": "meta.chord.block.latex support.class.chord.block.environment.latex",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        },
+        {
+          "match": "\\^",
+          "name": "meta.chord.block.latex support.class.chord.block.environment.latex"
+        },
+        {
+          "include": "$self"
+        }
+      ]
     }
   },
   "scopeName": "text.tex.latex"
diff --git a/resources/languages/lean.json b/resources/languages/lean.json
index 23b7d27..394f150 100644
--- a/resources/languages/lean.json
+++ b/resources/languages/lean.json
@@ -12,11 +12,11 @@
       "name": "storage.type.lean4"
     },
     {
-      "match": "\\battribute\\b\\s*\\[[^\\]]*\\]",
+      "match": "\\battribute\\b\\s*\\[[^\\]]*]",
       "name": "storage.modifier.lean4"
     },
     {
-      "match": "@\\[[^\\]]*\\]",
+      "match": "@\\[[^\\]]*]",
       "name": "storage.modifier.lean4"
     },
     {
@@ -36,13 +36,13 @@
       "name": "keyword.other.command.lean4"
     },
     {
-      "begin": "\\b(?<!\\.)(inductive|coinductive|structure|theorem|axiom|abbrev|lemma|def|instance|class|constant)\\b\\s+(\\{[^}]*\\})?",
+      "begin": "\\b(?<!\\.)(inductive|coinductive|structure|theorem|axiom|abbrev|lemma|def|instance|class|constant)\\b\\s+(\\{[^}]*})?",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.definitioncommand.lean4"
         }
       },
-      "end": "(?=\\bwith\\b|\\bextends\\b|\\bwhere\\b|[:\\|\\(\\[\\{⦃<>])",
+      "end": "(?=\\bwith\\b|\\bextends\\b|\\bwhere\\b|[:|(\\[{⦃<>])",
       "name": "meta.definitioncommand.lean4",
       "patterns": [
         {
@@ -82,7 +82,7 @@
               "name": "keyword.other.lean4"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "keyword.other.lean4"
@@ -99,11 +99,11 @@
           "name": "constant.character.escape.lean4"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f][0-9A-Fa-f]",
+          "match": "\\\\x\\h\\h",
           "name": "constant.character.escape.lean4"
         },
         {
-          "match": "\\\\u[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]",
+          "match": "\\\\u\\h\\h\\h\\h",
           "name": "constant.character.escape.lean4"
         }
       ]
@@ -118,11 +118,11 @@
           "name": "constant.character.escape.lean4"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f][0-9A-Fa-f]",
+          "match": "\\\\x\\h\\h",
           "name": "constant.character.escape.lean4"
         },
         {
-          "match": "\\\\u[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]",
+          "match": "\\\\u\\h\\h\\h\\h",
           "name": "constant.character.escape.lean4"
         }
       ]
@@ -141,7 +141,7 @@
           "name": "constant.character.escape.lean4"
         }
       },
-      "match": "'(\\\\(x[0-9A-Fa-f][0-9A-Fa-f]|u[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]|.))'",
+      "match": "'(\\\\(x\\h\\h|u\\h\\h\\h\\h|.))'",
       "name": "string.quoted.single.lean4"
     },
     {
@@ -149,7 +149,7 @@
       "name": "entity.name.lean4"
     },
     {
-      "match": "\\b([0-9]+|0([xX][0-9a-fA-F]+)|[-]?(0|[1-9][0-9]*)(\\.[0-9]+)?([eE][+-]?[0-9]+)?)\\b",
+      "match": "\\b([0-9]+|0([xX]\\h+)|-?(0|[1-9][0-9]*)(\\.[0-9]+)?([eE][+-]?[0-9]+)?)\\b",
       "name": "constant.numeric.lean4"
     }
   ],
@@ -199,7 +199,7 @@
     "definitionName": {
       "patterns": [
         {
-          "match": "\\b[^:«»\\(\\)\\{\\}[:space:]=→λ∀?][^:«»\\(\\)\\{\\}[:space:]]*",
+          "match": "\\b[^:«»(){}\\s=→λ∀?][^:«»(){}\\s]*",
           "name": "entity.name.function.lean4"
         },
         {
diff --git a/resources/languages/less.json b/resources/languages/less.json
index 86b11f5..4235418 100644
--- a/resources/languages/less.json
+++ b/resources/languages/less.json
@@ -31,7 +31,7 @@
           "name": "keyword.other.unit.less"
         }
       },
-      "match": "(?i:[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))(deg|grad|rad|turn))\\b",
+      "match": "(?i:[-+]?(?:\\d*\\.\\d+(?:[eE][-+]?\\d+)*|[-+]?\\d+)(deg|grad|rad|turn))\\b",
       "name": "constant.numeric.less"
     },
     "arbitrary-repetition": {
@@ -40,7 +40,7 @@
           "name": "punctuation.definition.arbitrary-repetition.less"
         }
       },
-      "match": "\\s*(?:(,))"
+      "match": "\\s*(,)"
     },
     "at-charset": {
       "begin": "\\s*((@)charset\\b)\\s*",
@@ -62,7 +62,7 @@
     },
     "at-container": {
       "begin": "(?=\\s*@container)",
-      "end": "\\s*(\\})",
+      "end": "\\s*(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.less"
@@ -118,7 +118,7 @@
                       "name": "support.constant.size-feature.less"
                     },
                     {
-                      "match": "((<|>)=?)|=|\\/",
+                      "match": "(([<>])=?)|[=/]",
                       "name": "keyword.operator.comparison.less"
                     },
                     {
@@ -133,7 +133,7 @@
                       "include": "#numeric-values"
                     },
                     {
-                      "match": "\\/",
+                      "match": "/",
                       "name": "keyword.operator.arithmetic.less"
                     },
                     {
@@ -151,7 +151,7 @@
                   "include": "#style-function"
                 },
                 {
-                  "match": "--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*",
+                  "match": "--|-?(?:[a-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))(?:[-\\da-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))*",
                   "name": "variable.parameter.container-name.css"
                 },
                 {
@@ -171,7 +171,7 @@
               "name": "punctuation.definition.block.begin.less"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "#rule-list-body"
@@ -184,7 +184,7 @@
       ]
     },
     "at-counter-style": {
-      "begin": "\\s*((@)counter-style\\b)\\s+(?:(?i:\\b(decimal|none)\\b)|(-?(?:[[_a-zA-Z][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*))\\s*(?=\\{|$)",
+      "begin": "\\s*((@)counter-style\\b)\\s+(?:(?i:\\b(decimal|none)\\b)|(-?(?:[_a-zA-Z[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*))\\s*(?=\\{|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.at-rule.counter-style.less"
@@ -199,7 +199,7 @@
           "name": "entity.other.counter-style-name.css"
         }
       },
-      "end": "\\s*(\\})",
+      "end": "\\s*(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.less"
@@ -257,7 +257,7 @@
           "name": "punctuation.definition.keyword.less"
         }
       },
-      "end": "\\s*(\\})",
+      "end": "\\s*(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.less"
@@ -283,7 +283,7 @@
           "name": "punctuation.definition.keyword.less"
         }
       },
-      "end": "\\;",
+      "end": ";",
       "endCaptures": {
         "0": {
           "name": "punctuation.terminator.rule.less"
@@ -299,7 +299,7 @@
         },
         {
           "begin": "(?<=([\"'])|([\"']\\)))\\s*",
-          "end": "\\s*(?=\\;)",
+          "end": "\\s*(?=;)",
           "patterns": [
             {
               "include": "#media-query"
@@ -348,7 +348,7 @@
           "name": "support.constant.keyframe.less"
         }
       },
-      "end": "\\s*(\\})",
+      "end": "\\s*(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.less"
@@ -362,7 +362,7 @@
               "name": "punctuation.definition.block.begin.less"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "captures": {
@@ -400,7 +400,7 @@
     },
     "at-media": {
       "begin": "(?=\\s*@media\\b)",
-      "end": "\\s*(\\})",
+      "end": "\\s*(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.less"
@@ -435,7 +435,7 @@
               "name": "punctuation.definition.block.begin.less"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "#rule-list-body"
@@ -457,7 +457,7 @@
           "name": "punctuation.definition.keyword.less"
         }
       },
-      "end": "\\;",
+      "end": ";",
       "endCaptures": {
         "0": {
           "name": "punctuation.terminator.rule.less"
@@ -472,7 +472,7 @@
           "include": "#literal-string"
         },
         {
-          "match": "(-?(?:[[_a-zA-Z][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)",
+          "match": "(-?(?:[_a-zA-Z[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)",
           "name": "entity.name.constant.namespace-prefix.less"
         }
       ]
@@ -545,7 +545,7 @@
     },
     "at-supports": {
       "begin": "(?=\\s*@supports\\b)",
-      "end": "(?=\\s*)(\\})",
+      "end": "(?=\\s*)(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.less"
@@ -583,7 +583,7 @@
               "name": "punctuation.section.property-list.begin.less"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "#rule-list-body"
@@ -656,12 +656,12 @@
               "include": "#literal-string"
             },
             {
-              "begin": "(-?(?:[[_a-zA-Z][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)",
+              "begin": "(-?(?:[_a-zA-Z[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)",
               "end": "(?=\\))",
               "name": "entity.other.attribute-name.less",
               "patterns": [
                 {
-                  "match": "\\b((?i:em|ex|ch|rem)|(?i:vw|vh|vmin|vmax)|(?i:cm|mm|q|in|pt|pc|px|fr)|(?i:deg|grad|rad|turn)|(?i:s|ms)|(?i:Hz|kHz)|(?i:dpi|dpcm|dppx))\\b",
+                  "match": "\\b((?i:em|ex|ch|rem)|(?i:v(?:[wh]|min|max))|(?i:cm|mm|q|in|pt|pc|px|fr)|(?i:deg|grad|rad|turn)|(?i:s|ms)|(?i:Hz|kHz)|(?i:dp(?:i|cm|px)))\\b",
                   "name": "keyword.other.unit.less"
                 },
                 {
@@ -799,7 +799,7 @@
       ]
     },
     "color-adjuster-operators": {
-      "match": "[\\-\\+*](?=\\s+)",
+      "match": "[-+*](?=\\s+)",
       "name": "keyword.operator.less"
     },
     "color-functions": {
@@ -811,7 +811,6 @@
               "name": "support.function.color.less"
             }
           },
-          "comment": "rgb(), rgba()",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -861,7 +860,6 @@
               "name": "support.function.color.less"
             }
           },
-          "comment": "hsla, hsl, hwb, oklab, oklch, lab, lch",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -920,7 +918,6 @@
               "name": "support.function.color.less"
             }
           },
-          "comment": "light-dark()",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -1068,7 +1065,7 @@
                   "include": "#var-function"
                 },
                 {
-                  "match": "(?:--(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))+|-?(?:[[_a-zA-Z][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)",
+                  "match": "(?:--(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))+|-?(?:[_a-zA-Z[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)",
                   "name": "entity.other.counter-name.less"
                 },
                 {
@@ -1079,7 +1076,7 @@
                       "include": "#comma-delimiter"
                     },
                     {
-                      "match": "\\b((?xi:arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|decimal-leading-zero|decimal|devanagari|disclosure-closed|disclosure-open|disc|ethiopic-numeric|georgian|gujarati|gurmukhi|hebrew|hiragana-iroha|hiragana|japanese-formal|japanese-informal|kannada|katakana-iroha|katakana|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman)|none)\\b",
+                      "match": "\\b((?i:arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|decimal-leading-zero|decimal|devanagari|disclosure-closed|disclosure-open|disc|ethiopic-numeric|georgian|gujarati|gurmukhi|hebrew|hiragana-iroha|hiragana|japanese-formal|japanese-informal|kannada|katakana-iroha|katakana|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman)|none)\\b",
                       "name": "support.constant.property-value.counter-style.less"
                     }
                   ]
@@ -1113,7 +1110,7 @@
               "end": "(?=\\))",
               "patterns": [
                 {
-                  "match": "(-?(?:[[_a-zA-Z][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)",
+                  "match": "(-?(?:[_a-zA-Z[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)",
                   "name": "entity.other.counter-name.less string.unquoted.less"
                 },
                 {
@@ -1136,7 +1133,7 @@
                       "include": "#comma-delimiter"
                     },
                     {
-                      "match": "\\b((?xi:arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|decimal-leading-zero|decimal|devanagari|disclosure-closed|disclosure-open|disc|ethiopic-numeric|georgian|gujarati|gurmukhi|hebrew|hiragana-iroha|hiragana|japanese-formal|japanese-informal|kannada|katakana-iroha|katakana|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman)|none)\\b",
+                      "match": "\\b((?i:arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|decimal-leading-zero|decimal|devanagari|disclosure-closed|disclosure-open|disc|ethiopic-numeric|georgian|gujarati|gurmukhi|hebrew|hiragana-iroha|hiragana|japanese-formal|japanese-informal|kannada|katakana-iroha|katakana|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman)|none)\\b",
                       "name": "support.constant.property-value.counter-style.less"
                     }
                   ]
@@ -1245,7 +1242,7 @@
           "name": "support.type.custom-property.name.less"
         }
       },
-      "match": "\\s*(--)((?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))+)",
+      "match": "\\s*(--)((?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))+)",
       "name": "support.type.custom-property.less"
     },
     "dimensions": {
@@ -1532,7 +1529,7 @@
           "name": "keyword.other.unit.less"
         }
       },
-      "match": "(?i:[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))(Hz|kHz))\\b",
+      "match": "(?i:[-+]?(?:\\d*\\.\\d+(?:[eE][-+]?\\d+)*|[-+]?\\d+)(Hz|kHz))\\b",
       "name": "constant.numeric.less"
     },
     "global-property-values": {
@@ -1697,11 +1694,11 @@
               "include": "#integer-type"
             },
             {
-              "match": "\\b(auto-(fill|fit))\\b",
+              "match": "\\b(auto-(fi(?:ll|t)))\\b",
               "name": "support.keyword.repetitions.less"
             },
             {
-              "match": "\\b(((max|min)-content)|auto)\\b",
+              "match": "\\b(((m(?:ax|in))-content)|auto)\\b",
               "name": "support.constant.property-value.less"
             }
           ]
@@ -1773,15 +1770,15 @@
           "name": "punctuation.separator.less"
         }
       },
-      "match": "(\\!)\\s*important",
+      "match": "(!)\\s*important",
       "name": "keyword.other.important.less"
     },
     "integer-type": {
-      "match": "(?:[-+]?\\d+)",
+      "match": "[-+]?\\d+",
       "name": "constant.numeric.less"
     },
     "keyframe-name": {
-      "begin": "\\s*(-?(?:[_a-z]|[^\\x{00}-\\x{7F}]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\s\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))(?:[_a-z0-9-]|[^\\x{00}-\\x{7F}]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))*)?",
+      "begin": "\\s*(-?(?:[_a-z[^\\x00-\\x7F]]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\s\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))(?:[_a-z0-9\\-[^\\x00-\\x7F]]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))*)?",
       "beginCaptures": {
         "1": {
           "name": "variable.other.constant.animation-name.less"
@@ -1802,11 +1799,11 @@
               "name": "keyword.other.unit.less"
             }
           },
-          "match": "(?:[-+]?)(?:\\d+\\.\\d+|\\.?\\d+)(?:[eE][-+]?\\d+)?(em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|m|q|in|pt|pc|px|fr|dpi|dpcm|dppx|x)",
+          "match": "[-+]?(?:\\d+\\.\\d+|\\.?\\d+)(?:[eE][-+]?\\d+)?(em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|[mq]|in|pt|pc|px|fr|dpi|dpcm|dppx|x)",
           "name": "constant.numeric.less"
         },
         {
-          "match": "\\b(?:[-+]?)0\\b",
+          "match": "\\b[-+]?0\\b",
           "name": "constant.numeric.less"
         }
       ]
@@ -1930,7 +1927,6 @@
               "name": "support.function.color-definition.less"
             }
           },
-          "comment": "argb()",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -1968,7 +1964,6 @@
               "name": "support.function.color.less"
             }
           },
-          "comment": "hsva(), hsv()",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -2482,7 +2477,7 @@
               "name": "keyword.operator.logical.less"
             }
           },
-          "match": "\\s*(=|((<|>)=?))\\s*"
+          "match": "\\s*(=|(([<>])=?))\\s*"
         },
         {
           "begin": "\\(",
@@ -2526,7 +2521,7 @@
     "less-math": {
       "patterns": [
         {
-          "match": "[-\\+\\*\\/]",
+          "match": "[-+*/]",
           "name": "keyword.operator.arithmetic.less"
         },
         {
@@ -2751,7 +2746,7 @@
                   "include": "#comma-delimiter"
                 },
                 {
-                  "match": "((c|m)?m|in|p(t|c|x)|m?s|g?rad|deg|turn|%|r?em|ex|ch)",
+                  "match": "(([cm])?m|in|p([tcx])|m?s|g?rad|deg|turn|%|r?em|ex|ch)",
                   "name": "keyword.other.unit.less"
                 }
               ]
@@ -2794,7 +2789,7 @@
                       "name": "punctuation.separator.less"
                     }
                   },
-                  "match": "\\s*(?:(,))"
+                  "match": "\\s*(,)"
                 }
               ]
             }
@@ -2995,7 +2990,7 @@
                   "name": "punctuation.section.property-list.begin.less"
                 }
               },
-              "end": "(?=\\})",
+              "end": "(?=})",
               "name": "meta.block.less",
               "patterns": [
                 {
@@ -3177,7 +3172,7 @@
     "less-strings": {
       "patterns": [
         {
-          "begin": "(~)('|\")",
+          "begin": "(~)(['\"])",
           "beginCaptures": {
             "1": {
               "name": "constant.character.escape.less"
@@ -3187,7 +3182,7 @@
             }
           },
           "contentName": "markup.raw.inline.less",
-          "end": "('|\")|(\\n)",
+          "end": "(['\"])|(\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.less"
@@ -3269,7 +3264,7 @@
                   "include": "#comma-delimiter"
                 },
                 {
-                  "match": "\\b((?i:em|ex|ch|rem)|(?i:vw|vh|vmin|vmax)|(?i:cm|mm|q|in|pt|pc|px|fr)|(?i:deg|grad|rad|turn)|(?i:s|ms)|(?i:Hz|kHz)|(?i:dpi|dpcm|dppx))\\b",
+                  "match": "\\b((?i:em|ex|ch|rem)|(?i:v(?:[wh]|min|max))|(?i:cm|mm|q|in|pt|pc|px|fr)|(?i:deg|grad|rad|turn)|(?i:s|ms)|(?i:Hz|kHz)|(?i:dp(?:i|cm|px)))\\b",
                   "name": "keyword.other.unit.less"
                 }
               ]
@@ -3312,7 +3307,7 @@
     "less-variable-assignment": {
       "patterns": [
         {
-          "begin": "(@)(-?(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)",
+          "begin": "(@)(-?(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)",
           "beginCaptures": {
             "0": {
               "name": "variable.other.readwrite.less"
@@ -3365,7 +3360,7 @@
     "less-variable-comparison": {
       "patterns": [
         {
-          "begin": "(@{1,2})([-]?([_a-z]|[^\\x{00}-\\x{7F}]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)",
+          "begin": "(@{1,2})(-?([_a-z[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)",
           "beginCaptures": {
             "0": {
               "name": "variable.other.readwrite.less"
@@ -3390,7 +3385,7 @@
                   "name": "keyword.operator.logical.less"
                 }
               },
-              "match": "\\s*(=|((<|>)=?))\\s*"
+              "match": "\\s*(=|(([<>])=?))\\s*"
             },
             {
               "match": "\\btrue\\b",
@@ -3428,7 +3423,7 @@
           "name": "punctuation.definition.expression.less"
         }
       },
-      "match": "(@)(\\{)([-\\w]+)(\\})",
+      "match": "(@)(\\{)([-\\w]+)(})",
       "name": "variable.other.readwrite.less"
     },
     "less-variables": {
@@ -3576,7 +3571,7 @@
           "name": "meta.group.less",
           "patterns": [
             {
-              "begin": "(--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*)\\s*(?=[:)])",
+              "begin": "(--|-?(?:[a-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))(?:[-\\da-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))*)\\s*(?=[:)])",
               "beginCaptures": {
                 "0": {
                   "name": "support.type.property-name.media.less"
@@ -3660,7 +3655,7 @@
               "include": "#comma-delimiter"
             },
             {
-              "match": "\\b(max-content|min-content)\\b",
+              "match": "\\b(m(?:ax-content|in-content))\\b",
               "name": "support.constant.property-value.less"
             }
           ]
@@ -3668,7 +3663,7 @@
       ]
     },
     "number-type": {
-      "match": "(?:[-+]?)(?:\\d+\\.\\d+|\\.?\\d+)(?:[eE][-+]?\\d+)?",
+      "match": "[-+]?(?:\\d+\\.\\d+|\\.?\\d+)(?:[eE][-+]?\\d+)?",
       "name": "constant.numeric.less"
     },
     "numeric-values": {
@@ -3690,14 +3685,14 @@
           "name": "keyword.other.unit.less"
         }
       },
-      "match": "(?:[-+]?)(?:\\d+\\.\\d+|\\.?\\d+)(?:[eE][-+]?\\d+)?(%)",
+      "match": "[-+]?(?:\\d+\\.\\d+|\\.?\\d+)(?:[eE][-+]?\\d+)?(%)",
       "name": "constant.numeric.less"
     },
     "property-list": {
       "patterns": [
         {
           "begin": "(?=(?=[^;]*)\\{)",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.end.less"
@@ -3714,12 +3709,10 @@
     "property-value-constants": {
       "patterns": [
         {
-          "comment": "align-content, align-items, align-self, justify-content, justify-items, justify-self",
           "match": "\\b(flex-start|flex-end|start|end|space-between|space-around|space-evenly|stretch|baseline|safe|unsafe|legacy|anchor-center|first|last|self-start|self-end)\\b",
           "name": "support.constant.property-value.less"
         },
         {
-          "comment": "alignment-baseline",
           "match": "\\b(text-before-edge|before-edge|middle|central|text-after-edge|after-edge|ideographic|alphabetic|hanging|mathematical|top|center|bottom)\\b",
           "name": "support.constant.property-value.less"
         },
@@ -3733,42 +3726,35 @@
           "include": "#steps-function"
         },
         {
-          "comment": "animation-composition",
           "match": "\\b(?:replace|add|accumulate)\\b",
           "name": "support.constant.property-value.less"
         },
         {
-          "comment": "animation-direction",
           "match": "\\b(?:normal|alternate-reverse|alternate|reverse)\\b",
           "name": "support.constant.property-value.less"
         },
         {
-          "comment": "animation-fill-mode",
           "match": "\\b(?:forwards|backwards|both)\\b",
           "name": "support.constant.property-value.less"
         },
         {
-          "comment": "animation-iteration-count",
-          "match": "\\b(?:infinite)\\b",
+          "match": "\\binfinite\\b",
           "name": "support.constant.property-value.less"
         },
         {
-          "comment": "animation-play-state",
           "match": "\\b(?:running|paused)\\b",
           "name": "support.constant.property-value.less"
         },
         {
-          "comment": "animation-range, animation-range-start, animation-range-end",
-          "match": "\\b(?:entry-crossing|exit-crossing|entry|exit)\\b",
+          "match": "\\be(?:ntry|xit)(?:-crossing|)\\b",
           "name": "support.constant.property-value.less"
         },
         {
-          "comment": "animation-timing-function",
           "match": "\\b(linear|ease-in-out|ease-in|ease-out|ease|step-start|step-end)\\b",
           "name": "support.constant.property-value.less"
         },
         {
-          "match": "\\b(absolute|active|add|all-petite-caps|all-small-caps|all-scroll|all|alphabetic|alpha|alternate-reverse|alternate|always|annotation|antialiased|at|autohiding-scrollbar|auto|avoid-column|avoid-page|avoid-region|avoid|background-color|background-image|background-position|background-size|background-repeat|background|backwards|balance|baseline|below|bevel|bicubic|bidi-override|blink|block-line-height|block-start|block-end|block|blur|bolder|bold|border-top-left-radius|border-top-right-radius|border-bottom-left-radius|border-bottom-right-radius|border-end-end-radius|border-end-start-radius|border-start-end-radius|border-start-start-radius|border-block-start-color|border-block-start-style|border-block-start-width|border-block-start|border-block-end-color|border-block-end-style|border-block-end-width|border-block-end|border-block-color|border-block-style|border-block-width|border-block|border-inline-start-color|border-inline-start-style|border-inline-start-width|border-inline-start|border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-end|border-inline-color|border-inline-style|border-inline-width|border-inline|border-top-color|border-top-style|border-top-width|border-top|border-right-color|border-right-style|border-right-width|border-right|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-left-color|border-left-style|border-left-width|border-left|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-image|border-color|border-style|border-width|border-radius|border-collapse|border-spacing|border|both|bottom|box-shadow|box|break-all|break-word|break-spaces|brightness|butt(on)?|capitalize|central|center|char(acter-variant)?|cjk-ideographic|clip|clone|close-quote|closest-corner|closest-side|col-resize|collapse|color-stop|color-burn|color-dodge|color|column-count|column-gap|column-reverse|column-rule-color|column-rule-width|column-rule|column-width|columns|column|common-ligatures|condensed|consider-shifts|contain|content-box|contents?|contextual|contrast|cover|crisp-edges|crispEdges|crop|crosshair|cross|darken|dashed|default|dense|device-width|diagonal-fractions|difference|disabled|discard|discretionary-ligatures|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|drop-shadow|[nsew]{1,4}-resize|ease-in-out|ease-in|ease-out|ease|element|ellipsis|embed|end|EndColorStr|evenodd|exclude-ruby|exclusion|expanded|extra-condensed|extra-expanded|farthest-corner|farthest-side|farthest|fill-box|fill-opacity|fill|filter|fit-content|fixed|flat|flex-basis|flex-end|flex-grow|flex-shrink|flex-start|flexbox|flex|flip|flood-color|font-size-adjust|font-size|font-stretch|font-weight|font|forwards|from-image|from|full-width|gap|geometricPrecision|glyphs|gradient|grayscale|grid-column-gap|grid-column|grid-row-gap|grid-row|grid-gap|grid-height|grid|groove|hand|hanging|hard-light|height|help|hidden|hide|historical-forms|historical-ligatures|horizontal-tb|horizontal|hue|ideographic|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|include-ruby|infinite|inherit|initial|inline-end|inline-size|inline-start|inline-table|inline-line-height|inline-flexbox|inline-flex|inline-box|inline-block|inline|inset|inside|inter-ideograph|inter-word|intersect|invert|isolate|isolation|italic|jis(04|78|83|90)|justify-all|justify|keep-all|larger|large|last|layout|left|letter-spacing|lighten|lighter|lighting-color|linear-gradient|linearRGB|linear|line-edge|line-height|line-through|line|lining-nums|list-item|local|loose|lowercase|lr-tb|ltr|luminosity|luminance|manual|manipulation|margin-bottom|margin-box|margin-left|margin-right|margin-top|margin|marker(-offset|s)?|match-parent|mathematical|max-(content|height|lines|size|width)|medium|middle|min-(content|height|width)|miter|mixed|move|multiply|newspaper|no-change|no-clip|no-close-quote|no-open-quote|no-common-ligatures|no-discretionary-ligatures|no-historical-ligatures|no-contextual|no-drop|no-repeat|none|nonzero|normal|not-allowed|nowrap|oblique|offset-after|offset-before|offset-end|offset-start|offset|oldstyle-nums|opacity|open-quote|optimize(Legibility|Precision|Quality|Speed)|order|ordinal|ornaments|outline-color|outline-offset|outline-width|outline|outset|outside|overline|over-edge|overlay|padding(-bottom|-box|-left|-right|-top|-box)?|page|paint(ed)?|paused|pan-(x|left|right|y|up|down)|perspective-origin|petite-caps|pixelated|pointer|pinch-zoom|pretty|pre(-line|-wrap)?|preserve-3d|preserve-breaks|preserve-spaces|preserve|progid:DXImageTransform\\.Microsoft\\.(Alpha|Blur|dropshadow|gradient|Shadow)|progress|proportional-nums|proportional-width|radial-gradient|recto|region|relative|repeating-linear-gradient|repeating-radial-gradient|repeat-x|repeat-y|repeat|replaced|reset-size|reverse|revert-layer|revert|ridge|right|round|row-gap|row-resize|row-reverse|row|rtl|ruby|running|saturate|saturation|screen|scrollbar|scroll-position|scroll|separate|sepia|scale-down|semi-condensed|semi-expanded|shape-image-threshold|shape-margin|shape-outside|show|sideways-lr|sideways-rl|sideways|simplified|size|slashed-zero|slice|small-caps|smaller|small|smooth|snap|solid|soft-light|space-around|space-between|space|span|sRGB|stable|stacked-fractions|stack|startColorStr|start|static|step-end|step-start|sticky|stop-color|stop-opacity|stretch|strict|stroke-box|stroke-dasharray|stroke-dashoffset|stroke-miterlimit|stroke-opacity|stroke-width|stroke|styleset|style|stylistic|subgrid|subpixel-antialiased|subtract|super|swash|table-caption|table-cell|table-column-group|table-footer-group|table-header-group|table-row-group|table-column|table-row|table|tabular-nums|tb-rl|text((-bottom|-(decoration|emphasis)-color|-indent|-(over|under)-edge|-shadow|-size(-adjust)?|-top)|field)?|thick|thin|titling-caps|titling-case|top|touch|to|traditional|transform-origin|transform-style|transform|ultra-condensed|ultra-expanded|under-edge|underline|unicase|unset|uppercase|upright|use-glyph-orientation|use-script|verso|vertical(-align|-ideographic|-lr|-rl|-text)?|view-box|viewport-fill-opacity|viewport-fill|visibility|visibleFill|visiblePainted|visibleStroke|visible|wait|wavy|weight|whitespace|width|word-spacing|wrap-reverse|wrap-reverse|wrap|xx?-(large|small)|z-index|zero|zoom-in|zoom-out|zoom|arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|decimal-leading-zero|decimal|devanagari|disclosure-closed|disclosure-open|disc|ethiopic-numeric|georgian|gujarati|gurmukhi|hebrew|hiragana-iroha|hiragana|japanese-formal|japanese-informal|kannada|katakana-iroha|katakana|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman)\\b",
+          "match": "\\b(absolute|active|add|all-petite-caps|all-small-caps|all-scroll|all|alphabetic|alpha|alternate-reverse|alternate|always|annotation|antialiased|at|autohiding-scrollbar|auto|avoid-column|avoid-page|avoid-region|avoid|background-color|background-image|background-position|background-size|background-repeat|background|backwards|balance|baseline|below|bevel|bicubic|bidi-override|blink|block-line-height|block-start|block-end|block|blur|bolder|bold|border-top-left-radius|border-top-right-radius|border-bottom-left-radius|border-bottom-right-radius|border-end-end-radius|border-end-start-radius|border-start-end-radius|border-start-start-radius|border-block-start-color|border-block-start-style|border-block-start-width|border-block-start|border-block-end-color|border-block-end-style|border-block-end-width|border-block-end|border-block-color|border-block-style|border-block-width|border-block|border-inline-start-color|border-inline-start-style|border-inline-start-width|border-inline-start|border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-end|border-inline-color|border-inline-style|border-inline-width|border-inline|border-top-color|border-top-style|border-top-width|border-top|border-right-color|border-right-style|border-right-width|border-right|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-left-color|border-left-style|border-left-width|border-left|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-image|border-color|border-style|border-width|border-radius|border-collapse|border-spacing|border|both|bottom|box-shadow|box|break-all|break-word|break-spaces|brightness|butt(on)?|capitalize|central|center|char(acter-variant)?|cjk-ideographic|clip|clone|close-quote|closest-corner|closest-side|col-resize|collapse|color-stop|color-burn|color-dodge|color|column-count|column-gap|column-reverse|column-rule-color|column-rule-width|column-rule|column-width|columns|column|common-ligatures|condensed|consider-shifts|contain|content-box|contents?|contextual|contrast|cover|crisp-edges|crispEdges|crop|crosshair|cross|darken|dashed|default|dense|device-width|diagonal-fractions|difference|disabled|discard|discretionary-ligatures|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|drop-shadow|[nsew]{1,4}-resize|ease-in-out|ease-in|ease-out|ease|element|ellipsis|embed|end|EndColorStr|evenodd|exclude-ruby|exclusion|expanded|extra-condensed|extra-expanded|farthest-corner|farthest-side|farthest|fill-box|fill-opacity|fill|filter|fit-content|fixed|flat|flex-basis|flex-end|flex-grow|flex-shrink|flex-start|flexbox|flex|flip|flood-color|font-size-adjust|font-size|font-stretch|font-weight|font|forwards|from-image|from|full-width|gap|geometricPrecision|glyphs|gradient|grayscale|grid-column-gap|grid-column|grid-row-gap|grid-row|grid-gap|grid-height|grid|groove|hand|hanging|hard-light|height|help|hidden|hide|historical-forms|historical-ligatures|horizontal-tb|horizontal|hue|ideographic|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|include-ruby|infinite|inherit|initial|inline-end|inline-size|inline-start|inline-table|inline-line-height|inline-flexbox|inline-flex|inline-box|inline-block|inline|inset|inside|inter-ideograph|inter-word|intersect|invert|isolate|isolation|italic|jis(04|78|83|90)|justify-all|justify|keep-all|larger|large|last|layout|left|letter-spacing|lighten|lighter|lighting-color|linear-gradient|linearRGB|linear|line-edge|line-height|line-through|line|lining-nums|list-item|local|loose|lowercase|lr-tb|ltr|luminosity|luminance|manual|manipulation|margin-bottom|margin-box|margin-left|margin-right|margin-top|margin|marker(-offset|s)?|match-parent|mathematical|max-(content|height|lines|size|width)|medium|middle|min-(content|height|width)|miter|mixed|move|multiply|newspaper|no-change|no-clip|no-close-quote|no-open-quote|no-common-ligatures|no-discretionary-ligatures|no-historical-ligatures|no-contextual|no-drop|no-repeat|none|nonzero|normal|not-allowed|nowrap|oblique|offset-after|offset-before|offset-end|offset-start|offset|oldstyle-nums|opacity|open-quote|optimize(Legibility|Precision|Quality|Speed)|order|ordinal|ornaments|outline-color|outline-offset|outline-width|outline|outset|outside|overline|over-edge|overlay|padding(-(?:bottom|box|left|right|top|box))?|page|paint(ed)?|paused|pan-(x|left|right|y|up|down)|perspective-origin|petite-caps|pixelated|pointer|pinch-zoom|pretty|pre(-(?:line|wrap))?|preserve-3d|preserve-breaks|preserve-spaces|preserve|progid:DXImageTransform\\.Microsoft\\.(Alpha|Blur|dropshadow|gradient|Shadow)|progress|proportional-nums|proportional-width|radial-gradient|recto|region|relative|repeating-linear-gradient|repeating-radial-gradient|repeat-x|repeat-y|repeat|replaced|reset-size|reverse|revert-layer|revert|ridge|right|round|row-gap|row-resize|row-reverse|row|rtl|ruby|running|saturate|saturation|screen|scrollbar|scroll-position|scroll|separate|sepia|scale-down|semi-condensed|semi-expanded|shape-image-threshold|shape-margin|shape-outside|show|sideways-lr|sideways-rl|sideways|simplified|size|slashed-zero|slice|small-caps|smaller|small|smooth|snap|solid|soft-light|space-around|space-between|space|span|sRGB|stable|stacked-fractions|stack|startColorStr|start|static|step-end|step-start|sticky|stop-color|stop-opacity|stretch|strict|stroke-box|stroke-dasharray|stroke-dashoffset|stroke-miterlimit|stroke-opacity|stroke-width|stroke|styleset|style|stylistic|subgrid|subpixel-antialiased|subtract|super|swash|table-caption|table-cell|table-column-group|table-footer-group|table-header-group|table-row-group|table-column|table-row|table|tabular-nums|tb-rl|text((-(?:bottom|(decoration|emphasis)-color|indent|(over|under)-edge|shadow|size(-adjust)?|top))|field)?|thick|thin|titling-caps|titling-case|top|touch|to|traditional|transform-origin|transform-style|transform|ultra-condensed|ultra-expanded|under-edge|underline|unicase|unset|uppercase|upright|use-glyph-orientation|use-script|verso|vertical(-(?:align|ideographic|lr|rl|text))?|view-box|viewport-fill-opacity|viewport-fill|visibility|visibleFill|visiblePainted|visibleStroke|visible|wait|wavy|weight|whitespace|width|word-spacing|wrap-reverse|wrap-reverse|wrap|xx?-(large|small)|z-index|zero|zoom-in|zoom-out|zoom|arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|decimal-leading-zero|decimal|devanagari|disclosure-closed|disclosure-open|disc|ethiopic-numeric|georgian|gujarati|gurmukhi|hebrew|hiragana-iroha|hiragana|japanese-formal|japanese-informal|kannada|katakana-iroha|katakana|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman)\\b",
           "name": "support.constant.property-value.less"
         },
         {
@@ -3970,7 +3956,7 @@
                       "name": "keyword.operator.arithmetic.less"
                     }
                   },
-                  "match": "(?:([-+])?(?:\\d+)?(n)(\\s*([-+])\\s*\\d+)?|[-+]?\\s*\\d+)",
+                  "match": "(?:([-+])?\\d+{0,1}(n)(\\s*([-+])\\s*\\d+)?|[-+]?\\s*\\d+)",
                   "name": "constant.numeric.less"
                 },
                 {
@@ -4036,7 +4022,6 @@
               "name": "punctuation.definition.entity.less"
             }
           },
-          "comment": "::highlight()",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -4055,7 +4040,7 @@
               "end": "(?=\\))",
               "patterns": [
                 {
-                  "match": "--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*",
+                  "match": "--|-?(?:[a-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))(?:[-\\da-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))*",
                   "name": "variable.parameter.less"
                 },
                 {
@@ -4072,7 +4057,6 @@
               "name": "punctuation.definition.entity.less"
             }
           },
-          "comment": "::slotted()",
           "contentName": "meta.function-call.less",
           "end": "\\)",
           "endCaptures": {
@@ -4105,7 +4089,6 @@
               "name": "punctuation.definition.entity.less"
             }
           },
-          "comment": "defined pseudo-elements",
           "match": "(::?)(after|backdrop|before|cue|file-selector-button|first-letter|first-line|grammar-error|marker|placeholder|selection|spelling-error|target-text|view-transition-group|view-transition-image-pair|view-transition-new|view-transition-old|view-transition)\\b",
           "name": "entity.other.attribute-name.pseudo-element.less"
         },
@@ -4118,8 +4101,7 @@
               "name": "meta.namespace.vendor-prefix.less"
             }
           },
-          "comment": "other possible pseudo-elements",
-          "match": "(::?)(-\\w+-)(--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*)\\b",
+          "match": "(::?)(-\\w+-)(--|-?(?:[a-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))(?:[-\\da-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))*)\\b",
           "name": "entity.other.attribute-name.pseudo-element.less"
         }
       ]
@@ -4136,7 +4118,7 @@
           "name": "punctuation.separator.namespace.less"
         }
       },
-      "match": "(?:(-?(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[_a-zA-Z][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)|(\\*))?([|])(?!=)"
+      "match": "(?:(-?(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[_a-zA-Z[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)|(\\*))?(\\|)(?!=)"
     },
     "regexp-function": {
       "begin": "\\b(regexp)(?=\\()",
@@ -4172,7 +4154,7 @@
           "name": "keyword.other.less"
         },
         {
-          "match": "\\b[hslawbch]\\b",
+          "match": "\\b[hslawbc]\\b",
           "name": "keyword.other.less"
         }
       ]
@@ -4186,7 +4168,7 @@
               "name": "punctuation.definition.block.begin.less"
             }
           },
-          "end": "(?=\\s*\\})",
+          "end": "(?=\\s*})",
           "name": "meta.property-list.less",
           "patterns": [
             {
@@ -4222,7 +4204,7 @@
           "include": "#less-variable-assignment"
         },
         {
-          "begin": "(?=[-\\w]*?@\\{.*\\}[-\\w]*?\\s*:[^;{(]*(?=[;})]))",
+          "begin": "(?=[-\\w]*?@\\{.*}[-\\w]*?\\s*:[^;{(]*(?=[;})]))",
           "end": "(?=\\s*(;)|(?=[})]))",
           "patterns": [
             {
@@ -4260,7 +4242,7 @@
               "include": "#custom-property-name"
             },
             {
-              "begin": "(-[\\w-]+?-)((?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*)\\b",
+              "begin": "(-[\\w-]+?-)((?:[a-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))(?:[-\\da-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))*)\\b",
               "beginCaptures": {
                 "0": {
                   "name": "support.type.property-name.less"
@@ -4269,7 +4251,6 @@
                   "name": "meta.namespace.vendor-prefix.less"
                 }
               },
-              "comment": "vendor-prefixed properties",
               "end": "\\s*(;)|(?=[})])",
               "endCaptures": {
                 "1": {
@@ -4308,7 +4289,6 @@
                   "name": "support.type.property-name.less"
                 }
               },
-              "comment": "border-radius and border-image properties utilize a slash as a separator",
               "end": "\\s*(;)|(?=[})])",
               "endCaptures": {
                 "1": {
@@ -4345,7 +4325,7 @@
                   "name": "support.type.custom-property.name.less"
                 }
               },
-              "match": "\\b(var-)(-?(?:[[-\\w][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[_a-zA-Z][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)(?=\\s)",
+              "match": "\\b(var-)(-?(?:[-\\w[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[_a-zA-Z[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)(?=\\s)",
               "name": "invalid.deprecated.custom-property.less"
             },
             {
@@ -4378,7 +4358,7 @@
                   "include": "#property-values"
                 },
                 {
-                  "match": "-?(?:[[_a-zA-Z][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*(\\s+-?(?:[[_a-zA-Z][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)*",
+                  "match": "-?(?:[_a-zA-Z[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*(\\s+-?(?:[_a-zA-Z[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)*",
                   "name": "string.unquoted.less"
                 },
                 {
@@ -4482,7 +4462,7 @@
                       "include": "#property-value-constants"
                     },
                     {
-                      "match": "-?(?:[_a-zA-Z]|[^\\x{00}-\\x{7F}]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\s\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))(?:[-_a-zA-Z0-9]|[^\\x{00}-\\x{7F}]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))*",
+                      "match": "-?(?:[_a-zA-Z[^\\x00-\\x7F]]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\s\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))(?:[-_a-zA-Z0-9[^\\x00-\\x7F]]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))*",
                       "name": "variable.other.constant.animation-name.less string.unquoted.less"
                     },
                     {
@@ -4607,7 +4587,7 @@
                   "name": "invalid.illegal.property-value.less"
                 },
                 {
-                  "match": "-?(?:[[-\\w][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[_a-zA-Z][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*",
+                  "match": "-?(?:[-\\w[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[_a-zA-Z[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*",
                   "name": "support.constant.property-value.less"
                 },
                 {
@@ -4642,7 +4622,7 @@
                   "match": "(((\\+_?)?):)([\\s\\t]*)"
                 },
                 {
-                  "match": "-?(?:[[-\\w][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[_a-zA-Z][^\\x{00}-\\x{9f}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*",
+                  "match": "-?(?:[-\\w[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[_a-zA-Z[^\\x00-\\x{9F}]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*",
                   "name": "entity.name.constant.counter-name.less"
                 },
                 {
@@ -4686,7 +4666,7 @@
                     },
                     {
                       "contentName": "variable.other.constant.container-name.less",
-                      "match": "--|(?:-?(?:(?:[a-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R]))))(?:(?:[-\\da-zA-Z_]|[\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}\\x{200D}\\x{203F}\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}])|(?:\\\\(?:\\N|[[:^xdigit:]]|[[:xdigit:]]{1,6}[\\s\\R])))*",
+                      "match": "--|-?(?:[a-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))(?:[-\\da-zA-Z_·À-ÖØ-öø-ͽͿ-῿‌‍‿⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}]|\\\\(?:\\N|\\H|\\h{1,6}[\\sR]))*",
                       "name": "support.constant.property-value.less"
                     },
                     {
@@ -4697,7 +4677,7 @@
               ]
             },
             {
-              "match": "\\b(accent-height|align-content|align-items|align-self|alignment-baseline|all|animation-timing-function|animation-range-start|animation-range-end|animation-range|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation-composition|animation|appearance|ascent|aspect-ratio|azimuth|backface-visibility|background-size|background-repeat-y|background-repeat-x|background-repeat|background-position-y|background-position-x|background-position|background-origin|background-image|background-color|background-clip|background-blend-mode|background-attachment|background|baseline-shift|begin|bias|blend-mode|border-top-left-radius|border-top-right-radius|border-bottom-left-radius|border-bottom-right-radius|border-end-end-radius|border-end-start-radius|border-start-end-radius|border-start-start-radius|border-block-start-color|border-block-start-style|border-block-start-width|border-block-start|border-block-end-color|border-block-end-style|border-block-end-width|border-block-end|border-block-color|border-block-style|border-block-width|border-block|border-inline-start-color|border-inline-start-style|border-inline-start-width|border-inline-start|border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-end|border-inline-color|border-inline-style|border-inline-width|border-inline|border-top-color|border-top-style|border-top-width|border-top|border-right-color|border-right-style|border-right-width|border-right|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-left-color|border-left-style|border-left-width|border-left|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-image|border-color|border-style|border-width|border-radius|border-collapse|border-spacing|border|bottom|box-(align|decoration-break|direction|flex|ordinal-group|orient|pack|shadow|sizing)|break-(after|before|inside)|caption-side|clear|clip-path|clip-rule|clip|color(-(interpolation(-filters)?|profile|rendering))?|columns|column-(break-before|count|fill|gap|(rule(-(color|style|width))?)|span|width)|container-name|container-type|container|contain-intrinsic-block-size|contain-intrinsic-inline-size|contain-intrinsic-height|contain-intrinsic-size|contain-intrinsic-width|contain|content|counter-(increment|reset)|cursor|[cdf][xy]|direction|display|divisor|dominant-baseline|dur|elevation|empty-cells|enable-background|end|fallback|fill(-(opacity|rule))?|filter|flex(-(align|basis|direction|flow|grow|item-align|line-pack|negative|order|pack|positive|preferred-size|shrink|wrap))?|float|flood-(color|opacity)|font-display|font-family|font-feature-settings|font-kerning|font-language-override|font-size(-adjust)?|font-smoothing|font-stretch|font-style|font-synthesis|font-variant(-(alternates|caps|east-asian|ligatures|numeric|position))?|font-weight|font|fr|((column|row)-)?gap|glyph-orientation-(horizontal|vertical)|grid-(area|gap)|grid-auto-(columns|flow|rows)|grid-(column|row)(-(end|gap|start))?|grid-template(-(areas|columns|rows))?|grid|height|hyphens|image-(orientation|rendering|resolution)|inset(-(block|inline))?(-(start|end))?|isolation|justify-content|justify-items|justify-self|kerning|left|letter-spacing|lighting-color|line-(box-contain|break|clamp|height)|list-style(-(image|position|type))?|(margin|padding)(-(bottom|left|right|top)|(-(block|inline)?(-(end|start))?))?|marker(-(end|mid|start))?|mask(-(clip||composite|image|origin|position|repeat|size|type))?|(max|min)-(height|width)|mix-blend-mode|nbsp-mode|negative|object-(fit|position)|opacity|operator|order|orphans|outline(-(color|offset|style|width))?|overflow(-((inline|block)|scrolling|wrap|x|y))?|overscroll-behavior(-block|-(inline|x|y))?|pad(ding(-(bottom|left|right|top))?)?|page(-break-(after|before|inside))?|paint-order|pause(-(after|before))?|perspective(-origin(-(x|y))?)?|pitch(-range)?|place-content|place-self|pointer-events|position|prefix|quotes|range|resize|right|rotate|scale|scroll-behavior|shape-(image-threshold|margin|outside|rendering)|size|speak(-as)?|src|stop-(color|opacity)|stroke(-(dash(array|offset)|line(cap|join)|miterlimit|opacity|width))?|suffix|symbols|system|tab-size|table-layout|tap-highlight-color|text-align(-last)?|text-decoration(-(color|line|style))?|text-emphasis(-(color|position|style))?|text-(anchor|fill-color|height|indent|justify|orientation|overflow|rendering|size-adjust|shadow|transform|underline-position|wrap)|top|touch-action|transform(-origin(-(x|y))?)|transform(-style)?|transition(-(delay|duration|property|timing-function))?|translate|unicode-(bidi|range)|user-(drag|select)|vertical-align|visibility|white-space(-collapse)?|widows|width|will-change|word-(break|spacing|wrap)|writing-mode|z-index|zoom)\\b",
+              "match": "\\b(accent-height|align-content|align-items|align-self|alignment-baseline|all|animation-timing-function|animation-range-start|animation-range-end|animation-range|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation-composition|animation|appearance|ascent|aspect-ratio|azimuth|backface-visibility|background-size|background-repeat-y|background-repeat-x|background-repeat|background-position-y|background-position-x|background-position|background-origin|background-image|background-color|background-clip|background-blend-mode|background-attachment|background|baseline-shift|begin|bias|blend-mode|border-top-left-radius|border-top-right-radius|border-bottom-left-radius|border-bottom-right-radius|border-end-end-radius|border-end-start-radius|border-start-end-radius|border-start-start-radius|border-block-start-color|border-block-start-style|border-block-start-width|border-block-start|border-block-end-color|border-block-end-style|border-block-end-width|border-block-end|border-block-color|border-block-style|border-block-width|border-block|border-inline-start-color|border-inline-start-style|border-inline-start-width|border-inline-start|border-inline-end-color|border-inline-end-style|border-inline-end-width|border-inline-end|border-inline-color|border-inline-style|border-inline-width|border-inline|border-top-color|border-top-style|border-top-width|border-top|border-right-color|border-right-style|border-right-width|border-right|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-left-color|border-left-style|border-left-width|border-left|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-image|border-color|border-style|border-width|border-radius|border-collapse|border-spacing|border|bottom|box-(align|decoration-break|direction|flex|ordinal-group|orient|pack|shadow|sizing)|break-(after|before|inside)|caption-side|clear|clip-path|clip-rule|clip|color(-(interpolation(-filters)?|profile|rendering))?|columns|column-(break-before|count|fill|gap|(rule(-(color|style|width))?)|span|width)|container-name|container-type|container|contain-intrinsic-block-size|contain-intrinsic-inline-size|contain-intrinsic-height|contain-intrinsic-size|contain-intrinsic-width|contain|content|counter-(increment|reset)|cursor|[cdf][xy]|direction|display|divisor|dominant-baseline|dur|elevation|empty-cells|enable-background|end|fallback|fill(-(opacity|rule))?|filter|flex(-(align|basis|direction|flow|grow|item-align|line-pack|negative|order|pack|positive|preferred-size|shrink|wrap))?|float|flood-(color|opacity)|font-display|font-family|font-feature-settings|font-kerning|font-language-override|font-size(-adjust)?|font-smoothing|font-stretch|font-style|font-synthesis|font-variant(-(alternates|caps|east-asian|ligatures|numeric|position))?|font-weight|font|fr|((column|row)-)?gap|glyph-orientation-(horizontal|vertical)|grid-(area|gap)|grid-auto-(columns|flow|rows)|grid-(column|row)(-(end|gap|start))?|grid-template(-(areas|columns|rows))?|grid|height|hyphens|image-(orientation|rendering|resolution)|inset(-(block|inline))?(-(start|end))?|isolation|justify-content|justify-items|justify-self|kerning|left|letter-spacing|lighting-color|line-(box-contain|break|clamp|height)|list-style(-(image|position|type))?|(margin|padding)(-(bottom|left|right|top)|(-(block|inline)?(-(end|start))?))?|marker(-(end|mid|start))?|mask(-(clip||composite|image|origin|position|repeat|size|type))?|(m(?:ax|in))-(height|width)|mix-blend-mode|nbsp-mode|negative|object-(fit|position)|opacity|operator|order|orphans|outline(-(color|offset|style|width))?|overflow(-((inline|block)|scrolling|wrap|[xy]))?|overscroll-behavior(-(?:block|(inline|[xy])))?|pad(ding(-(bottom|left|right|top))?)?|page(-break-(after|before|inside))?|paint-order|pause(-(after|before))?|perspective(-origin(-([xy]))?)?|pitch(-range)?|place-content|place-self|pointer-events|position|prefix|quotes|range|resize|right|rotate|scale|scroll-behavior|shape-(image-threshold|margin|outside|rendering)|size|speak(-as)?|src|stop-(color|opacity)|stroke(-(dash(array|offset)|line(cap|join)|miterlimit|opacity|width))?|suffix|symbols|system|tab-size|table-layout|tap-highlight-color|text-align(-last)?|text-decoration(-(color|line|style))?|text-emphasis(-(color|position|style))?|text-(anchor|fill-color|height|indent|justify|orientation|overflow|rendering|size-adjust|shadow|transform|underline-position|wrap)|top|touch-action|transform(-origin(-([xy]))?)|transform(-style)?|transition(-(delay|duration|property|timing-function))?|translate|unicode-(bidi|range)|user-(drag|select)|vertical-align|visibility|white-space(-collapse)?|widows|width|will-change|word-(break|spacing|wrap)|writing-mode|z-index|zoom)\\b",
               "name": "support.type.property-name.less"
             },
             {
@@ -4710,7 +4690,7 @@
           ]
         },
         {
-          "begin": "\\b((?:(?:\\+_?)?):)([\\s\\t]*)",
+          "begin": "\\b((?:\\+_?)?:)([\\s\\t]*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.key-value.less"
@@ -4768,7 +4748,7 @@
           "name": "support.constant.scroller.less"
         },
         {
-          "match": "block|inline|x|y",
+          "match": "block|inline|[xy]",
           "name": "support.constant.axis.less"
         },
         {
@@ -4782,7 +4762,7 @@
     "selector": {
       "patterns": [
         {
-          "begin": "(?=[>~+/\\.*#a-zA-Z\\[&]|(\\:{1,2}[^\\s])|@\\{)",
+          "begin": "(?=[>~+/.*#a-zA-Z\\[\\&]|(:{1,2}\\S)|@\\{)",
           "contentName": "meta.selector.less",
           "end": "(?=@(?!\\{)|[{;])",
           "patterns": [
@@ -4808,7 +4788,7 @@
     "selectors": {
       "patterns": [
         {
-          "match": "\\b([a-z](?:(?:[-_a-z0-9\\x{00B7}]|\\\\\\.|[[\\x{00C0}-\\x{00D6}][\\x{00D8}-\\x{00F6}][\\x{00F8}-\\x{02FF}][\\x{0300}-\\x{037D}][\\x{037F}-\\x{1FFF}][\\x{200C}-\\x{200D}][\\x{203F}-\\x{2040}][\\x{2070}-\\x{218F}][\\x{2C00}-\\x{2FEF}][\\x{3001}-\\x{D7FF}][\\x{F900}-\\x{FDCF}][\\x{FDF0}-\\x{FFFD}][\\x{10000}-\\x{EFFFF}]]))*-(?:(?:[-_a-z0-9\\x{00B7}]|\\\\\\.|[[\\x{00C0}-\\x{00D6}][\\x{00D8}-\\x{00F6}][\\x{00F8}-\\x{02FF}][\\x{0300}-\\x{037D}][\\x{037F}-\\x{1FFF}][\\x{200C}-\\x{200D}][\\x{203F}-\\x{2040}][\\x{2070}-\\x{218F}][\\x{2C00}-\\x{2FEF}][\\x{3001}-\\x{D7FF}][\\x{F900}-\\x{FDCF}][\\x{FDF0}-\\x{FFFD}][\\x{10000}-\\x{EFFFF}]]))*)\\b",
+          "match": "\\b([a-z](?:[-_a-z0-9·]|\\\\\\.|[À-ÖØ-öø-˿̀-ͽͿ-῿‌-‍‿-⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}])*-(?:[-_a-z0-9·]|\\\\\\.|[À-ÖØ-öø-˿̀-ͽͿ-῿‌-‍‿-⁀⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�𐀀-\\x{EFFFF}])*)\\b",
           "name": "entity.name.tag.custom.less"
         },
         {
@@ -4822,7 +4802,7 @@
               "name": "punctuation.definition.entity.less"
             }
           },
-          "end": "(?![-\\w]|[^\\x{00}-\\x{9f}]|\\\\([A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9])|(\\@(?=\\{)))",
+          "end": "(?![-\\w[^\\x00-\\x{9F}]]|\\\\(\\h{1,6} ?|\\H)|(@(?=\\{)))",
           "name": "entity.other.attribute-name.class.less",
           "patterns": [
             {
@@ -4837,7 +4817,7 @@
               "name": "punctuation.definition.entity.less"
             }
           },
-          "end": "(?![-\\w]|[^\\x{00}-\\x{9f}]|\\\\([A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9])|(\\@(?=\\{)))",
+          "end": "(?![-\\w[^\\x00-\\x{9F}]]|\\\\(\\h{1,6} ?|\\H)|(@(?=\\{)))",
           "name": "entity.other.attribute-name.id.less",
           "patterns": [
             {
@@ -4853,7 +4833,7 @@
             }
           },
           "contentName": "entity.other.attribute-name.parent.less",
-          "end": "(?![-\\w]|[^\\x{00}-\\x{9f}]|\\\\([A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9])|(\\@(?=\\{)))",
+          "end": "(?![-\\w[^\\x00-\\x{9F}]]|\\\\(\\h{1,6} ?|\\H)|(@(?=\\{)))",
           "name": "entity.other.attribute-name.parent.less",
           "patterns": [
             {
@@ -4879,7 +4859,7 @@
           "name": "invalid.illegal.combinator.less"
         },
         {
-          "match": "\\/deep\\/",
+          "match": "/deep/",
           "name": "invalid.illegal.combinator.less"
         },
         {
@@ -4889,7 +4869,7 @@
               "name": "punctuation.section.braces.begin.less"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.braces.end.less"
@@ -4904,7 +4884,7 @@
               "include": "#qualified-name"
             },
             {
-              "match": "(-?(?:[[_a-zA-Z][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))(?:[[-\\w][^\\x{00}-\\x{7F}]]|(?:\\\\\\h{1,6}[\\s\\t\\n\\f]?|\\\\[^\\n\\f\\h]))*)",
+              "match": "(-?(?:[_a-zA-Z[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))(?:[-\\w[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}[\\s\\t\\n\\f]?|[^\\n\\f\\h]))*)",
               "name": "entity.other.attribute-name.less"
             },
             {
@@ -4914,7 +4894,7 @@
                   "name": "keyword.operator.attribute-selector.less"
                 }
               },
-              "end": "(?=(\\s|\\]))",
+              "end": "(?=([\\s\\]]))",
               "patterns": [
                 {
                   "include": "#less-variable-interpolation"
@@ -4935,7 +4915,7 @@
                   "match": "(?:\\s+([iI]))?"
                 },
                 {
-                  "match": "\\]",
+                  "match": "]",
                   "name": "punctuation.definition.entity.less"
                 }
               ]
@@ -5244,13 +5224,13 @@
           "name": "keyword.other.unit.less"
         }
       },
-      "match": "(?i:[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))(s|ms))\\b",
+      "match": "(?i:[-+]?(?:\\d*\\.\\d+(?:[eE][-+]?\\d+)*|[-+]?\\d+)(s|ms))\\b",
       "name": "constant.numeric.less"
     },
     "transform-functions": {
       "patterns": [
         {
-          "begin": "\\b(matrix3d|scale3d|matrix|scale)(?=\\()",
+          "begin": "\\b((?:matrix|scale)(?:3d|))(?=\\()",
           "beginCaptures": {
             "0": {
               "name": "support.function.transform.less"
@@ -5724,7 +5704,7 @@
           "end": "(?=\\))",
           "patterns": [
             {
-              "match": "block|inline|x|y|auto",
+              "match": "block|inline|[xy]|auto",
               "name": "support.constant.property-value.less"
             },
             {
diff --git a/resources/languages/liquid.json b/resources/languages/liquid.json
index b6a0eb0..b449150 100644
--- a/resources/languages/liquid.json
+++ b/resources/languages/liquid.json
@@ -3,8 +3,8 @@
   "fileTypes": [
     "liquid"
   ],
-  "foldingStartMarker": "{%-?\\s*(capture|case|comment|for|form|if|javascript|paginate|schema|style)[^(%})]+%}",
-  "foldingStopMarker": "{%\\s*(endcapture|endcase|endcomment|endfor|endform|endif|endjavascript|endpaginate|endschema|endstyle)[^(%})]+%}",
+  "foldingStartMarker": "\\{%-?\\s*(capture|case|comment|for|form|if|javascript|paginate|schema|style)[^(%})]+%}",
+  "foldingStopMarker": "\\{%\\s*(end(?:capture|case|comment|for|form|if|javascript|paginate|schema|style))[^(%})]+%}",
   "injections": {
     "L:meta.embedded.block.js, L:meta.embedded.block.css, L:meta.embedded.block.html, L:string.quoted": {
       "patterns": [
@@ -42,7 +42,7 @@
           "name": "entity.other.attribute-name.liquid"
         }
       },
-      "end": "(?=,|\\|)|$",
+      "end": "(?=[,|])|$",
       "patterns": [
         {
           "include": "#value_expression"
@@ -50,15 +50,15 @@
       ]
     },
     "comment_block": {
-      "begin": "{%-?\\s*comment\\s*-?%}",
-      "end": "{%-?\\s*endcomment\\s*-?%}",
+      "begin": "\\{%-?\\s*comment\\s*-?%}",
+      "end": "\\{%-?\\s*endcomment\\s*-?%}",
       "name": "comment.block.liquid",
       "patterns": [
         {
           "include": "#comment_block"
         },
         {
-          "match": "(.(?!{%-?\\s*(comment|endcomment)\\s*-?%}))*."
+          "match": "(.(?!\\{%-?\\s*(comment|endcomment)\\s*-?%}))*."
         }
       ]
     },
@@ -97,7 +97,7 @@
       ]
     },
     "doc_tag": {
-      "begin": "{%-?\\s*(doc)\\s*-?%}",
+      "begin": "\\{%-?\\s*(doc)\\s*-?%}",
       "beginCaptures": {
         "0": {
           "name": "meta.tag.liquid"
@@ -107,7 +107,7 @@
         }
       },
       "contentName": "comment.block.documentation.liquid",
-      "end": "{%-?\\s*(enddoc)\\s*-?%}",
+      "end": "\\{%-?\\s*(enddoc)\\s*-?%}",
       "endCaptures": {
         "0": {
           "name": "meta.tag.liquid"
@@ -118,6 +118,9 @@
       },
       "name": "meta.block.doc.liquid",
       "patterns": [
+        {
+          "include": "#liquid_doc_description_tag"
+        },
         {
           "include": "#liquid_doc_param_tag"
         },
@@ -135,7 +138,7 @@
           "name": "support.function.liquid"
         }
       },
-      "match": "\\|\\s*((?![\\.0-9])[a-zA-Z0-9_-]+\\:?)\\s*"
+      "match": "\\|\\s*((?![.0-9])[a-zA-Z0-9_-]+:?)\\s*"
     },
     "injection": {
       "patterns": [
@@ -158,7 +161,7 @@
       "name": "invalid.illegal.range.liquid"
     },
     "javascript_codefence": {
-      "begin": "({%-?)\\s*(javascript)\\s*(-?%})",
+      "begin": "(\\{%-?)\\s*(javascript)\\s*(-?%})",
       "beginCaptures": {
         "0": {
           "name": "meta.tag.metadata.javascript.start.liquid"
@@ -174,7 +177,7 @@
         }
       },
       "contentName": "meta.embedded.block.js",
-      "end": "({%-?)\\s*(endjavascript)\\s*(-?%})",
+      "end": "(\\{%-?)\\s*(endjavascript)\\s*(-?%})",
       "endCaptures": {
         "0": {
           "name": "meta.tag.metadata.javascript.end.liquid"
@@ -197,7 +200,7 @@
       ]
     },
     "json_codefence": {
-      "begin": "({%-?)\\s*(schema)\\s*(-?%})",
+      "begin": "(\\{%-?)\\s*(schema)\\s*(-?%})",
       "beginCaptures": {
         "0": {
           "name": "meta.tag.metadata.schema.start.liquid"
@@ -213,7 +216,7 @@
         }
       },
       "contentName": "meta.embedded.block.json",
-      "end": "({%-?)\\s*(endschema)\\s*(-?%})",
+      "end": "(\\{%-?)\\s*(endschema)\\s*(-?%})",
       "endCaptures": {
         "0": {
           "name": "meta.tag.metadata.schema.end.liquid"
@@ -239,18 +242,46 @@
       "match": "\\b(false|true|nil|blank)\\b|empty(?!\\?)",
       "name": "constant.language.liquid"
     },
+    "liquid_doc_description_tag": {
+      "begin": "(@description)\\b\\s*",
+      "beginCaptures": {
+        "0": {
+          "name": "comment.block.documentation.liquid"
+        },
+        "1": {
+          "name": "storage.type.class.liquid"
+        }
+      },
+      "end": "(?=@|\\{%-?\\s*enddoc\\s*-?%})",
+      "patterns": [
+        {
+          "match": "[^@]+",
+          "name": "string.quoted.single.liquid"
+        }
+      ]
+    },
     "liquid_doc_example_tag": {
-      "captures": {
+      "begin": "(@example)\\b\\s*",
+      "beginCaptures": {
+        "0": {
+          "name": "comment.block.documentation.liquid"
+        },
         "1": {
           "name": "storage.type.class.liquid"
         }
       },
-      "match": "(@example)\\b"
+      "contentName": "meta.embedded.block.liquid",
+      "end": "(?=@|\\{%-?\\s*enddoc\\s*-?%})",
+      "patterns": [
+        {
+          "include": "#core"
+        }
+      ]
     },
     "liquid_doc_fallback_tag": {
       "captures": {
         "1": {
-          "name": "storage.type.class.liquid"
+          "name": "comment.block.liquid"
         }
       },
       "match": "(@\\w+)\\b"
@@ -265,16 +296,19 @@
         },
         "3": {
           "name": "variable.other.liquid"
+        },
+        "4": {
+          "name": "string.quoted.single.liquid"
         }
       },
-      "match": "(@param)\\s+(?:({[^}]*}?)\\s+)?([a-zA-Z_]\\w*)?"
+      "match": "(@param)\\s+(?:(\\{[^}]*}?)\\s+)?(\\[?[a-zA-Z_][\\w-]*]?)?(?:\\s+(.*))?"
     },
     "number": {
-      "match": "((-|\\+)\\s*)?[0-9]+(\\.[0-9]+)?",
+      "match": "(([-+])\\s*)?[0-9]+(\\.[0-9]+)?",
       "name": "constant.numeric.liquid"
     },
     "object": {
-      "begin": "(?<!comment %})(?<!comment -%})(?<!comment%})(?<!comment-%})(?<!raw %})(?<!raw -%})(?<!raw%})(?<!raw-%}){{-?",
+      "begin": "(?<!comment %})(?<!comment -%})(?<!comment%})(?<!comment-%})(?<!raw %})(?<!raw -%})(?<!raw%})(?<!raw-%})\\{\\{-?",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.tag.begin.liquid"
@@ -305,7 +339,7 @@
           "name": "keyword.operator.expression.liquid"
         }
       },
-      "match": "(?:(?<=\\s)|\\b)(\\=\\=|!\\=|\\>|\\<|\\>\\=|\\<\\=|or|and|contains)(?:(?=\\s)|\\b)"
+      "match": "(?:(?<=\\s)|\\b)(==|!=|[><]|>=|<=|or|and|contains)(?:(?=\\s)|\\b)"
     },
     "range": {
       "begin": "\\(",
@@ -335,14 +369,14 @@
       ]
     },
     "raw_tag": {
-      "begin": "{%-?\\s*(raw)\\s*-?%}",
+      "begin": "\\{%-?\\s*(raw)\\s*-?%}",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag.liquid"
         }
       },
       "contentName": "string.unquoted.liquid",
-      "end": "{%-?\\s*(endraw)\\s*-?%}",
+      "end": "\\{%-?\\s*(endraw)\\s*-?%}",
       "endCaptures": {
         "1": {
           "name": "entity.name.tag.liquid"
@@ -351,7 +385,7 @@
       "name": "meta.entity.tag.raw.liquid",
       "patterns": [
         {
-          "match": "(.(?!{%-?\\s*endraw\\s*-?%}))*."
+          "match": "(.(?!\\{%-?\\s*endraw\\s*-?%}))*."
         }
       ]
     },
@@ -376,7 +410,7 @@
       "name": "string.quoted.single.liquid"
     },
     "style_codefence": {
-      "begin": "({%-?)\\s*(style)\\s*(-?%})",
+      "begin": "(\\{%-?)\\s*(style)\\s*(-?%})",
       "beginCaptures": {
         "0": {
           "name": "meta.tag.metadata.style.start.liquid"
@@ -392,7 +426,7 @@
         }
       },
       "contentName": "meta.embedded.block.css",
-      "end": "({%-?)\\s*(endstyle)\\s*(-?%})",
+      "end": "(\\{%-?)\\s*(endstyle)\\s*(-?%})",
       "endCaptures": {
         "0": {
           "name": "meta.tag.metadata.style.end.liquid"
@@ -415,7 +449,7 @@
       ]
     },
     "stylesheet_codefence": {
-      "begin": "({%-?)\\s*(stylesheet)\\s*(-?%})",
+      "begin": "(\\{%-?)\\s*(stylesheet)\\s*(-?%})",
       "beginCaptures": {
         "0": {
           "name": "meta.tag.metadata.style.start.liquid"
@@ -431,7 +465,7 @@
         }
       },
       "contentName": "meta.embedded.block.css",
-      "end": "({%-?)\\s*(endstylesheet)\\s*(-?%})",
+      "end": "(\\{%-?)\\s*(endstylesheet)\\s*(-?%})",
       "endCaptures": {
         "0": {
           "name": "meta.tag.metadata.style.end.liquid"
@@ -454,7 +488,7 @@
       ]
     },
     "tag": {
-      "begin": "(?<!comment %})(?<!comment -%})(?<!comment%})(?<!comment-%})(?<!raw %})(?<!raw -%})(?<!raw%})(?<!raw-%}){%-?",
+      "begin": "(?<!comment %})(?<!comment -%})(?<!comment%})(?<!comment-%})(?<!raw %})(?<!raw -%})(?<!raw%})(?<!raw-%})\\{%-?",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.tag.begin.liquid"
@@ -474,7 +508,7 @@
       ]
     },
     "tag_assign": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(assign|echo)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(assign|echo)\\b",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag.liquid"
@@ -495,7 +529,7 @@
       ]
     },
     "tag_assign_liquid": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(assign|echo)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(assign|echo)\\b",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag.liquid"
@@ -550,7 +584,7 @@
       ]
     },
     "tag_case": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(case|when)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(case|when)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.case.liquid"
@@ -565,7 +599,7 @@
       ]
     },
     "tag_case_liquid": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(case|when)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(case|when)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.case.liquid"
@@ -580,15 +614,15 @@
       ]
     },
     "tag_comment_block_liquid": {
-      "begin": "(?:^\\s*)(comment)\\b",
-      "end": "(?:^\\s*)(endcomment)\\b",
+      "begin": "^\\s*(comment)\\b",
+      "end": "^\\s*(endcomment)\\b",
       "name": "comment.block.liquid",
       "patterns": [
         {
           "include": "#tag_comment_block_liquid"
         },
         {
-          "match": "(?:^\\s*)(?!(comment|endcomment)).*"
+          "match": "^\\s*(?!(comment|endcomment)).*"
         }
       ]
     },
@@ -598,12 +632,12 @@
       "name": "comment.line.number-sign.liquid"
     },
     "tag_comment_inline_liquid": {
-      "begin": "(?:^\\s*)#.*",
+      "begin": "^\\s*#.*",
       "end": "$",
       "name": "comment.line.number-sign.liquid"
     },
     "tag_conditional": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(if|elsif|unless)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(if|elsif|unless)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.conditional.liquid"
@@ -618,7 +652,7 @@
       ]
     },
     "tag_conditional_liquid": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(if|elsif|unless)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(if|elsif|unless)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.conditional.liquid"
@@ -638,7 +672,7 @@
           "include": "#tag_expression_without_arguments"
         },
         {
-          "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(\\w+)",
+          "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(\\w+)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.liquid"
@@ -660,7 +694,7 @@
           "include": "#tag_expression_without_arguments"
         },
         {
-          "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(\\w+)",
+          "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(\\w+)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.liquid"
@@ -684,7 +718,7 @@
               "name": "keyword.control.conditional.liquid"
             }
           },
-          "match": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(endunless|endif)\\b"
+          "match": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(end(?:unless|if))\\b"
         },
         {
           "captures": {
@@ -692,7 +726,7 @@
               "name": "keyword.control.loop.liquid"
             }
           },
-          "match": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(endfor|endtablerow|endpaginate)\\b"
+          "match": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(end(?:for|tablerow|paginate))\\b"
         },
         {
           "captures": {
@@ -700,7 +734,7 @@
               "name": "keyword.control.case.liquid"
             }
           },
-          "match": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(endcase)\\b"
+          "match": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(endcase)\\b"
         },
         {
           "captures": {
@@ -708,7 +742,7 @@
               "name": "keyword.control.other.liquid"
             }
           },
-          "match": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(capture|case|comment|for|form|if|javascript|paginate|schema|style)\\b"
+          "match": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(capture|case|comment|for|form|if|javascript|paginate|schema|style)\\b"
         },
         {
           "captures": {
@@ -716,7 +750,7 @@
               "name": "keyword.control.other.liquid"
             }
           },
-          "match": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(endcapture|endcase|endcomment|endfor|endform|endif|endjavascript|endpaginate|endschema|endstyle)\\b"
+          "match": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(end(?:capture|case|comment|for|form|if|javascript|paginate|schema|style))\\b"
         },
         {
           "captures": {
@@ -724,12 +758,12 @@
               "name": "keyword.control.other.liquid"
             }
           },
-          "match": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(else|break|continue)\\b"
+          "match": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(else|break|continue)\\b"
         }
       ]
     },
     "tag_for": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(for)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(for)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.for.liquid"
@@ -759,7 +793,7 @@
       ]
     },
     "tag_for_liquid": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(for)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(for)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.for.liquid"
@@ -774,7 +808,7 @@
       ]
     },
     "tag_injection": {
-      "begin": "(?<!comment %})(?<!comment -%})(?<!comment%})(?<!comment-%})(?<!raw %})(?<!raw -%})(?<!raw%})(?<!raw-%}){%-?(?!-?\\s*(endstyle|endjavascript|endcomment|endraw))",
+      "begin": "(?<!comment %})(?<!comment -%})(?<!comment%})(?<!comment-%})(?<!raw %})(?<!raw -%})(?<!raw%})(?<!raw-%})\\{%-?(?!-?\\s*(end(?:style|javascript|comment|raw)))",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.tag.end.liquid"
@@ -794,7 +828,7 @@
       ]
     },
     "tag_liquid": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(liquid)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(liquid)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.liquid.liquid"
@@ -836,7 +870,7 @@
       ]
     },
     "tag_paginate": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(paginate)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(paginate)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.paginate.liquid"
@@ -862,7 +896,7 @@
       ]
     },
     "tag_paginate_liquid": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(paginate)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(paginate)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.paginate.liquid"
@@ -877,7 +911,7 @@
       ]
     },
     "tag_render": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(render)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(render)\\b",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag.render.liquid"
@@ -898,7 +932,7 @@
       ]
     },
     "tag_render_liquid": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(render)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(render)\\b",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag.render.liquid"
@@ -923,7 +957,7 @@
       "name": "keyword.control.other.liquid"
     },
     "tag_tablerow": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(tablerow)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(tablerow)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.tablerow.liquid"
@@ -953,7 +987,7 @@
       ]
     },
     "tag_tablerow_liquid": {
-      "begin": "(?:(?:(?<={%)|(?<={%-)|^)\\s*)(tablerow)\\b",
+      "begin": "(?:(?<=\\{%)|(?<=\\{%-)|^)\\s*(tablerow)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.tablerow.liquid"
@@ -978,10 +1012,10 @@
               "name": "invalid.illegal.filter.liquid"
             }
           },
-          "match": "(\\[)(\\|)(?=[^\\]]*)(?=\\])"
+          "match": "(\\[)(\\|)(?=[^\\]]*)(?=])"
         },
         {
-          "match": "(?<=\\s)(\\+|\\-|\\/|\\*)(?=\\s)",
+          "match": "(?<=\\s)([+\\-/*])(?=\\s)",
           "name": "invalid.illegal.filter.liquid"
         },
         {
@@ -1014,7 +1048,7 @@
           "name": "variable.language.liquid"
         },
         {
-          "match": "((?<=\\w\\:\\s)\\w+)",
+          "match": "((?<=\\w:\\s)\\w+)",
           "name": "variable.parameter.liquid"
         },
         {
@@ -1024,7 +1058,7 @@
               "name": "punctuation.section.brackets.begin.liquid"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.brackets.end.liquid"
@@ -1038,7 +1072,7 @@
           ]
         },
         {
-          "match": "(?<=(\\w|\\])\\.)([-\\w]+\\??)",
+          "match": "(?<=([\\w\\]])\\.)([-\\w]+\\??)",
           "name": "variable.other.member.liquid"
         },
         {
@@ -1046,7 +1080,7 @@
           "name": "punctuation.accessor.liquid"
         },
         {
-          "match": "(?i)[a-z_](\\w|(?:-(?!\\}\\})))*",
+          "match": "(?i)[a-z_](\\w|-(?!}}))*",
           "name": "variable.other.liquid"
         }
       ]
diff --git a/resources/languages/llvm.json b/resources/languages/llvm.json
new file mode 100644
index 0000000..ea811ab
--- /dev/null
+++ b/resources/languages/llvm.json
@@ -0,0 +1,122 @@
+{
+  "displayName": "LLVM IR",
+  "name": "llvm",
+  "patterns": [
+    {
+      "match": "\\b(?:void\\b|half\\b|bfloat\\b|float\\b|double\\b|x86_fp80\\b|fp128\\b|ppc_fp128\\b|label\\b|metadata\\b|x86_mmx\\b|x86_amx\\b|type\\b|label\\b|opaque\\b|token\\b|i\\d+\\**)",
+      "name": "storage.type.llvm"
+    },
+    {
+      "captures": {
+        "1": {
+          "name": "storage.type.llvm"
+        }
+      },
+      "match": "!([a-zA-Z]+)\\s*\\("
+    },
+    {
+      "match": "(?<=\\s|^)#dbg_(assign|declare|label|value)\\b|\\badd\\b|\\baddrspacecast\\b|\\balloca\\b|\\band\\b|\\barcp\\b|\\bashr\\b|\\batomicrmw\\b|\\bbitcast\\b|\\bbr\\b|\\bcatchpad\\b|\\bcatchswitch\\b|\\bcatchret\\b|\\bcall\\b|\\bcallbr\\b|\\bcleanuppad\\b|\\bcleanupret\\b|\\bcmpxchg\\b|\\beq\\b|\\bexact\\b|\\bextractelement\\b|\\bextractvalue\\b|\\bfadd\\b|\\bfast\\b|\\bfcmp\\b|\\bfdiv\\b|\\bfence\\b|\\bfmul\\b|\\bfpext\\b|\\bfptosi\\b|\\bfptoui\\b|\\bfptrunc\\b|\\bfree\\b|\\bfrem\\b|\\bfreeze\\b|\\bfsub\\b|\\bfneg\\b|\\bgetelementptr\\b|\\bicmp\\b|\\binbounds\\b|\\bindirectbr\\b|\\binsertelement\\b|\\binsertvalue\\b|\\binttoptr\\b|\\binvoke\\b|\\blandingpad\\b|\\bload\\b|\\blshr\\b|\\bmalloc\\b|\\bmax\\b|\\bmin\\b|\\bmul\\b|\\bnand\\b|\\bne\\b|\\bninf\\b|\\bnnan\\b|\\bnsw\\b|\\bnsz\\b|\\bnuw\\b|\\boeq\\b|\\boge\\b|\\bogt\\b|\\bole\\b|\\bolt\\b|\\bone\\b|\\bor\\b|\\bord\\b|\\bphi\\b|\\bptrtoint\\b|\\bresume\\b|\\bret\\b|\\bsdiv\\b|\\bselect\\b|\\bsext\\b|\\bsge\\b|\\bsgt\\b|\\bshl\\b|\\bshufflevector\\b|\\bsitofp\\b|\\bsle\\b|\\bslt\\b|\\bsrem\\b|\\bstore\\b|\\bsub\\b|\\bswitch\\b|\\btrunc\\b|\\budiv\\b|\\bueq\\b|\\buge\\b|\\bugt\\b|\\buitofp\\b|\\bule\\b|\\bult\\b|\\bumax\\b|\\bumin\\b|\\bune\\b|\\buno\\b|\\bunreachable\\b|\\bunwind\\b|\\burem\\b|\\bva_arg\\b|\\bxchg\\b|\\bxor\\b|\\bzext\\b",
+      "name": "keyword.instruction.llvm"
+    },
+    {
+      "match": "\\b(?:acq_rel\\b|acquire\\b|addrspace\\b|alias\\b|align\\b|alignstack\\b|allocsize\\b|alwaysinline\\b|appending\\b|argmemonly\\b|arm_aapcs_vfpcc\\b|arm_aapcscc\\b|arm_apcscc\\b|asm\\b|atomic\\b|available_externally\\b|blockaddress\\b|builtin\\b|byref\\b|byval\\b|c\\b|caller\\b|catch\\b|cc\\b|ccc\\b|cleanup\\b|cold\\b|coldcc\\b|comdat\\b|common\\b|constant\\b|convergent\\b|datalayout\\b|declare\\b|default\\b|define\\b|deplibs\\b|dereferenceable\\b|dereferenceable_or_null\\b|distinct\\b|dllexport\\b|dllimport\\b|dso_local\\b|dso_preemptable\\b|except\\b|extern_weak\\b|external\\b|externally_initialized\\b|fastcc\\b|filter\\b|from\\b|gc\\b|global\\b|hhvm_ccc\\b|hhvmcc\\b|hidden\\b|hot\\b|immarg\\b|inaccessiblemem_or_argmemonly\\b|inaccessiblememonly\\b|inalloc\\b|initialexec\\b|inlinehint\\b|inreg\\b|intel_ocl_bicc\\b|inteldialect\\b|internal\\b|jumptable\\b|linkonce\\b|linkonce_odr\\b|local_unnamed_addr\\b|localdynamic\\b|localexec\\b|minsize\\b|module\\b|monotonic\\b|msp430_intrcc\\b|mustprogress\\b|musttail\\b|naked\\b|nest\\b|noalias\\b|nobuiltin\\b|nocallback\\b|nocapture\\b|nocf_check\\b|noduplicate\\b|nofree\\b|noimplicitfloat\\b|noinline\\b|nomerge\\b|nonlazybind\\b|nonnull\\b|noprofile\\b|norecurse\\b|noredzone\\b|noreturn\\b|nosync\\b|noundef\\b|nounwind\\b|nosanitize_bounds\\b|nosanitize_coverage\\b|null_pointer_is_valid\\b|optforfuzzing\\b|optnone\\b|optsize\\b|personality\\b|preallocated\\b|private\\b|protected\\b|ptx_device\\b|ptx_kernel\\b|readnone\\b|readonly\\b|release\\b|returned\\b|returns_twice\\b|safestack\\b|sanitize_address\\b|sanitize_hwaddress\\b|sanitize_memory\\b|sanitize_memtag\\b|sanitize_thread\\b|section\\b|seq_cst\\b|shadowcallstack\\b|sideeffect\\b|signext\\b|source_filename\\b|speculatable\\b|speculative_load_hardening\\b|spir_func\\b|spir_kernel\\b|sret\\b|ssp\\b|sspreq\\b|sspstrong\\b|strictfp\\b|swiftcc\\b|swifterror\\b|swiftself\\b|syncscope\\b|tail\\b|tailcc\\b|target\\b|thread_local\\b|to\\b|triple\\b|unnamed_addr\\b|unordered\\b|uselistorder\\b|uselistorder_bb\\b|uwtable\\b|volatile\\b|weak\\b|weak_odr\\b|willreturn\\b|win64cc\\b|within\\b|writeonly\\b|x86_64_sysvcc\\b|x86_fastcallcc\\b|x86_stdcallcc\\b|x86_thiscallcc\\b|zeroext\\b)",
+      "name": "storage.modifier.llvm"
+    },
+    {
+      "match": "@[-a-zA-Z$._][-a-zA-Z$._0-9]*",
+      "name": "entity.name.function.llvm"
+    },
+    {
+      "match": "[%@!]\\d+\\b",
+      "name": "variable.llvm"
+    },
+    {
+      "match": "%[-a-zA-Z$._][-a-zA-Z$._0-9]*",
+      "name": "variable.llvm"
+    },
+    {
+      "captures": {
+        "1": {
+          "name": "variable.llvm"
+        }
+      },
+      "match": "(![-a-zA-Z$._][-a-zA-Z$._0-9]*)\\s*$"
+    },
+    {
+      "captures": {
+        "1": {
+          "name": "variable.llvm"
+        }
+      },
+      "match": "(![-a-zA-Z$._][-a-zA-Z$._0-9]*)\\s*[=!]"
+    },
+    {
+      "begin": "\"",
+      "end": "\"",
+      "name": "string.quoted.double.llvm",
+      "patterns": [
+        {
+          "match": "\\.",
+          "name": "constant.character.escape.untitled"
+        }
+      ]
+    },
+    {
+      "match": "[-a-zA-Z$._][-a-zA-Z$._0-9]*:",
+      "name": "entity.name.label.llvm"
+    },
+    {
+      "match": "-?\\b\\d+\\.\\d*(e[+-]\\d+)?\\b",
+      "name": "constant.numeric.float"
+    },
+    {
+      "match": "\\b0x\\h+\\b",
+      "name": "constant.numeric.float"
+    },
+    {
+      "match": "-?\\b\\d+\\b",
+      "name": "constant.numeric.integer"
+    },
+    {
+      "match": "\\b(?:true\\b|false\\b|null\\b|zeroinitializer\\b|undef\\b|poison\\b|null\\b|none\\b)",
+      "name": "constant.language"
+    },
+    {
+      "match": "\\bD(?:W_TAG_[a-z_]+\\b|W_ATE_[a-zA-Z_]+\\b|W_OP_[a-zA-Z0-9_]+\\b|W_LANG_[a-zA-Z0-9_]+\\b|W_VIRTUALITY_[a-z_]+\\b|IFlag[A-Za-z]+\\b)",
+      "name": "constant.other"
+    },
+    {
+      "match": ";\\s*PR\\d*\\s*$",
+      "name": "string.regexp"
+    },
+    {
+      "match": ";\\s*REQUIRES:.*$",
+      "name": "string.regexp"
+    },
+    {
+      "match": ";\\s*RUN:.*$",
+      "name": "string.regexp"
+    },
+    {
+      "match": ";\\s*ALLOW_RETRIES:.*$",
+      "name": "string.regexp"
+    },
+    {
+      "match": ";\\s*CHECK:.*$",
+      "name": "string.regexp"
+    },
+    {
+      "match": ";\\s*CHECK-(NEXT|NOT|DAG|SAME|LABEL):.*$",
+      "name": "string.regexp"
+    },
+    {
+      "match": ";\\s*XFAIL:.*$",
+      "name": "string.regexp"
+    },
+    {
+      "match": ";.*$",
+      "name": "comment.line.llvm"
+    }
+  ],
+  "scopeName": "source.llvm"
+}
diff --git a/resources/languages/log.json b/resources/languages/log.json
index 9c68fb7..d291829 100644
--- a/resources/languages/log.json
+++ b/resources/languages/log.json
@@ -10,59 +10,59 @@
       "name": "comment log.verbose"
     },
     {
-      "match": "(?i)\\[(verbose|verb|vrb|vb|v)\\]",
+      "match": "(?i)\\[(v(?:erbose|erb|rb|b|))]",
       "name": "comment log.verbose"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]{0,254})\\bV\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bV\\b",
       "name": "comment log.verbose"
     },
     {
-      "match": "\\b(DEBUG|Debug)\\b|(?i)\\b(debug)\\:",
+      "match": "\\b(D(?:EBUG|ebug))\\b|(?i)\\b(debug):",
       "name": "markup.changed log.debug"
     },
     {
-      "match": "(?i)\\[(debug|dbug|dbg|de|d)\\]",
+      "match": "(?i)\\[(d(?:ebug|bug|bg|e|))]",
       "name": "markup.changed log.debug"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]{0,254})\\bD\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bD\\b",
       "name": "markup.changed log.debug"
     },
     {
-      "match": "\\b(HINT|INFO|INFORMATION|Info|NOTICE|II)\\b|(?i)\\b(info|information)\\:",
+      "match": "\\b(HINT|INFO|INFORMATION|Info|NOTICE|II)\\b|(?i)\\b(info(?:|rmation)):",
       "name": "markup.inserted log.info"
     },
     {
-      "match": "(?i)\\[(information|info|inf|in|i)\\]",
+      "match": "(?i)\\[(i(?:nformation|nfo|nf|n|))]",
       "name": "markup.inserted log.info"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]{0,254})\\bI\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bI\\b",
       "name": "markup.inserted log.info"
     },
     {
-      "match": "\\b(WARNING|WARN|Warn|WW)\\b|(?i)\\b(warning)\\:",
+      "match": "\\b(W(?:ARNING|ARN|arn|W))\\b|(?i)\\b(warning):",
       "name": "markup.deleted log.warning"
     },
     {
-      "match": "(?i)\\[(warning|warn|wrn|wn|w)\\]",
+      "match": "(?i)\\[(w(?:arning|arn|rn|n|))]",
       "name": "markup.deleted log.warning"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]{0,254})\\bW\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bW\\b",
       "name": "markup.deleted log.warning"
     },
     {
-      "match": "\\b(ALERT|CRITICAL|EMERGENCY|ERROR|FAILURE|FAIL|Fatal|FATAL|Error|EE)\\b|(?i)\\b(error)\\:",
+      "match": "\\b(ALERT|CRITICAL|EMERGENCY|ERROR|FAILURE|FAIL|Fatal|FATAL|Error|EE)\\b|(?i)\\b(error):",
       "name": "string.regexp, strong log.error"
     },
     {
-      "match": "(?i)\\[(error|eror|err|er|e|fatal|fatl|ftl|fa|f)\\]",
+      "match": "(?i)\\[(error|eror|err|er|e|fatal|fatl|ftl|fa|f)]",
       "name": "string.regexp, strong log.error"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]{0,254})\\bE\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bE\\b",
       "name": "string.regexp, strong log.error"
     },
     {
@@ -74,23 +74,23 @@
       "name": "comment log.date"
     },
     {
-      "match": "T?\\d{1,2}:\\d{2}(:\\d{2}([.,]\\d{1,})?)?(Z| ?[+-]\\d{1,2}:\\d{2})?\\b",
+      "match": "T?\\d{1,2}:\\d{2}(:\\d{2}([.,]\\d+)?)?(Z| ?[+-]\\d{1,2}:\\d{2})?\\b",
       "name": "comment log.date"
     },
     {
-      "match": "T\\d{2}\\d{2}(\\d{2}([.,]\\d{1,})?)?(Z| ?[+-]\\d{1,2}\\d{2})?\\b",
+      "match": "T\\d{2}\\d{2}(\\d{2}([.,]\\d+)?)?(Z| ?[+-]\\d{1,2}\\d{2})?\\b",
       "name": "comment log.date"
     },
     {
-      "match": "\\b([0-9a-fA-F]{40}|[0-9a-fA-F]{10}|[0-9a-fA-F]{7})\\b",
+      "match": "\\b(\\h{40}|\\h{10}|\\h{7})\\b",
       "name": "constant.language"
     },
     {
-      "match": "\\b[0-9a-fA-F]{8}[-]?([0-9a-fA-F]{4}[-]?){3}[0-9a-fA-F]{12}\\b",
+      "match": "\\b\\h{8}-?(\\h{4}-?){3}\\h{12}\\b",
       "name": "constant.language log.constant"
     },
     {
-      "match": "\\b([0-9a-fA-F]{2,}[:-])+[0-9a-fA-F]{2,}+\\b",
+      "match": "\\b(\\h{2,}[:-])+\\h{2,}+\\b",
       "name": "constant.language log.constant"
     },
     {
@@ -98,7 +98,7 @@
       "name": "constant.language log.constant"
     },
     {
-      "match": "\\b(0x[a-fA-F0-9]+)\\b",
+      "match": "\\b(0x\\h+)\\b",
       "name": "constant.language log.constant"
     },
     {
@@ -106,7 +106,7 @@
       "name": "string log.string"
     },
     {
-      "match": "(?<![\\w])'[^']*'",
+      "match": "(?<!\\w)'[^']*'",
       "name": "string log.string"
     },
     {
diff --git a/resources/languages/logo.json b/resources/languages/logo.json
index 302b22b..dd8b2ab 100644
--- a/resources/languages/logo.json
+++ b/resources/languages/logo.json
@@ -22,7 +22,7 @@
           "name": "punctuation.definition.variable.logo"
         }
       },
-      "match": "(\\:)(?:\\|[^|]*\\||[-\\w.]*)+",
+      "match": "(:)(?:\\|[^|]*\\||[-\\w.]*)+",
       "name": "variable.parameter.logo"
     },
     {
diff --git a/resources/languages/lua.json b/resources/languages/lua.json
index 5d63b5c..43f06af 100644
--- a/resources/languages/lua.json
+++ b/resources/languages/lua.json
@@ -12,7 +12,7 @@
           "name": "keyword.control.lua"
         }
       },
-      "end": "(?<=[\\)\\-{}\\[\\]\"'])",
+      "end": "(?<=[)\\-{}\\[\\]\"'])",
       "name": "meta.function.lua",
       "patterns": [
         {
@@ -25,7 +25,7 @@
               "name": "punctuation.definition.parameters.begin.lua"
             }
           },
-          "end": "(\\))|(?=[\\-\\.{}\\[\\]\"'])",
+          "end": "(\\))|(?=[-.{}\\[\\]\"'])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.parameters.finish.lua"
@@ -51,7 +51,7 @@
                   "name": "punctuation.separator.arguments.lua"
                 }
               },
-              "end": "(?=[\\),])",
+              "end": "(?=[),])",
               "patterns": [
                 {
                   "include": "#emmydoc.type"
@@ -71,15 +71,15 @@
       ]
     },
     {
-      "match": "(?<![\\w\\d.])0[xX][0-9A-Fa-f]+(\\.[0-9A-Fa-f]*)?([eE]-?\\d*)?([pP][-+]\\d+)?",
+      "match": "(?<![\\w\\d.])0[xX]\\h+(\\.\\h*)?([eE]-?\\d*)?([pP][-+]\\d+)?",
       "name": "constant.numeric.float.hexadecimal.lua"
     },
     {
-      "match": "(?<![\\w\\d.])0[xX]\\.[0-9A-Fa-f]+([eE]-?\\d*)?([pP][-+]\\d+)?",
+      "match": "(?<![\\w\\d.])0[xX]\\.\\h+([eE]-?\\d*)?([pP][-+]\\d+)?",
       "name": "constant.numeric.float.hexadecimal.lua"
     },
     {
-      "match": "(?<![\\w\\d.])0[xX][0-9A-Fa-f]+(?![pPeE.0-9])",
+      "match": "(?<![\\w\\d.])0[xX]\\h+(?![pPeE.0-9])",
       "name": "constant.numeric.integer.hexadecimal.lua"
     },
     {
@@ -138,10 +138,10 @@
           "name": "storage.type.attribute.lua"
         }
       },
-      "match": "<\\s*(const|close)\\s*>"
+      "match": "<\\s*(c(?:onst|lose))\\s*>"
     },
     {
-      "match": "\\<[a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*\\>",
+      "match": "<[a-zA-Z_*][a-zA-Z0-9_.*-]*>",
       "name": "storage.type.generic.lua"
     },
     {
@@ -157,7 +157,7 @@
       "name": "keyword.control.lua"
     },
     {
-      "match": "(?<![^.]\\.|:)\\b(false|nil(?!:)|true|_ENV|_G|_VERSION|math\\.(pi|huge|maxinteger|mininteger)|utf8\\.charpattern|io\\.(stdin|stdout|stderr)|package\\.(config|cpath|loaded|loaders|path|preload|searchers))\\b|(?<![.])\\.{3}(?!\\.)",
+      "match": "(?<![^.]\\.|:)\\b(false|nil(?!:)|true|_ENV|_G|_VERSION|math\\.(pi|huge|maxinteger|mininteger)|utf8\\.charpattern|io\\.(std(?:in|out|err))|package\\.(config|cpath|loaded|loaders|path|preload|searchers))\\b|(?<!\\.)\\.{3}(?!\\.)",
       "name": "constant.language.lua"
     },
     {
@@ -177,7 +177,7 @@
       "name": "support.function.library.lua"
     },
     {
-      "match": "\\b(and|or|not|\\|\\||\\&\\&|\\!)\\b",
+      "match": "\\b(and|or|not|\\|\\||&&|!)\\b",
       "name": "keyword.operator.lua"
     },
     {
@@ -201,7 +201,7 @@
       "name": "entity.name.function.lua"
     },
     {
-      "match": "\\+|-|%|#|\\*|\\/|\\^|==?|~=|!=|<=?|>=?|(?<!\\.)\\.{2}(?!\\.)",
+      "match": "[+\\-%#*/^]|==?|~=|!=|<=?|>=?|(?<!\\.)\\.{2}(?!\\.)",
       "name": "keyword.operator.lua"
     }
   ],
@@ -229,7 +229,7 @@
                   "name": "punctuation.definition.comment.begin.lua"
                 }
               },
-              "end": "(--)?\\]\\1\\]",
+              "end": "(--)?]\\1]",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.end.lua"
@@ -249,7 +249,7 @@
                   "name": "punctuation.definition.comment.begin.lua"
                 }
               },
-              "end": "(--)?\\]\\1\\]",
+              "end": "(--)?]\\1]",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.end.lua"
@@ -311,13 +311,13 @@
           ]
         },
         {
-          "begin": "\\/\\*",
+          "begin": "/\\*",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.lua"
             }
           },
-          "end": "\\*\\/",
+          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.lua"
@@ -347,11 +347,11 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "match": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "match": "\\b([a-zA-Z_*][a-zA-Z0-9_.*-]*)",
               "name": "support.class.lua"
             },
             {
-              "match": ":|,",
+              "match": "[:,]",
               "name": "keyword.operator.lua"
             }
           ]
@@ -366,7 +366,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "begin": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "begin": "\\b([a-zA-Z_*][a-zA-Z0-9_.*-]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.lua"
@@ -400,7 +400,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "begin": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "begin": "\\b([a-zA-Z_*][a-zA-Z0-9_.*-]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.lua"
@@ -442,7 +442,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "begin": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "begin": "\\b([a-zA-Z_*][a-zA-Z0-9_.*-]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.other.lua"
@@ -535,7 +535,7 @@
                   "include": "#emmydoc.type"
                 },
                 {
-                  "match": "\\]",
+                  "match": "]",
                   "name": "keyword.operator.lua"
                 }
               ]
@@ -663,7 +663,7 @@
               "name": "support.class.lua"
             },
             {
-              "match": ",|\\>|\\<",
+              "match": "[,><]",
               "name": "keyword.operator.lua"
             }
           ]
@@ -678,7 +678,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "match": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "match": "\\b([a-zA-Z_*][a-zA-Z0-9_.*-]*)",
               "name": "support.class.lua"
             },
             {
@@ -709,7 +709,7 @@
               "end": "(?=\\n)",
               "patterns": [
                 {
-                  "match": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\-]*)",
+                  "match": "\\b([a-zA-Z_*][a-zA-Z0-9_-]*)",
                   "name": "support.class.lua"
                 },
                 {
@@ -739,7 +739,7 @@
           "name": "storage.type.annotation.lua"
         },
         {
-          "begin": "(?<=---)\\|\\s*[\\>\\+]?",
+          "begin": "(?<=---)\\|\\s*[>+]?",
           "beginCaptures": {
             "0": {
               "name": "storage.type.annotation.lua"
@@ -766,11 +766,11 @@
           "end": "(?=[\\s#])",
           "patterns": [
             {
-              "match": "[\\(\\),:\\?][ \\t]*",
+              "match": "[(),:?][ \\t]*",
               "name": "keyword.operator.lua"
             },
             {
-              "match": "([a-zA-Z_][a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]*)(?<!,)[ \\t]*(?=\\??:)",
+              "match": "([a-zA-Z_][a-zA-Z0-9_.*\\[\\]<>,-]*)(?<!,)[ \\t]*(?=\\??:)",
               "name": "entity.name.variable.lua"
             },
             {
@@ -782,7 +782,7 @@
           ]
         },
         {
-          "match": "\\<[a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*\\>",
+          "match": "<[a-zA-Z_*][a-zA-Z0-9_.*-]*>",
           "name": "storage.type.generic.lua"
         },
         {
@@ -790,15 +790,15 @@
           "name": "entity.name.tag.lua"
         },
         {
-          "match": "[\\{\\}\\:\\,\\?\\|\\`][ \\t]*",
+          "match": "[{}:,?|`][ \\t]*",
           "name": "keyword.operator.lua"
         },
         {
-          "begin": "(?=[a-zA-Z_\\.\\*\"'\\[])",
-          "end": "(?=[\\s\\)\\,\\?\\:\\}\\|#])",
+          "begin": "(?=[a-zA-Z_.*\"'\\[])",
+          "end": "(?=[\\s),?:}|#])",
           "patterns": [
             {
-              "match": "([a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]+)(?<!,)[ \\t]*",
+              "match": "([a-zA-Z0-9_.*\\[\\]<>,-]+)(?<!,)[ \\t]*",
               "name": "support.type.lua"
             },
             {
@@ -827,11 +827,11 @@
           "name": "constant.character.escape.byte.lua"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f][0-9A-Fa-f]",
+          "match": "\\\\x\\h\\h",
           "name": "constant.character.escape.byte.lua"
         },
         {
-          "match": "\\\\u\\{[0-9A-Fa-f]+\\}",
+          "match": "\\\\u\\{\\h+}",
           "name": "constant.character.escape.unicode.lua"
         },
         {
@@ -919,7 +919,7 @@
             }
           },
           "contentName": "meta.embedded.lua",
-          "end": "(\\]\\2\\])[ \\t]*",
+          "end": "(]\\2])[ \\t]*",
           "endCaptures": {
             "0": {
               "name": "string.quoted.other.multiline.lua"
@@ -941,7 +941,7 @@
               "name": "punctuation.definition.string.begin.lua"
             }
           },
-          "end": "\\]\\1\\][ \\t]*",
+          "end": "]\\1][ \\t]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.lua"
diff --git a/resources/languages/luau.json b/resources/languages/luau.json
index 35e0a6d..f569fb7 100644
--- a/resources/languages/luau.json
+++ b/resources/languages/luau.json
@@ -81,7 +81,7 @@
       "patterns": [
         {
           "begin": "--\\[(=*)\\[",
-          "end": "\\]\\1\\]",
+          "end": "]\\1]",
           "name": "comment.block.luau",
           "patterns": [
             {
@@ -141,7 +141,7 @@
               "name": "variable.parameter.luau"
             }
           },
-          "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s)+(\\b\\w+\\b)"
+          "match": "((?<=[\\s*!/])[\\\\@]param)\\s+(\\b\\w+\\b)"
         }
       ]
     },
@@ -192,7 +192,7 @@
           "name": "keyword.control.luau"
         }
       },
-      "end": "(?<=[\\)\\-{}\\[\\]\"'])",
+      "end": "(?<=[)\\-{}\\[\\]\"'])",
       "name": "meta.function.luau",
       "patterns": [
         {
@@ -238,7 +238,7 @@
                   "name": "keyword.operator.type.luau"
                 }
               },
-              "end": "(?=[\\),])",
+              "end": "(?=[),])",
               "patterns": [
                 {
                   "include": "#type_literal"
@@ -248,7 +248,7 @@
           ]
         },
         {
-          "match": "\\b(__add|__call|__concat|__div|__eq|__index|__le|__len|__lt|__metatable|__mod|__mode|__mul|__newindex|__pow|__sub|__tostring|__unm|__iter|__idiv)\\b",
+          "match": "\\b(__(?:add|call|concat|div|eq|index|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tostring|unm|iter|idiv))\\b",
           "name": "variable.language.metamethod.luau"
         },
         {
@@ -302,7 +302,7 @@
         }
       },
       "contentName": "meta.embedded.line.luau",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.interpolated-string-expression.end.luau"
@@ -338,11 +338,11 @@
           "name": "keyword.operator.logical.luau keyword.operator.wordlike.luau"
         },
         {
-          "match": "(?<=[^.]\\.|:)\\b(__add|__call|__concat|__div|__eq|__index|__le|__len|__lt|__metatable|__mod|__mode|__mul|__newindex|__pow|__sub|__tostring|__unm)\\b",
+          "match": "(?<=[^.]\\.|:)\\b(__(?:add|call|concat|div|eq|index|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tostring|unm))\\b",
           "name": "variable.language.metamethod.luau"
         },
         {
-          "match": "(?<![.])\\.{3}(?!\\.)",
+          "match": "(?<!\\.)\\.{3}(?!\\.)",
           "name": "keyword.other.unit.luau"
         }
       ]
@@ -405,15 +405,15 @@
     "number": {
       "patterns": [
         {
-          "match": "\\b0_*[xX]_*[\\da-fA-F_]*(?:[eE][\\+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
+          "match": "\\b0_*[xX]_*[\\da-fA-F_]*(?:[eE][+-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
           "name": "constant.numeric.hex.luau"
         },
         {
-          "match": "\\b0_*[bB][01_]+(?:[eE][\\+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
+          "match": "\\b0_*[bB][01_]+(?:[eE][+-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
           "name": "constant.numeric.binary.luau"
         },
         {
-          "match": "(?:\\d[\\d_]*(?:\\.[\\d_]*)?|\\.\\d[\\d_]*)(?:[eE][\\+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
+          "match": "(?:\\d[\\d_]*(?:\\.[\\d_]*)?|\\.\\d[\\d_]*)(?:[eE][+-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
           "name": "constant.numeric.decimal.luau"
         }
       ]
@@ -429,7 +429,7 @@
           "name": "keyword.operator.assignment.luau"
         },
         {
-          "match": "\\+|-|%|\\*|\\/\\/|\\/|\\^",
+          "match": "[+\\-%*]|//|[/^]",
           "name": "keyword.operator.arithmetic.luau"
         },
         {
@@ -477,7 +477,7 @@
           "name": "support.function.luau"
         },
         {
-          "match": "(?<![^.]\\.|:)\\b(_G|_VERSION)\\b",
+          "match": "(?<![^.]\\.|:)\\b(_(?:G|VERSION))\\b",
           "name": "constant.language.luau"
         },
         {
@@ -522,7 +522,7 @@
         },
         {
           "begin": "\\[(=*)\\[",
-          "end": "\\]\\1\\]",
+          "end": "]\\1]",
           "name": "string.other.multiline.luau"
         },
         {
@@ -551,11 +551,11 @@
           "name": "constant.character.escape.luau"
         },
         {
-          "match": "\\\\x[0-9a-fA-F]{2}",
+          "match": "\\\\x\\h{2}",
           "name": "constant.character.escape.luau"
         },
         {
-          "match": "\\\\u\\{[0-9a-fA-F]*\\}",
+          "match": "\\\\u\\{\\h*}",
           "name": "constant.character.escape.luau"
         },
         {
@@ -571,7 +571,7 @@
           "name": "punctuation.table.begin.luau"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.table.end.luau"
@@ -610,7 +610,7 @@
     },
     "type_annotation": {
       "begin": ":(?!\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[)))",
-      "end": "(?<=\\))(?!\\s*->)|=|;|$|(?=\\breturn\\b)|(?=\\bend\\b)",
+      "end": "(?<=\\))(?!\\s*->)|[=;]|$|(?=\\breturn\\b)|(?=\\bend\\b)",
       "patterns": [
         {
           "include": "#comment"
@@ -627,7 +627,7 @@
           "name": "keyword.operator.typecast.luau"
         }
       },
-      "end": "(?=^|[;),}\\]:?\\-\\+\\>](?!\\s*[&\\|])|$|\\b(break|do|else|for|if|elseif|return|then|repeat|while|until|end|in|continue)\\b)",
+      "end": "(?=^|[;),}\\]:?\\-+>](?!\\s*[\\&|])|$|\\b(break|do|else|for|if|elseif|return|then|repeat|while|until|end|in|continue)\\b)",
       "patterns": [
         {
           "include": "#type_literal"
@@ -643,7 +643,7 @@
           "include": "#string"
         },
         {
-          "match": "\\?|\\&|\\|",
+          "match": "[?\\&|]",
           "name": "keyword.operator.type.luau"
         },
         {
@@ -713,11 +713,11 @@
         },
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "begin": "\\[",
-              "end": "\\]",
+              "end": "]",
               "patterns": [
                 {
                   "include": "#type_literal"
diff --git a/resources/languages/make.json b/resources/languages/make.json
index 628ce2d..9f4437c 100644
--- a/resources/languages/make.json
+++ b/resources/languages/make.json
@@ -25,7 +25,7 @@
     "another-variable-braces": {
       "patterns": [
         {
-          "begin": "(?<={)(?!})",
+          "begin": "(?<=\\{)(?!})",
           "end": "(?=}|((?<!\\\\)\\n))",
           "name": "variable.other.makefile",
           "patterns": [
@@ -59,7 +59,7 @@
       ]
     },
     "braces-interpolation": {
-      "begin": "{",
+      "begin": "\\{",
       "end": "}",
       "patterns": [
         {
@@ -73,7 +73,7 @@
     "builtin-variable-braces": {
       "patterns": [
         {
-          "match": "(?<={)(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\\.LIBPATTERNS)(?=\\s*})",
+          "match": "(?<=\\{)(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\\.LIBPATTERNS)(?=\\s*})",
           "name": "variable.language.makefile"
         }
       ]
@@ -91,7 +91,7 @@
       "name": "punctuation.separator.delimeter.comma.makefile"
     },
     "comment": {
-      "begin": "(^[ ]+)?((?<!\\\\)(\\\\\\\\)*)(?=#)",
+      "begin": "(^ +)?((?<!\\\\)(\\\\\\\\)*)(?=#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.whitespace.comment.leading.makefile"
@@ -120,7 +120,7 @@
     "directives": {
       "patterns": [
         {
-          "begin": "^[ ]*([s\\-]?include)\\b",
+          "begin": "^ *([s-]?include)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.include.makefile"
@@ -141,7 +141,7 @@
           ]
         },
         {
-          "begin": "^[ ]*(vpath)\\b",
+          "begin": "^ *(vpath)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.vpath.makefile"
@@ -162,7 +162,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:(override)\\s*)?(define)\\s*([^\\s]+)\\s*(=|\\?=|:=|\\+=)?(?=\\s)",
+          "begin": "^\\s*(?:(override)\\s*)?(define)\\s*(\\S+)\\s*(=|\\?=|:=|\\+=)?(?=\\s)",
           "captures": {
             "1": {
               "name": "keyword.control.override.makefile"
@@ -198,7 +198,7 @@
           ]
         },
         {
-          "begin": "^[ ]*(export)\\b",
+          "begin": "^ *(export)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.$1.makefile"
@@ -213,13 +213,13 @@
               "include": "#variable-assignment"
             },
             {
-              "match": "[^\\s]+",
+              "match": "\\S+",
               "name": "variable.other.makefile"
             }
           ]
         },
         {
-          "begin": "^[ ]*(override|private)\\b",
+          "begin": "^ *(override|private)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.$1.makefile"
@@ -236,7 +236,7 @@
           ]
         },
         {
-          "begin": "^[ ]*(unexport|undefine)\\b",
+          "begin": "^ *(un(?:export|define))\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.$1.makefile"
@@ -248,13 +248,13 @@
               "include": "#comment"
             },
             {
-              "match": "[^\\s]+",
+              "match": "\\S+",
               "name": "variable.other.makefile"
             }
           ]
         },
         {
-          "begin": "^\\s*(ifeq|ifneq|ifdef|ifndef)(?=\\s)",
+          "begin": "^\\s*(if(?:|n)(?:eq|def))(?=\\s)",
           "captures": {
             "1": {
               "name": "keyword.control.$1.makefile"
@@ -280,7 +280,7 @@
               ]
             },
             {
-              "begin": "^\\s*else(?=\\s)\\s*(ifeq|ifneq|ifdef|ifndef)*(?=\\s)",
+              "begin": "^\\s*else(?=\\s)\\s*(if(?:|n)(?:eq|def))*(?=\\s)",
               "beginCaptures": {
                 "0": {
                   "name": "keyword.control.else.makefile"
@@ -309,7 +309,7 @@
     "flavor-variable-braces": {
       "patterns": [
         {
-          "begin": "(?<={)(origin|flavor)\\s(?=[^\\s}]+\\s*})",
+          "begin": "(?<=\\{)(origin|flavor)\\s(?=[^\\s}]+\\s*})",
           "beginCaptures": {
             "1": {
               "name": "support.function.$1.makefile"
@@ -349,7 +349,7 @@
     "function-variable-braces": {
       "patterns": [
         {
-          "begin": "(?<={)(subst|patsubst|strip|findstring|filter(-out)?|sort|word(list)?|firstword|lastword|dir|notdir|suffix|basename|addsuffix|addprefix|join|wildcard|realpath|abspath|info|error|warning|shell|foreach|if|or|and|call|eval|value|file|guile)\\s",
+          "begin": "(?<=\\{)(subst|patsubst|strip|findstring|filter(-out)?|sort|word(list)?|firstword|lastword|dir|notdir|suffix|basename|addsuffix|addprefix|join|wildcard|realpath|abspath|info|error|warning|shell|foreach|if|or|and|call|eval|value|file|guile)\\s",
           "beginCaptures": {
             "1": {
               "name": "support.function.$1.makefile"
@@ -368,7 +368,7 @@
               "include": "#interpolation"
             },
             {
-              "match": "%|\\*",
+              "match": "[%*]",
               "name": "constant.other.placeholder.makefile"
             },
             {
@@ -401,7 +401,7 @@
               "include": "#interpolation"
             },
             {
-              "match": "%|\\*",
+              "match": "[%*]",
               "name": "constant.other.placeholder.makefile"
             },
             {
@@ -462,7 +462,7 @@
       ]
     },
     "target": {
-      "begin": "^(?!\\t)([^:]*)(:)(?!\\=)",
+      "begin": "^(?!\\t)([^:]*)(:)(?!=)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -507,7 +507,7 @@
               "name": "constant.character.escape.continuation.makefile"
             },
             {
-              "match": "%|\\*",
+              "match": "[%*]",
               "name": "constant.other.placeholder.makefile"
             },
             {
@@ -521,7 +521,7 @@
       ]
     },
     "variable-assignment": {
-      "begin": "(^[ ]*|\\G\\s*)([^\\s:#=]+)\\s*((?<![?:+!])=|\\?=|:=|\\+=|!=)",
+      "begin": "(^ *|\\G\\s*)([^\\s:#=]+)\\s*((?<![?:+!])=|\\?=|:=|\\+=|!=)",
       "beginCaptures": {
         "2": {
           "name": "variable.other.makefile",
@@ -552,7 +552,7 @@
     "variable-braces": {
       "patterns": [
         {
-          "begin": "\\${",
+          "begin": "\\$\\{",
           "captures": {
             "0": {
               "name": "punctuation.definition.variable.makefile"
diff --git a/resources/languages/markdown.json b/resources/languages/markdown.json
index e0e8031..0af2898 100644
--- a/resources/languages/markdown.json
+++ b/resources/languages/markdown.json
@@ -11,8 +11,7 @@
   ],
   "repository": {
     "ampersand": {
-      "comment": "Markdown will convert this for us. We match it so that the HTML grammar will not mark it up as invalid.",
-      "match": "&(?!([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+);)",
+      "match": "&(?!([a-zA-Z0-9]+|#[0-9]+|#x\\h+);)",
       "name": "meta.other.valid-ampersand.markdown"
     },
     "block": {
@@ -50,7 +49,7 @@
       ]
     },
     "blockquote": {
-      "begin": "(^|\\G)[ ]{0,3}(>) ?",
+      "begin": "(^|\\G) {0,3}(>) ?",
       "captures": {
         "2": {
           "name": "punctuation.definition.quote.begin.markdown"
@@ -65,7 +64,7 @@
       "while": "(^|\\G)\\s*(>) ?"
     },
     "bold": {
-      "begin": "(?<open>(\\*\\*(?=\\w)|(?<!\\w)\\*\\*|(?<!\\w)\\b__))(?=\\S)(?=(<[^>]*+>|(?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>|\\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+|\\[((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+\\](([ ]?\\[[^\\]]*+\\])|(\\([ \\t]*+<?(.*?)>?[ \\t]*+((?<title>['\"])(.*?)\\k<title>)?\\))))|(?!(?<=\\S)\\k<open>).)++(?<=\\S)(?=__\\b|\\*\\*)\\k<open>)",
+      "begin": "(?<open>(\\*\\*(?=\\w)|(?<!\\w)\\*\\*|(?<!\\w)\\b__))(?=\\S)(?=(<[^>]*+>|(?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>|\\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+|\\[((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+])*+](( ?\\[[^\\]]*+])|(\\([ \\t]*+<?(.*?)>?[ \\t]*+((?<title>['\"])(.*?)\\k<title>)?\\))))|(?!(?<=\\S)\\k<open>).)++(?<=\\S)(?=__\\b|\\*\\*)\\k<open>)",
       "captures": {
         "1": {
           "name": "punctuation.definition.bold.markdown"
@@ -132,8 +131,7 @@
       ]
     },
     "bracket": {
-      "comment": "Markdown will convert this for us. We match it so that the HTML grammar will not mark it up as invalid.",
-      "match": "<(?![a-zA-Z/?\\$!])",
+      "match": "<(?![a-zA-Z/?$!])",
       "name": "meta.other.valid-bracket.markdown"
     },
     "escape": {
@@ -316,7 +314,7 @@
       ]
     },
     "fenced_code_block_basic": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(html|htm|shtml|xhtml|inc|tmpl|tpl)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(html|htm|shtml|xhtml|inc|tmpl|tpl)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -349,7 +347,7 @@
       ]
     },
     "fenced_code_block_bibtex": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(bibtex)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(bibtex)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -382,7 +380,7 @@
       ]
     },
     "fenced_code_block_c": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(c|h)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:([ch])((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -415,7 +413,7 @@
       ]
     },
     "fenced_code_block_clojure": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(clj|cljs|clojure)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(cl(?:j|js|ojure))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -448,7 +446,7 @@
       ]
     },
     "fenced_code_block_coffee": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(coffee|Cakefile|coffee.erb)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(coffee|Cakefile|coffee.erb)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -481,7 +479,7 @@
       ]
     },
     "fenced_code_block_cpp": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(cpp|c\\+\\+|cxx)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(c(?:pp|\\+\\+|xx))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -514,7 +512,7 @@
       ]
     },
     "fenced_code_block_csharp": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(cs|csharp|c#)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(c(?:s|sharp|#))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -547,7 +545,7 @@
       ]
     },
     "fenced_code_block_css": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(css|css.erb)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(css(?:|.erb))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -580,7 +578,7 @@
       ]
     },
     "fenced_code_block_dart": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(dart)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(dart)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -613,7 +611,7 @@
       ]
     },
     "fenced_code_block_diff": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(patch|diff|rej)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(patch|diff|rej)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -646,7 +644,7 @@
       ]
     },
     "fenced_code_block_dockerfile": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(dockerfile|Dockerfile)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(dockerfile|Dockerfile)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -679,7 +677,7 @@
       ]
     },
     "fenced_code_block_dosbatch": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(bat|batch)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(bat(?:|ch))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -712,7 +710,7 @@
       ]
     },
     "fenced_code_block_elixir": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(elixir)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(elixir)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -745,7 +743,7 @@
       ]
     },
     "fenced_code_block_erlang": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(erlang)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(erlang)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -778,7 +776,7 @@
       ]
     },
     "fenced_code_block_fsharp": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(fs|fsharp|f#)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(f(?:s|sharp|#))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -811,7 +809,7 @@
       ]
     },
     "fenced_code_block_git_commit": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(COMMIT_EDITMSG|MERGE_MSG)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(COMMIT_EDITMSG|MERGE_MSG)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -844,7 +842,7 @@
       ]
     },
     "fenced_code_block_git_rebase": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(git-rebase-todo)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(git-rebase-todo)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -877,7 +875,7 @@
       ]
     },
     "fenced_code_block_go": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(go|golang)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(go(?:|lang))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -910,7 +908,7 @@
       ]
     },
     "fenced_code_block_groovy": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(groovy|gvy)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(g(?:roovy|vy))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -943,7 +941,7 @@
       ]
     },
     "fenced_code_block_handlebars": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(handlebars|hbs)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(h(?:andlebars|bs))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -976,7 +974,7 @@
       ]
     },
     "fenced_code_block_ini": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(ini|conf)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(ini|conf)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1009,7 +1007,7 @@
       ]
     },
     "fenced_code_block_java": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(java|bsh)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(java|bsh)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1042,7 +1040,7 @@
       ]
     },
     "fenced_code_block_js": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|dataviewjs|\\{\\.js.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|dataviewjs|\\{\\.js.+?})((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1075,7 +1073,7 @@
       ]
     },
     "fenced_code_block_js_regexp": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(regexp)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(regexp)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1108,7 +1106,7 @@
       ]
     },
     "fenced_code_block_json": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(json|json5|sublime-settings|sublime-menu|sublime-keymap|sublime-mousemap|sublime-theme|sublime-build|sublime-project|sublime-completions)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(json|json5|sublime-settings|sublime-menu|sublime-keymap|sublime-mousemap|sublime-theme|sublime-build|sublime-project|sublime-completions)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1141,7 +1139,7 @@
       ]
     },
     "fenced_code_block_jsonc": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jsonc)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jsonc)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1174,7 +1172,7 @@
       ]
     },
     "fenced_code_block_julia": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(julia|\\{\\.julia.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(julia|\\{\\.julia.+?})((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1207,7 +1205,7 @@
       ]
     },
     "fenced_code_block_latex": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(latex|tex)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(latex|tex)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1240,7 +1238,7 @@
       ]
     },
     "fenced_code_block_less": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(less)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(less)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1273,7 +1271,7 @@
       ]
     },
     "fenced_code_block_log": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(log)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(log)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1306,7 +1304,7 @@
       ]
     },
     "fenced_code_block_lua": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(lua)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(lua)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1339,7 +1337,7 @@
       ]
     },
     "fenced_code_block_makefile": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(Makefile|makefile|GNUmakefile|OCamlMakefile)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(Makefile|makefile|GNUmakefile|OCamlMakefile)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1372,7 +1370,7 @@
       ]
     },
     "fenced_code_block_markdown": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(markdown|md)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(m(?:arkdown|d))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1405,7 +1403,7 @@
       ]
     },
     "fenced_code_block_objc": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(objectivec|objective-c|mm|objc|obj-c|m|h)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(objectivec|objective-c|mm|objc|obj-c|[mh])((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1438,7 +1436,7 @@
       ]
     },
     "fenced_code_block_perl": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(perl|pl|pm|pod|t|PL|psgi|vcl)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(perl|pl|pm|pod|t|PL|psgi|vcl)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1471,7 +1469,7 @@
       ]
     },
     "fenced_code_block_perl6": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(perl6|p6|pl6|pm6|nqp)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(perl6|p6|pl6|pm6|nqp)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1504,7 +1502,7 @@
       ]
     },
     "fenced_code_block_php": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(php|php3|php4|php5|phpt|phtml|aw|ctp)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(php|php3|php4|php5|phpt|phtml|aw|ctp)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1540,7 +1538,7 @@
       ]
     },
     "fenced_code_block_powershell": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(powershell|ps1|psm1|psd1|pwsh)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(p(?:owershell|s1|sm1|sd1|wsh))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1573,7 +1571,7 @@
       ]
     },
     "fenced_code_block_pug": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jade|pug)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jade|pug)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1606,7 +1604,7 @@
       ]
     },
     "fenced_code_block_python": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(python|py|py3|rpy|pyw|cpy|SConstruct|Sconstruct|sconstruct|SConscript|gyp|gypi|\\{\\.python.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(python|py|py3|rpy|pyw|cpy|SConstruct|Sconstruct|sconstruct|SConscript|gyp|gypi|\\{\\.python.+?})((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1639,7 +1637,7 @@
       ]
     },
     "fenced_code_block_r": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(R|r|s|S|Rprofile|\\{\\.r.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:([RrsS]|Rprofile|\\{\\.r.+?})((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1672,7 +1670,7 @@
       ]
     },
     "fenced_code_block_regexp_python": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(re)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(re)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1705,7 +1703,7 @@
       ]
     },
     "fenced_code_block_ruby": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(ruby|rb|rbx|rjs|Rakefile|rake|cgi|fcgi|gemspec|irbrc|Capfile|ru|prawn|Cheffile|Gemfile|Guardfile|Hobofile|Vagrantfile|Appraisals|Rantfile|Berksfile|Berksfile.lock|Thorfile|Puppetfile)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(ruby|rb|rbx|rjs|Rakefile|rake|cgi|fcgi|gemspec|irbrc|Capfile|ru|prawn|Cheffile|Gemfile|Guardfile|Hobofile|Vagrantfile|Appraisals|Rantfile|Berksfile|Berksfile.lock|Thorfile|Puppetfile)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1738,7 +1736,7 @@
       ]
     },
     "fenced_code_block_rust": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(rust|rs|\\{\\.rust.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(rust|rs|\\{\\.rust.+?})((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1771,7 +1769,7 @@
       ]
     },
     "fenced_code_block_scala": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(scala|sbt)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(s(?:cala|bt))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1804,7 +1802,7 @@
       ]
     },
     "fenced_code_block_scss": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(scss)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(scss)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1837,7 +1835,7 @@
       ]
     },
     "fenced_code_block_shell": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(shell|sh|bash|zsh|bashrc|bash_profile|bash_login|profile|bash_logout|.textmate_init|\\{\\.bash.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(shell|sh|bash|zsh|bashrc|bash_profile|bash_login|profile|bash_logout|.textmate_init|\\{\\.bash.+?})((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1870,7 +1868,7 @@
       ]
     },
     "fenced_code_block_sql": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(sql|ddl|dml)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(sql|ddl|dml)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1903,7 +1901,7 @@
       ]
     },
     "fenced_code_block_swift": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(swift)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(swift)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1936,7 +1934,7 @@
       ]
     },
     "fenced_code_block_ts": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(typescript|ts)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(t(?:ypescript|s))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -1969,7 +1967,7 @@
       ]
     },
     "fenced_code_block_tsx": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(tsx)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(tsx)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -2002,7 +2000,7 @@
       ]
     },
     "fenced_code_block_twig": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(twig)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(twig)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -2053,7 +2051,7 @@
       "name": "markup.fenced_code.block.markdown"
     },
     "fenced_code_block_vs_net": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(vb)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(vb)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -2086,7 +2084,7 @@
       ]
     },
     "fenced_code_block_xml": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(xml|xsd|tld|jsp|pt|cpt|dtml|rss|opml)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(xml|xsd|tld|jsp|pt|cpt|dtml|rss|opml)((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -2119,7 +2117,7 @@
       ]
     },
     "fenced_code_block_xsl": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(xsl|xslt)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(xsl(?:|t))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -2152,7 +2150,7 @@
       ]
     },
     "fenced_code_block_yaml": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(yaml|yml)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(y(?:aml|ml))((\\s+|[:,{?])[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"
@@ -2187,7 +2185,7 @@
     "frontMatter": {
       "applyEndPatternLast": 1,
       "begin": "\\A(?=(-{3,}))",
-      "end": "^ {,3}\\1-*[ \\t]*$|^[ \\t]*\\.{3}$",
+      "end": "^(?: {0,3}\\1-*[ \\t]*$|[ \\t]*\\.{3}$)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.end.frontmatter"
@@ -2210,7 +2208,7 @@
               "include": "source.yaml"
             }
           ],
-          "while": "^(?! {,3}\\1-*[ \\t]*$|[ \\t]*\\.{3}$)"
+          "while": "^(?! {0,3}\\1-*[ \\t]*$|[ \\t]*\\.{3}$)"
         }
       ]
     },
@@ -2359,7 +2357,7 @@
           ]
         }
       },
-      "match": "(?:^|\\G)[ ]{0,3}(#{1,6}\\s+(.*?)(\\s+#{1,6})?\\s*)$",
+      "match": "(?:^|\\G) {0,3}(#{1,6}\\s+(.*?)(\\s+#{1,6})?\\s*)$",
       "name": "markup.heading.markdown"
     },
     "heading-setext": {
@@ -2426,7 +2424,7 @@
           ]
         },
         {
-          "begin": "(?i)(^|\\G)\\s*(?=</?[a-zA-Z]+[^\\s/&gt;]*(\\s|$|/?>))",
+          "begin": "(?i)(^|\\G)\\s*(?=</?[a-zA-Z]+[^\\s/\\&gt;]*(\\s|$|/?>))",
           "patterns": [
             {
               "include": "text.html.derivative"
@@ -2435,7 +2433,7 @@
           "while": "^(?!\\s*$)"
         },
         {
-          "begin": "(^|\\G)\\s*(?=(<[a-zA-Z0-9\\-](/?>|\\s.*?>)|</[a-zA-Z0-9\\-]>)\\s*$)",
+          "begin": "(^|\\G)\\s*(?=(<(?:[a-zA-Z0-9-](/?>|\\s.*?>)|/[a-zA-Z0-9-]>))\\s*$)",
           "patterns": [
             {
               "include": "text.html.derivative"
@@ -2502,7 +2500,7 @@
           "name": "punctuation.definition.link.markdown"
         }
       },
-      "match": "(\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])(\\()[ \\t]*((<)((?:\\\\[<>]|[^<>\\n])*)(>)|((?<url>(?>[^\\s()]+)|\\(\\g<url>*\\))*))[ \\t]*(?:((\\().+?(\\)))|((\").+?(\"))|((').+?(')))?\\s*(\\))",
+      "match": "(!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+])*+)(])(\\()[ \\t]*((<)((?:\\\\[<>]|[^<>\\n])*)(>)|((?<url>(?>[^\\s()]+)|\\(\\g<url>*\\))*))[ \\t]*(?:((\\().+?(\\)))|((\").+?(\"))|((').+?(')))?\\s*(\\))",
       "name": "meta.image.inline.markdown"
     },
     "image-ref": {
@@ -2526,7 +2524,7 @@
           "name": "punctuation.definition.constant.markdown"
         }
       },
-      "match": "(\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(.*?)(\\])",
+      "match": "(!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+])*+)(]) ?(\\[)(.*?)(])",
       "name": "meta.image.reference.markdown"
     },
     "inline": {
@@ -2579,7 +2577,7 @@
       ]
     },
     "italic": {
-      "begin": "(?<open>(\\*(?=\\w)|(?<!\\w)\\*|(?<!\\w)\\b_))(?=\\S)(?=(<[^>]*+>|(?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>|\\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+|\\[((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+\\](([ ]?\\[[^\\]]*+\\])|(\\([ \\t]*+<?(.*?)>?[ \\t]*+((?<title>['\"])(.*?)\\k<title>)?\\))))|\\k<open>\\k<open>|(?!(?<=\\S)\\k<open>).)++(?<=\\S)(?=_\\b|\\*)\\k<open>)",
+      "begin": "(?<open>(\\*(?=\\w)|(?<!\\w)\\*|(?<!\\w)\\b_))(?=\\S)(?=(<[^>]*+>|(?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>|\\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+|\\[((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+])*+](( ?\\[[^\\]]*+])|(\\([ \\t]*+<?(.*?)>?[ \\t]*+((?<title>['\"])(.*?)\\k<title>)?\\))))|\\k<open>\\k<open>|(?!(?<=\\S)\\k<open>).)++(?<=\\S)(?=_\\b|\\*)\\k<open>)",
       "captures": {
         "1": {
           "name": "punctuation.definition.italic.markdown"
@@ -2696,7 +2694,7 @@
           "name": "string.other.link.description.title.markdown"
         }
       },
-      "match": "\\s*(\\[)([^]]+?)(\\])(:)[ \\t]*(?:(<)((?:\\\\[<>]|[^<>\\n])*)(>)|(\\S+?))[ \\t]*(?:((\\().+?(\\)))|((\").+?(\"))|((').+?(')))?\\s*$",
+      "match": "\\s*(\\[)([^\\]]+?)(])(:)[ \\t]*(?:(<)((?:\\\\[<>]|[^<>\\n])*)(>)|(\\S+?))[ \\t]*(?:((\\().+?(\\)))|((\").+?(\"))|((').+?(')))?\\s*$",
       "name": "meta.link.reference.def.markdown"
     },
     "link-email": {
@@ -2711,7 +2709,7 @@
           "name": "punctuation.definition.link.markdown"
         }
       },
-      "match": "(<)((?:mailto:)?[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*)(>)",
+      "match": "(<)((?:mailto:)?[a-zA-Z0-9.!#$%\\&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*)(>)",
       "name": "meta.link.email.lt-gt.markdown"
     },
     "link-inet": {
@@ -2803,7 +2801,7 @@
           "name": "punctuation.definition.link.markdown"
         }
       },
-      "match": "(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])(\\()[ \\t]*((<)((?:\\\\[<>]|[^<>\\n])*)(>)|((?<url>(?>[^\\s()]+)|\\(\\g<url>*\\))*))[ \\t]*(?:((\\()[^()]*(\\)))|((\")[^\"]*(\"))|((')[^']*(')))?\\s*(\\))",
+      "match": "(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+])*+)(])(\\()[ \\t]*((<)((?:\\\\[<>]|[^<>\\n])*)(>)|((?<url>(?>[^\\s()]+)|\\(\\g<url>*\\))*))[ \\t]*(?:((\\()[^()]*(\\)))|((\")[^\"]*(\"))|((')[^']*(')))?\\s*(\\))",
       "name": "meta.link.inline.markdown"
     },
     "link-ref": {
@@ -2844,7 +2842,7 @@
           "name": "punctuation.definition.constant.end.markdown"
         }
       },
-      "match": "(?<![\\]\\\\])(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])(\\[)([^\\]]*+)(\\])",
+      "match": "(?<![\\]\\\\])(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+])*+)(])(\\[)([^\\]]*+)(])",
       "name": "meta.link.reference.markdown"
     },
     "link-ref-literal": {
@@ -2865,7 +2863,7 @@
           "name": "punctuation.definition.constant.end.markdown"
         }
       },
-      "match": "(?<![\\]\\\\])(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(\\])",
+      "match": "(?<![\\]\\\\])(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+])*+)(]) ?(\\[)(])",
       "name": "meta.link.reference.literal.markdown"
     },
     "link-ref-shortcut": {
@@ -2880,7 +2878,7 @@
           "name": "punctuation.definition.link.title.end.markdown"
         }
       },
-      "match": "(?<![\\]\\\\])(\\[)((?:[^\\s\\[\\]\\\\]|\\\\[\\[\\]])+?)((?<!\\\\)\\])",
+      "match": "(?<![\\]\\\\])(\\[)((?:[^\\s\\[\\]\\\\]|\\\\[\\[\\]])+?)((?<!\\\\)])",
       "name": "meta.link.reference.markdown"
     },
     "list_paragraph": {
@@ -2897,18 +2895,17 @@
           "include": "#heading-setext"
         }
       ],
-      "while": "(^|\\G)(?!\\s*$|#|[ ]{0,3}([-*_>][ ]{2,}){3,}[ \\t]*$\\n?|[ ]{0,3}[*+->]|[ ]{0,3}[0-9]+\\.)"
+      "while": "(^|\\G)(?!\\s*$|#| {0,3}([-*_>] {2,}){3,}[ \\t]*$\\n?| {0,3}[*+->]| {0,3}[0-9]+\\.)"
     },
     "lists": {
       "patterns": [
         {
-          "begin": "(^|\\G)([ ]{0,3})([*+-])([ \\t])",
+          "begin": "(^|\\G)( {0,3})([*+-])([ \\t])",
           "beginCaptures": {
             "3": {
               "name": "punctuation.definition.list.begin.markdown"
             }
           },
-          "comment": "Currently does not support un-indented second lines.",
           "name": "markup.list.unnumbered.markdown",
           "patterns": [
             {
@@ -2918,10 +2915,10 @@
               "include": "#list_paragraph"
             }
           ],
-          "while": "((^|\\G)([ ]{2,4}|\\t))|(^[ \\t]*$)"
+          "while": "((^|\\G)( {2,4}|\\t))|(^[ \\t]*$)"
         },
         {
-          "begin": "(^|\\G)([ ]{0,3})([0-9]+[\\.\\)])([ \\t])",
+          "begin": "(^|\\G)( {0,3})([0-9]+[.)])([ \\t])",
           "beginCaptures": {
             "3": {
               "name": "punctuation.definition.list.begin.markdown"
@@ -2936,12 +2933,12 @@
               "include": "#list_paragraph"
             }
           ],
-          "while": "((^|\\G)([ ]{2,4}|\\t))|(^[ \\t]*$)"
+          "while": "((^|\\G)( {2,4}|\\t))|(^[ \\t]*$)"
         }
       ]
     },
     "paragraph": {
-      "begin": "(^|\\G)[ ]{0,3}(?=[^ \\t\\n])",
+      "begin": "(^|\\G) {0,3}(?=[^ \\t\\n])",
       "name": "meta.paragraph.markdown",
       "patterns": [
         {
@@ -2954,7 +2951,7 @@
           "include": "#heading-setext"
         }
       ],
-      "while": "(^|\\G)((?=\\s*[-=]{3,}\\s*$)|[ ]{4,}(?=[^ \\t\\n]))"
+      "while": "(^|\\G)((?=\\s*[-=]{3,}\\s*$)| {4,}(?=[^ \\t\\n]))"
     },
     "raw": {
       "captures": {
@@ -2969,12 +2966,12 @@
       "name": "markup.inline.raw.string.markdown"
     },
     "raw_block": {
-      "begin": "(^|\\G)([ ]{4}|\\t)",
+      "begin": "(^|\\G)( {4}|\\t)",
       "name": "markup.raw.block.markdown",
-      "while": "(^|\\G)([ ]{4}|\\t)"
+      "while": "(^|\\G)( {4}|\\t)"
     },
     "separator": {
-      "match": "(^|\\G)[ ]{0,3}([\\*\\-\\_])([ ]{0,2}\\2){2,}[ \\t]*$\\n?",
+      "match": "(^|\\G) {0,3}([*\\-_])( {0,2}\\2){2,}[ \\t]*$\\n?",
       "name": "meta.separator.markdown"
     },
     "strikethrough": {
diff --git a/resources/languages/marko.json b/resources/languages/marko.json
index 6f249c5..b1bd1f6 100644
--- a/resources/languages/marko.json
+++ b/resources/languages/marko.json
@@ -15,9 +15,8 @@
           "name": "punctuation.section.scope.begin.marko.css"
         }
       },
-      "comment": "CSS style block, eg: style { color: green }",
       "contentName": "source.css",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.marko.css"
@@ -43,9 +42,8 @@
           "name": "punctuation.section.scope.begin.marko.css"
         }
       },
-      "comment": "Less style block, eg: style.less { color: green }",
       "contentName": "source.less",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.marko.css"
@@ -71,9 +69,8 @@
           "name": "punctuation.section.scope.begin.marko.css"
         }
       },
-      "comment": "SCSS style block, eg: style.scss { color: green }",
       "contentName": "source.scss",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.marko.css"
@@ -93,7 +90,6 @@
           "name": "keyword.control.static.marko"
         }
       },
-      "comment": "Top level blocks parsed as JavaScript",
       "contentName": "source.js",
       "end": "(?=\\n|$)",
       "name": "meta.embedded.js",
@@ -124,7 +120,6 @@
               "name": "support.function.attribute-name.marko"
             }
           },
-          "comment": "Attribute with optional value",
           "end": "(?=.|$)",
           "name": "meta.marko-attribute",
           "patterns": [
@@ -143,7 +138,6 @@
                   ]
                 }
               },
-              "comment": "Attribute value",
               "contentName": "source.js",
               "end": "(?=.|$)",
               "name": "meta.embedded.js",
@@ -163,7 +157,6 @@
               "name": "keyword.operator.spread.marko"
             }
           },
-          "comment": "A ...spread attribute",
           "contentName": "source.js",
           "end": "(?=.|$)",
           "name": "meta.marko-spread-attribute",
@@ -184,7 +177,6 @@
               ]
             }
           },
-          "comment": "Consume any whitespace after a comma",
           "end": "(?!\\S)"
         },
         {
@@ -202,7 +194,6 @@
           "name": "punctuation.section.scope.begin.marko"
         }
       },
-      "comment": "--- HTML block within concise mode content. ---",
       "end": "\\1",
       "endCaptures": {
         "1": {
@@ -243,7 +234,6 @@
           ]
         }
       },
-      "comment": "-- HTML line within concise mode content. (content-html-mode w/o scriptlet)",
       "match": "\\s*(--+)(?=\\s+\\S)(.*$)",
       "name": "meta.section.marko-html-line"
     },
@@ -295,7 +285,6 @@
           "name": "punctuation.section.scope.begin.marko"
         }
       },
-      "comment": "--- Embedded concise script content block. ---",
       "end": "(\\2)|(?=^(?!\\1)\\s*\\S)",
       "endCaptures": {
         "1": {
@@ -317,7 +306,6 @@
           "name": "punctuation.section.scope.begin.marko"
         }
       },
-      "comment": "-- Embedded concise script content line.",
       "end": "$",
       "name": "meta.section.marko-script-line",
       "patterns": [
@@ -333,7 +321,6 @@
           "name": "punctuation.section.scope.begin.marko"
         }
       },
-      "comment": "--- Embedded concise style content block. ---",
       "contentName": "source.css",
       "end": "(\\2)|(?=^(?!\\1)\\s*\\S)",
       "endCaptures": {
@@ -355,7 +342,6 @@
           "name": "punctuation.section.scope.begin.marko"
         }
       },
-      "comment": "--- Embedded concise style content block. ---",
       "contentName": "source.less",
       "end": "(\\2)|(?=^(?!\\1)\\s*\\S)",
       "endCaptures": {
@@ -377,7 +363,6 @@
           "name": "punctuation.section.scope.begin.marko"
         }
       },
-      "comment": "--- Embedded concise style content block. ---",
       "contentName": "source.scss",
       "end": "(\\2)|(?=^(?!\\1)\\s*\\S)",
       "endCaptures": {
@@ -400,7 +385,6 @@
           "name": "punctuation.section.scope.begin.marko"
         }
       },
-      "comment": "-- Embedded concise style content line.",
       "contentName": "source.css",
       "end": "$",
       "name": "meta.section.marko-style-line",
@@ -418,7 +402,6 @@
           "name": "punctuation.section.scope.begin.marko"
         }
       },
-      "comment": "-- Embedded concise style content line.",
       "contentName": "source.less",
       "end": "$",
       "name": "meta.section.marko-style-line",
@@ -436,7 +419,6 @@
           "name": "punctuation.section.scope.begin.marko"
         }
       },
-      "comment": "-- Embedded concise style content line.",
       "contentName": "source.scss",
       "end": "$",
       "name": "meta.section.marko-style-line",
@@ -447,7 +429,6 @@
       ]
     },
     "content-concise-mode": {
-      "comment": "Concise mode content block.",
       "name": "meta.marko-concise-content",
       "patterns": [
         {
@@ -469,11 +450,9 @@
           "include": "#tag-html"
         },
         {
-          "comment": "A concise html tag.",
           "patterns": [
             {
               "begin": "^(\\s*)(?=style\\.less\\b)",
-              "comment": "Concise style tag less",
               "patterns": [
                 {
                   "include": "#concise-open-tag-content"
@@ -489,7 +468,6 @@
             },
             {
               "begin": "^(\\s*)(?=style\\.scss\\b)",
-              "comment": "Concise style tag scss",
               "patterns": [
                 {
                   "include": "#concise-open-tag-content"
@@ -505,7 +483,6 @@
             },
             {
               "begin": "^(\\s*)(?=style\\b)",
-              "comment": "Concise style tag",
               "patterns": [
                 {
                   "include": "#concise-open-tag-content"
@@ -521,7 +498,6 @@
             },
             {
               "begin": "^(\\s*)(?=script\\b)",
-              "comment": "Concise script tag",
               "patterns": [
                 {
                   "include": "#concise-open-tag-content"
@@ -537,7 +513,6 @@
             },
             {
               "begin": "^(\\s*)(?=[a-zA-Z0-9_$@])",
-              "comment": "Normal concise tag",
               "patterns": [
                 {
                   "include": "#concise-open-tag-content"
@@ -600,7 +575,6 @@
       ]
     },
     "content-html-mode": {
-      "comment": "HTML mode content block.",
       "patterns": [
         {
           "include": "#scriptlet"
@@ -631,9 +605,8 @@
         },
         {
           "begin": "(?<=\\))\\s*(?=\\{)",
-          "comment": "Attribute method shorthand following parens",
           "contentName": "source.js",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "name": "meta.embedded.js",
           "patterns": [
             {
@@ -652,7 +625,6 @@
               "name": "punctuation.definition.comment.marko"
             }
           },
-          "comment": "HTML comments, doctypes & cdata",
           "end": "\\2>",
           "endCaptures": {
             "0": {
@@ -668,7 +640,6 @@
               "name": "punctuation.definition.comment.marko"
             }
           },
-          "comment": "Preserved HTML comment tag",
           "end": "</html-comment>",
           "endCaptures": {
             "0": {
@@ -680,12 +651,11 @@
       ]
     },
     "invalid": {
-      "match": "[^\\s]",
+      "match": "\\S",
       "name": "invalid.illegal.character-not-allowed-here.marko"
     },
     "javascript-args": {
       "begin": "(?=\\()",
-      "comment": "Javascript style arguments",
       "contentName": "source.js",
       "end": "(?<=\\))",
       "name": "meta.embedded.js",
@@ -705,13 +675,11 @@
           ]
         }
       },
-      "comment": "JavaScript // single line comment",
       "contentName": "source.js",
       "match": "\\s*//.*$"
     },
     "javascript-comment-multiline": {
       "begin": "\\s*(?=/\\*)",
-      "comment": "JavaScript /* block comment */",
       "contentName": "source.js",
       "end": "(?<=\\*/)",
       "patterns": [
@@ -731,7 +699,6 @@
       ]
     },
     "javascript-enclosed": {
-      "comment": "Matches JavaScript content and ensures enclosed blocks are matched.",
       "patterns": [
         {
           "include": "#javascript-comments"
@@ -740,7 +707,7 @@
           "include": "#javascript-args"
         },
         {
-          "begin": "(?={)",
+          "begin": "(?=\\{)",
           "end": "(?<=})",
           "patterns": [
             {
@@ -803,7 +770,7 @@
           ]
         },
         {
-          "begin": "\\s*(?:(?:\\b(?:new|typeof|instanceof|in)\\b)|\\&\\&|\\|\\||[\\^|&]|[!=]=|[!=]==|<|<[=<]|=>|[?:]|[-+*%](?!-))",
+          "begin": "\\s*(?:\\b(?:new|typeof|instanceof|in)\\b|&&|\\|\\||[\\^|\\&]|[!=]=|[!=]==|<|<[=<]|=>|[?:]|[-+*%](?!-))",
           "captures": {
             "0": {
               "patterns": [
@@ -832,7 +799,6 @@
               ]
             }
           },
-          "comment": "Match identifiers and member expressions",
           "match": "[0-9a-zA-Z$_.]+"
         }
       ]
@@ -854,7 +820,6 @@
         },
         {
           "begin": "(?= )",
-          "comment": "Attributes begin after the first space within the tag name",
           "end": "(?=/?>)",
           "patterns": [
             {
@@ -865,13 +830,12 @@
       ]
     },
     "placeholder": {
-      "begin": "\\$!?{",
+      "begin": "\\$!?\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.begin.js"
         }
       },
-      "comment": "${ } placeholder",
       "contentName": "source.js",
       "end": "}",
       "endCaptures": {
@@ -892,7 +856,6 @@
           "name": "keyword.control.scriptlet.marko"
         }
       },
-      "comment": "An inline JavaScript scriptlet.",
       "contentName": "source.js",
       "end": "$",
       "name": "meta.embedded.js",
@@ -903,13 +866,11 @@
       ]
     },
     "tag-before-attrs": {
-      "comment": "Everything in a tag before the attributes content",
       "patterns": [
         {
           "include": "#tag-name"
         },
         {
-          "comment": "Shorthand class or ID attribute",
           "match": "[#.][a-zA-Z0-9_$][a-zA-Z0-9_$-]*",
           "name": "entity.other.attribute-name.marko"
         },
@@ -920,13 +881,11 @@
               "name": "punctuation.separator.key-value.marko"
             }
           },
-          "comment": "Variable for a tag",
           "contentName": "source.js",
-          "end": "(?=:?\\=|\\s|>|$|\\||\\(|/)",
+          "end": "(?=:?=|[\\s>]|$|[|(/])",
           "name": "meta.embedded.js",
           "patterns": [
             {
-              "comment": "Match identifiers",
               "match": "[a-zA-Z$_][0-9a-zA-Z$_]*",
               "name": "variable.other.constant.object.js"
             },
@@ -956,7 +915,6 @@
               ]
             }
           },
-          "comment": "Default attribute value",
           "contentName": "source.js",
           "end": "(?=.|$)",
           "name": "meta.embedded.js",
@@ -973,7 +931,6 @@
               "name": "punctuation.section.scope.begin.marko"
             }
           },
-          "comment": "Parameters for a tag",
           "end": "\\|",
           "endCaptures": {
             "0": {
@@ -995,7 +952,6 @@
       ]
     },
     "tag-html": {
-      "comment": "Matches an HTML tag and its contents",
       "patterns": [
         {
           "begin": "\\s*(<)(?=(area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)\\b)",
@@ -1004,7 +960,6 @@
               "name": "punctuation.definition.tag.end.marko"
             }
           },
-          "comment": "HTML void elements",
           "end": "/?>",
           "endCaptures": {
             "0": {
@@ -1024,8 +979,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "comment": "HTML style tag with less",
-          "end": "/>|(?<=\\>)",
+          "end": "/>|(?<=>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1042,7 +996,6 @@
                   "name": "punctuation.definition.tag.end.marko"
                 }
               },
-              "comment": "Style body content",
               "contentName": "source.less",
               "end": "\\s*(</)(style)?(>)",
               "endCaptures": {
@@ -1075,8 +1028,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "comment": "HTML style tag with scss",
-          "end": "/>|(?<=\\>)",
+          "end": "/>|(?<=>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1093,7 +1045,6 @@
                   "name": "punctuation.definition.tag.end.marko"
                 }
               },
-              "comment": "Style body content",
               "contentName": "source.less",
               "end": "\\s*(</)(style)?(>)",
               "endCaptures": {
@@ -1126,8 +1077,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "comment": "HTML style tag",
-          "end": "/>|(?<=\\>)",
+          "end": "/>|(?<=>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1144,7 +1094,6 @@
                   "name": "punctuation.definition.tag.end.marko"
                 }
               },
-              "comment": "Style body content",
               "contentName": "source.css",
               "end": "\\s*(</)(style)?(>)",
               "endCaptures": {
@@ -1177,8 +1126,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "comment": "HTML script tag",
-          "end": "/>|(?<=\\>)",
+          "end": "/>|(?<=>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1195,7 +1143,6 @@
                   "name": "punctuation.definition.tag.end.marko"
                 }
               },
-              "comment": "Script body content",
               "contentName": "source.js",
               "end": "\\s*(</)(script)?(>)",
               "endCaptures": {
@@ -1228,8 +1175,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "comment": "HTML normal tag",
-          "end": "/>|(?<=\\>)",
+          "end": "/>|(?<=>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1246,7 +1192,6 @@
                   "name": "punctuation.definition.tag.end.marko"
                 }
               },
-              "comment": "Body content",
               "end": "\\s*(</)([a-zA-Z0-9_$:@-]+)?(.*?)(>)",
               "endCaptures": {
                 "1": {
@@ -1283,13 +1228,12 @@
     "tag-name": {
       "patterns": [
         {
-          "begin": "\\${",
+          "begin": "\\$\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.template-expression.begin.js"
             }
           },
-          "comment": "Dynamic tag.",
           "end": "}",
           "endCaptures": {
             "0": {
@@ -1313,22 +1257,18 @@
             "3": {
               "patterns": [
                 {
-                  "comment": "Core tag.",
                   "match": "(attrs|return|import)(?=\\b)",
                   "name": "support.type.builtin.marko"
                 },
                 {
-                  "comment": "Core tag.",
                   "match": "(for|if|while|else-if|else|macro|tag|await|let|const|effect|set|get|id|lifecycle)(?=\\b)",
                   "name": "support.function.marko"
                 },
                 {
-                  "comment": "Attribute tag.",
                   "match": "@.+",
                   "name": "entity.other.attribute-name.marko"
                 },
                 {
-                  "comment": "Native or userland tag.",
                   "match": ".+",
                   "name": "entity.name.tag.marko"
                 }
diff --git a/resources/languages/matlab.json b/resources/languages/matlab.json
index c04ceb9..caca7e0 100644
--- a/resources/languages/matlab.json
+++ b/resources/languages/matlab.json
@@ -6,7 +6,6 @@
   "name": "matlab",
   "patterns": [
     {
-      "comment": "This and #all_after_command_dual are split out so #command_dual can be excluded in things like (), {}, []",
       "include": "#all_before_command_dual"
     },
     {
@@ -336,13 +335,12 @@
       ]
     },
     "braced_validator_list": {
-      "begin": "\\s*({)\\s*",
+      "begin": "\\s*(\\{)\\s*",
       "beginCaptures": {
         "1": {
           "name": "storage.type.matlab"
         }
       },
-      "comment": "Validator functions. Treated as a recursive group to permit nested brackets, quotes, etc.",
       "end": "(})",
       "endCaptures": {
         "1": {
@@ -365,7 +363,7 @@
               "name": "storage.type.matlab"
             }
           },
-          "match": "([^{}}'\"\\.]+)"
+          "match": "([^{}'\".]+)"
         },
         {
           "match": "\\.",
@@ -469,7 +467,7 @@
                           "name": "constant.language.boolean.matlab"
                         },
                         {
-                          "match": "public|protected|private",
+                          "match": "p(?:ublic|rotected|rivate)",
                           "name": "constant.language.access.matlab"
                         }
                       ]
@@ -514,7 +512,7 @@
                           "name": "constant.language.boolean.matlab"
                         },
                         {
-                          "match": "public|protected|private",
+                          "match": "p(?:ublic|rotected|rivate)",
                           "name": "constant.language.access.matlab"
                         }
                       ]
@@ -556,7 +554,7 @@
                           "name": "constant.language.boolean.matlab"
                         },
                         {
-                          "match": "public|protected|private",
+                          "match": "p(?:ublic|rotected|rivate)",
                           "name": "constant.language.access.matlab"
                         }
                       ]
@@ -616,17 +614,16 @@
           "name": "comment.line.percentage.matlab"
         }
       },
-      "comment": "  1        2                                  3                                                    4                                                  5                                                    6                                                         7                                                                             8                 9                            10                   11                      12                         13                   14                                                               1516       17                                                             18                                                                                                                               19                      20                                     21                                    22                                      23                                         24                                         25                                                                         26            27                 28",
-      "match": "^\\s*(([b-df-hk-moq-zA-HJ-MO-Z]\\w*|a|an|a([A-Za-mo-z0-9_]\\w*|n[A-Za-rt-z0-9_]\\w*|ns\\w+)|e|ep|e([A-Za-oq-z0-9_]\\w*|p[A-Za-rt-z0-9_]\\w*|ps\\w+)|in|i([A-Za-mo-z0-9_]\\w*|n[A-Za-eg-z0-9_]\\w*|nf\\w+)|I|In|I([A-Za-mo-z0-9_]\\w*|n[A-Za-eg-z0-9_]\\w*|nf\\w+)|j\\w+|N|Na|N([A-Zb-z0-9_]\\w*|a[A-MO-Za-z0-9_]\\w*|aN\\w+)|n|na|nar|narg|nargi|nargo|nargou|n([A-Zb-z0-9_]\\w*|a([A-Za-mo-qs-z0-9_]\\w*|n\\w+|r([A-Za-fh-z0-9_]\\w*|g([A-Za-hj-nq-z0-9_]\\w*|i([A-Za-mo-z0-9_]\\w*|n\\w+)|o([A-Za-tv-z0-9_]\\w*|u([A-Za-su-z]\\w*|t\\w+))))))|p|p[A-Za-hj-z0-9_]\\w*|pi\\w+)\\s+((([^\\s;,%()=.{&|~<>:+\\-*/\\\\@^'\"]|(?=')|(?=\"))|(\\.\\^|\\.\\*|\\./|\\.\\\\|\\.'|\\.\\(|&&|==|\\|\\||&(?=[^&])|\\|(?=[^\\|])|~=|<=|>=|~(?!=)|<(?!=)|>(?!=)|:|\\+|-|\\*|/|\\\\|@|\\^)([^\\s]|\\s*(?=%)|\\s+$|\\s+(,|;|\\)|}|\\]|&|\\||<|>|=|:|\\*|/|\\\\|\\^|@|(\\.[^\\d.]|\\.\\.[^.])))|(\\.[^^*/\\\\'(\\sA-Za-z]))([^%]|'[^']*'|\"[^\"]*\")*|(\\.(?=\\s)|\\.[A-Za-z]|(?={))([^(=\\'\"%]|==|'[^']*'|\"[^\"]*\"|\\(|\\([^)%]*\\)|\\[|\\[[^\\]%]*\\]|{|{[^}%]*})*(\\.\\.\\.[^%]*)?((?=%)|$)))(%.*)?$"
+      "match": "^\\s*(([b-df-hk-moq-zA-HJ-MO-Z]\\w*|a|an|a([A-Za-mo-z0-9_]\\w*|n[A-Za-rt-z0-9_]\\w*|ns\\w+)|e|ep|e([A-Za-oq-z0-9_]\\w*|p[A-Za-rt-z0-9_]\\w*|ps\\w+)|in|i([A-Za-mo-z0-9_]\\w*|n[A-Za-eg-z0-9_]\\w*|nf\\w+)|I|In|I([A-Za-mo-z0-9_]\\w*|n[A-Za-eg-z0-9_]\\w*|nf\\w+)|j\\w+|N|Na|N([A-Zb-z0-9_]\\w*|a[A-MO-Za-z0-9_]\\w*|aN\\w+)|n|na|nar|narg|nargi|nargo|nargou|n([A-Zb-z0-9_]\\w*|a([A-Za-mo-qs-z0-9_]\\w*|n\\w+|r([A-Za-fh-z0-9_]\\w*|g([A-Za-hj-nq-z0-9_]\\w*|i([A-Za-mo-z0-9_]\\w*|n\\w+)|o([A-Za-tv-z0-9_]\\w*|u([A-Za-su-z]\\w*|t\\w+))))))|p|p[A-Za-hj-z0-9_]\\w*|pi\\w+)\\s+((([^\\s;,%()=.{\\&|~<>:+\\-*/\\\\@^'\"]|(?=')|(?=\"))|(\\.\\^|\\.\\*|\\./|\\.\\\\|\\.'|\\.\\(|&&|==|\\|\\||&(?=[^\\&])|\\|(?=[^|])|~=|<=|>=|~(?!=)|<(?!=)|>(?!=)|[:+\\-*/\\\\@^])(\\S|\\s*(?=%)|\\s+$|\\s+([,;)}\\]\\&|<>=:*/\\\\^@]|(\\.(?:[^\\d.]|\\.[^.]))))|(\\.[^^*/\\\\'(\\sA-Za-z]))([^%]|'[^']*'|\"[^\"]*\")*|(\\.(?=\\s)|\\.[A-Za-z]|(?=\\{))([^(='\"%]|==|'[^']*'|\"[^\"]*\"|\\(|\\([^)%]*\\)|\\[|\\[[^\\]%]*]|\\{|\\{[^}%]*})*(\\.\\.\\.[^%]*)?((?=%)|$)))(%.*)?$"
     },
     "comment_block": {
-      "begin": "(^[\\s]*)%\\{[^\\n\\S]*+\\n",
+      "begin": "(^\\s*)%\\{[^\\n\\S]*+\\n",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.matlab"
         }
       },
-      "end": "^[\\s]*%\\}[^\\n\\S]*+(?:\\n|$)",
+      "end": "^\\s*%}[^\\n\\S]*+(?:\\n|$)",
       "name": "comment.block.percentage.matlab",
       "patterns": [
         {
@@ -694,11 +691,10 @@
       ]
     },
     "conjugate_transpose": {
-      "match": "((?<=[^\\s])|(?<=\\])|(?<=\\))|(?<=\\}))'",
+      "match": "((?<=\\S)|(?<=])|(?<=\\))|(?<=}))'",
       "name": "keyword.operator.transpose.matlab"
     },
     "constants": {
-      "comment": "MATLAB Constants",
       "match": "(?<!\\.)\\b(eps|false|Inf|inf|intmax|intmin|namelengthmax|NaN|nan|on|off|realmax|realmin|true|pi)\\b",
       "name": "constant.language.matlab"
     },
@@ -713,8 +709,7 @@
     },
     "curly_brackets": {
       "begin": "\\{",
-      "comment": "We don't include $self here to avoid matching command syntax inside (), [], {}",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#end_in_parens"
@@ -729,20 +724,18 @@
           "include": "#end_in_parens"
         },
         {
-          "comment": "These block keywords pick up any such missed keywords when the block matching for things like (), if-end, etc. don't work. Useful for when someone has partially written",
           "include": "#block_keywords"
         }
       ]
     },
     "end_in_parens": {
-      "comment": "end as operator symbol",
       "match": "\\bend\\b",
       "name": "keyword.operator.symbols.matlab"
     },
     "function": {
       "patterns": [
         {
-          "begin": "(^\\s*)(function)\\s+(?:(?:(\\[)([^\\]]*)(\\])|([a-zA-Z][a-zA-Z0-9_]*))\\s*=\\s*)?([a-zA-Z][a-zA-Z0-9_]*(\\.[a-zA-Z][a-zA-Z0-9_]*)*)\\s*",
+          "begin": "(^\\s*)(function)\\s+(?:(?:(\\[)([^\\]]*)(])|([a-zA-Z][a-zA-Z0-9_]*))\\s*=\\s*)?([a-zA-Z][a-zA-Z0-9_]*(\\.[a-zA-Z][a-zA-Z0-9_]*)*)\\s*",
           "beginCaptures": {
             "2": {
               "name": "storage.type.function.matlab"
@@ -839,7 +832,7 @@
     },
     "indexing_curly_brackets": {
       "Comment": "Match identifier{idx, idx, } and stop at newline without ... This helps with partially written code like x{idx ",
-      "begin": "([a-zA-Z][a-zA-Z0-9_\\.]*\\s*)\\{",
+      "begin": "([a-zA-Z][a-zA-Z0-9_.]*\\s*)\\{",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -849,8 +842,7 @@
           ]
         }
       },
-      "comment": "We don't include $self here to avoid matching command syntax inside (), [], {}",
-      "end": "(\\}|(?<!\\.\\.\\.).\\n)",
+      "end": "(}|(?<!\\.\\.\\.).\\n)",
       "patterns": [
         {
           "include": "#end_in_parens"
@@ -865,7 +857,6 @@
           "include": "#end_in_parens"
         },
         {
-          "comment": "These block keywords pick up any such missed keywords when the block matching for things like (), if-end, etc. don't work. Useful for when someone has partially written",
           "include": "#block_keywords"
         }
       ]
@@ -879,23 +870,19 @@
           "name": "comment.line.continuation.matlab"
         }
       },
-      "comment": "Line continuations",
       "match": "(\\.\\.\\.)(.*)$",
       "name": "meta.linecontinuation.matlab"
     },
     "numbers": {
-      "comment": "Valid numbers: 1, .1, 1.1, .1e1, 1.1e1, 1e1, 1i, 1j, 1e2j",
-      "match": "(?<=[\\s\\-\\+\\*\\/\\\\=:\\[\\(\\{,]|^)\\d*\\.?\\d+([eE][+-]?\\d)?([0-9&&[^\\.]])*(i|j)?\\b",
+      "match": "(?<=[\\s\\-+*/\\\\=:\\[({,]|^)\\d*\\.?\\d+([eE][+-]?\\d)?([0-9&&[^.]])*([ij])?\\b",
       "name": "constant.numeric.matlab"
     },
     "operators": {
-      "comment": "Operator symbols",
-      "match": "(?<=\\s)(==|~=|>|>=|<|<=|&|&&|:|\\||\\|\\||\\+|-|\\*|\\.\\*|/|\\./|\\\\|\\.\\\\|\\^|\\.\\^)(?=\\s)",
+      "match": "(?<=\\s)(==|~=|>|>=|<|<=|&|&&|[:|]|\\|\\||[+\\-*]|\\.\\*|/|\\./|\\\\|\\.\\\\|\\^|\\.\\^)(?=\\s)",
       "name": "keyword.operator.symbols.matlab"
     },
     "parens": {
       "begin": "\\(",
-      "comment": "We don't include $self here to avoid matching command syntax inside (), [], {}",
       "end": "(\\)|(?<!\\.\\.\\.).\\n)",
       "patterns": [
         {
@@ -908,15 +895,13 @@
           "include": "#all_after_command_dual"
         },
         {
-          "comment": "These block keywords pick up any such missed keywords when the block matching for things like (), if-end, etc. don't work. Useful for when someone has partially written",
           "include": "#block_keywords"
         }
       ]
     },
     "square_brackets": {
       "begin": "\\[",
-      "comment": "We don't include $self here to avoid matching command syntax inside (), [], {}",
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#all_before_command_dual"
@@ -925,7 +910,6 @@
           "include": "#all_after_command_dual"
         },
         {
-          "comment": "These block keywords pick up any such missed keywords when the block matching for things like (), if-end, etc. don't work. Useful for when someone has partially written",
           "include": "#block_keywords"
         }
       ]
@@ -941,18 +925,16 @@
               "name": "punctuation.definition.string.begin.matlab"
             }
           },
-          "comment": "Shell command",
           "match": "^\\s*((!).*$\\n?)"
         },
         {
-          "begin": "((?<=(\\[|\\(|\\{|=|\\s|;|:|,|~|<|>|&|\\||-|\\+|\\*|/|\\\\|\\.|\\^))|^)'",
+          "begin": "((?<=([\\[({=\\s;:,~<>\\&|\\-+*/\\\\.^]))|^)'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.matlab"
             }
           },
-          "comment": "Character vector literal (single-quoted)",
-          "end": "'(?=(\\[|\\(|\\{|\\]|\\)|\\}|=|~|<|>|&|\\||-|\\+|\\*|/|\\\\|\\.|\\^|\\s|;|:|,))",
+          "end": "'(?=([\\[({\\])}=~<>\\&|\\-+*/\\\\.^\\s;:,]))",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.matlab"
@@ -969,21 +951,19 @@
               "name": "invalid.illegal.unescaped-quote.matlab"
             },
             {
-              "comment": "Operator symbols",
-              "match": "((\\%([\\+\\-0]?\\d{0,3}(\\.\\d{1,3})?)(c|d|e|E|f|g|G|s|((b|t)?(o|u|x|X))))|\\%\\%|\\\\(b|f|n|r|t|\\\\))",
+              "match": "((%([+\\-0]?\\d{0,3}(\\.\\d{1,3})?)([cdeEfgGs]|(([bt])?([ouxX]))))|%%|\\\\([bfnrt\\\\]))",
               "name": "constant.character.escape.matlab"
             }
           ]
         },
         {
-          "begin": "((?<=(\\[|\\(|\\{|=|\\s|;|:|,|~|<|>|&|\\||-|\\+|\\*|/|\\\\|\\.|\\^))|^)\"",
+          "begin": "((?<=([\\[({=\\s;:,~<>\\&|\\-+*/\\\\.^]))|^)\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.matlab"
             }
           },
-          "comment": "String literal (double-quoted)",
-          "end": "\"(?=(\\[|\\(|\\{|\\]|\\)|\\}|=|~|<|>|&|\\||-|\\+|\\*|/|\\\\|\\.|\\^|\\||\\s|;|:|,))",
+          "end": "\"(?=([\\[({\\])}=~<>\\&|\\-+*/\\\\.^\\s;:,]))",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.matlab"
@@ -1008,14 +988,12 @@
       "name": "keyword.operator.transpose.matlab"
     },
     "validator_strings": {
-      "comment": "Simplified string patterns nested inside validator functions which don't change scopes of matches.",
       "patterns": [
         {
           "patterns": [
             {
-              "begin": "((?<=(\\[|\\(|\\{|=|\\s|;|:|,|~|<|>|&|\\||-|\\+|\\*|/|\\\\|\\.|\\^))|^)'",
-              "comment": "Character vector literal (single-quoted)",
-              "end": "'(?=(\\[|\\(|\\{|\\]|\\)|\\}|=|~|<|>|&|\\||-|\\+|\\*|/|\\\\|\\.|\\^|\\s|;|:|,))",
+              "begin": "((?<=([\\[({=\\s;:,~<>\\&|\\-+*/\\\\.^]))|^)'",
+              "end": "'(?=([\\[({\\])}=~<>\\&|\\-+*/\\\\.^\\s;:,]))",
               "name": "storage.type.matlab",
               "patterns": [
                 {
@@ -1030,9 +1008,8 @@
               ]
             },
             {
-              "begin": "((?<=(\\[|\\(|\\{|=|\\s|;|:|,|~|<|>|&|\\||-|\\+|\\*|/|\\\\|\\.|\\^))|^)\"",
-              "comment": "String literal (double-quoted)",
-              "end": "\"(?=(\\[|\\(|\\{|\\]|\\)|\\}|=|~|<|>|&|\\||-|\\+|\\*|/|\\\\|\\.|\\^|\\||\\s|;|:|,))",
+              "begin": "((?<=([\\[({=\\s;:,~<>\\&|\\-+*/\\\\.^]))|^)\"",
+              "end": "\"(?=([\\[({\\])}=~<>\\&|\\-+*/\\\\.^\\s;:,]))",
               "name": "storage.type.matlab",
               "patterns": [
                 {
@@ -1051,8 +1028,7 @@
       ]
     },
     "validators": {
-      "begin": "\\s*[;]?\\s*([a-zA-Z][a-zA-Z0-9_\\.\\?]*)",
-      "comment": "Property and argument validation. Match an identifier allowing . and ?.",
+      "begin": "\\s*;?\\s*([a-zA-Z][a-zA-Z0-9_.?]*)",
       "end": "([;\\n%=].*)",
       "endCaptures": {
         "1": {
@@ -1067,8 +1043,7 @@
                   ]
                 }
               },
-              "comment": "Match comments",
-              "match": "([%].*)"
+              "match": "(%.*)"
             },
             {
               "captures": {
@@ -1080,7 +1055,6 @@
                   ]
                 }
               },
-              "comment": "Handle things like arg = val; nextArg",
               "match": "(=[^;]*)"
             },
             {
@@ -1093,7 +1067,6 @@
                   ]
                 }
               },
-              "comment": "End of property/argument patterns which start a new property/argument. Look for beginning of identifier after semicolon. Otherwise treat as regular code.",
               "match": "([\\n;]\\s*[a-zA-Z].*)"
             },
             {
@@ -1107,13 +1080,11 @@
           "include": "#line_continuation"
         },
         {
-          "comment": "Size declaration",
-          "match": "\\s*(\\([^\\)]*\\))",
+          "match": "\\s*(\\([^)]*\\))",
           "name": "storage.type.matlab"
         },
         {
-          "comment": "Type declaration",
-          "match": "([a-zA-Z][a-zA-Z0-9_\\.]*)",
+          "match": "([a-zA-Z][a-zA-Z0-9_.]*)",
           "name": "storage.type.matlab"
         },
         {
@@ -1122,7 +1093,6 @@
       ]
     },
     "variables": {
-      "comment": "MATLAB variables",
       "match": "(?<!\\.)\\b(nargin|nargout|varargin|varargout)\\b",
       "name": "variable.other.function.matlab"
     }
diff --git a/resources/languages/mdx.json b/resources/languages/mdx.json
index 470bed3..0266f01 100644
--- a/resources/languages/mdx.json
+++ b/resources/languages/mdx.json
@@ -20,7 +20,7 @@
           "name": "string.other.strong.emphasis.asterisk.mdx"
         },
         {
-          "match": "(?<=[\\p{L}\\p{N}])_{3,}(?![\\p{L}\\p{N}])|(?<=\\p{P})_{3,}|(?<![\\p{L}\\p{N}]|\\p{P})_{3,}(?!\\s)",
+          "match": "(?<=[\\p{L}\\p{N}])_{3,}(?![\\p{L}\\p{N}])|(?<=\\p{P})_{3,}|(?<![\\p{L}\\p{N}\\p{P}])_{3,}(?!\\s)",
           "name": "string.other.strong.emphasis.underscore.mdx"
         },
         {
@@ -28,7 +28,7 @@
           "name": "string.other.strong.asterisk.mdx"
         },
         {
-          "match": "(?<=[\\p{L}\\p{N}])_{2}(?![\\p{L}\\p{N}])|(?<=\\p{P})_{2}|(?<![\\p{L}\\p{N}]|\\p{P})_{2}(?!\\s)",
+          "match": "(?<=[\\p{L}\\p{N}])_{2}(?![\\p{L}\\p{N}])|(?<=\\p{P})_{2}|(?<![\\p{L}\\p{N}\\p{P}])_{2}(?!\\s)",
           "name": "string.other.strong.underscore.mdx"
         },
         {
@@ -36,13 +36,13 @@
           "name": "string.other.emphasis.asterisk.mdx"
         },
         {
-          "match": "(?<=[\\p{L}\\p{N}])_(?![\\p{L}\\p{N}])|(?<=\\p{P})_|(?<![\\p{L}\\p{N}]|\\p{P})_(?!\\s)",
+          "match": "(?<=[\\p{L}\\p{N}])_(?![\\p{L}\\p{N}])|(?<=\\p{P})_|(?<![\\p{L}\\p{N}\\p{P}])_(?!\\s)",
           "name": "string.other.emphasis.underscore.mdx"
         }
       ]
     },
     "commonmark-block-quote": {
-      "begin": "(?:^|\\G)[\\t ]*(>)[ ]?",
+      "begin": "(?:^|\\G)[\\t ]*(>) ?",
       "beginCaptures": {
         "0": {
           "name": "markup.quote.mdx"
@@ -57,7 +57,7 @@
           "include": "#markdown-sections"
         }
       ],
-      "while": "(>)[ ]?",
+      "while": "(>) ?",
       "whileCaptures": {
         "0": {
           "name": "markup.quote.mdx"
@@ -68,7 +68,7 @@
       }
     },
     "commonmark-character-escape": {
-      "match": "\\\\(?:[!\"#$%&'()*+,\\-.\\/:;<=>?@\\[\\\\\\]^_`{|}~])",
+      "match": "\\\\[!\"#$%\\&'()*+,\\-./:;<=>?@\\[\\\\\\]^_`{|}~]",
       "name": "constant.language.character-escape.mdx"
     },
     "commonmark-character-reference": {
@@ -94,7 +94,7 @@
               "name": "punctuation.definition.character-reference.end.html"
             }
           },
-          "match": "(&)(#)([Xx])([0-9A-Fa-f]{1,6})(;)",
+          "match": "(&)(#)([Xx])(\\h{1,6})(;)",
           "name": "constant.language.character-reference.numeric.hexadecimal.html"
         },
         {
@@ -286,7 +286,7 @@
     "commonmark-code-fenced-apib": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:api\\x2dblueprint|(?:.*\\.)?apib))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:api-blueprint|(?:.*\\.)?apib))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -307,7 +307,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -328,7 +328,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:api\\x2dblueprint|(?:.*\\.)?apib))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:api-blueprint|(?:.*\\.)?apib))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -349,7 +349,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -374,7 +374,7 @@
     "commonmark-code-fenced-asciidoc": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?(?:adoc|asciidoc)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?a(?:doc|sciidoc)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -395,7 +395,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -416,7 +416,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?(?:adoc|asciidoc)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?a(?:doc|sciidoc)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -437,7 +437,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -462,7 +462,7 @@
     "commonmark-code-fenced-c": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:dtrace|dtrace\\x2dscript|oncrpc|rpc|rpcgen|unified\\x2dparallel\\x2dc|x\\x2dbitmap|x\\x2dpixmap|xdr|(?:.*\\.)?(?:c|cats|h|idc|opencl|upc|xbm|xpm|xs)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:dtrace|dtrace-script|oncrpc|rpc|rpcgen|unified-parallel-c|x-bitmap|x-pixmap|xdr|(?:.*\\.)?(?:c|cats|h|idc|opencl|upc|xbm|xpm|xs)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -483,7 +483,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -504,7 +504,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:dtrace|dtrace\\x2dscript|oncrpc|rpc|rpcgen|unified\\x2dparallel\\x2dc|x\\x2dbitmap|x\\x2dpixmap|xdr|(?:.*\\.)?(?:c|cats|h|idc|opencl|upc|xbm|xpm|xs)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:dtrace|dtrace-script|oncrpc|rpc|rpcgen|unified-parallel-c|x-bitmap|x-pixmap|xdr|(?:.*\\.)?(?:c|cats|h|idc|opencl|upc|xbm|xpm|xs)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -525,7 +525,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -550,7 +550,7 @@
     "commonmark-code-fenced-clojure": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:clojure|rouge|(?:.*\\.)?(?:boot|cl2|clj|cljc|cljs|cljs\\.hl|cljscm|cljx|edn|hic|rg|wisp)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:clojure|rouge|(?:.*\\.)?(?:boot|cl2|clj|cljc|cljs|cljs\\.hl|cljscm|cljx|edn|hic|rg|wisp)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -571,7 +571,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -592,7 +592,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:clojure|rouge|(?:.*\\.)?(?:boot|cl2|clj|cljc|cljs|cljs\\.hl|cljscm|cljx|edn|hic|rg|wisp)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:clojure|rouge|(?:.*\\.)?(?:boot|cl2|clj|cljc|cljs|cljs\\.hl|cljscm|cljx|edn|hic|rg|wisp)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -613,7 +613,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -638,7 +638,7 @@
     "commonmark-code-fenced-coffee": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:coffee\\x2dscript|coffeescript|(?:.*\\.)?(?:_coffee|cjsx|coffee|cson|em|emberscript|iced)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:coffee-script|coffeescript|(?:.*\\.)?(?:_coffee|cjsx|coffee|cson|em|emberscript|iced)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -659,7 +659,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -680,7 +680,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:coffee\\x2dscript|coffeescript|(?:.*\\.)?(?:_coffee|cjsx|coffee|cson|em|emberscript|iced)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:coffee-script|coffeescript|(?:.*\\.)?(?:_coffee|cjsx|coffee|cson|em|emberscript|iced)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -701,7 +701,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -726,7 +726,7 @@
     "commonmark-code-fenced-console": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:pycon|python\\x2dconsole))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:py(?:con|thon-console)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -747,7 +747,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -768,7 +768,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:pycon|python\\x2dconsole))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:py(?:con|thon-console)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -789,7 +789,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -814,7 +814,7 @@
     "commonmark-code-fenced-cpp": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:ags|ags\\x2dscript|asymptote|c\\+\\+|edje\\x2ddata\\x2dcollection|game\\x2dmaker\\x2dlanguage|swig|(?:.*\\.)?(?:asc|ash|asy|c\\+\\+|cc|cp|cpp|cppm|cxx|edc|gml|h\\+\\+|hh|hpp|hxx|inl|ino|ipp|ixx|metal|re|tcc|tpp|txx)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:ags|ags-script|asymptote|c\\+\\+|edje-data-collection|game-maker-language|swig|(?:.*\\.)?(?:asc|ash|asy|c\\+\\+|cc|cp|cpp|cppm|cxx|edc|gml|h\\+\\+|hh|hpp|hxx|inl|ino|ipp|ixx|metal|re|tcc|tpp|txx)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -835,7 +835,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -859,7 +859,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:ags|ags\\x2dscript|asymptote|c\\+\\+|edje\\x2ddata\\x2dcollection|game\\x2dmaker\\x2dlanguage|swig|(?:.*\\.)?(?:asc|ash|asy|c\\+\\+|cc|cp|cpp|cppm|cxx|edc|gml|h\\+\\+|hh|hpp|hxx|inl|ino|ipp|ixx|metal|re|tcc|tpp|txx)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:ags|ags-script|asymptote|c\\+\\+|edje-data-collection|game-maker-language|swig|(?:.*\\.)?(?:asc|ash|asy|c\\+\\+|cc|cp|cpp|cppm|cxx|edc|gml|h\\+\\+|hh|hpp|hxx|inl|ino|ipp|ixx|metal|re|tcc|tpp|txx)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -880,7 +880,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -908,7 +908,7 @@
     "commonmark-code-fenced-cs": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:beef|c#|cakescript|csharp|(?:.*\\.)?(?:bf|cake|cs|cs\\.pp|csx|eq|linq|uno)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:beef|c#|cakescript|csharp|(?:.*\\.)?(?:bf|cake|cs|cs\\.pp|csx|eq|linq|uno)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -929,7 +929,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -950,7 +950,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:beef|c#|cakescript|csharp|(?:.*\\.)?(?:bf|cake|cs|cs\\.pp|csx|eq|linq|uno)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:beef|c#|cakescript|csharp|(?:.*\\.)?(?:bf|cake|cs|cs\\.pp|csx|eq|linq|uno)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -971,7 +971,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -996,7 +996,7 @@
     "commonmark-code-fenced-css": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?css))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?css))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1017,7 +1017,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1038,7 +1038,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?css))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?css))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1059,7 +1059,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1084,7 +1084,7 @@
     "commonmark-code-fenced-diff": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:udiff|(?:.*\\.)?(?:diff|patch)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:udiff|(?:.*\\.)?(?:diff|patch)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1105,7 +1105,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1126,7 +1126,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:udiff|(?:.*\\.)?(?:diff|patch)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:udiff|(?:.*\\.)?(?:diff|patch)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1147,7 +1147,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1172,7 +1172,7 @@
     "commonmark-code-fenced-dockerfile": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:containerfile|(?:.*\\.)?dockerfile))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:containerfile|(?:.*\\.)?dockerfile))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1193,7 +1193,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1214,7 +1214,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:containerfile|(?:.*\\.)?dockerfile))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:containerfile|(?:.*\\.)?dockerfile))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1235,7 +1235,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1260,7 +1260,7 @@
     "commonmark-code-fenced-elixir": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:elixir|(?:.*\\.)?(?:ex|exs)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:elixir|(?:.*\\.)?ex(?:|s)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1281,7 +1281,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1302,7 +1302,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:elixir|(?:.*\\.)?(?:ex|exs)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:elixir|(?:.*\\.)?ex(?:|s)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1323,7 +1323,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1348,7 +1348,7 @@
     "commonmark-code-fenced-elm": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?elm))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?elm))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1369,7 +1369,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1390,7 +1390,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?elm))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?elm))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1411,7 +1411,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1436,7 +1436,7 @@
     "commonmark-code-fenced-erlang": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:erlang|(?:.*\\.)?(?:app|app\\.src|erl|es|escript|hrl|xrl|yrl)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:erlang|(?:.*\\.)?(?:app|app\\.src|erl|es|escript|hrl|xrl|yrl)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1457,7 +1457,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1478,7 +1478,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:erlang|(?:.*\\.)?(?:app|app\\.src|erl|es|escript|hrl|xrl|yrl)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:erlang|(?:.*\\.)?(?:app|app\\.src|erl|es|escript|hrl|xrl|yrl)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1499,7 +1499,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1524,7 +1524,7 @@
     "commonmark-code-fenced-gitconfig": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:git\\x2dconfig|gitmodules|(?:.*\\.)?gitconfig))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:git-config|gitmodules|(?:.*\\.)?gitconfig))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1545,7 +1545,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1566,7 +1566,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:git\\x2dconfig|gitmodules|(?:.*\\.)?gitconfig))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:git-config|gitmodules|(?:.*\\.)?gitconfig))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1587,7 +1587,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1612,7 +1612,7 @@
     "commonmark-code-fenced-go": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:golang|(?:.*\\.)?go))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:golang|(?:.*\\.)?go))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1633,7 +1633,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1654,7 +1654,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:golang|(?:.*\\.)?go))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:golang|(?:.*\\.)?go))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1675,7 +1675,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1700,7 +1700,7 @@
     "commonmark-code-fenced-graphql": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?(?:gql|graphql|graphqls)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?g(?:ql|raphql|raphqls)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1721,7 +1721,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1742,7 +1742,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?(?:gql|graphql|graphqls)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?g(?:ql|raphql|raphqls)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1763,7 +1763,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1788,7 +1788,7 @@
     "commonmark-code-fenced-haskell": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:c2hs|c2hs\\x2dhaskell|frege|haskell|(?:.*\\.)?(?:chs|dhall|hs|hs\\x2dboot|hsc)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:c2hs|c2hs-haskell|frege|haskell|(?:.*\\.)?(?:chs|dhall|hs|hs-boot|hsc)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1809,7 +1809,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1830,7 +1830,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:c2hs|c2hs\\x2dhaskell|frege|haskell|(?:.*\\.)?(?:chs|dhall|hs|hs\\x2dboot|hsc)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:c2hs|c2hs-haskell|frege|haskell|(?:.*\\.)?(?:chs|dhall|hs|hs-boot|hsc)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1851,7 +1851,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1876,7 +1876,7 @@
     "commonmark-code-fenced-html": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:html|(?:.*\\.)?(?:hta|htm|html\\.hl|kit|mtml|xht|xhtml)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:html|(?:.*\\.)?(?:hta|htm|html\\.hl|kit|mtml|xht|xhtml)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1897,7 +1897,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1918,7 +1918,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:html|(?:.*\\.)?(?:hta|htm|html\\.hl|kit|mtml|xht|xhtml)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:html|(?:.*\\.)?(?:hta|htm|html\\.hl|kit|mtml|xht|xhtml)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1939,7 +1939,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -1964,7 +1964,7 @@
     "commonmark-code-fenced-ini": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:altium|altium\\x2ddesigner|dosini|(?:.*\\.)?(?:cnf|dof|ini|lektorproject|outjob|pcbdoc|prefs|prjpcb|properties|schdoc|url)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:altium|altium-designer|dosini|(?:.*\\.)?(?:cnf|dof|ini|lektorproject|outjob|pcbdoc|prefs|prjpcb|properties|schdoc|url)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -1985,7 +1985,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2006,7 +2006,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:altium|altium\\x2ddesigner|dosini|(?:.*\\.)?(?:cnf|dof|ini|lektorproject|outjob|pcbdoc|prefs|prjpcb|properties|schdoc|url)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:altium|altium-designer|dosini|(?:.*\\.)?(?:cnf|dof|ini|lektorproject|outjob|pcbdoc|prefs|prjpcb|properties|schdoc|url)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2027,7 +2027,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2052,7 +2052,7 @@
     "commonmark-code-fenced-java": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:chuck|unrealscript|(?:.*\\.)?(?:ck|jav|java|jsh|uc)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:chuck|unrealscript|(?:.*\\.)?(?:ck|jav|java|jsh|uc)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2073,7 +2073,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2094,7 +2094,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:chuck|unrealscript|(?:.*\\.)?(?:ck|jav|java|jsh|uc)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:chuck|unrealscript|(?:.*\\.)?(?:ck|jav|java|jsh|uc)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2115,7 +2115,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2140,7 +2140,7 @@
     "commonmark-code-fenced-js": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:cycript|javascript\\+erb|json\\x2dwith\\x2dcomments|node|qt\\x2dscript|(?:.*\\.)?(?:_js|bones|cjs|code\\x2dsnippets|code\\x2dworkspace|cy|es6|jake|javascript|js|js\\.erb|jsb|jscad|jsfl|jslib|jsm|json5|jsonc|jsonld|jspre|jss|jsx|mjs|njs|pac|sjs|ssjs|sublime\\x2dbuild|sublime\\x2dcolor\\x2dscheme|sublime\\x2dcommands|sublime\\x2dcompletions|sublime\\x2dkeymap|sublime\\x2dmacro|sublime\\x2dmenu|sublime\\x2dmousemap|sublime\\x2dproject|sublime\\x2dsettings|sublime\\x2dtheme|sublime\\x2dworkspace|sublime_metrics|sublime_session|xsjs|xsjslib)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:cycript|javascript\\+erb|json-with-comments|node|qt-script|(?:.*\\.)?(?:_js|bones|cjs|code-snippets|code-workspace|cy|es6|jake|javascript|js|js\\.erb|jsb|jscad|jsfl|jslib|jsm|json5|jsonc|jsonld|jspre|jss|jsx|mjs|njs|pac|sjs|ssjs|sublime-build|sublime-color-scheme|sublime-commands|sublime-completions|sublime-keymap|sublime-macro|sublime-menu|sublime-mousemap|sublime-project|sublime-settings|sublime-theme|sublime-workspace|sublime_metrics|sublime_session|xsjs|xsjslib)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2161,7 +2161,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2182,7 +2182,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:cycript|javascript\\+erb|json\\x2dwith\\x2dcomments|node|qt\\x2dscript|(?:.*\\.)?(?:_js|bones|cjs|code\\x2dsnippets|code\\x2dworkspace|cy|es6|jake|javascript|js|js\\.erb|jsb|jscad|jsfl|jslib|jsm|json5|jsonc|jsonld|jspre|jss|jsx|mjs|njs|pac|sjs|ssjs|sublime\\x2dbuild|sublime\\x2dcolor\\x2dscheme|sublime\\x2dcommands|sublime\\x2dcompletions|sublime\\x2dkeymap|sublime\\x2dmacro|sublime\\x2dmenu|sublime\\x2dmousemap|sublime\\x2dproject|sublime\\x2dsettings|sublime\\x2dtheme|sublime\\x2dworkspace|sublime_metrics|sublime_session|xsjs|xsjslib)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:cycript|javascript\\+erb|json-with-comments|node|qt-script|(?:.*\\.)?(?:_js|bones|cjs|code-snippets|code-workspace|cy|es6|jake|javascript|js|js\\.erb|jsb|jscad|jsfl|jslib|jsm|json5|jsonc|jsonld|jspre|jss|jsx|mjs|njs|pac|sjs|ssjs|sublime-build|sublime-color-scheme|sublime-commands|sublime-completions|sublime-keymap|sublime-macro|sublime-menu|sublime-mousemap|sublime-project|sublime-settings|sublime-theme|sublime-workspace|sublime_metrics|sublime_session|xsjs|xsjslib)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2203,7 +2203,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2228,7 +2228,7 @@
     "commonmark-code-fenced-json": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:ecere\\x2dprojects|ipython\\x2dnotebook|jupyter\\x2dnotebook|max|max/msp|maxmsp|oasv2\\x2djson|oasv3\\x2djson|(?:.*\\.)?(?:4dform|4dproject|avsc|epj|geojson|gltf|har|ice|ipynb|json|json|json|json\\x2dtmlanguage|jsonl|maxhelp|maxpat|maxproj|mcmeta|mxt|pat|sarif|tfstate|tfstate\\.backup|topojson|webapp|webmanifest|yy|yyp)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:ecere-projects|ipython-notebook|jupyter-notebook|max|max/msp|maxmsp|oasv2-json|oasv3-json|(?:.*\\.)?(?:4dform|4dproject|avsc|epj|geojson|gltf|har|ice|ipynb|json|json|json|json-tmlanguage|jsonl|maxhelp|maxpat|maxproj|mcmeta|mxt|pat|sarif|tfstate|tfstate\\.backup|topojson|webapp|webmanifest|yy|yyp)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2249,7 +2249,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2270,7 +2270,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:ecere\\x2dprojects|ipython\\x2dnotebook|jupyter\\x2dnotebook|max|max/msp|maxmsp|oasv2\\x2djson|oasv3\\x2djson|(?:.*\\.)?(?:4dform|4dproject|avsc|epj|geojson|gltf|har|ice|ipynb|json|json|json|json\\x2dtmlanguage|jsonl|maxhelp|maxpat|maxproj|mcmeta|mxt|pat|sarif|tfstate|tfstate\\.backup|topojson|webapp|webmanifest|yy|yyp)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:ecere-projects|ipython-notebook|jupyter-notebook|max|max/msp|maxmsp|oasv2-json|oasv3-json|(?:.*\\.)?(?:4dform|4dproject|avsc|epj|geojson|gltf|har|ice|ipynb|json|json|json|json-tmlanguage|jsonl|maxhelp|maxpat|maxproj|mcmeta|mxt|pat|sarif|tfstate|tfstate\\.backup|topojson|webapp|webmanifest|yy|yyp)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2291,7 +2291,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2316,7 +2316,7 @@
     "commonmark-code-fenced-julia": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:julia|(?:.*\\.)?jl))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:julia|(?:.*\\.)?jl))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2337,7 +2337,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2358,7 +2358,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:julia|(?:.*\\.)?jl))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:julia|(?:.*\\.)?jl))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2379,7 +2379,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2404,7 +2404,7 @@
     "commonmark-code-fenced-kotlin": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:gradle\\x2dkotlin\\x2ddsl|kotlin|(?:.*\\.)?(?:gradle\\.kts|kt|ktm|kts)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:gradle-kotlin-dsl|kotlin|(?:.*\\.)?(?:gradle\\.kts|kt|ktm|kts)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2425,7 +2425,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2446,7 +2446,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:gradle\\x2dkotlin\\x2ddsl|kotlin|(?:.*\\.)?(?:gradle\\.kts|kt|ktm|kts)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:gradle-kotlin-dsl|kotlin|(?:.*\\.)?(?:gradle\\.kts|kt|ktm|kts)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2467,7 +2467,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2492,7 +2492,7 @@
     "commonmark-code-fenced-less": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:less\\x2dcss|(?:.*\\.)?less))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:less-css|(?:.*\\.)?less))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2513,7 +2513,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2534,7 +2534,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:less\\x2dcss|(?:.*\\.)?less))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:less-css|(?:.*\\.)?less))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2555,7 +2555,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2580,7 +2580,7 @@
     "commonmark-code-fenced-lua": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?(?:fcgi|lua|nse|p8|pd_lua|rbxs|rockspec|wlua)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?(?:fcgi|lua|nse|p8|pd_lua|rbxs|rockspec|wlua)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2601,7 +2601,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2622,7 +2622,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?(?:fcgi|lua|nse|p8|pd_lua|rbxs|rockspec|wlua)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?(?:fcgi|lua|nse|p8|pd_lua|rbxs|rockspec|wlua)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2643,7 +2643,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2668,7 +2668,7 @@
     "commonmark-code-fenced-makefile": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:bsdmake|mf|(?:.*\\.)?(?:mak|make|makefile|mk|mkfile)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:bsdmake|mf|(?:.*\\.)?m(?:ak|ake|akefile|k|kfile)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2689,7 +2689,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2710,7 +2710,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:bsdmake|mf|(?:.*\\.)?(?:mak|make|makefile|mk|mkfile)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:bsdmake|mf|(?:.*\\.)?m(?:ak|ake|akefile|k|kfile)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2731,7 +2731,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2756,7 +2756,7 @@
     "commonmark-code-fenced-md": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:md|pandoc|rmarkdown|(?:.*\\.)?(?:livemd|markdown|mdown|mdwn|mkd|mkdn|mkdown|qmd|rmd|ronn|scd|workbook)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:md|pandoc|rmarkdown|(?:.*\\.)?(?:livemd|markdown|mdown|mdwn|mkd|mkdn|mkdown|qmd|rmd|ronn|scd|workbook)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2777,7 +2777,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2804,7 +2804,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:md|pandoc|rmarkdown|(?:.*\\.)?(?:livemd|markdown|mdown|mdwn|mkd|mkdn|mkdown|qmd|rmd|ronn|scd|workbook)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:md|pandoc|rmarkdown|(?:.*\\.)?(?:livemd|markdown|mdown|mdwn|mkd|mkdn|mkdown|qmd|rmd|ronn|scd|workbook)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2825,7 +2825,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2856,7 +2856,7 @@
     "commonmark-code-fenced-mdx": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?mdx))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?mdx))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2877,7 +2877,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2898,7 +2898,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?mdx))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?mdx))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2919,7 +2919,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2944,7 +2944,7 @@
     "commonmark-code-fenced-objc": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:obj\\x2dc|objc|objective\\x2dc|objectivec))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:obj(?:-c|c|ective-c|ectivec)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -2965,7 +2965,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -2986,7 +2986,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:obj\\x2dc|objc|objective\\x2dc|objectivec))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:obj(?:-c|c|ective-c|ectivec)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3007,7 +3007,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3032,7 +3032,7 @@
     "commonmark-code-fenced-perl": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:cperl|(?:.*\\.)?(?:cgi|perl|ph|pl|plx|pm|psgi|t)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:cperl|(?:.*\\.)?(?:cgi|perl|ph|pl|plx|pm|psgi|t)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3053,7 +3053,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3074,7 +3074,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:cperl|(?:.*\\.)?(?:cgi|perl|ph|pl|plx|pm|psgi|t)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:cperl|(?:.*\\.)?(?:cgi|perl|ph|pl|plx|pm|psgi|t)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3095,7 +3095,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3120,7 +3120,7 @@
     "commonmark-code-fenced-php": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:html\\+php|inc|php|(?:.*\\.)?(?:aw|ctp|php3|php4|php5|phps|phpt|phtml)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:html\\+php|inc|php|(?:.*\\.)?(?:aw|ctp|php3|php4|php5|phps|phpt|phtml)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3141,7 +3141,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3162,7 +3162,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:html\\+php|inc|php|(?:.*\\.)?(?:aw|ctp|php3|php4|php5|phps|phpt|phtml)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:html\\+php|inc|php|(?:.*\\.)?(?:aw|ctp|php3|php4|php5|phps|phpt|phtml)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3183,7 +3183,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3208,7 +3208,7 @@
     "commonmark-code-fenced-python": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:bazel|easybuild|python|python3|rusthon|snakemake|starlark|xonsh|(?:.*\\.)?(?:bzl|eb|gyp|gypi|lmi|py|py3|pyde|pyi|pyp|pyt|pyw|rpy|sage|sagews|smk|snakefile|spec|tac|wsgi|xpy|xsh)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:bazel|easybuild|python|python3|rusthon|snakemake|starlark|xonsh|(?:.*\\.)?(?:bzl|eb|gyp|gypi|lmi|py|py3|pyde|pyi|pyp|pyt|pyw|rpy|sage|sagews|smk|snakefile|spec|tac|wsgi|xpy|xsh)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3229,7 +3229,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3250,7 +3250,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:bazel|easybuild|python|python3|rusthon|snakemake|starlark|xonsh|(?:.*\\.)?(?:bzl|eb|gyp|gypi|lmi|py|py3|pyde|pyi|pyp|pyt|pyw|rpy|sage|sagews|smk|snakefile|spec|tac|wsgi|xpy|xsh)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:bazel|easybuild|python|python3|rusthon|snakemake|starlark|xonsh|(?:.*\\.)?(?:bzl|eb|gyp|gypi|lmi|py|py3|pyde|pyi|pyp|pyt|pyw|rpy|sage|sagews|smk|snakefile|spec|tac|wsgi|xpy|xsh)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3271,7 +3271,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3296,7 +3296,7 @@
     "commonmark-code-fenced-r": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:rscript|splus|(?:.*\\.)?(?:r|rd|rsx)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:rscript|splus|(?:.*\\.)?r(?:|d|sx)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3317,7 +3317,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3338,7 +3338,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:rscript|splus|(?:.*\\.)?(?:r|rd|rsx)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:rscript|splus|(?:.*\\.)?r(?:|d|sx)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3359,7 +3359,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3384,7 +3384,7 @@
     "commonmark-code-fenced-raku": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:perl\\x2d6|perl6|pod\\x2d6|(?:.*\\.)?(?:6pl|6pm|nqp|p6|p6l|p6m|pl6|pm6|pod|pod6|raku|rakumod)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:perl-6|perl6|pod-6|(?:.*\\.)?(?:6pl|6pm|nqp|p6|p6l|p6m|pl6|pm6|pod|pod6|raku|rakumod)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3405,7 +3405,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3426,7 +3426,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:perl\\x2d6|perl6|pod\\x2d6|(?:.*\\.)?(?:6pl|6pm|nqp|p6|p6l|p6m|pl6|pm6|pod|pod6|raku|rakumod)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:perl-6|perl6|pod-6|(?:.*\\.)?(?:6pl|6pm|nqp|p6|p6l|p6m|pl6|pm6|pod|pod6|raku|rakumod)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3447,7 +3447,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3472,7 +3472,7 @@
     "commonmark-code-fenced-ruby": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:jruby|macruby|(?:.*\\.)?(?:builder|druby|duby|eye|gemspec|god|jbuilder|mirah|mspec|pluginspec|podspec|prawn|rabl|rake|rb|rbi|rbuild|rbw|rbx|ru|ruby|thor|watchr)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:jruby|macruby|(?:.*\\.)?(?:builder|druby|duby|eye|gemspec|god|jbuilder|mirah|mspec|pluginspec|podspec|prawn|rabl|rake|rb|rbi|rbuild|rbw|rbx|ru|ruby|thor|watchr)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3493,7 +3493,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3514,7 +3514,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:jruby|macruby|(?:.*\\.)?(?:builder|druby|duby|eye|gemspec|god|jbuilder|mirah|mspec|pluginspec|podspec|prawn|rabl|rake|rb|rbi|rbuild|rbw|rbx|ru|ruby|thor|watchr)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:jruby|macruby|(?:.*\\.)?(?:builder|druby|duby|eye|gemspec|god|jbuilder|mirah|mspec|pluginspec|podspec|prawn|rabl|rake|rb|rbi|rbuild|rbw|rbx|ru|ruby|thor|watchr)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3535,7 +3535,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3560,7 +3560,7 @@
     "commonmark-code-fenced-rust": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:rust|(?:.*\\.)?(?:rs|rs\\.in)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:rust|(?:.*\\.)?rs(?:|\\.in)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3581,7 +3581,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3602,7 +3602,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:rust|(?:.*\\.)?(?:rs|rs\\.in)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:rust|(?:.*\\.)?rs(?:|\\.in)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3623,7 +3623,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3648,7 +3648,7 @@
     "commonmark-code-fenced-scala": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?(?:kojo|sbt|sc|scala)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?(?:kojo|sbt|sc|scala)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3669,7 +3669,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3690,7 +3690,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?(?:kojo|sbt|sc|scala)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?(?:kojo|sbt|sc|scala)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3711,7 +3711,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3736,7 +3736,7 @@
     "commonmark-code-fenced-scss": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?scss))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?scss))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3757,7 +3757,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3778,7 +3778,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?scss))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?scss))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3799,7 +3799,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3824,7 +3824,7 @@
     "commonmark-code-fenced-shell": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:abuild|alpine\\x2dabuild|apkbuild|envrc|gentoo\\x2debuild|gentoo\\x2declass|openrc|openrc\\x2drunscript|shell|shell\\x2dscript|(?:.*\\.)?(?:bash|bats|command|csh|ebuild|eclass|ksh|sh|sh\\.in|tcsh|tmux|tool|zsh|zsh\\x2dtheme)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:abuild|alpine-abuild|apkbuild|envrc|gentoo-ebuild|gentoo-eclass|openrc|openrc-runscript|shell|shell-script|(?:.*\\.)?(?:bash|bats|command|csh|ebuild|eclass|ksh|sh|sh\\.in|tcsh|tmux|tool|zsh|zsh-theme)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3845,7 +3845,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3866,7 +3866,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:abuild|alpine\\x2dabuild|apkbuild|envrc|gentoo\\x2debuild|gentoo\\x2declass|openrc|openrc\\x2drunscript|shell|shell\\x2dscript|(?:.*\\.)?(?:bash|bats|command|csh|ebuild|eclass|ksh|sh|sh\\.in|tcsh|tmux|tool|zsh|zsh\\x2dtheme)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:abuild|alpine-abuild|apkbuild|envrc|gentoo-ebuild|gentoo-eclass|openrc|openrc-runscript|shell|shell-script|(?:.*\\.)?(?:bash|bats|command|csh|ebuild|eclass|ksh|sh|sh\\.in|tcsh|tmux|tool|zsh|zsh-theme)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3887,7 +3887,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3912,7 +3912,7 @@
     "commonmark-code-fenced-shell-session": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:bash\\x2dsession|console|shellsession|(?:.*\\.)?sh\\x2dsession))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:bash-session|console|shellsession|(?:.*\\.)?sh-session))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3933,7 +3933,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -3954,7 +3954,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:bash\\x2dsession|console|shellsession|(?:.*\\.)?sh\\x2dsession))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:bash-session|console|shellsession|(?:.*\\.)?sh-session))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -3975,7 +3975,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4000,7 +4000,7 @@
     "commonmark-code-fenced-sql": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:plpgsql|sqlpl|(?:.*\\.)?(?:cql|db2|ddl|mysql|pgsql|prc|sql|sql|sql|tab|udf|viw)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:plpgsql|sqlpl|(?:.*\\.)?(?:cql|db2|ddl|mysql|pgsql|prc|sql|sql|sql|tab|udf|viw)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4021,7 +4021,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4042,7 +4042,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:plpgsql|sqlpl|(?:.*\\.)?(?:cql|db2|ddl|mysql|pgsql|prc|sql|sql|sql|tab|udf|viw)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:plpgsql|sqlpl|(?:.*\\.)?(?:cql|db2|ddl|mysql|pgsql|prc|sql|sql|sql|tab|udf|viw)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4063,7 +4063,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4088,7 +4088,7 @@
     "commonmark-code-fenced-svg": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?svg))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?svg))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4109,7 +4109,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4133,7 +4133,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?svg))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?svg))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4154,7 +4154,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4182,7 +4182,7 @@
     "commonmark-code-fenced-swift": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?swift))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?swift))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4203,7 +4203,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4224,7 +4224,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?swift))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?swift))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4245,7 +4245,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4270,7 +4270,7 @@
     "commonmark-code-fenced-toml": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?toml))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?toml))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4291,7 +4291,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4312,7 +4312,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?toml))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?toml))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4333,7 +4333,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4358,7 +4358,7 @@
     "commonmark-code-fenced-ts": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:typescript|(?:.*\\.)?(?:cts|mts|ts)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:typescript|(?:.*\\.)?(?:cts|mts|ts)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4379,7 +4379,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4400,7 +4400,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:typescript|(?:.*\\.)?(?:cts|mts|ts)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:typescript|(?:.*\\.)?(?:cts|mts|ts)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4421,7 +4421,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4446,7 +4446,7 @@
     "commonmark-code-fenced-tsx": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?tsx))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:(?:.*\\.)?tsx))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4467,7 +4467,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4488,7 +4488,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?tsx))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:(?:.*\\.)?tsx))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4509,7 +4509,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4534,7 +4534,7 @@
     "commonmark-code-fenced-unknown": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?:[^\\t\\n\\r` ])+)(?:[\\t ]+((?:[^\\n\\r`])+))?)?(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*([^\\t\\n\\r` ]+)(?:[\\t ]+([^\\n\\r`]+))?)?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4556,7 +4556,7 @@
             }
           },
           "contentName": "markup.raw.code.fenced.mdx",
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4565,7 +4565,7 @@
           "name": "markup.code.other.mdx"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?:[^\\t\\n\\r ])+)(?:[\\t ]+((?:[^\\n\\r])+))?)?(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*([^\\t\\n\\r ]+)(?:[\\t ]+([^\\n\\r]+))?)?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4587,7 +4587,7 @@
             }
           },
           "contentName": "markup.raw.code.fenced.mdx",
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4600,7 +4600,7 @@
     "commonmark-code-fenced-vbnet": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:fb|freebasic|realbasic|vb\\x2d\\.net|vb\\.net|vbnet|vbscript|visual\\x2dbasic|visual\\x2dbasic\\x2d\\.net|(?:.*\\.)?(?:bi|rbbas|rbfrm|rbmnu|rbres|rbtbar|rbuistate|vb|vbhtml|vbs)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:fb|freebasic|realbasic|vb-\\.net|vb\\.net|vbnet|vbscript|visual-basic|visual-basic-\\.net|(?:.*\\.)?(?:bi|rbbas|rbfrm|rbmnu|rbres|rbtbar|rbuistate|vb|vbhtml|vbs)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4621,7 +4621,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4642,7 +4642,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:fb|freebasic|realbasic|vb\\x2d\\.net|vb\\.net|vbnet|vbscript|visual\\x2dbasic|visual\\x2dbasic\\x2d\\.net|(?:.*\\.)?(?:bi|rbbas|rbfrm|rbmnu|rbres|rbtbar|rbuistate|vb|vbhtml|vbs)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:fb|freebasic|realbasic|vb-\\.net|vb\\.net|vbnet|vbscript|visual-basic|visual-basic-\\.net|(?:.*\\.)?(?:bi|rbbas|rbfrm|rbmnu|rbres|rbtbar|rbuistate|vb|vbhtml|vbs)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4663,7 +4663,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4688,7 +4688,7 @@
     "commonmark-code-fenced-xml": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:collada|eagle|labview|web\\x2dontology\\x2dlanguage|xpages|(?:.*\\.)?(?:adml|admx|ant|axaml|axml|brd|builds|ccproj|ccxml|clixml|cproject|cscfg|csdef|csproj|ct|dae|depproj|dita|ditamap|ditaval|dll\\.config|dotsettings|filters|fsproj|fxml|glade|gmx|grxml|hzp|iml|ivy|jelly|jsproj|kml|launch|lvclass|lvlib|lvproj|mdpolicy|mjml|mxml|natvis|ndproj|nproj|nuspec|odd|osm|owl|pkgproj|proj|props|ps1xml|psc1|pt|qhelp|rdf|resx|rss|sch|sch|scxml|sfproj|shproj|srdf|storyboard|sublime\\x2dsnippet|targets|tml|ui|urdf|ux|vbproj|vcxproj|vsixmanifest|vssettings|vstemplate|vxml|wixproj|wsdl|wsf|wxi|wxl|wxs|x3d|xacro|xaml|xib|xlf|xliff|xmi|xml|xml\\.dist|xmp|xpl|xproc|xproj|xsd|xsp\\x2dconfig|xsp\\.metadata|xspec|xul|zcml)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:collada|eagle|labview|web-ontology-language|xpages|(?:.*\\.)?(?:adml|admx|ant|axaml|axml|brd|builds|ccproj|ccxml|clixml|cproject|cscfg|csdef|csproj|ct|dae|depproj|dita|ditamap|ditaval|dll\\.config|dotsettings|filters|fsproj|fxml|glade|gmx|grxml|hzp|iml|ivy|jelly|jsproj|kml|launch|lvclass|lvlib|lvproj|mdpolicy|mjml|mxml|natvis|ndproj|nproj|nuspec|odd|osm|owl|pkgproj|proj|props|ps1xml|psc1|pt|qhelp|rdf|resx|rss|sch|sch|scxml|sfproj|shproj|srdf|storyboard|sublime-snippet|targets|tml|ui|urdf|ux|vbproj|vcxproj|vsixmanifest|vssettings|vstemplate|vxml|wixproj|wsdl|wsf|wxi|wxl|wxs|x3d|xacro|xaml|xib|xlf|xliff|xmi|xml|xml\\.dist|xmp|xpl|xproc|xproj|xsd|xsp-config|xsp\\.metadata|xspec|xul|zcml)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4709,7 +4709,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4730,7 +4730,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:collada|eagle|labview|web\\x2dontology\\x2dlanguage|xpages|(?:.*\\.)?(?:adml|admx|ant|axaml|axml|brd|builds|ccproj|ccxml|clixml|cproject|cscfg|csdef|csproj|ct|dae|depproj|dita|ditamap|ditaval|dll\\.config|dotsettings|filters|fsproj|fxml|glade|gmx|grxml|hzp|iml|ivy|jelly|jsproj|kml|launch|lvclass|lvlib|lvproj|mdpolicy|mjml|mxml|natvis|ndproj|nproj|nuspec|odd|osm|owl|pkgproj|proj|props|ps1xml|psc1|pt|qhelp|rdf|resx|rss|sch|sch|scxml|sfproj|shproj|srdf|storyboard|sublime\\x2dsnippet|targets|tml|ui|urdf|ux|vbproj|vcxproj|vsixmanifest|vssettings|vstemplate|vxml|wixproj|wsdl|wsf|wxi|wxl|wxs|x3d|xacro|xaml|xib|xlf|xliff|xmi|xml|xml\\.dist|xmp|xpl|xproc|xproj|xsd|xsp\\x2dconfig|xsp\\.metadata|xspec|xul|zcml)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:collada|eagle|labview|web-ontology-language|xpages|(?:.*\\.)?(?:adml|admx|ant|axaml|axml|brd|builds|ccproj|ccxml|clixml|cproject|cscfg|csdef|csproj|ct|dae|depproj|dita|ditamap|ditaval|dll\\.config|dotsettings|filters|fsproj|fxml|glade|gmx|grxml|hzp|iml|ivy|jelly|jsproj|kml|launch|lvclass|lvlib|lvproj|mdpolicy|mjml|mxml|natvis|ndproj|nproj|nuspec|odd|osm|owl|pkgproj|proj|props|ps1xml|psc1|pt|qhelp|rdf|resx|rss|sch|sch|scxml|sfproj|shproj|srdf|storyboard|sublime-snippet|targets|tml|ui|urdf|ux|vbproj|vcxproj|vsixmanifest|vssettings|vstemplate|vxml|wixproj|wsdl|wsf|wxi|wxl|wxs|x3d|xacro|xaml|xib|xlf|xliff|xmi|xml|xml\\.dist|xmp|xpl|xproc|xproj|xsd|xsp-config|xsp\\.metadata|xspec|xul|zcml)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4751,7 +4751,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4776,7 +4776,7 @@
     "commonmark-code-fenced-yaml": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:jar\\x2dmanifest|kaitai\\x2dstruct|oasv2\\x2dyaml|oasv3\\x2dyaml|unity3d\\x2dasset|yaml|yml|(?:.*\\.)?(?:anim|asset|ksy|lkml|lookml|mat|meta|mir|prefab|raml|reek|rviz|sublime\\x2dsyntax|syntax|unity|yaml\\x2dtmlanguage|yaml\\.sed|yml\\.mysql)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(`{3,})[\\t ]*((?i:jar-manifest|kaitai-struct|oasv2-yaml|oasv3-yaml|unity3d-asset|yaml|yml|(?:.*\\.)?(?:anim|asset|ksy|lkml|lookml|mat|meta|mir|prefab|raml|reek|rviz|sublime-syntax|syntax|unity|yaml-tmlanguage|yaml\\.sed|yml\\.mysql)))(?:[\\t ]+([^\\n\\r`]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4797,7 +4797,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4818,7 +4818,7 @@
           ]
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:jar\\x2dmanifest|kaitai\\x2dstruct|oasv2\\x2dyaml|oasv3\\x2dyaml|unity3d\\x2dasset|yaml|yml|(?:.*\\.)?(?:anim|asset|ksy|lkml|lookml|mat|meta|mir|prefab|raml|reek|rviz|sublime\\x2dsyntax|syntax|unity|yaml\\x2dtmlanguage|yaml\\.sed|yml\\.mysql)))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+          "begin": "(?:^|\\G)[\\t ]*(~{3,})[\\t ]*((?i:jar-manifest|kaitai-struct|oasv2-yaml|oasv3-yaml|unity3d-asset|yaml|yml|(?:.*\\.)?(?:anim|asset|ksy|lkml|lookml|mat|meta|mir|prefab|raml|reek|rviz|sublime-syntax|syntax|unity|yaml-tmlanguage|yaml\\.sed|yml\\.mysql)))(?:[\\t ]+([^\\n\\r]+))?[\\t ]*$",
           "beginCaptures": {
             "1": {
               "name": "string.other.begin.code.fenced.mdx"
@@ -4839,7 +4839,7 @@
               ]
             }
           },
-          "end": "(?:^|\\G)[\\t ]*(\\1)(?:[\\t ]*$)",
+          "end": "(?:^|\\G)[\\t ]*(\\1)[\\t ]*$",
           "endCaptures": {
             "1": {
               "name": "string.other.end.code.fenced.mdx"
@@ -4960,7 +4960,7 @@
           "name": "string.other.begin.mdx"
         }
       },
-      "match": "(?:^|\\G)[\\t ]*(\\[)((?:[^\\[\\\\\\]]|\\\\[\\[\\\\\\]]?)+?)(\\])(:)[ \\t]*(?:(<)((?:[^\\n<\\\\>]|\\\\[<\\\\>]?)*)(>)|(\\g<destination_raw>))(?:[\\t ]+(?:(\")((?:[^\"\\\\]|\\\\[\"\\\\]?)*)(\")|(')((?:[^'\\\\]|\\\\['\\\\]?)*)(')|(\\()((?:[^\\)\\\\]|\\\\[\\)\\\\]?)*)(\\))))?$(?<destination_raw>(?!\\<)(?:(?:[^\\p{Cc}\\ \\\\\\(\\)]|\\\\[\\(\\)\\\\]?)|\\(\\g<destination_raw>*\\))+){0}",
+      "match": "(?:^|\\G)[\\t ]*(\\[)((?:[^\\[\\\\\\]]|\\\\[\\[\\\\\\]]?)+?)(])(:)[ \\t]*(?:(<)((?:[^\\n<\\\\>]|\\\\[<\\\\>]?)*)(>)|(\\g<destination_raw>))(?:[\\t ]+(?:(\")((?:[^\"\\\\]|\\\\[\"\\\\]?)*)(\")|(')((?:[^'\\\\]|\\\\['\\\\]?)*)(')|(\\()((?:[^)\\\\]|\\\\[)\\\\]?)*)(\\))))?$(?<destination_raw>(?!<)(?:(?:[^\\p{Cc} \\\\()]|\\\\[()\\\\]?)|\\(\\g<destination_raw>*\\))+){0}",
       "name": "meta.link.reference.def.mdx"
     },
     "commonmark-hard-break-escape": {
@@ -5098,11 +5098,11 @@
     "commonmark-heading-setext": {
       "patterns": [
         {
-          "match": "(?:^|\\G)[\\t ]*(={1,})[ \\t]*$",
+          "match": "(?:^|\\G)[\\t ]*(=+)[ \\t]*$",
           "name": "markup.heading.setext.1.mdx"
         },
         {
-          "match": "(?:^|\\G)[\\t ]*(-{1,})[ \\t]*$",
+          "match": "(?:^|\\G)[\\t ]*(-+)[ \\t]*$",
           "name": "markup.heading.setext.2.mdx"
         }
       ]
@@ -5185,7 +5185,7 @@
               "name": "string.other.end.mdx"
             }
           },
-          "match": "(\\])(\\()[\\t ]*(?:(?:(<)((?:[^\\n<\\\\>]|\\\\[<\\\\>]?)*)(>)|(\\g<destination_raw>))(?:[\\t ]+(?:(\")((?:[^\"\\\\]|\\\\[\"\\\\]?)*)(\")|(')((?:[^'\\\\]|\\\\['\\\\]?)*)(')|(\\()((?:[^\\)\\\\]|\\\\[\\)\\\\]?)*)(\\))))?)?[\\t ]*(\\))(?<destination_raw>(?!\\<)(?:(?:[^\\p{Cc}\\ \\\\\\(\\)]|\\\\[\\(\\)\\\\]?)|\\(\\g<destination_raw>*\\))+){0}"
+          "match": "(])(\\()[\\t ]*(?:(?:(<)((?:[^\\n<\\\\>]|\\\\[<\\\\>]?)*)(>)|(\\g<destination_raw>))(?:[\\t ]+(?:(\")((?:[^\"\\\\]|\\\\[\"\\\\]?)*)(\")|(')((?:[^'\\\\]|\\\\['\\\\]?)*)(')|(\\()((?:[^)\\\\]|\\\\[)\\\\]?)*)(\\))))?)?[\\t ]*(\\))(?<destination_raw>(?!<)(?:(?:[^\\p{Cc} \\\\()]|\\\\[()\\\\]?)|\\(\\g<destination_raw>*\\))+){0}"
         },
         {
           "captures": {
@@ -5207,7 +5207,7 @@
               "name": "string.other.end.mdx"
             }
           },
-          "match": "(\\])(\\[)((?:[^\\[\\\\\\]]|\\\\[\\[\\\\\\]]?)+?)(\\])"
+          "match": "(])(\\[)((?:[^\\[\\\\\\]]|\\\\[\\[\\\\\\]]?)+?)(])"
         },
         {
           "captures": {
@@ -5215,14 +5215,14 @@
               "name": "string.other.end.mdx"
             }
           },
-          "match": "(\\])"
+          "match": "(])"
         }
       ]
     },
     "commonmark-label-start": {
       "patterns": [
         {
-          "match": "\\!\\[(?!\\^)",
+          "match": "!\\[(?!\\^)",
           "name": "string.other.begin.image.mdx"
         },
         {
@@ -5234,7 +5234,7 @@
     "commonmark-list-item": {
       "patterns": [
         {
-          "begin": "(?:^|\\G)[\\t ]*((?:[*+-]))(?:[ ]{4}(?![ ])|\\t)(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*([*+-])(?: {4}(?! )|\\t)(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "variable.unordered.list.mdx"
@@ -5248,10 +5248,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t)[ ]{1}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t) {1}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*((?:[*+-]))(?:[ ]{3}(?![ ]))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*([*+-]) {3}(?! )(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "variable.unordered.list.mdx"
@@ -5265,10 +5265,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t)"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t)"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*((?:[*+-]))(?:[ ]{2}(?![ ]))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*([*+-]) {2}(?! )(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "variable.unordered.list.mdx"
@@ -5282,10 +5282,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)[ ]{3}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G) {3}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*((?:[*+-]))(?:[ ]{1}|(?=\\n))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*([*+-])(?: {1}|(?=\\n))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "variable.unordered.list.mdx"
@@ -5299,10 +5299,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)[ ]{2}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G) {2}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*([0-9]{9})((?:\\.|\\)))(?:[ ]{4}(?![ ])|\\t(?![\\t ]))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*([0-9]{9})([.)])(?: {4}(?! )|\\t(?![\\t ]))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5319,10 +5319,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t){3}[ ]{2}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t){3} {2}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{9})((?:\\.|\\)))(?:[ ]{3}(?![ ]))|([0-9]{8})((?:\\.|\\)))(?:[ ]{4}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{9})([.)]) {3}(?! )|([0-9]{8})([.)]) {4}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5345,10 +5345,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t){3}[ ]{1}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t){3} {1}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{9})((?:\\.|\\)))(?:[ ]{2}(?![ ]))|([0-9]{8})((?:\\.|\\)))(?:[ ]{3}(?![ ]))|([0-9]{7})((?:\\.|\\)))(?:[ ]{4}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{9})([.)]) {2}(?! )|([0-9]{8})([.)]) {3}(?! )|([0-9]{7})([.)]) {4}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5377,10 +5377,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t){3}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t){3}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{9})((?:\\.|\\)))(?:[ ]{1}|(?=[ \\t]*\\n))|([0-9]{8})((?:\\.|\\)))(?:[ ]{2}(?![ ]))|([0-9]{7})((?:\\.|\\)))(?:[ ]{3}(?![ ]))|([0-9]{6})((?:\\.|\\)))(?:[ ]{4}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{9})([.)])(?: {1}|(?=[ \\t]*\\n))|([0-9]{8})([.)]) {2}(?! )|([0-9]{7})([.)]) {3}(?! )|([0-9]{6})([.)]) {4}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5415,10 +5415,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t){2}[ ]{3}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t){2} {3}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{8})((?:\\.|\\)))(?:[ ]{1}|(?=[ \\t]*\\n))|([0-9]{7})((?:\\.|\\)))(?:[ ]{2}(?![ ]))|([0-9]{6})((?:\\.|\\)))(?:[ ]{3}(?![ ]))|([0-9]{5})((?:\\.|\\)))(?:[ ]{4}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{8})([.)])(?: {1}|(?=[ \\t]*\\n))|([0-9]{7})([.)]) {2}(?! )|([0-9]{6})([.)]) {3}(?! )|([0-9]{5})([.)]) {4}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5453,10 +5453,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t){2}[ ]{2}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t){2} {2}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{7})((?:\\.|\\)))(?:[ ]{1}|(?=[ \\t]*\\n))|([0-9]{6})((?:\\.|\\)))(?:[ ]{2}(?![ ]))|([0-9]{5})((?:\\.|\\)))(?:[ ]{3}(?![ ]))|([0-9]{4})((?:\\.|\\)))(?:[ ]{4}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{7})([.)])(?: {1}|(?=[ \\t]*\\n))|([0-9]{6})([.)]) {2}(?! )|([0-9]{5})([.)]) {3}(?! )|([0-9]{4})([.)]) {4}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5491,10 +5491,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t){2}[ ]{1}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t){2} {1}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{6})((?:\\.|\\)))(?:[ ]{1}|(?=[ \\t]*\\n))|([0-9]{5})((?:\\.|\\)))(?:[ ]{2}(?![ ]))|([0-9]{4})((?:\\.|\\)))(?:[ ]{3}(?![ ]))|([0-9]{3})((?:\\.|\\)))(?:[ ]{4}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{6})([.)])(?: {1}|(?=[ \\t]*\\n))|([0-9]{5})([.)]) {2}(?! )|([0-9]{4})([.)]) {3}(?! )|([0-9]{3})([.)]) {4}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5529,10 +5529,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t){2}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t){2}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{5})((?:\\.|\\)))(?:[ ]{1}|(?=[ \\t]*\\n))|([0-9]{4})((?:\\.|\\)))(?:[ ]{2}(?![ ]))|([0-9]{3})((?:\\.|\\)))(?:[ ]{3}(?![ ]))|([0-9]{2})((?:\\.|\\)))(?:[ ]{4}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{5})([.)])(?: {1}|(?=[ \\t]*\\n))|([0-9]{4})([.)]) {2}(?! )|([0-9]{3})([.)]) {3}(?! )|([0-9]{2})([.)]) {4}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5567,10 +5567,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t)[ ]{3}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t) {3}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{4})((?:\\.|\\)))(?:[ ]{1}|(?=[ \\t]*\\n))|([0-9]{3})((?:\\.|\\)))(?:[ ]{2}(?![ ]))|([0-9]{2})((?:\\.|\\)))(?:[ ]{3}(?![ ]))|([0-9]{1})((?:\\.|\\)))(?:[ ]{4}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{4})([.)])(?: {1}|(?=[ \\t]*\\n))|([0-9]{3})([.)]) {2}(?! )|([0-9]{2})([.)]) {3}(?! )|([0-9]{1})([.)]) {4}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5605,10 +5605,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t)[ ]{2}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t) {2}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{3})((?:\\.|\\)))(?:[ ]{1}|(?=[ \\t]*\\n))|([0-9]{2})((?:\\.|\\)))(?:[ ]{2}(?![ ]))|([0-9]{1})((?:\\.|\\)))(?:[ ]{3}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{3})([.)])(?: {1}|(?=[ \\t]*\\n))|([0-9]{2})([.)]) {2}(?! )|([0-9]{1})([.)]) {3}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5637,10 +5637,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t)[ ]{1}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t) {1}"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{2})((?:\\.|\\)))(?:[ ]{1}|(?=[ \\t]*\\n))|([0-9])((?:\\.|\\)))(?:[ ]{2}(?![ ])))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*(?:([0-9]{2})([.)])(?: {1}|(?=[ \\t]*\\n))|([0-9])([.)]) {2}(?! ))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5663,10 +5663,10 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t)"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t)"
         },
         {
-          "begin": "(?:^|\\G)[\\t ]*([0-9])((?:\\.|\\)))(?:[ ]{1}|(?=[ \\t]*\\n))(\\[[\\t Xx]\\](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
+          "begin": "(?:^|\\G)[\\t ]*([0-9])([.)])(?: {1}|(?=[ \\t]*\\n))(\\[[\\t Xx]](?=[\\t\\n\\r ]+(?:$|[^\\t\\n\\r ])))?",
           "beginCaptures": {
             "1": {
               "name": "string.other.number.mdx"
@@ -5683,7 +5683,7 @@
               "include": "#markdown-sections"
             }
           ],
-          "while": "^(?=[\\t ]*$)|(?:^|\\G)[ ]{3}"
+          "while": "^(?=[\\t ]*$)|(?:^|\\G) {3}"
         }
       ]
     },
@@ -5695,7 +5695,7 @@
           "include": "#markdown-text"
         }
       ],
-      "while": "(?:^|\\G)(?:[ ]{4}|\\t)"
+      "while": "(?:^|\\G)(?: {4}|\\t)"
     },
     "commonmark-thematic-break": {
       "match": "(?:^|\\G)[\\t ]*([-*_])[ \\t]*(?:\\1[ \\t]*){2,}$",
@@ -5704,15 +5704,15 @@
     "extension-gfm-autolink-literal": {
       "patterns": [
         {
-          "match": "(?<=^|[\\t\\n\\r \\(\\*\\_\\[\\]~])(?=(?i:www)\\.[^\\n\\r])(?:(?:[\\p{L}\\p{N}]|-|[\\._](?!(?:[!\"'\\)\\*,\\.:;<\\?_~]*(?:[\\s<]|\\][\\t\\n \\(\\[]))))+\\g<path>?)?(?<path>(?:(?:[^\\t\\n\\r !\"&'\\(\\)\\*,\\.:;<\\?\\]_~]|&(?![A-Za-z]*;(?:[!\"'\\)\\*,\\.:;<\\?_~]*(?:[\\s<]|\\][\\t\\n \\(\\[])))|[!\"'\\)\\*,\\.:;\\?_~](?!(?:[!\"'\\)\\*,\\.:;<\\?_~]*(?:[\\s<]|\\][\\t\\n \\(\\[]))))|\\(\\g<path>*\\))+){0}",
+          "match": "(?<=^|[\\t\\n\\r (*_\\[\\]~])(?=(?i:www)\\.[^\\n\\r])(?:(?:[\\p{L}\\p{N}-]|[._](?![!\"')*,.:;<?_~]*(?:[\\s<]|][\\t\\n (\\[])))+\\g<path>?)?(?<path>(?:(?:[^\\t\\n\\r !\"\\&'()*,.:;<?\\]_~]|&(?![A-Za-z]*;[!\"')*,.:;<?_~]*(?:[\\s<]|][\\t\\n (\\[]))|[!\"')*,.:;?_~](?![!\"')*,.:;<?_~]*(?:[\\s<]|][\\t\\n (\\[])))|\\(\\g<path>*\\))+){0}",
           "name": "string.other.link.autolink.literal.www.mdx"
         },
         {
-          "match": "(?<=^|[^A-Za-z])(?i:https?://)(?=[\\p{L}\\p{N}])(?:(?:[\\p{L}\\p{N}]|-|[\\._](?!(?:[!\"'\\)\\*,\\.:;<\\?_~]*(?:[\\s<]|\\][\\t\\n \\(\\[]))))+\\g<path>?)?(?<path>(?:(?:[^\\t\\n\\r !\"&'\\(\\)\\*,\\.:;<\\?\\]_~]|&(?![A-Za-z]*;(?:[!\"'\\)\\*,\\.:;<\\?_~]*(?:[\\s<]|\\][\\t\\n \\(\\[])))|[!\"'\\)\\*,\\.:;\\?_~](?!(?:[!\"'\\)\\*,\\.:;<\\?_~]*(?:[\\s<]|\\][\\t\\n \\(\\[]))))|\\(\\g<path>*\\))+){0}",
+          "match": "(?<=^|[^A-Za-z])(?i:https?://)(?=[\\p{L}\\p{N}])(?:(?:[\\p{L}\\p{N}-]|[._](?![!\"')*,.:;<?_~]*(?:[\\s<]|][\\t\\n (\\[])))+\\g<path>?)?(?<path>(?:(?:[^\\t\\n\\r !\"\\&'()*,.:;<?\\]_~]|&(?![A-Za-z]*;[!\"')*,.:;<?_~]*(?:[\\s<]|][\\t\\n (\\[]))|[!\"')*,.:;?_~](?![!\"')*,.:;<?_~]*(?:[\\s<]|][\\t\\n (\\[])))|\\(\\g<path>*\\))+){0}",
           "name": "string.other.link.autolink.literal.http.mdx"
         },
         {
-          "match": "(?<=^|[^A-Za-z/])(?i:mailto:|xmpp:)?(?:[0-9A-Za-z+\\-\\._])+@(?:(?:[0-9A-Za-z]|[-_](?!(?:[!\"'\\)\\*,\\.:;<\\?_~]*(?:[\\s<]|\\][\\t\\n \\(\\[]))))+(?:\\.(?!(?:[!\"'\\)\\*,\\.:;<\\?_~]*(?:[\\s<]|\\][\\t\\n \\(\\[])))))+(?:[A-Za-z]|[-_](?!(?:[!\"'\\)\\*,\\.:;<\\?_~]*(?:[\\s<]|\\][\\t\\n \\(\\[]))))+",
+          "match": "(?<=^|[^A-Za-z/])(?i:mailto:|xmpp:)?[0-9A-Za-z+\\-._]+@(?:(?:[0-9A-Za-z]|[-_](?![!\"')*,.:;<?_~]*(?:[\\s<]|][\\t\\n (\\[])))+\\.(?![!\"')*,.:;<?_~]*(?:[\\s<]|][\\t\\n (\\[])))+(?:[A-Za-z]|[-_](?![!\"')*,.:;<?_~]*(?:[\\s<]|][\\t\\n (\\[])))+",
           "name": "string.other.link.autolink.literal.email.mdx"
         }
       ]
@@ -5737,10 +5737,10 @@
           "name": "string.other.end.footnote.mdx"
         }
       },
-      "match": "(\\[)(\\^)((?:[^\\t\\n\\r \\[\\\\\\]]|\\\\[\\[\\\\\\]]?)+)(\\])"
+      "match": "(\\[)(\\^)((?:[^\\t\\n\\r \\[\\\\\\]]|\\\\[\\[\\\\\\]]?)+)(])"
     },
     "extension-gfm-footnote-definition": {
-      "begin": "(?:^|\\G)[\\t ]*(\\[)(\\^)((?:[^\\t\\n\\r \\[\\\\\\]]|\\\\[\\[\\\\\\]]?)+)(\\])(:)[\\t ]*",
+      "begin": "(?:^|\\G)[\\t ]*(\\[)(\\^)((?:[^\\t\\n\\r \\[\\\\\\]]|\\\\[\\[\\\\\\]]?)+)(])(:)[\\t ]*",
       "beginCaptures": {
         "1": {
           "name": "string.other.begin.link.mdx"
@@ -5765,7 +5765,7 @@
           "include": "#markdown-sections"
         }
       ],
-      "while": "^(?=[\\t ]*$)|(?:^|\\G)(?:[ ]{4}|\\t)"
+      "while": "^(?=[\\t ]*$)|(?:^|\\G)(?: {4}|\\t)"
     },
     "extension-gfm-strikethrough": {
       "match": "(?<=\\S)(?<!~)~{1,2}(?!~)|(?<!~)~{1,2}(?=\\S)(?!~)",
@@ -5785,10 +5785,10 @@
               ]
             }
           },
-          "match": "(?<=\\||(?:^|\\G))[\\t ]*((?:[^\\n\\r\\\\\\|]|\\\\[\\\\\\|]?)+?)[\\t ]*(?=\\||$)"
+          "match": "(?<=\\||(?:^|\\G))[\\t ]*((?:[^\\n\\r\\\\|]|\\\\[\\\\|]?)+?)[\\t ]*(?=\\||$)"
         },
         {
-          "match": "(?:\\|)",
+          "match": "\\|",
           "name": "markup.list.table-delimiter.mdx"
         }
       ]
@@ -5805,7 +5805,7 @@
           "name": "punctuation.definition.gemoji.end.mdx"
         }
       },
-      "match": "(:)((?:(?:(?:hand_with_index_finger_and_thumb_cros|mailbox_clo|fist_rai|confu)s|r(?:aised_hand_with_fingers_splay|e(?:gister|l(?:iev|ax)))|disappointed_reliev|confound|(?:a(?:ston|ngu)i|flu)sh|unamus|hush)e|(?:chart_with_(?:down|up)wards_tre|large_orange_diamo|small_(?:orang|blu)e_diamo|large_blue_diamo|parasol_on_grou|loud_sou|rewi)n|(?:rightwards_pushing_h|hourglass_flowing_s|leftwards_(?:pushing_)?h|(?:raised_back_of|palm_(?:down|up)|call_me)_h|(?:(?:(?:clippert|ascensi)on|norfolk)_is|christmas_is|desert_is|bouvet_is|new_zea|thai|eng|fin|ire)l|rightwards_h|pinching_h|writing_h|s(?:w(?:itzer|azi)|cot)l|magic_w|ok_h|icel)an|s(?:un_behind_(?:large|small|rain)_clou|hallow_pan_of_foo|tar_of_davi|leeping_be|kateboar|a(?:tisfie|uropo)|hiel|oun|qui)|(?:ear_with_hearing_a|pouring_liqu)i|(?:identification_c|(?:arrow_(?:back|for)|fast_for)w|credit_c|woman_be|biohaz|man_be|l(?:eop|iz))ar|m(?:usical_key|ortar_)boar|(?:drop_of_bl|canned_f)oo|c(?:apital_abc|upi)|person_bal|(?:black_bi|(?:cust|plac)a)r|(?:clip|key)boar|mermai|pea_po|worrie|po(?:la|u)n|threa|dv)d|(?:(?:(?:face_with_open_eyes_and_hand_over|face_with_diagonal|open|no)_mou|h(?:and_over_mou|yacin)|mammo)t|running_shirt_with_sas|(?:(?:fishing_pole_and_|blow)fi|(?:tropical_f|petri_d)i|(?:paint|tooth)bru|banglade|jellyfi)s|(?:camera_fl|wavy_d)as|triump|menora|pouc|blus|watc|das|has)h|(?:s(?:o(?:(?:uth_georgia_south_sandwich|lomon)_island|ck)|miling_face_with_three_heart|t_kitts_nevi|weat_drop|agittariu|c(?:orpiu|issor)|ymbol|hort)|twisted_rightwards_arrow|(?:northern_mariana|heard_mcdonald|(?:british_virgi|us_virgi|pitcair|cayma)n|turks_caicos|us_outlying|(?:falk|a)land|marshall|c(?:anary|ocos)|faroe)_island|(?:face_holding_back_tea|(?:c(?:ard_index_divid|rossed_fing)|pinched_fing)e|night_with_sta)r|(?:two_(?:wo)?men_holding|people_holding|heart|open)_hand|(?:sunrise_over_mountai|(?:congratul|united_n)atio|jea)n|(?:caribbean_)?netherland|(?:f(?:lower_playing_car|ace_in_clou)|crossed_swor|prayer_bea)d|(?:money_with_win|nest_with_eg|crossed_fla|hotsprin)g|revolving_heart|(?:high_brightne|(?:expression|wire)le|(?:tumbler|wine)_gla|milk_gla|compa|dre)s|performing_art|earth_america|orthodox_cros|l(?:ow_brightnes|a(?:tin_cros|o)|ung)|no_pedestrian|c(?:ontrol_kno|lu)b|b(?:ookmark_tab|rick|ean)|nesting_doll|cook_island|(?:fleur_de_l|tenn)i|(?:o(?:ncoming_b|phiuch|ctop)|hi(?:ppopotam|bisc)|trolleyb|m(?:(?:rs|x)_cla|auriti|inib)|belar|cact|abac|(?:cyp|tau)r)u|medal_sport|(?:chopstic|firewor)k|rhinocero|(?:p(?:aw_prin|eanu)|footprin)t|two_heart|princes|(?:hondur|baham)a|barbado|aquariu|c(?:ustom|hain)|maraca|comoro|flag|wale|hug|vh)s|(?:(?:diamond_shape_with_a_dot_ins|playground_sl)id|(?:(?:first_quarter|last_quarter|full|new)_moon_with|(?:zipper|money)_mouth|dotted_line|upside_down|c(?:rying_c|owboy_h)at|(?:disguis|nauseat)ed|neutral|monocle|panda|tired|woozy|clown|nerd|zany|fox)_fac|s(?:t(?:uck_out_tongue_winking_ey|eam_locomotiv)|(?:lightly_(?:frown|smil)|neez|h(?:ush|ak))ing_fac|(?:tudio_micropho|(?:hinto_shr|lot_mach)i|ierra_leo|axopho)n|mall_airplan|un_with_fac|a(?:luting_fac|tellit|k)|haved_ic|y(?:nagogu|ring)|n(?:owfl)?ak|urinam|pong)|(?:black_(?:medium_)?small|white_(?:(?:medium_)?small|large)|(?:black|white)_medium|black_large|orange|purple|yellow|b(?:rown|lue)|red)_squar|(?:(?:perso|woma)n_with_|man_with_)?probing_can|(?:p(?:ut_litter_in_its_pl|outing_f)|frowning_f|cold_f|wind_f|hot_f)ac|(?:arrows_c(?:ounterc)?lockwi|computer_mou|derelict_hou|carousel_hor|c(?:ity_sunri|hee)|heartpul|briefca|racehor|pig_no|lacros)s|(?:(?:face_with_head_band|ideograph_advant|adhesive_band|under|pack)a|currency_exchan|l(?:eft_l)?ugga|woman_jud|name_bad|man_jud|jud)g|face_with_peeking_ey|(?:(?:e(?:uropean_post_off|ar_of_r)|post_off)i|information_sour|ambulan)c|artificial_satellit|(?:busts?_in_silhouet|(?:vulcan_sal|parach)u|m(?:usical_no|ayot)|ro(?:ller_ska|set)|timor_les|ice_ska)t|(?:(?:incoming|red)_envelo|s(?:ao_tome_princi|tethosco)|(?:micro|tele)sco|citysca)p|(?:(?:(?:convenience|department)_st|musical_sc)o|f(?:light_depar|ramed_pic)tu|love_you_gestu|heart_on_fi|japanese_og|cote_divoi|perseve|singapo)r|b(?:ullettrain_sid|eliz|on)|(?:(?:female_|male_)?dete|radioa)ctiv|(?:christmas|deciduous|evergreen|tanabata|palm)_tre|(?:vibration_mo|cape_ver)d|(?:fortune_cook|neckt|self)i|(?:fork_and_)?knif|athletic_sho|(?:p(?:lead|arty)|drool|curs|melt|yawn|ly)ing_fac|vomiting_fac|(?:(?:c(?:urling_st|ycl)|meat_on_b|repeat_|headst)o|(?:fire_eng|tanger|ukra)i|rice_sce|(?:micro|i)pho|champag|pho)n|(?:cricket|video)_gam|(?:boxing_glo|oli)v|(?:d(?:ragon|izzy)|monkey)_fac|(?:m(?:artin|ozamb)iq|fond)u|wind_chim|test_tub|flat_sho|m(?:a(?:ns_sho|t)|icrob|oos|ut)|(?:handsh|fish_c|moon_c|cupc)ak|nail_car|zimbabw|ho(?:neybe|l)|ice_cub|airplan|pensiv|c(?:a(?:n(?:dl|o)|k)|o(?:ffe|oki))|tongu|purs|f(?:lut|iv)|d(?:at|ov)|n(?:iu|os)|kit|rag|ax)e|(?:(?:british_indian_ocean_territo|(?:plate_with_cutl|batt)e|medal_milita|low_batte|hunga|wea)r|family_(?:woman_(?:woman_(?:girl|boy)|girl|boy)|man_(?:woman_(?:girl|boy)|man_(?:girl|boy)|girl|boy))_bo|person_feeding_bab|woman_feeding_bab|s(?:u(?:spension_railwa|nn)|t(?:atue_of_libert|_barthelem|rawberr))|(?:m(?:ountain_cable|ilky_)|aerial_tram)wa|articulated_lorr|man_feeding_bab|mountain_railwa|partly_sunn|(?:vatican_c|infin)it|(?:outbox_tr|inbox_tr|birthd|motorw|paragu|urugu|norw|x_r)a|butterfl|ring_buo|t(?:urke|roph)|angr|fogg)y|(?:(?:perso|woma)n_in_motorized_wheelchai|(?:(?:notebook_with_decorative_c|four_leaf_cl)ov|(?:index_pointing_at_the_vie|white_flo)w|(?:face_with_thermome|non\\-potable_wa|woman_firefigh|desktop_compu|m(?:an_firefigh|otor_scoo)|(?:ro(?:ller_coa|o)|oy)s|potable_wa|kick_scoo|thermome|firefigh|helicop|ot)t|(?:woman_factory_wor|(?:woman_office|woman_health|health)_wor|man_(?:factory|office|health)_wor|(?:factory|office)_wor|rice_crac|black_jo|firecrac)k|telephone_receiv|(?:palms_up_toget|f(?:ire_extinguis|eat)|teac)h|(?:(?:open_)?file_fol|level_sli)d|police_offic|f(?:lying_sauc|arm)|woman_teach|roll_of_pap|(?:m(?:iddle_f|an_s)in|woman_sin|hambur|plun|dag)g|do_not_litt|wilted_flow|woman_farm|man_(?:teach|farm)|(?:bell_pe|hot_pe|fli)pp|l(?:o(?:udspeak|ve_lett|bst)|edg|add)|tokyo_tow|c(?:ucumb|lapp|anc)|b(?:e(?:ginn|av)|adg)|print|hamst)e|(?:perso|woma)n_in_manual_wheelchai|m(?:an(?:_in_motorized|(?:_in_man)?ual)|otorized)_wheelchai|(?:person_(?:white|curly|red)_|wheelc)hai|triangular_rule|(?:film_project|e(?:l_salv|cu)ad|elevat|tract|anch)o|s(?:traight_rul|pace_invad|crewdriv|nowboard|unflow|peak|wimm|ing|occ|how|urf|ki)e|r(?:ed_ca|unne|azo)|d(?:o(?:lla|o)|ee)|barbe)r|(?:(?:cloud_with_(?:lightning_and_)?ra|japanese_gobl|round_pushp|liechtenste|mandar|pengu|dolph|bahra|pushp|viol)i|(?:couple(?:_with_heart_wo|kiss_)man|construction_worker|(?:mountain_bik|bow|row)ing|lotus_position|(?:w(?:eight_lift|alk)|climb)ing|white_haired|curly_haired|raising_hand|super(?:villain|hero)|red_haired|basketball|s(?:(?:wimm|urf)ing|assy)|haircut|no_good|(?:vampir|massag)e|b(?:iking|ald)|zombie|fairy|mage|elf|ng)_(?:wo)?ma|(?:(?:couple_with_heart_man|isle_of)_m|(?:couplekiss_woman_|(?:b(?:ouncing_ball|lond_haired)|tipping_hand|pregnant|kneeling|deaf)_|frowning_|s(?:tanding|auna)_|po(?:uting_|lice)|running_|blonde_|o(?:lder|k)_)wom|(?:perso|woma)n_with_turb|(?:b(?:ouncing_ball|lond_haired)|tipping_hand|pregnant|kneeling|deaf)_m|f(?:olding_hand_f|rowning_m)|man_with_turb|(?:turkmen|afghan|pak)ist|s(?:tanding_m|(?:outh_s)?ud|auna_m)|po(?:uting_|lice)m|running_m|azerbaij|k(?:yrgyz|azakh)st|tajikist|uzbekist|o(?:lder_m|k_m|ce)|(?:orang|bh)ut|taiw|jord)a|s(?:mall_red_triangle_dow|(?:valbard_jan_may|int_maart|ev)e|afety_pi|top_sig|t_marti|(?:corpi|po|o)o|wede)|(?:heavy_(?:d(?:ivision|ollar)|equals|minus|plus)|no_entry|female|male)_sig|(?:arrow_(?:heading|double)_d|p(?:erson_with_cr|oint_d)|arrow_up_d|thumbsd)ow|(?:house_with_gard|l(?:ock_with_ink_p|eafy_gre)|dancing_(?:wo)?m|fountain_p|keycap_t|chick|ali|yem|od)e|(?:izakaya|jack_o)_lanter|(?:funeral_u|(?:po(?:stal_h|pc)|capric)o|unico)r|chess_paw|b(?:a(?:llo|c)o|eni|rai)|l(?:anter|io)|c(?:o(?:ff)?i|row)|melo|rame|oma|yar)n|(?:s(?:t(?:uck_out_tongue_closed_ey|_vincent_grenadin)|kull_and_crossbon|unglass|pad)|(?:french_souther|palestinia)n_territori|(?:face_with_spiral|kissing_smiling)_ey|united_arab_emirat|kissing_closed_ey|(?:clinking_|dark_sun|eye)glass|(?:no_mobile_|head)phon|womans_cloth|b(?:allet_sho|lueberri)|philippin|(?:no_bicyc|seychel)l|roll_ey|(?:cher|a)ri|p(?:ancak|isc)|maldiv|leav)es|(?:f(?:amily_(?:woman_(?:woman_)?|man_(?:woman_|man_)?)girl_gir|earfu)|(?:woman_playing_hand|m(?:an_playing_hand|irror_)|c(?:onfetti|rystal)_|volley|track|base|8)bal|(?:(?:m(?:ailbox_with_(?:no_)?m|onor)|cockt|e\\-m)a|(?:person|bride|woman)_with_ve|man_with_ve|light_ra|braz|ema)i|(?:transgender|baby)_symbo|passport_contro|(?:arrow_(?:down|up)_sm|rice_b|footb)al|(?:dromedary_cam|ferris_whe|love_hot|high_he|pretz|falaf|isra)e|page_with_cur|me(?:dical_symbo|ta)|(?:n(?:ewspaper_ro|o_be)|bellhop_be)l|rugby_footbal|s(?:chool_satche|(?:peak|ee)_no_evi|oftbal|crol|anda|nai|hel)|(?:peace|atom)_symbo|hear_no_evi|cora|hote|bage|labe|rof|ow)l|(?:(?:negative_squared_cross|heavy_exclamation|part_alternation)_mar|(?:eight_spoked_)?asteris|(?:ballot_box_with_che|(?:(?:mantelpiece|alarm|timer)_c|un)lo|(?:ha(?:(?:mmer_and|ir)_p|tch(?:ing|ed)_ch)|baby_ch|joyst)i|railway_tra|lipsti|peaco)c|heavy_check_mar|white_check_mar|tr(?:opical_drin|uc)|national_par|pickup_truc|diving_mas|floppy_dis|s(?:tar_struc|hamroc|kun|har)|chipmun|denmar|duc|hoo|lin)k|(?:leftwards_arrow_with_h|arrow_right_h|(?:o(?:range|pen)|closed|blue)_b)ook|(?:woman_playing_water_pol|m(?:an(?:_(?:playing_water_pol|with_gua_pi_ma|in_tuxed)|g)|ontenegr|o(?:roc|na)c|e(?:xic|tr|m))|(?:perso|woma)n_in_tuxed|(?:trinidad_toba|vir)g|water_buffal|b(?:urkina_fas|a(?:mbo|nj)|ent)|puerto_ric|water_pol|flaming|kangaro|(?:mosqu|burr)it|(?:avoc|torn)ad|curaca|lesoth|potat|ko(?:sov|k)|tomat|d(?:ang|od)|yo_y|hoch|t(?:ac|og)|zer)o|(?:c(?:entral_african|zech)|dominican)_republic|(?:eight_pointed_black_s|six_pointed_s|qa)tar|(?:business_suit_levitat|(?:classical_buil|breast_fee)d|(?:woman_cartwhee|m(?:an_(?:cartwhee|jugg)|en_wrest)|women_wrest|woman_jugg|face_exha|cartwhee|wrest|dump)l|c(?:hildren_cross|amp)|woman_facepalm|woman_shrugg|man_(?:facepalm|shrugg)|people_hugg|(?:person_fe|woman_da|man_da)nc|fist_oncom|horse_rac|(?:no_smo|thin)k|laugh|s(?:eedl|mok)|park|w(?:arn|edd))ing|f(?:a(?:mily(?:_(?:woman_(?:woman_(?:girl|boy)|girl|boy)|man_(?:woman_(?:girl|boy)|man_(?:girl|boy)|girl|boy)))?|ctory)|o(?:u(?:ntain|r)|ot|g)|r(?:owning)?|i(?:re|s[ht])|ly|u)|(?:(?:(?:information_desk|handball|bearded)_|(?:frowning|ok)_|juggling_|mer)pers|(?:previous_track|p(?:lay_or_p)?ause|black_square|white_square|next_track|r(?:ecord|adio)|eject)_butt|(?:wa[nx]ing_(?:crescent|gibbous)_m|bowl_with_sp|crescent_m|racc)o|(?:b(?:ouncing_ball|lond_haired)|tipping_hand|pregnant|kneeling|deaf)_pers|s(?:t(?:_pierre_miquel|op_butt|ati)|tanding_pers|peech_ballo|auna_pers)|r(?:eminder_r)?ibb|thought_ballo|watermel|badmint|c(?:amero|ray)|le(?:ban|m)|oni|bis)on|(?:heavy_heart_exclama|building_construc|heart_decora|exclama)tion|(?:(?:triangular_flag_on_po|(?:(?:woman_)?technolog|m(?:ountain_bicycl|an_technolog)|bicycl)i|(?:wo)?man_scienti|(?:wo)?man_arti|s(?:afety_ve|cienti)|empty_ne)s|(?:vertical_)?traffic_ligh|(?:rescue_worker_helm|military_helm|nazar_amul|city_suns|wastebask|dropl|t(?:rump|oil)|bouqu|buck|magn|secr)e|one_piece_swimsui|(?:(?:arrow_(?:low|upp)er|point)_r|bridge_at_n|copyr|mag_r)igh|(?:bullettrain_fro|(?:potted_pl|croiss|e(?:ggpl|leph))a)n|s(?:t(?:ar_and_cresc|ud)en|cream_ca|mi(?:ley?|rk)_ca|(?:peed|ail)boa|hir)|(?:arrow_(?:low|upp)er|point)_lef|woman_astronau|r(?:o(?:tating_ligh|cke)|eceip)|heart_eyes_ca|man_astronau|(?:woman_stud|circus_t|man_stud|trid)en|(?:ringed_pla|file_cabi)ne|nut_and_bol|(?:older_)?adul|k(?:i(?:ssing_ca|wi_frui)|uwai|no)|(?:pouting_c|c(?:ut_of_m|old_sw)e|womans_h|montserr|(?:(?:motor_|row)b|lab_c)o|heartbe|toph)a|(?:woman_pil|honey_p|man_pil|[cp]arr|teap|rob)o|hiking_boo|arrow_lef|fist_righ|flashligh|f(?:ist_lef|ee)|black_ca|astronau|(?:c(?:hest|oco)|dough)nu|innocen|joy_ca|artis|(?:acce|egy)p|co(?:me|a)|pilo)t|(?:heavy_multiplication_|t\\-re)x|(?:s(?:miling_face_with_te|piral_calend)|oncoming_police_c|chocolate_b|ra(?:ilway|cing)_c|police_c|polar_be|teddy_be|madagasc|blue_c|calend|myanm)ar|c(?:l(?:o(?:ud(?:_with_lightning)?|ck(?:1[0-2]?|[2-9]))|ap)?|o(?:uple(?:_with_heart|kiss)?|nstruction|mputer|ok|p|w)|a(?:r(?:d_index)?|mera)|r(?:icket|y)|h(?:art|ild))|(?:m(?:artial_arts_unifo|echanical_a)r|(?:cherry_)?blosso|b(?:aggage_clai|roo)|ice_?crea|facepal|mushroo|restroo|vietna|dru|yu)m|(?:woman_with_headscar|m(?:obile_phone_of|aple_lea)|fallen_lea|wol)f|(?:(?:closed_lock_with|old)_|field_hoc|ice_hoc|han|don)key|g(?:lobe_with_meridians|r(?:e(?:y_(?:exclama|ques)tion|e(?:n(?:_(?:square|circle|salad|apple|heart|book)|land)|ce)|y_heart|nada)|i(?:mac|nn)ing|apes)|u(?:inea_bissau|ernsey|am|n)|(?:(?:olfing|enie)_(?:wo)?|uards(?:wo)?)man|(?:inger_roo|oal_ne|hos)t|(?:uadeloup|ame_di|iraff|oos)e|ift_heart|i(?:braltar|rl)|(?:uatemal|(?:eorg|amb)i|orill|uyan|han)a|uide_dog|(?:oggl|lov)es|arlic|emini|uitar|abon|oat|ear|b)|construction_worker|(?:(?:envelope_with|bow_and)_ar|left_right_ar|raised_eyeb)row|(?:(?:oncoming_automob|crocod)i|right_anger_bubb|l(?:eft_speech_bubb|otion_bott|ady_beet)|congo_brazzavil|eye_speech_bubb|(?:large_blue|orange|purple|yellow|brown)_circ|(?:(?:european|japanese)_cas|baby_bot)t|b(?:alance_sca|eet)|s(?:ewing_need|weat_smi)|(?:black|white|red)_circ|(?:motor|re)cyc|pood|turt|tama|waff|musc|eag)le|first_quarter_moon|s(?:m(?:all_red_triangle|i(?:ley?|rk))|t(?:uck_out_tongue|ar)|hopping|leeping|p(?:arkle|ider)|unrise|nowman|chool|cream|k(?:ull|i)|weat|ix|a)|(?:(?:b(?:osnia_herzegovi|ana)|wallis_futu|(?:french_gui|botsw)a|argenti|st_hele)n|(?:(?:equatorial|papua_new)_guin|north_kor|eritr)e|t(?:ristan_da_cunh|ad)|(?:(?:(?:french_poly|indo)ne|tuni)s|(?:new_caledo|ma(?:urita|cedo)|lithua|(?:tanz|alb|rom)a|arme|esto)n|diego_garc|s(?:audi_arab|t_luc|lov(?:ak|en)|omal|erb)|e(?:arth_as|thiop)|m(?:icrone|alay)s|(?:austra|mongo)l|c(?:ambod|roat)|(?:bulga|alge)r|(?:colom|nami|zam)b|boliv|l(?:iber|atv))i|(?:wheel_of_dhar|cine|pana)m|(?:(?:(?:closed|beach|open)_)?umbrel|ceuta_melil|venezue|ang(?:uil|o)|koa)l|c(?:ongo_kinshas|anad|ub)|(?:western_saha|a(?:mpho|ndor)|zeb)r|american_samo|video_camer|m(?:o(?:vie_camer|ldov)|alt|eg)|(?:earth_af|costa_)ric|s(?:outh_afric|ri_lank|a(?:mo|nt))|bubble_te|(?:antarct|jama)ic|ni(?:caragu|geri|nj)|austri|pi(?:nat|zz)|arub|k(?:eny|aab)|indi|u7a7|l(?:lam|ib[ry])|dn)a|l(?:ast_quarter_moon|o(?:tus|ck)|ips|eo)|(?:hammer_and_wren|c(?:ockroa|hur)|facepun|wren|crut|pun)ch|s(?:nowman_with_snow|ignal_strength|weet_potato|miling_imp|p(?:ider_web|arkle[rs])|w(?:im_brief|an)|a(?:n(?:_marino|dwich)|lt)|topwatch|t(?:a(?:dium|r[2s])|ew)|l(?:e(?:epy|d)|oth)|hrimp|yria|carf|(?:hee|oa)p|ea[lt]|h(?:oe|i[pt])|o[bs])|(?:s(?:tuffed_flatbre|p(?:iral_notep|eaking_he))|(?:exploding_h|baguette_br|flatbr)e)ad|(?:arrow_(?:heading|double)_u|(?:p(?:lace_of_wor|assenger_)sh|film_str|tul)i|page_facing_u|biting_li|(?:billed_c|world_m)a|mouse_tra|(?:curly_lo|busst)o|thumbsu|lo(?:llip)?o|clam|im)p|(?:anatomical|light_blue|sparkling|kissing|mending|orange|purple|yellow|broken|b(?:rown|l(?:ack|ue))|pink)_heart|(?:(?:transgender|black)_fla|mechanical_le|(?:checkered|pirate)_fla|electric_plu|rainbow_fla|poultry_le|service_do|white_fla|luxembour|fried_eg|moneyba|h(?:edgeh|otd)o|shru)g|(?:cloud_with|mountain)_snow|(?:(?:antigua_barb|berm)u|(?:kh|ug)an|rwan)da|(?:3r|2n)d_place_medal|1(?:st_place_medal|234|00)|lotus_position|(?:w(?:eight_lift|alk)|climb)ing|(?:(?:cup_with_str|auto_ricksh)a|carpentry_sa|windo|jigsa)w|(?:(?:couch_and|diya)_la|f(?:ried_shri|uelpu))mp|(?:woman_mechan|man_mechan|alemb)ic|(?:european_un|accord|collis|reun)ion|(?:flight_arriv|hospit|portug|seneg|nep)al|card_file_box|(?:(?:oncoming_)?tax|m(?:o(?:unt_fuj|ya)|alaw)|s(?:paghett|ush|ar)|b(?:r(?:occol|une)|urund)|(?:djibou|kiriba)t|hait|fij)i|(?:shopping_c|white_he|bar_ch)art|d(?:isappointed|ominica|e(?:sert)?)|raising_hand|super(?:villain|hero)|b(?:e(?:verage_box|ers|d)|u(?:bbles|lb|g)|i(?:k(?:ini|e)|rd)|o(?:o(?:ks|t)|a[rt]|y)|read|a[cn]k)|ra(?:ised_hands|bbit2|t)|(?:hindu_tem|ap)ple|thong_sandal|a(?:r(?:row_(?:right|down|up)|t)|bc?|nt)?|r(?:a(?:i(?:sed_hand|nbow)|bbit|dio|m)|u(?:nning)?|epeat|i(?:ng|ce)|o(?:ck|se))|takeout_box|(?:flying_|mini)disc|(?:(?:interrob|yin_y)a|b(?:o(?:omera|wli)|angba)|(?:ping_p|hong_k)o|calli|mahjo)ng|b(?:a(?:llot_box|sket|th?|by)|o(?:o(?:k(?:mark)?|m)|w)|u(?:tter|s)|e(?:ll|er?|ar))?|heart_eyes|basketball|(?:paperclip|dancer|ticket)s|point_up_2|(?:wo)?man_cook|n(?:ew(?:spaper)?|o(?:tebook|_entry)|iger)|t(?:e(?:lephone|a)|o(?:oth|p)|r(?:oll)?|wo)|h(?:o(?:u(?:rglass|se)|rse)|a(?:mmer|nd)|eart)|paperclip|full_moon|(?:b(?:lack_ni|athtu|om)|her)b|(?:long|oil)_drum|pineapple|(?:clock(?:1[0-2]?|[2-9])3|u6e8)0|p(?:o(?:int_up|ut)|r(?:ince|ay)|i(?:ck|g)|en)|e(?:nvelope|ight|u(?:ro)?|gg|ar|ye|s)|m(?:o(?:u(?:ntain|se)|nkey|on)|echanic|a(?:ilbox|g|n)|irror)?|new_moon|d(?:iamonds|olls|art)|question|k(?:iss(?:ing)?|ey)|haircut|no_good|(?:vampir|massag)e|g(?:olf(?:ing)?|u(?:inea|ard)|e(?:nie|m)|ift|rin)|h(?:a(?:ndbag|msa)|ouses|earts|ut)|postbox|toolbox|(?:pencil|t(?:rain|iger)|whale|cat|dog)2|belgium|(?:volca|kimo)no|(?:vanuat|tuval|pala|naur|maca)u|tokelau|o(?:range|ne?|m|k)?|office|dancer|ticket|dragon|pencil|zombie|w(?:o(?:mens|rm|od)|ave|in[gk]|c)|m(?:o(?:sque|use2)|e(?:rman|ns)|a(?:li|sk))|jersey|tshirt|w(?:heel|oman)|dizzy|j(?:apan|oy)|t(?:rain|iger)|whale|fairy|a(?:nge[lr]|bcd|tm)|c(?:h(?:a(?:ir|d)|ile)|a(?:ndy|mel)|urry|rab|o(?:rn|ol|w2)|[dn])|p(?:ager|e(?:a(?:ch|r)|ru)|i(?:g2|ll|e)|oop)|n(?:otes|ine)|t(?:onga|hree|ent|ram|[mv])|f(?:erry|r(?:ies|ee|og)|ax)|u(?:7(?:533|981|121)|5(?:5b6|408|272)|6(?:307|70[89]))|mage|e(?:yes|nd)|i(?:ra[nq]|t)|cat|dog|elf|z(?:zz|ap)|yen|j(?:ar|p)|leg|id|u[kps]|ng|o[2x]|vs|kr|[\\+\\x2D]1|x|v)(:)",
+      "match": "(:)((?:(?:(?:hand_with_index_finger_and_thumb_cros|mailbox_clo|fist_rai|confu)s|r(?:aised_hand_with_fingers_splay|e(?:gister|l(?:iev|ax)))|disappointed_reliev|confound|(?:a(?:ston|ngu)i|flu)sh|unamus|hush)e|(?:chart_with_(?:down|up)wards_tre|large_orange_diamo|small_(?:orang|blu)e_diamo|large_blue_diamo|parasol_on_grou|loud_sou|rewi)n|(?:rightwards_pushing_h|hourglass_flowing_s|leftwards_(?:pushing_)?h|(?:raised_back_of|palm_(?:down|up)|call_me)_h|(?:(?:(?:clippert|ascensi)on|norfolk)_is|christmas_is|desert_is|bouvet_is|new_zea|thai|eng|fin|ire)l|rightwards_h|pinching_h|writing_h|s(?:w(?:itzer|azi)|cot)l|magic_w|ok_h|icel)an|s(?:un_behind_(?:large|small|rain)_clou|hallow_pan_of_foo|tar_of_davi|leeping_be|kateboar|a(?:tisfie|uropo)|hiel|oun|qui)|(?:ear_with_hearing_a|pouring_liqu)i|(?:identification_c|(?:arrow_(?:back|for)|fast_for)w|credit_c|woman_be|biohaz|man_be|l(?:eop|iz))ar|m(?:usical_key|ortar_)boar|(?:drop_of_bl|canned_f)oo|c(?:apital_abc|upi)|person_bal|(?:black_bi|(?:cust|plac)a)r|(?:clip|key)boar|mermai|pea_po|worrie|po(?:la|u)n|threa|dv)d|(?:(?:(?:face_with_open_eyes_and_hand_over|face_with_diagonal|open|no)_mou|h(?:and_over_mou|yacin)|mammo)t|running_shirt_with_sas|(?:(?:fishing_pole_and_|blow)fi|(?:tropical_f|petri_d)i|(?:paint|tooth)bru|banglade|jellyfi)s|(?:camera_fl|wavy_d)as|triump|menora|pouc|blus|watc|das|has)h|(?:s(?:o(?:(?:uth_georgia_south_sandwich|lomon)_island|ck)|miling_face_with_three_heart|t_kitts_nevi|weat_drop|agittariu|c(?:orpiu|issor)|ymbol|hort)|twisted_rightwards_arrow|(?:northern_mariana|heard_mcdonald|(?:british_virgi|us_virgi|pitcair|cayma)n|turks_caicos|us_outlying|(?:falk|a)land|marshall|c(?:anary|ocos)|faroe)_island|(?:face_holding_back_tea|(?:c(?:ard_index_divid|rossed_fing)|pinched_fing)e|night_with_sta)r|(?:two_(?:wo)?men_holding|people_holding|heart|open)_hand|(?:sunrise_over_mountai|(?:congratul|united_n)atio|jea)n|(?:caribbean_)?netherland|(?:f(?:lower_playing_car|ace_in_clou)|crossed_swor|prayer_bea)d|(?:money_with_win|nest_with_eg|crossed_fla|hotsprin)g|revolving_heart|(?:high_brightne|(?:expression|wire)le|(?:tumbler|wine)_gla|milk_gla|compa|dre)s|performing_art|earth_america|orthodox_cros|l(?:ow_brightnes|a(?:tin_cros|o)|ung)|no_pedestrian|c(?:ontrol_kno|lu)b|b(?:ookmark_tab|rick|ean)|nesting_doll|cook_island|(?:fleur_de_l|tenn)i|(?:o(?:ncoming_b|phiuch|ctop)|hi(?:ppopotam|bisc)|trolleyb|m(?:(?:rs|x)_cla|auriti|inib)|belar|cact|abac|(?:cyp|tau)r)u|medal_sport|(?:chopstic|firewor)k|rhinocero|(?:p(?:aw_prin|eanu)|footprin)t|two_heart|princes|(?:hondur|baham)a|barbado|aquariu|c(?:ustom|hain)|maraca|comoro|flag|wale|hug|vh)s|(?:(?:diamond_shape_with_a_dot_ins|playground_sl)id|(?:(?:first_quarter|last_quarter|full|new)_moon_with|(?:zipper|money)_mouth|dotted_line|upside_down|c(?:rying_c|owboy_h)at|(?:disguis|nauseat)ed|neutral|monocle|panda|tired|woozy|clown|nerd|zany|fox)_fac|s(?:t(?:uck_out_tongue_winking_ey|eam_locomotiv)|(?:lightly_(?:frown|smil)|neez|h(?:ush|ak))ing_fac|(?:tudio_micropho|(?:hinto_shr|lot_mach)i|ierra_leo|axopho)n|mall_airplan|un_with_fac|a(?:luting_fac|tellit|k)|haved_ic|y(?:nagogu|ring)|n(?:owfl)?ak|urinam|pong)|(?:black_(?:medium_)?small|white_(?:(?:medium_)?small|large)|(?:black|white)_medium|black_large|orange|purple|yellow|b(?:rown|lue)|red)_squar|(?:(?:perso|woma)n_with_|man_with_)?probing_can|(?:p(?:ut_litter_in_its_pl|outing_f)|frowning_f|cold_f|wind_f|hot_f)ac|(?:arrows_c(?:ounterc)?lockwi|computer_mou|derelict_hou|carousel_hor|c(?:ity_sunri|hee)|heartpul|briefca|racehor|pig_no|lacros)s|(?:(?:face_with_head_band|ideograph_advant|adhesive_band|under|pack)a|currency_exchan|l(?:eft_l)?ugga|woman_jud|name_bad|man_jud|jud)g|face_with_peeking_ey|(?:(?:e(?:uropean_post_off|ar_of_r)|post_off)i|information_sour|ambulan)c|artificial_satellit|(?:busts?_in_silhouet|(?:vulcan_sal|parach)u|m(?:usical_no|ayot)|ro(?:ller_ska|set)|timor_les|ice_ska)t|(?:(?:incoming|red)_envelo|s(?:ao_tome_princi|tethosco)|(?:micro|tele)sco|citysca)p|(?:(?:(?:convenience|department)_st|musical_sc)o|f(?:light_depar|ramed_pic)tu|love_you_gestu|heart_on_fi|japanese_og|cote_divoi|perseve|singapo)r|b(?:ullettrain_sid|eliz|on)|(?:(?:female_|male_)?dete|radioa)ctiv|(?:christmas|deciduous|evergreen|tanabata|palm)_tre|(?:vibration_mo|cape_ver)d|(?:fortune_cook|neckt|self)i|(?:fork_and_)?knif|athletic_sho|(?:p(?:lead|arty)|drool|curs|melt|yawn|ly)ing_fac|vomiting_fac|(?:(?:c(?:urling_st|ycl)|meat_on_b|repeat_|headst)o|(?:fire_eng|tanger|ukra)i|rice_sce|(?:micro|i)pho|champag|pho)n|(?:cricket|video)_gam|(?:boxing_glo|oli)v|(?:d(?:ragon|izzy)|monkey)_fac|(?:m(?:artin|ozamb)iq|fond)u|wind_chim|test_tub|flat_sho|m(?:a(?:ns_sho|t)|icrob|oos|ut)|(?:handsh|fish_c|moon_c|cupc)ak|nail_car|zimbabw|ho(?:neybe|l)|ice_cub|airplan|pensiv|c(?:a(?:n(?:dl|o)|k)|o(?:ffe|oki))|tongu|purs|f(?:lut|iv)|d(?:at|ov)|n(?:iu|os)|kit|rag|ax)e|(?:(?:british_indian_ocean_territo|(?:plate_with_cutl|batt)e|medal_milita|low_batte|hunga|wea)r|family_(?:woman_(?:woman_(?:girl|boy)|girl|boy)|man_(?:woman_(?:girl|boy)|man_(?:girl|boy)|girl|boy))_bo|person_feeding_bab|woman_feeding_bab|s(?:u(?:spension_railwa|nn)|t(?:atue_of_libert|_barthelem|rawberr))|(?:m(?:ountain_cable|ilky_)|aerial_tram)wa|articulated_lorr|man_feeding_bab|mountain_railwa|partly_sunn|(?:vatican_c|infin)it|(?:outbox_tr|inbox_tr|birthd|motorw|paragu|urugu|norw|x_r)a|butterfl|ring_buo|t(?:urke|roph)|angr|fogg)y|(?:(?:perso|woma)n_in_motorized_wheelchai|(?:(?:notebook_with_decorative_c|four_leaf_cl)ov|(?:index_pointing_at_the_vie|white_flo)w|(?:face_with_thermome|non-potable_wa|woman_firefigh|desktop_compu|m(?:an_firefigh|otor_scoo)|(?:ro(?:ller_coa|o)|oy)s|potable_wa|kick_scoo|thermome|firefigh|helicop|ot)t|(?:woman_factory_wor|(?:woman_office|woman_health|health)_wor|man_(?:factory|office|health)_wor|(?:factory|office)_wor|rice_crac|black_jo|firecrac)k|telephone_receiv|(?:palms_up_toget|f(?:ire_extinguis|eat)|teac)h|(?:(?:open_)?file_fol|level_sli)d|police_offic|f(?:lying_sauc|arm)|woman_teach|roll_of_pap|(?:m(?:iddle_f|an_s)in|woman_sin|hambur|plun|dag)g|do_not_litt|wilted_flow|woman_farm|man_(?:teach|farm)|(?:bell_pe|hot_pe|fli)pp|l(?:o(?:udspeak|ve_lett|bst)|edg|add)|tokyo_tow|c(?:ucumb|lapp|anc)|b(?:e(?:ginn|av)|adg)|print|hamst)e|(?:perso|woma)n_in_manual_wheelchai|m(?:an(?:_in_motorized|(?:_in_man)?ual)|otorized)_wheelchai|(?:person_(?:white|curly|red)_|wheelc)hai|triangular_rule|(?:film_project|e(?:l_salv|cu)ad|elevat|tract|anch)o|s(?:traight_rul|pace_invad|crewdriv|nowboard|unflow|peak|wimm|ing|occ|how|urf|ki)e|r(?:ed_ca|unne|azo)|d(?:o(?:lla|o)|ee)|barbe)r|(?:(?:cloud_with_(?:lightning_and_)?ra|japanese_gobl|round_pushp|liechtenste|mandar|pengu|dolph|bahra|pushp|viol)i|(?:couple(?:_with_heart_wo|kiss_)man|construction_worker|(?:mountain_bik|bow|row)ing|lotus_position|(?:w(?:eight_lift|alk)|climb)ing|white_haired|curly_haired|raising_hand|super(?:villain|hero)|red_haired|basketball|s(?:(?:wimm|urf)ing|assy)|haircut|no_good|(?:vampir|massag)e|b(?:iking|ald)|zombie|fairy|mage|elf|ng)_(?:wo)?ma|(?:(?:couple_with_heart_man|isle_of)_m|(?:couplekiss_woman_|(?:b(?:ouncing_ball|lond_haired)|tipping_hand|pregnant|kneeling|deaf)_|frowning_|s(?:tanding|auna)_|po(?:uting_|lice)|running_|blonde_|o(?:lder|k)_)wom|(?:perso|woma)n_with_turb|(?:b(?:ouncing_ball|lond_haired)|tipping_hand|pregnant|kneeling|deaf)_m|f(?:olding_hand_f|rowning_m)|man_with_turb|(?:turkmen|afghan|pak)ist|s(?:tanding_m|(?:outh_s)?ud|auna_m)|po(?:uting_|lice)m|running_m|azerbaij|k(?:yrgyz|azakh)st|tajikist|uzbekist|o(?:lder_m|k_m|ce)|(?:orang|bh)ut|taiw|jord)a|s(?:mall_red_triangle_dow|(?:valbard_jan_may|int_maart|ev)e|afety_pi|top_sig|t_marti|(?:corpi|po|o)o|wede)|(?:heavy_(?:d(?:ivision|ollar)|equals|minus|plus)|no_entry|female|male)_sig|(?:arrow_(?:heading|double)_d|p(?:erson_with_cr|oint_d)|arrow_up_d|thumbsd)ow|(?:house_with_gard|l(?:ock_with_ink_p|eafy_gre)|dancing_(?:wo)?m|fountain_p|keycap_t|chick|ali|yem|od)e|(?:izakaya|jack_o)_lanter|(?:funeral_u|(?:po(?:stal_h|pc)|capric)o|unico)r|chess_paw|b(?:a(?:llo|c)o|eni|rai)|l(?:anter|io)|c(?:o(?:ff)?i|row)|melo|rame|oma|yar)n|(?:s(?:t(?:uck_out_tongue_closed_ey|_vincent_grenadin)|kull_and_crossbon|unglass|pad)|(?:french_souther|palestinia)n_territori|(?:face_with_spiral|kissing_smiling)_ey|united_arab_emirat|kissing_closed_ey|(?:clinking_|dark_sun|eye)glass|(?:no_mobile_|head)phon|womans_cloth|b(?:allet_sho|lueberri)|philippin|(?:no_bicyc|seychel)l|roll_ey|(?:cher|a)ri|p(?:ancak|isc)|maldiv|leav)es|(?:f(?:amily_(?:woman_(?:woman_)?|man_(?:woman_|man_)?)girl_gir|earfu)|(?:woman_playing_hand|m(?:an_playing_hand|irror_)|c(?:onfetti|rystal)_|volley|track|base|8)bal|(?:(?:m(?:ailbox_with_(?:no_)?m|onor)|cockt|e-m)a|(?:person|bride|woman)_with_ve|man_with_ve|light_ra|braz|ema)i|(?:transgender|baby)_symbo|passport_contro|(?:arrow_(?:down|up)_sm|rice_b|footb)al|(?:dromedary_cam|ferris_whe|love_hot|high_he|pretz|falaf|isra)e|page_with_cur|me(?:dical_symbo|ta)|(?:n(?:ewspaper_ro|o_be)|bellhop_be)l|rugby_footbal|s(?:chool_satche|(?:peak|ee)_no_evi|oftbal|crol|anda|nai|hel)|(?:peace|atom)_symbo|hear_no_evi|cora|hote|bage|labe|rof|ow)l|(?:(?:negative_squared_cross|heavy_exclamation|part_alternation)_mar|(?:eight_spoked_)?asteris|(?:ballot_box_with_che|(?:(?:mantelpiece|alarm|timer)_c|un)lo|(?:ha(?:(?:mmer_and|ir)_p|tch(?:ing|ed)_ch)|baby_ch|joyst)i|railway_tra|lipsti|peaco)c|heavy_check_mar|white_check_mar|tr(?:opical_drin|uc)|national_par|pickup_truc|diving_mas|floppy_dis|s(?:tar_struc|hamroc|kun|har)|chipmun|denmar|duc|hoo|lin)k|(?:leftwards_arrow_with_h|arrow_right_h|(?:o(?:range|pen)|closed|blue)_b)ook|(?:woman_playing_water_pol|m(?:an(?:_(?:playing_water_pol|with_gua_pi_ma|in_tuxed)|g)|ontenegr|o(?:roc|na)c|e(?:xic|tr|m))|(?:perso|woma)n_in_tuxed|(?:trinidad_toba|vir)g|water_buffal|b(?:urkina_fas|a(?:mbo|nj)|ent)|puerto_ric|water_pol|flaming|kangaro|(?:mosqu|burr)it|(?:avoc|torn)ad|curaca|lesoth|potat|ko(?:sov|k)|tomat|d(?:ang|od)|yo_y|hoch|t(?:ac|og)|zer)o|(?:c(?:entral_african|zech)|dominican)_republic|(?:eight_pointed_black_s|six_pointed_s|qa)tar|(?:business_suit_levitat|(?:classical_buil|breast_fee)d|(?:woman_cartwhee|m(?:an_(?:cartwhee|jugg)|en_wrest)|women_wrest|woman_jugg|face_exha|cartwhee|wrest|dump)l|c(?:hildren_cross|amp)|woman_facepalm|woman_shrugg|man_(?:facepalm|shrugg)|people_hugg|(?:person_fe|woman_da|man_da)nc|fist_oncom|horse_rac|(?:no_smo|thin)k|laugh|s(?:eedl|mok)|park|w(?:arn|edd))ing|f(?:a(?:mily(?:_(?:woman_(?:woman_(?:girl|boy)|girl|boy)|man_(?:woman_(?:girl|boy)|man_(?:girl|boy)|girl|boy)))?|ctory)|o(?:u(?:ntain|r)|ot|g)|r(?:owning)?|i(?:re|s[ht])|ly|u)|(?:(?:(?:information_desk|handball|bearded)_|(?:frowning|ok)_|juggling_|mer)pers|(?:previous_track|p(?:lay_or_p)?ause|black_square|white_square|next_track|r(?:ecord|adio)|eject)_butt|(?:wa[nx]ing_(?:crescent|gibbous)_m|bowl_with_sp|crescent_m|racc)o|(?:b(?:ouncing_ball|lond_haired)|tipping_hand|pregnant|kneeling|deaf)_pers|s(?:t(?:_pierre_miquel|op_butt|ati)|tanding_pers|peech_ballo|auna_pers)|r(?:eminder_r)?ibb|thought_ballo|watermel|badmint|c(?:amero|ray)|le(?:ban|m)|oni|bis)on|(?:heavy_heart_exclama|building_construc|heart_decora|exclama)tion|(?:(?:triangular_flag_on_po|(?:(?:woman_)?technolog|m(?:ountain_bicycl|an_technolog)|bicycl)i|(?:wo)?man_scienti|(?:wo)?man_arti|s(?:afety_ve|cienti)|empty_ne)s|(?:vertical_)?traffic_ligh|(?:rescue_worker_helm|military_helm|nazar_amul|city_suns|wastebask|dropl|t(?:rump|oil)|bouqu|buck|magn|secr)e|one_piece_swimsui|(?:(?:arrow_(?:low|upp)er|point)_r|bridge_at_n|copyr|mag_r)igh|(?:bullettrain_fro|(?:potted_pl|croiss|e(?:ggpl|leph))a)n|s(?:t(?:ar_and_cresc|ud)en|cream_ca|mi(?:ley?|rk)_ca|(?:peed|ail)boa|hir)|(?:arrow_(?:low|upp)er|point)_lef|woman_astronau|r(?:o(?:tating_ligh|cke)|eceip)|heart_eyes_ca|man_astronau|(?:woman_stud|circus_t|man_stud|trid)en|(?:ringed_pla|file_cabi)ne|nut_and_bol|(?:older_)?adul|k(?:i(?:ssing_ca|wi_frui)|uwai|no)|(?:pouting_c|c(?:ut_of_m|old_sw)e|womans_h|montserr|(?:(?:motor_|row)b|lab_c)o|heartbe|toph)a|(?:woman_pil|honey_p|man_pil|[cp]arr|teap|rob)o|hiking_boo|arrow_lef|fist_righ|flashligh|f(?:ist_lef|ee)|black_ca|astronau|(?:c(?:hest|oco)|dough)nu|innocen|joy_ca|artis|(?:acce|egy)p|co(?:me|a)|pilo)t|(?:heavy_multiplication_|t-re)x|(?:s(?:miling_face_with_te|piral_calend)|oncoming_police_c|chocolate_b|ra(?:ilway|cing)_c|police_c|polar_be|teddy_be|madagasc|blue_c|calend|myanm)ar|c(?:l(?:o(?:ud(?:_with_lightning)?|ck(?:1[0-2]?|[2-9]))|ap)?|o(?:uple(?:_with_heart|kiss)?|nstruction|mputer|ok|[pw])|a(?:r(?:d_index)?|mera)|r(?:icket|y)|h(?:art|ild))|(?:m(?:artial_arts_unifo|echanical_a)r|(?:cherry_)?blosso|b(?:aggage_clai|roo)|ice_?crea|facepal|mushroo|restroo|vietna|dru|yu)m|(?:woman_with_headscar|m(?:obile_phone_of|aple_lea)|fallen_lea|wol)f|(?:(?:closed_lock_with|old)_|field_hoc|ice_hoc|han|don)key|g(?:lobe_with_meridians|r(?:e(?:y_(?:exclama|ques)tion|e(?:n(?:_(?:square|circle|salad|apple|heart|book)|land)|ce)|y_heart|nada)|i(?:mac|nn)ing|apes)|u(?:inea_bissau|ernsey|am|n)|(?:(?:olfing|enie)_(?:wo)?|uards(?:wo)?)man|(?:inger_roo|oal_ne|hos)t|(?:uadeloup|ame_di|iraff|oos)e|ift_heart|i(?:braltar|rl)|(?:uatemal|(?:eorg|amb)i|orill|uyan|han)a|uide_dog|(?:oggl|lov)es|arlic|emini|uitar|abon|oat|ear|b)|construction_worker|(?:(?:envelope_with|bow_and)_ar|left_right_ar|raised_eyeb)row|(?:(?:oncoming_automob|crocod)i|right_anger_bubb|l(?:eft_speech_bubb|otion_bott|ady_beet)|congo_brazzavil|eye_speech_bubb|(?:large_blue|orange|purple|yellow|brown)_circ|(?:(?:european|japanese)_cas|baby_bot)t|b(?:alance_sca|eet)|s(?:ewing_need|weat_smi)|(?:black|white|red)_circ|(?:motor|re)cyc|pood|turt|tama|waff|musc|eag)le|first_quarter_moon|s(?:m(?:all_red_triangle|i(?:ley?|rk))|t(?:uck_out_tongue|ar)|hopping|leeping|p(?:arkle|ider)|unrise|nowman|chool|cream|k(?:ull|i)|weat|ix|a)|(?:(?:b(?:osnia_herzegovi|ana)|wallis_futu|(?:french_gui|botsw)a|argenti|st_hele)n|(?:(?:equatorial|papua_new)_guin|north_kor|eritr)e|t(?:ristan_da_cunh|ad)|(?:(?:(?:french_poly|indo)ne|tuni)s|(?:new_caledo|ma(?:urita|cedo)|lithua|(?:tanz|alb|rom)a|arme|esto)n|diego_garc|s(?:audi_arab|t_luc|lov(?:ak|en)|omal|erb)|e(?:arth_as|thiop)|m(?:icrone|alay)s|(?:austra|mongo)l|c(?:ambod|roat)|(?:bulga|alge)r|(?:colom|nami|zam)b|boliv|l(?:iber|atv))i|(?:wheel_of_dhar|cine|pana)m|(?:(?:(?:closed|beach|open)_)?umbrel|ceuta_melil|venezue|ang(?:uil|o)|koa)l|c(?:ongo_kinshas|anad|ub)|(?:western_saha|a(?:mpho|ndor)|zeb)r|american_samo|video_camer|m(?:o(?:vie_camer|ldov)|alt|eg)|(?:earth_af|costa_)ric|s(?:outh_afric|ri_lank|a(?:mo|nt))|bubble_te|(?:antarct|jama)ic|ni(?:caragu|geri|nj)|austri|pi(?:nat|zz)|arub|k(?:eny|aab)|indi|u7a7|l(?:lam|ib[ry])|dn)a|l(?:ast_quarter_moon|o(?:tus|ck)|ips|eo)|(?:hammer_and_wren|c(?:ockroa|hur)|facepun|wren|crut|pun)ch|s(?:nowman_with_snow|ignal_strength|weet_potato|miling_imp|p(?:ider_web|arkle[rs])|w(?:im_brief|an)|a(?:n(?:_marino|dwich)|lt)|topwatch|t(?:a(?:dium|r[2s])|ew)|l(?:e(?:epy|d)|oth)|hrimp|yria|carf|(?:hee|oa)p|ea[lt]|h(?:oe|i[pt])|o[bs])|(?:s(?:tuffed_flatbre|p(?:iral_notep|eaking_he))|(?:exploding_h|baguette_br|flatbr)e)ad|(?:arrow_(?:heading|double)_u|(?:p(?:lace_of_wor|assenger_)sh|film_str|tul)i|page_facing_u|biting_li|(?:billed_c|world_m)a|mouse_tra|(?:curly_lo|busst)o|thumbsu|lo(?:llip)?o|clam|im)p|(?:anatomical|light_blue|sparkling|kissing|mending|orange|purple|yellow|broken|b(?:rown|l(?:ack|ue))|pink)_heart|(?:(?:transgender|black)_fla|mechanical_le|(?:checkered|pirate)_fla|electric_plu|rainbow_fla|poultry_le|service_do|white_fla|luxembour|fried_eg|moneyba|h(?:edgeh|otd)o|shru)g|(?:cloud_with|mountain)_snow|(?:(?:antigua_barb|berm)u|(?:kh|ug)an|rwan)da|(?:3r|2n)d_place_medal|1(?:st_place_medal|234|00)|lotus_position|(?:w(?:eight_lift|alk)|climb)ing|(?:(?:cup_with_str|auto_ricksh)a|carpentry_sa|windo|jigsa)w|(?:(?:couch_and|diya)_la|f(?:ried_shri|uelpu))mp|(?:woman_mechan|man_mechan|alemb)ic|(?:european_un|accord|collis|reun)ion|(?:flight_arriv|hospit|portug|seneg|nep)al|card_file_box|(?:(?:oncoming_)?tax|m(?:o(?:unt_fuj|ya)|alaw)|s(?:paghett|ush|ar)|b(?:r(?:occol|une)|urund)|(?:djibou|kiriba)t|hait|fij)i|(?:shopping_c|white_he|bar_ch)art|d(?:isappointed|ominica|e(?:sert)?)|raising_hand|super(?:villain|hero)|b(?:e(?:verage_box|ers|d)|u(?:bbles|lb|g)|i(?:k(?:ini|e)|rd)|o(?:o(?:ks|t)|a[rt]|y)|read|a[cn]k)|ra(?:ised_hands|bbit2|t)|(?:hindu_tem|ap)ple|thong_sandal|a(?:r(?:row_(?:right|down|up)|t)|bc?|nt)?|r(?:a(?:i(?:sed_hand|nbow)|bbit|dio|m)|u(?:nning)?|epeat|i(?:ng|ce)|o(?:ck|se))|takeout_box|(?:flying_|mini)disc|(?:(?:interrob|yin_y)a|b(?:o(?:omera|wli)|angba)|(?:ping_p|hong_k)o|calli|mahjo)ng|b(?:a(?:llot_box|sket|th?|by)|o(?:o(?:k(?:mark)?|m)|w)|u(?:tter|s)|e(?:ll|er?|ar))?|heart_eyes|basketball|(?:paperclip|dancer|ticket)s|point_up_2|(?:wo)?man_cook|n(?:ew(?:spaper)?|o(?:tebook|_entry)|iger)|t(?:e(?:lephone|a)|o(?:oth|p)|r(?:oll)?|wo)|h(?:o(?:u(?:rglass|se)|rse)|a(?:mmer|nd)|eart)|paperclip|full_moon|(?:b(?:lack_ni|athtu|om)|her)b|(?:long|oil)_drum|pineapple|(?:clock(?:1[0-2]?|[2-9])3|u6e8)0|p(?:o(?:int_up|ut)|r(?:ince|ay)|i(?:ck|g)|en)|e(?:nvelope|ight|u(?:ro)?|gg|ar|ye|s)|m(?:o(?:u(?:ntain|se)|nkey|on)|echanic|a(?:ilbox|[gn])|irror)?|new_moon|d(?:iamonds|olls|art)|question|k(?:iss(?:ing)?|ey)|haircut|no_good|(?:vampir|massag)e|g(?:olf(?:ing)?|u(?:inea|ard)|e(?:nie|m)|ift|rin)|h(?:a(?:ndbag|msa)|ouses|earts|ut)|postbox|toolbox|(?:pencil|t(?:rain|iger)|whale|cat|dog)2|belgium|(?:volca|kimo)no|(?:vanuat|tuval|pala|naur|maca)u|tokelau|o(?:range|ne?|[mk])?|office|dancer|ticket|dragon|pencil|zombie|w(?:o(?:mens|rm|od)|ave|in[gk]|c)|m(?:o(?:sque|use2)|e(?:rman|ns)|a(?:li|sk))|jersey|tshirt|w(?:heel|oman)|dizzy|j(?:apan|oy)|t(?:rain|iger)|whale|fairy|a(?:nge[lr]|bcd|tm)|c(?:h(?:a(?:ir|d)|ile)|a(?:ndy|mel)|urry|rab|o(?:rn|ol|w2)|[dn])|p(?:ager|e(?:a(?:ch|r)|ru)|i(?:g2|ll|e)|oop)|n(?:otes|ine)|t(?:onga|hree|ent|ram|[mv])|f(?:erry|r(?:ies|ee|og)|ax)|u(?:7(?:533|981|121)|5(?:5b6|408|272)|6(?:307|70[89]))|mage|e(?:yes|nd)|i(?:ra[nq]|t)|cat|dog|elf|z(?:zz|ap)|yen|j(?:ar|p)|leg|id|u[kps]|ng|o[2x]|vs|kr|[+-]1|[xv])(:)",
       "name": "string.emoji.mdx"
     },
     "extension-github-mention": {
@@ -5817,7 +5817,7 @@
           "name": "string.other.link.mention.mdx"
         }
       },
-      "match": "(?<![0-9A-Za-z_`])(@)((?:[0-9A-Za-z][0-9A-Za-z-]{0,38})(?:\\/(?:[0-9A-Za-z][0-9A-Za-z-]{0,38}))?)(?![0-9A-Za-z_`])",
+      "match": "(?<![0-9A-Za-z_`])(@)([0-9A-Za-z][0-9A-Za-z-]{0,38}(?:/[0-9A-Za-z][0-9A-Za-z-]{0,38})?)(?![0-9A-Za-z_`])",
       "name": "string.mention.mdx"
     },
     "extension-github-reference": {
@@ -5852,13 +5852,13 @@
               "name": "string.other.link.reference.issue-or-pr.mdx"
             }
           },
-          "match": "(?<![^\\t\\n\\r \\(@\\[\\{])((?:[0-9A-Za-z][0-9A-Za-z-]{0,38})(?:\\/(?:(?:\\.git[0-9A-Za-z_-]|\\.(?!git)|[0-9A-Za-z_-])+))?)(#)([0-9]+)(?![0-9A-Za-z_])",
+          "match": "(?<![^\\t\\n\\r (@\\[{])([0-9A-Za-z][0-9A-Za-z-]{0,38}(?:/(?:\\.git[0-9A-Za-z_-]|\\.(?!git)|[0-9A-Za-z_-])+)?)(#)([0-9]+)(?![0-9A-Za-z_])",
           "name": "string.reference.mdx"
         }
       ]
     },
     "extension-math-flow": {
-      "begin": "(?:^|\\G)[\\t ]*(\\${2,})([^\\n\\r\\$]*)$",
+      "begin": "(?:^|\\G)[\\t ]*(\\${2,})([^\\n\\r$]*)$",
       "beginCaptures": {
         "1": {
           "name": "string.other.begin.math.flow.mdx"
@@ -5872,7 +5872,7 @@
         }
       },
       "contentName": "markup.raw.math.flow.mdx",
-      "end": "(\\1)(?:[\\t ]*$)",
+      "end": "(\\1)[\\t ]*$",
       "endCaptures": {
         "1": {
           "name": "string.other.end.math.flow.mdx"
@@ -5895,7 +5895,7 @@
       "match": "(?<!\\$)(\\${2,})(?!\\$)(.+?)(?<!\\$)(\\1)(?!\\$)"
     },
     "extension-mdx-esm": {
-      "begin": "(?:^|\\G)(?=(?i:export|import)[ ])",
+      "begin": "(?:^|\\G)(?=(?i:export|import) )",
       "end": "^(?=[\\t ]*$)|$",
       "name": "meta.embedded.tsx",
       "patterns": [
@@ -5905,14 +5905,14 @@
       ]
     },
     "extension-mdx-expression-flow": {
-      "begin": "(?:^|\\G)[\\t ]*(\\{)(?!.*\\}[\\t ]*.)",
+      "begin": "(?:^|\\G)[\\t ]*(\\{)(?!.*}[\\t ]*.)",
       "beginCaptures": {
         "1": {
           "name": "string.other.begin.expression.mdx.js"
         }
       },
       "contentName": "meta.embedded.tsx",
-      "end": "(\\})(?:[\\t ]*$)",
+      "end": "(})[\\t ]*$",
       "endCaptures": {
         "1": {
           "name": "string.other.begin.expression.mdx.js"
@@ -5932,7 +5932,7 @@
         }
       },
       "contentName": "meta.embedded.tsx",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "string.other.begin.expression.mdx.js"
@@ -5945,7 +5945,7 @@
       ]
     },
     "extension-mdx-jsx-flow": {
-      "begin": "(?<=^|\\G|\\>)[\\t ]*(<)(?=(?![\\t\\n\\r ]))(?:\\s*(/))?(?:\\s*(?:(?:((?:[_$[:alpha:]][-_$[:alnum:]]*))\\s*(:)\\s*((?:[_$[:alpha:]][-_$[:alnum:]]*)))|((?:(?:[_$[:alpha:]][_$[:alnum:]]*)(?:\\s*\\.\\s*(?:[_$[:alpha:]][-_$[:alnum:]]*))+))|((?:[_$[:upper:]][_$[:alnum:]]*))|((?:[_$[:alpha:]][-_$[:alnum:]]*)))(?=[\\s\\/\\>\\{]))?",
+      "begin": "(?<=^|\\G|>)[\\t ]*(<)(?=(?![\\t\\n\\r ]))(?:\\s*(/))?(?:\\s*(?:([_$[:alpha:]][-_$[:alnum:]]*)\\s*(:)\\s*([_$[:alpha:]][-_$[:alnum:]]*)|([_$[:alpha:]][_$[:alnum:]]*(?:\\s*\\.\\s*[_$[:alpha:]][-_$[:alnum:]]*)+)|([_$[:upper:]][_$[:alnum:]]*)|([_$[:alpha:]][-_$[:alnum:]]*))(?=[\\s/>{]))?",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.jsx"
@@ -5972,7 +5972,7 @@
           "name": "entity.name.tag.jsx"
         }
       },
-      "end": "(?:(\\/)\\s*)?(>)",
+      "end": "(?:(/)\\s*)?(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.self-closing.jsx"
@@ -6003,7 +6003,7 @@
       ]
     },
     "extension-mdx-jsx-text": {
-      "begin": "(<)(?=(?![\\t\\n\\r ]))(?:\\s*(/))?(?:\\s*(?:(?:((?:[_$[:alpha:]][-_$[:alnum:]]*))\\s*(:)\\s*((?:[_$[:alpha:]][-_$[:alnum:]]*)))|((?:(?:[_$[:alpha:]][_$[:alnum:]]*)(?:\\s*\\.\\s*(?:[_$[:alpha:]][-_$[:alnum:]]*))+))|((?:[_$[:upper:]][_$[:alnum:]]*))|((?:[_$[:alpha:]][-_$[:alnum:]]*)))(?=[\\s\\/\\>\\{]))?",
+      "begin": "(<)(?=(?![\\t\\n\\r ]))(?:\\s*(/))?(?:\\s*(?:([_$[:alpha:]][-_$[:alnum:]]*)\\s*(:)\\s*([_$[:alpha:]][-_$[:alnum:]]*)|([_$[:alpha:]][_$[:alnum:]]*(?:\\s*\\.\\s*[_$[:alpha:]][-_$[:alnum:]]*)+)|([_$[:upper:]][_$[:alnum:]]*)|([_$[:alpha:]][-_$[:alnum:]]*))(?=[\\s/>{]))?",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.jsx"
@@ -6030,7 +6030,7 @@
           "name": "entity.name.tag.jsx"
         }
       },
-      "end": "(?:(\\/)\\s*)?(>)",
+      "end": "(?:(/)\\s*)?(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.self-closing.jsx"
@@ -6233,7 +6233,7 @@
           "name": "punctuation.definition.character-reference.end.html"
         }
       },
-      "match": "(&)((?:C(?:(?:o(?:unterClockwiseCo)?|lockwiseCo)ntourIntegra|cedi)|(?:(?:Not(?:S(?:quareSu(?:per|b)set|u(?:cceeds|(?:per|b)set))|Precedes|Greater|Tilde|Less)|Not(?:Righ|Lef)tTriangle|(?:Not(?:(?:Succeed|Precede|Les)s|Greater)|(?:Precede|Succeed)s|Less)Slant|SquareSu(?:per|b)set|(?:Not(?:Greater|Tilde)|Tilde|Less)Full|RightTriangle|LeftTriangle|Greater(?:Slant|Full)|Precedes|Succeeds|Superset|NotHump|Subset|Tilde|Hump)Equ|int(?:er)?c|DotEqu)a|DoubleContourIntegra|(?:n(?:short)?parall|shortparall|p(?:arall|rur))e|(?:rightarrowta|l(?:eftarrowta|ced|ata|Ata)|sced|rata|perm|rced|rAta|ced)i|Proportiona|smepars|e(?:qvpars|pars|xc|um)|Integra|suphso|rarr[pt]|n(?:pars|tg)|l(?:arr[pt]|cei)|Rarrt|(?:hybu|fora)l|ForAl|[GKLNR-Tcknt]cedi|rcei|iexc|gime|fras|[uy]um|oso|dso|ium|Ium)l|D(?:o(?:uble(?:(?:L(?:ong(?:Left)?R|eftR)ight|L(?:ongL)?eft|UpDown|Right|Up)Arrow|Do(?:wnArrow|t))|wn(?:ArrowUpA|TeeA|a)rrow)|iacriticalDot|strok|ashv|cy)|(?:(?:(?:N(?:(?:otN)?estedGreater|ot(?:Greater|Less))|Less(?:Equal)?)Great|GreaterGreat|l[lr]corn|mark|east)e|Not(?:Double)?VerticalBa|(?:Not(?:Righ|Lef)tTriangleB|(?:(?:Righ|Lef)tDown|Right(?:Up)?|Left(?:Up)?)VectorB|RightTriangleB|Left(?:Triangle|Arrow)B|RightArrowB|V(?:er(?:ticalB|b)|b)|UpArrowB|l(?:ur(?:ds|u)h|dr(?:us|d)h|trP|owb|H)|profal|r(?:ulu|dld)h|b(?:igst|rvb)|(?:wed|ve[er])b|s(?:wn|es)w|n(?:wne|ese|sp|hp)|gtlP|d(?:oll|uh|H)|(?:hor|ov)b|u(?:dh|H)|r(?:lh|H)|ohb|hb|St)a|D(?:o(?:wn(?:(?:Left(?:Right|Tee)|RightTee)Vecto|(?:(?:Righ|Lef)tVector|Arrow)Ba)|ubleVerticalBa)|a(?:gge|r)|sc|f)|(?:(?:(?:Righ|Lef)tDown|(?:Righ|Lef)tUp)Tee|(?:Righ|Lef)tUpDown)Vecto|VerticalSeparato|(?:Left(?:Right|Tee)|RightTee)Vecto|less(?:eqq?)?gt|e(?:qslantgt|sc)|(?:RightF|LeftF|[lr]f)loo|u(?:[lr]corne|ar)|timesba|(?:plusa|cirs|apa)ci|U(?:arroci|f)|(?:dzigr|s(?:u(?:pl|br)|imr|[lr])|zigr|angz|nvH|l(?:tl|B)|r[Br])ar|UnderBa|(?:plus|harr|top|mid|of)ci|O(?:verBa|sc|f)|dd?agge|s(?:olba|sc)|g(?:t(?:rar|ci)|sc|f)|c(?:opys|u(?:po|ep)|sc|f)|(?:n(?:(?:v[lr]|w|r)A|l[Aa]|h[Aa]|eA)|x[hlr][Aa]|u(?:ua|da|A)|s[ew]A|rla|o[lr]a|rba|rAa|l[Ablr]a|h(?:oa|A)|era|d(?:ua|A)|cra|vA)r|o(?:lci|sc|ro|pa)|ropa|roar|l(?:o(?:pa|ar)|sc|Ar)|i(?:ma|s)c|ltci|dd?ar|a(?:ma|s)c|R(?:Bar|sc|f)|I(?:mac|f)|(?:u(?:ma|s)|oma|ema|Oma|Ema|[wyz]s|qs|ks|fs|Zs|Ys|Xs|Ws|Vs|Us|Ss|Qs|Ns|Ms|Ks|Is|Gs|Fs|Cs|Bs)c|Umac|x(?:sc|f)|v(?:sc|f)|rsc|n(?:ld|f)|m(?:sc|ld|ac|f)|rAr|h(?:sc|f)|b(?:sc|f)|psc|P(?:sc|f)|L(?:sc|ar|f)|jsc|J(?:sc|f)|E(?:sc|f)|[HT]sc|[yz]f|wf|tf|qf|pf|kf|jf|Zf|Yf|Xf|Wf|Vf|Tf|Sf|Qf|Nf|Mf|Kf|Hf|Gf|Ff|Cf|Bf)r|(?:Diacritical(?:Double)?A|[EINOSYZaisz]a)cute|(?:(?:N(?:egative(?:VeryThin|Thi(?:ck|n))|onBreaking)|NegativeMedium|ZeroWidth|VeryThin|Medium|Thi(?:ck|n))Spac|Filled(?:Very)?SmallSquar|Empty(?:Very)?SmallSquar|(?:N(?:ot(?:Succeeds|Greater|Tilde|Less)T|t)|DiacriticalT|VerticalT|PrecedesT|SucceedsT|NotEqualT|GreaterT|TildeT|EqualT|LessT|at|Ut|It)ild|(?:(?:DiacriticalG|[EIOUaiu]g)ra|(?:u|U)?bre|(?:o|e)?gra)v|(?:doublebar|curly|big|x)wedg|H(?:orizontalLin|ilbertSpac)|Double(?:Righ|Lef)tTe|(?:(?:measured|uw)ang|exponentia|dwang|ssmi|fema)l|(?:Poincarepla|reali|pho|oli)n|(?:black)?lozeng|(?:VerticalL|(?:prof|imag)l)in|SmallCircl|(?:black|dot)squar|rmoustach|l(?:moustach|angl)|(?:b(?:ack)?pr|(?:tri|xo)t|[qt]pr)im|[Tt]herefor|(?:DownB|[Gag]b)rev|(?:infint|nv[lr]tr)i|b(?:arwedg|owti)|an(?:dslop|gl)|(?:cu(?:rly)?v|rthr|lthr|b(?:ig|ar)v|xv)e|n(?:s(?:qsu[bp]|ccu)|prcu)|orslop|NewLin|maltes|Becaus|rangl|incar|(?:otil|Otil|t(?:ra|il))d|[inu]tild|s(?:mil|imn)|(?:sc|pr)cu|Wedg|Prim|Brev)e|(?:CloseCurly(?:Double)?Quo|OpenCurly(?:Double)?Quo|[ry]?acu)te|(?:Reverse(?:Up)?|Up)Equilibrium|C(?:apitalDifferentialD|(?:oproduc|(?:ircleD|enterD|d)o)t|on(?:grue|i)nt|conint|upCap|o(?:lone|pf)|OPY|hi)|(?:(?:(?:left)?rightsquig|(?:longleftr|twoheadr|nleftr|nLeftr|longr|hookr|nR|Rr)ight|(?:twohead|hook)left|longleft|updown|Updown|nright|Right|nleft|nLeft|down|up|Up)a|L(?:(?:ong(?:left)?righ|(?:ong)?lef)ta|eft(?:(?:right)?a|RightA|TeeA))|RightTeeA|LongLeftA|UpTeeA)rrow|(?:(?:RightArrow|Short|Upper|Lower)Left|(?:L(?:eftArrow|o(?:wer|ng))|LongLeft|Short|Upper)Right|ShortUp)Arrow|(?:b(?:lacktriangle(?:righ|lef)|ulle|no)|RightDoubleBracke|RightAngleBracke|Left(?:Doub|Ang)leBracke|(?:vartriangle|downharpoon|c(?:ircl|urv)earrow|upharpoon|looparrow)righ|(?:vartriangle|downharpoon|c(?:ircl|urv)earrow|upharpoon|looparrow|mapsto)lef|(?:UnderBrack|OverBrack|emptys|targ|Sups)e|diamondsui|c(?:ircledas|lubsui|are)|(?:spade|heart)sui|(?:(?:c(?:enter|t)|lmi|ino)d|(?:Triple|mD)D|n(?:otin|e)d|(?:ncong|doteq|su[bp]e|e[gl]s)d|l(?:ess|t)d|isind|c(?:ong|up|ap)?d|b(?:igod|N)|t(?:(?:ri)?d|opb)|s(?:ub|im)d|midd|g(?:tr?)?d|Lmid|DotD|(?:xo|ut|z)d|e(?:s?d|rD|fD|DD)|dtd|Zd|Id|Gd|Ed)o|realpar|i(?:magpar|iin)|S(?:uchTha|qr)|su[bp]mul|(?:(?:lt|i)que|gtque|(?:mid|low)a|e(?:que|xi))s|Produc|s(?:updo|e[cx])|r(?:parg|ec)|lparl|vangr|hamil|(?:homt|[lr]fis|ufis|dfis)h|phmma|t(?:wix|in)|quo|o(?:do|as)|fla|eDo)t|(?:(?:Square)?Intersecti|(?:straight|back|var)epsil|SquareUni|expectati|upsil|epsil|Upsil|eq?col|Epsil|(?:omic|Omic|rca|lca|eca|Sca|[NRTt]ca|Lca|Eca|[Zdz]ca|Dca)r|scar|ncar|herc|ccar|Ccar|iog|Iog)on|Not(?:S(?:quareSu(?:per|b)set|u(?:cceeds|(?:per|b)set))|Precedes|Greater|Tilde|Less)?|(?:(?:(?:Not(?:Reverse)?|Reverse)E|comp|E)leme|NotCongrue|(?:n[gl]|l)eqsla|geqsla|q(?:uat)?i|perc|iiii|coni|cwi|awi|oi)nt|(?:(?:rightleftharpo|leftrightharpo|quaterni)on|(?:(?:N(?:ot(?:NestedLess|Greater|Less)|estedLess)L|(?:eqslant|gtr(?:eqq?)?)l|LessL)e|Greater(?:Equal)?Le|cro)s|(?:rightright|leftleft|upup)arrow|rightleftarrow|(?:(?:(?:righ|lef)tthree|divideon|b(?:igo|ox)|[lr]o)t|InvisibleT)ime|downdownarrow|(?:(?:smallset|tri|dot|box)m|PlusM)inu|(?:RoundImpli|complex|Impli|Otim)e|C(?:ircle(?:Time|Minu|Plu)|ayley|ros)|(?:rationa|mode)l|NotExist|(?:(?:UnionP|MinusP|(?:b(?:ig[ou]|ox)|tri|s(?:u[bp]|im)|dot|xu|mn)p)l|(?:xo|u)pl|o(?:min|pl)|ropl|lopl|epl)u|otimesa|integer|e(?:linter|qual)|setminu|rarrbf|larrb?f|olcros|rarrf|mstpo|lesge|gesle|Exist|[lr]time|strn|napo|fltn|ccap|apo)s|(?:b(?:(?:lack|ig)triangledow|etwee)|(?:righ|lef)tharpoondow|(?:triangle|mapsto)dow|(?:nv|i)infi|ssetm|plusm|lagra|d(?:[lr]cor|isi)|c(?:ompf|aro)|s?frow|(?:hyph|curr)e|kgree|thor|ogo|ye)n|Not(?:Righ|Lef)tTriangle|(?:Up(?:Arrow)?|Short)DownArrow|(?:(?:n(?:triangle(?:righ|lef)t|succ|prec)|(?:trianglerigh|trianglelef|sqsu[bp]se|ques)t|backsim)e|lvertneq|gvertneq|(?:suc|pre)cneq|a(?:pprox|symp)e|(?:succ|prec|vee)e|circe)q|(?:UnderParenthes|OverParenthes|xn)is|(?:(?:Righ|Lef)tDown|Right(?:Up)?|Left(?:Up)?)Vector|D(?:o(?:wn(?:RightVector|LeftVector|Arrow|Tee)|t)|el|D)|l(?:eftrightarrows|br(?:k(?:sl[du]|e)|ac[ek])|tri[ef]|s(?:im[eg]|qb|h)|hard|a(?:tes|ngd|p)|o[pz]f|rm|gE|fr|eg|cy)|(?:NotHumpDownHum|(?:righ|lef)tharpoonu|big(?:(?:triangle|sqc)u|c[au])|HumpDownHum|m(?:apstou|lc)|(?:capbr|xsq)cu|smash|rarr[al]|(?:weie|sha)r|larrl|velli|(?:thin|punc)s|h(?:elli|airs)|(?:u[lr]c|vp)ro|d[lr]cro|c(?:upc[au]|apc[au])|thka|scna|prn?a|oper|n(?:ums|va|cu|bs)|ens|xc[au]|Ma)p|l(?:eftrightarrow|e(?:ftarrow|s(?:dot)?)?|moust|a(?:rrb?|te?|ng)|t(?:ri)?|sim|par|oz|l|g)|n(?:triangle(?:righ|lef)t|succ|prec)|SquareSu(?:per|b)set|(?:I(?:nvisibleComm|ot)|(?:varthe|iio)t|varkapp|(?:vars|S)igm|(?:diga|mco)mm|Cedill|lambd|Lambd|delt|Thet|omeg|Omeg|Kapp|Delt|nabl|zet|to[es]|rdc|ldc|iot|Zet|Bet|Et)a|b(?:lacktriangle|arwed|u(?:mpe?|ll)|sol|o(?:x[HVhv]|t)|brk|ne)|(?:trianglerigh|trianglelef|sqsu[bp]se|ques)t|RightT(?:riangl|e)e|(?:(?:varsu[bp]setn|su(?:psetn?|bsetn?))eq|nsu[bp]seteq|colone|(?:wedg|sim)e|nsime|lneq|gneq)q|DifferentialD|(?:(?:fall|ris)ingdots|(?:suc|pre)ccurly|ddots)eq|A(?:pplyFunction|ssign|(?:tild|grav|brev)e|acute|o(?:gon|pf)|lpha|(?:mac|sc|f)r|c(?:irc|y)|ring|Elig|uml|nd|MP)|(?:varsu[bp]setn|su(?:psetn?|bsetn?))eq|L(?:eft(?:T(?:riangl|e)e|Arrow)|l)|G(?:reaterEqual|amma)|E(?:xponentialE|quilibrium|sim|cy|TH|NG)|(?:(?:RightCeil|LeftCeil|varnoth|ar|Ur)in|(?:b(?:ack)?co|uri)n|vzigza|roan|loan|ffli|amal|sun|rin|n(?:tl|an)|Ran|Lan)g|(?:thick|succn?|precn?|less|g(?:tr|n)|ln|n)approx|(?:s(?:traightph|em)|(?:rtril|xu|u[lr]|xd|v[lr])tr|varph|l[lr]tr|b(?:sem|eps)|Ph)i|(?:circledd|osl|n(?:v[Dd]|V[Dd]|d)|hsl|V(?:vd|D)|Osl|v[Dd]|md)ash|(?:(?:RuleDelay|imp|cuw)e|(?:n(?:s(?:hort)?)?|short|rn)mi|D(?:Dotrah|iamon)|(?:i(?:nt)?pr|peri)o|odsol|llhar|c(?:opro|irmi)|(?:capa|anda|pou)n|Barwe|napi|api)d|(?:cu(?:rlyeq(?:suc|pre)|es)|telre|[ou]dbla|Udbla|Odbla|radi|lesc|gesc|dbla)c|(?:circled|big|eq|[is]|c|x|a|S|[hw]|W|H|G|E|C)circ|rightarrow|R(?:ightArrow|arr|e)|Pr(?:oportion)?|(?:longmapst|varpropt|p(?:lustw|ropt)|varrh|numer|(?:rsa|lsa|sb)qu|m(?:icr|h)|[lr]aqu|bdqu|eur)o|UnderBrace|ImaginaryI|B(?:ernoullis|a(?:ckslash|rv)|umpeq|cy)|(?:(?:Laplace|Mellin|zee)tr|Fo(?:uriertr|p)|(?:profsu|ssta)r|ordero|origo|[ps]op|nop|mop|i(?:op|mo)|h(?:op|al)|f(?:op|no)|dop|bop|Rop|Pop|Nop|Lop|Iop|Hop|Dop|[GJKMOQSTV-Zgjkoqvwyz]op|Bop)f|nsu[bp]seteq|t(?:ri(?:angleq|e)|imesd|he(?:tav|re4)|au)|O(?:verBrace|r)|(?:(?:pitchfo|checkma|t(?:opfo|b)|rob|rbb|l[bo]b)r|intlarh|b(?:brktbr|l(?:oc|an))|perten|NoBrea|rarrh|s[ew]arh|n[ew]arh|l(?:arrh|hbl)|uhbl|Hace)k|(?:NotCupC|(?:mu(?:lti)?|x)m|cupbrc)ap|t(?:riangle|imes|heta|opf?)|Precedes|Succeeds|Superset|NotEqual|(?:n(?:atural|exist|les)|s(?:qc[au]p|mte)|prime)s|c(?:ir(?:cled[RS]|[Ee])|u(?:rarrm|larrp|darr[lr]|ps)|o(?:mmat|pf)|aps|hi)|b(?:sol(?:hsu)?b|ump(?:eq|E)|ox(?:box|[Vv][HLRhlr]|[Hh][DUdu]|[DUdu][LRlr])|e(?:rnou|t[ah])|lk(?:34|1[24])|cy)|(?:l(?:esdot|squ|dqu)o|rsquo|rdquo|ngt)r|a(?:n(?:g(?:msda[a-h]|st|e)|d[dv])|st|p[Ee]|mp|fr|c[Edy])|(?:g(?:esdoto|E)|[lr]haru)l|(?:angrtvb|lrhar|nis)d|(?:(?:th(?:ic)?k|succn?|p(?:r(?:ecn?|n)?|lus)|rarr|l(?:ess|arr)|su[bp]|par|scn|g(?:tr|n)|ne|sc|n[glv]|ln|eq?)si|thetasy|ccupss|alefsy|botto)m|trpezium|(?:hks[ew]|dr?bk|bk)arow|(?:(?:[lr]a|d|c)empty|b(?:nequi|empty)|plank|nequi|odi)v|(?:(?:sc|rp|n)pol|point|fpart)int|(?:c(?:irf|wco)|awco)nint|PartialD|n(?:s(?:u[bp](?:set)?|c)|rarr|ot(?:ni|in)?|warr|e(?:arr)?|a(?:tur|p)|vlt|p(?:re?|ar)|um?|l[et]|ge|i)|n(?:atural|exist|les)|d(?:i(?:am(?:ond)?|v(?:ide)?)|tri|ash|ot|d)|backsim|l(?:esdot|squ|dqu)o|g(?:esdoto|E)|U(?:p(?:Arrow|si)|nion|arr)|angrtvb|p(?:l(?:anckh|us(?:d[ou]|[be]))|ar(?:sl|t)|r(?:od|nE|E)|erp|iv|m)|n(?:ot(?:niv[a-c]|in(?:v[a-c]|E))|rarr[cw]|s(?:u[bp][Ee]|c[er])|part|v(?:le|g[et])|g(?:es|E)|c(?:ap|y)|apE|lE|iv|Ll|Gg)|m(?:inus(?:du|b)|ale|cy|p)|rbr(?:k(?:sl[du]|e)|ac[ek])|(?:suphsu|tris|rcu|lcu)b|supdsub|(?:s[ew]a|n[ew]a)rrow|(?:b(?:ecaus|sim)|n(?:[lr]tri|bump)|csu[bp])e|equivDD|u(?:rcorn|lcorn|psi)|timesb|s(?:u(?:p(?:set)?|b(?:set)?)|q(?:su[bp]|u)|i(?:gma|m)|olb?|dot|mt|fr|ce?)|p(?:l(?:anck|us)|r(?:op|ec?)?|ara?|i)|o(?:times|r(?:d(?:er)?)?)|m(?:i(?:nusd?|d)|a(?:p(?:sto)?|lt)|u)|rmoust|g(?:e(?:s(?:dot|l)?|q)?|sim|n(?:ap|e)|t|l|g)|(?:spade|heart)s|c(?:u(?:rarr|larr|p)|o(?:m(?:ma|p)|lon|py|ng)|lubs|heck|cups|irc?|ent|ap)|colone|a(?:p(?:prox)?|n(?:g(?:msd|rt)?|d)|symp|f|c)|S(?:quare|u[bp]|c)|Subset|b(?:ecaus|sim)|vsu[bp]n[Ee]|s(?:u(?:psu[bp]|b(?:su[bp]|n[Ee]|E)|pn[Ee]|p[1-3E]|m)|q(?:u(?:ar[ef]|f)|su[bp]e)|igma[fv]|etmn|dot[be]|par|mid|hc?y|c[Ey])|f(?:rac(?:78|5[68]|45|3[458]|2[35]|1[2-68])|fr)|e(?:m(?:sp1[34]|ptyv)|psiv|c(?:irc|y)|t[ah]|ng|ll|fr|e)|(?:kappa|isins|vBar|fork|rho|phi|n[GL]t)v|divonx|V(?:dashl|ee)|gammad|G(?:ammad|cy|[Tgt])|[Ldhlt]strok|[HT]strok|(?:c(?:ylct|hc)|(?:s(?:oft|hch)|hard|S(?:OFT|HCH)|jser|J(?:ser|uk)|HARD|tsh|TSH|juk|iuk|I(?:uk|[EO])|zh|yi|nj|lj|k[hj]|gj|dj|ZH|Y[AIU]|NJ|LJ|K[HJ]|GJ|D[JSZ])c|ubrc|Ubrc|(?:yu|i[eo]|dz|v|p|f)c|TSc|SHc|CHc|Vc|Pc|Mc|Fc)y|(?:(?:wre|jm)at|dalet|a(?:ngs|le)p|imat|[lr]ds)h|[CLRUceglnou]acute|ff?llig|(?:f(?:fi|[ij])|sz|oe|ij|ae|OE|IJ)lig|r(?:a(?:tio|rr|ng)|tri|par|eal)|s[ew]arr|s(?:qc[au]p|mte)|prime|rarrb|i(?:n(?:fin|t)?|sin|t|i|c)|e(?:quiv|m(?:pty|sp)|p(?:si|ar)|cir|l|g)|kappa|isins|ncong|doteq|(?:wedg|sim)e|nsime|rsquo|rdquo|[lr]haru|V(?:dash|ert)|Tilde|lrhar|gamma|Equal|UpTee|n(?:[lr]tri|bump)|C(?:olon|up|ap)|v(?:arpi|ert)|u(?:psih|ml)|vnsu[bp]|r(?:tri[ef]|e(?:als|g)|a(?:rr[cw]|ng[de]|ce)|sh|lm|x)|rhard|sim[gl]E|i(?:sin[Ev]|mage|f[fr]|cy)|harrw|(?:n[gl]|l)eqq|g(?:sim[el]|tcc|e(?:qq|l)|nE|l[Eaj]|gg|ap)|ocirc|starf|utrif|d(?:trif|i(?:ams|e)|ashv|sc[ry]|fr|eg)|[du]har[lr]|T(?:HORN|a[bu])|(?:TRAD|[gl]vn)E|odash|[EUaeu]o(?:gon|pf)|alpha|[IJOUYgjuy]c(?:irc|y)|v(?:arr|ee)|succ|sim[gl]|harr|ln(?:ap|e)|lesg|(?:n[gl]|l)eq|ocir|star|utri|vBar|fork|su[bp]e|nsim|lneq|gneq|csu[bp]|zwn?j|yacy|x(?:opf|i)|scnE|o(?:r(?:d[fm]|v)|mid|lt|hm|gt|fr|cy|S)|scap|rsqb|ropf|ltcc|tsc[ry]|QUOT|[EOUYao]uml|rho|phi|n[GL]t|e[gl]s|ngt|I(?:nt|m)|nis|rfr|rcy|lnE|lEg|ufr|S(?:um|cy)|R(?:sh|ho)|psi|Ps?i|[NRTt]cy|L(?:sh|cy|[Tt])|kcy|Kcy|Hat|REG|[Zdz]cy|wr|lE|wp|Xi|Nu|Mu)(;)",
+      "match": "(&)((?:C(?:(?:o(?:unterClockwiseCo)?|lockwiseCo)ntourIntegra|cedi)|(?:(?:Not(?:S(?:quareSu(?:per|b)set|u(?:cceeds|(?:per|b)set))|Precedes|Greater|Tilde|Less)|Not(?:Righ|Lef)tTriangle|(?:Not(?:(?:Succeed|Precede|Les)s|Greater)|(?:Precede|Succeed)s|Less)Slant|SquareSu(?:per|b)set|(?:Not(?:Greater|Tilde)|Tilde|Less)Full|RightTriangle|LeftTriangle|Greater(?:Slant|Full)|Precedes|Succeeds|Superset|NotHump|Subset|Tilde|Hump)Equ|int(?:er)?c|DotEqu)a|DoubleContourIntegra|(?:n(?:short)?parall|shortparall|p(?:arall|rur))e|(?:rightarrowta|l(?:eftarrowta|ced|ata|Ata)|sced|rata|perm|rced|rAta|ced)i|Proportiona|smepars|e(?:qvpars|pars|xc|um)|Integra|suphso|rarr[pt]|n(?:pars|tg)|l(?:arr[pt]|cei)|Rarrt|(?:hybu|fora)l|ForAl|[GKLNR-Tcknt]cedi|rcei|iexc|gime|fras|[uy]um|oso|dso|ium|Ium)l|D(?:o(?:uble(?:(?:L(?:ong(?:Left)?R|eftR)ight|L(?:ongL)?eft|UpDown|Right|Up)Arrow|Do(?:wnArrow|t))|wn(?:ArrowUpA|TeeA|a)rrow)|iacriticalDot|strok|ashv|cy)|(?:(?:(?:N(?:(?:otN)?estedGreater|ot(?:Greater|Less))|Less(?:Equal)?)Great|GreaterGreat|l[lr]corn|mark|east)e|Not(?:Double)?VerticalBa|(?:Not(?:Righ|Lef)tTriangleB|(?:(?:Righ|Lef)tDown|Right(?:Up)?|Left(?:Up)?)VectorB|RightTriangleB|Left(?:Triangle|Arrow)B|RightArrowB|V(?:er(?:ticalB|b)|b)|UpArrowB|l(?:ur(?:ds|u)h|dr(?:us|d)h|trP|owb|H)|profal|r(?:ulu|dld)h|b(?:igst|rvb)|(?:wed|ve[er])b|s(?:wn|es)w|n(?:wne|ese|sp|hp)|gtlP|d(?:oll|uh|H)|(?:hor|ov)b|u(?:dh|H)|r(?:lh|H)|ohb|hb|St)a|D(?:o(?:wn(?:(?:Left(?:Right|Tee)|RightTee)Vecto|(?:(?:Righ|Lef)tVector|Arrow)Ba)|ubleVerticalBa)|a(?:gge|r)|sc|f)|(?:(?:(?:Righ|Lef)tDown|(?:Righ|Lef)tUp)Tee|(?:Righ|Lef)tUpDown)Vecto|VerticalSeparato|(?:Left(?:Right|Tee)|RightTee)Vecto|less(?:eqq?)?gt|e(?:qslantgt|sc)|(?:RightF|LeftF|[lr]f)loo|u(?:[lr]corne|ar)|timesba|(?:plusa|cirs|apa)ci|U(?:arroci|f)|(?:dzigr|s(?:u(?:pl|br)|imr|[lr])|zigr|angz|nvH|l(?:tl|B)|r[Br])ar|UnderBa|(?:plus|harr|top|mid|of)ci|O(?:verBa|sc|f)|dd?agge|s(?:olba|sc)|g(?:t(?:rar|ci)|sc|f)|c(?:opys|u(?:po|ep)|sc|f)|(?:n(?:(?:v[lr]|[wr])A|l[Aa]|h[Aa]|eA)|x[hlr][Aa]|u(?:ua|da|A)|s[ew]A|rla|o[lr]a|rba|rAa|l[Ablr]a|h(?:oa|A)|era|d(?:ua|A)|cra|vA)r|o(?:lci|sc|ro|pa)|ropa|roar|l(?:o(?:pa|ar)|sc|Ar)|i(?:ma|s)c|ltci|dd?ar|a(?:ma|s)c|R(?:Bar|sc|f)|I(?:mac|f)|(?:u(?:ma|s)|oma|ema|Oma|Ema|[wyz]s|qs|ks|fs|Zs|Ys|Xs|Ws|Vs|Us|Ss|Qs|Ns|Ms|Ks|Is|Gs|Fs|Cs|Bs)c|Umac|x(?:sc|f)|v(?:sc|f)|rsc|n(?:ld|f)|m(?:sc|ld|ac|f)|rAr|h(?:sc|f)|b(?:sc|f)|psc|P(?:sc|f)|L(?:sc|ar|f)|jsc|J(?:sc|f)|E(?:sc|f)|[HT]sc|[yz]f|wf|tf|qf|pf|kf|jf|Zf|Yf|Xf|Wf|Vf|Tf|Sf|Qf|Nf|Mf|Kf|Hf|Gf|Ff|Cf|Bf)r|(?:Diacritical(?:Double)?A|[EINOSYZaisz]a)cute|(?:(?:N(?:egative(?:VeryThin|Thi(?:ck|n))|onBreaking)|NegativeMedium|ZeroWidth|VeryThin|Medium|Thi(?:ck|n))Spac|Filled(?:Very)?SmallSquar|Empty(?:Very)?SmallSquar|(?:N(?:ot(?:Succeeds|Greater|Tilde|Less)T|t)|DiacriticalT|VerticalT|PrecedesT|SucceedsT|NotEqualT|GreaterT|TildeT|EqualT|LessT|at|Ut|It)ild|(?:(?:DiacriticalG|[EIOUaiu]g)ra|[uU]?bre|[oe]?gra)v|(?:doublebar|curly|big|x)wedg|H(?:orizontalLin|ilbertSpac)|Double(?:Righ|Lef)tTe|(?:(?:measured|uw)ang|exponentia|dwang|ssmi|fema)l|(?:Poincarepla|reali|pho|oli)n|(?:black)?lozeng|(?:VerticalL|(?:prof|imag)l)in|SmallCircl|(?:black|dot)squar|rmoustach|l(?:moustach|angl)|(?:b(?:ack)?pr|(?:tri|xo)t|[qt]pr)im|[Tt]herefor|(?:DownB|[Gag]b)rev|(?:infint|nv[lr]tr)i|b(?:arwedg|owti)|an(?:dslop|gl)|(?:cu(?:rly)?v|rthr|lthr|b(?:ig|ar)v|xv)e|n(?:s(?:qsu[bp]|ccu)|prcu)|orslop|NewLin|maltes|Becaus|rangl|incar|(?:otil|Otil|t(?:ra|il))d|[inu]tild|s(?:mil|imn)|(?:sc|pr)cu|Wedg|Prim|Brev)e|(?:CloseCurly(?:Double)?Quo|OpenCurly(?:Double)?Quo|[ry]?acu)te|(?:Reverse(?:Up)?|Up)Equilibrium|C(?:apitalDifferentialD|(?:oproduc|(?:ircleD|enterD|d)o)t|on(?:grue|i)nt|conint|upCap|o(?:lone|pf)|OPY|hi)|(?:(?:(?:left)?rightsquig|(?:longleftr|twoheadr|nleftr|nLeftr|longr|hookr|nR|Rr)ight|(?:twohead|hook)left|longleft|updown|Updown|nright|Right|nleft|nLeft|down|up|Up)a|L(?:(?:ong(?:left)?righ|(?:ong)?lef)ta|eft(?:(?:right)?a|RightA|TeeA))|RightTeeA|LongLeftA|UpTeeA)rrow|(?:(?:RightArrow|Short|Upper|Lower)Left|(?:L(?:eftArrow|o(?:wer|ng))|LongLeft|Short|Upper)Right|ShortUp)Arrow|(?:b(?:lacktriangle(?:righ|lef)|ulle|no)|RightDoubleBracke|RightAngleBracke|Left(?:Doub|Ang)leBracke|(?:vartriangle|downharpoon|c(?:ircl|urv)earrow|upharpoon|looparrow)righ|(?:vartriangle|downharpoon|c(?:ircl|urv)earrow|upharpoon|looparrow|mapsto)lef|(?:UnderBrack|OverBrack|emptys|targ|Sups)e|diamondsui|c(?:ircledas|lubsui|are)|(?:spade|heart)sui|(?:(?:c(?:enter|t)|lmi|ino)d|(?:Triple|mD)D|n(?:otin|e)d|(?:ncong|doteq|su[bp]e|e[gl]s)d|l(?:ess|t)d|isind|c(?:ong|up|ap)?d|b(?:igod|N)|t(?:(?:ri)?d|opb)|s(?:ub|im)d|midd|g(?:tr?)?d|Lmid|DotD|(?:xo|ut|z)d|e(?:s?d|rD|fD|DD)|dtd|Zd|Id|Gd|Ed)o|realpar|i(?:magpar|iin)|S(?:uchTha|qr)|su[bp]mul|(?:(?:lt|i)que|gtque|(?:mid|low)a|e(?:que|xi))s|Produc|s(?:updo|e[cx])|r(?:parg|ec)|lparl|vangr|hamil|(?:homt|[lr]fis|ufis|dfis)h|phmma|t(?:wix|in)|quo|o(?:do|as)|fla|eDo)t|(?:(?:Square)?Intersecti|(?:straight|back|var)epsil|SquareUni|expectati|upsil|epsil|Upsil|eq?col|Epsil|(?:omic|Omic|rca|lca|eca|Sca|[NRTt]ca|Lca|Eca|[Zdz]ca|Dca)r|scar|ncar|herc|ccar|Ccar|iog|Iog)on|Not(?:S(?:quareSu(?:per|b)set|u(?:cceeds|(?:per|b)set))|Precedes|Greater|Tilde|Less)?|(?:(?:(?:Not(?:Reverse)?|Reverse)E|comp|E)leme|NotCongrue|(?:n[gl]|l)eqsla|geqsla|q(?:uat)?i|perc|iiii|coni|cwi|awi|oi)nt|(?:(?:rightleftharpo|leftrightharpo|quaterni)on|(?:(?:N(?:ot(?:NestedLess|Greater|Less)|estedLess)L|(?:eqslant|gtr(?:eqq?)?)l|LessL)e|Greater(?:Equal)?Le|cro)s|(?:rightright|leftleft|upup)arrow|rightleftarrow|(?:(?:(?:righ|lef)tthree|divideon|b(?:igo|ox)|[lr]o)t|InvisibleT)ime|downdownarrow|(?:(?:smallset|tri|dot|box)m|PlusM)inu|(?:RoundImpli|complex|Impli|Otim)e|C(?:ircle(?:Time|Minu|Plu)|ayley|ros)|(?:rationa|mode)l|NotExist|(?:(?:UnionP|MinusP|(?:b(?:ig[ou]|ox)|tri|s(?:u[bp]|im)|dot|xu|mn)p)l|(?:xo|u)pl|o(?:min|pl)|ropl|lopl|epl)u|otimesa|integer|e(?:linter|qual)|setminu|rarrbf|larrb?f|olcros|rarrf|mstpo|lesge|gesle|Exist|[lr]time|strn|napo|fltn|ccap|apo)s|(?:b(?:(?:lack|ig)triangledow|etwee)|(?:righ|lef)tharpoondow|(?:triangle|mapsto)dow|(?:nv|i)infi|ssetm|plusm|lagra|d(?:[lr]cor|isi)|c(?:ompf|aro)|s?frow|(?:hyph|curr)e|kgree|thor|ogo|ye)n|Not(?:Righ|Lef)tTriangle|(?:Up(?:Arrow)?|Short)DownArrow|(?:(?:n(?:triangle(?:righ|lef)t|succ|prec)|(?:trianglerigh|trianglelef|sqsu[bp]se|ques)t|backsim)e|lvertneq|gvertneq|(?:suc|pre)cneq|a(?:pprox|symp)e|(?:succ|prec|vee)e|circe)q|(?:UnderParenthes|OverParenthes|xn)is|(?:(?:Righ|Lef)tDown|Right(?:Up)?|Left(?:Up)?)Vector|D(?:o(?:wn(?:RightVector|LeftVector|Arrow|Tee)|t)|el|D)|l(?:eftrightarrows|br(?:k(?:sl[du]|e)|ac[ek])|tri[ef]|s(?:im[eg]|qb|h)|hard|a(?:tes|ngd|p)|o[pz]f|rm|gE|fr|eg|cy)|(?:NotHumpDownHum|(?:righ|lef)tharpoonu|big(?:(?:triangle|sqc)u|c[au])|HumpDownHum|m(?:apstou|lc)|(?:capbr|xsq)cu|smash|rarr[al]|(?:weie|sha)r|larrl|velli|(?:thin|punc)s|h(?:elli|airs)|(?:u[lr]c|vp)ro|d[lr]cro|c(?:upc[au]|apc[au])|thka|scna|prn?a|oper|n(?:ums|va|cu|bs)|ens|xc[au]|Ma)p|l(?:eftrightarrow|e(?:ftarrow|s(?:dot)?)?|moust|a(?:rrb?|te?|ng)|t(?:ri)?|sim|par|oz|[lg])|n(?:triangle(?:righ|lef)t|succ|prec)|SquareSu(?:per|b)set|(?:I(?:nvisibleComm|ot)|(?:varthe|iio)t|varkapp|(?:vars|S)igm|(?:diga|mco)mm|Cedill|lambd|Lambd|delt|Thet|omeg|Omeg|Kapp|Delt|nabl|zet|to[es]|rdc|ldc|iot|Zet|Bet|Et)a|b(?:lacktriangle|arwed|u(?:mpe?|ll)|sol|o(?:x[HVhv]|t)|brk|ne)|(?:trianglerigh|trianglelef|sqsu[bp]se|ques)t|RightT(?:riangl|e)e|(?:(?:varsu[bp]setn|su(?:psetn?|bsetn?))eq|nsu[bp]seteq|colone|(?:wedg|sim)e|nsime|lneq|gneq)q|DifferentialD|(?:(?:fall|ris)ingdots|(?:suc|pre)ccurly|ddots)eq|A(?:pplyFunction|ssign|(?:tild|grav|brev)e|acute|o(?:gon|pf)|lpha|(?:mac|sc|f)r|c(?:irc|y)|ring|Elig|uml|nd|MP)|(?:varsu[bp]setn|su(?:psetn?|bsetn?))eq|L(?:eft(?:T(?:riangl|e)e|Arrow)|l)|G(?:reaterEqual|amma)|E(?:xponentialE|quilibrium|sim|cy|TH|NG)|(?:(?:RightCeil|LeftCeil|varnoth|ar|Ur)in|(?:b(?:ack)?co|uri)n|vzigza|roan|loan|ffli|amal|sun|rin|n(?:tl|an)|Ran|Lan)g|(?:thick|succn?|precn?|less|g(?:tr|n)|ln|n)approx|(?:s(?:traightph|em)|(?:rtril|xu|u[lr]|xd|v[lr])tr|varph|l[lr]tr|b(?:sem|eps)|Ph)i|(?:circledd|osl|n(?:v[Dd]|V[Dd]|d)|hsl|V(?:vd|D)|Osl|v[Dd]|md)ash|(?:(?:RuleDelay|imp|cuw)e|(?:n(?:s(?:hort)?)?|short|rn)mi|D(?:Dotrah|iamon)|(?:i(?:nt)?pr|peri)o|odsol|llhar|c(?:opro|irmi)|(?:capa|anda|pou)n|Barwe|napi|api)d|(?:cu(?:rlyeq(?:suc|pre)|es)|telre|[ou]dbla|Udbla|Odbla|radi|lesc|gesc|dbla)c|(?:circled|big|eq|[iscxaShwWHGEC])circ|rightarrow|R(?:ightArrow|arr|e)|Pr(?:oportion)?|(?:longmapst|varpropt|p(?:lustw|ropt)|varrh|numer|(?:rsa|lsa|sb)qu|m(?:icr|h)|[lr]aqu|bdqu|eur)o|UnderBrace|ImaginaryI|B(?:ernoullis|a(?:ckslash|rv)|umpeq|cy)|(?:(?:Laplace|Mellin|zee)tr|Fo(?:uriertr|p)|(?:profsu|ssta)r|ordero|origo|[ps]op|nop|mop|i(?:op|mo)|h(?:op|al)|f(?:op|no)|dop|bop|Rop|Pop|Nop|Lop|Iop|Hop|Dop|[GJKMOQSTV-Zgjkoqvwyz]op|Bop)f|nsu[bp]seteq|t(?:ri(?:angleq|e)|imesd|he(?:tav|re4)|au)|O(?:verBrace|r)|(?:(?:pitchfo|checkma|t(?:opfo|b)|rob|rbb|l[bo]b)r|intlarh|b(?:brktbr|l(?:oc|an))|perten|NoBrea|rarrh|s[ew]arh|n[ew]arh|l(?:arrh|hbl)|uhbl|Hace)k|(?:NotCupC|(?:mu(?:lti)?|x)m|cupbrc)ap|t(?:riangle|imes|heta|opf?)|Precedes|Succeeds|Superset|NotEqual|(?:n(?:atural|exist|les)|s(?:qc[au]p|mte)|prime)s|c(?:ir(?:cled[RS]|[Ee])|u(?:rarrm|larrp|darr[lr]|ps)|o(?:mmat|pf)|aps|hi)|b(?:sol(?:hsu)?b|ump(?:eq|E)|ox(?:box|[Vv][HLRhlr]|[Hh][DUdu]|[DUdu][LRlr])|e(?:rnou|t[ah])|lk(?:34|1[24])|cy)|(?:l(?:esdot|squ|dqu)o|rsquo|rdquo|ngt)r|a(?:n(?:g(?:msda[a-h]|st|e)|d[dv])|st|p[Ee]|mp|fr|c[Edy])|(?:g(?:esdoto|E)|[lr]haru)l|(?:angrtvb|lrhar|nis)d|(?:(?:th(?:ic)?k|succn?|p(?:r(?:ecn?|n)?|lus)|rarr|l(?:ess|arr)|su[bp]|par|scn|g(?:tr|n)|ne|sc|n[glv]|ln|eq?)si|thetasy|ccupss|alefsy|botto)m|trpezium|(?:hks[ew]|dr?bk|bk)arow|(?:(?:[lr]a|[dc])empty|b(?:nequi|empty)|plank|nequi|odi)v|(?:(?:sc|rp|n)pol|point|fpart)int|(?:c(?:irf|wco)|awco)nint|PartialD|n(?:s(?:u[bp](?:set)?|c)|rarr|ot(?:ni|in)?|warr|e(?:arr)?|a(?:tur|p)|vlt|p(?:re?|ar)|um?|l[et]|ge|i)|n(?:atural|exist|les)|d(?:i(?:am(?:ond)?|v(?:ide)?)|tri|ash|ot|d)|backsim|l(?:esdot|squ|dqu)o|g(?:esdoto|E)|U(?:p(?:Arrow|si)|nion|arr)|angrtvb|p(?:l(?:anckh|us(?:d[ou]|[be]))|ar(?:sl|t)|r(?:od|nE|E)|erp|iv|m)|n(?:ot(?:niv[a-c]|in(?:v[a-c]|E))|rarr[cw]|s(?:u[bp][Ee]|c[er])|part|v(?:le|g[et])|g(?:es|E)|c(?:ap|y)|apE|lE|iv|Ll|Gg)|m(?:inus(?:du|b)|ale|cy|p)|rbr(?:k(?:sl[du]|e)|ac[ek])|(?:suphsu|tris|rcu|lcu)b|supdsub|(?:s[ew]a|n[ew]a)rrow|(?:b(?:ecaus|sim)|n(?:[lr]tri|bump)|csu[bp])e|equivDD|u(?:rcorn|lcorn|psi)|timesb|s(?:u(?:p(?:set)?|b(?:set)?)|q(?:su[bp]|u)|i(?:gma|m)|olb?|dot|mt|fr|ce?)|p(?:l(?:anck|us)|r(?:op|ec?)?|ara?|i)|o(?:times|r(?:d(?:er)?)?)|m(?:i(?:nusd?|d)|a(?:p(?:sto)?|lt)|u)|rmoust|g(?:e(?:s(?:dot|l)?|q)?|sim|n(?:ap|e)|[tlg])|(?:spade|heart)s|c(?:u(?:rarr|larr|p)|o(?:m(?:ma|p)|lon|py|ng)|lubs|heck|cups|irc?|ent|ap)|colone|a(?:p(?:prox)?|n(?:g(?:msd|rt)?|d)|symp|[fc])|S(?:quare|u[bp]|c)|Subset|b(?:ecaus|sim)|vsu[bp]n[Ee]|s(?:u(?:psu[bp]|b(?:su[bp]|n[Ee]|E)|pn[Ee]|p[1-3E]|m)|q(?:u(?:ar[ef]|f)|su[bp]e)|igma[fv]|etmn|dot[be]|par|mid|hc?y|c[Ey])|f(?:rac(?:78|5[68]|45|3[458]|2[35]|1[2-68])|fr)|e(?:m(?:sp1[34]|ptyv)|psiv|c(?:irc|y)|t[ah]|ng|ll|fr|e)|(?:kappa|isins|vBar|fork|rho|phi|n[GL]t)v|divonx|V(?:dashl|ee)|gammad|G(?:ammad|cy|[Tgt])|[Ldhlt]strok|[HT]strok|(?:c(?:ylct|hc)|(?:s(?:oft|hch)|hard|S(?:OFT|HCH)|jser|J(?:ser|uk)|HARD|tsh|TSH|juk|iuk|I(?:uk|[EO])|zh|yi|nj|lj|k[hj]|gj|dj|ZH|Y[AIU]|NJ|LJ|K[HJ]|GJ|D[JSZ])c|ubrc|Ubrc|(?:yu|i[eo]|dz|[vpf])c|TSc|SHc|CHc|Vc|Pc|Mc|Fc)y|(?:(?:wre|jm)at|dalet|a(?:ngs|le)p|imat|[lr]ds)h|[CLRUceglnou]acute|ff?llig|(?:f(?:fi|[ij])|sz|oe|ij|ae|OE|IJ)lig|r(?:a(?:tio|rr|ng)|tri|par|eal)|s[ew]arr|s(?:qc[au]p|mte)|prime|rarrb|i(?:n(?:fin|t)?|sin|[tic])|e(?:quiv|m(?:pty|sp)|p(?:si|ar)|cir|[lg])|kappa|isins|ncong|doteq|(?:wedg|sim)e|nsime|rsquo|rdquo|[lr]haru|V(?:dash|ert)|Tilde|lrhar|gamma|Equal|UpTee|n(?:[lr]tri|bump)|C(?:olon|up|ap)|v(?:arpi|ert)|u(?:psih|ml)|vnsu[bp]|r(?:tri[ef]|e(?:als|g)|a(?:rr[cw]|ng[de]|ce)|sh|lm|x)|rhard|sim[gl]E|i(?:sin[Ev]|mage|f[fr]|cy)|harrw|(?:n[gl]|l)eqq|g(?:sim[el]|tcc|e(?:qq|l)|nE|l[Eaj]|gg|ap)|ocirc|starf|utrif|d(?:trif|i(?:ams|e)|ashv|sc[ry]|fr|eg)|[du]har[lr]|T(?:HORN|a[bu])|(?:TRAD|[gl]vn)E|odash|[EUaeu]o(?:gon|pf)|alpha|[IJOUYgjuy]c(?:irc|y)|v(?:arr|ee)|succ|sim[gl]|harr|ln(?:ap|e)|lesg|(?:n[gl]|l)eq|ocir|star|utri|vBar|fork|su[bp]e|nsim|lneq|gneq|csu[bp]|zwn?j|yacy|x(?:opf|i)|scnE|o(?:r(?:d[fm]|v)|mid|lt|hm|gt|fr|cy|S)|scap|rsqb|ropf|ltcc|tsc[ry]|QUOT|[EOUYao]uml|rho|phi|n[GL]t|e[gl]s|ngt|I(?:nt|m)|nis|rfr|rcy|lnE|lEg|ufr|S(?:um|cy)|R(?:sh|ho)|psi|Ps?i|[NRTt]cy|L(?:sh|cy|[Tt])|kcy|Kcy|Hat|REG|[Zdz]cy|wr|lE|wp|Xi|Nu|Mu)(;)",
       "name": "constant.language.character-reference.named.html"
     }
   },
diff --git a/resources/languages/mipsasm.json b/resources/languages/mipsasm.json
index 62f3736..1bae65c 100644
--- a/resources/languages/mipsasm.json
+++ b/resources/languages/mipsasm.json
@@ -9,7 +9,6 @@
   "name": "mipsasm",
   "patterns": [
     {
-      "comment": "ok actually this are instructions, but one also could call them funtions…",
       "match": "\\b(mul|abs|div|divu|mulo|mulou|neg|negu|not|rem|remu|rol|ror|li|seq|sge|sgeu|sgt|sgtu|sle|sleu|sne|b|beqz|bge|bgeu|bgt|bgtu|ble|bleu|blt|bltu|bnez|la|ld|ulh|ulhu|ulw|sd|ush|usw|move|mfc1\\.d|l\\.d|l\\.s|s\\.d|s\\.s)\\b",
       "name": "support.function.pseudo.mips"
     },
@@ -40,7 +39,7 @@
           "name": "punctuation.definition.variable.mips"
         }
       },
-      "match": "(\\$)(0|[2-9]|1[0-9]|2[0-5]|2[89]|3[0-1])\\b",
+      "match": "(\\$)([02-9]|1[0-9]|2[0-5]|2[89]|3[0-1])\\b",
       "name": "variable.other.register.usable.by-number.mips"
     },
     {
@@ -75,7 +74,7 @@
       "name": "constant.numeric.float.mips"
     },
     {
-      "match": "\\b(\\d+|0(x|X)[a-fA-F0-9]+)\\b",
+      "match": "\\b(\\d+|0([xX])\\h+)\\b",
       "name": "constant.numeric.integer.mips"
     },
     {
diff --git a/resources/languages/mojo.json b/resources/languages/mojo.json
index 5f4061e..65b6917 100644
--- a/resources/languages/mojo.json
+++ b/resources/languages/mojo.json
@@ -41,8 +41,8 @@
       "name": "keyword.operator.assignment.python"
     },
     "backticks": {
-      "begin": "\\`",
-      "end": "(?:\\`|(?<!\\\\)(\\n))",
+      "begin": "`",
+      "end": "(?:`|(?<!\\\\)(\\n))",
       "name": "string.quoted.single.python"
     },
     "builtin-callables": {
@@ -96,7 +96,6 @@
     },
     "call-wrapper-inheritance": {
       "begin": "\\b(?=([[:alpha:]_]\\w*)\\s*(\\())",
-      "comment": "same as a function call, but in inheritance context",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -116,7 +115,7 @@
     "class-declaration": {
       "patterns": [
         {
-          "begin": "\\s*(class|struct|trait)\\s+(?=[[:alpha:]_]\\w*\\s*(:|\\())",
+          "begin": "\\s*(class|struct|trait)\\s+(?=[[:alpha:]_]\\w*\\s*([:(]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.python"
@@ -156,7 +155,7 @@
       "name": "meta.class.inheritance.python",
       "patterns": [
         {
-          "match": "(\\*\\*|\\*)",
+          "match": "(\\*(?:\\*|))",
           "name": "keyword.operator.unpacking.arguments.python"
         },
         {
@@ -222,12 +221,12 @@
           "name": "keyword.codetag.notation.python"
         }
       },
-      "match": "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)"
+      "match": "\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b"
     },
     "comments": {
       "patterns": [
         {
-          "begin": "(?:\\#\\s*(type:)\\s*+(?!$|\\#))",
+          "begin": "#\\s*(type:)\\s*+(?!$|#)",
           "beginCaptures": {
             "0": {
               "name": "meta.typehint.comment.python"
@@ -237,11 +236,11 @@
             }
           },
           "contentName": "meta.typehint.comment.python",
-          "end": "(?:$|(?=\\#))",
+          "end": "(?:$|(?=#))",
           "name": "comment.line.number-sign.python",
           "patterns": [
             {
-              "match": "\\Gignore(?=\\s*(?:$|\\#))",
+              "match": "\\Gignore(?=\\s*(?:$|#))",
               "name": "comment.typehint.ignore.notation.python"
             },
             {
@@ -249,7 +248,7 @@
               "name": "comment.typehint.type.notation.python"
             },
             {
-              "match": "([\\[\\]\\(\\),\\.\\=\\*]|(->))",
+              "match": "([\\[\\](),.=*]|(->))",
               "name": "comment.typehint.punctuation.notation.python"
             },
             {
@@ -264,7 +263,7 @@
       ]
     },
     "comments-base": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -279,7 +278,7 @@
       ]
     },
     "comments-string-double-three": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -294,7 +293,7 @@
       ]
     },
     "comments-string-single-three": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -315,7 +314,7 @@
           "name": "punctuation.definition.dict.begin.python"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dict.end.python"
@@ -341,7 +340,7 @@
           "name": "punctuation.definition.decorator.python"
         }
       },
-      "end": "(\\))(?:(.*?)(?=\\s*(?:\\#|$)))|(?=\\n|\\#)",
+      "end": "(\\))(.*?)(?=\\s*(?:#|$))|(?=[\\n#])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.arguments.end.python"
@@ -386,7 +385,7 @@
               "name": "invalid.illegal.decorator.python"
             }
           },
-          "match": "\\s*([^([:alpha:]\\s_\\.#\\\\].*?)(?=\\#|$)",
+          "match": "\\s*([^([:alpha:]\\s_.#\\\\].*?)(?=#|$)",
           "name": "invalid.illegal.decorator.python"
         }
       ]
@@ -394,10 +393,10 @@
     "double-one-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -409,7 +408,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\"))|((?=(?<!\\\\)\\n))",
+          "end": "(]|(?=\"))|((?=(?<!\\\\)\\n))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -424,7 +423,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -455,7 +454,7 @@
       ]
     },
     "double-one-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -623,7 +622,7 @@
       ]
     },
     "double-one-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -695,10 +694,10 @@
     "double-three-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -710,7 +709,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\"\"\"))",
+          "end": "(]|(?=\"\"\"))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -725,7 +724,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -756,7 +755,7 @@
       ]
     },
     "double-three-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -942,7 +941,7 @@
       ]
     },
     "double-three-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -1025,19 +1024,18 @@
       "name": "constant.other.ellipsis.python"
     },
     "escape-sequence": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|[0-7]{1,3}|[\\\\\"'abfnrtv])",
+      "match": "\\\\(x\\h{2}|[0-7]{1,3}|[\\\\\"'abfnrtv])",
       "name": "constant.character.escape.python"
     },
     "escape-sequence-unicode": {
       "patterns": [
         {
-          "match": "\\\\(u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8}|N\\{[\\w\\s]+?\\})",
+          "match": "\\\\(u\\h{4}|U\\h{8}|N\\{[\\w\\s]+?})",
           "name": "constant.character.escape.python"
         }
       ]
     },
     "expression": {
-      "comment": "All valid Python expressions",
       "patterns": [
         {
           "include": "#expression-base"
@@ -1046,13 +1044,11 @@
           "include": "#member-access"
         },
         {
-          "comment": "Tokenize identifiers to help linters",
           "match": "\\b([[:alpha:]_]\\w*)\\b"
         }
       ]
     },
     "expression-bare": {
-      "comment": "valid Python expressions w/o comments and line continuation",
       "patterns": [
         {
           "include": "#backticks"
@@ -1129,7 +1125,6 @@
       ]
     },
     "expression-base": {
-      "comment": "valid Python expressions with comments and line continuation",
       "patterns": [
         {
           "include": "#comments"
@@ -1143,7 +1138,6 @@
       ]
     },
     "f-expression": {
-      "comment": "All valid Python expressions, except comments and line continuation",
       "patterns": [
         {
           "include": "#expression-bare"
@@ -1152,7 +1146,6 @@
           "include": "#member-access"
         },
         {
-          "comment": "Tokenize identifiers to help linters",
           "match": "\\b([[:alpha:]_]\\w*)\\b"
         }
       ]
@@ -1166,7 +1159,7 @@
           "include": "#fstring-formatting-braces"
         },
         {
-          "match": "\\{.*?\\}"
+          "match": "\\{.*?}"
         },
         {
           "include": "#regexp-base-common"
@@ -1174,7 +1167,7 @@
       ]
     },
     "fregexp-quantifier": {
-      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}\\}",
+      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)}}",
       "name": "keyword.operator.quantifier.regexp"
     },
     "fstring-fnorm-quoted-multi-line": {
@@ -1277,11 +1270,10 @@
               "name": "constant.character.format.placeholder.other.python"
             }
           },
-          "comment": "empty braces are illegal",
-          "match": "({)(\\s*?)(})"
+          "match": "(\\{)(\\s*?)(})"
         },
         {
-          "match": "({{|}})",
+          "match": "(\\{\\{|}})",
           "name": "constant.character.escape.python"
         }
       ]
@@ -1320,8 +1312,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "comment": "it is illegal to have a multiline brace inside a single-line string",
-      "end": "(\\})|(?=\\n)",
+      "end": "(})|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1343,8 +1334,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "comment": "value interpolation using { ... }",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1360,7 +1350,7 @@
       ]
     },
     "fstring-multi-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|'''|\"\"\"))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|'''|\"\"\"))|\\n",
       "name": "string.interpolated.python string.quoted.multi.python"
     },
     "fstring-normf-quoted-multi-line": {
@@ -1450,7 +1440,7 @@
       ]
     },
     "fstring-raw-multi-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|'''|\"\"\"))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|'''|\"\"\"))|\\n",
       "name": "string.interpolated.python string.quoted.raw.multi.python"
     },
     "fstring-raw-quoted-multi-line": {
@@ -1524,7 +1514,7 @@
       ]
     },
     "fstring-raw-single-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n)))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|(['\"])|((?<!\\\\)\\n)))|\\n",
       "name": "string.interpolated.python string.quoted.raw.single.python"
     },
     "fstring-single-brace": {
@@ -1534,8 +1524,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "comment": "value interpolation using { ... }",
-      "end": "(\\})|(?=\\n)",
+      "end": "(})|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1551,7 +1540,7 @@
       ]
     },
     "fstring-single-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n)))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|(['\"])|((?<!\\\\)\\n)))|\\n",
       "name": "string.interpolated.python string.quoted.single.python"
     },
     "fstring-terminator-multi": {
@@ -1573,7 +1562,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "((?:=?)(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
+          "match": "(=?(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
         },
         {
           "include": "#fstring-terminator-multi-tail"
@@ -1581,7 +1570,7 @@
       ]
     },
     "fstring-terminator-multi-tail": {
-      "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
+      "begin": "(=?(?:![rsa])?)(:)(?=.*?\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.format.python"
@@ -1615,7 +1604,7 @@
           "name": "storage.type.format.python"
         },
         {
-          "match": "(\\#)",
+          "match": "(#)",
           "name": "storage.type.format.python"
         },
         {
@@ -1651,7 +1640,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "((?:=?)(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
+          "match": "(=?(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
         },
         {
           "include": "#fstring-terminator-single-tail"
@@ -1659,7 +1648,7 @@
       ]
     },
     "fstring-terminator-single-tail": {
-      "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
+      "begin": "(=?(?:![rsa])?)(:)(?=.*?\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.format.python"
@@ -1693,7 +1682,7 @@
           "name": "storage.type.format.python"
         },
         {
-          "match": "(\\#)",
+          "match": "(#)",
           "name": "storage.type.format.python"
         },
         {
@@ -1771,7 +1760,6 @@
     },
     "function-call": {
       "begin": "\\b(?=([[:alpha:]_]\\w*)\\s*(\\())",
-      "comment": "Regular function call of the type \"name(args)\"",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -1792,7 +1780,7 @@
       ]
     },
     "function-declaration": {
-      "begin": "\\s*(?:\\b(async)\\s+)?\\b(def|fn)\\s+(?=[[:alpha:]_][[:word:]]*\\s*[\\(\\[])",
+      "begin": "\\s*(?:\\b(async)\\s+)?\\b(def|fn)\\s+(?=[[:alpha:]_]\\p{word}*\\s*[(\\[])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.async.python"
@@ -1853,7 +1841,6 @@
           "include": "#builtin-possible-callables"
         },
         {
-          "comment": "Some color schemas support meta.function-call.generic scope",
           "match": "\\b([[:alpha:]_]\\w*)\\b",
           "name": "meta.function-call.generic.python"
         }
@@ -1866,7 +1853,6 @@
           "name": "keyword.control.flow.python"
         }
       },
-      "comment": "Match \"for ... in\" construct used in generators and for loops to\ncorrectly identify the \"in\" as a control flow keyword.\n",
       "end": "\\bin\\b",
       "endCaptures": {
         "0": {
@@ -1891,10 +1877,9 @@
           "name": "keyword.control.import.python"
         }
       },
-      "match": "\\b(?:(and|assert|async|await|break|class|struct|trait|continue|del|elif|else|except|finally|for|from|global|if|in|is|(?<=\\.)lambda|lambda(?=\\s*[\\.=])|nonlocal|not|or|pass|raise|return|try|while|with|yield)|(def|fn|capturing|raises)|(as|import))\\b"
+      "match": "\\b(?:(and|assert|async|await|break|class|struct|trait|continue|del|elif|else|except|finally|for|from|global|if|in|is|(?<=\\.)lambda|lambda(?=\\s*[.=])|nonlocal|not|or|pass|raise|return|try|while|with|yield)|(def|fn|capturing|raises)|(as|import))\\b"
     },
     "illegal-object-name": {
-      "comment": "It's illegal to name class or function \"True\"",
       "match": "\\b(True|False|None)\\b",
       "name": "keyword.illegal.name.python"
     },
@@ -1909,14 +1894,12 @@
           "name": "invalid.illegal.operator.python"
         },
         {
-          "comment": "We don't want `!` to flash when we're typing `!=`",
           "match": "!\\b",
           "name": "invalid.illegal.operator.python"
         }
       ]
     },
     "import": {
-      "comment": "Import statements used to correctly mark `from`, `import`, and `as`\n",
       "patterns": [
         {
           "begin": "\\b(?<!\\.)(from)\\b(?=.+import)",
@@ -1957,7 +1940,6 @@
       ]
     },
     "impossible": {
-      "comment": "This is a special rule that should be used where no match is desired. It is not a good idea to match something like '1{0}' because in some cases that can result in infinite loops in token generation. So the rule instead matches and impossible expression to allow a match to fail and move to the next token.",
       "match": "$.^"
     },
     "inheritance-identifier": {
@@ -1985,7 +1967,7 @@
       "patterns": [
         {
           "begin": "\\b(?=[[:alpha:]_]\\w*\\s*\\[)",
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.python"
@@ -2014,7 +1996,7 @@
         }
       },
       "contentName": "meta.item-access.arguments.python",
-      "end": "(?=\\])",
+      "end": "(?=])",
       "patterns": [
         {
           "match": ":",
@@ -2050,7 +2032,7 @@
               "name": "keyword.control.flow.python"
             }
           },
-          "match": "((?<=\\.)lambda|lambda(?=\\s*[\\.=]))"
+          "match": "((?<=\\.)lambda|lambda(?=\\s*[.=]))"
         },
         {
           "captures": {
@@ -2085,7 +2067,7 @@
               "name": "keyword.operator.positional.parameter.python"
             },
             {
-              "match": "(\\*\\*|\\*)",
+              "match": "(\\*(?:\\*|))",
               "name": "keyword.operator.unpacking.parameter.python"
             },
             {
@@ -2174,7 +2156,7 @@
               "name": "punctuation.separator.continuation.line.python"
             }
           },
-          "end": "(?=^\\s*$)|(?!(\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))|(\\G$))",
+          "end": "(?=^\\s*$)|(?!(\\s*[rR]?('''|\"\"\"|['\"]))|(\\G$))",
           "patterns": [
             {
               "include": "#regexp"
@@ -2193,7 +2175,7 @@
           "name": "punctuation.definition.list.begin.python"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.list.end.python"
@@ -2241,7 +2223,6 @@
           "name": "support.function.magic.python"
         }
       },
-      "comment": "these methods have magic interpretation by python and are generally called\nindirectly through syntactic constructs\n",
       "match": "\\b(__(?:abs|add|aenter|aexit|aiter|and|anext|await|bool|call|ceil|class_getitem|cmp|coerce|complex|contains|copy|deepcopy|del|delattr|delete|delitem|delslice|dir|div|divmod|enter|eq|exit|float|floor|floordiv|format|ge|get|getattr|getattribute|getinitargs|getitem|getnewargs|getslice|getstate|gt|hash|hex|iadd|iand|idiv|ifloordiv||ilshift|imod|imul|index|init|instancecheck|int|invert|ior|ipow|irshift|isub|iter|itruediv|ixor|le|len|long|lshift|lt|missing|mod|mul|ne|neg|new|next|nonzero|oct|or|pos|pow|radd|rand|rdiv|rdivmod|reduce|reduce_ex|repr|reversed|rfloordiv||rlshift|rmod|rmul|ror|round|rpow|rrshift|rshift|rsub|rtruediv|rxor|set|setattr|setitem|set_name|setslice|setstate|sizeof|str|sub|subclasscheck|truediv|trunc|unicode|xor|matmul|rmatmul|imatmul|init_subclass|set_name|fspath|bytes|prepare|length_hint)__)\\b"
     },
     "magic-names": {
@@ -2260,7 +2241,6 @@
           "name": "support.variable.magic.python"
         }
       },
-      "comment": "magic variables which a class/module may have.",
       "match": "\\b(__(?:all|annotations|bases|builtins|class|struct|trait|closure|code|debug|defaults|dict|doc|file|func|globals|kwdefaults|match_args|members|metaclass|methods|module|mro|mro_entries|name|qualname|post_init|self|signature|slots|subclasses|version|weakref|wrapped|classcell|spec|path|package|future|traceback)__)\\b"
     },
     "member-access": {
@@ -2285,7 +2265,6 @@
       ]
     },
     "member-access-attribute": {
-      "comment": "Highlight attribute access in otherwise non-specialized cases.",
       "match": "\\b([[:alpha:]_]\\w*)\\b",
       "name": "meta.attribute.python"
     },
@@ -2339,7 +2318,7 @@
           "name": "punctuation.definition.parameters.begin.python"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.parameters.end.python"
@@ -2357,7 +2336,7 @@
               "name": "punctuation.separator.annotation.python"
             }
           },
-          "end": "(,)|(?=\\])",
+          "end": "(,)|(?=])",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.parameters.python"
@@ -2407,7 +2386,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[bB])(_?[01])+\\b",
+      "match": "(?<![\\w.])(0[bB])(_?[01])+\\b",
       "name": "constant.numeric.bin.python"
     },
     "number-dec": {
@@ -2419,7 +2398,7 @@
           "name": "invalid.illegal.dec.python"
         }
       },
-      "match": "(?<![\\w\\.])(?:[1-9](?:_?[0-9])*|0+|[0-9](?:_?[0-9])*([jJ])|0([0-9]+)(?![eE\\.]))\\b",
+      "match": "(?<![\\w.])(?:[1-9](?:_?[0-9])*|0+|[0-9](?:_?[0-9])*([jJ])|0([0-9]+)(?![eE.]))\\b",
       "name": "constant.numeric.dec.python"
     },
     "number-float": {
@@ -2428,7 +2407,7 @@
           "name": "storage.type.imaginary.number.python"
         }
       },
-      "match": "(?<!\\w)(?:(?:\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.)(?:[eE][+-]?[0-9](?:_?[0-9])*)?|[0-9](?:_?[0-9])*(?:[eE][+-]?[0-9](?:_?[0-9])*))([jJ])?\\b",
+      "match": "(?<!\\w)(?:(?:\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.)(?:[eE][+-]?[0-9](?:_?[0-9])*)?|[0-9](?:_?[0-9])*[eE][+-]?[0-9](?:_?[0-9])*)([jJ])?\\b",
       "name": "constant.numeric.float.python"
     },
     "number-hex": {
@@ -2437,7 +2416,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[xX])(_?[0-9a-fA-F])+\\b",
+      "match": "(?<![\\w.])(0[xX])(_?\\h)+\\b",
       "name": "constant.numeric.hex.python"
     },
     "number-long": {
@@ -2446,8 +2425,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "comment": "this is to support python2 syntax for long ints",
-      "match": "(?<![\\w\\.])([1-9][0-9]*|0)([lL])\\b",
+      "match": "(?<![\\w.])([1-9][0-9]*|0)([lL])\\b",
       "name": "constant.numeric.bin.python"
     },
     "number-oct": {
@@ -2456,12 +2434,11 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[oO])(_?[0-7])+\\b",
+      "match": "(?<![\\w.])(0[oO])(_?[0-7])+\\b",
       "name": "constant.numeric.oct.python"
     },
     "odd-function-call": {
-      "begin": "(?<=\\]|\\))\\s*(?=\\()",
-      "comment": "A bit obscured function call where there may have been an\narbitrary number of other operations to get the function.\nE.g. \"arr[idx](args)\"\n",
+      "begin": "(?<=[\\])])\\s*(?=\\()",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -2495,7 +2472,7 @@
           "name": "keyword.operator.assignment.python"
         }
       },
-      "match": "\\b(?<!\\.)(?:(and|or|not|in|is)|(for|if|else|await|(?:yield(?:\\s+from)?)))(?!\\s*:)\\b|(<<|>>|&|\\||\\^|~)|(\\*\\*|\\*|\\+|-|%|//|/|@)|(!=|==|>=|<=|<|>)|(:=)"
+      "match": "\\b(?<!\\.)(?:(and|or|not|in|is)|(for|if|else|await|yield(?:\\s+from)?))(?!\\s*:)\\b|(<<|>>|[\\&|^~])|(\\*\\*|[*+\\-%]|//|[/@])|(!=|==|>=|<=|[<>])|(:=)"
     },
     "parameter-special": {
       "captures": {
@@ -2538,7 +2515,7 @@
           "name": "keyword.operator.positional.parameter.python"
         },
         {
-          "match": "(\\*\\*|\\*)",
+          "match": "(\\*(?:\\*|))",
           "name": "keyword.operator.unpacking.parameter.python"
         },
         {
@@ -2615,7 +2592,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp"
         }
       },
-      "match": "(\\()(\\?P=\\w+(?:\\s+[[:alnum:]]+)?)(\\))",
+      "match": "(\\()(\\?P=\\w+(?:\\s+\\p{alnum}+)?)(\\))",
       "name": "meta.backreference.named.regexp"
     },
     "regexp-backreference-number": {
@@ -2757,7 +2734,7 @@
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-character": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|0[0-7]{1,2}|[0-7]{3})",
+      "match": "\\\\(x\\h{2}|0[0-7]{1,2}|[0-7]{3})",
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-sequence": {
@@ -2784,7 +2761,7 @@
       "name": "support.other.escape.special.regexp"
     },
     "regexp-escape-unicode": {
-      "match": "\\\\(u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+      "match": "\\\\(u\\h{4}|U\\h{8})",
       "name": "constant.character.unicode.regexp"
     },
     "regexp-flags": {
@@ -2792,11 +2769,11 @@
       "name": "storage.modifier.flag.regexp"
     },
     "regexp-quantifier": {
-      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}",
+      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)}",
       "name": "keyword.operator.quantifier.regexp"
     },
     "regexp-single-one-line": {
-      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\')",
+      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(')",
       "beginCaptures": {
         "2": {
           "name": "invalid.deprecated.prefix.python"
@@ -2811,7 +2788,7 @@
           "name": "punctuation.definition.string.begin.python"
         }
       },
-      "end": "(\\')|(?<!\\\\)(\\n)",
+      "end": "(')|(?<!\\\\)(\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.python"
@@ -2828,7 +2805,7 @@
       ]
     },
     "regexp-single-three-line": {
-      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\'\\'\\')",
+      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(''')",
       "beginCaptures": {
         "2": {
           "name": "invalid.deprecated.prefix.python"
@@ -2843,7 +2820,7 @@
           "name": "punctuation.definition.string.begin.python"
         }
       },
-      "end": "(\\'\\'\\')",
+      "end": "(''')",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.python"
@@ -2895,7 +2872,7 @@
     "semicolon": {
       "patterns": [
         {
-          "match": "\\;$",
+          "match": ";$",
           "name": "invalid.deprecated.semicolon.python"
         }
       ]
@@ -2903,10 +2880,10 @@
     "single-one-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -2918,7 +2895,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\\'))|((?=(?<!\\\\)\\n))",
+          "end": "(]|(?='))|((?=(?<!\\\\)\\n))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -2933,7 +2910,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -2947,7 +2924,7 @@
           "name": "punctuation.comment.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "punctuation.comment.end.regexp"
@@ -2964,7 +2941,7 @@
       ]
     },
     "single-one-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -2973,7 +2950,7 @@
           "name": "punctuation.parenthesis.conditional.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
@@ -3041,7 +3018,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3066,7 +3043,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3091,7 +3068,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3116,7 +3093,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3132,7 +3109,7 @@
       ]
     },
     "single-one-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -3141,7 +3118,7 @@
           "name": "entity.name.tag.named.group.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
@@ -3164,7 +3141,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
@@ -3186,7 +3163,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
@@ -3204,10 +3181,10 @@
     "single-three-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -3219,7 +3196,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\\'\\'\\'))",
+          "end": "(]|(?='''))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -3234,7 +3211,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -3248,7 +3225,7 @@
           "name": "punctuation.comment.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "punctuation.comment.end.regexp"
@@ -3265,7 +3242,7 @@
       ]
     },
     "single-three-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -3274,7 +3251,7 @@
           "name": "punctuation.parenthesis.conditional.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
@@ -3348,7 +3325,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3376,7 +3353,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3404,7 +3381,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3432,7 +3409,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3451,7 +3428,7 @@
       ]
     },
     "single-three-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -3460,7 +3437,7 @@
           "name": "entity.name.tag.named.group.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
@@ -3486,7 +3463,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
@@ -3511,7 +3488,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
@@ -3530,7 +3507,7 @@
       ]
     },
     "special-names": {
-      "match": "\\b(_*[[:upper:]][_\\d]*[[:upper:]])[[:upper:]\\d]*(_\\w*)?\\b",
+      "match": "\\b(_*\\p{upper}[_\\d]*\\p{upper})[[:upper:]\\d]*(_\\w*)?\\b",
       "name": "constant.other.caps.python"
     },
     "special-variables": {
@@ -3579,12 +3556,10 @@
           "name": "storage.type.function.python"
         },
         {
-          "comment": "if `as` is eventually followed by `:` or line continuation\nit's probably control flow like:\n    with foo as bar, \\\n         Foo as Bar:\n      try:\n        do_stuff()\n      except Exception as e:\n        pass\n",
           "match": "\\b(?<!\\.)as\\b(?=.*[:\\\\])",
           "name": "keyword.control.flow.python"
         },
         {
-          "comment": "other legal use of `as` is in an import",
           "match": "\\b(?<!\\.)as\\b",
           "name": "keyword.control.import.python"
         },
@@ -3733,7 +3708,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "({{|}}|(?:{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?}))",
+          "match": "(\\{\\{|}}|\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?})",
           "name": "meta.format.brace.python"
         },
         {
@@ -3748,7 +3723,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "({\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?\\}[^'\"{}\\n]*)*})",
+          "match": "(\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?}[^'\"{}\\n]*)*})",
           "name": "meta.format.brace.python"
         }
       ]
@@ -3783,7 +3758,7 @@
       "name": "constant.language.python"
     },
     "string-mojo-code-block": {
-      "begin": "^(\\s*\\`{3,})(mojo)$",
+      "begin": "^(\\s*`{3,})(mojo)$",
       "beginCaptures": {
         "1": {
           "name": "string.quoted.single.python"
@@ -3807,8 +3782,7 @@
       ]
     },
     "string-multi-bad-brace1-formatting-raw": {
-      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3817,8 +3791,7 @@
       ]
     },
     "string-multi-bad-brace1-formatting-unicode": {
-      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3833,8 +3806,7 @@
       ]
     },
     "string-multi-bad-brace2-formatting-raw": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:\\.\\[}\\w]).*?(?!'''|\"\"\")\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:.\\[}\\w]).*?(?!'''|\"\"\")})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3846,8 +3818,7 @@
       ]
     },
     "string-multi-bad-brace2-formatting-unicode": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:\\.\\[}\\w]).*?(?!'''|\"\"\")\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:.\\[}\\w]).*?(?!'''|\"\"\")})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -4074,8 +4045,7 @@
       ]
     },
     "string-single-bad-brace1-formatting-raw": {
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4084,8 +4054,7 @@
       ]
     },
     "string-single-bad-brace1-formatting-unicode": {
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4100,8 +4069,7 @@
       ]
     },
     "string-single-bad-brace2-formatting-raw": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4113,8 +4081,7 @@
       ]
     },
     "string-single-bad-brace2-formatting-unicode": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
diff --git a/resources/languages/move.json b/resources/languages/move.json
index 5d5404d..d6829c9 100644
--- a/resources/languages/move.json
+++ b/resources/languages/move.json
@@ -67,7 +67,6 @@
     "=== DEPRECATED_BELOW ===": {
     },
     "abilities": {
-      "comment": "Ability",
       "match": "\\b(store|key|drop|copy)\\b",
       "name": "support.type.ability.move"
     },
@@ -78,7 +77,6 @@
           "name": "storage.modifier.type.address.keyword.move"
         }
       },
-      "comment": "Address block",
       "end": "(?<=})",
       "name": "meta.address_block.move",
       "patterns": [
@@ -87,8 +85,7 @@
         },
         {
           "begin": "(?<=address)",
-          "comment": "Address value/const",
-          "end": "(?=[{])",
+          "end": "(?=\\{)",
           "name": "meta.address.definition.move",
           "patterns": [
             {
@@ -98,7 +95,6 @@
               "include": "#address_literal"
             },
             {
-              "comment": "Named Address",
               "match": "\\b(\\w+)\\b",
               "name": "entity.name.type.move"
             }
@@ -111,17 +107,15 @@
     },
     "annotation": {
       "begin": "#\\[",
-      "end": "\\]",
+      "end": "]",
       "name": "support.constant.annotation.move",
       "patterns": [
         {
-          "comment": "Annotation name",
-          "match": "\\b(\\w+)\\s*(?=\\=)",
+          "match": "\\b(\\w+)\\s*(?==)",
           "name": "meta.annotation.name.move"
         },
         {
           "begin": "=",
-          "comment": "Annotation value",
           "end": "(?=[,\\]])",
           "name": "meta.annotation.value.move",
           "patterns": [
@@ -133,18 +127,15 @@
       ]
     },
     "as": {
-      "comment": "Keyword as (highlighted)",
       "match": "\\b(as)\\b",
       "name": "keyword.control.as.move"
     },
     "as-import": {
-      "comment": "Keyword as in import statement; not highlighted",
       "match": "\\b(as)\\b",
       "name": "meta.import.as.move"
     },
     "block": {
-      "begin": "{",
-      "comment": "Block expression or definition",
+      "begin": "\\{",
       "end": "}",
       "name": "meta.block.move",
       "patterns": [
@@ -156,21 +147,18 @@
     "block-comments": {
       "patterns": [
         {
-          "begin": "/\\*[\\*!](?![\\*/])",
-          "comment": "Block documentation comment",
+          "begin": "/\\*[*!](?![*/])",
           "end": "\\*/",
           "name": "comment.block.documentation.move"
         },
         {
           "begin": "/\\*",
-          "comment": "Block comment",
           "end": "\\*/",
           "name": "comment.block.move"
         }
       ]
     },
     "capitalized": {
-      "comment": "MyType - capitalized type name",
       "match": "\\b([A-Z][a-zA-Z_0-9]*)\\b",
       "name": "entity.name.type.use.move"
     },
@@ -220,13 +208,11 @@
       ]
     },
     "control": {
-      "comment": "Control flow",
       "match": "\\b(return|while|loop|if|else|break|continue|abort)\\b",
       "name": "keyword.control.move"
     },
     "doc-comments": {
       "begin": "///",
-      "comment": "Documentation comment",
       "end": "$",
       "name": "comment.block.documentation.move",
       "patterns": [
@@ -236,13 +222,11 @@
               "name": "markup.underline.link.move"
             }
           },
-          "comment": "Escaped member / link",
           "match": "`(\\w+)`"
         }
       ]
     },
     "entry": {
-      "comment": "entry",
       "match": "\\b(entry)\\b",
       "name": "storage.modifier.visibility.entry.move"
     },
@@ -253,7 +237,6 @@
           "name": "keyword.control.enum.move"
         }
       },
-      "comment": "Enum syntax",
       "end": "(?<=})",
       "name": "meta.enum.move",
       "patterns": [
@@ -267,7 +250,6 @@
           "include": "#type_param"
         },
         {
-          "comment": "Enum name (ident)",
           "match": "\\b[A-Z][a-zA-Z_0-9]*\\b",
           "name": "entity.name.type.enum.move"
         },
@@ -278,7 +260,7 @@
           "include": "#abilities"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}",
           "name": "meta.enum.definition.move",
           "patterns": [
@@ -313,7 +295,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "end": "}",
               "name": "meta.enum.struct.move",
               "patterns": [
@@ -344,12 +326,10 @@
     },
     "escaped_identifier": {
       "begin": "`",
-      "comment": "Escaped variable",
       "end": "`",
       "name": "variable.language.escaped.move"
     },
     "expr": {
-      "comment": "Aggregate Expression",
       "name": "meta.expression.move",
       "patterns": [
         {
@@ -420,11 +400,10 @@
           "name": "keyword.operator.macro.dollar.move"
         },
         {
-          "match": "(?<=[$])[a-z][A-Z_0-9a-z]*",
+          "match": "(?<=\\$)[a-z][A-Z_0-9a-z]*",
           "name": "variable.other.meta.move"
         },
         {
-          "comment": "ALL_CONST_CAPS",
           "match": "\\b([A-Z][A-Z_]+)\\b",
           "name": "constant.other.move"
         },
@@ -432,7 +411,6 @@
           "include": "#error_const"
         },
         {
-          "comment": "CustomType",
           "match": "\\b([A-Z][a-zA-Z_0-9]*)\\b",
           "name": "entity.name.type.move"
         },
@@ -446,7 +424,6 @@
     },
     "expr_generic": {
       "begin": "<(?=([\\sa-z_,0-9A-Z<>]+>))",
-      "comment": "< angle brackets >",
       "end": ">",
       "name": "meta.expression.generic.type.move",
       "patterns": [
@@ -481,7 +458,6 @@
           "include": "#address_literal"
         },
         {
-          "comment": "Name of the imported module",
           "match": "\\b([a-zA-Z][A-Za-z_0-9]*)\\b",
           "name": "entity.name.type.module.move"
         }
@@ -498,8 +474,7 @@
       ]
     },
     "fun_body": {
-      "begin": "{",
-      "comment": "Function body",
+      "begin": "\\{",
       "end": "(?<=})",
       "name": "meta.fun_body.move",
       "patterns": [
@@ -509,14 +484,13 @@
       ]
     },
     "fun_call": {
-      "begin": "\\b(\\w+)\\s*(?:<[\\w\\s,]+>)?\\s*[(]",
+      "begin": "\\b(\\w+)\\s*(?:<[\\w\\s,]+>)?\\s*\\(",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.call.move"
         }
       },
-      "comment": "Function call",
-      "end": "[)]",
+      "end": "\\)",
       "name": "meta.fun_call.move",
       "patterns": [
         {
@@ -558,7 +532,6 @@
           "name": "storage.modifier.fun.move"
         }
       },
-      "comment": "Function signature",
       "end": "(?=[;{])",
       "name": "meta.fun_signature.move",
       "patterns": [
@@ -579,7 +552,6 @@
         },
         {
           "begin": "(?<=\\bfun)",
-          "comment": "Function name",
           "end": "(?=[<(])",
           "name": "meta.function_name.move",
           "patterns": [
@@ -599,9 +571,8 @@
           "include": "#type_param"
         },
         {
-          "begin": "[(]",
-          "comment": "Parentheses",
-          "end": "[)]",
+          "begin": "\\(",
+          "end": "\\)",
           "name": "meta.parentheses.move",
           "patterns": [
             {
@@ -631,14 +602,12 @@
           ]
         },
         {
-          "comment": "Keyword acquires",
           "match": "\\b(acquires)\\b",
           "name": "storage.modifier"
         }
       ]
     },
     "has": {
-      "comment": "Has Abilities",
       "match": "\\b(has)\\b",
       "name": "keyword.control.ability.has.move"
     },
@@ -687,13 +656,11 @@
           "include": "#as-import"
         },
         {
-          "comment": "Uppercase entities",
           "match": "\\b([A-Z]\\w*)\\b",
           "name": "entity.name.type.move"
         },
         {
-          "begin": "{",
-          "comment": "Module members",
+          "begin": "\\{",
           "end": "}",
           "patterns": [
             {
@@ -703,87 +670,71 @@
               "include": "#as-import"
             },
             {
-              "comment": "Uppercase entities",
               "match": "\\b([A-Z]\\w*)\\b",
               "name": "entity.name.type.move"
             }
           ]
         },
         {
-          "comment": "Name of the imported module",
           "match": "\\b(\\w+)\\b",
           "name": "meta.entity.name.type.module.move"
         }
       ]
     },
     "inline": {
-      "comment": "inline",
       "match": "\\b(inline)\\b",
       "name": "storage.modifier.visibility.inline.move"
     },
     "label": {
-      "comment": "Label",
       "match": "'[a-z][a-z_0-9]*",
       "name": "string.quoted.single.label.move"
     },
     "let": {
-      "comment": "Keyword let",
       "match": "\\b(let)\\b",
       "name": "keyword.control.move"
     },
     "line-comments": {
       "begin": "//",
-      "comment": "Single-line comment",
       "end": "$",
       "name": "comment.line.double-slash.move"
     },
     "literals": {
-      "comment": "Literals supported in Move",
       "name": "meta.literal.move",
       "patterns": [
         {
-          "comment": "base16 address literal",
-          "match": "@0x[A-F0-9a-f]+",
+          "match": "@0x\\h+",
           "name": "support.constant.address.base16.move"
         },
         {
-          "comment": "named address literal @[ident]",
           "match": "@[a-zA-Z][a-zA-Z_0-9]*",
           "name": "support.constant.address.name.move"
         },
         {
-          "comment": "Hex literal",
-          "match": "0x[_a-fA-F0-9]+(?:u(?:8|16|32|64|128|256))?",
+          "match": "0x[_\\h]+(?:u(?:8|16|32|64|128|256))?",
           "name": "constant.numeric.hex.move"
         },
         {
-          "comment": "Numeric literal",
-          "match": "(?<!(?:\\w|(?:(?<!\\.)\\.)))[0-9][_0-9]*(?:\\.(?!\\.)(?:[0-9][_0-9]*)?)?(?:[eE][+\\-]?[_0-9]+)?(?:[u](?:8|16|32|64|128|256))?",
+          "match": "(?<!(?:\\w|(?<!\\.)\\.))[0-9][_0-9]*(?:\\.(?!\\.)(?:[0-9][_0-9]*)?)?(?:[eE][+-]?[_0-9]+)?(?:u(?:8|16|32|64|128|256))?",
           "name": "constant.numeric.move"
         },
         {
           "begin": "\\bb\"",
-          "comment": "vector ascii bytestring literal",
           "end": "\"",
           "name": "meta.vector.literal.ascii.move",
           "patterns": [
             {
-              "comment": "character escape",
               "match": "\\\\.",
               "name": "constant.character.escape.move"
             },
             {
-              "comment": "Special symbol escape",
-              "match": "\\\\[nrt\\0\"]",
+              "match": "\\\\[nrt\\x00\"]",
               "name": "constant.character.escape.move"
             },
             {
-              "comment": "HEX Escape",
-              "match": "\\\\x[a-fA-F0-9][A-Fa-f0-9]",
+              "match": "\\\\x\\h\\h",
               "name": "constant.character.escape.hex.move"
             },
             {
-              "comment": "ASCII Character",
               "match": "[\\x00-\\x7F]",
               "name": "string.quoted.double.raw.move"
             }
@@ -791,26 +742,22 @@
         },
         {
           "begin": "x\"",
-          "comment": "vector hex literal",
           "end": "\"",
           "name": "meta.vector.literal.hex.move",
           "patterns": [
             {
-              "comment": "vector hex literal",
-              "match": "[A-Fa-f0-9]+",
+              "match": "\\h+",
               "name": "constant.character.move"
             }
           ]
         },
         {
-          "comment": "bool literal",
           "match": "\\b(?:true|false)\\b",
           "name": "constant.language.boolean.move"
         },
         {
           "begin": "vector\\[",
-          "comment": "vector literal (macro?)",
-          "end": "\\]",
+          "end": "]",
           "name": "meta.vector.literal.macro.move",
           "patterns": [
             {
@@ -821,8 +768,7 @@
       ]
     },
     "local_call": {
-      "comment": "call to a local / imported fun",
-      "match": "\\b([a-z][_a-z0-9]*)(?=[<\\(])",
+      "match": "\\b([a-z][_a-z0-9]*)(?=[<(])",
       "name": "entity.name.function.call.local.move"
     },
     "macro": {
@@ -832,7 +778,6 @@
           "name": "keyword.control.macro.move"
         }
       },
-      "comment": "macro fun [ident] {}",
       "end": "(?<=})",
       "name": "meta.macro.move",
       "patterns": [
@@ -850,7 +795,6 @@
           "name": "support.function.macro.move"
         }
       },
-      "comment": "Macro fun call",
       "match": "(\\b|\\.)([a-z][A-Za-z0-9_]*)!",
       "name": "meta.macro.call"
     },
@@ -861,7 +805,6 @@
           "name": "keyword.control.match.move"
         }
       },
-      "comment": "enum pattern matching",
       "end": "(?<=})",
       "name": "meta.match.move",
       "patterns": [
@@ -875,13 +818,11 @@
           "include": "#types"
         },
         {
-          "begin": "{",
-          "comment": "Block expression or definition",
+          "begin": "\\{",
           "end": "}",
           "name": "meta.match.block.move",
           "patterns": [
             {
-              "comment": "arrow operator",
               "match": "\\b(=>)\\b",
               "name": "operator.match.move"
             },
@@ -901,8 +842,7 @@
           "name": "entity.name.function.call.path.move"
         }
       },
-      "comment": "<expr>.[ident]<>?() call",
-      "match": "\\.([a-z][_a-z0-9]*)(?=[<\\(])",
+      "match": "\\.([a-z][_a-z0-9]*)(?=[<(])",
       "name": "meta.path.call.move"
     },
     "module": {
@@ -912,7 +852,6 @@
           "name": "storage.modifier.type.move"
         }
       },
-      "comment": "Module definition",
       "end": "(?<=[;}])",
       "name": "meta.module.move",
       "patterns": [
@@ -921,7 +860,6 @@
         },
         {
           "begin": "(?<=\\b(module)\\b)",
-          "comment": "Module name",
           "end": "(?=[;{])",
           "patterns": [
             {
@@ -932,8 +870,7 @@
             },
             {
               "begin": "(?<=\\b(module))",
-              "comment": "Module namespace / address",
-              "end": "(?=[(::){])",
+              "end": "(?=[(:){])",
               "name": "constant.other.move",
               "patterns": [
                 {
@@ -946,7 +883,6 @@
             },
             {
               "begin": "(?<=::)",
-              "comment": "Module name",
               "end": "(?=[\\s;{])",
               "name": "entity.name.type.move",
               "patterns": [
@@ -961,8 +897,7 @@
           ]
         },
         {
-          "begin": "{",
-          "comment": "Module scope",
+          "begin": "\\{",
           "end": "}",
           "name": "meta.module_scope.move",
           "patterns": [
@@ -1024,13 +959,11 @@
           "name": "entity.name.function.call.move"
         }
       },
-      "comment": "Use of module type or method",
       "match": "\\b(\\w+)::(\\w+)\\b",
       "name": "meta.module_access.move"
     },
     "module_label": {
       "begin": "^\\s*(module)\\b",
-      "comment": "Module label, inline module definition",
       "end": ";\\s*$",
       "name": "meta.module.label.move",
       "patterns": [
@@ -1042,35 +975,29 @@
         },
         {
           "begin": "(?<=\\bmodule\\b)",
-          "comment": "Module namespace / address",
-          "end": "(?=[(::){])",
+          "end": "(?=[(:){])",
           "name": "constant.other.move"
         },
         {
           "begin": "(?<=::)",
-          "comment": "Module name",
           "end": "(?=[\\s{])",
           "name": "entity.name.type.move"
         }
       ]
     },
     "move_copy": {
-      "comment": "Keywords move and copy",
       "match": "\\b(move|copy)\\b",
       "name": "variable.language.move"
     },
     "mut": {
-      "comment": "Mutable reference and let mut",
       "match": "\\b(mut)\\b",
       "name": "storage.modifier.mut.move"
     },
     "native": {
-      "comment": "native",
       "match": "\\b(native)\\b",
       "name": "storage.modifier.visibility.native.move"
     },
     "packed_field": {
-      "comment": "[ident]: ",
       "match": "[a-z][a-z0-9_]+\\s*:\\s*(?=\\s)",
       "name": "meta.struct.field.move"
     },
@@ -1085,28 +1012,23 @@
       ]
     },
     "path_access": {
-      "comment": "<expr>.[ident] access",
       "match": "\\.[a-z][_a-z0-9]*\\b",
       "name": "meta.path.access.move"
     },
     "phantom": {
-      "comment": "Keyword phantom inside type parameters",
       "match": "\\b(phantom)\\b",
       "name": "keyword.control.phantom.move"
     },
     "primitives": {
-      "comment": "Primitive types",
       "match": "\\b(u8|u16|u32|u64|u128|u256|address|bool|signer)\\b",
       "name": "support.type.primitives.move"
     },
     "public": {
-      "comment": "public",
       "match": "\\b(public)\\b",
       "name": "storage.modifier.visibility.public.move"
     },
     "public-scope": {
       "begin": "(?<=\\b(public))\\s*\\(",
-      "comment": "public (friend/script/package)",
       "end": "\\)",
       "name": "meta.public.scoped.move",
       "patterns": [
@@ -1120,7 +1042,6 @@
       ]
     },
     "resource_methods": {
-      "comment": "Methods to work with resource",
       "match": "\\b(borrow_global|borrow_global_mut|exists|move_from|move_to_sender|move_to)\\b",
       "name": "support.function.typed.move"
     },
@@ -1138,8 +1059,7 @@
           "include": "#comments"
         },
         {
-          "begin": "{",
-          "comment": "Script scope",
+          "begin": "\\{",
           "end": "}",
           "name": "meta.script_scope.move",
           "patterns": [
@@ -1168,7 +1088,6 @@
           "name": "entity.name.function.call.move"
         }
       },
-      "comment": "Use of Self",
       "match": "\\b(Self)::(\\w+)\\b",
       "name": "meta.self_access.move"
     },
@@ -1183,23 +1102,19 @@
       "name": "meta.spec.move",
       "patterns": [
         {
-          "comment": "Spec target",
           "match": "\\b(module|schema|struct|fun)",
           "name": "storage.modifier.spec.target.move"
         },
         {
-          "comment": "Spec define inline",
           "match": "\\b(define)",
           "name": "storage.modifier.spec.define.move"
         },
         {
-          "comment": "Target name",
           "match": "\\b(\\w+)\\b",
           "name": "entity.name.function.move"
         },
         {
-          "begin": "{",
-          "comment": "Spec block",
+          "begin": "\\{",
           "end": "}",
           "patterns": [
             {
@@ -1237,8 +1152,7 @@
       ]
     },
     "spec_block": {
-      "begin": "{",
-      "comment": "Spec block",
+      "begin": "\\{",
       "end": "}",
       "name": "meta.spec_block.move",
       "patterns": [
@@ -1275,7 +1189,6 @@
           "name": "keyword.control.move.spec"
         }
       },
-      "comment": "Spec define keyword",
       "end": "(?=[;{])",
       "name": "meta.spec_define.move",
       "patterns": [
@@ -1290,8 +1203,7 @@
         },
         {
           "begin": "(?<=\\bdefine)",
-          "comment": "Function name",
-          "end": "(?=[(])",
+          "end": "(?=\\()",
           "patterns": [
             {
               "include": "#comments"
@@ -1309,7 +1221,6 @@
       "name": "keyword.control.move.spec"
     },
     "spec_types": {
-      "comment": "Spec-only types",
       "match": "\\b(range|num|vector|bool|u8|u16|u32|u64|u128|u256|address)\\b",
       "name": "support.type.vector.move"
     },
@@ -1320,7 +1231,7 @@
           "name": "storage.modifier.type.move"
         }
       },
-      "end": "(?<=[};\\)])",
+      "end": "(?<=[};)])",
       "name": "meta.struct.move",
       "patterns": [
         {
@@ -1336,13 +1247,11 @@
           "include": "#abilities"
         },
         {
-          "comment": "Struct name (ident)",
           "match": "\\b[A-Z][a-zA-Z_0-9]*\\b",
           "name": "entity.name.type.struct.move"
         },
         {
           "begin": "\\(",
-          "comment": "Positional fields",
           "end": "\\)",
           "name": "meta.struct.paren.move",
           "patterns": [
@@ -1362,8 +1271,7 @@
         },
         {
           "begin": "\\(",
-          "comment": "Simple struct",
-          "end": "(?<=[)])",
+          "end": "(?<=\\))",
           "name": "meta.struct.paren.move",
           "patterns": [
             {
@@ -1375,8 +1283,7 @@
           ]
         },
         {
-          "begin": "{",
-          "comment": "Struct body",
+          "begin": "\\{",
           "end": "}",
           "name": "meta.struct.body.move",
           "patterns": [
@@ -1409,8 +1316,7 @@
       ]
     },
     "struct_pack": {
-      "begin": "(?<=[A-Za-z0-9_>])\\s*{",
-      "comment": "Struct { field: value... }; identified as generic / ident followed by curly's",
+      "begin": "(?<=[A-Za-z0-9_>])\\s*\\{",
       "end": "}",
       "name": "meta.struct.pack.move",
       "patterns": [
@@ -1421,7 +1327,6 @@
     },
     "type_param": {
       "begin": "<",
-      "comment": "Generic type param",
       "end": ">",
       "name": "meta.generic_param.move",
       "patterns": [
@@ -1443,7 +1348,6 @@
       ]
     },
     "types": {
-      "comment": "Built-in types + vector",
       "name": "meta.types.move",
       "patterns": [
         {
@@ -1461,7 +1365,6 @@
           "name": "storage.modifier.fun.move"
         }
       },
-      "comment": "use { fun } internals",
       "end": "(?=;)",
       "name": "meta.import.fun.move",
       "patterns": [
@@ -1469,17 +1372,14 @@
           "include": "#comments"
         },
         {
-          "comment": "as keyword",
           "match": "\\b(as)\\b",
           "name": "keyword.control.as.move"
         },
         {
-          "comment": "Self keyword",
           "match": "\\b(Self)\\b",
           "name": "variable.language.self.use.fun.move"
         },
         {
-          "comment": "Function name",
           "match": "\\b(_______[a-z][a-z_0-9]+)\\b",
           "name": "entity.name.function.use.move"
         },
@@ -1495,7 +1395,6 @@
       ]
     },
     "vector": {
-      "comment": "vector type",
       "match": "\\b(vector)\\b",
       "name": "support.type.vector.move"
     }
diff --git a/resources/languages/narrat.json b/resources/languages/narrat.json
index 7aa5d74..e5bc467 100644
--- a/resources/languages/narrat.json
+++ b/resources/languages/narrat.json
@@ -17,7 +17,7 @@
           "name": "keyword.commands.variables.narrat"
         },
         {
-          "match": "\\b(talk|think)\\b",
+          "match": "\\b(t(?:alk|hink))\\b",
           "name": "keyword.commands.text.narrat"
         },
         {
@@ -73,7 +73,7 @@
     "comments": {
       "patterns": [
         {
-          "match": "\\/\\/.*$",
+          "match": "//.*$",
           "name": "comment.line.narrat"
         }
       ]
@@ -103,7 +103,7 @@
     "interpolation": {
       "patterns": [
         {
-          "match": "(\\w|\\.)+",
+          "match": "([\\w.])+",
           "name": "variable.interpolation.narrat"
         }
       ]
@@ -115,19 +115,19 @@
           "name": "keyword.control.narrat"
         },
         {
-          "match": "\\$[\\w|\\.]+\\b",
+          "match": "\\$[\\w|.]+\\b",
           "name": "variable.value.narrat"
         },
         {
-          "match": "^\\w+(?=(\\s|\\w)*:)",
+          "match": "^\\w+(?=([\\s\\w])*:)",
           "name": "entity.name.function.narrat"
         },
         {
-          "match": "^\\w+(?!(\\s|\\w)*:)",
+          "match": "^\\w+(?!([\\s\\w])*:)",
           "name": "invalid.label.narrat"
         },
         {
-          "match": "(?<=\\w)[^^](\\b\\w+\\b)(?=(\\s|\\w)*:)",
+          "match": "(?<=\\w)[^^](\\b\\w+\\b)(?=([\\s\\w])*:)",
           "name": "entity.other.attribute-name"
         }
       ]
@@ -135,11 +135,11 @@
     "operators": {
       "patterns": [
         {
-          "match": "(&&|\\|\\||!=|==|>=|<=|<|>|!|\\?)\\s",
+          "match": "(&&|\\|\\||!=|==|>=|<=|[<>!?])\\s",
           "name": "keyword.operator.logic.narrat"
         },
         {
-          "match": "(\\+|-|\\*|\\/)\\s",
+          "match": "([+\\-*/])\\s",
           "name": "keyword.operator.arithmetic.narrat"
         }
       ]
@@ -198,7 +198,7 @@
           "name": "constant.character.escape.narrat"
         },
         {
-          "begin": "%{",
+          "begin": "%\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.template.open"
diff --git a/resources/languages/nextflow.json b/resources/languages/nextflow.json
index d26295d..790ed6a 100644
--- a/resources/languages/nextflow.json
+++ b/resources/languages/nextflow.json
@@ -8,7 +8,7 @@
   ],
   "repository": {
     "enum-def": {
-      "begin": "^\\s*(enum)\\s+(\\w+)\\s*{",
+      "begin": "^\\s*(enum)\\s+(\\w+)\\s*\\{",
       "beginCaptures": {
         "1": {
           "name": "keyword.nextflow"
@@ -30,7 +30,7 @@
     "enum-values": {
       "patterns": [
         {
-          "begin": "(?<=;|^)\\s*\\b([A-Z0-9_]+)(?=\\s*(?:,|}|\\(|$))",
+          "begin": "(?<=;|^)\\s*\\b([A-Z0-9_]+)(?=\\s*(?:[,}(]|$))",
           "beginCaptures": {
             "1": {
               "name": "constant.enum.name.groovy"
@@ -62,7 +62,7 @@
           "match": "\\s"
         },
         {
-          "begin": "(?=(?:\\w|<)[^\\(]*\\s+(?:[\\w$]|<)+\\s*\\()",
+          "begin": "(?=[\\w<][^(]*\\s+[\\w$<]+\\s*\\()",
           "end": "(?=[\\w$]+\\s*\\()",
           "name": "meta.method.return-type.java",
           "patterns": [
@@ -88,7 +88,7 @@
               "patterns": [
                 {
                   "begin": "(?=[^,)])",
-                  "end": "(?=,|\\))",
+                  "end": "(?=[,)])",
                   "name": "meta.method.parameter.groovy",
                   "patterns": [
                     {
@@ -102,7 +102,7 @@
                           "name": "keyword.operator.assignment.groovy"
                         }
                       },
-                      "end": "(?=,|\\))",
+                      "end": "(?=[,)])",
                       "name": "meta.parameter.default.groovy",
                       "patterns": [
                         {
@@ -141,7 +141,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "(?=})",
           "name": "meta.method.body.java",
           "patterns": [
@@ -154,7 +154,7 @@
     },
     "function-def": {
       "applyEndPatternLast": 1,
-      "begin": "(?:(?<=;|^|{)(?=\\s*(?:(?:def)|(?:(?:(?:boolean|byte|char|short|int|float|long|double)|(?:@?(?:[a-zA-Z]\\w*\\.)*[A-Z]+\\w*))[\\[\\]]*(?:<.*>)?)n)\\s+([^=]+\\s+)?\\w+\\s*\\())",
+      "begin": "(?<=;|^|\\{)(?=\\s*(?:def|(?:(?:boolean|byte|char|short|int|float|long|double)|@?(?:[a-zA-Z]\\w*\\.)*[A-Z]+\\w*)[\\[\\]]*(?:<.*>)?n)\\s+([^=]+\\s+)?\\w+\\s*\\()",
       "end": "}|(?=[^{])",
       "name": "meta.definition.method.groovy",
       "patterns": [
@@ -201,7 +201,7 @@
       ]
     },
     "output-def": {
-      "begin": "^\\s*(output)\\s*{",
+      "begin": "^\\s*(output)\\s*\\{",
       "beginCaptures": {
         "1": {
           "name": "keyword.nextflow"
@@ -222,7 +222,7 @@
           "name": "constant.block.nextflow"
         },
         {
-          "match": "\\b(val|env|file|path|stdin|stdout|tuple)(\\(|\\s)",
+          "match": "\\b(val|env|file|path|stdin|stdout|tuple)([(\\s])",
           "name": "entity.name.function.nextflow"
         },
         {
@@ -231,7 +231,7 @@
       ]
     },
     "process-def": {
-      "begin": "^\\s*(process)\\s+(\\w+)\\s*{",
+      "begin": "^\\s*(process)\\s+(\\w+)\\s*\\{",
       "beginCaptures": {
         "1": {
           "name": "keyword.nextflow"
@@ -260,7 +260,7 @@
       ]
     },
     "workflow-def": {
-      "begin": "^\\s*(workflow)(?:\\s+(\\w+))?\\s*{",
+      "begin": "^\\s*(workflow)(?:\\s+(\\w+))?\\s*\\{",
       "beginCaptures": {
         "1": {
           "name": "keyword.nextflow"
diff --git a/resources/languages/nginx.json b/resources/languages/nginx.json
index 0f3c77d..ced6aac 100644
--- a/resources/languages/nginx.json
+++ b/resources/languages/nginx.json
@@ -11,11 +11,11 @@
     "uwsgi_params"
   ],
   "foldingStartMarker": "\\{\\s*$",
-  "foldingStopMarker": "^\\s*\\}",
+  "foldingStopMarker": "^\\s*}",
   "name": "nginx",
   "patterns": [
     {
-      "match": "\\#.*",
+      "match": "#.*",
       "name": "comment.line.number-sign"
     },
     {
@@ -26,7 +26,7 @@
         }
       },
       "contentName": "meta.embedded.block.lua",
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.lua.nginx",
       "patterns": [
         {
@@ -57,7 +57,7 @@
           "name": "storage.type.directive.context.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.events.nginx",
       "patterns": [
         {
@@ -72,7 +72,7 @@
           "name": "storage.type.directive.context.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.http.nginx",
       "patterns": [
         {
@@ -87,7 +87,7 @@
           "name": "storage.type.directive.context.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.mail.nginx",
       "patterns": [
         {
@@ -102,7 +102,7 @@
           "name": "storage.type.directive.context.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.stream.nginx",
       "patterns": [
         {
@@ -117,7 +117,7 @@
           "name": "storage.type.directive.context.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.server.nginx",
       "patterns": [
         {
@@ -126,7 +126,7 @@
       ]
     },
     {
-      "begin": "\\b(location) +([\\^]?~[\\*]?|=) +(.*?)\\{",
+      "begin": "\\b(location) +(\\^?~\\*?|=) +(.*?)\\{",
       "beginCaptures": {
         "1": {
           "name": "storage.type.directive.context.nginx"
@@ -138,7 +138,7 @@
           "name": "string.regexp.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.location.nginx",
       "patterns": [
         {
@@ -156,7 +156,7 @@
           "name": "entity.name.context.location.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.location.nginx",
       "patterns": [
         {
@@ -171,7 +171,7 @@
           "name": "storage.type.directive.context.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.limit_except.nginx",
       "patterns": [
         {
@@ -204,7 +204,7 @@
           "name": "entity.name.context.location.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.upstream.nginx",
       "patterns": [
         {
@@ -219,7 +219,7 @@
           "name": "storage.type.directive.context.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.types.nginx",
       "patterns": [
         {
@@ -228,7 +228,7 @@
       ]
     },
     {
-      "begin": "\\b(map) +(\\$)([A-Za-z0-9\\_]+) +(\\$)([A-Za-z0-9\\_]+) *\\{",
+      "begin": "\\b(map) +(\\$)([A-Za-z0-9_]+) +(\\$)([A-Za-z0-9_]+) *\\{",
       "beginCaptures": {
         "1": {
           "name": "storage.type.directive.context.nginx"
@@ -246,7 +246,7 @@
           "name": "variable.other.nginx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.context.map.nginx",
       "patterns": [
         {
@@ -257,14 +257,14 @@
           "name": "punctuation.terminator.nginx"
         },
         {
-          "match": "\\#.*",
+          "match": "#.*",
           "name": "comment.line.number-sign"
         }
       ]
     },
     {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "name": "meta.block.nginx",
       "patterns": [
         {
@@ -342,7 +342,7 @@
       }
     },
     {
-      "begin": "([\"'\\s]|^)(accept_)(mutex|mutex_delay)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(accept_)(mutex(?:|_delay))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -790,7 +790,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(tcp_)(nodelay|nopush)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(tcp_)(no(?:delay|push))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -818,7 +818,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(types_)(hash_bucket_size|hash_max_size)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(types_)(hash_(?:bucket_size|max_size))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -846,7 +846,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(variables_)(hash_bucket_size|hash_max_size)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(variables_)(hash_(?:bucket_size|max_size))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -958,7 +958,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(ancient_)(browser|browser_value)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(ancient_)(browser(?:|_value))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -986,7 +986,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(modern_)(browser|browser_value)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(modern_)(browser(?:|_value))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -1210,7 +1210,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(image_)(filter|filter_buffer|filter_interlace|filter_jpeg_quality|filter_sharpen|filter_transparency|filter_webp_quality)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(image_)(filter(?:|_buffer|_interlace|_jpeg_quality|_sharpen|_transparency|_webp_quality))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -1238,7 +1238,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(map_)(hash_bucket_size|hash_max_size)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(map_)(hash_(?:bucket_size|max_size))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -1378,7 +1378,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(real_)(ip_header|ip_recursive)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(real_)(ip_(?:header|recursive))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -1406,7 +1406,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(referer_)(hash_bucket_size|hash_max_size)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(referer_)(hash_(?:bucket_size|max_size))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -1462,7 +1462,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(secure_)(link|link_md5|link_secret)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(secure_)(link(?:|_md5|_secret))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -1490,7 +1490,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(session_)(log|log_format|log_zone)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(session_)(log(?:|_format|_zone))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -1546,7 +1546,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(sub_)(filter|filter_last_modified|filter_once|filter_types)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(sub_)(filter(?:|_last_modified|_once|_types))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -1574,7 +1574,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(health_)(check|check_timeout)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(health_)(check(?:|_timeout))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -1910,7 +1910,7 @@
       ]
     },
     {
-      "begin": "([\"'\\s]|^)(zone_)(sync_buffers|sync_connect_retry_interval|sync_connect_timeout|sync_interval|sync_recv_buffer_size|sync_server|sync_ssl|sync_ssl_certificate|sync_ssl_certificate_key|sync_ssl_ciphers|sync_ssl_conf_command|sync_ssl_crl|sync_ssl_name|sync_ssl_password_file|sync_ssl_protocols|sync_ssl_server_name|sync_ssl_trusted_certificate|sync_ssl_verify|sync_ssl_verify_depth|sync_timeout)([\"'\\s]|$)",
+      "begin": "([\"'\\s]|^)(zone_)(sync_(?:buffers|connect_retry_interval|connect_timeout|interval|recv_buffer_size|server|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_conf_command|ssl_crl|ssl_name|ssl_password_file|ssl_protocols|ssl_server_name|ssl_trusted_certificate|ssl_verify|ssl_verify_depth|timeout))([\"'\\s]|$)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.nginx"
@@ -2019,7 +2019,7 @@
       ]
     },
     {
-      "begin": "\\b([a-zA-Z0-9\\_]+)\\s+",
+      "begin": "\\b([a-zA-Z0-9_]+)\\s+",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.unknown.nginx"
@@ -2038,7 +2038,7 @@
       ]
     },
     {
-      "begin": "\\b([a-z]+\\/[A-Za-z0-9\\-\\.\\+]+)\\b",
+      "begin": "\\b([a-z]+/[A-Za-z0-9\\-.+]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "constant.other.mediatype.nginx"
@@ -2064,15 +2064,15 @@
           "include": "#variables"
         },
         {
-          "match": "\\!?\\~\\*?\\s",
+          "match": "!?~\\*?\\s",
           "name": "keyword.operator.nginx"
         },
         {
-          "match": "\\!?\\-[fdex]\\s",
+          "match": "!?-[fdex]\\s",
           "name": "keyword.operator.nginx"
         },
         {
-          "match": "\\!?=[^=]",
+          "match": "!?=[^=]",
           "name": "keyword.operator.nginx"
         },
         {
@@ -2130,7 +2130,7 @@
               "name": "constant.numeric.nginx"
             }
           },
-          "match": "(?:^|\\s)(weight|max_conn|max_fails|fail_timeout|slow_start)(=)(\\d[\\d\\.]*[bBkKmMgGtTsShHdD]?)(?:\\s|;|$)"
+          "match": "(?:^|\\s)(weight|max_conn|max_fails|fail_timeout|slow_start)(=)(\\d[\\d.]*[bBkKmMgGtTsShHdD]?)(?:[\\s;]|$)"
         },
         {
           "include": "#values"
@@ -2143,7 +2143,7 @@
           "include": "#variables"
         },
         {
-          "match": "\\#.*",
+          "match": "#.*",
           "name": "comment.line.number-sign"
         },
         {
@@ -2152,18 +2152,18 @@
               "name": "constant.numeric.nginx"
             }
           },
-          "match": "(?<=\\G|\\s)(=?[0-9][0-9\\.]*[bBkKmMgGtTsShHdD]?)(?=[\\t ;])"
+          "match": "(?<=\\G|\\s)(=?[0-9][0-9.]*[bBkKmMgGtTsShHdD]?)(?=[\\t ;])"
         },
         {
           "match": "(?<=\\G|\\s)(on|off|true|false)(?=[\\t ;])",
           "name": "constant.language.nginx"
         },
         {
-          "match": "(?<=\\G|\\s)(kqueue|rtsig|epoll|\\/dev\\/poll|select|poll|eventport|max|all|default_server|default|main|crit|error|debug|warn|notice|last)(?=[\\t ;])",
+          "match": "(?<=\\G|\\s)(kqueue|rtsig|epoll|/dev/poll|select|poll|eventport|max|all|default_server|default|main|crit|error|debug|warn|notice|last)(?=[\\t ;])",
           "name": "constant.language.nginx"
         },
         {
-          "match": "\\\\.*\\ |\\~\\*|\\~|\\!\\~\\*|\\!\\~",
+          "match": "\\\\.* |~\\*|~|!~\\*|!~",
           "name": "keyword.operator.nginx"
         },
         {
@@ -2182,7 +2182,7 @@
               "name": "variable.other.nginx"
             }
           },
-          "match": "(\\$)([A-Za-z0-9\\_]+)\\b"
+          "match": "(\\$)([A-Za-z0-9_]+)\\b"
         },
         {
           "captures": {
@@ -2196,7 +2196,7 @@
               "name": "punctuation.definition.variable.nginx"
             }
           },
-          "match": "(\\$\\{)([A-Za-z0-9\\_]+)(\\})"
+          "match": "(\\$\\{)([A-Za-z0-9_]+)(})"
         }
       ]
     }
diff --git a/resources/languages/nim.json b/resources/languages/nim.json
index a0b316c..87b3d28 100644
--- a/resources/languages/nim.json
+++ b/resources/languages/nim.json
@@ -8,7 +8,7 @@
     {
       "begin": "[ \\t]*##\\[",
       "contentName": "comment.block.doc-comment.content.nim",
-      "end": "\\]##",
+      "end": "]##",
       "name": "comment.block.doc-comment.nim",
       "patterns": [
         {
@@ -20,7 +20,7 @@
     {
       "begin": "[ \\t]*#\\[",
       "contentName": "comment.block.content.nim",
-      "end": "\\]#",
+      "end": "]#",
       "name": "comment.block.nim",
       "patterns": [
         {
@@ -72,11 +72,10 @@
       ]
     },
     {
-      "comment": "A nim procedure or method",
       "name": "meta.proc.nim",
       "patterns": [
         {
-          "begin": "\\b(proc|method|template|macro|iterator|converter|func)\\s+\\`?([^\\:\\{\\s\\`\\*\\(]*)\\`?(\\s*\\*)?\\s*(?=\\(|\\=|:|\\[|\\n|\\{)",
+          "begin": "\\b(proc|method|template|macro|iterator|converter|func)\\s+`?([^:{\\s`*(]*)`?(\\s*\\*)?\\s*(?=[(=:\\[\\n{])",
           "captures": {
             "1": {
               "name": "keyword.other"
@@ -99,7 +98,6 @@
     },
     {
       "begin": "discard \"\"\"",
-      "comment": "A discarded triple string literal comment",
       "end": "\"\"\"(?!\")",
       "name": "comment.line.discarded.nim"
     },
@@ -110,8 +108,7 @@
       "include": "#integer_literal"
     },
     {
-      "comment": "Operator as function name",
-      "match": "(?<=\\`)[^\\` ]+(?=\\`)",
+      "match": "(?<=`)[^` ]+(?=`)",
       "name": "entity.name.function.nim"
     },
     {
@@ -120,8 +117,7 @@
           "name": "keyword.control.export"
         }
       },
-      "comment": "Export qualifier.",
-      "match": "\\b\\s*(\\*)(?:\\s*(?=[,:])|\\s+(?=[=]))"
+      "match": "\\b\\s*(\\*)(?:\\s*(?=[,:])|\\s+(?==))"
     },
     {
       "captures": {
@@ -132,79 +128,64 @@
           "name": "keyword.control.export"
         }
       },
-      "comment": "Export qualifier following a type def.",
       "match": "\\b([A-Z]\\w+)(\\*)"
     },
     {
       "include": "#string_literal"
     },
     {
-      "comment": "Language Constants.",
       "match": "\\b(true|false|Inf|NegInf|NaN|nil)\\b",
       "name": "constant.language.nim"
     },
     {
-      "comment": "Keywords that affect program control flow or scope.",
       "match": "\\b(block|break|case|continue|do|elif|else|end|except|finally|for|if|raise|return|try|when|while|yield)\\b",
       "name": "keyword.control.nim"
     },
     {
-      "comment": "Keyword boolean operators for expressions.",
       "match": "(\\b(and|in|is|isnot|not|notin|or|xor)\\b)",
       "name": "keyword.boolean.nim"
     },
     {
-      "comment": "Generic operators for expressions.",
-      "match": "(=|\\+|-|\\*|/|<|>|@|\\$|~|&|%|!|\\?|\\^|\\.|:|\\\\)+",
+      "match": "([=+\\-*/<>@$~\\&%!?^.:\\\\])+",
       "name": "keyword.operator.nim"
     },
     {
-      "comment": "Other keywords.",
       "match": "(\\b(addr|as|asm|atomic|bind|cast|const|converter|concept|defer|discard|distinct|div|enum|export|from|import|include|let|mod|mixin|object|of|ptr|ref|shl|shr|static|type|using|var|tuple|iterator|macro|func|method|proc|template)\\b)",
       "name": "keyword.other.nim"
     },
     {
-      "comment": "Invalid and unused keywords.",
       "match": "(\\b(generic|interface|lambda|out|shared)\\b)",
       "name": "invalid.illegal.invalid-keyword.nim"
     },
     {
-      "comment": "Common functions",
       "match": "\\b(new|await|assert|echo|defined|declared|newException|countup|countdown|high|low)\\b",
       "name": "keyword.other.common.function.nim"
     },
     {
-      "comment": "Built-in, concrete types.",
       "match": "\\b(((uint|int)(8|16|32|64)?)|float(32|64)?|bool|string|auto|cstring|char|byte|tobject|typedesc|stmt|expr|any|untyped|typed)\\b",
       "name": "storage.type.concrete.nim"
     },
     {
-      "comment": "Built-in, generic types.",
       "match": "\\b(range|array|seq|set|pointer)\\b",
       "name": "storage.type.generic.nim"
     },
     {
-      "comment": "Special types.",
       "match": "\\b(openarray|varargs|void)\\b",
       "name": "storage.type.generic.nim"
     },
     {
-      "comment": "Other constants.",
       "match": "\\b[A-Z][A-Z0-9_]+\\b",
       "name": "support.constant.nim"
     },
     {
-      "comment": "Other types.",
       "match": "\\b[A-Z]\\w+\\b",
       "name": "support.type.nim"
     },
     {
-      "comment": "Function call.",
-      "match": "\\b\\w+\\b(?=(\\[([a-zA-Z0-9_,]|\\s)+\\])?\\()",
+      "match": "\\b\\w+\\b(?=(\\[([a-zA-Z0-9_,\\s])+])?\\()",
       "name": "support.function.any-method.nim"
     },
     {
-      "comment": "Function call (no parenthesis).",
       "match": "(?!(openarray|varargs|void|range|array|seq|set|pointer|new|await|assert|echo|defined|declared|newException|countup|countdown|high|low|((uint|int)(8|16|32|64)?)|float(32|64)?|bool|string|auto|cstring|char|byte|tobject|typedesc|stmt|expr|any|untyped|typed|addr|as|asm|atomic|bind|cast|const|converter|concept|defer|discard|distinct|div|enum|export|from|import|include|let|mod|mixin|object|of|ptr|ref|shl|shr|static|type|using|var|tuple|iterator|macro|func|method|proc|template|and|in|is|isnot|not|notin|or|xor|proc|method|template|macro|iterator|converter|func|true|false|Inf|NegInf|NaN|nil|block|break|case|continue|do|elif|else|end|except|finally|for|if|raise|return|try|when|while|yield)\\b)\\w+\\s+(?!(and|in|is|isnot|not|notin|or|xor|[^a-zA-Z0-9_\"'`(-+]+)\\b)(?=[a-zA-Z0-9_\"'`(-+])",
       "name": "support.function.any-method.nim"
     },
@@ -233,7 +214,7 @@
             }
           },
           "contentName": "source.c",
-          "end": "(\")\"\"(?!\")(\\.{0,1}\\})?",
+          "end": "(\")\"\"(?!\")(\\.?})?",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.nim"
@@ -245,8 +226,8 @@
           "name": "meta.embedded.block.c",
           "patterns": [
             {
-              "begin": "\\`",
-              "end": "\\`",
+              "begin": "`",
+              "end": "`",
               "name": "keyword.operator.nim"
             },
             {
@@ -263,7 +244,7 @@
           "name": "punctuation.pragma.start.nim"
         }
       },
-      "end": "\\.?\\}",
+      "end": "\\.?}",
       "endCaptures": {
         "0": {
           "name": "punctuation.pragma.end.nim"
@@ -271,13 +252,13 @@
       },
       "patterns": [
         {
-          "begin": "\\b([[:alpha:]]\\w*)(?:\\s|\\s*:)",
+          "begin": "\\b(\\p{alpha}\\w*)(?:\\s|\\s*:)",
           "beginCaptures": {
             "1": {
               "name": "meta.preprocessor.pragma.nim"
             }
           },
-          "end": "(?=\\.?\\}|,)",
+          "end": "(?=\\.?}|,)",
           "patterns": [
             {
               "include": "source.nim"
@@ -285,7 +266,7 @@
           ]
         },
         {
-          "begin": "\\b([[:alpha:]]\\w*)\\(",
+          "begin": "\\b(\\p{alpha}\\w*)\\(",
           "beginCaptures": {
             "1": {
               "name": "meta.preprocessor.pragma.nim"
@@ -304,10 +285,10 @@
               "name": "meta.preprocessor.pragma.nim"
             }
           },
-          "match": "\\b([[:alpha:]]\\w*)(?=\\.?\\}|,)"
+          "match": "\\b(\\p{alpha}\\w*)(?=\\.?}|,)"
         },
         {
-          "begin": "\\b([[:alpha:]]\\w*)(\"\"\")",
+          "begin": "\\b(\\p{alpha}\\w*)(\"\"\")",
           "beginCaptures": {
             "1": {
               "name": "meta.preprocessor.pragma.nim"
@@ -325,7 +306,7 @@
           "name": "string.quoted.triple.raw.nim"
         },
         {
-          "begin": "\\b([[:alpha:]]\\w*)(\")",
+          "begin": "\\b(\\p{alpha}\\w*)(\")",
           "beginCaptures": {
             "1": {
               "name": "meta.preprocessor.pragma.nim"
@@ -343,13 +324,13 @@
           "name": "string.quoted.double.raw.nim"
         },
         {
-          "begin": "\\b(hint\\[\\w+\\]):",
+          "begin": "\\b(hint\\[\\w+]):",
           "beginCaptures": {
             "1": {
               "name": "meta.preprocessor.pragma.nim"
             }
           },
-          "end": "(?=\\.?\\}|,)",
+          "end": "(?=\\.?}|,)",
           "patterns": [
             {
               "include": "source.nim"
@@ -399,8 +380,8 @@
           "name": "meta.embedded.block.asm",
           "patterns": [
             {
-              "begin": "\\`",
-              "end": "\\`",
+              "begin": "`",
+              "end": "`",
               "name": "keyword.operator.nim"
             },
             {
@@ -419,7 +400,6 @@
           "name": "keyword.operator.nim"
         }
       },
-      "comment": "tmpl specifier",
       "match": "(tmpl(i)?)(?=( (html|xml|js|css|glsl|md))?\"\"\")"
     },
     {
@@ -482,7 +462,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.nim"
@@ -499,7 +479,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "(\\{|\\n)",
+              "end": "([{\\n])",
               "endCaptures": {
                 "1": {
                   "name": "plain"
@@ -582,7 +562,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.nim"
@@ -599,7 +579,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "(\\{|\\n)",
+              "end": "([{\\n])",
               "endCaptures": {
                 "1": {
                   "name": "plain"
@@ -682,7 +662,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.nim"
@@ -699,7 +679,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "(\\{|\\n)",
+              "end": "([{\\n])",
               "endCaptures": {
                 "1": {
                   "name": "plain"
@@ -782,7 +762,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.nim"
@@ -799,7 +779,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "(\\{|\\n)",
+              "end": "([{\\n])",
               "endCaptures": {
                 "1": {
                   "name": "plain"
@@ -882,7 +862,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.nim"
@@ -899,7 +879,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "(\\{|\\n)",
+              "end": "([{\\n])",
               "endCaptures": {
                 "1": {
                   "name": "plain"
@@ -982,7 +962,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.nim"
@@ -999,7 +979,7 @@
                   "name": "keyword.operator.nim"
                 }
               },
-              "end": "(\\{|\\n)",
+              "end": "([{\\n])",
               "endCaptures": {
                 "1": {
                   "name": "plain"
@@ -1027,11 +1007,11 @@
     "char_escapes": {
       "patterns": [
         {
-          "match": "\\\\[cC]|\\\\[rR]",
+          "match": "\\\\[cCrR]",
           "name": "constant.character.escape.carriagereturn.nim"
         },
         {
-          "match": "\\\\[lL]|\\\\[nN]",
+          "match": "\\\\[lLnN]",
           "name": "constant.character.escape.linefeed.nim"
         },
         {
@@ -1047,7 +1027,7 @@
           "name": "constant.character.escape.verticaltabulator.nim"
         },
         {
-          "match": "\\\\\\\"",
+          "match": "\\\\\"",
           "name": "constant.character.escape.double-quote.nim"
         },
         {
@@ -1124,7 +1104,7 @@
     "float_literal": {
       "patterns": [
         {
-          "match": "\\b\\d[_\\d]*((\\.\\d[_\\d]*([eE][\\+\\-]?\\d[_\\d]*)?)|([eE][\\+\\-]?\\d[_\\d]*))('([fF](32|64|128)|[fFdD]))?",
+          "match": "\\b\\d[_\\d]*((\\.\\d[_\\d]*([eE][+-]?\\d[_\\d]*)?)|([eE][+-]?\\d[_\\d]*))('([fF](32|64|128)|[fFdD]))?",
           "name": "constant.numeric.float.decimal.nim"
         },
         {
@@ -1136,7 +1116,7 @@
           "name": "constant.numeric.float.octal.nim"
         },
         {
-          "match": "\\b0(b|B)[01][_01]*'([fF](32|64|128)|[fFdD])",
+          "match": "\\b0([bB])[01][_01]*'([fF](32|64|128)|[fFdD])",
           "name": "constant.numeric.float.binary.nim"
         },
         {
@@ -1152,7 +1132,7 @@
           "name": "punctuation.definition.template-expression.begin.nim"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.nim"
@@ -1162,7 +1142,7 @@
       "patterns": [
         {
           "begin": ":",
-          "end": "(?=\\})",
+          "end": "(?=})",
           "name": "meta.template.format-specifier.nim"
         },
         {
@@ -1325,7 +1305,7 @@
           "name": "constant.numeric.integer.octal.nim"
         },
         {
-          "match": "\\b(0(b|B)[01][_01]*)('(([iIuU](8|16|32|64))|[uU]))?",
+          "match": "\\b(0([bB])[01][_01]*)('(([iIuU](8|16|32|64))|[uU]))?",
           "name": "constant.numeric.integer.binary.nim"
         },
         {
@@ -1336,7 +1316,7 @@
     },
     "multilinecomment": {
       "begin": "#\\[",
-      "end": "\\]#",
+      "end": "]#",
       "patterns": [
         {
           "include": "#multilinecomment"
@@ -1345,7 +1325,7 @@
     },
     "multilinedoccomment": {
       "begin": "##\\[",
-      "end": "\\]##",
+      "end": "]##",
       "patterns": [
         {
           "include": "#multilinedoccomment"
@@ -1371,7 +1351,7 @@
           "name": "constant.character.escape.hex.nim"
         },
         {
-          "match": "\\\\[uU]\\{\\h+\\}",
+          "match": "\\\\[uU]\\{\\h+}",
           "name": "constant.character.escape.hex.nim"
         },
         {
@@ -1426,7 +1406,6 @@
           "name": "punctuation.definition.string.begin.nim"
         }
       },
-      "comment": "Double Quoted String",
       "end": "\"",
       "endCaptures": {
         "0": {
@@ -1467,7 +1446,6 @@
           "name": "punctuation.definition.string.begin.nim"
         }
       },
-      "comment": "Single quoted character literal",
       "end": "'",
       "endCaptures": {
         "0": {
@@ -1492,7 +1470,6 @@
           "name": "punctuation.definition.string.begin.nim"
         }
       },
-      "comment": "Triple Quoted String",
       "end": "\"\"\"(?!\")",
       "endCaptures": {
         "0": {
@@ -1508,7 +1485,6 @@
           "name": "punctuation.definition.string.begin.nim"
         }
       },
-      "comment": "Raw Triple Quoted String",
       "end": "\"\"\"",
       "endCaptures": {
         "0": {
diff --git a/resources/languages/nix.json b/resources/languages/nix.json
index 283e7b4..88302a7 100644
--- a/resources/languages/nix.json
+++ b/resources/languages/nix.json
@@ -21,13 +21,13 @@
       ]
     },
     "attribute-bind-from-equals": {
-      "begin": "\\=",
+      "begin": "=",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.bind.nix"
         }
       },
-      "end": "\\;",
+      "end": ";",
       "endCaptures": {
         "0": {
           "name": "punctuation.terminator.bind.nix"
@@ -46,7 +46,7 @@
           "name": "keyword.other.inherit.nix"
         }
       },
-      "end": "\\;",
+      "end": ";",
       "endCaptures": {
         "0": {
           "name": "punctuation.terminator.inherit.nix"
@@ -60,7 +60,7 @@
               "name": "punctuation.section.function.arguments.nix"
             }
           },
-          "end": "(?=\\;)",
+          "end": "(?=;)",
           "patterns": [
             {
               "begin": "\\)",
@@ -69,7 +69,7 @@
                   "name": "punctuation.section.function.arguments.nix"
                 }
               },
-              "end": "(?=\\;)",
+              "end": "(?=;)",
               "patterns": [
                 {
                   "include": "#bad-reserved"
@@ -88,8 +88,8 @@
           ]
         },
         {
-          "begin": "(?=[a-zA-Z\\_])",
-          "end": "(?=\\;)",
+          "begin": "(?=[a-zA-Z_])",
+          "end": "(?=;)",
           "patterns": [
             {
               "include": "#bad-reserved"
@@ -110,7 +110,7 @@
     "attribute-name": {
       "patterns": [
         {
-          "match": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
+          "match": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
           "name": "entity.other.attribute-name.multipart.nix"
         },
         {
@@ -125,7 +125,7 @@
       ]
     },
     "attribute-name-single": {
-      "match": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
+      "match": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
       "name": "entity.other.attribute-name.single.nix"
     },
     "attrset-contents": {
@@ -155,7 +155,7 @@
               "name": "punctuation.definition.attrset.nix"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.attrset.nix"
@@ -168,7 +168,7 @@
           ]
         },
         {
-          "begin": "(?<=\\})",
+          "begin": "(?<=})",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -181,7 +181,7 @@
     "attrset-definition-brace-opened": {
       "patterns": [
         {
-          "begin": "(?<=\\})",
+          "begin": "(?<=})",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -191,7 +191,7 @@
         },
         {
           "begin": "(?=.?)",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.attrset.nix"
@@ -234,7 +234,7 @@
           ]
         },
         {
-          "begin": "(?=\\{\\s*(\\}|[^,?]*(=|;)))",
+          "begin": "(?=\\{\\s*(}|[^,?]*([=;])))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -257,7 +257,7 @@
       "end": "(?=([\\])};]|\\b(else|then)\\b))",
       "patterns": [
         {
-          "begin": "(?=(\\s*\\}|\\\"|\\binherit\\b|\\$\\{|\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*(\\s*\\.|\\s*=[^=])))",
+          "begin": "(?=(\\s*}|\"|\\binherit\\b|\\$\\{|\\b[a-zA-Z_][a-zA-Z0-9_'-]*(\\s*\\.|\\s*=[^=])))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -266,7 +266,7 @@
           ]
         },
         {
-          "begin": "(?=(\\.\\.\\.|\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*\\s*[,?]))",
+          "begin": "(?=(\\.\\.\\.|\\b[a-zA-Z_][a-zA-Z0-9_'-]*\\s*[,?]))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -278,7 +278,7 @@
           "include": "#bad-reserved"
         },
         {
-          "begin": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
+          "begin": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
           "beginCaptures": {
             "0": {
               "name": "variable.parameter.function.maybe.nix"
@@ -296,7 +296,7 @@
               ]
             },
             {
-              "begin": "\\s*(\\,)",
+              "begin": "\\s*(,)",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.operator.nix"
@@ -310,7 +310,7 @@
               ]
             },
             {
-              "begin": "(?=\\=)",
+              "begin": "(?==)",
               "end": "(?=([\\])};,]|\\b(else|then)\\b))",
               "patterns": [
                 {
@@ -329,7 +329,7 @@
                   "include": "#function-parameter-default"
                 },
                 {
-                  "begin": "\\,",
+                  "begin": ",",
                   "beginCaptures": {
                     "0": {
                       "name": "keyword.operator.nix"
@@ -361,8 +361,8 @@
     "comment": {
       "patterns": [
         {
-          "begin": "/\\*([^*]|\\*[^\\/])*",
-          "end": "\\*\\/",
+          "begin": "/\\*([^*]|\\*[^/])*",
+          "end": "\\*/",
           "name": "comment.block.nix",
           "patterns": [
             {
@@ -371,7 +371,7 @@
           ]
         },
         {
-          "begin": "\\#",
+          "begin": "#",
           "end": "$",
           "name": "comment.line.number-sign.nix",
           "patterns": [
@@ -388,7 +388,7 @@
           "name": "markup.bold.comment.nix"
         }
       },
-      "match": "(TODO|FIXME|BUG|\\!\\!\\!):?"
+      "match": "(TODO|FIXME|BUG|!!!):?"
     },
     "constants": {
       "patterns": [
@@ -511,7 +511,7 @@
           "include": "#attrset-or-function"
         },
         {
-          "match": "(\\bor\\b|\\.|==|!=|!|\\<\\=|\\<|\\>\\=|\\>|&&|\\|\\||-\\>|//|\\?|\\+\\+|-|\\*|/(?=([^*]|$))|\\+)",
+          "match": "(\\bor\\b|\\.|\\|>|<\\||==|!=|!|<=|<|>=|>|&&|\\|\\||->|//|\\?|\\+\\+|[-*]|/(?=([^*]|$))|\\+)",
           "name": "keyword.operator.nix"
         },
         {
@@ -529,7 +529,7 @@
       ]
     },
     "function-body": {
-      "begin": "(@\\s*([a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*)\\s*)?(\\:)",
+      "begin": "(@\\s*([a-zA-Z_][a-zA-Z0-9_'-]*)\\s*)?(:)",
       "end": "(?=([\\])};,]|\\b(else|then)\\b))",
       "patterns": [
         {
@@ -538,7 +538,7 @@
       ]
     },
     "function-body-from-colon": {
-      "begin": "(\\:)",
+      "begin": "(:)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.function.nix"
@@ -573,20 +573,20 @@
         },
         {
           "begin": "(?=.?)",
-          "end": "(?=\\:)",
+          "end": "(?=:)",
           "patterns": [
             {
-              "begin": "(\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*)",
+              "begin": "(\\b[a-zA-Z_][a-zA-Z0-9_'-]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.parameter.function.4.nix"
                 }
               },
-              "end": "(?=\\:)",
+              "end": "(?=:)",
               "patterns": [
                 {
-                  "begin": "\\@",
-                  "end": "(?=\\:)",
+                  "begin": "@",
+                  "end": "(?=:)",
                   "patterns": [
                     {
                       "include": "#function-header-until-colon-no-arg"
@@ -603,7 +603,7 @@
             },
             {
               "begin": "(?=\\{)",
-              "end": "(?=\\:)",
+              "end": "(?=:)",
               "patterns": [
                 {
                   "include": "#function-header-until-colon-with-arg"
@@ -626,14 +626,14 @@
         },
         {
           "begin": "(?=.?)",
-          "end": "(?=\\:)",
+          "end": "(?=:)",
           "patterns": [
             {
               "include": "#function-header-close-brace-with-arg"
             },
             {
               "begin": "(?=.?)",
-              "end": "(?=\\})",
+              "end": "(?=})",
               "patterns": [
                 {
                   "include": "#function-contents"
@@ -650,7 +650,7 @@
     "function-for-sure": {
       "patterns": [
         {
-          "begin": "(?=(\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*\\s*[:@]|\\{[^}]*\\}\\s*:|\\{[^#}\"'/=]*[,\\?]))",
+          "begin": "(?=(\\b[a-zA-Z_][a-zA-Z0-9_'-]*\\s*[:@]|\\{[^}]*}\\s*:|\\{[^#}\"'/=]*[,?]))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -661,13 +661,13 @@
       ]
     },
     "function-header-close-brace-no-arg": {
-      "begin": "\\}",
+      "begin": "}",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.entity.function.nix"
         }
       },
-      "end": "(?=\\:)",
+      "end": "(?=:)",
       "patterns": [
         {
           "include": "#others"
@@ -675,13 +675,13 @@
       ]
     },
     "function-header-close-brace-with-arg": {
-      "begin": "\\}",
+      "begin": "}",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.entity.function.nix"
         }
       },
-      "end": "(?=\\:)",
+      "end": "(?=:)",
       "patterns": [
         {
           "include": "#function-header-terminal-arg"
@@ -698,7 +698,7 @@
           "name": "punctuation.definition.entity.function.2.nix"
         }
       },
-      "end": "(?=\\})",
+      "end": "(?=})",
       "patterns": [
         {
           "include": "#function-contents"
@@ -707,15 +707,15 @@
     },
     "function-header-terminal-arg": {
       "begin": "(?=@)",
-      "end": "(?=\\:)",
+      "end": "(?=:)",
       "patterns": [
         {
-          "begin": "\\@",
-          "end": "(?=\\:)",
+          "begin": "@",
+          "end": "(?=:)",
           "patterns": [
             {
-              "begin": "(\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*)",
-              "end": "(?=\\:)",
+              "begin": "(\\b[a-zA-Z_][a-zA-Z0-9_'-]*)",
+              "end": "(?=:)",
               "name": "variable.parameter.function.3.nix"
             },
             {
@@ -730,7 +730,7 @@
     },
     "function-header-until-colon-no-arg": {
       "begin": "(?=\\{)",
-      "end": "(?=\\:)",
+      "end": "(?=:)",
       "patterns": [
         {
           "include": "#function-header-open-brace"
@@ -742,7 +742,7 @@
     },
     "function-header-until-colon-with-arg": {
       "begin": "(?=\\{)",
-      "end": "(?=\\:)",
+      "end": "(?=:)",
       "patterns": [
         {
           "include": "#function-header-open-brace"
@@ -756,7 +756,7 @@
       "patterns": [
         {
           "begin": "(\\.\\.\\.)",
-          "end": "(,|(?=\\}))",
+          "end": "(,|(?=}))",
           "name": "keyword.operator.nix",
           "patterns": [
             {
@@ -765,13 +765,13 @@
           ]
         },
         {
-          "begin": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
+          "begin": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
           "beginCaptures": {
             "0": {
               "name": "variable.parameter.function.1.nix"
             }
           },
-          "end": "(,|(?=\\}))",
+          "end": "(,|(?=}))",
           "endCaptures": {
             "0": {
               "name": "keyword.operator.nix"
@@ -885,7 +885,7 @@
           "name": "punctuation.section.embedded.begin.nix"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.embedded.end.nix"
@@ -917,7 +917,7 @@
               "patterns": [
                 {
                   "begin": "\\{",
-                  "end": "\\}",
+                  "end": "}",
                   "patterns": [
                     {
                       "include": "#attrset-contents"
@@ -925,7 +925,7 @@
                   ]
                 },
                 {
-                  "begin": "(^|(?<=\\}))",
+                  "begin": "(^|(?<=}))",
                   "end": "(?=([\\])};,]|\\b(else|then)\\b))",
                   "patterns": [
                     {
@@ -969,7 +969,7 @@
           "name": "punctuation.definition.list.nix"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.list.nix"
@@ -994,7 +994,7 @@
       ]
     },
     "operator-unary": {
-      "match": "(!|-)",
+      "match": "([!-])",
       "name": "keyword.operator.unary.nix"
     },
     "others": {
@@ -1016,10 +1016,10 @@
           "name": "variable.parameter.name.nix"
         }
       },
-      "match": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*"
+      "match": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*"
     },
     "parameter-name-and-cont": {
-      "begin": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
+      "begin": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
       "beginCaptures": {
         "0": {
           "name": "variable.parameter.name.nix"
@@ -1066,17 +1066,17 @@
     "string": {
       "patterns": [
         {
-          "begin": "(?=\\'\\')",
+          "begin": "(?='')",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
-              "begin": "\\'\\'",
+              "begin": "''",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.other.start.nix"
                 }
               },
-              "end": "\\'\\'(?!\\$|\\'|\\\\.)",
+              "end": "''(?![$']|\\\\.)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.other.end.nix"
@@ -1085,7 +1085,7 @@
               "name": "string.quoted.other.nix",
               "patterns": [
                 {
-                  "match": "\\'\\'(\\$|\\'|\\\\.)",
+                  "match": "''([$']|\\\\.)",
                   "name": "constant.character.escape.nix"
                 },
                 {
@@ -1099,7 +1099,7 @@
           ]
         },
         {
-          "begin": "(?=\\\")",
+          "begin": "(?=\")",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -1111,7 +1111,7 @@
           ]
         },
         {
-          "begin": "(~?[a-zA-Z0-9\\.\\_\\-\\+]*(\\/[a-zA-Z0-9\\.\\_\\-\\+]+)+)",
+          "begin": "(~?[a-zA-Z0-9._\\-+]*(/[a-zA-Z0-9._\\-+]+)+)",
           "beginCaptures": {
             "0": {
               "name": "string.unquoted.path.nix"
@@ -1125,7 +1125,7 @@
           ]
         },
         {
-          "begin": "(\\<[a-zA-Z0-9\\.\\_\\-\\+]+(\\/[a-zA-Z0-9\\.\\_\\-\\+]+)*\\>)",
+          "begin": "(<[a-zA-Z0-9._\\-+]+(/[a-zA-Z0-9._\\-+]+)*>)",
           "beginCaptures": {
             "0": {
               "name": "string.unquoted.spath.nix"
@@ -1139,7 +1139,7 @@
           ]
         },
         {
-          "begin": "([a-zA-Z][a-zA-Z0-9\\+\\-\\.]*\\:[a-zA-Z0-9\\%\\/\\?\\:\\@\\&\\=\\+\\$\\,\\-\\_\\.\\!\\~\\*\\']+)",
+          "begin": "([a-zA-Z][a-zA-Z0-9+\\-.]*:[a-zA-Z0-9%/?:@\\&=+$,\\-_.!~*']+)",
           "beginCaptures": {
             "0": {
               "name": "string.unquoted.url.nix"
@@ -1155,13 +1155,13 @@
       ]
     },
     "string-quoted": {
-      "begin": "\\\"",
+      "begin": "\"",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.double.start.nix"
         }
       },
-      "end": "\\\"",
+      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.double.end.nix"
@@ -1188,7 +1188,7 @@
           "name": "keyword.other.nix"
         }
       },
-      "end": "\\;",
+      "end": ";",
       "patterns": [
         {
           "include": "#expression"
diff --git a/resources/languages/nushell.json b/resources/languages/nushell.json
index 7df7383..f24dc73 100644
--- a/resources/languages/nushell.json
+++ b/resources/languages/nushell.json
@@ -38,7 +38,7 @@
           "name": "meta.brace.square.begin.nushell"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.begin.nushell"
@@ -47,7 +47,7 @@
       "name": "constant.binary.nushell",
       "patterns": [
         {
-          "match": "[0-9a-fA-F]{2}",
+          "match": "\\h{2}",
           "name": "constant.numeric.nushell"
         }
       ]
@@ -59,7 +59,7 @@
           "name": "punctuation.section.block.begin.bracket.curly.nushell"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.block.end.bracket.curly.nushell"
@@ -161,7 +161,7 @@
       ]
     },
     "command": {
-      "begin": "(?<!\\w)(?:(\\^)|(?![0-9]|\\$))([\\w.!]+(?:(?: (?!-)[\\w\\-.!]+(?:(?= |\\))|$)|[\\w\\-.!]+))*|(?<=\\^)\\$?(?:\"[^\"]+\"|'[^']+'))",
+      "begin": "(?<!\\w)(?:(\\^)|(?![0-9$]))([\\w.!]+(?: (?!-)[\\w\\-.!]+(?:(?=[ )])|$)|[\\w\\-.!]+)*|(?<=\\^)\\$?(?:\"[^\"]+\"|'[^']+'))",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.nushell"
@@ -192,8 +192,7 @@
                   ]
                 }
               },
-              "comment": "Regex generated with list-to-tree (https://github.com/glcraft/list-to-tree)",
-              "match": "(a(?:l(?:ias|l)|n(?:si(?: (?:gradient|link|strip))?|y)|ppend|st)|b(?:g|its(?: (?:and|not|or|ro(?:l|r)|sh(?:l|r)|xor))?|reak|ytes(?: (?:a(?:dd|t)|build|collect|ends-with|index-of|length|re(?:move|place|verse)|starts-with))?)|c(?:al|d|h(?:ar|unks)|lear|o(?:l(?:lect|umns)|m(?:mandline(?: (?:edit|get-cursor|set-cursor))?|p(?:act|lete))|n(?:fig(?: (?:env|nu|reset))?|st|tinue))|p)|d(?:ate(?: (?:format|humanize|list-timezone|now|to-(?:record|t(?:able|imezone))))?|e(?:bug(?: (?:info|profile))?|code(?: (?:base(?:32(?:hex)?|64)|hex|new-base64))?|f(?:ault)?|scribe|tect columns)|o|rop(?: (?:column|nth))?|t(?: (?:add|diff|format|now|part|to|utcnow))?|u)|e(?:ach(?: while)?|cho|moji|n(?:code(?: (?:base(?:32(?:hex)?|64)|hex|new-base64))?|umerate)|rror make|very|x(?:ec|it|p(?:l(?:ain|ore)|ort(?: (?:alias|const|def|extern|module|use)|-env)?)|tern))|f(?:i(?:l(?:e|l|ter)|nd|rst)|latten|mt|or(?:mat(?: (?:d(?:ate|uration)|filesize|pattern))?)?|rom(?: (?:csv|eml|i(?:cs|ni)|json|msgpack(?:z)?|nuon|ods|p(?:arquet|list)|ssv|t(?:oml|sv)|url|vcf|x(?:lsx|ml)|y(?:aml|ml)))?)|g(?:e(?:nerate|t)|lob|r(?:id|oup(?:-by)?)|stat)|h(?:ash(?: (?:md5|sha256))?|e(?:aders|lp(?: (?:aliases|commands|e(?:scapes|xterns)|modules|operators))?)|i(?:de(?:-env)?|sto(?:gram|ry(?: session)?))|ttp(?: (?:delete|get|head|options|p(?:atch|ost|ut)))?)|i(?:f|gnore|n(?:c|put(?: list(?:en)?)?|s(?:ert|pect)|t(?:erleave|o(?: (?:b(?:i(?:nary|ts)|ool)|cell-path|d(?:atetime|uration)|f(?:ilesize|loat)|glob|int|record|s(?:qlite|tring)|value))?))|s-(?:admin|empty|not-empty|terminal)|tems)|j(?:oin|son path|walk)|k(?:eybindings(?: (?:default|list(?:en)?))?|ill)|l(?:ast|e(?:ngth|t(?:-env)?)|ines|o(?:ad-env|op)|s)|m(?:at(?:ch|h(?: (?:a(?:bs|rc(?:cos(?:h)?|sin(?:h)?|tan(?:h)?)|vg)|c(?:eil|os(?:h)?)|exp|floor|l(?:n|og)|m(?:ax|edian|in|ode)|product|round|s(?:in(?:h)?|qrt|tddev|um)|tan(?:h)?|variance))?)|d|e(?:rge|tadata(?: (?:access|set))?)|k(?:dir|temp)|o(?:dule|ve)|ut|v)|nu-(?:check|highlight)|o(?:pen|verlay(?: (?:hide|list|new|use))?)|p(?:a(?:nic|r(?:-each|se)|th(?: (?:basename|dirname|ex(?:ists|pand)|join|parse|relative-to|split|type))?)|lugin(?: (?:add|list|rm|stop|use))?|net|o(?:lars(?: (?:a(?:gg(?:-groups)?|ll-(?:false|true)|ppend|rg-(?:m(?:ax|in)|sort|true|unique|where)|s(?:-date(?:time)?)?)|c(?:a(?:che|st)|o(?:l(?:lect|umns)?|n(?:cat(?:-str)?|tains)|unt(?:-null)?)|umulative)|d(?:atepart|ecimal|rop(?:-(?:duplicates|nulls))?|ummies)|exp(?:lode|r-not)|f(?:etch|i(?:l(?:l-n(?:an|ull)|ter(?:-with)?)|rst)|latten)|g(?:et(?:-(?:day|hour|m(?:inute|onth)|nanosecond|ordinal|second|week(?:day)?|year))?|roup-by)|i(?:mplode|nt(?:eger|o-(?:df|lazy|nu))|s-(?:duplicated|in|n(?:ot-null|ull)|unique))|join|l(?:ast|it|owercase)|m(?:ax|e(?:an|dian)|in)|n(?:-unique|ot)|o(?:pen|therwise)|p(?:ivot|rofile)|qu(?:antile|ery)|r(?:e(?:name|place(?:-all)?|verse)|olling)|s(?:a(?:mple|ve)|chema|e(?:lect|t(?:-with-idx)?)|h(?:ape|ift)|lice|ort-by|t(?:d|ore-(?:get|ls|rm)|r(?:-(?:join|lengths|slice)|ftime))|um(?:mary)?)|take|u(?:n(?:ique|pivot)|ppercase)|va(?:lue-counts|r)|w(?:hen|ith-column)))?|rt)|r(?:epend|int)|s)|query(?: (?:db|git|json|web(?:page-info)?|xml))?|r(?:an(?:dom(?: (?:b(?:inary|ool)|chars|dice|float|int|uuid))?|ge)|e(?:duce|g(?:ex|istry query)|ject|name|turn|verse)|m|o(?:ll(?: (?:down|left|right|up))?|tate)|un-external)|s(?:ave|c(?:hema|ope(?: (?:aliases|commands|e(?:ngine-stats|xterns)|modules|variables))?)|e(?:lect|q(?: (?:char|date))?)|huffle|kip(?: (?:until|while))?|leep|o(?:rt(?:-by)?|urce(?:-env)?)|plit(?: (?:c(?:ell-path|hars|olumn)|list|row|words)|-by)?|t(?:art|or(?: (?:create|delete|export|i(?:mport|nsert)|open|reset|update))?|r(?: (?:c(?:a(?:mel-case|pitalize)|ontains)|d(?:istance|owncase)|e(?:nds-with|xpand)|index-of|join|kebab-case|length|pascal-case|re(?:place|verse)|s(?:creaming-snake-case|imilarity|nake-case|ta(?:rts-with|ts)|ubstring)|t(?:itle-case|rim)|upcase)|ess_internals)?)|ys(?: (?:cpu|disks|host|mem|net|temp|users))?)|t(?:a(?:ble|ke(?: (?:until|while))?)|e(?:e|rm size)|imeit|o(?: (?:csv|html|json|m(?:d|sgpack(?:z)?)|nuon|p(?:arquet|list)|t(?:ext|oml|sv)|xml|yaml)|uch)?|r(?:anspose|y)|utor)|u(?:limit|n(?:ame|iq(?:-by)?)|p(?:date(?: cells)?|sert)|rl(?: (?:build-query|decode|encode|join|parse))?|se)|v(?:alues|ersion|iew(?: (?:files|ir|s(?:ource|pan)))?)|w(?:atch|h(?:ere|i(?:ch|le)|oami)|i(?:ndow|th-env)|rap)|zip)(?![\\w-])( (.*))?"
+              "match": "(a(?:l(?:ias|l)|n(?:si(?: (?:gradient|link|strip))?|y)|ppend|st)|b(?:g|its(?: (?:and|not|or|ro[lr]|sh[lr]|xor))?|reak|ytes(?: (?:a(?:dd|t)|build|collect|ends-with|index-of|length|re(?:move|place|verse)|starts-with))?)|c(?:al|d|h(?:ar|unks)|lear|o(?:l(?:lect|umns)|m(?:mandline(?: (?:edit|get-cursor|set-cursor))?|p(?:act|lete))|n(?:fig(?: (?:env|nu|reset))?|st|tinue))|p)|d(?:ate(?: (?:format|humanize|list-timezone|now|to-(?:record|t(?:able|imezone))))?|e(?:bug(?: (?:info|profile))?|code(?: (?:base(?:32(?:hex)?|64)|hex|new-base64))?|f(?:ault)?|scribe|tect columns)|o|rop(?: (?:column|nth))?|t(?: (?:add|diff|format|now|part|to|utcnow))?|u)|e(?:ach(?: while)?|cho|moji|n(?:code(?: (?:base(?:32(?:hex)?|64)|hex|new-base64))?|umerate)|rror make|very|x(?:ec|it|p(?:l(?:ain|ore)|ort(?: (?:alias|const|def|extern|module|use)|-env)?)|tern))|f(?:i(?:l(?:[el]|ter)|nd|rst)|latten|mt|or(?:mat(?: (?:d(?:ate|uration)|filesize|pattern))?)?|rom(?: (?:csv|eml|i(?:cs|ni)|json|msgpackz?|nuon|ods|p(?:arquet|list)|ssv|t(?:oml|sv)|url|vcf|x(?:lsx|ml)|y(?:aml|ml)))?)|g(?:e(?:nerate|t)|lob|r(?:id|oup(?:-by)?)|stat)|h(?:ash(?: (?:md5|sha256))?|e(?:aders|lp(?: (?:aliases|commands|e(?:scapes|xterns)|modules|operators))?)|i(?:de(?:-env)?|sto(?:gram|ry(?: session)?))|ttp(?: (?:delete|get|head|options|p(?:atch|ost|ut)))?)|i(?:f|gnore|n(?:c|put(?: list(?:en)?)?|s(?:ert|pect)|t(?:erleave|o(?: (?:b(?:i(?:nary|ts)|ool)|cell-path|d(?:atetime|uration)|f(?:ilesize|loat)|glob|int|record|s(?:qlite|tring)|value))?))|s-(?:admin|empty|not-empty|terminal)|tems)|j(?:oin|son path|walk)|k(?:eybindings(?: (?:default|list(?:en)?))?|ill)|l(?:ast|e(?:ngth|t(?:-env)?)|ines|o(?:ad-env|op)|s)|m(?:at(?:ch|h(?: (?:a(?:bs|rc(?:cosh?|sinh?|tanh?)|vg)|c(?:eil|osh?)|exp|floor|l(?:n|og)|m(?:ax|edian|in|ode)|product|round|s(?:inh?|qrt|tddev|um)|tanh?|variance))?)|d|e(?:rge|tadata(?: (?:access|set))?)|k(?:dir|temp)|o(?:dule|ve)|ut|v)|nu-(?:check|highlight)|o(?:pen|verlay(?: (?:hide|list|new|use))?)|p(?:a(?:nic|r(?:-each|se)|th(?: (?:basename|dirname|ex(?:ists|pand)|join|parse|relative-to|split|type))?)|lugin(?: (?:add|list|rm|stop|use))?|net|o(?:lars(?: (?:a(?:gg(?:-groups)?|ll-(?:false|true)|ppend|rg-(?:m(?:ax|in)|sort|true|unique|where)|s(?:-date(?:time)?)?)|c(?:a(?:che|st)|o(?:l(?:lect|umns)?|n(?:cat(?:-str)?|tains)|unt(?:-null)?)|umulative)|d(?:atepart|ecimal|rop(?:-(?:duplicates|nulls))?|ummies)|exp(?:lode|r-not)|f(?:etch|i(?:l(?:l-n(?:an|ull)|ter(?:-with)?)|rst)|latten)|g(?:et(?:-(?:day|hour|m(?:inute|onth)|nanosecond|ordinal|second|week(?:day)?|year))?|roup-by)|i(?:mplode|nt(?:eger|o-(?:df|lazy|nu))|s-(?:duplicated|in|n(?:ot-null|ull)|unique))|join|l(?:ast|it|owercase)|m(?:ax|e(?:an|dian)|in)|n(?:-unique|ot)|o(?:pen|therwise)|p(?:ivot|rofile)|qu(?:antile|ery)|r(?:e(?:name|place(?:-all)?|verse)|olling)|s(?:a(?:mple|ve)|chema|e(?:lect|t(?:-with-idx)?)|h(?:ape|ift)|lice|ort-by|t(?:d|ore-(?:get|ls|rm)|r(?:-(?:join|lengths|slice)|ftime))|um(?:mary)?)|take|u(?:n(?:ique|pivot)|ppercase)|va(?:lue-counts|r)|w(?:hen|ith-column)))?|rt)|r(?:epend|int)|s)|query(?: (?:db|git|json|web(?:page-info)?|xml))?|r(?:an(?:dom(?: (?:b(?:inary|ool)|chars|dice|float|int|uuid))?|ge)|e(?:duce|g(?:ex|istry query)|ject|name|turn|verse)|m|o(?:ll(?: (?:down|left|right|up))?|tate)|un-external)|s(?:ave|c(?:hema|ope(?: (?:aliases|commands|e(?:ngine-stats|xterns)|modules|variables))?)|e(?:lect|q(?: (?:char|date))?)|huffle|kip(?: (?:until|while))?|leep|o(?:rt(?:-by)?|urce(?:-env)?)|plit(?: (?:c(?:ell-path|hars|olumn)|list|row|words)|-by)?|t(?:art|or(?: (?:create|delete|export|i(?:mport|nsert)|open|reset|update))?|r(?: (?:c(?:a(?:mel-case|pitalize)|ontains)|d(?:istance|owncase)|e(?:nds-with|xpand)|index-of|join|kebab-case|length|pascal-case|re(?:place|verse)|s(?:creaming-snake-case|imilarity|nake-case|ta(?:rts-with|ts)|ubstring)|t(?:itle-case|rim)|upcase)|ess_internals)?)|ys(?: (?:cpu|disks|host|mem|net|temp|users))?)|t(?:a(?:ble|ke(?: (?:until|while))?)|e(?:e|rm size)|imeit|o(?: (?:csv|html|json|m(?:d|sgpackz?)|nuon|p(?:arquet|list)|t(?:ext|oml|sv)|xml|yaml)|uch)?|r(?:anspose|y)|utor)|u(?:limit|n(?:ame|iq(?:-by)?)|p(?:date(?: cells)?|sert)|rl(?: (?:build-query|decode|encode|join|parse))?|se)|v(?:alues|ersion|iew(?: (?:files|ir|s(?:ource|pan)))?)|w(?:atch|h(?:ere|i(?:ch|le)|oami)|i(?:ndow|th-env)|rap)|zip)(?![\\w-])( (.*))?"
             },
             {
               "captures": {
@@ -229,7 +228,7 @@
           ]
         }
       },
-      "end": "(?=\\||\\)|\\}|;)|$",
+      "end": "(?=[|)};])|$",
       "name": "meta.command.nushell",
       "patterns": [
         {
@@ -265,14 +264,19 @@
         {
           "include": "#numbers-hexa"
         },
+        {
+          "include": "#numbers-octal"
+        },
+        {
+          "include": "#numbers-binary"
+        },
         {
           "include": "#binary"
         }
       ]
     },
     "control-keywords": {
-      "comment": "Regex generated with list-to-tree (https://github.com/glcraft/list-to-tree)",
-      "match": "(?<![0-9a-zA-Z_\\-.\\/:\\\\])(?:break|continue|else(?: if)?|for|if|loop|mut|return|try|while)(?![0-9a-zA-Z_\\-.\\/:\\\\])",
+      "match": "(?<![0-9a-zA-Z_\\-./:\\\\])(?:break|continue|else(?: if)?|for|if|loop|mut|return|try|while)(?![0-9a-zA-Z_\\-./:\\\\])",
       "name": "keyword.control.nushell"
     },
     "datetime": {
@@ -336,6 +340,9 @@
         {
           "include": "#constant-value"
         },
+        {
+          "include": "#string-raw"
+        },
         {
           "include": "#command"
         },
@@ -345,7 +352,7 @@
       ]
     },
     "extern": {
-      "begin": "((?:export\\s+)?extern)\\s+([\\w\\-]+|\"[\\w\\- ]+\")",
+      "begin": "((?:export\\s+)?extern)\\s+([\\w-]+|\"[\\w\\- ]+\")",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.nushell"
@@ -354,7 +361,7 @@
           "name": "entity.name.type.nushell"
         }
       },
-      "end": "(?<=\\])",
+      "end": "(?<=])",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.function.end.nushell"
@@ -389,7 +396,7 @@
           "name": "punctuation.section.block.begin.bracket.curly.nushell"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.block.end.bracket.curly.nushell"
@@ -403,7 +410,7 @@
       ]
     },
     "function": {
-      "begin": "((?:export\\s+)?def(?:\\s+--\\w+)*)\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|`[\\w\\- ]+`)(\\s+--\\w+)*",
+      "begin": "((?:export\\s+)?def(?:\\s+--\\w+)*)\\s+([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|`[\\w\\- ]+`)(\\s+--\\w+)*",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.nushell"
@@ -415,7 +422,7 @@
           "name": "entity.name.function.nushell"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#function-parameters"
@@ -435,7 +442,7 @@
           "name": "punctuation.definition.function.begin.nushell"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.function.end.nushell"
@@ -472,7 +479,7 @@
           "name": "meta.brace.square.begin.nushell"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.end.nushell"
@@ -513,7 +520,7 @@
         },
         {
           "begin": "\\??:\\s*",
-          "end": "(?=(?:\\s+(?:-{0,2}|\\.{3})[\\w-]+)|(?:\\s*(?:,|\\]|\\||@|=|#|$)))",
+          "end": "(?=\\s+(?:-{0,2}|\\.{3})[\\w-]+|\\s*(?:[,\\]|@=#]|$))",
           "patterns": [
             {
               "include": "#types"
@@ -521,8 +528,8 @@
           ]
         },
         {
-          "begin": "@(?=\"|')",
-          "end": "(?<=\"|')",
+          "begin": "@(?=[\"'])",
+          "end": "(?<=[\"'])",
           "patterns": [
             {
               "include": "#string"
@@ -531,7 +538,7 @@
         },
         {
           "begin": "=\\s*",
-          "end": "(?=(?:\\s+-{0,2}[\\w-]+)|(?:\\s*(?:,|\\]|\\||#|$)))",
+          "end": "(?=\\s+-{0,2}[\\w-]+|\\s*(?:[,\\]|#]|$))",
           "name": "default.value.nushell",
           "patterns": [
             {
@@ -548,7 +555,7 @@
           "name": "meta.brace.square.begin.nushell"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.end.nushell"
@@ -569,11 +576,11 @@
       "name": "variable.language.nushell"
     },
     "keyword": {
-      "match": "(?:def(?:-env)?)",
+      "match": "def(?:-env)?",
       "name": "keyword.other.nushell"
     },
     "module": {
-      "begin": "((?:export\\s+)?module)\\s+([\\w\\-]+)\\s*\\{",
+      "begin": "((?:export\\s+)?module)\\s+([\\w-]+)\\s*\\{",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.nushell"
@@ -582,7 +589,7 @@
           "name": "entity.name.namespace.nushell"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.module.end.nushell"
@@ -596,11 +603,19 @@
       ]
     },
     "numbers": {
-      "match": "(?<![\\w-])[-+]?(?:\\d+|\\d{1,3}(?:_\\d{3})*)(?:\\.\\d*)?(?i:ns|us|ms|sec|min|hr|day|wk|b|kb|mb|gb|tb|pt|eb|zb|kib|mib|gib|tib|pit|eib|zib)?(?:(?![\\w.])|(?=\\.\\.))",
+      "match": "(?<![\\w-])_*+[-+]?_*+(?:(?i:NaN|infinity|inf)_*+|(?:\\d[\\d_]*+\\.?|\\._*+\\d)[\\d_]*+(?i:E_*+[-+]?_*+\\d[\\d_]*+)?)(?i:ns|us|µs|ms|sec|min|hr|day|wk|b|kb|mb|gb|tb|pt|eb|zb|kib|mib|gib|tib|pit|eib|zib)?(?:(?![\\w.])|(?=\\.\\.))",
+      "name": "constant.numeric.nushell"
+    },
+    "numbers-binary": {
+      "match": "(?<![\\w-])_*+0_*+b_*+[01][01_]*+(?![\\w.])",
       "name": "constant.numeric.nushell"
     },
     "numbers-hexa": {
-      "match": "(?<![\\w-])0x[0-9a-fA-F]+(?![\\w.])",
+      "match": "(?<![\\w-])_*+0_*+x_*+\\h[_\\h]*+(?![\\w.])",
+      "name": "constant.numeric.nushell"
+    },
+    "numbers-octal": {
+      "match": "(?<![\\w-])_*+0_*+o_*+[0-7][0-7_]*+(?![\\w.])",
       "name": "constant.numeric.nushell"
     },
     "operators": {
@@ -617,11 +632,11 @@
       ]
     },
     "operators-symbols": {
-      "match": "(?<= )(?:(?:\\+|\\-|\\*|\\/)=?|\\/\\/|\\*\\*|!=|[<>=]=?|[!=]~|\\+\\+=?)(?= |$)",
+      "match": "(?<= )(?:[+\\-*/]=?|//|\\*\\*|!=|[<>=]=?|[!=]~|\\+\\+=?)(?= |$)",
       "name": "keyword.control.nushell"
     },
     "operators-word": {
-      "match": "(?<= |\\()(?:mod|in|not-in|not|and|or|xor|bit-or|bit-and|bit-xor|bit-shl|bit-shr|starts-with|ends-with)(?= |\\)|$)",
+      "match": "(?<=[ (])(?:mod|in|not-(?:in|like|has)|not|and|or|xor|bit-(?:or|and|xor|shl|shr)|starts-with|ends-with|like|has)(?=[ )]|$)",
       "name": "keyword.control.nushell"
     },
     "parameters": {
@@ -699,6 +714,9 @@
         {
           "include": "#string-interpolated-single"
         },
+        {
+          "include": "#string-raw"
+        },
         {
           "include": "#string-bare"
         }
@@ -720,7 +738,7 @@
       "name": "string.quoted.single.nushell"
     },
     "string-bare": {
-      "match": "[^$\\[{(\"',|#\\s|][^\\[\\]{}()\"'\\s#,|]*",
+      "match": "[^$\\[{(\"',|#\\s;][^\\[\\]{}()\"'\\s,|;]*",
       "name": "string.bare.nushell"
     },
     "string-double-quote": {
@@ -747,7 +765,7 @@
       ]
     },
     "string-escape": {
-      "match": "\\\\(?:[bfrnt\\\\'\"/]|u[0-9a-fA-F]{4})",
+      "match": "\\\\(?:[bfrnt\\\\'\"/]|u\\h{4})",
       "name": "constant.character.escape.nushell"
     },
     "string-interpolated-double": {
@@ -797,6 +815,21 @@
         }
       ]
     },
+    "string-raw": {
+      "begin": "r(#+)'",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.nushell"
+        }
+      },
+      "end": "'\\1",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.nushell"
+        }
+      },
+      "name": "string.raw.nushell"
+    },
     "string-single-quote": {
       "begin": "'",
       "beginCaptures": {
@@ -819,7 +852,7 @@
           "name": "meta.brace.square.begin.nushell"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.end.nushell"
@@ -872,7 +905,7 @@
                   "name": "variable.parameter.nushell"
                 }
               },
-              "match": "([\\w\\-]+|\"[\\w\\- ]+\"|'[^']+')\\s*:\\s*"
+              "match": "([\\w-]+|\"[\\w\\- ]+\"|'[^']+')\\s*:\\s*"
             },
             {
               "include": "#types"
@@ -899,10 +932,10 @@
               "name": "keyword.other.nushell"
             }
           },
-          "match": "^\\s*((?:export )?use)\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+')(?:\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*))?\\s*;?$"
+          "match": "^\\s*((?:export )?use)\\s+([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+')(?:\\s+([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*))?\\s*;?$"
         },
         {
-          "begin": "^\\s*((?:export )?use)\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+')\\s*\\[",
+          "begin": "^\\s*((?:export )?use)\\s+([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+')\\s*\\[",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.nushell"
@@ -911,7 +944,7 @@
               "name": "entity.name.namespace.nushell"
             }
           },
-          "end": "(\\])\\s*;?\\s*$",
+          "end": "(])\\s*;?\\s*$",
           "endCaptures": {
             "1": {
               "name": "meta.brace.square.end.nushell"
@@ -924,7 +957,7 @@
                   "name": "keyword.other.nushell"
                 }
               },
-              "match": "([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*),?"
+              "match": "([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*),?"
             },
             {
               "include": "#comment"
@@ -945,7 +978,7 @@
                       "name": "entity.name.namespace.nushell"
                     }
                   },
-                  "match": "([\\w\\- ]+)(?:\\.nu)?(?=$|\"|')"
+                  "match": "([\\w\\- ]+)(?:\\.nu)?(?=$|[\"'])"
                 }
               ]
             },
@@ -953,10 +986,10 @@
               "name": "keyword.other.nushell"
             }
           },
-          "match": "(?<path>(?:/|\\\\|~[\\/\\\\]|\\.\\.?[\\/\\\\])?(?:[^\\/\\\\]+[\\/\\\\])*[\\w\\- ]+(?:\\.nu)?){0}^\\s*((?:export )?use)\\s+(\"\\g<path>\"|'\\g<path>\\'|(?![\"'])\\g<path>)(?:\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[^']+'|\\*))?\\s*;?$"
+          "match": "(?<path>(?:[/\\\\]|~[/\\\\]|\\.\\.?[/\\\\])?(?:[^/\\\\]+[/\\\\])*[\\w\\- ]+(?:\\.nu)?){0}^\\s*((?:export )?use)\\s+(\"\\g<path>\"|'\\g<path>'|(?![\"'])\\g<path>)(?:\\s+([\\w-]+|\"[\\w\\- ]+\"|'[^']+'|\\*))?\\s*;?$"
         },
         {
-          "begin": "(?<path>(?:/|\\\\|~[\\/\\\\]|\\.\\.?[\\/\\\\])?(?:[^\\/\\\\]+[\\/\\\\])*[\\w\\- ]+(?:\\.nu)?){0}^\\s*((?:export )?use)\\s+(\"\\g<path>\"|'\\g<path>\\'|(?![\"'])\\g<path>)\\s+\\[",
+          "begin": "(?<path>(?:[/\\\\]|~[/\\\\]|\\.\\.?[/\\\\])?(?:[^/\\\\]+[/\\\\])*[\\w\\- ]+(?:\\.nu)?){0}^\\s*((?:export )?use)\\s+(\"\\g<path>\"|'\\g<path>'|(?![\"'])\\g<path>)\\s+\\[",
           "beginCaptures": {
             "2": {
               "name": "entity.name.function.nushell"
@@ -970,12 +1003,12 @@
                       "name": "entity.name.namespace.nushell"
                     }
                   },
-                  "match": "([\\w\\- ]+)(?:\\.nu)?(?=$|\"|')"
+                  "match": "([\\w\\- ]+)(?:\\.nu)?(?=$|[\"'])"
                 }
               ]
             }
           },
-          "end": "(\\])\\s*;?\\s*$",
+          "end": "(])\\s*;?\\s*$",
           "endCaptures": {
             "1": {
               "name": "meta.brace.square.end.nushell"
@@ -988,7 +1021,7 @@
                   "name": "keyword.other.nushell"
                 }
               },
-              "match": "([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*),?"
+              "match": "([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*),?"
             },
             {
               "include": "#comment"
@@ -1040,7 +1073,7 @@
       ]
     },
     "variable-fields": {
-      "match": "(?<=\\)|\\}|\\])(?:\\.(?:[\\w-]+|\"[\\w\\- ]+\"))+",
+      "match": "(?<=[)}\\]])(?:\\.(?:[\\w-]+|\"[\\w\\- ]+\"))+",
       "name": "variable.other.nushell"
     },
     "variables": {
diff --git a/resources/languages/objective-c.json b/resources/languages/objective-c.json
index e3cd23a..f53e2b7 100644
--- a/resources/languages/objective-c.json
+++ b/resources/languages/objective-c.json
@@ -101,7 +101,7 @@
   ],
   "repository": {
     "anonymous_pattern_1": {
-      "begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)(?:\\s*)([A-Za-z][A-Za-z0-9]*))?(\\s|\\n)?",
+      "begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)\\s*([A-Za-z][A-Za-z0-9]*))?([\\s\\n])?",
       "captures": {
         "1": {
           "name": "storage.type.objc"
@@ -188,7 +188,7 @@
               "name": "punctuation.separator.arguments.objc"
             }
           },
-          "match": "\\b(?:[a-zA-Z_:][\\w]*)+",
+          "match": "\\b(?:[a-zA-Z_:]\\w*)+",
           "name": "support.function.any-method.name-of-parameter.objc"
         }
       ]
@@ -230,7 +230,7 @@
           "name": "support.function.cocoa.objc"
         }
       },
-      "match": "(\\s*)\\b(NS(R(ound(DownToMultipleOfPageSize|UpToMultipleOfPageSize)|un(CriticalAlertPanel(RelativeToWindow)?|InformationalAlertPanel(RelativeToWindow)?|AlertPanel(RelativeToWindow)?)|e(set(MapTable|HashTable)|c(ycleZone|t(Clip(List)?|F(ill(UsingOperation|List(UsingOperation|With(Grays|Colors(UsingOperation)?))?)?|romString))|ordAllocationEvent)|turnAddress|leaseAlertPanel|a(dPixel|l(MemoryAvailable|locateCollectable))|gisterServicesProvider)|angeFromString)|Get(SizeAndAlignment|CriticalAlertPanel|InformationalAlertPanel|UncaughtExceptionHandler|FileType(s)?|WindowServerMemory|AlertPanel)|M(i(n(X|Y)|d(X|Y))|ouseInRect|a(p(Remove|Get|Member|Insert(IfAbsent|KnownAbsent)?)|ke(R(ect|ange)|Size|Point)|x(Range|X|Y)))|B(itsPer(SampleFromDepth|PixelFromDepth)|e(stDepth|ep|gin(CriticalAlertSheet|InformationalAlertSheet|AlertSheet)))|S(ho(uldRetainWithZone|w(sServicesMenuItem|AnimationEffect))|tringFrom(R(ect|ange)|MapTable|S(ize|elector)|HashTable|Class|Point)|izeFromString|e(t(ShowsServicesMenuItem|ZoneName|UncaughtExceptionHandler|FocusRingStyle)|lectorFromString|archPathForDirectoriesInDomains)|wap(Big(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|Short|Host(ShortTo(Big|Little)|IntTo(Big|Little)|DoubleTo(Big|Little)|FloatTo(Big|Little)|Long(To(Big|Little)|LongTo(Big|Little)))|Int|Double|Float|L(ittle(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|ong(Long)?)))|H(ighlightRect|o(stByteOrder|meDirectory(ForUser)?)|eight|ash(Remove|Get|Insert(IfAbsent|KnownAbsent)?)|FSType(CodeFromFileType|OfFile))|N(umberOfColorComponents|ext(MapEnumeratorPair|HashEnumeratorItem))|C(o(n(tainsRect|vert(GlyphsToPackedGlyphs|Swapped(DoubleToHost|FloatToHost)|Host(DoubleToSwapped|FloatToSwapped)))|unt(MapTable|HashTable|Frames|Windows(ForContext)?)|py(M(emoryPages|apTableWithZone)|Bits|HashTableWithZone|Object)|lorSpaceFromDepth|mpare(MapTables|HashTables))|lassFromString|reate(MapTable(WithZone)?|HashTable(WithZone)?|Zone|File(namePboardType|ContentsPboardType)))|TemporaryDirectory|I(s(ControllerMarker|EmptyRect|FreedObject)|n(setRect|crementExtraRefCount|te(r(sect(sRect|ionR(ect|ange))|faceStyleForKey)|gralRect)))|Zone(Realloc|Malloc|Name|Calloc|Fr(omPointer|ee))|O(penStepRootDirectory|ffsetRect)|D(i(sableScreenUpdates|videRect)|ottedFrameRect|e(c(imal(Round|Multiply|S(tring|ubtract)|Normalize|Co(py|mpa(ct|re))|IsNotANumber|Divide|Power|Add)|rementExtraRefCountWasZero)|faultMallocZone|allocate(MemoryPages|Object))|raw(Gr(oove|ayBezel)|B(itmap|utton)|ColorTiledRects|TiledRects|DarkBezel|W(hiteBezel|indowBackground)|LightBezel))|U(serName|n(ionR(ect|ange)|registerServicesProvider)|pdateDynamicServices)|Java(Bundle(Setup|Cleanup)|Setup(VirtualMachine)?|Needs(ToLoadClasses|VirtualMachine)|ClassesF(orBundle|romPath)|ObjectNamedInPath|ProvidesClasses)|P(oint(InRect|FromString)|erformService|lanarFromDepth|ageSize)|E(n(d(MapTableEnumeration|HashTableEnumeration)|umerate(MapTable|HashTable)|ableScreenUpdates)|qual(R(ects|anges)|Sizes|Points)|raseRect|xtraRefCount)|F(ileTypeForHFSTypeCode|ullUserName|r(ee(MapTable|HashTable)|ame(Rect(WithWidth(UsingOperation)?)?|Address)))|Wi(ndowList(ForContext)?|dth)|Lo(cationInRange|g(v|PageSize)?)|A(ccessibility(R(oleDescription(ForUIElement)?|aiseBadArgumentException)|Unignored(Children(ForOnlyChild)?|Descendant|Ancestor)|PostNotification|ActionDescription)|pplication(Main|Load)|vailableWindowDepths|ll(MapTable(Values|Keys)|HashTableObjects|ocate(MemoryPages|Collectable|Object)))))\\b"
+      "match": "(\\s*)\\b(NS(R(ound(DownToMultipleOfPageSize|UpToMultipleOfPageSize)|un(CriticalAlertPanel(RelativeToWindow)?|InformationalAlertPanel(RelativeToWindow)?|AlertPanel(RelativeToWindow)?)|e(set(MapTable|HashTable)|c(ycleZone|t(Clip(List)?|F(ill(UsingOperation|List(UsingOperation|With(Grays|Colors(UsingOperation)?))?)?|romString))|ordAllocationEvent)|turnAddress|leaseAlertPanel|a(dPixel|l(MemoryAvailable|locateCollectable))|gisterServicesProvider)|angeFromString)|Get(SizeAndAlignment|CriticalAlertPanel|InformationalAlertPanel|UncaughtExceptionHandler|FileType(s)?|WindowServerMemory|AlertPanel)|M(i(n([XY])|d([XY]))|ouseInRect|a(p(Remove|Get|Member|Insert(IfAbsent|KnownAbsent)?)|ke(R(ect|ange)|Size|Point)|x(Range|[XY])))|B(itsPer(SampleFromDepth|PixelFromDepth)|e(stDepth|ep|gin(CriticalAlertSheet|InformationalAlertSheet|AlertSheet)))|S(ho(uldRetainWithZone|w(sServicesMenuItem|AnimationEffect))|tringFrom(R(ect|ange)|MapTable|S(ize|elector)|HashTable|Class|Point)|izeFromString|e(t(ShowsServicesMenuItem|ZoneName|UncaughtExceptionHandler|FocusRingStyle)|lectorFromString|archPathForDirectoriesInDomains)|wap(Big(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|Short|Host(ShortTo(Big|Little)|IntTo(Big|Little)|DoubleTo(Big|Little)|FloatTo(Big|Little)|Long(To(Big|Little)|LongTo(Big|Little)))|Int|Double|Float|L(ittle(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|ong(Long)?)))|H(ighlightRect|o(stByteOrder|meDirectory(ForUser)?)|eight|ash(Remove|Get|Insert(IfAbsent|KnownAbsent)?)|FSType(CodeFromFileType|OfFile))|N(umberOfColorComponents|ext(MapEnumeratorPair|HashEnumeratorItem))|C(o(n(tainsRect|vert(GlyphsToPackedGlyphs|Swapped(DoubleToHost|FloatToHost)|Host(DoubleToSwapped|FloatToSwapped)))|unt(MapTable|HashTable|Frames|Windows(ForContext)?)|py(M(emoryPages|apTableWithZone)|Bits|HashTableWithZone|Object)|lorSpaceFromDepth|mpare(MapTables|HashTables))|lassFromString|reate(MapTable(WithZone)?|HashTable(WithZone)?|Zone|File(namePboardType|ContentsPboardType)))|TemporaryDirectory|I(s(ControllerMarker|EmptyRect|FreedObject)|n(setRect|crementExtraRefCount|te(r(sect(sRect|ionR(ect|ange))|faceStyleForKey)|gralRect)))|Zone(Realloc|Malloc|Name|Calloc|Fr(omPointer|ee))|O(penStepRootDirectory|ffsetRect)|D(i(sableScreenUpdates|videRect)|ottedFrameRect|e(c(imal(Round|Multiply|S(tring|ubtract)|Normalize|Co(py|mpa(ct|re))|IsNotANumber|Divide|Power|Add)|rementExtraRefCountWasZero)|faultMallocZone|allocate(MemoryPages|Object))|raw(Gr(oove|ayBezel)|B(itmap|utton)|ColorTiledRects|TiledRects|DarkBezel|W(hiteBezel|indowBackground)|LightBezel))|U(serName|n(ionR(ect|ange)|registerServicesProvider)|pdateDynamicServices)|Java(Bundle(Setup|Cleanup)|Setup(VirtualMachine)?|Needs(ToLoadClasses|VirtualMachine)|ClassesF(orBundle|romPath)|ObjectNamedInPath|ProvidesClasses)|P(oint(InRect|FromString)|erformService|lanarFromDepth|ageSize)|E(n(d(MapTableEnumeration|HashTableEnumeration)|umerate(MapTable|HashTable)|ableScreenUpdates)|qual(R(ects|anges)|Sizes|Points)|raseRect|xtraRefCount)|F(ileTypeForHFSTypeCode|ullUserName|r(ee(MapTable|HashTable)|ame(Rect(WithWidth(UsingOperation)?)?|Address)))|Wi(ndowList(ForContext)?|dth)|Lo(cationInRange|g(v|PageSize)?)|A(ccessibility(R(oleDescription(ForUIElement)?|aiseBadArgumentException)|Unignored(Children(ForOnlyChild)?|Descendant|Ancestor)|PostNotification|ActionDescription)|pplication(Main|Load)|vailableWindowDepths|ll(MapTable(Values|Keys)|HashTableObjects|ocate(MemoryPages|Collectable|Object)))))\\b"
     },
     "anonymous_pattern_2": {
       "begin": "((@)(implementation))\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z][A-Za-z0-9]*))?",
@@ -316,7 +316,7 @@
           "include": "#string_escaped_char"
         },
         {
-          "match": "%(\\d+\\$)?[#0\\- +']*((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?[@]",
+          "match": "%(\\d+\\$)?[#0\\- +']*((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?@",
           "name": "constant.other.placeholder.objc"
         },
         {
@@ -325,7 +325,7 @@
       ]
     },
     "anonymous_pattern_30": {
-      "match": "\\bNS(R(GB(ModeColorPanel|ColorSpaceModel)|ight(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey)|ound(RectBezelStyle|Bankers|ed(BezelStyle|TokenStyle|DisclosureBezelStyle)|Down|Up|Plain|Line(CapStyle|JoinStyle))|un(StoppedResponse|ContinuesResponse|AbortedResponse)|e(s(izableWindowMask|et(CursorRectsRunLoopOrdering|FunctionKey))|ce(ssedBezelStyle|iver(sCantHandleCommandScriptError|EvaluationScriptError))|turnTextMovement|doFunctionKey|quiredArgumentsMissingScriptError|l(evancyLevelIndicatorStyle|ative(Before|After))|gular(SquareBezelStyle|ControlSize)|moveTraitFontAction)|a(n(domSubelement|geDateMode)|tingLevelIndicatorStyle|dio(ModeMatrix|Button)))|G(IFFileType|lyph(Below|Inscribe(B(elow|ase)|Over(strike|Below)|Above)|Layout(WithPrevious|A(tAPoint|gainstAPoint))|A(ttribute(BidiLevel|Soft|Inscribe|Elastic)|bove))|r(ooveBorder|eaterThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|a(y(ModeColorPanel|ColorSpaceModel)|dient(None|Con(cave(Strong|Weak)|vex(Strong|Weak)))|phiteControlTint)))|XML(N(o(tationDeclarationKind|de(CompactEmptyElement|IsCDATA|OptionsNone|Use(SingleQuotes|DoubleQuotes)|Pre(serve(NamespaceOrder|C(haracterReferences|DATA)|DTD|Prefixes|E(ntities|mptyElements)|Quotes|Whitespace|A(ttributeOrder|ll))|ttyPrint)|ExpandEmptyElement))|amespaceKind)|CommentKind|TextKind|InvalidKind|D(ocument(X(MLKind|HTMLKind|Include)|HTMLKind|T(idy(XML|HTML)|extKind)|IncludeContentTypeDeclaration|Validate|Kind)|TDKind)|P(arser(GTRequiredError|XMLDeclNot(StartedError|FinishedError)|Mi(splaced(XMLDeclarationError|CDATAEndStringError)|xedContentDeclNot(StartedError|FinishedError))|S(t(andaloneValueError|ringNot(StartedError|ClosedError))|paceRequiredError|eparatorRequiredError)|N(MTOKENRequiredError|o(t(ationNot(StartedError|FinishedError)|WellBalancedError)|DTDError)|amespaceDeclarationError|AMERequiredError)|C(haracterRef(In(DTDError|PrologError|EpilogError)|AtEOFError)|o(nditionalSectionNot(StartedError|FinishedError)|mment(NotFinishedError|ContainsDoubleHyphenError))|DATANotFinishedError)|TagNameMismatchError|In(ternalError|valid(HexCharacterRefError|C(haracter(RefError|InEntityError|Error)|onditionalSectionError)|DecimalCharacterRefError|URIError|Encoding(NameError|Error)))|OutOfMemoryError|D(ocumentStartError|elegateAbortedParseError|OCTYPEDeclNotFinishedError)|U(RI(RequiredError|FragmentError)|n(declaredEntityError|parsedEntityError|knownEncodingError|finishedTagError))|P(CDATARequiredError|ublicIdentifierRequiredError|arsedEntityRef(MissingSemiError|NoNameError|In(Internal(SubsetError|Error)|PrologError|EpilogError)|AtEOFError)|r(ocessingInstructionNot(StartedError|FinishedError)|ematureDocumentEndError))|E(n(codingNotSupportedError|tity(Ref(In(DTDError|PrologError|EpilogError)|erence(MissingSemiError|WithoutNameError)|LoopError|AtEOFError)|BoundaryError|Not(StartedError|FinishedError)|Is(ParameterError|ExternalError)|ValueRequiredError))|qualExpectedError|lementContentDeclNot(StartedError|FinishedError)|xt(ernalS(tandaloneEntityError|ubsetNotFinishedError)|raContentError)|mptyDocumentError)|L(iteralNot(StartedError|FinishedError)|T(RequiredError|SlashRequiredError)|essThanSymbolInAttributeError)|Attribute(RedefinedError|HasNoValueError|Not(StartedError|FinishedError)|ListNot(StartedError|FinishedError)))|rocessingInstructionKind)|E(ntity(GeneralKind|DeclarationKind|UnparsedKind|P(ar(sedKind|ameterKind)|redefined))|lement(Declaration(MixedKind|UndefinedKind|E(lementKind|mptyKind)|Kind|AnyKind)|Kind))|Attribute(N(MToken(sKind|Kind)|otationKind)|CDATAKind|ID(Ref(sKind|Kind)|Kind)|DeclarationKind|En(tit(yKind|iesKind)|umerationKind)|Kind))|M(i(n(XEdge|iaturizableWindowMask|YEdge|uteCalendarUnit)|terLineJoinStyle|ddleSubelement|xedState)|o(nthCalendarUnit|deSwitchFunctionKey|use(Moved(Mask)?|E(ntered(Mask)?|ventSubtype|xited(Mask)?))|veToBezierPathElement|mentary(ChangeButton|Push(Button|InButton)|Light(Button)?))|enuFunctionKey|a(c(intoshInterfaceStyle|OSRomanStringEncoding)|tchesPredicateOperatorType|ppedRead|x(XEdge|YEdge))|ACHOperatingSystem)|B(MPFileType|o(ttomTabsBezelBorder|ldFontMask|rderlessWindowMask|x(Se(condary|parator)|OldStyle|Primary))|uttLineCapStyle|e(zelBorder|velLineJoinStyle|low(Bottom|Top)|gin(sWith(Comparison|PredicateOperatorType)|FunctionKey))|lueControlTint|ack(spaceCharacter|tabTextMovement|ingStore(Retained|Buffered|Nonretained)|TabCharacter|wardsSearch|groundTab)|r(owser(NoColumnResizing|UserColumnResizing|AutoColumnResizing)|eakFunctionKey))|S(h(ift(JISStringEncoding|KeyMask)|ow(ControlGlyphs|InvisibleGlyphs)|adowlessSquareBezelStyle)|y(s(ReqFunctionKey|tem(D(omainMask|efined(Mask)?)|FunctionKey))|mbolStringEncoding)|c(a(nnedOption|le(None|ToFit|Proportionally))|r(oll(er(NoPart|Increment(Page|Line|Arrow)|Decrement(Page|Line|Arrow)|Knob(Slot)?|Arrows(M(inEnd|axEnd)|None|DefaultSetting))|Wheel(Mask)?|LockFunctionKey)|eenChangedEventType))|t(opFunctionKey|r(ingDrawing(OneShot|DisableScreenFontSubstitution|Uses(DeviceMetrics|FontLeading|LineFragmentOrigin))|eam(Status(Reading|NotOpen|Closed|Open(ing)?|Error|Writing|AtEnd)|Event(Has(BytesAvailable|SpaceAvailable)|None|OpenCompleted|E(ndEncountered|rrorOccurred)))))|i(ngle(DateMode|UnderlineStyle)|ze(DownFontAction|UpFontAction))|olarisOperatingSystem|unOSOperatingSystem|pecialPageOrder|e(condCalendarUnit|lect(By(Character|Paragraph|Word)|i(ng(Next|Previous)|onAffinity(Downstream|Upstream))|edTab|FunctionKey)|gmentSwitchTracking(Momentary|Select(One|Any)))|quareLineCapStyle|witchButton|ave(ToOperation|Op(tions(Yes|No|Ask)|eration)|AsOperation)|mall(SquareBezelStyle|C(ontrolSize|apsFontMask)|IconButtonBezelStyle))|H(ighlightModeMatrix|SBModeColorPanel|o(ur(Minute(SecondDatePickerElementFlag|DatePickerElementFlag)|CalendarUnit)|rizontalRuler|meFunctionKey)|TTPCookieAcceptPolicy(Never|OnlyFromMainDocumentDomain|Always)|e(lp(ButtonBezelStyle|KeyMask|FunctionKey)|avierFontAction)|PUXOperatingSystem)|Year(MonthDa(yDatePickerElementFlag|tePickerElementFlag)|CalendarUnit)|N(o(n(StandardCharacterSetFontMask|ZeroWindingRule|activatingPanelMask|LossyASCIIStringEncoding)|Border|t(ification(SuspensionBehavior(Hold|Coalesce|D(eliverImmediately|rop))|NoCoalescing|CoalescingOn(Sender|Name)|DeliverImmediately|PostToAllSessions)|PredicateType|EqualToPredicateOperatorType)|S(cr(iptError|ollerParts)|ubelement|pecifierError)|CellMask|T(itle|opLevelContainersSpecifierError|abs(BezelBorder|NoBorder|LineBorder))|I(nterfaceStyle|mage)|UnderlineStyle|FontChangeAction)|u(ll(Glyph|CellType)|m(eric(Search|PadKeyMask)|berFormatter(Round(Half(Down|Up|Even)|Ceiling|Down|Up|Floor)|Behavior(10|Default)|S(cientificStyle|pellOutStyle)|NoStyle|CurrencyStyle|DecimalStyle|P(ercentStyle|ad(Before(Suffix|Prefix)|After(Suffix|Prefix))))))|e(t(Services(BadArgumentError|NotFoundError|C(ollisionError|ancelledError)|TimeoutError|InvalidError|UnknownError|ActivityInProgress)|workDomainMask)|wlineCharacter|xt(StepInterfaceStyle|FunctionKey))|EXTSTEPStringEncoding|a(t(iveShortGlyphPacking|uralTextAlignment)|rrowFontMask))|C(hange(ReadOtherContents|GrayCell(Mask)?|BackgroundCell(Mask)?|Cleared|Done|Undone|Autosaved)|MYK(ModeColorPanel|ColorSpaceModel)|ircular(BezelStyle|Slider)|o(n(stantValueExpressionType|t(inuousCapacityLevelIndicatorStyle|entsCellMask|ain(sComparison|erSpecifierError)|rol(Glyph|KeyMask))|densedFontMask)|lor(Panel(RGBModeMask|GrayModeMask|HSBModeMask|C(MYKModeMask|olorListModeMask|ustomPaletteModeMask|rayonModeMask)|WheelModeMask|AllModesMask)|ListModeColorPanel)|reServiceDirectory|m(p(osite(XOR|Source(In|O(ut|ver)|Atop)|Highlight|C(opy|lear)|Destination(In|O(ut|ver)|Atop)|Plus(Darker|Lighter))|ressedFontMask)|mandKeyMask))|u(stom(SelectorPredicateOperatorType|PaletteModeColorPanel)|r(sor(Update(Mask)?|PointingDevice)|veToBezierPathElement))|e(nterT(extAlignment|abStopType)|ll(State|H(ighlighted|as(Image(Horizontal|OnLeftOrBottom)|OverlappingImage))|ChangesContents|Is(Bordered|InsetButton)|Disabled|Editable|LightsBy(Gray|Background|Contents)|AllowsMixedState))|l(ipPagination|o(s(ePathBezierPathElement|ableWindowMask)|ckAndCalendarDatePickerStyle)|ear(ControlTint|DisplayFunctionKey|LineFunctionKey))|a(seInsensitive(Search|PredicateOption)|n(notCreateScriptCommandError|cel(Button|TextMovement))|chesDirectory|lculation(NoError|Overflow|DivideByZero|Underflow|LossOfPrecision)|rriageReturnCharacter)|r(itical(Request|AlertStyle)|ayonModeColorPanel))|T(hick(SquareBezelStyle|erSquareBezelStyle)|ypesetter(Behavior|HorizontalTabAction|ContainerBreakAction|ZeroAdvancementAction|OriginalBehavior|ParagraphBreakAction|WhitespaceAction|L(ineBreakAction|atestBehavior))|i(ckMark(Right|Below|Left|Above)|tledWindowMask|meZoneDatePickerElementFlag)|o(olbarItemVisibilityPriority(Standard|High|User|Low)|pTabsBezelBorder|ggleButton)|IFF(Compression(N(one|EXT)|CCITTFAX(3|4)|OldJPEG|JPEG|PackBits|LZW)|FileType)|e(rminate(Now|Cancel|Later)|xt(Read(InapplicableDocumentTypeError|WriteErrorM(inimum|aximum))|Block(M(i(nimum(Height|Width)|ddleAlignment)|a(rgin|ximum(Height|Width)))|B(o(ttomAlignment|rder)|aselineAlignment)|Height|TopAlignment|P(ercentageValueType|adding)|Width|AbsoluteValueType)|StorageEdited(Characters|Attributes)|CellType|ured(RoundedBezelStyle|BackgroundWindowMask|SquareBezelStyle)|Table(FixedLayoutAlgorithm|AutomaticLayoutAlgorithm)|Field(RoundedBezel|SquareBezel|AndStepperDatePickerStyle)|WriteInapplicableDocumentTypeError|ListPrependEnclosingMarker))|woByteGlyphPacking|ab(Character|TextMovement|le(tP(oint(Mask|EventSubtype)?|roximity(Mask|EventSubtype)?)|Column(NoResizing|UserResizingMask|AutoresizingMask)|View(ReverseSequentialColumnAutoresizingStyle|GridNone|S(olid(HorizontalGridLineMask|VerticalGridLineMask)|equentialColumnAutoresizingStyle)|NoColumnAutoresizing|UniformColumnAutoresizingStyle|FirstColumnOnlyAutoresizingStyle|LastColumnOnlyAutoresizingStyle)))|rackModeMatrix)|I(n(sert(CharFunctionKey|FunctionKey|LineFunctionKey)|t(Type|ernalS(criptError|pecifierError))|dexSubelement|validIndexSpecifierError|formational(Request|AlertStyle)|PredicateOperatorType)|talicFontMask|SO(2022JPStringEncoding|Latin(1StringEncoding|2StringEncoding))|dentityMappingCharacterCollection|llegalTextMovement|mage(R(ight|ep(MatchesDevice|LoadStatus(ReadingHeader|Completed|InvalidData|Un(expectedEOF|knownType)|WillNeedAllData)))|Below|C(ellType|ache(BySize|Never|Default|Always))|Interpolation(High|None|Default|Low)|O(nly|verlaps)|Frame(Gr(oove|ayBezel)|Button|None|Photo)|L(oadStatus(ReadError|C(ompleted|ancelled)|InvalidData|UnexpectedEOF)|eft)|A(lign(Right|Bottom(Right|Left)?|Center|Top(Right|Left)?|Left)|bove)))|O(n(State|eByteGlyphPacking|OffButton|lyScrollerArrows)|ther(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|TextMovement)|SF1OperatingSystem|pe(n(GL(GO(Re(setLibrary|tainRenderers)|ClearFormatCache|FormatCacheSize)|PFA(R(obust|endererID)|M(inimumPolicy|ulti(sample|Screen)|PSafe|aximumPolicy)|BackingStore|S(creenMask|te(ncilSize|reo)|ingleRenderer|upersample|ample(s|Buffers|Alpha))|NoRecovery|C(o(lor(Size|Float)|mpliant)|losestPolicy)|OffScreen|D(oubleBuffer|epthSize)|PixelBuffer|VirtualScreenCount|FullScreen|Window|A(cc(umSize|elerated)|ux(Buffers|DepthStencil)|l(phaSize|lRenderers))))|StepUnicodeReservedBase)|rationNotSupportedForKeyS(criptError|pecifierError))|ffState|KButton|rPredicateType|bjC(B(itfield|oolType)|S(hortType|tr(ingType|uctType)|electorType)|NoType|CharType|ObjectType|DoubleType|UnionType|PointerType|VoidType|FloatType|Long(Type|longType)|ArrayType))|D(i(s(c(losureBezelStyle|reteCapacityLevelIndicatorStyle)|playWindowRunLoopOrdering)|acriticInsensitivePredicateOption|rect(Selection|PredicateModifier))|o(c(ModalWindowMask|ument(Directory|ationDirectory))|ubleType|wn(TextMovement|ArrowFunctionKey))|e(s(cendingPageOrder|ktopDirectory)|cimalTabStopType|v(ice(NColorSpaceModel|IndependentModifierFlagsMask)|eloper(Directory|ApplicationDirectory))|fault(ControlTint|TokenStyle)|lete(Char(acter|FunctionKey)|FunctionKey|LineFunctionKey)|moApplicationDirectory)|a(yCalendarUnit|teFormatter(MediumStyle|Behavior(10|Default)|ShortStyle|NoStyle|FullStyle|LongStyle))|ra(wer(Clos(ingState|edState)|Open(ingState|State))|gOperation(Generic|Move|None|Copy|Delete|Private|Every|Link|All)))|U(ser(CancelledError|D(irectory|omainMask)|FunctionKey)|RL(Handle(NotLoaded|Load(Succeeded|InProgress|Failed))|CredentialPersistence(None|Permanent|ForSession))|n(scaledWindowMask|cachedRead|i(codeStringEncoding|talicFontMask|fiedTitleAndToolbarWindowMask)|d(o(CloseGroupingRunLoopOrdering|FunctionKey)|e(finedDateComponent|rline(Style(Single|None|Thick|Double)|Pattern(Solid|D(ot|ash(Dot(Dot)?)?)))))|known(ColorSpaceModel|P(ointingDevice|ageOrder)|KeyS(criptError|pecifierError))|boldFontMask)|tilityWindowMask|TF8StringEncoding|p(dateWindowsRunLoopOrdering|TextMovement|ArrowFunctionKey))|J(ustifiedTextAlignment|PEG(2000FileType|FileType)|apaneseEUC(GlyphPacking|StringEncoding))|P(o(s(t(Now|erFontMask|WhenIdle|ASAP)|iti(on(Replace|Be(fore|ginning)|End|After)|ve(IntType|DoubleType|FloatType)))|pUp(NoArrow|ArrowAt(Bottom|Center))|werOffEventType|rtraitOrientation)|NGFileType|ush(InCell(Mask)?|OnPushOffButton)|e(n(TipMask|UpperSideMask|PointingDevice|LowerSideMask)|riodic(Mask)?)|P(S(caleField|tatus(Title|Field)|aveButton)|N(ote(Title|Field)|ame(Title|Field))|CopiesField|TitleField|ImageButton|OptionsButton|P(a(perFeedButton|ge(Range(To|From)|ChoiceMatrix))|reviewButton)|LayoutButton)|lainTextTokenStyle|a(useFunctionKey|ragraphSeparatorCharacter|ge(DownFunctionKey|UpFunctionKey))|r(int(ing(ReplyLater|Success|Cancelled|Failure)|ScreenFunctionKey|erTable(NotFound|OK|Error)|FunctionKey)|o(p(ertyList(XMLFormat|MutableContainers(AndLeaves)?|BinaryFormat|Immutable|OpenStepFormat)|rietaryStringEncoding)|gressIndicator(BarStyle|SpinningStyle|Preferred(SmallThickness|Thickness|LargeThickness|AquaThickness)))|e(ssedTab|vFunctionKey))|L(HeightForm|CancelButton|TitleField|ImageButton|O(KButton|rientationMatrix)|UnitsButton|PaperNameButton|WidthForm))|E(n(terCharacter|d(sWith(Comparison|PredicateOperatorType)|FunctionKey))|v(e(nOddWindingRule|rySubelement)|aluatedObjectExpressionType)|qualTo(Comparison|PredicateOperatorType)|ra(serPointingDevice|CalendarUnit|DatePickerElementFlag)|x(clude(10|QuickDrawElementsIconCreationOption)|pandedFontMask|ecuteFunctionKey))|V(i(ew(M(in(XMargin|YMargin)|ax(XMargin|YMargin))|HeightSizable|NotSizable|WidthSizable)|aPanelFontAction)|erticalRuler|a(lidationErrorM(inimum|aximum)|riableExpressionType))|Key(SpecifierEvaluationScriptError|Down(Mask)?|Up(Mask)?|PathExpressionType|Value(MinusSetMutation|SetSetMutation|Change(Re(placement|moval)|Setting|Insertion)|IntersectSetMutation|ObservingOption(New|Old)|UnionSetMutation|ValidationError))|QTMovie(NormalPlayback|Looping(BackAndForthPlayback|Playback))|F(1(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|7FunctionKey|i(nd(PanelAction(Replace(A(ndFind|ll(InSelection)?))?|S(howFindPanel|e(tFindString|lectAll(InSelection)?))|Next|Previous)|FunctionKey)|tPagination|le(Read(No(SuchFileError|PermissionError)|CorruptFileError|In(validFileNameError|applicableStringEncodingError)|Un(supportedSchemeError|knownError))|HandlingPanel(CancelButton|OKButton)|NoSuchFileError|ErrorM(inimum|aximum)|Write(NoPermissionError|In(validFileNameError|applicableStringEncodingError)|OutOfSpaceError|Un(supportedSchemeError|knownError))|LockingError)|xedPitchFontMask)|2(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|o(nt(Mo(noSpaceTrait|dernSerifsClass)|BoldTrait|S(ymbolicClass|criptsClass|labSerifsClass|ansSerifClass)|C(o(ndensedTrait|llectionApplicationOnlyMask)|larendonSerifsClass)|TransitionalSerifsClass|I(ntegerAdvancementsRenderingMode|talicTrait)|O(ldStyleSerifsClass|rnamentalsClass)|DefaultRenderingMode|U(nknownClass|IOptimizedTrait)|Panel(S(hadowEffectModeMask|t(andardModesMask|rikethroughEffectModeMask)|izeModeMask)|CollectionModeMask|TextColorEffectModeMask|DocumentColorEffectModeMask|UnderlineEffectModeMask|FaceModeMask|All(ModesMask|EffectsModeMask))|ExpandedTrait|VerticalTrait|F(amilyClassMask|reeformSerifsClass)|Antialiased(RenderingMode|IntegerAdvancementsRenderingMode))|cusRing(Below|Type(None|Default|Exterior)|Only|Above)|urByteGlyphPacking|rm(attingError(M(inimum|aximum))?|FeedCharacter))|8FunctionKey|unction(ExpressionType|KeyMask)|3(1FunctionKey|2FunctionKey|3FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey)|9FunctionKey|4FunctionKey|P(RevertButton|S(ize(Title|Field)|etButton)|CurrentField|Preview(Button|Field))|l(oat(ingPointSamplesBitmapFormat|Type)|agsChanged(Mask)?)|axButton|5FunctionKey|6FunctionKey)|W(heelModeColorPanel|indow(s(NTOperatingSystem|CP125(1StringEncoding|2StringEncoding|3StringEncoding|4StringEncoding|0StringEncoding)|95(InterfaceStyle|OperatingSystem))|M(iniaturizeButton|ovedEventType)|Below|CloseButton|ToolbarButton|ZoomButton|Out|DocumentIconButton|ExposedEventType|Above)|orkspaceLaunch(NewInstance|InhibitingBackgroundOnly|Default|PreferringClassic|WithoutA(ctivation|ddingToRecents)|A(sync|nd(Hide(Others)?|Print)|llowingClassicStartup))|eek(day(CalendarUnit|OrdinalCalendarUnit)|CalendarUnit)|a(ntsBidiLevels|rningAlertStyle)|r(itingDirection(RightToLeft|Natural|LeftToRight)|apCalendarComponents))|L(i(stModeMatrix|ne(Moves(Right|Down|Up|Left)|B(order|reakBy(C(harWrapping|lipping)|Truncating(Middle|Head|Tail)|WordWrapping))|S(eparatorCharacter|weep(Right|Down|Up|Left))|ToBezierPathElement|DoesntMove|arSlider)|teralSearch|kePredicateOperatorType|ghterFontAction|braryDirectory)|ocalDomainMask|e(ssThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|ft(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey))|a(yout(RightToLeft|NotDone|CantFit|OutOfGlyphs|Done|LeftToRight)|ndscapeOrientation)|ABColorSpaceModel)|A(sc(iiWithDoubleByteEUCGlyphPacking|endingPageOrder)|n(y(Type|PredicateModifier|EventMask)|choredSearch|imation(Blocking|Nonblocking(Threaded)?|E(ffect(DisappearingItemDefault|Poof)|ase(In(Out)?|Out))|Linear)|dPredicateType)|t(Bottom|tachmentCharacter|omicWrite|Top)|SCIIStringEncoding|d(obe(GB1CharacterCollection|CNS1CharacterCollection|Japan(1CharacterCollection|2CharacterCollection)|Korea1CharacterCollection)|dTraitFontAction|minApplicationDirectory)|uto(saveOperation|Pagination)|pp(lication(SupportDirectory|D(irectory|e(fined(Mask)?|legateReply(Success|Cancel|Failure)|activatedEventType))|ActivatedEventType)|KitDefined(Mask)?)|l(ternateKeyMask|pha(ShiftKeyMask|NonpremultipliedBitmapFormat|FirstBitmapFormat)|ert(SecondButtonReturn|ThirdButtonReturn|OtherReturn|DefaultReturn|ErrorReturn|FirstButtonReturn|AlternateReturn)|l(ScrollerParts|DomainsMask|PredicateModifier|LibrariesDirectory|ApplicationsDirectory))|rgument(sWrongScriptError|EvaluationScriptError)|bove(Bottom|Top)|WTEventType))\\b",
+      "match": "\\bNS(R(GB(ModeColorPanel|ColorSpaceModel)|ight(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey)|ound(RectBezelStyle|Bankers|ed(BezelStyle|TokenStyle|DisclosureBezelStyle)|Down|Up|Plain|Line(CapStyle|JoinStyle))|un(StoppedResponse|ContinuesResponse|AbortedResponse)|e(s(izableWindowMask|et(CursorRectsRunLoopOrdering|FunctionKey))|ce(ssedBezelStyle|iver(sCantHandleCommandScriptError|EvaluationScriptError))|turnTextMovement|doFunctionKey|quiredArgumentsMissingScriptError|l(evancyLevelIndicatorStyle|ative(Before|After))|gular(SquareBezelStyle|ControlSize)|moveTraitFontAction)|a(n(domSubelement|geDateMode)|tingLevelIndicatorStyle|dio(ModeMatrix|Button)))|G(IFFileType|lyph(Below|Inscribe(B(elow|ase)|Over(strike|Below)|Above)|Layout(WithPrevious|A(tAPoint|gainstAPoint))|A(ttribute(BidiLevel|Soft|Inscribe|Elastic)|bove))|r(ooveBorder|eaterThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|a(y(ModeColorPanel|ColorSpaceModel)|dient(None|Con(cave(Strong|Weak)|vex(Strong|Weak)))|phiteControlTint)))|XML(N(o(tationDeclarationKind|de(CompactEmptyElement|IsCDATA|OptionsNone|Use(SingleQuotes|DoubleQuotes)|Pre(serve(NamespaceOrder|C(haracterReferences|DATA)|DTD|Prefixes|E(ntities|mptyElements)|Quotes|Whitespace|A(ttributeOrder|ll))|ttyPrint)|ExpandEmptyElement))|amespaceKind)|CommentKind|TextKind|InvalidKind|D(ocument(X(MLKind|HTMLKind|Include)|HTMLKind|T(idy(XML|HTML)|extKind)|IncludeContentTypeDeclaration|Validate|Kind)|TDKind)|P(arser(GTRequiredError|XMLDeclNot(StartedError|FinishedError)|Mi(splaced(XMLDeclarationError|CDATAEndStringError)|xedContentDeclNot(StartedError|FinishedError))|S(t(andaloneValueError|ringNot(StartedError|ClosedError))|paceRequiredError|eparatorRequiredError)|N(MTOKENRequiredError|o(t(ationNot(StartedError|FinishedError)|WellBalancedError)|DTDError)|amespaceDeclarationError|AMERequiredError)|C(haracterRef(In(DTDError|PrologError|EpilogError)|AtEOFError)|o(nditionalSectionNot(StartedError|FinishedError)|mment(NotFinishedError|ContainsDoubleHyphenError))|DATANotFinishedError)|TagNameMismatchError|In(ternalError|valid(HexCharacterRefError|C(haracter(RefError|InEntityError|Error)|onditionalSectionError)|DecimalCharacterRefError|URIError|Encoding(NameError|Error)))|OutOfMemoryError|D(ocumentStartError|elegateAbortedParseError|OCTYPEDeclNotFinishedError)|U(RI(RequiredError|FragmentError)|n(declaredEntityError|parsedEntityError|knownEncodingError|finishedTagError))|P(CDATARequiredError|ublicIdentifierRequiredError|arsedEntityRef(MissingSemiError|NoNameError|In(Internal(SubsetError|Error)|PrologError|EpilogError)|AtEOFError)|r(ocessingInstructionNot(StartedError|FinishedError)|ematureDocumentEndError))|E(n(codingNotSupportedError|tity(Ref(In(DTDError|PrologError|EpilogError)|erence(MissingSemiError|WithoutNameError)|LoopError|AtEOFError)|BoundaryError|Not(StartedError|FinishedError)|Is(ParameterError|ExternalError)|ValueRequiredError))|qualExpectedError|lementContentDeclNot(StartedError|FinishedError)|xt(ernalS(tandaloneEntityError|ubsetNotFinishedError)|raContentError)|mptyDocumentError)|L(iteralNot(StartedError|FinishedError)|T(RequiredError|SlashRequiredError)|essThanSymbolInAttributeError)|Attribute(RedefinedError|HasNoValueError|Not(StartedError|FinishedError)|ListNot(StartedError|FinishedError)))|rocessingInstructionKind)|E(ntity(GeneralKind|DeclarationKind|UnparsedKind|P(ar(sedKind|ameterKind)|redefined))|lement(Declaration(MixedKind|UndefinedKind|E(lementKind|mptyKind)|Kind|AnyKind)|Kind))|Attribute(N(MToken(sKind|Kind)|otationKind)|CDATAKind|ID(Ref(sKind|Kind)|Kind)|DeclarationKind|En(tit(yKind|iesKind)|umerationKind)|Kind))|M(i(n(XEdge|iaturizableWindowMask|YEdge|uteCalendarUnit)|terLineJoinStyle|ddleSubelement|xedState)|o(nthCalendarUnit|deSwitchFunctionKey|use(Moved(Mask)?|E(ntered(Mask)?|ventSubtype|xited(Mask)?))|veToBezierPathElement|mentary(ChangeButton|Push(Button|InButton)|Light(Button)?))|enuFunctionKey|a(c(intoshInterfaceStyle|OSRomanStringEncoding)|tchesPredicateOperatorType|ppedRead|x(XEdge|YEdge))|ACHOperatingSystem)|B(MPFileType|o(ttomTabsBezelBorder|ldFontMask|rderlessWindowMask|x(Se(condary|parator)|OldStyle|Primary))|uttLineCapStyle|e(zelBorder|velLineJoinStyle|low(Bottom|Top)|gin(sWith(Comparison|PredicateOperatorType)|FunctionKey))|lueControlTint|ack(spaceCharacter|tabTextMovement|ingStore(Retained|Buffered|Nonretained)|TabCharacter|wardsSearch|groundTab)|r(owser(NoColumnResizing|UserColumnResizing|AutoColumnResizing)|eakFunctionKey))|S(h(ift(JISStringEncoding|KeyMask)|ow(ControlGlyphs|InvisibleGlyphs)|adowlessSquareBezelStyle)|y(s(ReqFunctionKey|tem(D(omainMask|efined(Mask)?)|FunctionKey))|mbolStringEncoding)|c(a(nnedOption|le(None|ToFit|Proportionally))|r(oll(er(NoPart|Increment(Page|Line|Arrow)|Decrement(Page|Line|Arrow)|Knob(Slot)?|Arrows(M(inEnd|axEnd)|None|DefaultSetting))|Wheel(Mask)?|LockFunctionKey)|eenChangedEventType))|t(opFunctionKey|r(ingDrawing(OneShot|DisableScreenFontSubstitution|Uses(DeviceMetrics|FontLeading|LineFragmentOrigin))|eam(Status(Reading|NotOpen|Closed|Open(ing)?|Error|Writing|AtEnd)|Event(Has(BytesAvailable|SpaceAvailable)|None|OpenCompleted|E(ndEncountered|rrorOccurred)))))|i(ngle(DateMode|UnderlineStyle)|ze(DownFontAction|UpFontAction))|olarisOperatingSystem|unOSOperatingSystem|pecialPageOrder|e(condCalendarUnit|lect(By(Character|Paragraph|Word)|i(ng(Next|Previous)|onAffinity(Downstream|Upstream))|edTab|FunctionKey)|gmentSwitchTracking(Momentary|Select(One|Any)))|quareLineCapStyle|witchButton|ave(ToOperation|Op(tions(Yes|No|Ask)|eration)|AsOperation)|mall(SquareBezelStyle|C(ontrolSize|apsFontMask)|IconButtonBezelStyle))|H(ighlightModeMatrix|SBModeColorPanel|o(ur(Minute(SecondDatePickerElementFlag|DatePickerElementFlag)|CalendarUnit)|rizontalRuler|meFunctionKey)|TTPCookieAcceptPolicy(Never|OnlyFromMainDocumentDomain|Always)|e(lp(ButtonBezelStyle|KeyMask|FunctionKey)|avierFontAction)|PUXOperatingSystem)|Year(MonthDa(yDatePickerElementFlag|tePickerElementFlag)|CalendarUnit)|N(o(n(StandardCharacterSetFontMask|ZeroWindingRule|activatingPanelMask|LossyASCIIStringEncoding)|Border|t(ification(SuspensionBehavior(Hold|Coalesce|D(eliverImmediately|rop))|NoCoalescing|CoalescingOn(Sender|Name)|DeliverImmediately|PostToAllSessions)|PredicateType|EqualToPredicateOperatorType)|S(cr(iptError|ollerParts)|ubelement|pecifierError)|CellMask|T(itle|opLevelContainersSpecifierError|abs(BezelBorder|NoBorder|LineBorder))|I(nterfaceStyle|mage)|UnderlineStyle|FontChangeAction)|u(ll(Glyph|CellType)|m(eric(Search|PadKeyMask)|berFormatter(Round(Half(Down|Up|Even)|Ceiling|Down|Up|Floor)|Behavior(10|Default)|S(cientificStyle|pellOutStyle)|NoStyle|CurrencyStyle|DecimalStyle|P(ercentStyle|ad(Before(Suffix|Prefix)|After(Suffix|Prefix))))))|e(t(Services(BadArgumentError|NotFoundError|C(ollisionError|ancelledError)|TimeoutError|InvalidError|UnknownError|ActivityInProgress)|workDomainMask)|wlineCharacter|xt(StepInterfaceStyle|FunctionKey))|EXTSTEPStringEncoding|a(t(iveShortGlyphPacking|uralTextAlignment)|rrowFontMask))|C(hange(ReadOtherContents|GrayCell(Mask)?|BackgroundCell(Mask)?|Cleared|Done|Undone|Autosaved)|MYK(ModeColorPanel|ColorSpaceModel)|ircular(BezelStyle|Slider)|o(n(stantValueExpressionType|t(inuousCapacityLevelIndicatorStyle|entsCellMask|ain(sComparison|erSpecifierError)|rol(Glyph|KeyMask))|densedFontMask)|lor(Panel(RGBModeMask|GrayModeMask|HSBModeMask|C(MYKModeMask|olorListModeMask|ustomPaletteModeMask|rayonModeMask)|WheelModeMask|AllModesMask)|ListModeColorPanel)|reServiceDirectory|m(p(osite(XOR|Source(In|O(ut|ver)|Atop)|Highlight|C(opy|lear)|Destination(In|O(ut|ver)|Atop)|Plus(Darker|Lighter))|ressedFontMask)|mandKeyMask))|u(stom(SelectorPredicateOperatorType|PaletteModeColorPanel)|r(sor(Update(Mask)?|PointingDevice)|veToBezierPathElement))|e(nterT(extAlignment|abStopType)|ll(State|H(ighlighted|as(Image(Horizontal|OnLeftOrBottom)|OverlappingImage))|ChangesContents|Is(Bordered|InsetButton)|Disabled|Editable|LightsBy(Gray|Background|Contents)|AllowsMixedState))|l(ipPagination|o(s(ePathBezierPathElement|ableWindowMask)|ckAndCalendarDatePickerStyle)|ear(ControlTint|DisplayFunctionKey|LineFunctionKey))|a(seInsensitive(Search|PredicateOption)|n(notCreateScriptCommandError|cel(Button|TextMovement))|chesDirectory|lculation(NoError|Overflow|DivideByZero|Underflow|LossOfPrecision)|rriageReturnCharacter)|r(itical(Request|AlertStyle)|ayonModeColorPanel))|T(hick(SquareBezelStyle|erSquareBezelStyle)|ypesetter(Behavior|HorizontalTabAction|ContainerBreakAction|ZeroAdvancementAction|OriginalBehavior|ParagraphBreakAction|WhitespaceAction|L(ineBreakAction|atestBehavior))|i(ckMark(Right|Below|Left|Above)|tledWindowMask|meZoneDatePickerElementFlag)|o(olbarItemVisibilityPriority(Standard|High|User|Low)|pTabsBezelBorder|ggleButton)|IFF(Compression(N(one|EXT)|CCITTFAX([34])|OldJPEG|JPEG|PackBits|LZW)|FileType)|e(rminate(Now|Cancel|Later)|xt(Read(InapplicableDocumentTypeError|WriteErrorM(inimum|aximum))|Block(M(i(nimum(Height|Width)|ddleAlignment)|a(rgin|ximum(Height|Width)))|B(o(ttomAlignment|rder)|aselineAlignment)|Height|TopAlignment|P(ercentageValueType|adding)|Width|AbsoluteValueType)|StorageEdited(Characters|Attributes)|CellType|ured(RoundedBezelStyle|BackgroundWindowMask|SquareBezelStyle)|Table(FixedLayoutAlgorithm|AutomaticLayoutAlgorithm)|Field(RoundedBezel|SquareBezel|AndStepperDatePickerStyle)|WriteInapplicableDocumentTypeError|ListPrependEnclosingMarker))|woByteGlyphPacking|ab(Character|TextMovement|le(tP(oint(Mask|EventSubtype)?|roximity(Mask|EventSubtype)?)|Column(NoResizing|UserResizingMask|AutoresizingMask)|View(ReverseSequentialColumnAutoresizingStyle|GridNone|S(olid(HorizontalGridLineMask|VerticalGridLineMask)|equentialColumnAutoresizingStyle)|NoColumnAutoresizing|UniformColumnAutoresizingStyle|FirstColumnOnlyAutoresizingStyle|LastColumnOnlyAutoresizingStyle)))|rackModeMatrix)|I(n(sert(CharFunctionKey|FunctionKey|LineFunctionKey)|t(Type|ernalS(criptError|pecifierError))|dexSubelement|validIndexSpecifierError|formational(Request|AlertStyle)|PredicateOperatorType)|talicFontMask|SO(2022JPStringEncoding|Latin(1StringEncoding|2StringEncoding))|dentityMappingCharacterCollection|llegalTextMovement|mage(R(ight|ep(MatchesDevice|LoadStatus(ReadingHeader|Completed|InvalidData|Un(expectedEOF|knownType)|WillNeedAllData)))|Below|C(ellType|ache(BySize|Never|Default|Always))|Interpolation(High|None|Default|Low)|O(nly|verlaps)|Frame(Gr(oove|ayBezel)|Button|None|Photo)|L(oadStatus(ReadError|C(ompleted|ancelled)|InvalidData|UnexpectedEOF)|eft)|A(lign(Right|Bottom(Right|Left)?|Center|Top(Right|Left)?|Left)|bove)))|O(n(State|eByteGlyphPacking|OffButton|lyScrollerArrows)|ther(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|TextMovement)|SF1OperatingSystem|pe(n(GL(GO(Re(setLibrary|tainRenderers)|ClearFormatCache|FormatCacheSize)|PFA(R(obust|endererID)|M(inimumPolicy|ulti(sample|Screen)|PSafe|aximumPolicy)|BackingStore|S(creenMask|te(ncilSize|reo)|ingleRenderer|upersample|ample(s|Buffers|Alpha))|NoRecovery|C(o(lor(Size|Float)|mpliant)|losestPolicy)|OffScreen|D(oubleBuffer|epthSize)|PixelBuffer|VirtualScreenCount|FullScreen|Window|A(cc(umSize|elerated)|ux(Buffers|DepthStencil)|l(phaSize|lRenderers))))|StepUnicodeReservedBase)|rationNotSupportedForKeyS(criptError|pecifierError))|ffState|KButton|rPredicateType|bjC(B(itfield|oolType)|S(hortType|tr(ingType|uctType)|electorType)|NoType|CharType|ObjectType|DoubleType|UnionType|PointerType|VoidType|FloatType|Long(Type|longType)|ArrayType))|D(i(s(c(losureBezelStyle|reteCapacityLevelIndicatorStyle)|playWindowRunLoopOrdering)|acriticInsensitivePredicateOption|rect(Selection|PredicateModifier))|o(c(ModalWindowMask|ument(Directory|ationDirectory))|ubleType|wn(TextMovement|ArrowFunctionKey))|e(s(cendingPageOrder|ktopDirectory)|cimalTabStopType|v(ice(NColorSpaceModel|IndependentModifierFlagsMask)|eloper(Directory|ApplicationDirectory))|fault(ControlTint|TokenStyle)|lete(Char(acter|FunctionKey)|FunctionKey|LineFunctionKey)|moApplicationDirectory)|a(yCalendarUnit|teFormatter(MediumStyle|Behavior(10|Default)|ShortStyle|NoStyle|FullStyle|LongStyle))|ra(wer(Clos(ingState|edState)|Open(ingState|State))|gOperation(Generic|Move|None|Copy|Delete|Private|Every|Link|All)))|U(ser(CancelledError|D(irectory|omainMask)|FunctionKey)|RL(Handle(NotLoaded|Load(Succeeded|InProgress|Failed))|CredentialPersistence(None|Permanent|ForSession))|n(scaledWindowMask|cachedRead|i(codeStringEncoding|talicFontMask|fiedTitleAndToolbarWindowMask)|d(o(CloseGroupingRunLoopOrdering|FunctionKey)|e(finedDateComponent|rline(Style(Single|None|Thick|Double)|Pattern(Solid|D(ot|ash(Dot(Dot)?)?)))))|known(ColorSpaceModel|P(ointingDevice|ageOrder)|KeyS(criptError|pecifierError))|boldFontMask)|tilityWindowMask|TF8StringEncoding|p(dateWindowsRunLoopOrdering|TextMovement|ArrowFunctionKey))|J(ustifiedTextAlignment|PEG(2000FileType|FileType)|apaneseEUC(GlyphPacking|StringEncoding))|P(o(s(t(Now|erFontMask|WhenIdle|ASAP)|iti(on(Replace|Be(fore|ginning)|End|After)|ve(IntType|DoubleType|FloatType)))|pUp(NoArrow|ArrowAt(Bottom|Center))|werOffEventType|rtraitOrientation)|NGFileType|ush(InCell(Mask)?|OnPushOffButton)|e(n(TipMask|UpperSideMask|PointingDevice|LowerSideMask)|riodic(Mask)?)|P(S(caleField|tatus(Title|Field)|aveButton)|N(ote(Title|Field)|ame(Title|Field))|CopiesField|TitleField|ImageButton|OptionsButton|P(a(perFeedButton|ge(Range(To|From)|ChoiceMatrix))|reviewButton)|LayoutButton)|lainTextTokenStyle|a(useFunctionKey|ragraphSeparatorCharacter|ge(DownFunctionKey|UpFunctionKey))|r(int(ing(ReplyLater|Success|Cancelled|Failure)|ScreenFunctionKey|erTable(NotFound|OK|Error)|FunctionKey)|o(p(ertyList(XMLFormat|MutableContainers(AndLeaves)?|BinaryFormat|Immutable|OpenStepFormat)|rietaryStringEncoding)|gressIndicator(BarStyle|SpinningStyle|Preferred(SmallThickness|Thickness|LargeThickness|AquaThickness)))|e(ssedTab|vFunctionKey))|L(HeightForm|CancelButton|TitleField|ImageButton|O(KButton|rientationMatrix)|UnitsButton|PaperNameButton|WidthForm))|E(n(terCharacter|d(sWith(Comparison|PredicateOperatorType)|FunctionKey))|v(e(nOddWindingRule|rySubelement)|aluatedObjectExpressionType)|qualTo(Comparison|PredicateOperatorType)|ra(serPointingDevice|CalendarUnit|DatePickerElementFlag)|x(clude(10|QuickDrawElementsIconCreationOption)|pandedFontMask|ecuteFunctionKey))|V(i(ew(M(in(XMargin|YMargin)|ax(XMargin|YMargin))|HeightSizable|NotSizable|WidthSizable)|aPanelFontAction)|erticalRuler|a(lidationErrorM(inimum|aximum)|riableExpressionType))|Key(SpecifierEvaluationScriptError|Down(Mask)?|Up(Mask)?|PathExpressionType|Value(MinusSetMutation|SetSetMutation|Change(Re(placement|moval)|Setting|Insertion)|IntersectSetMutation|ObservingOption(New|Old)|UnionSetMutation|ValidationError))|QTMovie(NormalPlayback|Looping(BackAndForthPlayback|Playback))|F(1(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|7FunctionKey|i(nd(PanelAction(Replace(A(ndFind|ll(InSelection)?))?|S(howFindPanel|e(tFindString|lectAll(InSelection)?))|Next|Previous)|FunctionKey)|tPagination|le(Read(No(SuchFileError|PermissionError)|CorruptFileError|In(validFileNameError|applicableStringEncodingError)|Un(supportedSchemeError|knownError))|HandlingPanel(CancelButton|OKButton)|NoSuchFileError|ErrorM(inimum|aximum)|Write(NoPermissionError|In(validFileNameError|applicableStringEncodingError)|OutOfSpaceError|Un(supportedSchemeError|knownError))|LockingError)|xedPitchFontMask)|2(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|o(nt(Mo(noSpaceTrait|dernSerifsClass)|BoldTrait|S(ymbolicClass|criptsClass|labSerifsClass|ansSerifClass)|C(o(ndensedTrait|llectionApplicationOnlyMask)|larendonSerifsClass)|TransitionalSerifsClass|I(ntegerAdvancementsRenderingMode|talicTrait)|O(ldStyleSerifsClass|rnamentalsClass)|DefaultRenderingMode|U(nknownClass|IOptimizedTrait)|Panel(S(hadowEffectModeMask|t(andardModesMask|rikethroughEffectModeMask)|izeModeMask)|CollectionModeMask|TextColorEffectModeMask|DocumentColorEffectModeMask|UnderlineEffectModeMask|FaceModeMask|All(ModesMask|EffectsModeMask))|ExpandedTrait|VerticalTrait|F(amilyClassMask|reeformSerifsClass)|Antialiased(RenderingMode|IntegerAdvancementsRenderingMode))|cusRing(Below|Type(None|Default|Exterior)|Only|Above)|urByteGlyphPacking|rm(attingError(M(inimum|aximum))?|FeedCharacter))|8FunctionKey|unction(ExpressionType|KeyMask)|3(1FunctionKey|2FunctionKey|3FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey)|9FunctionKey|4FunctionKey|P(RevertButton|S(ize(Title|Field)|etButton)|CurrentField|Preview(Button|Field))|l(oat(ingPointSamplesBitmapFormat|Type)|agsChanged(Mask)?)|axButton|5FunctionKey|6FunctionKey)|W(heelModeColorPanel|indow(s(NTOperatingSystem|CP125(1StringEncoding|2StringEncoding|3StringEncoding|4StringEncoding|0StringEncoding)|95(InterfaceStyle|OperatingSystem))|M(iniaturizeButton|ovedEventType)|Below|CloseButton|ToolbarButton|ZoomButton|Out|DocumentIconButton|ExposedEventType|Above)|orkspaceLaunch(NewInstance|InhibitingBackgroundOnly|Default|PreferringClassic|WithoutA(ctivation|ddingToRecents)|A(sync|nd(Hide(Others)?|Print)|llowingClassicStartup))|eek(day(CalendarUnit|OrdinalCalendarUnit)|CalendarUnit)|a(ntsBidiLevels|rningAlertStyle)|r(itingDirection(RightToLeft|Natural|LeftToRight)|apCalendarComponents))|L(i(stModeMatrix|ne(Moves(Right|Down|Up|Left)|B(order|reakBy(C(harWrapping|lipping)|Truncating(Middle|Head|Tail)|WordWrapping))|S(eparatorCharacter|weep(Right|Down|Up|Left))|ToBezierPathElement|DoesntMove|arSlider)|teralSearch|kePredicateOperatorType|ghterFontAction|braryDirectory)|ocalDomainMask|e(ssThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|ft(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey))|a(yout(RightToLeft|NotDone|CantFit|OutOfGlyphs|Done|LeftToRight)|ndscapeOrientation)|ABColorSpaceModel)|A(sc(iiWithDoubleByteEUCGlyphPacking|endingPageOrder)|n(y(Type|PredicateModifier|EventMask)|choredSearch|imation(Blocking|Nonblocking(Threaded)?|E(ffect(DisappearingItemDefault|Poof)|ase(In(Out)?|Out))|Linear)|dPredicateType)|t(Bottom|tachmentCharacter|omicWrite|Top)|SCIIStringEncoding|d(obe(GB1CharacterCollection|CNS1CharacterCollection|Japan(1CharacterCollection|2CharacterCollection)|Korea1CharacterCollection)|dTraitFontAction|minApplicationDirectory)|uto(saveOperation|Pagination)|pp(lication(SupportDirectory|D(irectory|e(fined(Mask)?|legateReply(Success|Cancel|Failure)|activatedEventType))|ActivatedEventType)|KitDefined(Mask)?)|l(ternateKeyMask|pha(ShiftKeyMask|NonpremultipliedBitmapFormat|FirstBitmapFormat)|ert(SecondButtonReturn|ThirdButtonReturn|OtherReturn|DefaultReturn|ErrorReturn|FirstButtonReturn|AlternateReturn)|l(ScrollerParts|DomainsMask|PredicateModifier|LibrariesDirectory|ApplicationsDirectory))|rgument(sWrongScriptError|EvaluationScriptError)|bove(Bottom|Top)|WTEventType))\\b",
       "name": "support.constant.cocoa.objc"
     },
     "anonymous_pattern_4": {
@@ -344,7 +344,7 @@
       ]
     },
     "anonymous_pattern_5": {
-      "match": "\\b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\\b",
+      "match": "\\b(NS_(?:DURING|HANDLER|ENDHANDLER))\\b",
       "name": "keyword.control.macro.objc"
     },
     "anonymous_pattern_7": {
@@ -375,7 +375,7 @@
       "name": "keyword.control.protocol-specification.objc"
     },
     "apple_foundation_functional_macros": {
-      "begin": "(\\b(?:API_AVAILABLE|API_DEPRECATED|API_UNAVAILABLE|NS_AVAILABLE|NS_AVAILABLE_MAC|NS_AVAILABLE_IOS|NS_DEPRECATED|NS_DEPRECATED_MAC|NS_DEPRECATED_IOS|NS_SWIFT_NAME))(?:(?:\\s)+)?(\\()",
+      "begin": "(\\b(?:API_AVAILABLE|API_DEPRECATED|API_UNAVAILABLE|NS_AVAILABLE|NS_AVAILABLE_MAC|NS_AVAILABLE_IOS|NS_DEPRECATED|NS_DEPRECATED_MAC|NS_DEPRECATED_IOS|NS_SWIFT_NAME))\\s+{0,1}(\\()",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.preprocessor.apple-foundation.objc"
@@ -404,7 +404,7 @@
           "name": "punctuation.section.scope.begin.objc"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.objc"
@@ -422,7 +422,7 @@
               "name": "punctuation.separator.arguments.objc"
             }
           },
-          "end": "(?=\\])",
+          "end": "(?=])",
           "name": "meta.function-call.predicate.objc",
           "patterns": [
             {
@@ -483,7 +483,7 @@
                   "name": "keyword.other.predicate.cocoa.objc"
                 },
                 {
-                  "match": "\\\\(\\\\|[abefnrtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-zA-Z0-9]+)",
+                  "match": "\\\\([\\\\abefnrtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-zA-Z0-9]+)",
                   "name": "constant.character.escape.objc"
                 },
                 {
@@ -504,7 +504,7 @@
           ]
         },
         {
-          "begin": "(?=\\w)(?<=[\\w\\])\"] )(\\w+(?:(:)|(?=\\])))",
+          "begin": "(?=\\w)(?<=[\\w\\])\"] )(\\w+(?:(:)|(?=])))",
           "beginCaptures": {
             "1": {
               "name": "support.function.any-method.objc"
@@ -513,7 +513,7 @@
               "name": "punctuation.separator.arguments.objc"
             }
           },
-          "end": "(?=\\])",
+          "end": "(?=])",
           "name": "meta.function-call.objc",
           "patterns": [
             {
@@ -558,7 +558,7 @@
               "name": "support.function.C99.objc"
             }
           },
-          "match": "(\\s*)\\b(hypot(f|l)?|s(scanf|ystem|nprintf|ca(nf|lb(n(f|l)?|ln(f|l)?))|i(n(h(f|l)?|f|l)?|gn(al|bit))|tr(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|k|f|l(d|l)?)|error|pbrk|ftime|len|rchr|xfrm)|printf|et(jmp|vbuf|locale|buf)|qrt(f|l)?|w(scanf|printf)|rand)|n(e(arbyint(f|l)?|xt(toward(f|l)?|after(f|l)?))|an(f|l)?)|c(s(in(h(f|l)?|f|l)?|qrt(f|l)?)|cos(h(f)?|f|l)?|imag(f|l)?|t(ime|an(h(f|l)?|f|l)?)|o(s(h(f|l)?|f|l)?|nj(f|l)?|pysign(f|l)?)|p(ow(f|l)?|roj(f|l)?)|e(il(f|l)?|xp(f|l)?)|l(o(ck|g(f|l)?)|earerr)|a(sin(h(f|l)?|f|l)?|cos(h(f|l)?|f|l)?|tan(h(f|l)?|f|l)?|lloc|rg(f|l)?|bs(f|l)?)|real(f|l)?|brt(f|l)?)|t(ime|o(upper|lower)|an(h(f|l)?|f|l)?|runc(f|l)?|gamma(f|l)?|mp(nam|file))|i(s(space|n(ormal|an)|cntrl|inf|digit|u(nordered|pper)|p(unct|rint)|finite|w(space|c(ntrl|type)|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit|blank)|l(ower|ess(equal|greater)?)|al(num|pha)|gr(eater(equal)?|aph)|xdigit|blank)|logb(f|l)?|max(div|abs))|di(v|fftime)|_Exit|unget(c|wc)|p(ow(f|l)?|ut(s|c(har)?|wc(har)?)|error|rintf)|e(rf(c(f|l)?|f|l)?|x(it|p(2(f|l)?|f|l|m1(f|l)?)?))|v(s(scanf|nprintf|canf|printf|w(scanf|printf))|printf|f(scanf|printf|w(scanf|printf))|w(scanf|printf)|a_(start|copy|end|arg))|qsort|f(s(canf|e(tpos|ek))|close|tell|open|dim(f|l)?|p(classify|ut(s|c|w(s|c))|rintf)|e(holdexcept|set(e(nv|xceptflag)|round)|clearexcept|testexcept|of|updateenv|r(aiseexcept|ror)|get(e(nv|xceptflag)|round))|flush|w(scanf|ide|printf|rite)|loor(f|l)?|abs(f|l)?|get(s|c|pos|w(s|c))|re(open|e|ad|xp(f|l)?)|m(in(f|l)?|od(f|l)?|a(f|l|x(f|l)?)?))|l(d(iv|exp(f|l)?)|o(ngjmp|cal(time|econv)|g(1(p(f|l)?|0(f|l)?)|2(f|l)?|f|l|b(f|l)?)?)|abs|l(div|abs|r(int(f|l)?|ound(f|l)?))|r(int(f|l)?|ound(f|l)?)|gamma(f|l)?)|w(scanf|c(s(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|k|f|l(d|l)?|mbs)|pbrk|ftime|len|r(chr|tombs)|xfrm)|to(b|mb)|rtomb)|printf|mem(set|c(hr|py|mp)|move))|a(s(sert|ctime|in(h(f|l)?|f|l)?)|cos(h(f|l)?|f|l)?|t(o(i|f|l(l)?)|exit|an(h(f|l)?|2(f|l)?|f|l)?)|b(s|ort))|g(et(s|c(har)?|env|wc(har)?)|mtime)|r(int(f|l)?|ound(f|l)?|e(name|alloc|wind|m(ove|quo(f|l)?|ainder(f|l)?))|a(nd|ise))|b(search|towc)|m(odf(f|l)?|em(set|c(hr|py|mp)|move)|ktime|alloc|b(s(init|towcs|rtowcs)|towc|len|r(towc|len))))\\b"
+          "match": "(\\s*)\\b(hypot([fl])?|s(scanf|ystem|nprintf|ca(nf|lb(n([fl])?|ln([fl])?))|i(n(h([fl])?|[fl])?|gn(al|bit))|tr(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|[kf]|l([dl])?)|error|pbrk|ftime|len|rchr|xfrm)|printf|et(jmp|vbuf|locale|buf)|qrt([fl])?|w(scanf|printf)|rand)|n(e(arbyint([fl])?|xt(toward([fl])?|after([fl])?))|an([fl])?)|c(s(in(h([fl])?|[fl])?|qrt([fl])?)|cos(h(f)?|[fl])?|imag([fl])?|t(ime|an(h([fl])?|[fl])?)|o(s(h([fl])?|[fl])?|nj([fl])?|pysign([fl])?)|p(ow([fl])?|roj([fl])?)|e(il([fl])?|xp([fl])?)|l(o(ck|g([fl])?)|earerr)|a(sin(h([fl])?|[fl])?|cos(h([fl])?|[fl])?|tan(h([fl])?|[fl])?|lloc|rg([fl])?|bs([fl])?)|real([fl])?|brt([fl])?)|t(ime|o(upper|lower)|an(h([fl])?|[fl])?|runc([fl])?|gamma([fl])?|mp(nam|file))|i(s(space|n(ormal|an)|cntrl|inf|digit|u(nordered|pper)|p(unct|rint)|finite|w(space|c(ntrl|type)|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit|blank)|l(ower|ess(equal|greater)?)|al(num|pha)|gr(eater(equal)?|aph)|xdigit|blank)|logb([fl])?|max(div|abs))|di(v|fftime)|_Exit|unget(c|wc)|p(ow([fl])?|ut(s|c(har)?|wc(har)?)|error|rintf)|e(rf(c([fl])?|[fl])?|x(it|p(2([fl])?|[fl]|m1([fl])?)?))|v(s(scanf|nprintf|canf|printf|w(scanf|printf))|printf|f(scanf|printf|w(scanf|printf))|w(scanf|printf)|a_(start|copy|end|arg))|qsort|f(s(canf|e(tpos|ek))|close|tell|open|dim([fl])?|p(classify|ut([sc]|w([sc]))|rintf)|e(holdexcept|set(e(nv|xceptflag)|round)|clearexcept|testexcept|of|updateenv|r(aiseexcept|ror)|get(e(nv|xceptflag)|round))|flush|w(scanf|ide|printf|rite)|loor([fl])?|abs([fl])?|get([sc]|pos|w([sc]))|re(open|e|ad|xp([fl])?)|m(in([fl])?|od([fl])?|a([fl]|x([fl])?)?))|l(d(iv|exp([fl])?)|o(ngjmp|cal(time|econv)|g(1(p([fl])?|0([fl])?)|2([fl])?|[fl]|b([fl])?)?)|abs|l(div|abs|r(int([fl])?|ound([fl])?))|r(int([fl])?|ound([fl])?)|gamma([fl])?)|w(scanf|c(s(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|[kf]|l([dl])?|mbs)|pbrk|ftime|len|r(chr|tombs)|xfrm)|to(b|mb)|rtomb)|printf|mem(set|c(hr|py|mp)|move))|a(s(sert|ctime|in(h([fl])?|[fl])?)|cos(h([fl])?|[fl])?|t(o([if]|l(l)?)|exit|an(h([fl])?|2([fl])?|[fl])?)|b(s|ort))|g(et(s|c(har)?|env|wc(har)?)|mtime)|r(int([fl])?|ound([fl])?|e(name|alloc|wind|m(ove|quo([fl])?|ainder([fl])?))|a(nd|ise))|b(search|towc)|m(odf([fl])?|em(set|c(hr|py|mp)|move)|ktime|alloc|b(s(init|towcs|rtowcs)|towc|len|r(towc|len))))\\b"
         },
         {
           "captures": {
@@ -642,7 +642,7 @@
           "include": "#special_variables"
         },
         {
-          "begin": "^\\s*((\\#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
+          "begin": "^\\s*((#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.define.objc"
@@ -666,7 +666,7 @@
               "name": "punctuation.definition.parameters.end.objc"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.macro.objc",
           "patterns": [
             {
@@ -743,7 +743,7 @@
           ]
         },
         {
-          "begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
+          "begin": "^\\s*((#)\\s*(i(?:nclude(?:_next)?|mport)))\\b\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.$3.objc"
@@ -752,7 +752,7 @@
               "name": "punctuation.definition.directive.objc"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.include.objc",
           "patterns": [
             {
@@ -803,7 +803,7 @@
               "name": "punctuation.definition.directive.objc"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objc",
           "patterns": [
             {
@@ -818,7 +818,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*undef))\\b",
+          "begin": "^\\s*((#)\\s*undef)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.undef.objc"
@@ -827,7 +827,7 @@
               "name": "punctuation.definition.directive.objc"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objc",
           "patterns": [
             {
@@ -840,7 +840,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*pragma))\\b",
+          "begin": "^\\s*((#)\\s*pragma)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.pragma.objc"
@@ -849,7 +849,7 @@
               "name": "punctuation.definition.directive.objc"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.pragma.objc",
           "patterns": [
             {
@@ -872,7 +872,7 @@
           "name": "support.type.sys-types.objc"
         },
         {
-          "match": "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b",
+          "match": "\\b(pthread_(?:attr_t|cond_t|condattr_t|mutex_t|mutexattr_t|once_t|rwlock_t|rwlockattr_t|t|key_t))\\b",
           "name": "support.type.pthread.objc"
         },
         {
@@ -911,7 +911,7 @@
           "include": "#line_continuation_character"
         },
         {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!])",
           "beginCaptures": {
             "1": {
               "name": "variable.object.objc"
@@ -920,7 +920,7 @@
               "name": "punctuation.definition.begin.bracket.square.objc"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.objc"
@@ -934,7 +934,7 @@
           ]
         },
         {
-          "match": "\\[\\s*\\]",
+          "match": "\\[\\s*]",
           "name": "storage.modifier.array.bracket.square.objc"
         },
         {
@@ -948,7 +948,7 @@
       ],
       "repository": {
         "access-method": {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))\\s*(?:(\\.)|(->))((?:[a-zA-Z_][a-zA-Z_0-9]*\\s*(?:\\.|->))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.object.objc"
@@ -1002,13 +1002,13 @@
         "block": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objc"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objc"
@@ -1044,7 +1044,7 @@
               "include": "#c_function_call"
             },
             {
-              "begin": "(?:(?:(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)))((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "variable.other.objc"
@@ -1067,13 +1067,13 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objc"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objc"
@@ -1094,7 +1094,7 @@
           ]
         },
         "c_function_call": {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
           "end": "(?<=\\))(?!\\w)",
           "name": "meta.function-call.objc",
           "patterns": [
@@ -1246,7 +1246,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objc"
@@ -1306,7 +1306,7 @@
               "include": "#vararg_ellipses"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objc"
@@ -1414,7 +1414,7 @@
                       "name": "punctuation.separator.pointer-access.objc"
                     }
                   },
-                  "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+                  "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
                 }
               ]
             },
@@ -1422,10 +1422,10 @@
               "name": "variable.other.member.objc"
             }
           },
-          "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())"
+          "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?-im:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*(\\b(?!(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())"
         },
         "method_access": {
-          "begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
+          "begin": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?-im:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1472,7 +1472,7 @@
                       "name": "punctuation.separator.pointer-access.objc"
                     }
                   },
-                  "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+                  "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
                 }
               ]
             },
@@ -1498,7 +1498,7 @@
         },
         "numbers": {
           "begin": "(?<!\\w)(?=\\d|\\.\\d)",
-          "end": "(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))",
+          "end": "(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))",
           "patterns": [
             {
               "captures": {
@@ -1512,7 +1512,7 @@
                   "name": "constant.numeric.exponent.hexadecimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1524,7 +1524,7 @@
                   "name": "constant.numeric.hexadecimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1539,7 +1539,7 @@
                   "name": "constant.numeric.hexadecimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1554,7 +1554,7 @@
                   "name": "keyword.operator.plus.exponent.hexadecimal.objc"
                 }
               },
-              "match": "(\\G0[xX])(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1565,7 +1565,7 @@
                   "name": "constant.numeric.exponent.decimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1577,7 +1577,7 @@
                   "name": "constant.numeric.decimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1592,7 +1592,7 @@
                   "name": "constant.numeric.decimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1607,7 +1607,7 @@
                   "name": "keyword.operator.plus.exponent.decimal.objc"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9])\\.|\\.(?=[0-9])))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1618,7 +1618,7 @@
                   "name": "constant.numeric.binary.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1630,7 +1630,7 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G0[bB])([01](?:(?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1641,7 +1641,7 @@
                   "name": "constant.numeric.octal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1653,7 +1653,7 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G0)((?:(?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))+)(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1664,7 +1664,7 @@
                   "name": "constant.numeric.hexadecimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1685,7 +1685,7 @@
                   "name": "constant.numeric.exponent.hexadecimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1694,7 +1694,7 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G0[xX])([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1702,7 +1702,7 @@
                   "name": "constant.numeric.decimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1723,7 +1723,7 @@
                   "name": "constant.numeric.exponent.decimal.objc",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objc"
                     }
                   ]
@@ -1732,10 +1732,10 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
-              "match": "(?:(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))+",
+              "match": "(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-])+",
               "name": "invalid.illegal.constant.numeric.objc"
             }
           ]
@@ -1767,7 +1767,7 @@
               "name": "keyword.operator.bitwise.shift.objc"
             },
             {
-              "match": "!=|<=|>=|==|<|>",
+              "match": "!=|<=|>=|==|[<>]",
               "name": "keyword.operator.comparison.objc"
             },
             {
@@ -1775,7 +1775,7 @@
               "name": "keyword.operator.logical.objc"
             },
             {
-              "match": "&|\\||\\^|~",
+              "match": "[\\&|^~]",
               "name": "keyword.operator.objc"
             },
             {
@@ -1783,7 +1783,7 @@
               "name": "keyword.operator.assignment.objc"
             },
             {
-              "match": "%|\\*|/|-|\\+",
+              "match": "[%*/\\-+]",
               "name": "keyword.operator.objc"
             },
             {
@@ -1849,7 +1849,7 @@
               "include": "#block_innards"
             },
             {
-              "match": "(?-mix:(?<!:):(?!:))",
+              "match": "(?-im:(?<!:):(?!:))",
               "name": "punctuation.range-based.objc"
             }
           ]
@@ -1901,7 +1901,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objc",
                   "patterns": [
@@ -1948,7 +1948,7 @@
                   "name": "invalid.illegal.stray-$1.objc"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
@@ -1981,7 +1981,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objc",
                   "patterns": [
@@ -2028,14 +2028,14 @@
                   "name": "invalid.illegal.stray-$1.objc"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
         "preprocessor-rule-conditional-line": {
           "patterns": [
             {
-              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
+              "match": "\\bdefined\\b(?:\\s*$|(?=\\s*\\(*\\s*(?!defined\\b)[a-zA-Z_$][\\w$]*\\b\\s*\\)*\\s*(?:\\n|//|/\\*|[?:]|&&|\\|\\||\\\\\\s*\\n)))",
               "name": "keyword.control.directive.conditional.objc"
             },
             {
@@ -2108,13 +2108,13 @@
         "preprocessor-rule-define-line-blocks": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objc"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objc"
@@ -2140,13 +2140,13 @@
               "include": "#vararg_ellipses"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objc"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objc"
@@ -2168,7 +2168,7 @@
               "name": "punctuation.section.parens.end.bracket.round.objc"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
               "end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
               "name": "meta.function.objc",
               "patterns": [
@@ -2258,7 +2258,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objc"
@@ -2332,7 +2332,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objc",
                   "patterns": [
@@ -2366,10 +2366,10 @@
                       "name": "punctuation.definition.directive.objc"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objc",
                       "patterns": [
@@ -2386,7 +2386,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.objc",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2429,7 +2429,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objc",
                   "patterns": [
@@ -2463,10 +2463,10 @@
                       "name": "punctuation.definition.directive.objc"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objc",
                       "patterns": [
@@ -2483,7 +2483,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objc",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2510,10 +2510,10 @@
               "name": "punctuation.definition.directive.objc"
             }
           },
-          "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objc",
               "patterns": [
@@ -2528,7 +2528,7 @@
             {
               "begin": "\\n",
               "contentName": "comment.block.preprocessor.elif-branch.objc",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2572,7 +2572,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objc",
                   "patterns": [
@@ -2622,7 +2622,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.objc",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2634,7 +2634,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "$base"
@@ -2674,7 +2674,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objc",
                   "patterns": [
@@ -2724,7 +2724,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objc",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2736,7 +2736,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#block_innards"
@@ -2763,7 +2763,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objc",
               "patterns": [
@@ -2777,7 +2777,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2817,7 +2817,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objc",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2850,7 +2850,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objc",
               "patterns": [
@@ -2864,7 +2864,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2904,7 +2904,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objc",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2967,7 +2967,7 @@
               "name": "variable.parameter.probably.objc"
             }
           },
-          "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\]\\)]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
+          "match": "(?<=(?:[a-zA-Z_0-9] |[\\&*>\\])]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[]\\s*)?[,)])"
         },
         "static_assert": {
           "begin": "(static_assert|_Static_assert)\\s*(\\()",
@@ -2987,7 +2987,7 @@
           },
           "patterns": [
             {
-              "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
+              "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\")?)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.delimiter.objc"
@@ -3012,15 +3012,15 @@
         "storage_types": {
           "patterns": [
             {
-              "match": "(?-mix:(?<!\\w)(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool)(?!\\w))",
+              "match": "(?-im:(?<!\\w)(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool)(?!\\w))",
               "name": "storage.type.built-in.primitive.objc"
             },
             {
-              "match": "(?-mix:(?<!\\w)(?:_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t)(?!\\w))",
+              "match": "(?-im:(?<!\\w)(?:_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t)(?!\\w))",
               "name": "storage.type.built-in.objc"
             },
             {
-              "match": "(?-mix:\\b(asm|__asm__|enum|struct|union)\\b)",
+              "match": "(?-im:\\b(asm|__asm__|enum|struct|union)\\b)",
               "name": "storage.type.$1.objc"
             }
           ]
@@ -3028,7 +3028,7 @@
         "string_escaped_char": {
           "patterns": [
             {
-              "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+              "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
               "name": "constant.character.escape.objc"
             },
             {
@@ -3040,7 +3040,7 @@
         "string_placeholder": {
           "patterns": [
             {
-              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
               "name": "constant.other.placeholder.objc"
             },
             {
@@ -3136,7 +3136,7 @@
               "name": "keyword.control.switch.objc"
             }
           },
-          "end": "(?:(?<=\\})|(?=[;>\\[\\]=]))",
+          "end": "(?:(?<=})|(?=[;>\\[\\]=]))",
           "name": "meta.block.switch.objc",
           "patterns": [
             {
@@ -3159,7 +3159,7 @@
             },
             {
               "begin": "(?<=\\{)",
-              "end": "(\\})",
+              "end": "(})",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.section.block.end.bracket.curly.switch.objc"
@@ -3242,7 +3242,6 @@
     },
     "disabled": {
       "begin": "^\\s*#\\s*if(n?def)?\\b.*$",
-      "comment": "eat nested preprocessor if(def)s",
       "end": "^\\s*#\\s*endif\\b.*$",
       "patterns": [
         {
@@ -3301,8 +3300,8 @@
       ]
     },
     "method": {
-      "begin": "^(-|\\+)\\s*",
-      "end": "(?=\\{|#)|;",
+      "begin": "^([-+])\\s*",
+      "end": "(?=[{#])|;",
       "name": "meta.function.objc",
       "patterns": [
         {
@@ -3379,8 +3378,8 @@
       ]
     },
     "method_super": {
-      "begin": "^(?=-|\\+)",
-      "end": "(?<=\\})|(?=#)",
+      "begin": "^(?=[-+])",
+      "end": "(?<=})|(?=#)",
       "name": "meta.function-with-body.objc",
       "patterns": [
         {
@@ -3419,7 +3418,7 @@
           "name": "constant.numeric.preprocessor.objc"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
@@ -3431,7 +3430,7 @@
               "name": "keyword.control.import.else.objc"
             }
           },
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#interface_innards"
@@ -3440,7 +3439,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "name": "comment.block.preprocessor.if-branch.objc",
           "patterns": [
             {
@@ -3466,7 +3465,7 @@
           "name": "constant.numeric.preprocessor.objc"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
@@ -3478,7 +3477,7 @@
               "name": "keyword.control.import.else.objc"
             }
           },
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#interface_innards"
@@ -3487,7 +3486,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "name": "comment.block.preprocessor.if-branch.objc",
           "patterns": [
             {
@@ -3513,7 +3512,7 @@
           "name": "constant.numeric.preprocessor.objc"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b).*",
@@ -3526,7 +3525,7 @@
             }
           },
           "contentName": "comment.block.preprocessor.else-branch.objc",
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#disabled"
@@ -3538,7 +3537,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#implementation_innards"
@@ -3560,7 +3559,7 @@
           "name": "constant.numeric.preprocessor.objc"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b).*",
@@ -3573,7 +3572,7 @@
             }
           },
           "contentName": "comment.block.preprocessor.else-branch.objc",
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#disabled"
@@ -3585,7 +3584,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#interface_innards"
@@ -3595,7 +3594,7 @@
       ]
     },
     "preprocessor-rule-other-implementation": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=/[/*])|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.objc"
@@ -3604,7 +3603,7 @@
           "name": "keyword.control.import.objc"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=(?://|/\\*))|$)",
+      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=/[/*])|$)",
       "patterns": [
         {
           "include": "#implementation_innards"
@@ -3612,7 +3611,7 @@
       ]
     },
     "preprocessor-rule-other-interface": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=/[/*])|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.objc"
@@ -3621,7 +3620,7 @@
           "name": "keyword.control.import.objc"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=(?://|/\\*))|$)",
+      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=/[/*])|$)",
       "patterns": [
         {
           "include": "#interface_innards"
@@ -3712,7 +3711,7 @@
           "name": "variable.other.selector.objc"
         },
         {
-          "match": "\\b(self|super)\\b",
+          "match": "\\b(s(?:elf|uper))\\b",
           "name": "variable.language.objc"
         }
       ]
@@ -3720,7 +3719,7 @@
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+          "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
           "name": "constant.character.escape.objc"
         },
         {
@@ -3732,7 +3731,7 @@
     "string_placeholder": {
       "patterns": [
         {
-          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
           "name": "constant.other.placeholder.objc"
         },
         {
diff --git a/resources/languages/objective-cpp.json b/resources/languages/objective-cpp.json
index 75fe201..6de88ce 100644
--- a/resources/languages/objective-cpp.json
+++ b/resources/languages/objective-cpp.json
@@ -104,7 +104,7 @@
   ],
   "repository": {
     "anonymous_pattern_1": {
-      "begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)(?:\\s*)([A-Za-z][A-Za-z0-9]*))?(\\s|\\n)?",
+      "begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)\\s*([A-Za-z][A-Za-z0-9]*))?([\\s\\n])?",
       "captures": {
         "1": {
           "name": "storage.type.objcpp"
@@ -191,7 +191,7 @@
               "name": "punctuation.separator.arguments.objcpp"
             }
           },
-          "match": "\\b(?:[a-zA-Z_:][\\w]*)+",
+          "match": "\\b(?:[a-zA-Z_:]\\w*)+",
           "name": "support.function.any-method.name-of-parameter.objcpp"
         }
       ]
@@ -233,7 +233,7 @@
           "name": "support.function.cocoa.objcpp"
         }
       },
-      "match": "(\\s*)\\b(NS(R(ound(DownToMultipleOfPageSize|UpToMultipleOfPageSize)|un(CriticalAlertPanel(RelativeToWindow)?|InformationalAlertPanel(RelativeToWindow)?|AlertPanel(RelativeToWindow)?)|e(set(MapTable|HashTable)|c(ycleZone|t(Clip(List)?|F(ill(UsingOperation|List(UsingOperation|With(Grays|Colors(UsingOperation)?))?)?|romString))|ordAllocationEvent)|turnAddress|leaseAlertPanel|a(dPixel|l(MemoryAvailable|locateCollectable))|gisterServicesProvider)|angeFromString)|Get(SizeAndAlignment|CriticalAlertPanel|InformationalAlertPanel|UncaughtExceptionHandler|FileType(s)?|WindowServerMemory|AlertPanel)|M(i(n(X|Y)|d(X|Y))|ouseInRect|a(p(Remove|Get|Member|Insert(IfAbsent|KnownAbsent)?)|ke(R(ect|ange)|Size|Point)|x(Range|X|Y)))|B(itsPer(SampleFromDepth|PixelFromDepth)|e(stDepth|ep|gin(CriticalAlertSheet|InformationalAlertSheet|AlertSheet)))|S(ho(uldRetainWithZone|w(sServicesMenuItem|AnimationEffect))|tringFrom(R(ect|ange)|MapTable|S(ize|elector)|HashTable|Class|Point)|izeFromString|e(t(ShowsServicesMenuItem|ZoneName|UncaughtExceptionHandler|FocusRingStyle)|lectorFromString|archPathForDirectoriesInDomains)|wap(Big(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|Short|Host(ShortTo(Big|Little)|IntTo(Big|Little)|DoubleTo(Big|Little)|FloatTo(Big|Little)|Long(To(Big|Little)|LongTo(Big|Little)))|Int|Double|Float|L(ittle(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|ong(Long)?)))|H(ighlightRect|o(stByteOrder|meDirectory(ForUser)?)|eight|ash(Remove|Get|Insert(IfAbsent|KnownAbsent)?)|FSType(CodeFromFileType|OfFile))|N(umberOfColorComponents|ext(MapEnumeratorPair|HashEnumeratorItem))|C(o(n(tainsRect|vert(GlyphsToPackedGlyphs|Swapped(DoubleToHost|FloatToHost)|Host(DoubleToSwapped|FloatToSwapped)))|unt(MapTable|HashTable|Frames|Windows(ForContext)?)|py(M(emoryPages|apTableWithZone)|Bits|HashTableWithZone|Object)|lorSpaceFromDepth|mpare(MapTables|HashTables))|lassFromString|reate(MapTable(WithZone)?|HashTable(WithZone)?|Zone|File(namePboardType|ContentsPboardType)))|TemporaryDirectory|I(s(ControllerMarker|EmptyRect|FreedObject)|n(setRect|crementExtraRefCount|te(r(sect(sRect|ionR(ect|ange))|faceStyleForKey)|gralRect)))|Zone(Realloc|Malloc|Name|Calloc|Fr(omPointer|ee))|O(penStepRootDirectory|ffsetRect)|D(i(sableScreenUpdates|videRect)|ottedFrameRect|e(c(imal(Round|Multiply|S(tring|ubtract)|Normalize|Co(py|mpa(ct|re))|IsNotANumber|Divide|Power|Add)|rementExtraRefCountWasZero)|faultMallocZone|allocate(MemoryPages|Object))|raw(Gr(oove|ayBezel)|B(itmap|utton)|ColorTiledRects|TiledRects|DarkBezel|W(hiteBezel|indowBackground)|LightBezel))|U(serName|n(ionR(ect|ange)|registerServicesProvider)|pdateDynamicServices)|Java(Bundle(Setup|Cleanup)|Setup(VirtualMachine)?|Needs(ToLoadClasses|VirtualMachine)|ClassesF(orBundle|romPath)|ObjectNamedInPath|ProvidesClasses)|P(oint(InRect|FromString)|erformService|lanarFromDepth|ageSize)|E(n(d(MapTableEnumeration|HashTableEnumeration)|umerate(MapTable|HashTable)|ableScreenUpdates)|qual(R(ects|anges)|Sizes|Points)|raseRect|xtraRefCount)|F(ileTypeForHFSTypeCode|ullUserName|r(ee(MapTable|HashTable)|ame(Rect(WithWidth(UsingOperation)?)?|Address)))|Wi(ndowList(ForContext)?|dth)|Lo(cationInRange|g(v|PageSize)?)|A(ccessibility(R(oleDescription(ForUIElement)?|aiseBadArgumentException)|Unignored(Children(ForOnlyChild)?|Descendant|Ancestor)|PostNotification|ActionDescription)|pplication(Main|Load)|vailableWindowDepths|ll(MapTable(Values|Keys)|HashTableObjects|ocate(MemoryPages|Collectable|Object)))))\\b"
+      "match": "(\\s*)\\b(NS(R(ound(DownToMultipleOfPageSize|UpToMultipleOfPageSize)|un(CriticalAlertPanel(RelativeToWindow)?|InformationalAlertPanel(RelativeToWindow)?|AlertPanel(RelativeToWindow)?)|e(set(MapTable|HashTable)|c(ycleZone|t(Clip(List)?|F(ill(UsingOperation|List(UsingOperation|With(Grays|Colors(UsingOperation)?))?)?|romString))|ordAllocationEvent)|turnAddress|leaseAlertPanel|a(dPixel|l(MemoryAvailable|locateCollectable))|gisterServicesProvider)|angeFromString)|Get(SizeAndAlignment|CriticalAlertPanel|InformationalAlertPanel|UncaughtExceptionHandler|FileType(s)?|WindowServerMemory|AlertPanel)|M(i(n([XY])|d([XY]))|ouseInRect|a(p(Remove|Get|Member|Insert(IfAbsent|KnownAbsent)?)|ke(R(ect|ange)|Size|Point)|x(Range|[XY])))|B(itsPer(SampleFromDepth|PixelFromDepth)|e(stDepth|ep|gin(CriticalAlertSheet|InformationalAlertSheet|AlertSheet)))|S(ho(uldRetainWithZone|w(sServicesMenuItem|AnimationEffect))|tringFrom(R(ect|ange)|MapTable|S(ize|elector)|HashTable|Class|Point)|izeFromString|e(t(ShowsServicesMenuItem|ZoneName|UncaughtExceptionHandler|FocusRingStyle)|lectorFromString|archPathForDirectoriesInDomains)|wap(Big(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|Short|Host(ShortTo(Big|Little)|IntTo(Big|Little)|DoubleTo(Big|Little)|FloatTo(Big|Little)|Long(To(Big|Little)|LongTo(Big|Little)))|Int|Double|Float|L(ittle(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|ong(Long)?)))|H(ighlightRect|o(stByteOrder|meDirectory(ForUser)?)|eight|ash(Remove|Get|Insert(IfAbsent|KnownAbsent)?)|FSType(CodeFromFileType|OfFile))|N(umberOfColorComponents|ext(MapEnumeratorPair|HashEnumeratorItem))|C(o(n(tainsRect|vert(GlyphsToPackedGlyphs|Swapped(DoubleToHost|FloatToHost)|Host(DoubleToSwapped|FloatToSwapped)))|unt(MapTable|HashTable|Frames|Windows(ForContext)?)|py(M(emoryPages|apTableWithZone)|Bits|HashTableWithZone|Object)|lorSpaceFromDepth|mpare(MapTables|HashTables))|lassFromString|reate(MapTable(WithZone)?|HashTable(WithZone)?|Zone|File(namePboardType|ContentsPboardType)))|TemporaryDirectory|I(s(ControllerMarker|EmptyRect|FreedObject)|n(setRect|crementExtraRefCount|te(r(sect(sRect|ionR(ect|ange))|faceStyleForKey)|gralRect)))|Zone(Realloc|Malloc|Name|Calloc|Fr(omPointer|ee))|O(penStepRootDirectory|ffsetRect)|D(i(sableScreenUpdates|videRect)|ottedFrameRect|e(c(imal(Round|Multiply|S(tring|ubtract)|Normalize|Co(py|mpa(ct|re))|IsNotANumber|Divide|Power|Add)|rementExtraRefCountWasZero)|faultMallocZone|allocate(MemoryPages|Object))|raw(Gr(oove|ayBezel)|B(itmap|utton)|ColorTiledRects|TiledRects|DarkBezel|W(hiteBezel|indowBackground)|LightBezel))|U(serName|n(ionR(ect|ange)|registerServicesProvider)|pdateDynamicServices)|Java(Bundle(Setup|Cleanup)|Setup(VirtualMachine)?|Needs(ToLoadClasses|VirtualMachine)|ClassesF(orBundle|romPath)|ObjectNamedInPath|ProvidesClasses)|P(oint(InRect|FromString)|erformService|lanarFromDepth|ageSize)|E(n(d(MapTableEnumeration|HashTableEnumeration)|umerate(MapTable|HashTable)|ableScreenUpdates)|qual(R(ects|anges)|Sizes|Points)|raseRect|xtraRefCount)|F(ileTypeForHFSTypeCode|ullUserName|r(ee(MapTable|HashTable)|ame(Rect(WithWidth(UsingOperation)?)?|Address)))|Wi(ndowList(ForContext)?|dth)|Lo(cationInRange|g(v|PageSize)?)|A(ccessibility(R(oleDescription(ForUIElement)?|aiseBadArgumentException)|Unignored(Children(ForOnlyChild)?|Descendant|Ancestor)|PostNotification|ActionDescription)|pplication(Main|Load)|vailableWindowDepths|ll(MapTable(Values|Keys)|HashTableObjects|ocate(MemoryPages|Collectable|Object)))))\\b"
     },
     "anonymous_pattern_2": {
       "begin": "((@)(implementation))\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z][A-Za-z0-9]*))?",
@@ -319,7 +319,7 @@
           "include": "#string_escaped_char"
         },
         {
-          "match": "%(\\d+\\$)?[#0\\- +']*((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?[@]",
+          "match": "%(\\d+\\$)?[#0\\- +']*((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?@",
           "name": "constant.other.placeholder.objcpp"
         },
         {
@@ -328,7 +328,7 @@
       ]
     },
     "anonymous_pattern_30": {
-      "match": "\\bNS(R(GB(ModeColorPanel|ColorSpaceModel)|ight(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey)|ound(RectBezelStyle|Bankers|ed(BezelStyle|TokenStyle|DisclosureBezelStyle)|Down|Up|Plain|Line(CapStyle|JoinStyle))|un(StoppedResponse|ContinuesResponse|AbortedResponse)|e(s(izableWindowMask|et(CursorRectsRunLoopOrdering|FunctionKey))|ce(ssedBezelStyle|iver(sCantHandleCommandScriptError|EvaluationScriptError))|turnTextMovement|doFunctionKey|quiredArgumentsMissingScriptError|l(evancyLevelIndicatorStyle|ative(Before|After))|gular(SquareBezelStyle|ControlSize)|moveTraitFontAction)|a(n(domSubelement|geDateMode)|tingLevelIndicatorStyle|dio(ModeMatrix|Button)))|G(IFFileType|lyph(Below|Inscribe(B(elow|ase)|Over(strike|Below)|Above)|Layout(WithPrevious|A(tAPoint|gainstAPoint))|A(ttribute(BidiLevel|Soft|Inscribe|Elastic)|bove))|r(ooveBorder|eaterThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|a(y(ModeColorPanel|ColorSpaceModel)|dient(None|Con(cave(Strong|Weak)|vex(Strong|Weak)))|phiteControlTint)))|XML(N(o(tationDeclarationKind|de(CompactEmptyElement|IsCDATA|OptionsNone|Use(SingleQuotes|DoubleQuotes)|Pre(serve(NamespaceOrder|C(haracterReferences|DATA)|DTD|Prefixes|E(ntities|mptyElements)|Quotes|Whitespace|A(ttributeOrder|ll))|ttyPrint)|ExpandEmptyElement))|amespaceKind)|CommentKind|TextKind|InvalidKind|D(ocument(X(MLKind|HTMLKind|Include)|HTMLKind|T(idy(XML|HTML)|extKind)|IncludeContentTypeDeclaration|Validate|Kind)|TDKind)|P(arser(GTRequiredError|XMLDeclNot(StartedError|FinishedError)|Mi(splaced(XMLDeclarationError|CDATAEndStringError)|xedContentDeclNot(StartedError|FinishedError))|S(t(andaloneValueError|ringNot(StartedError|ClosedError))|paceRequiredError|eparatorRequiredError)|N(MTOKENRequiredError|o(t(ationNot(StartedError|FinishedError)|WellBalancedError)|DTDError)|amespaceDeclarationError|AMERequiredError)|C(haracterRef(In(DTDError|PrologError|EpilogError)|AtEOFError)|o(nditionalSectionNot(StartedError|FinishedError)|mment(NotFinishedError|ContainsDoubleHyphenError))|DATANotFinishedError)|TagNameMismatchError|In(ternalError|valid(HexCharacterRefError|C(haracter(RefError|InEntityError|Error)|onditionalSectionError)|DecimalCharacterRefError|URIError|Encoding(NameError|Error)))|OutOfMemoryError|D(ocumentStartError|elegateAbortedParseError|OCTYPEDeclNotFinishedError)|U(RI(RequiredError|FragmentError)|n(declaredEntityError|parsedEntityError|knownEncodingError|finishedTagError))|P(CDATARequiredError|ublicIdentifierRequiredError|arsedEntityRef(MissingSemiError|NoNameError|In(Internal(SubsetError|Error)|PrologError|EpilogError)|AtEOFError)|r(ocessingInstructionNot(StartedError|FinishedError)|ematureDocumentEndError))|E(n(codingNotSupportedError|tity(Ref(In(DTDError|PrologError|EpilogError)|erence(MissingSemiError|WithoutNameError)|LoopError|AtEOFError)|BoundaryError|Not(StartedError|FinishedError)|Is(ParameterError|ExternalError)|ValueRequiredError))|qualExpectedError|lementContentDeclNot(StartedError|FinishedError)|xt(ernalS(tandaloneEntityError|ubsetNotFinishedError)|raContentError)|mptyDocumentError)|L(iteralNot(StartedError|FinishedError)|T(RequiredError|SlashRequiredError)|essThanSymbolInAttributeError)|Attribute(RedefinedError|HasNoValueError|Not(StartedError|FinishedError)|ListNot(StartedError|FinishedError)))|rocessingInstructionKind)|E(ntity(GeneralKind|DeclarationKind|UnparsedKind|P(ar(sedKind|ameterKind)|redefined))|lement(Declaration(MixedKind|UndefinedKind|E(lementKind|mptyKind)|Kind|AnyKind)|Kind))|Attribute(N(MToken(sKind|Kind)|otationKind)|CDATAKind|ID(Ref(sKind|Kind)|Kind)|DeclarationKind|En(tit(yKind|iesKind)|umerationKind)|Kind))|M(i(n(XEdge|iaturizableWindowMask|YEdge|uteCalendarUnit)|terLineJoinStyle|ddleSubelement|xedState)|o(nthCalendarUnit|deSwitchFunctionKey|use(Moved(Mask)?|E(ntered(Mask)?|ventSubtype|xited(Mask)?))|veToBezierPathElement|mentary(ChangeButton|Push(Button|InButton)|Light(Button)?))|enuFunctionKey|a(c(intoshInterfaceStyle|OSRomanStringEncoding)|tchesPredicateOperatorType|ppedRead|x(XEdge|YEdge))|ACHOperatingSystem)|B(MPFileType|o(ttomTabsBezelBorder|ldFontMask|rderlessWindowMask|x(Se(condary|parator)|OldStyle|Primary))|uttLineCapStyle|e(zelBorder|velLineJoinStyle|low(Bottom|Top)|gin(sWith(Comparison|PredicateOperatorType)|FunctionKey))|lueControlTint|ack(spaceCharacter|tabTextMovement|ingStore(Retained|Buffered|Nonretained)|TabCharacter|wardsSearch|groundTab)|r(owser(NoColumnResizing|UserColumnResizing|AutoColumnResizing)|eakFunctionKey))|S(h(ift(JISStringEncoding|KeyMask)|ow(ControlGlyphs|InvisibleGlyphs)|adowlessSquareBezelStyle)|y(s(ReqFunctionKey|tem(D(omainMask|efined(Mask)?)|FunctionKey))|mbolStringEncoding)|c(a(nnedOption|le(None|ToFit|Proportionally))|r(oll(er(NoPart|Increment(Page|Line|Arrow)|Decrement(Page|Line|Arrow)|Knob(Slot)?|Arrows(M(inEnd|axEnd)|None|DefaultSetting))|Wheel(Mask)?|LockFunctionKey)|eenChangedEventType))|t(opFunctionKey|r(ingDrawing(OneShot|DisableScreenFontSubstitution|Uses(DeviceMetrics|FontLeading|LineFragmentOrigin))|eam(Status(Reading|NotOpen|Closed|Open(ing)?|Error|Writing|AtEnd)|Event(Has(BytesAvailable|SpaceAvailable)|None|OpenCompleted|E(ndEncountered|rrorOccurred)))))|i(ngle(DateMode|UnderlineStyle)|ze(DownFontAction|UpFontAction))|olarisOperatingSystem|unOSOperatingSystem|pecialPageOrder|e(condCalendarUnit|lect(By(Character|Paragraph|Word)|i(ng(Next|Previous)|onAffinity(Downstream|Upstream))|edTab|FunctionKey)|gmentSwitchTracking(Momentary|Select(One|Any)))|quareLineCapStyle|witchButton|ave(ToOperation|Op(tions(Yes|No|Ask)|eration)|AsOperation)|mall(SquareBezelStyle|C(ontrolSize|apsFontMask)|IconButtonBezelStyle))|H(ighlightModeMatrix|SBModeColorPanel|o(ur(Minute(SecondDatePickerElementFlag|DatePickerElementFlag)|CalendarUnit)|rizontalRuler|meFunctionKey)|TTPCookieAcceptPolicy(Never|OnlyFromMainDocumentDomain|Always)|e(lp(ButtonBezelStyle|KeyMask|FunctionKey)|avierFontAction)|PUXOperatingSystem)|Year(MonthDa(yDatePickerElementFlag|tePickerElementFlag)|CalendarUnit)|N(o(n(StandardCharacterSetFontMask|ZeroWindingRule|activatingPanelMask|LossyASCIIStringEncoding)|Border|t(ification(SuspensionBehavior(Hold|Coalesce|D(eliverImmediately|rop))|NoCoalescing|CoalescingOn(Sender|Name)|DeliverImmediately|PostToAllSessions)|PredicateType|EqualToPredicateOperatorType)|S(cr(iptError|ollerParts)|ubelement|pecifierError)|CellMask|T(itle|opLevelContainersSpecifierError|abs(BezelBorder|NoBorder|LineBorder))|I(nterfaceStyle|mage)|UnderlineStyle|FontChangeAction)|u(ll(Glyph|CellType)|m(eric(Search|PadKeyMask)|berFormatter(Round(Half(Down|Up|Even)|Ceiling|Down|Up|Floor)|Behavior(10|Default)|S(cientificStyle|pellOutStyle)|NoStyle|CurrencyStyle|DecimalStyle|P(ercentStyle|ad(Before(Suffix|Prefix)|After(Suffix|Prefix))))))|e(t(Services(BadArgumentError|NotFoundError|C(ollisionError|ancelledError)|TimeoutError|InvalidError|UnknownError|ActivityInProgress)|workDomainMask)|wlineCharacter|xt(StepInterfaceStyle|FunctionKey))|EXTSTEPStringEncoding|a(t(iveShortGlyphPacking|uralTextAlignment)|rrowFontMask))|C(hange(ReadOtherContents|GrayCell(Mask)?|BackgroundCell(Mask)?|Cleared|Done|Undone|Autosaved)|MYK(ModeColorPanel|ColorSpaceModel)|ircular(BezelStyle|Slider)|o(n(stantValueExpressionType|t(inuousCapacityLevelIndicatorStyle|entsCellMask|ain(sComparison|erSpecifierError)|rol(Glyph|KeyMask))|densedFontMask)|lor(Panel(RGBModeMask|GrayModeMask|HSBModeMask|C(MYKModeMask|olorListModeMask|ustomPaletteModeMask|rayonModeMask)|WheelModeMask|AllModesMask)|ListModeColorPanel)|reServiceDirectory|m(p(osite(XOR|Source(In|O(ut|ver)|Atop)|Highlight|C(opy|lear)|Destination(In|O(ut|ver)|Atop)|Plus(Darker|Lighter))|ressedFontMask)|mandKeyMask))|u(stom(SelectorPredicateOperatorType|PaletteModeColorPanel)|r(sor(Update(Mask)?|PointingDevice)|veToBezierPathElement))|e(nterT(extAlignment|abStopType)|ll(State|H(ighlighted|as(Image(Horizontal|OnLeftOrBottom)|OverlappingImage))|ChangesContents|Is(Bordered|InsetButton)|Disabled|Editable|LightsBy(Gray|Background|Contents)|AllowsMixedState))|l(ipPagination|o(s(ePathBezierPathElement|ableWindowMask)|ckAndCalendarDatePickerStyle)|ear(ControlTint|DisplayFunctionKey|LineFunctionKey))|a(seInsensitive(Search|PredicateOption)|n(notCreateScriptCommandError|cel(Button|TextMovement))|chesDirectory|lculation(NoError|Overflow|DivideByZero|Underflow|LossOfPrecision)|rriageReturnCharacter)|r(itical(Request|AlertStyle)|ayonModeColorPanel))|T(hick(SquareBezelStyle|erSquareBezelStyle)|ypesetter(Behavior|HorizontalTabAction|ContainerBreakAction|ZeroAdvancementAction|OriginalBehavior|ParagraphBreakAction|WhitespaceAction|L(ineBreakAction|atestBehavior))|i(ckMark(Right|Below|Left|Above)|tledWindowMask|meZoneDatePickerElementFlag)|o(olbarItemVisibilityPriority(Standard|High|User|Low)|pTabsBezelBorder|ggleButton)|IFF(Compression(N(one|EXT)|CCITTFAX(3|4)|OldJPEG|JPEG|PackBits|LZW)|FileType)|e(rminate(Now|Cancel|Later)|xt(Read(InapplicableDocumentTypeError|WriteErrorM(inimum|aximum))|Block(M(i(nimum(Height|Width)|ddleAlignment)|a(rgin|ximum(Height|Width)))|B(o(ttomAlignment|rder)|aselineAlignment)|Height|TopAlignment|P(ercentageValueType|adding)|Width|AbsoluteValueType)|StorageEdited(Characters|Attributes)|CellType|ured(RoundedBezelStyle|BackgroundWindowMask|SquareBezelStyle)|Table(FixedLayoutAlgorithm|AutomaticLayoutAlgorithm)|Field(RoundedBezel|SquareBezel|AndStepperDatePickerStyle)|WriteInapplicableDocumentTypeError|ListPrependEnclosingMarker))|woByteGlyphPacking|ab(Character|TextMovement|le(tP(oint(Mask|EventSubtype)?|roximity(Mask|EventSubtype)?)|Column(NoResizing|UserResizingMask|AutoresizingMask)|View(ReverseSequentialColumnAutoresizingStyle|GridNone|S(olid(HorizontalGridLineMask|VerticalGridLineMask)|equentialColumnAutoresizingStyle)|NoColumnAutoresizing|UniformColumnAutoresizingStyle|FirstColumnOnlyAutoresizingStyle|LastColumnOnlyAutoresizingStyle)))|rackModeMatrix)|I(n(sert(CharFunctionKey|FunctionKey|LineFunctionKey)|t(Type|ernalS(criptError|pecifierError))|dexSubelement|validIndexSpecifierError|formational(Request|AlertStyle)|PredicateOperatorType)|talicFontMask|SO(2022JPStringEncoding|Latin(1StringEncoding|2StringEncoding))|dentityMappingCharacterCollection|llegalTextMovement|mage(R(ight|ep(MatchesDevice|LoadStatus(ReadingHeader|Completed|InvalidData|Un(expectedEOF|knownType)|WillNeedAllData)))|Below|C(ellType|ache(BySize|Never|Default|Always))|Interpolation(High|None|Default|Low)|O(nly|verlaps)|Frame(Gr(oove|ayBezel)|Button|None|Photo)|L(oadStatus(ReadError|C(ompleted|ancelled)|InvalidData|UnexpectedEOF)|eft)|A(lign(Right|Bottom(Right|Left)?|Center|Top(Right|Left)?|Left)|bove)))|O(n(State|eByteGlyphPacking|OffButton|lyScrollerArrows)|ther(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|TextMovement)|SF1OperatingSystem|pe(n(GL(GO(Re(setLibrary|tainRenderers)|ClearFormatCache|FormatCacheSize)|PFA(R(obust|endererID)|M(inimumPolicy|ulti(sample|Screen)|PSafe|aximumPolicy)|BackingStore|S(creenMask|te(ncilSize|reo)|ingleRenderer|upersample|ample(s|Buffers|Alpha))|NoRecovery|C(o(lor(Size|Float)|mpliant)|losestPolicy)|OffScreen|D(oubleBuffer|epthSize)|PixelBuffer|VirtualScreenCount|FullScreen|Window|A(cc(umSize|elerated)|ux(Buffers|DepthStencil)|l(phaSize|lRenderers))))|StepUnicodeReservedBase)|rationNotSupportedForKeyS(criptError|pecifierError))|ffState|KButton|rPredicateType|bjC(B(itfield|oolType)|S(hortType|tr(ingType|uctType)|electorType)|NoType|CharType|ObjectType|DoubleType|UnionType|PointerType|VoidType|FloatType|Long(Type|longType)|ArrayType))|D(i(s(c(losureBezelStyle|reteCapacityLevelIndicatorStyle)|playWindowRunLoopOrdering)|acriticInsensitivePredicateOption|rect(Selection|PredicateModifier))|o(c(ModalWindowMask|ument(Directory|ationDirectory))|ubleType|wn(TextMovement|ArrowFunctionKey))|e(s(cendingPageOrder|ktopDirectory)|cimalTabStopType|v(ice(NColorSpaceModel|IndependentModifierFlagsMask)|eloper(Directory|ApplicationDirectory))|fault(ControlTint|TokenStyle)|lete(Char(acter|FunctionKey)|FunctionKey|LineFunctionKey)|moApplicationDirectory)|a(yCalendarUnit|teFormatter(MediumStyle|Behavior(10|Default)|ShortStyle|NoStyle|FullStyle|LongStyle))|ra(wer(Clos(ingState|edState)|Open(ingState|State))|gOperation(Generic|Move|None|Copy|Delete|Private|Every|Link|All)))|U(ser(CancelledError|D(irectory|omainMask)|FunctionKey)|RL(Handle(NotLoaded|Load(Succeeded|InProgress|Failed))|CredentialPersistence(None|Permanent|ForSession))|n(scaledWindowMask|cachedRead|i(codeStringEncoding|talicFontMask|fiedTitleAndToolbarWindowMask)|d(o(CloseGroupingRunLoopOrdering|FunctionKey)|e(finedDateComponent|rline(Style(Single|None|Thick|Double)|Pattern(Solid|D(ot|ash(Dot(Dot)?)?)))))|known(ColorSpaceModel|P(ointingDevice|ageOrder)|KeyS(criptError|pecifierError))|boldFontMask)|tilityWindowMask|TF8StringEncoding|p(dateWindowsRunLoopOrdering|TextMovement|ArrowFunctionKey))|J(ustifiedTextAlignment|PEG(2000FileType|FileType)|apaneseEUC(GlyphPacking|StringEncoding))|P(o(s(t(Now|erFontMask|WhenIdle|ASAP)|iti(on(Replace|Be(fore|ginning)|End|After)|ve(IntType|DoubleType|FloatType)))|pUp(NoArrow|ArrowAt(Bottom|Center))|werOffEventType|rtraitOrientation)|NGFileType|ush(InCell(Mask)?|OnPushOffButton)|e(n(TipMask|UpperSideMask|PointingDevice|LowerSideMask)|riodic(Mask)?)|P(S(caleField|tatus(Title|Field)|aveButton)|N(ote(Title|Field)|ame(Title|Field))|CopiesField|TitleField|ImageButton|OptionsButton|P(a(perFeedButton|ge(Range(To|From)|ChoiceMatrix))|reviewButton)|LayoutButton)|lainTextTokenStyle|a(useFunctionKey|ragraphSeparatorCharacter|ge(DownFunctionKey|UpFunctionKey))|r(int(ing(ReplyLater|Success|Cancelled|Failure)|ScreenFunctionKey|erTable(NotFound|OK|Error)|FunctionKey)|o(p(ertyList(XMLFormat|MutableContainers(AndLeaves)?|BinaryFormat|Immutable|OpenStepFormat)|rietaryStringEncoding)|gressIndicator(BarStyle|SpinningStyle|Preferred(SmallThickness|Thickness|LargeThickness|AquaThickness)))|e(ssedTab|vFunctionKey))|L(HeightForm|CancelButton|TitleField|ImageButton|O(KButton|rientationMatrix)|UnitsButton|PaperNameButton|WidthForm))|E(n(terCharacter|d(sWith(Comparison|PredicateOperatorType)|FunctionKey))|v(e(nOddWindingRule|rySubelement)|aluatedObjectExpressionType)|qualTo(Comparison|PredicateOperatorType)|ra(serPointingDevice|CalendarUnit|DatePickerElementFlag)|x(clude(10|QuickDrawElementsIconCreationOption)|pandedFontMask|ecuteFunctionKey))|V(i(ew(M(in(XMargin|YMargin)|ax(XMargin|YMargin))|HeightSizable|NotSizable|WidthSizable)|aPanelFontAction)|erticalRuler|a(lidationErrorM(inimum|aximum)|riableExpressionType))|Key(SpecifierEvaluationScriptError|Down(Mask)?|Up(Mask)?|PathExpressionType|Value(MinusSetMutation|SetSetMutation|Change(Re(placement|moval)|Setting|Insertion)|IntersectSetMutation|ObservingOption(New|Old)|UnionSetMutation|ValidationError))|QTMovie(NormalPlayback|Looping(BackAndForthPlayback|Playback))|F(1(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|7FunctionKey|i(nd(PanelAction(Replace(A(ndFind|ll(InSelection)?))?|S(howFindPanel|e(tFindString|lectAll(InSelection)?))|Next|Previous)|FunctionKey)|tPagination|le(Read(No(SuchFileError|PermissionError)|CorruptFileError|In(validFileNameError|applicableStringEncodingError)|Un(supportedSchemeError|knownError))|HandlingPanel(CancelButton|OKButton)|NoSuchFileError|ErrorM(inimum|aximum)|Write(NoPermissionError|In(validFileNameError|applicableStringEncodingError)|OutOfSpaceError|Un(supportedSchemeError|knownError))|LockingError)|xedPitchFontMask)|2(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|o(nt(Mo(noSpaceTrait|dernSerifsClass)|BoldTrait|S(ymbolicClass|criptsClass|labSerifsClass|ansSerifClass)|C(o(ndensedTrait|llectionApplicationOnlyMask)|larendonSerifsClass)|TransitionalSerifsClass|I(ntegerAdvancementsRenderingMode|talicTrait)|O(ldStyleSerifsClass|rnamentalsClass)|DefaultRenderingMode|U(nknownClass|IOptimizedTrait)|Panel(S(hadowEffectModeMask|t(andardModesMask|rikethroughEffectModeMask)|izeModeMask)|CollectionModeMask|TextColorEffectModeMask|DocumentColorEffectModeMask|UnderlineEffectModeMask|FaceModeMask|All(ModesMask|EffectsModeMask))|ExpandedTrait|VerticalTrait|F(amilyClassMask|reeformSerifsClass)|Antialiased(RenderingMode|IntegerAdvancementsRenderingMode))|cusRing(Below|Type(None|Default|Exterior)|Only|Above)|urByteGlyphPacking|rm(attingError(M(inimum|aximum))?|FeedCharacter))|8FunctionKey|unction(ExpressionType|KeyMask)|3(1FunctionKey|2FunctionKey|3FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey)|9FunctionKey|4FunctionKey|P(RevertButton|S(ize(Title|Field)|etButton)|CurrentField|Preview(Button|Field))|l(oat(ingPointSamplesBitmapFormat|Type)|agsChanged(Mask)?)|axButton|5FunctionKey|6FunctionKey)|W(heelModeColorPanel|indow(s(NTOperatingSystem|CP125(1StringEncoding|2StringEncoding|3StringEncoding|4StringEncoding|0StringEncoding)|95(InterfaceStyle|OperatingSystem))|M(iniaturizeButton|ovedEventType)|Below|CloseButton|ToolbarButton|ZoomButton|Out|DocumentIconButton|ExposedEventType|Above)|orkspaceLaunch(NewInstance|InhibitingBackgroundOnly|Default|PreferringClassic|WithoutA(ctivation|ddingToRecents)|A(sync|nd(Hide(Others)?|Print)|llowingClassicStartup))|eek(day(CalendarUnit|OrdinalCalendarUnit)|CalendarUnit)|a(ntsBidiLevels|rningAlertStyle)|r(itingDirection(RightToLeft|Natural|LeftToRight)|apCalendarComponents))|L(i(stModeMatrix|ne(Moves(Right|Down|Up|Left)|B(order|reakBy(C(harWrapping|lipping)|Truncating(Middle|Head|Tail)|WordWrapping))|S(eparatorCharacter|weep(Right|Down|Up|Left))|ToBezierPathElement|DoesntMove|arSlider)|teralSearch|kePredicateOperatorType|ghterFontAction|braryDirectory)|ocalDomainMask|e(ssThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|ft(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey))|a(yout(RightToLeft|NotDone|CantFit|OutOfGlyphs|Done|LeftToRight)|ndscapeOrientation)|ABColorSpaceModel)|A(sc(iiWithDoubleByteEUCGlyphPacking|endingPageOrder)|n(y(Type|PredicateModifier|EventMask)|choredSearch|imation(Blocking|Nonblocking(Threaded)?|E(ffect(DisappearingItemDefault|Poof)|ase(In(Out)?|Out))|Linear)|dPredicateType)|t(Bottom|tachmentCharacter|omicWrite|Top)|SCIIStringEncoding|d(obe(GB1CharacterCollection|CNS1CharacterCollection|Japan(1CharacterCollection|2CharacterCollection)|Korea1CharacterCollection)|dTraitFontAction|minApplicationDirectory)|uto(saveOperation|Pagination)|pp(lication(SupportDirectory|D(irectory|e(fined(Mask)?|legateReply(Success|Cancel|Failure)|activatedEventType))|ActivatedEventType)|KitDefined(Mask)?)|l(ternateKeyMask|pha(ShiftKeyMask|NonpremultipliedBitmapFormat|FirstBitmapFormat)|ert(SecondButtonReturn|ThirdButtonReturn|OtherReturn|DefaultReturn|ErrorReturn|FirstButtonReturn|AlternateReturn)|l(ScrollerParts|DomainsMask|PredicateModifier|LibrariesDirectory|ApplicationsDirectory))|rgument(sWrongScriptError|EvaluationScriptError)|bove(Bottom|Top)|WTEventType))\\b",
+      "match": "\\bNS(R(GB(ModeColorPanel|ColorSpaceModel)|ight(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey)|ound(RectBezelStyle|Bankers|ed(BezelStyle|TokenStyle|DisclosureBezelStyle)|Down|Up|Plain|Line(CapStyle|JoinStyle))|un(StoppedResponse|ContinuesResponse|AbortedResponse)|e(s(izableWindowMask|et(CursorRectsRunLoopOrdering|FunctionKey))|ce(ssedBezelStyle|iver(sCantHandleCommandScriptError|EvaluationScriptError))|turnTextMovement|doFunctionKey|quiredArgumentsMissingScriptError|l(evancyLevelIndicatorStyle|ative(Before|After))|gular(SquareBezelStyle|ControlSize)|moveTraitFontAction)|a(n(domSubelement|geDateMode)|tingLevelIndicatorStyle|dio(ModeMatrix|Button)))|G(IFFileType|lyph(Below|Inscribe(B(elow|ase)|Over(strike|Below)|Above)|Layout(WithPrevious|A(tAPoint|gainstAPoint))|A(ttribute(BidiLevel|Soft|Inscribe|Elastic)|bove))|r(ooveBorder|eaterThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|a(y(ModeColorPanel|ColorSpaceModel)|dient(None|Con(cave(Strong|Weak)|vex(Strong|Weak)))|phiteControlTint)))|XML(N(o(tationDeclarationKind|de(CompactEmptyElement|IsCDATA|OptionsNone|Use(SingleQuotes|DoubleQuotes)|Pre(serve(NamespaceOrder|C(haracterReferences|DATA)|DTD|Prefixes|E(ntities|mptyElements)|Quotes|Whitespace|A(ttributeOrder|ll))|ttyPrint)|ExpandEmptyElement))|amespaceKind)|CommentKind|TextKind|InvalidKind|D(ocument(X(MLKind|HTMLKind|Include)|HTMLKind|T(idy(XML|HTML)|extKind)|IncludeContentTypeDeclaration|Validate|Kind)|TDKind)|P(arser(GTRequiredError|XMLDeclNot(StartedError|FinishedError)|Mi(splaced(XMLDeclarationError|CDATAEndStringError)|xedContentDeclNot(StartedError|FinishedError))|S(t(andaloneValueError|ringNot(StartedError|ClosedError))|paceRequiredError|eparatorRequiredError)|N(MTOKENRequiredError|o(t(ationNot(StartedError|FinishedError)|WellBalancedError)|DTDError)|amespaceDeclarationError|AMERequiredError)|C(haracterRef(In(DTDError|PrologError|EpilogError)|AtEOFError)|o(nditionalSectionNot(StartedError|FinishedError)|mment(NotFinishedError|ContainsDoubleHyphenError))|DATANotFinishedError)|TagNameMismatchError|In(ternalError|valid(HexCharacterRefError|C(haracter(RefError|InEntityError|Error)|onditionalSectionError)|DecimalCharacterRefError|URIError|Encoding(NameError|Error)))|OutOfMemoryError|D(ocumentStartError|elegateAbortedParseError|OCTYPEDeclNotFinishedError)|U(RI(RequiredError|FragmentError)|n(declaredEntityError|parsedEntityError|knownEncodingError|finishedTagError))|P(CDATARequiredError|ublicIdentifierRequiredError|arsedEntityRef(MissingSemiError|NoNameError|In(Internal(SubsetError|Error)|PrologError|EpilogError)|AtEOFError)|r(ocessingInstructionNot(StartedError|FinishedError)|ematureDocumentEndError))|E(n(codingNotSupportedError|tity(Ref(In(DTDError|PrologError|EpilogError)|erence(MissingSemiError|WithoutNameError)|LoopError|AtEOFError)|BoundaryError|Not(StartedError|FinishedError)|Is(ParameterError|ExternalError)|ValueRequiredError))|qualExpectedError|lementContentDeclNot(StartedError|FinishedError)|xt(ernalS(tandaloneEntityError|ubsetNotFinishedError)|raContentError)|mptyDocumentError)|L(iteralNot(StartedError|FinishedError)|T(RequiredError|SlashRequiredError)|essThanSymbolInAttributeError)|Attribute(RedefinedError|HasNoValueError|Not(StartedError|FinishedError)|ListNot(StartedError|FinishedError)))|rocessingInstructionKind)|E(ntity(GeneralKind|DeclarationKind|UnparsedKind|P(ar(sedKind|ameterKind)|redefined))|lement(Declaration(MixedKind|UndefinedKind|E(lementKind|mptyKind)|Kind|AnyKind)|Kind))|Attribute(N(MToken(sKind|Kind)|otationKind)|CDATAKind|ID(Ref(sKind|Kind)|Kind)|DeclarationKind|En(tit(yKind|iesKind)|umerationKind)|Kind))|M(i(n(XEdge|iaturizableWindowMask|YEdge|uteCalendarUnit)|terLineJoinStyle|ddleSubelement|xedState)|o(nthCalendarUnit|deSwitchFunctionKey|use(Moved(Mask)?|E(ntered(Mask)?|ventSubtype|xited(Mask)?))|veToBezierPathElement|mentary(ChangeButton|Push(Button|InButton)|Light(Button)?))|enuFunctionKey|a(c(intoshInterfaceStyle|OSRomanStringEncoding)|tchesPredicateOperatorType|ppedRead|x(XEdge|YEdge))|ACHOperatingSystem)|B(MPFileType|o(ttomTabsBezelBorder|ldFontMask|rderlessWindowMask|x(Se(condary|parator)|OldStyle|Primary))|uttLineCapStyle|e(zelBorder|velLineJoinStyle|low(Bottom|Top)|gin(sWith(Comparison|PredicateOperatorType)|FunctionKey))|lueControlTint|ack(spaceCharacter|tabTextMovement|ingStore(Retained|Buffered|Nonretained)|TabCharacter|wardsSearch|groundTab)|r(owser(NoColumnResizing|UserColumnResizing|AutoColumnResizing)|eakFunctionKey))|S(h(ift(JISStringEncoding|KeyMask)|ow(ControlGlyphs|InvisibleGlyphs)|adowlessSquareBezelStyle)|y(s(ReqFunctionKey|tem(D(omainMask|efined(Mask)?)|FunctionKey))|mbolStringEncoding)|c(a(nnedOption|le(None|ToFit|Proportionally))|r(oll(er(NoPart|Increment(Page|Line|Arrow)|Decrement(Page|Line|Arrow)|Knob(Slot)?|Arrows(M(inEnd|axEnd)|None|DefaultSetting))|Wheel(Mask)?|LockFunctionKey)|eenChangedEventType))|t(opFunctionKey|r(ingDrawing(OneShot|DisableScreenFontSubstitution|Uses(DeviceMetrics|FontLeading|LineFragmentOrigin))|eam(Status(Reading|NotOpen|Closed|Open(ing)?|Error|Writing|AtEnd)|Event(Has(BytesAvailable|SpaceAvailable)|None|OpenCompleted|E(ndEncountered|rrorOccurred)))))|i(ngle(DateMode|UnderlineStyle)|ze(DownFontAction|UpFontAction))|olarisOperatingSystem|unOSOperatingSystem|pecialPageOrder|e(condCalendarUnit|lect(By(Character|Paragraph|Word)|i(ng(Next|Previous)|onAffinity(Downstream|Upstream))|edTab|FunctionKey)|gmentSwitchTracking(Momentary|Select(One|Any)))|quareLineCapStyle|witchButton|ave(ToOperation|Op(tions(Yes|No|Ask)|eration)|AsOperation)|mall(SquareBezelStyle|C(ontrolSize|apsFontMask)|IconButtonBezelStyle))|H(ighlightModeMatrix|SBModeColorPanel|o(ur(Minute(SecondDatePickerElementFlag|DatePickerElementFlag)|CalendarUnit)|rizontalRuler|meFunctionKey)|TTPCookieAcceptPolicy(Never|OnlyFromMainDocumentDomain|Always)|e(lp(ButtonBezelStyle|KeyMask|FunctionKey)|avierFontAction)|PUXOperatingSystem)|Year(MonthDa(yDatePickerElementFlag|tePickerElementFlag)|CalendarUnit)|N(o(n(StandardCharacterSetFontMask|ZeroWindingRule|activatingPanelMask|LossyASCIIStringEncoding)|Border|t(ification(SuspensionBehavior(Hold|Coalesce|D(eliverImmediately|rop))|NoCoalescing|CoalescingOn(Sender|Name)|DeliverImmediately|PostToAllSessions)|PredicateType|EqualToPredicateOperatorType)|S(cr(iptError|ollerParts)|ubelement|pecifierError)|CellMask|T(itle|opLevelContainersSpecifierError|abs(BezelBorder|NoBorder|LineBorder))|I(nterfaceStyle|mage)|UnderlineStyle|FontChangeAction)|u(ll(Glyph|CellType)|m(eric(Search|PadKeyMask)|berFormatter(Round(Half(Down|Up|Even)|Ceiling|Down|Up|Floor)|Behavior(10|Default)|S(cientificStyle|pellOutStyle)|NoStyle|CurrencyStyle|DecimalStyle|P(ercentStyle|ad(Before(Suffix|Prefix)|After(Suffix|Prefix))))))|e(t(Services(BadArgumentError|NotFoundError|C(ollisionError|ancelledError)|TimeoutError|InvalidError|UnknownError|ActivityInProgress)|workDomainMask)|wlineCharacter|xt(StepInterfaceStyle|FunctionKey))|EXTSTEPStringEncoding|a(t(iveShortGlyphPacking|uralTextAlignment)|rrowFontMask))|C(hange(ReadOtherContents|GrayCell(Mask)?|BackgroundCell(Mask)?|Cleared|Done|Undone|Autosaved)|MYK(ModeColorPanel|ColorSpaceModel)|ircular(BezelStyle|Slider)|o(n(stantValueExpressionType|t(inuousCapacityLevelIndicatorStyle|entsCellMask|ain(sComparison|erSpecifierError)|rol(Glyph|KeyMask))|densedFontMask)|lor(Panel(RGBModeMask|GrayModeMask|HSBModeMask|C(MYKModeMask|olorListModeMask|ustomPaletteModeMask|rayonModeMask)|WheelModeMask|AllModesMask)|ListModeColorPanel)|reServiceDirectory|m(p(osite(XOR|Source(In|O(ut|ver)|Atop)|Highlight|C(opy|lear)|Destination(In|O(ut|ver)|Atop)|Plus(Darker|Lighter))|ressedFontMask)|mandKeyMask))|u(stom(SelectorPredicateOperatorType|PaletteModeColorPanel)|r(sor(Update(Mask)?|PointingDevice)|veToBezierPathElement))|e(nterT(extAlignment|abStopType)|ll(State|H(ighlighted|as(Image(Horizontal|OnLeftOrBottom)|OverlappingImage))|ChangesContents|Is(Bordered|InsetButton)|Disabled|Editable|LightsBy(Gray|Background|Contents)|AllowsMixedState))|l(ipPagination|o(s(ePathBezierPathElement|ableWindowMask)|ckAndCalendarDatePickerStyle)|ear(ControlTint|DisplayFunctionKey|LineFunctionKey))|a(seInsensitive(Search|PredicateOption)|n(notCreateScriptCommandError|cel(Button|TextMovement))|chesDirectory|lculation(NoError|Overflow|DivideByZero|Underflow|LossOfPrecision)|rriageReturnCharacter)|r(itical(Request|AlertStyle)|ayonModeColorPanel))|T(hick(SquareBezelStyle|erSquareBezelStyle)|ypesetter(Behavior|HorizontalTabAction|ContainerBreakAction|ZeroAdvancementAction|OriginalBehavior|ParagraphBreakAction|WhitespaceAction|L(ineBreakAction|atestBehavior))|i(ckMark(Right|Below|Left|Above)|tledWindowMask|meZoneDatePickerElementFlag)|o(olbarItemVisibilityPriority(Standard|High|User|Low)|pTabsBezelBorder|ggleButton)|IFF(Compression(N(one|EXT)|CCITTFAX([34])|OldJPEG|JPEG|PackBits|LZW)|FileType)|e(rminate(Now|Cancel|Later)|xt(Read(InapplicableDocumentTypeError|WriteErrorM(inimum|aximum))|Block(M(i(nimum(Height|Width)|ddleAlignment)|a(rgin|ximum(Height|Width)))|B(o(ttomAlignment|rder)|aselineAlignment)|Height|TopAlignment|P(ercentageValueType|adding)|Width|AbsoluteValueType)|StorageEdited(Characters|Attributes)|CellType|ured(RoundedBezelStyle|BackgroundWindowMask|SquareBezelStyle)|Table(FixedLayoutAlgorithm|AutomaticLayoutAlgorithm)|Field(RoundedBezel|SquareBezel|AndStepperDatePickerStyle)|WriteInapplicableDocumentTypeError|ListPrependEnclosingMarker))|woByteGlyphPacking|ab(Character|TextMovement|le(tP(oint(Mask|EventSubtype)?|roximity(Mask|EventSubtype)?)|Column(NoResizing|UserResizingMask|AutoresizingMask)|View(ReverseSequentialColumnAutoresizingStyle|GridNone|S(olid(HorizontalGridLineMask|VerticalGridLineMask)|equentialColumnAutoresizingStyle)|NoColumnAutoresizing|UniformColumnAutoresizingStyle|FirstColumnOnlyAutoresizingStyle|LastColumnOnlyAutoresizingStyle)))|rackModeMatrix)|I(n(sert(CharFunctionKey|FunctionKey|LineFunctionKey)|t(Type|ernalS(criptError|pecifierError))|dexSubelement|validIndexSpecifierError|formational(Request|AlertStyle)|PredicateOperatorType)|talicFontMask|SO(2022JPStringEncoding|Latin(1StringEncoding|2StringEncoding))|dentityMappingCharacterCollection|llegalTextMovement|mage(R(ight|ep(MatchesDevice|LoadStatus(ReadingHeader|Completed|InvalidData|Un(expectedEOF|knownType)|WillNeedAllData)))|Below|C(ellType|ache(BySize|Never|Default|Always))|Interpolation(High|None|Default|Low)|O(nly|verlaps)|Frame(Gr(oove|ayBezel)|Button|None|Photo)|L(oadStatus(ReadError|C(ompleted|ancelled)|InvalidData|UnexpectedEOF)|eft)|A(lign(Right|Bottom(Right|Left)?|Center|Top(Right|Left)?|Left)|bove)))|O(n(State|eByteGlyphPacking|OffButton|lyScrollerArrows)|ther(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|TextMovement)|SF1OperatingSystem|pe(n(GL(GO(Re(setLibrary|tainRenderers)|ClearFormatCache|FormatCacheSize)|PFA(R(obust|endererID)|M(inimumPolicy|ulti(sample|Screen)|PSafe|aximumPolicy)|BackingStore|S(creenMask|te(ncilSize|reo)|ingleRenderer|upersample|ample(s|Buffers|Alpha))|NoRecovery|C(o(lor(Size|Float)|mpliant)|losestPolicy)|OffScreen|D(oubleBuffer|epthSize)|PixelBuffer|VirtualScreenCount|FullScreen|Window|A(cc(umSize|elerated)|ux(Buffers|DepthStencil)|l(phaSize|lRenderers))))|StepUnicodeReservedBase)|rationNotSupportedForKeyS(criptError|pecifierError))|ffState|KButton|rPredicateType|bjC(B(itfield|oolType)|S(hortType|tr(ingType|uctType)|electorType)|NoType|CharType|ObjectType|DoubleType|UnionType|PointerType|VoidType|FloatType|Long(Type|longType)|ArrayType))|D(i(s(c(losureBezelStyle|reteCapacityLevelIndicatorStyle)|playWindowRunLoopOrdering)|acriticInsensitivePredicateOption|rect(Selection|PredicateModifier))|o(c(ModalWindowMask|ument(Directory|ationDirectory))|ubleType|wn(TextMovement|ArrowFunctionKey))|e(s(cendingPageOrder|ktopDirectory)|cimalTabStopType|v(ice(NColorSpaceModel|IndependentModifierFlagsMask)|eloper(Directory|ApplicationDirectory))|fault(ControlTint|TokenStyle)|lete(Char(acter|FunctionKey)|FunctionKey|LineFunctionKey)|moApplicationDirectory)|a(yCalendarUnit|teFormatter(MediumStyle|Behavior(10|Default)|ShortStyle|NoStyle|FullStyle|LongStyle))|ra(wer(Clos(ingState|edState)|Open(ingState|State))|gOperation(Generic|Move|None|Copy|Delete|Private|Every|Link|All)))|U(ser(CancelledError|D(irectory|omainMask)|FunctionKey)|RL(Handle(NotLoaded|Load(Succeeded|InProgress|Failed))|CredentialPersistence(None|Permanent|ForSession))|n(scaledWindowMask|cachedRead|i(codeStringEncoding|talicFontMask|fiedTitleAndToolbarWindowMask)|d(o(CloseGroupingRunLoopOrdering|FunctionKey)|e(finedDateComponent|rline(Style(Single|None|Thick|Double)|Pattern(Solid|D(ot|ash(Dot(Dot)?)?)))))|known(ColorSpaceModel|P(ointingDevice|ageOrder)|KeyS(criptError|pecifierError))|boldFontMask)|tilityWindowMask|TF8StringEncoding|p(dateWindowsRunLoopOrdering|TextMovement|ArrowFunctionKey))|J(ustifiedTextAlignment|PEG(2000FileType|FileType)|apaneseEUC(GlyphPacking|StringEncoding))|P(o(s(t(Now|erFontMask|WhenIdle|ASAP)|iti(on(Replace|Be(fore|ginning)|End|After)|ve(IntType|DoubleType|FloatType)))|pUp(NoArrow|ArrowAt(Bottom|Center))|werOffEventType|rtraitOrientation)|NGFileType|ush(InCell(Mask)?|OnPushOffButton)|e(n(TipMask|UpperSideMask|PointingDevice|LowerSideMask)|riodic(Mask)?)|P(S(caleField|tatus(Title|Field)|aveButton)|N(ote(Title|Field)|ame(Title|Field))|CopiesField|TitleField|ImageButton|OptionsButton|P(a(perFeedButton|ge(Range(To|From)|ChoiceMatrix))|reviewButton)|LayoutButton)|lainTextTokenStyle|a(useFunctionKey|ragraphSeparatorCharacter|ge(DownFunctionKey|UpFunctionKey))|r(int(ing(ReplyLater|Success|Cancelled|Failure)|ScreenFunctionKey|erTable(NotFound|OK|Error)|FunctionKey)|o(p(ertyList(XMLFormat|MutableContainers(AndLeaves)?|BinaryFormat|Immutable|OpenStepFormat)|rietaryStringEncoding)|gressIndicator(BarStyle|SpinningStyle|Preferred(SmallThickness|Thickness|LargeThickness|AquaThickness)))|e(ssedTab|vFunctionKey))|L(HeightForm|CancelButton|TitleField|ImageButton|O(KButton|rientationMatrix)|UnitsButton|PaperNameButton|WidthForm))|E(n(terCharacter|d(sWith(Comparison|PredicateOperatorType)|FunctionKey))|v(e(nOddWindingRule|rySubelement)|aluatedObjectExpressionType)|qualTo(Comparison|PredicateOperatorType)|ra(serPointingDevice|CalendarUnit|DatePickerElementFlag)|x(clude(10|QuickDrawElementsIconCreationOption)|pandedFontMask|ecuteFunctionKey))|V(i(ew(M(in(XMargin|YMargin)|ax(XMargin|YMargin))|HeightSizable|NotSizable|WidthSizable)|aPanelFontAction)|erticalRuler|a(lidationErrorM(inimum|aximum)|riableExpressionType))|Key(SpecifierEvaluationScriptError|Down(Mask)?|Up(Mask)?|PathExpressionType|Value(MinusSetMutation|SetSetMutation|Change(Re(placement|moval)|Setting|Insertion)|IntersectSetMutation|ObservingOption(New|Old)|UnionSetMutation|ValidationError))|QTMovie(NormalPlayback|Looping(BackAndForthPlayback|Playback))|F(1(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|7FunctionKey|i(nd(PanelAction(Replace(A(ndFind|ll(InSelection)?))?|S(howFindPanel|e(tFindString|lectAll(InSelection)?))|Next|Previous)|FunctionKey)|tPagination|le(Read(No(SuchFileError|PermissionError)|CorruptFileError|In(validFileNameError|applicableStringEncodingError)|Un(supportedSchemeError|knownError))|HandlingPanel(CancelButton|OKButton)|NoSuchFileError|ErrorM(inimum|aximum)|Write(NoPermissionError|In(validFileNameError|applicableStringEncodingError)|OutOfSpaceError|Un(supportedSchemeError|knownError))|LockingError)|xedPitchFontMask)|2(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|o(nt(Mo(noSpaceTrait|dernSerifsClass)|BoldTrait|S(ymbolicClass|criptsClass|labSerifsClass|ansSerifClass)|C(o(ndensedTrait|llectionApplicationOnlyMask)|larendonSerifsClass)|TransitionalSerifsClass|I(ntegerAdvancementsRenderingMode|talicTrait)|O(ldStyleSerifsClass|rnamentalsClass)|DefaultRenderingMode|U(nknownClass|IOptimizedTrait)|Panel(S(hadowEffectModeMask|t(andardModesMask|rikethroughEffectModeMask)|izeModeMask)|CollectionModeMask|TextColorEffectModeMask|DocumentColorEffectModeMask|UnderlineEffectModeMask|FaceModeMask|All(ModesMask|EffectsModeMask))|ExpandedTrait|VerticalTrait|F(amilyClassMask|reeformSerifsClass)|Antialiased(RenderingMode|IntegerAdvancementsRenderingMode))|cusRing(Below|Type(None|Default|Exterior)|Only|Above)|urByteGlyphPacking|rm(attingError(M(inimum|aximum))?|FeedCharacter))|8FunctionKey|unction(ExpressionType|KeyMask)|3(1FunctionKey|2FunctionKey|3FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey)|9FunctionKey|4FunctionKey|P(RevertButton|S(ize(Title|Field)|etButton)|CurrentField|Preview(Button|Field))|l(oat(ingPointSamplesBitmapFormat|Type)|agsChanged(Mask)?)|axButton|5FunctionKey|6FunctionKey)|W(heelModeColorPanel|indow(s(NTOperatingSystem|CP125(1StringEncoding|2StringEncoding|3StringEncoding|4StringEncoding|0StringEncoding)|95(InterfaceStyle|OperatingSystem))|M(iniaturizeButton|ovedEventType)|Below|CloseButton|ToolbarButton|ZoomButton|Out|DocumentIconButton|ExposedEventType|Above)|orkspaceLaunch(NewInstance|InhibitingBackgroundOnly|Default|PreferringClassic|WithoutA(ctivation|ddingToRecents)|A(sync|nd(Hide(Others)?|Print)|llowingClassicStartup))|eek(day(CalendarUnit|OrdinalCalendarUnit)|CalendarUnit)|a(ntsBidiLevels|rningAlertStyle)|r(itingDirection(RightToLeft|Natural|LeftToRight)|apCalendarComponents))|L(i(stModeMatrix|ne(Moves(Right|Down|Up|Left)|B(order|reakBy(C(harWrapping|lipping)|Truncating(Middle|Head|Tail)|WordWrapping))|S(eparatorCharacter|weep(Right|Down|Up|Left))|ToBezierPathElement|DoesntMove|arSlider)|teralSearch|kePredicateOperatorType|ghterFontAction|braryDirectory)|ocalDomainMask|e(ssThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|ft(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey))|a(yout(RightToLeft|NotDone|CantFit|OutOfGlyphs|Done|LeftToRight)|ndscapeOrientation)|ABColorSpaceModel)|A(sc(iiWithDoubleByteEUCGlyphPacking|endingPageOrder)|n(y(Type|PredicateModifier|EventMask)|choredSearch|imation(Blocking|Nonblocking(Threaded)?|E(ffect(DisappearingItemDefault|Poof)|ase(In(Out)?|Out))|Linear)|dPredicateType)|t(Bottom|tachmentCharacter|omicWrite|Top)|SCIIStringEncoding|d(obe(GB1CharacterCollection|CNS1CharacterCollection|Japan(1CharacterCollection|2CharacterCollection)|Korea1CharacterCollection)|dTraitFontAction|minApplicationDirectory)|uto(saveOperation|Pagination)|pp(lication(SupportDirectory|D(irectory|e(fined(Mask)?|legateReply(Success|Cancel|Failure)|activatedEventType))|ActivatedEventType)|KitDefined(Mask)?)|l(ternateKeyMask|pha(ShiftKeyMask|NonpremultipliedBitmapFormat|FirstBitmapFormat)|ert(SecondButtonReturn|ThirdButtonReturn|OtherReturn|DefaultReturn|ErrorReturn|FirstButtonReturn|AlternateReturn)|l(ScrollerParts|DomainsMask|PredicateModifier|LibrariesDirectory|ApplicationsDirectory))|rgument(sWrongScriptError|EvaluationScriptError)|bove(Bottom|Top)|WTEventType))\\b",
       "name": "support.constant.cocoa.objcpp"
     },
     "anonymous_pattern_4": {
@@ -347,7 +347,7 @@
       ]
     },
     "anonymous_pattern_5": {
-      "match": "\\b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\\b",
+      "match": "\\b(NS_(?:DURING|HANDLER|ENDHANDLER))\\b",
       "name": "keyword.control.macro.objcpp"
     },
     "anonymous_pattern_7": {
@@ -378,7 +378,7 @@
       "name": "keyword.control.protocol-specification.objcpp"
     },
     "apple_foundation_functional_macros": {
-      "begin": "(\\b(?:API_AVAILABLE|API_DEPRECATED|API_UNAVAILABLE|NS_AVAILABLE|NS_AVAILABLE_MAC|NS_AVAILABLE_IOS|NS_DEPRECATED|NS_DEPRECATED_MAC|NS_DEPRECATED_IOS|NS_SWIFT_NAME))(?:(?:\\s)+)?(\\()",
+      "begin": "(\\b(?:API_AVAILABLE|API_DEPRECATED|API_UNAVAILABLE|NS_AVAILABLE|NS_AVAILABLE_MAC|NS_AVAILABLE_IOS|NS_DEPRECATED|NS_DEPRECATED_MAC|NS_DEPRECATED_IOS|NS_SWIFT_NAME))\\s+{0,1}(\\()",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.preprocessor.apple-foundation.objcpp"
@@ -407,7 +407,7 @@
           "name": "punctuation.section.scope.begin.objcpp"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.objcpp"
@@ -425,7 +425,7 @@
               "name": "punctuation.separator.arguments.objcpp"
             }
           },
-          "end": "(?=\\])",
+          "end": "(?=])",
           "name": "meta.function-call.predicate.objcpp",
           "patterns": [
             {
@@ -486,7 +486,7 @@
                   "name": "keyword.other.predicate.cocoa.objcpp"
                 },
                 {
-                  "match": "\\\\(\\\\|[abefnrtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-zA-Z0-9]+)",
+                  "match": "\\\\([\\\\abefnrtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-zA-Z0-9]+)",
                   "name": "constant.character.escape.objcpp"
                 },
                 {
@@ -507,7 +507,7 @@
           ]
         },
         {
-          "begin": "(?=\\w)(?<=[\\w\\])\"] )(\\w+(?:(:)|(?=\\])))",
+          "begin": "(?=\\w)(?<=[\\w\\])\"] )(\\w+(?:(:)|(?=])))",
           "beginCaptures": {
             "1": {
               "name": "support.function.any-method.objcpp"
@@ -516,7 +516,7 @@
               "name": "punctuation.separator.arguments.objcpp"
             }
           },
-          "end": "(?=\\])",
+          "end": "(?=])",
           "name": "meta.function-call.objcpp",
           "patterns": [
             {
@@ -561,7 +561,7 @@
               "name": "support.function.C99.objcpp"
             }
           },
-          "match": "(\\s*)\\b(hypot(f|l)?|s(scanf|ystem|nprintf|ca(nf|lb(n(f|l)?|ln(f|l)?))|i(n(h(f|l)?|f|l)?|gn(al|bit))|tr(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|k|f|l(d|l)?)|error|pbrk|ftime|len|rchr|xfrm)|printf|et(jmp|vbuf|locale|buf)|qrt(f|l)?|w(scanf|printf)|rand)|n(e(arbyint(f|l)?|xt(toward(f|l)?|after(f|l)?))|an(f|l)?)|c(s(in(h(f|l)?|f|l)?|qrt(f|l)?)|cos(h(f)?|f|l)?|imag(f|l)?|t(ime|an(h(f|l)?|f|l)?)|o(s(h(f|l)?|f|l)?|nj(f|l)?|pysign(f|l)?)|p(ow(f|l)?|roj(f|l)?)|e(il(f|l)?|xp(f|l)?)|l(o(ck|g(f|l)?)|earerr)|a(sin(h(f|l)?|f|l)?|cos(h(f|l)?|f|l)?|tan(h(f|l)?|f|l)?|lloc|rg(f|l)?|bs(f|l)?)|real(f|l)?|brt(f|l)?)|t(ime|o(upper|lower)|an(h(f|l)?|f|l)?|runc(f|l)?|gamma(f|l)?|mp(nam|file))|i(s(space|n(ormal|an)|cntrl|inf|digit|u(nordered|pper)|p(unct|rint)|finite|w(space|c(ntrl|type)|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit|blank)|l(ower|ess(equal|greater)?)|al(num|pha)|gr(eater(equal)?|aph)|xdigit|blank)|logb(f|l)?|max(div|abs))|di(v|fftime)|_Exit|unget(c|wc)|p(ow(f|l)?|ut(s|c(har)?|wc(har)?)|error|rintf)|e(rf(c(f|l)?|f|l)?|x(it|p(2(f|l)?|f|l|m1(f|l)?)?))|v(s(scanf|nprintf|canf|printf|w(scanf|printf))|printf|f(scanf|printf|w(scanf|printf))|w(scanf|printf)|a_(start|copy|end|arg))|qsort|f(s(canf|e(tpos|ek))|close|tell|open|dim(f|l)?|p(classify|ut(s|c|w(s|c))|rintf)|e(holdexcept|set(e(nv|xceptflag)|round)|clearexcept|testexcept|of|updateenv|r(aiseexcept|ror)|get(e(nv|xceptflag)|round))|flush|w(scanf|ide|printf|rite)|loor(f|l)?|abs(f|l)?|get(s|c|pos|w(s|c))|re(open|e|ad|xp(f|l)?)|m(in(f|l)?|od(f|l)?|a(f|l|x(f|l)?)?))|l(d(iv|exp(f|l)?)|o(ngjmp|cal(time|econv)|g(1(p(f|l)?|0(f|l)?)|2(f|l)?|f|l|b(f|l)?)?)|abs|l(div|abs|r(int(f|l)?|ound(f|l)?))|r(int(f|l)?|ound(f|l)?)|gamma(f|l)?)|w(scanf|c(s(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|k|f|l(d|l)?|mbs)|pbrk|ftime|len|r(chr|tombs)|xfrm)|to(b|mb)|rtomb)|printf|mem(set|c(hr|py|mp)|move))|a(s(sert|ctime|in(h(f|l)?|f|l)?)|cos(h(f|l)?|f|l)?|t(o(i|f|l(l)?)|exit|an(h(f|l)?|2(f|l)?|f|l)?)|b(s|ort))|g(et(s|c(har)?|env|wc(har)?)|mtime)|r(int(f|l)?|ound(f|l)?|e(name|alloc|wind|m(ove|quo(f|l)?|ainder(f|l)?))|a(nd|ise))|b(search|towc)|m(odf(f|l)?|em(set|c(hr|py|mp)|move)|ktime|alloc|b(s(init|towcs|rtowcs)|towc|len|r(towc|len))))\\b"
+          "match": "(\\s*)\\b(hypot([fl])?|s(scanf|ystem|nprintf|ca(nf|lb(n([fl])?|ln([fl])?))|i(n(h([fl])?|[fl])?|gn(al|bit))|tr(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|[kf]|l([dl])?)|error|pbrk|ftime|len|rchr|xfrm)|printf|et(jmp|vbuf|locale|buf)|qrt([fl])?|w(scanf|printf)|rand)|n(e(arbyint([fl])?|xt(toward([fl])?|after([fl])?))|an([fl])?)|c(s(in(h([fl])?|[fl])?|qrt([fl])?)|cos(h(f)?|[fl])?|imag([fl])?|t(ime|an(h([fl])?|[fl])?)|o(s(h([fl])?|[fl])?|nj([fl])?|pysign([fl])?)|p(ow([fl])?|roj([fl])?)|e(il([fl])?|xp([fl])?)|l(o(ck|g([fl])?)|earerr)|a(sin(h([fl])?|[fl])?|cos(h([fl])?|[fl])?|tan(h([fl])?|[fl])?|lloc|rg([fl])?|bs([fl])?)|real([fl])?|brt([fl])?)|t(ime|o(upper|lower)|an(h([fl])?|[fl])?|runc([fl])?|gamma([fl])?|mp(nam|file))|i(s(space|n(ormal|an)|cntrl|inf|digit|u(nordered|pper)|p(unct|rint)|finite|w(space|c(ntrl|type)|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit|blank)|l(ower|ess(equal|greater)?)|al(num|pha)|gr(eater(equal)?|aph)|xdigit|blank)|logb([fl])?|max(div|abs))|di(v|fftime)|_Exit|unget(c|wc)|p(ow([fl])?|ut(s|c(har)?|wc(har)?)|error|rintf)|e(rf(c([fl])?|[fl])?|x(it|p(2([fl])?|[fl]|m1([fl])?)?))|v(s(scanf|nprintf|canf|printf|w(scanf|printf))|printf|f(scanf|printf|w(scanf|printf))|w(scanf|printf)|a_(start|copy|end|arg))|qsort|f(s(canf|e(tpos|ek))|close|tell|open|dim([fl])?|p(classify|ut([sc]|w([sc]))|rintf)|e(holdexcept|set(e(nv|xceptflag)|round)|clearexcept|testexcept|of|updateenv|r(aiseexcept|ror)|get(e(nv|xceptflag)|round))|flush|w(scanf|ide|printf|rite)|loor([fl])?|abs([fl])?|get([sc]|pos|w([sc]))|re(open|e|ad|xp([fl])?)|m(in([fl])?|od([fl])?|a([fl]|x([fl])?)?))|l(d(iv|exp([fl])?)|o(ngjmp|cal(time|econv)|g(1(p([fl])?|0([fl])?)|2([fl])?|[fl]|b([fl])?)?)|abs|l(div|abs|r(int([fl])?|ound([fl])?))|r(int([fl])?|ound([fl])?)|gamma([fl])?)|w(scanf|c(s(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|[kf]|l([dl])?|mbs)|pbrk|ftime|len|r(chr|tombs)|xfrm)|to(b|mb)|rtomb)|printf|mem(set|c(hr|py|mp)|move))|a(s(sert|ctime|in(h([fl])?|[fl])?)|cos(h([fl])?|[fl])?|t(o([if]|l(l)?)|exit|an(h([fl])?|2([fl])?|[fl])?)|b(s|ort))|g(et(s|c(har)?|env|wc(har)?)|mtime)|r(int([fl])?|ound([fl])?|e(name|alloc|wind|m(ove|quo([fl])?|ainder([fl])?))|a(nd|ise))|b(search|towc)|m(odf([fl])?|em(set|c(hr|py|mp)|move)|ktime|alloc|b(s(init|towcs|rtowcs)|towc|len|r(towc|len))))\\b"
         },
         {
           "captures": {
@@ -645,7 +645,7 @@
           "include": "#special_variables"
         },
         {
-          "begin": "^\\s*((\\#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
+          "begin": "^\\s*((#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.define.objcpp"
@@ -669,7 +669,7 @@
               "name": "punctuation.definition.parameters.end.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.macro.objcpp",
           "patterns": [
             {
@@ -746,7 +746,7 @@
           ]
         },
         {
-          "begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
+          "begin": "^\\s*((#)\\s*(i(?:nclude(?:_next)?|mport)))\\b\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.$3.objcpp"
@@ -755,7 +755,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.include.objcpp",
           "patterns": [
             {
@@ -806,7 +806,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objcpp",
           "patterns": [
             {
@@ -821,7 +821,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*undef))\\b",
+          "begin": "^\\s*((#)\\s*undef)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.undef.objcpp"
@@ -830,7 +830,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objcpp",
           "patterns": [
             {
@@ -843,7 +843,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*pragma))\\b",
+          "begin": "^\\s*((#)\\s*pragma)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.pragma.objcpp"
@@ -852,7 +852,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.pragma.objcpp",
           "patterns": [
             {
@@ -875,7 +875,7 @@
           "name": "support.type.sys-types.objcpp"
         },
         {
-          "match": "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b",
+          "match": "\\b(pthread_(?:attr_t|cond_t|condattr_t|mutex_t|mutexattr_t|once_t|rwlock_t|rwlockattr_t|t|key_t))\\b",
           "name": "support.type.pthread.objcpp"
         },
         {
@@ -914,7 +914,7 @@
           "include": "#line_continuation_character"
         },
         {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!])",
           "beginCaptures": {
             "1": {
               "name": "variable.object.objcpp"
@@ -923,7 +923,7 @@
               "name": "punctuation.definition.begin.bracket.square.objcpp"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.objcpp"
@@ -937,7 +937,7 @@
           ]
         },
         {
-          "match": "\\[\\s*\\]",
+          "match": "\\[\\s*]",
           "name": "storage.modifier.array.bracket.square.objcpp"
         },
         {
@@ -951,7 +951,7 @@
       ],
       "repository": {
         "access-method": {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))\\s*(?:(\\.)|(->))((?:[a-zA-Z_][a-zA-Z_0-9]*\\s*(?:\\.|->))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.object.objcpp"
@@ -1005,13 +1005,13 @@
         "block": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -1047,7 +1047,7 @@
               "include": "#c_function_call"
             },
             {
-              "begin": "(?:(?:(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)))((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "variable.other.objcpp"
@@ -1070,13 +1070,13 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -1097,7 +1097,7 @@
           ]
         },
         "c_function_call": {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
           "end": "(?<=\\))(?!\\w)",
           "name": "meta.function-call.objcpp",
           "patterns": [
@@ -1249,7 +1249,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -1309,7 +1309,7 @@
               "include": "#vararg_ellipses"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -1417,7 +1417,7 @@
                       "name": "punctuation.separator.pointer-access.objcpp"
                     }
                   },
-                  "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+                  "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
                 }
               ]
             },
@@ -1425,10 +1425,10 @@
               "name": "variable.other.member.objcpp"
             }
           },
-          "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())"
+          "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?-im:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*(\\b(?!(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())"
         },
         "method_access": {
-          "begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
+          "begin": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?-im:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1475,7 +1475,7 @@
                       "name": "punctuation.separator.pointer-access.objcpp"
                     }
                   },
-                  "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+                  "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
                 }
               ]
             },
@@ -1501,7 +1501,7 @@
         },
         "numbers": {
           "begin": "(?<!\\w)(?=\\d|\\.\\d)",
-          "end": "(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))",
+          "end": "(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))",
           "patterns": [
             {
               "captures": {
@@ -1515,7 +1515,7 @@
                   "name": "constant.numeric.exponent.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1527,7 +1527,7 @@
                   "name": "constant.numeric.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1542,7 +1542,7 @@
                   "name": "constant.numeric.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1557,7 +1557,7 @@
                   "name": "keyword.operator.plus.exponent.hexadecimal.objcpp"
                 }
               },
-              "match": "(\\G0[xX])(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1568,7 +1568,7 @@
                   "name": "constant.numeric.exponent.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1580,7 +1580,7 @@
                   "name": "constant.numeric.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1595,7 +1595,7 @@
                   "name": "constant.numeric.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1610,7 +1610,7 @@
                   "name": "keyword.operator.plus.exponent.decimal.objcpp"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9])\\.|\\.(?=[0-9])))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1621,7 +1621,7 @@
                   "name": "constant.numeric.binary.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1633,7 +1633,7 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G0[bB])([01](?:(?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1644,7 +1644,7 @@
                   "name": "constant.numeric.octal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1656,7 +1656,7 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G0)((?:(?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))+)(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1667,7 +1667,7 @@
                   "name": "constant.numeric.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1688,7 +1688,7 @@
                   "name": "constant.numeric.exponent.hexadecimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1697,7 +1697,7 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G0[xX])([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1705,7 +1705,7 @@
                   "name": "constant.numeric.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1726,7 +1726,7 @@
                   "name": "constant.numeric.exponent.decimal.objcpp",
                   "patterns": [
                     {
-                      "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                      "match": "(?<=\\h)'(?=\\h)",
                       "name": "punctuation.separator.constant.numeric.objcpp"
                     }
                   ]
@@ -1735,10 +1735,10 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
-              "match": "(?:(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))+",
+              "match": "(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-])+",
               "name": "invalid.illegal.constant.numeric.objcpp"
             }
           ]
@@ -1770,7 +1770,7 @@
               "name": "keyword.operator.bitwise.shift.objcpp"
             },
             {
-              "match": "!=|<=|>=|==|<|>",
+              "match": "!=|<=|>=|==|[<>]",
               "name": "keyword.operator.comparison.objcpp"
             },
             {
@@ -1778,7 +1778,7 @@
               "name": "keyword.operator.logical.objcpp"
             },
             {
-              "match": "&|\\||\\^|~",
+              "match": "[\\&|^~]",
               "name": "keyword.operator.objcpp"
             },
             {
@@ -1786,7 +1786,7 @@
               "name": "keyword.operator.assignment.objcpp"
             },
             {
-              "match": "%|\\*|/|-|\\+",
+              "match": "[%*/\\-+]",
               "name": "keyword.operator.objcpp"
             },
             {
@@ -1852,7 +1852,7 @@
               "include": "#block_innards"
             },
             {
-              "match": "(?-mix:(?<!:):(?!:))",
+              "match": "(?-im:(?<!:):(?!:))",
               "name": "punctuation.range-based.objcpp"
             }
           ]
@@ -1904,7 +1904,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -1951,7 +1951,7 @@
                   "name": "invalid.illegal.stray-$1.objcpp"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
@@ -1984,7 +1984,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2031,14 +2031,14 @@
                   "name": "invalid.illegal.stray-$1.objcpp"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
         "preprocessor-rule-conditional-line": {
           "patterns": [
             {
-              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
+              "match": "\\bdefined\\b(?:\\s*$|(?=\\s*\\(*\\s*(?!defined\\b)[a-zA-Z_$][\\w$]*\\b\\s*\\)*\\s*(?:\\n|//|/\\*|[?:]|&&|\\|\\||\\\\\\s*\\n)))",
               "name": "keyword.control.directive.conditional.objcpp"
             },
             {
@@ -2111,13 +2111,13 @@
         "preprocessor-rule-define-line-blocks": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -2143,13 +2143,13 @@
               "include": "#vararg_ellipses"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -2171,7 +2171,7 @@
               "name": "punctuation.section.parens.end.bracket.round.objcpp"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
               "end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
               "name": "meta.function.objcpp",
               "patterns": [
@@ -2261,7 +2261,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -2335,7 +2335,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2369,10 +2369,10 @@
                       "name": "punctuation.definition.directive.objcpp"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objcpp",
                       "patterns": [
@@ -2389,7 +2389,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2432,7 +2432,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2466,10 +2466,10 @@
                       "name": "punctuation.definition.directive.objcpp"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objcpp",
                       "patterns": [
@@ -2486,7 +2486,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2513,10 +2513,10 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -2531,7 +2531,7 @@
             {
               "begin": "\\n",
               "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2575,7 +2575,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2625,7 +2625,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2637,7 +2637,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "$base"
@@ -2677,7 +2677,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -2727,7 +2727,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2739,7 +2739,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#block_innards"
@@ -2766,7 +2766,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -2780,7 +2780,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2820,7 +2820,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2853,7 +2853,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -2867,7 +2867,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2907,7 +2907,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -2970,7 +2970,7 @@
               "name": "variable.parameter.probably.objcpp"
             }
           },
-          "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\]\\)]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
+          "match": "(?<=(?:[a-zA-Z_0-9] |[\\&*>\\])]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[]\\s*)?[,)])"
         },
         "static_assert": {
           "begin": "(static_assert|_Static_assert)\\s*(\\()",
@@ -2990,7 +2990,7 @@
           },
           "patterns": [
             {
-              "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
+              "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\")?)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.delimiter.objcpp"
@@ -3015,15 +3015,15 @@
         "storage_types": {
           "patterns": [
             {
-              "match": "(?-mix:(?<!\\w)(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool)(?!\\w))",
+              "match": "(?-im:(?<!\\w)(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool)(?!\\w))",
               "name": "storage.type.built-in.primitive.objcpp"
             },
             {
-              "match": "(?-mix:(?<!\\w)(?:_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t)(?!\\w))",
+              "match": "(?-im:(?<!\\w)(?:_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t)(?!\\w))",
               "name": "storage.type.built-in.objcpp"
             },
             {
-              "match": "(?-mix:\\b(asm|__asm__|enum|struct|union)\\b)",
+              "match": "(?-im:\\b(asm|__asm__|enum|struct|union)\\b)",
               "name": "storage.type.$1.objcpp"
             }
           ]
@@ -3031,7 +3031,7 @@
         "string_escaped_char": {
           "patterns": [
             {
-              "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+              "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
               "name": "constant.character.escape.objcpp"
             },
             {
@@ -3043,7 +3043,7 @@
         "string_placeholder": {
           "patterns": [
             {
-              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
               "name": "constant.other.placeholder.objcpp"
             },
             {
@@ -3139,7 +3139,7 @@
               "name": "keyword.control.switch.objcpp"
             }
           },
-          "end": "(?:(?<=\\})|(?=[;>\\[\\]=]))",
+          "end": "(?:(?<=})|(?=[;>\\[\\]=]))",
           "name": "meta.block.switch.objcpp",
           "patterns": [
             {
@@ -3162,7 +3162,7 @@
             },
             {
               "begin": "(?<=\\{)",
-              "end": "(\\})",
+              "end": "(})",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.section.block.end.bracket.curly.switch.objcpp"
@@ -3256,7 +3256,7 @@
           "name": "storage.modifier.objcpp"
         },
         {
-          "match": "\\b(private:|protected:|public:)",
+          "match": "\\b(p(?:rivate:|rotected:|ublic:))",
           "name": "storage.type.modifier.access.objcpp"
         },
         {
@@ -3264,11 +3264,11 @@
           "name": "keyword.control.objcpp"
         },
         {
-          "match": "\\bdelete\\b(\\s*\\[\\])?|\\bnew\\b(?!])",
+          "match": "\\b(?:delete\\b(\\s*\\[])?|new\\b(?!]))",
           "name": "keyword.control.objcpp"
         },
         {
-          "match": "\\b(f|m)[A-Z]\\w*\\b",
+          "match": "\\b([fm])[A-Z]\\w*\\b",
           "name": "variable.other.readwrite.member.objcpp"
         },
         {
@@ -3318,7 +3318,7 @@
           "name": "storage.modifier.objcpp"
         },
         {
-          "begin": "(?:^|(?:(?<!else|new|=)))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
+          "begin": "(?:^|(?<!else|new|=))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.objcpp"
@@ -3341,7 +3341,7 @@
           ]
         },
         {
-          "begin": "(?:^|(?:(?<!else|new|=)))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
+          "begin": "(?:^|(?<!else|new|=))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.objcpp"
@@ -3388,7 +3388,7 @@
               "name": "punctuation.section.block.begin.bracket.curly.objcpp"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -3416,7 +3416,7 @@
         "constructor": {
           "patterns": [
             {
-              "begin": "(?:^\\s*)((?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*)\\s*(\\()",
+              "begin": "^\\s*((?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*)\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.constructor.objcpp"
@@ -3496,7 +3496,7 @@
                   "name": "keyword.control.namespace.$2.objcpp"
                 }
               },
-              "end": "(?<=\\})|(?=(;|,|\\(|\\)|>|\\[|\\]|=))",
+              "end": "(?<=})|(?=([;,()>\\[\\]=]))",
               "name": "meta.namespace-block.objcpp",
               "patterns": [
                 {
@@ -3506,7 +3506,7 @@
                       "name": "punctuation.definition.scope.objcpp"
                     }
                   },
-                  "end": "\\}",
+                  "end": "}",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.definition.scope.objcpp"
@@ -3530,7 +3530,7 @@
               ]
             },
             {
-              "begin": "\\b(?:(class)|(struct))\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(public|protected|private)\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(public|protected|private)\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
+              "begin": "\\b(?:(class)|(struct))\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(p(?:ublic|rotected|rivate))\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(p(?:ublic|rotected|rivate))\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
               "beginCaptures": {
                 "1": {
                   "name": "storage.type.class.objcpp"
@@ -3550,7 +3550,7 @@
                 "7": {
                   "patterns": [
                     {
-                      "match": "(public|protected|private)",
+                      "match": "(p(?:ublic|rotected|rivate))",
                       "name": "storage.type.modifier.access.objcpp"
                     },
                     {
@@ -3560,7 +3560,7 @@
                   ]
                 }
               },
-              "end": "(?<=\\})|(?=(;|\\(|\\)|>|\\[|\\]|=))",
+              "end": "(?<=})|(?=([;()>\\[\\]=]))",
               "name": "meta.class-struct-block.objcpp",
               "patterns": [
                 {
@@ -3573,7 +3573,7 @@
                       "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                     }
                   },
-                  "end": "(\\})(\\s*\\n)?",
+                  "end": "(})(\\s*\\n)?",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -3606,7 +3606,7 @@
                   "name": "storage.modifier.objcpp"
                 }
               },
-              "end": "(?<=\\})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
+              "end": "(?<=})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
               "name": "meta.extern-block.objcpp",
               "patterns": [
                 {
@@ -3616,7 +3616,7 @@
                       "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                     }
                   },
-                  "end": "\\}|(?=\\s*#\\s*endif\\b)",
+                  "end": "}|(?=\\s*#\\s*endif\\b)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -3641,7 +3641,7 @@
         "strings": {
           "patterns": [
             {
-              "begin": "(u|u8|U|L)?\"",
+              "begin": "(u|u8|[UL])?\"",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -3659,7 +3659,7 @@
               "name": "string.quoted.double.objcpp",
               "patterns": [
                 {
-                  "match": "\\\\u\\h{4}|\\\\U\\h{8}",
+                  "match": "\\\\(?:u\\h{4}|U\\h{8})",
                   "name": "constant.character.escape.objcpp"
                 },
                 {
@@ -3680,7 +3680,7 @@
               ]
             },
             {
-              "begin": "(u|u8|U|L)?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+              "begin": "(u|u8|[UL])?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -3774,7 +3774,7 @@
           "include": "#special_block"
         },
         {
-          "match": "(?-mix:##[a-zA-Z_]\\w*(?!\\w))",
+          "match": "(?-im:##[a-zA-Z_]\\w*(?!\\w))",
           "name": "variable.other.macro.argument.objcpp"
         },
         {
@@ -3785,7 +3785,7 @@
           "name": "storage.modifier.specificer.functional.pre-parameters.$1.objcpp"
         },
         {
-          "match": "(?<!\\w)((?:final|override|volatile|const|noexcept))(?!\\w)(?=\\s*(?:(?:(?:(?:\\{|;))|[\\n\\r])))",
+          "match": "(?<!\\w)((?:final|override|volatile|const|noexcept))(?!\\w)(?=\\s*[{;\\n\\r])",
           "name": "storage.modifier.specifier.functional.post-parameters.$1.objcpp"
         },
         {
@@ -3793,7 +3793,7 @@
           "name": "storage.modifier.specifier.$1.objcpp"
         },
         {
-          "match": "(?<!\\w)((?:private|protected|public)) *:",
+          "match": "(?<!\\w)(p(?:rivate|rotected|ublic)) *:",
           "name": "storage.type.modifier.access.control.$1.objcpp"
         },
         {
@@ -3837,7 +3837,7 @@
           "name": "storage.modifier.objcpp"
         },
         {
-          "begin": "(?:^|(?:(?<!else|new|=)))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
+          "begin": "(?:^|(?<!else|new|=))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.destructor.objcpp"
@@ -3860,7 +3860,7 @@
           ]
         },
         {
-          "begin": "(?:^|(?:(?<!else|new|=)))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
+          "begin": "(?:^|(?<!else|new|=))((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.objcpp"
@@ -3918,7 +3918,7 @@
           "include": "#strings-c"
         },
         {
-          "begin": "^\\s*((\\#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
+          "begin": "^\\s*((#)\\s*define)\\s+((?<id>[a-zA-Z_$][\\w$]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.define.objcpp"
@@ -3942,7 +3942,7 @@
               "name": "punctuation.definition.parameters.end.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.macro.objcpp",
           "patterns": [
             {
@@ -4019,7 +4019,7 @@
           ]
         },
         {
-          "begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
+          "begin": "^\\s*((#)\\s*(i(?:nclude(?:_next)?|mport)))\\b\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.$3.objcpp"
@@ -4028,7 +4028,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.include.objcpp",
           "patterns": [
             {
@@ -4079,7 +4079,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objcpp",
           "patterns": [
             {
@@ -4094,7 +4094,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*undef))\\b",
+          "begin": "^\\s*((#)\\s*undef)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.undef.objcpp"
@@ -4103,7 +4103,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.objcpp",
           "patterns": [
             {
@@ -4116,7 +4116,7 @@
           ]
         },
         {
-          "begin": "^\\s*(?:((#)\\s*pragma))\\b",
+          "begin": "^\\s*((#)\\s*pragma)\\b",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.directive.pragma.objcpp"
@@ -4125,7 +4125,7 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+          "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.pragma.objcpp",
           "patterns": [
             {
@@ -4148,7 +4148,7 @@
           "name": "support.type.sys-types.objcpp"
         },
         {
-          "match": "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b",
+          "match": "\\b(pthread_(?:attr_t|cond_t|condattr_t|mutex_t|mutexattr_t|once_t|rwlock_t|rwlockattr_t|t|key_t))\\b",
           "name": "support.type.pthread.objcpp"
         },
         {
@@ -4156,7 +4156,7 @@
           "name": "support.type.stdint.objcpp"
         },
         {
-          "match": "(?<!\\w)[a-zA-Z_](?:\\w)*_t(?!\\w)",
+          "match": "(?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)",
           "name": "support.type.posix-reserved.objcpp"
         },
         {
@@ -4179,7 +4179,7 @@
           "include": "#line_continuation_character"
         },
         {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!])",
           "beginCaptures": {
             "1": {
               "name": "variable.other.object.objcpp"
@@ -4188,7 +4188,7 @@
               "name": "punctuation.definition.begin.bracket.square.objcpp"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.square.objcpp"
@@ -4202,7 +4202,7 @@
           ]
         },
         {
-          "match": "(?-mix:(?<!delete))\\\\[\\\\s*\\\\]",
+          "match": "(?-im:(?<!delete))\\\\[\\\\s*]",
           "name": "storage.modifier.array.bracket.square.objcpp"
         },
         {
@@ -4250,11 +4250,11 @@
               "name": "variable.other.member.objcpp"
             }
           },
-          "match": "(?:(?:([a-zA-Z_]\\w*)|(?<=\\]|\\))))\\s*(?:(?:((?:(?:\\.|\\.\\*)))|((?:(?:->|->\\*)))))\\s*((?:[a-zA-Z_]\\w*\\s*(?:(?:\\.|->))\\s*)*)\\b(?!(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t))([a-zA-Z_]\\w*)\\b(?!\\()",
+          "match": "(?:([a-zA-Z_]\\w*)|(?<=[\\])]))\\s*(?:(\\.(?:|\\*))|(->(?:|\\*)))\\s*((?:[a-zA-Z_]\\w*\\s*(?:\\.|->)\\s*)*)\\b(?!(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t))([a-zA-Z_]\\w*)\\b(?!\\()",
           "name": "variable.other.object.access.objcpp"
         },
         "access-method": {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))\\s*(?:(\\.)|(->))((?:[a-zA-Z_][a-zA-Z_0-9]*\\s*(?:\\.|->))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.other.object.objcpp"
@@ -4325,7 +4325,7 @@
               "name": "punctuation.section.block.begin.bracket.curly.objcpp"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -4353,13 +4353,13 @@
         "block-c": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -4395,7 +4395,7 @@
               "include": "#c_function_call"
             },
             {
-              "begin": "(?:(?:(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)))((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "variable.other.objcpp"
@@ -4418,13 +4418,13 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -4445,7 +4445,7 @@
           ]
         },
         "c_function_call": {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*(?:<[\\s<>,\\w]*>\\s*)?\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
           "end": "(?<=\\))(?!\\w)",
           "name": "meta.function-call.objcpp",
           "patterns": [
@@ -4524,7 +4524,7 @@
         "constructor": {
           "patterns": [
             {
-              "begin": "(?:^\\s*)((?!while|for|do|if|else|switch|catch)[A-Za-z_][A-Za-z0-9_:]*)\\s*(\\()",
+              "begin": "^\\s*((?!while|for|do|if|else|switch|catch)[A-Za-z_][A-Za-z0-9_:]*)\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.constructor.objcpp"
@@ -4596,7 +4596,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:new)\\s*((?:(?:<(?:[\\s<>,\\w])*>\\s*))?)|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(new\\s*((?:<[\\s<>,\\w]*>\\s*)?)|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.operator.memory.new.objcpp"
@@ -4625,7 +4625,7 @@
               ]
             },
             {
-              "begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*)\\s*([a-zA-Z_]\\w*)\\s*(?:((?:<(?:[\\s<>,\\w])*>\\s*)))?(\\()",
+              "begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*)\\s*([a-zA-Z_]\\w*)\\s*(<[\\s<>,\\w]*>\\s*)?(\\()",
               "beginCaptures": {
                 "1": {
                   "patterns": [
@@ -4699,7 +4699,7 @@
               "include": "#vararg_ellipses-c"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -4708,7 +4708,7 @@
                   "name": "punctuation.section.parameters.begin.bracket.round.objcpp"
                 }
               },
-              "end": "\\)|:",
+              "end": "[):]",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.parameters.end.bracket.round.objcpp"
@@ -4779,7 +4779,7 @@
               "name": "keyword.operator.memory.new.objcpp"
             }
           },
-          "match": "(?<!\\w)(?:(?:(delete)\\s*(\\[\\])|(delete))|(new))(?!\\w)",
+          "match": "(?<!\\w)(?:(?:(delete)\\s*(\\[])|(delete))|(new))(?!\\w)",
           "name": "keyword.operator.memory.objcpp"
         },
         "number_literal": {
@@ -4968,10 +4968,10 @@
               "name": "keyword.operator.plus.exponent.hexadecimal.objcpp"
             }
           },
-          "match": "((?<!\\w)(?:(?:(?:(0[xX])(?:([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*))?((?:(?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F]))))(?:([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*))?(?:([pP])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?|(?:([0-9](?:(?:(?:[0-9]|((?<!')'(?!')))))*))?((?:(?:(?<=[0-9])\\.|\\.(?=[0-9]))))(?:([0-9](?:(?:(?:[0-9]|((?<!')'(?!')))))*))?(?:([eE])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?)(?:([lLfF](?!\\w)))?|(?:(?:(?:(?:(?:(0[bB])((?:(?:(?:[01]|((?<!')'(?!')))))+)|(0)((?:(?:(?:[0-7]|((?<!')'(?!')))))+)))|(0[xX])([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*)(?:([pP])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?))|([0-9](?:(?:(?:[0-9]|((?<!')'(?!')))))*)(?:([eE])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?)(?:((?:(?:(?:(?:(?:(?:(?:(?:(?:(?:(?:(?:LL[uU]|ll[uU]))|[uU]LL))|[uU]ll))|ll))|LL))|[uUlL]))(?!\\w)))?))(\\w*))"
+          "match": "((?<!\\w)(?:(?:(0[xX])(\\h(?:\\h|((?<!')'(?!')))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<!')'(?!')))*)?(?:([pP])(\\+)?(-)?([0-9](?:[0-9]|(?<!')'(?!'))*))?|([0-9](?:[0-9]|((?<!')'(?!')))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<!')'(?!')))*)?(?:([eE])(\\+)?(-)?([0-9](?:[0-9]|(?<!')'(?!'))*))?)([lLfF](?!\\w))?|(?:(?:(?:(0[bB])((?:[01]|((?<!')'(?!')))+)|(0)((?:[0-7]|((?<!')'(?!')))+))|(0[xX])(\\h(?:\\h|((?<!')'(?!')))*)(?:([pP])(\\+)?(-)?([0-9](?:[0-9]|(?<!')'(?!'))*))?)|([0-9](?:[0-9]|((?<!')'(?!')))*)(?:([eE])(\\+)?(-)?([0-9](?:[0-9]|(?<!')'(?!'))*))?)((?:(?:(?:(?:(?:(?:LL[uU]|ll[uU])|[uU]LL)|[uU]ll)|ll)|LL)|[uUlL])(?!\\w))?)(\\w*))"
         },
         "operator_overload": {
-          "begin": "((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*)\\s*(operator)((?:(?:\\s*(?:\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|\\-\\-|\\+|\\-|!|~|\\*|&|\\->\\*|\\*|\\/|%|\\+|\\-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|\\-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,)|\\s+(?:(?:(?:new|new\\[\\]|delete|delete\\[\\])|(?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*[a-zA-Z_]\\w*\\s*(?:&)?)))))\\s*(\\()",
+          "begin": "((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*)\\s*(operator)((?:\\s*(?:\\+\\+|--|\\(\\)|\\[]|->|\\+\\+|--|[+\\-!~*\\&]|->\\*|[*/%+-]|<<|>>|<=>|<|<=|>|>=|==|!=|[\\&^|]|&&|\\|\\||=|\\+=|-=|\\*=|/=|%=|<<=|>>=|&=|\\^=|\\|=|,)|\\s+(?:(?:new|new\\[]|delete|delete\\[])|(?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*[a-zA-Z_]\\w*\\s*&?)))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.scope.objcpp"
@@ -5005,7 +5005,7 @@
         "operators": {
           "patterns": [
             {
-              "match": "(?-mix:(?<!\\w)((?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept))(?!\\w))",
+              "match": "(?-im:(?<!\\w)((?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept))(?!\\w))",
               "name": "keyword.operator.$1.objcpp"
             },
             {
@@ -5029,7 +5029,7 @@
               "name": "keyword.operator.bitwise.shift.objcpp"
             },
             {
-              "match": "!=|<=|>=|==|<|>",
+              "match": "!=|<=|>=|==|[<>]",
               "name": "keyword.operator.comparison.objcpp"
             },
             {
@@ -5037,7 +5037,7 @@
               "name": "keyword.operator.logical.objcpp"
             },
             {
-              "match": "&|\\||\\^|~",
+              "match": "[\\&|^~]",
               "name": "keyword.operator.objcpp"
             },
             {
@@ -5045,7 +5045,7 @@
               "name": "keyword.operator.assignment.objcpp"
             },
             {
-              "match": "%|\\*|/|-|\\+",
+              "match": "[%*/\\-+]",
               "name": "keyword.operator.objcpp"
             },
             {
@@ -5170,7 +5170,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5217,7 +5217,7 @@
                   "name": "invalid.illegal.stray-$1.objcpp"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
@@ -5250,7 +5250,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5297,14 +5297,14 @@
                   "name": "invalid.illegal.stray-$1.objcpp"
                 }
               },
-              "match": "^\\s*#\\s*(else|elif|endif)\\b"
+              "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
             }
           ]
         },
         "preprocessor-rule-conditional-line": {
           "patterns": [
             {
-              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
+              "match": "\\bdefined\\b(?:\\s*$|(?=\\s*\\(*\\s*(?!defined\\b)[a-zA-Z_$][\\w$]*\\b\\s*\\)*\\s*(?:\\n|//|/\\*|[?:]|&&|\\|\\||\\\\\\s*\\n)))",
               "name": "keyword.control.directive.conditional.objcpp"
             },
             {
@@ -5376,13 +5376,13 @@
         "preprocessor-rule-define-line-blocks": {
           "patterns": [
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -5408,17 +5408,17 @@
               "include": "#vararg_ellipses-c"
             },
             {
-              "match": "(?-mix:##?[a-zA-Z_]\\w*(?!\\w))",
+              "match": "(?-im:##?[a-zA-Z_]\\w*(?!\\w))",
               "name": "variable.other.macro.argument.objcpp"
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                 }
               },
-              "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+              "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -5440,7 +5440,7 @@
               "name": "punctuation.section.parens.end.bracket.round.objcpp"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
               "end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
               "name": "meta.function.objcpp",
               "patterns": [
@@ -5530,7 +5530,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objcpp"
@@ -5604,7 +5604,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5638,10 +5638,10 @@
                       "name": "punctuation.definition.directive.objcpp"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objcpp",
                       "patterns": [
@@ -5658,7 +5658,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -5701,7 +5701,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5735,10 +5735,10 @@
                       "name": "punctuation.definition.directive.objcpp"
                     }
                   },
-                  "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
                   "patterns": [
                     {
-                      "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                      "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                       "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                       "name": "meta.preprocessor.objcpp",
                       "patterns": [
@@ -5755,7 +5755,7 @@
                 {
                   "begin": "\\n",
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -5782,10 +5782,10 @@
               "name": "punctuation.definition.directive.objcpp"
             }
           },
-          "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -5800,7 +5800,7 @@
             {
               "begin": "\\n",
               "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -5844,7 +5844,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5894,7 +5894,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -5906,7 +5906,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "$base"
@@ -5946,7 +5946,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
                   "name": "meta.preprocessor.objcpp",
                   "patterns": [
@@ -5996,7 +5996,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.if-branch.in-block.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -6008,7 +6008,7 @@
                 },
                 {
                   "begin": "\\n",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#block_innards-c"
@@ -6035,7 +6035,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -6049,7 +6049,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -6089,7 +6089,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -6122,7 +6122,7 @@
           "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.objcpp",
               "patterns": [
@@ -6136,7 +6136,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*endif\\b))",
               "patterns": [
                 {
                   "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -6176,7 +6176,7 @@
                     }
                   },
                   "contentName": "comment.block.preprocessor.elif-branch.objcpp",
-                  "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+                  "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
                   "patterns": [
                     {
                       "include": "#disabled"
@@ -6242,7 +6242,7 @@
               "name": "variable.parameter.probably.objcpp"
             }
           },
-          "match": "(?:(?:([a-zA-Z_]\\w*)\\s*(?==)|(?<=\\w\\s|\\*\\/|[&*>\\]\\)])\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:(?:,|\\))))))"
+          "match": "(?:([a-zA-Z_]\\w*)\\s*(?==)|(?<=\\w\\s|\\*/|[\\&*>\\])])\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[]\\s*)?[,)]))"
         },
         "scope_resolution": {
           "captures": {
@@ -6267,13 +6267,13 @@
               "name": "punctuation.separator.namespace.access.objcpp"
             }
           },
-          "match": "((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*\\s*)([a-zA-Z_]\\w*)\\s*((?:<(?:[\\s<>,\\w])*>\\s*))?(::)",
+          "match": "((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*\\s*)([a-zA-Z_]\\w*)\\s*(<[\\s<>,\\w]*>\\s*)?(::)",
           "name": "meta.scope-resolution.objcpp"
         },
         "special_block": {
           "patterns": [
             {
-              "begin": "\\b(using)\\s+(namespace)\\s+(?:((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*)\\s*)?((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?=;|\\n)",
+              "begin": "\\b(using)\\s+(namespace)\\s+(?:((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*)\\s*)?((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?=[;\\n])",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.using.directive.objcpp"
@@ -6292,7 +6292,6 @@
                   "name": "entity.name.namespace.objcpp"
                 }
               },
-              "comment": "https://en.cppreference.com/w/cpp/language/namespace",
               "end": ";",
               "endCaptures": {
                 "0": {
@@ -6302,7 +6301,7 @@
               "name": "meta.using-namespace-declaration.objcpp"
             },
             {
-              "begin": "(?<!\\w)(namespace)\\s+(?:(?:((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*[a-zA-Z_]\\w*)|(?={)))",
+              "begin": "(?<!\\w)(namespace)\\s+(?:((?:[a-zA-Z_]\\w*\\s*(?:<[\\s<>,\\w]*>\\s*)?::)*[a-zA-Z_]\\w*)|(?=\\{))",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.namespace.definition.objcpp storage.type.namespace.definition.objcpp"
@@ -6310,7 +6309,7 @@
                 "2": {
                   "patterns": [
                     {
-                      "match": "(?-mix:(?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+                      "match": "(?-im:(?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
                       "name": "entity.name.type.objcpp"
                     },
                     {
@@ -6320,7 +6319,7 @@
                   ]
                 }
               },
-              "end": "(?<=\\})|(?=(;|,|\\(|\\)|>|\\[|\\]|=))",
+              "end": "(?<=})|(?=([;,()>\\[\\]=]))",
               "name": "meta.namespace-block.objcpp",
               "patterns": [
                 {
@@ -6330,7 +6329,7 @@
                       "name": "punctuation.definition.scope.objcpp"
                     }
                   },
-                  "end": "\\}",
+                  "end": "}",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.definition.scope.objcpp"
@@ -6354,7 +6353,7 @@
               ]
             },
             {
-              "begin": "\\b(?:(class)|(struct))\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(public|protected|private)\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(public|protected|private)\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
+              "begin": "\\b(?:(class)|(struct))\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(p(?:ublic|rotected|rivate))\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(p(?:ublic|rotected|rivate))\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
               "beginCaptures": {
                 "1": {
                   "name": "storage.type.class.objcpp"
@@ -6374,7 +6373,7 @@
                 "7": {
                   "patterns": [
                     {
-                      "match": "(public|protected|private)",
+                      "match": "(p(?:ublic|rotected|rivate))",
                       "name": "storage.type.modifier.access.objcpp"
                     },
                     {
@@ -6384,7 +6383,7 @@
                   ]
                 }
               },
-              "end": "(?<=\\})|(;)|(?=(\\(|\\)|>|\\[|\\]|=))",
+              "end": "(?<=})|(;)|(?=([()>\\[\\]=]))",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.terminator.statement.objcpp"
@@ -6402,7 +6401,7 @@
                       "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                     }
                   },
-                  "end": "(\\})(\\s*\\n)?",
+                  "end": "(})(\\s*\\n)?",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -6435,7 +6434,7 @@
                   "name": "storage.modifier.objcpp"
                 }
               },
-              "end": "(?<=\\})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
+              "end": "(?<=})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
               "name": "meta.extern-block.objcpp",
               "patterns": [
                 {
@@ -6445,7 +6444,7 @@
                       "name": "punctuation.section.block.begin.bracket.curly.objcpp"
                     }
                   },
-                  "end": "\\}|(?=\\s*#\\s*endif\\b)",
+                  "end": "}|(?=\\s*#\\s*endif\\b)",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.block.end.bracket.curly.objcpp"
@@ -6486,7 +6485,7 @@
         "string_escaped_char-c": {
           "patterns": [
             {
-              "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+              "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
               "name": "constant.character.escape.objcpp"
             },
             {
@@ -6498,7 +6497,7 @@
         "string_placeholder-c": {
           "patterns": [
             {
-              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+              "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
               "name": "constant.other.placeholder.objcpp"
             }
           ]
@@ -6506,7 +6505,7 @@
         "strings": {
           "patterns": [
             {
-              "begin": "(u|u8|U|L)?\"",
+              "begin": "(u|u8|[UL])?\"",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -6524,7 +6523,7 @@
               "name": "string.quoted.double.objcpp",
               "patterns": [
                 {
-                  "match": "\\\\u\\h{4}|\\\\U\\h{8}",
+                  "match": "\\\\(?:u\\h{4}|U\\h{8})",
                   "name": "constant.character.escape.objcpp"
                 },
                 {
@@ -6545,7 +6544,7 @@
               ]
             },
             {
-              "begin": "(u|u8|U|L)?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+              "begin": "(u|u8|[UL])?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -6599,7 +6598,7 @@
               ]
             },
             {
-              "begin": "(?-mix:(?<![\\da-fA-F])')",
+              "begin": "(?-im:(?<![\\da-fA-F])')",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.objcpp"
@@ -6657,10 +6656,10 @@
               ]
             }
           },
-          "match": "<(?:[\\s<>,\\w])*>\\s*"
+          "match": "<[\\s<>,\\w]*>\\s*"
         },
         "template_definition": {
-          "begin": "(?-mix:(?<!\\w)(template)\\s*(<))",
+          "begin": "(?-im:(?<!\\w)(template)\\s*(<))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.template.objcpp"
@@ -6669,7 +6668,7 @@
               "name": "punctuation.section.angle-brackets.start.template.definition.objcpp"
             }
           },
-          "end": "(?-mix:(>))",
+          "end": "(?-im:(>))",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.angle-brackets.end.template.definition.objcpp"
@@ -6724,7 +6723,7 @@
               "name": "entity.name.type.template.objcpp"
             }
           },
-          "match": "((?:(?:(?:(?:(?:(?:\\s*([a-zA-Z_]\\w*)|((?:[a-zA-Z_]\\w*\\s+)+)([a-zA-Z_]\\w*)))|([a-zA-Z_]\\w*)\\s*(\\.\\.\\.)\\s*([a-zA-Z_]\\w*)))|((?:[a-zA-Z_]\\w*\\s+)*)([a-zA-Z_]\\w*)\\s*([=])\\s*(\\w+)))\\s*(?:(?:(,)|(?=>))))"
+          "match": "((?:(?:(?:\\s*([a-zA-Z_]\\w*)|((?:[a-zA-Z_]\\w*\\s+)+)([a-zA-Z_]\\w*))|([a-zA-Z_]\\w*)\\s*(\\.\\.\\.)\\s*([a-zA-Z_]\\w*))|((?:[a-zA-Z_]\\w*\\s+)*)([a-zA-Z_]\\w*)\\s*(=)\\s*(\\w+))\\s*(?:(,)|(?=>)))"
         },
         "vararg_ellipses-c": {
           "match": "(?<!\\.)\\.\\.\\.(?!\\.)",
@@ -6734,7 +6733,6 @@
     },
     "disabled": {
       "begin": "^\\s*#\\s*if(n?def)?\\b.*$",
-      "comment": "eat nested preprocessor if(def)s",
       "end": "^\\s*#\\s*endif\\b.*$",
       "patterns": [
         {
@@ -6793,8 +6791,8 @@
       ]
     },
     "method": {
-      "begin": "^(-|\\+)\\s*",
-      "end": "(?=\\{|#)|;",
+      "begin": "^([-+])\\s*",
+      "end": "(?=[{#])|;",
       "name": "meta.function.objcpp",
       "patterns": [
         {
@@ -6871,8 +6869,8 @@
       ]
     },
     "method_super": {
-      "begin": "^(?=-|\\+)",
-      "end": "(?<=\\})|(?=#)",
+      "begin": "^(?=[-+])",
+      "end": "(?<=})|(?=#)",
       "name": "meta.function-with-body.objcpp",
       "patterns": [
         {
@@ -6911,7 +6909,7 @@
           "name": "constant.numeric.preprocessor.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
@@ -6923,7 +6921,7 @@
               "name": "keyword.control.import.else.objcpp"
             }
           },
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#interface_innards"
@@ -6932,7 +6930,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "name": "comment.block.preprocessor.if-branch.objcpp",
           "patterns": [
             {
@@ -6958,7 +6956,7 @@
           "name": "constant.numeric.preprocessor.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b)",
@@ -6970,7 +6968,7 @@
               "name": "keyword.control.import.else.objcpp"
             }
           },
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#interface_innards"
@@ -6979,7 +6977,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "name": "comment.block.preprocessor.if-branch.objcpp",
           "patterns": [
             {
@@ -7005,7 +7003,7 @@
           "name": "constant.numeric.preprocessor.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b).*",
@@ -7018,7 +7016,7 @@
             }
           },
           "contentName": "comment.block.preprocessor.else-branch.objcpp",
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#disabled"
@@ -7030,7 +7028,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#implementation_innards"
@@ -7052,7 +7050,7 @@
           "name": "constant.numeric.preprocessor.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "end": "^\\s*(#\\s*(endif)\\b.*?(?:(?=/[/*])|$))",
       "patterns": [
         {
           "begin": "^\\s*(#\\s*(else)\\b).*",
@@ -7065,7 +7063,7 @@
             }
           },
           "contentName": "comment.block.preprocessor.else-branch.objcpp",
-          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*endif\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#disabled"
@@ -7077,7 +7075,7 @@
         },
         {
           "begin": "",
-          "end": "(?=^\\s*#\\s*(else|endif)\\b.*?(?:(?=(?://|/\\*))|$))",
+          "end": "(?=^\\s*#\\s*(e(?:lse|ndif))\\b.*?(?:(?=/[/*])|$))",
           "patterns": [
             {
               "include": "#interface_innards"
@@ -7087,7 +7085,7 @@
       ]
     },
     "preprocessor-rule-other-implementation": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=/[/*])|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.objcpp"
@@ -7096,7 +7094,7 @@
           "name": "keyword.control.import.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=(?://|/\\*))|$)",
+      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=/[/*])|$)",
       "patterns": [
         {
           "include": "#implementation_innards"
@@ -7104,7 +7102,7 @@
       ]
     },
     "preprocessor-rule-other-interface": {
-      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=(?://|/\\*))|$))",
+      "begin": "^\\s*(#\\s*(if(n?def)?)\\b.*?(?:(?=/[/*])|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.objcpp"
@@ -7113,7 +7111,7 @@
           "name": "keyword.control.import.objcpp"
         }
       },
-      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=(?://|/\\*))|$)",
+      "end": "^\\s*(#\\s*(endif)\\b).*?(?:(?=/[/*])|$)",
       "patterns": [
         {
           "include": "#interface_innards"
@@ -7204,7 +7202,7 @@
           "name": "variable.other.selector.objcpp"
         },
         {
-          "match": "\\b(self|super)\\b",
+          "match": "\\b(s(?:elf|uper))\\b",
           "name": "variable.language.objcpp"
         }
       ]
@@ -7212,7 +7210,7 @@
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+          "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
           "name": "constant.character.escape.objcpp"
         },
         {
@@ -7224,7 +7222,7 @@
     "string_placeholder": {
       "patterns": [
         {
-          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
           "name": "constant.other.placeholder.objcpp"
         },
         {
diff --git a/resources/languages/ocaml.json b/resources/languages/ocaml.json
index dca89f4..b03d119 100644
--- a/resources/languages/ocaml.json
+++ b/resources/languages/ocaml.json
@@ -18,7 +18,7 @@
   ],
   "repository": {
     "attribute": {
-      "begin": "(\\[)[[:space:]]*((?<![#\\-:!?.@*/&%^+<=>|~$])@{1,3}(?![#\\-:!?.@*/&%^+<=>|~$]))",
+      "begin": "(\\[)\\s*((?<![#\\-:!?.@*/\\&%^+<=>|~$])@{1,3}(?![#\\-:!?.@*/\\&%^+<=>|~$]))",
       "beginCaptures": {
         "1": {
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
@@ -27,7 +27,7 @@
           "name": "variable.other.class.js message.error variable.interpolation string.regexp"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
@@ -48,13 +48,13 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "((?<![#\\-:!?.@*/&%^+<=>|~$])%(?![#\\-:!?.@*/&%^+<=>|~$]))((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))"
+      "match": "((?<![#\\-:!?.@*/\\&%^+<=>|~$])%(?![#\\-:!?.@*/\\&%^+<=>|~$]))((?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)"
     },
     "attributePayload": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]%|^%))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "((?<![#\\-:!?.@*/&%^+<=>|~$])[:\\?](?![#\\-:!?.@*/&%^+<=>|~$]))|(?<=[[:space:]])|(?=\\])",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]%|^%))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "((?<![#\\-:!?.@*/\\&%^+<=>|~$])[:?](?![#\\-:!?.@*/\\&%^+<=>|~$]))|(?<=\\s)|(?=])",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -70,8 +70,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(?=\\])",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(?=])",
           "patterns": [
             {
               "include": "#signature"
@@ -82,12 +82,12 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(?=\\])",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(?=])",
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-              "end": "(?=\\])|\\bwhen\\b",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+              "end": "(?=])|\\bwhen\\b",
               "endCaptures": {
                 "1": {
                 }
@@ -99,8 +99,8 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^[:word:]]when|^when))(?![[:word:]]))",
-              "end": "(?=\\])",
+              "begin": "(?<=(?:\\P{word}when|^when))(?!\\p{word})",
+              "end": "(?=])",
               "patterns": [
                 {
                   "include": "#term"
@@ -117,8 +117,8 @@
     "bindClassTerm": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(:)|(=)(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}|^)(?:and|class|type))(?!\\p{word})",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])(:)|(=)(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -129,8 +129,8 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
-              "end": "(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[[:space:]]*,|[^[:space:][:lower:]%])|(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?=\\btype\\b)",
+              "begin": "(?<=(?:\\P{word}|^)(?:and|class|type))(?!\\p{word})",
+              "end": "(?=(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*\\s*,|[^\\s[:lower:]%])|(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*|(?=\\btype\\b)",
               "endCaptures": {
                 "0": {
                   "name": "entity.name.function strong emphasis"
@@ -149,7 +149,7 @@
                   "name": "punctuation.definition.tag"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "patterns": [
                 {
                   "include": "#type"
@@ -162,8 +162,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])=(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "support.type strong"
@@ -176,8 +176,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "\\band\\b|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -194,8 +194,8 @@
     "bindClassType": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(:)|(=)(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}|^)(?:and|class|type))(?!\\p{word})",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])(:)|(=)(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -206,8 +206,8 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
-              "end": "(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[[:space:]]*,|[^[:space:][:lower:]%])|(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?=\\btype\\b)",
+              "begin": "(?<=(?:\\P{word}|^)(?:and|class|type))(?!\\p{word})",
+              "end": "(?=(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*\\s*,|[^\\s[:lower:]%])|(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*|(?=\\btype\\b)",
               "endCaptures": {
                 "0": {
                   "name": "entity.name.function strong emphasis"
@@ -226,7 +226,7 @@
                   "name": "punctuation.definition.tag"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "patterns": [
                 {
                   "include": "#type"
@@ -239,8 +239,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])=(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "support.type strong"
@@ -253,8 +253,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "\\band\\b|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -271,8 +271,8 @@
     "bindConstructor": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^[:word:]]exception|^exception))(?![[:word:]]))|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\+=|^\\+=|[^#\\-:!?.@*/&%^+<=>|~$]=|^=|[^#\\-:!?.@*/&%^+<=>|~$]\\||^\\|))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(:)|(\\bof\\b)|((?<![#\\-:!?.@*/&%^+<=>|~$])\\|(?![#\\-:!?.@*/&%^+<=>|~$]))|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}exception|^exception))(?!\\p{word})|(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]\\+=|^\\+=|[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=|[^#\\-:!?.@*/\\&%^+<=>|~$]\\||^\\|))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(:)|(\\bof\\b)|((?<![#\\-:!?.@*/\\&%^+<=>|~$])\\|(?![#\\-:!?.@*/\\&%^+<=>|~$]))|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -293,7 +293,7 @@
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
             },
             {
-              "match": "\\b(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)\\b(?![[:space:]]*(?:\\.|\\([^\\*]))",
+              "match": "\\b\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*\\b(?!\\s*(?:\\.|\\([^*]))",
               "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
             },
             {
@@ -302,8 +302,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]of|^of))(?![[:word:]]))",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\|(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?<=(?:\\P{word}of|^of))(?!\\p{word})",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])\\|(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "support.type strong"
@@ -323,8 +323,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "begin": "(?<=(?:\\P{word}type|^type))(?!\\p{word})",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])=(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "endCaptures": {
             "0": {
               "name": "support.type strong"
@@ -340,8 +340,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "\\band\\b|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -361,8 +361,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]and|^and))(?![[:word:]]))|(?=[[:upper:]])",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(:(?!=))|(:?=)(?![#\\-:!?.@*/&%^+<=>|~$])|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}and|^and))(?!\\p{word})|(?=\\p{upper})",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])(:(?!=))|(:?=)(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -380,7 +380,7 @@
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
             },
             {
-              "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
+              "match": "\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*",
               "name": "entity.name.function strong emphasis"
             },
             {
@@ -396,7 +396,7 @@
                   "include": "#comment"
                 },
                 {
-                  "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$])",
+                  "begin": "(?<![#\\-:!?.@*/\\&%^+<=>|~$]):(?![#\\-:!?.@*/\\&%^+<=>|~$])",
                   "beginCaptures": {
                     "0": {
                       "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -420,8 +420,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "\\b(and)\\b|((?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$]))|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "\\b(and)\\b|((?<![#\\-:!?.@*/\\&%^+<=>|~$])=(?![#\\-:!?.@*/\\&%^+<=>|~$]))|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -437,8 +437,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:=|^:=|[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "\\b(?:(and)|(with))\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:=|^:=|[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "\\b(?:(and)|(with))\\b|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -458,8 +458,8 @@
     "bindTerm": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]val|^val))(?![[:word:]]))",
-          "end": "(\\bmodule\\b)|(\\bopen\\b)|(?<![#\\-:!?.@*/&%^+<=>|~$])(:)|((?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$]))(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?<=(?:\\P{word}|^)(?:and|external|let|method|val))(?!\\p{word})",
+          "end": "(\\bmodule\\b)|(\\bopen\\b)|(?<![#\\-:!?.@*/\\&%^+<=>|~$])(:)|((?<![#\\-:!?.@*/\\&%^+<=>|~$])=(?![#\\-:!?.@*/\\&%^+<=>|~$]))(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
@@ -476,8 +476,8 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]val|^val))(?![[:word:]]))",
-              "end": "(?=\\b(?:module|open)\\b)|(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[[:space:]]*,|[^[:space:][:lower:]%])|(\\brec\\b)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?<=(?:\\P{word}|^)(?:and|external|let|method|val))(?!\\p{word})",
+              "end": "(?=\\b(?:module|open)\\b)|(?=(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*\\s*,|[^\\s[:lower:]%])|(\\brec\\b)|((?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
               "endCaptures": {
                 "1": {
                   "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -496,8 +496,8 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^[:word:]]rec|^rec))(?![[:word:]]))",
-              "end": "((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(?=[^[:space:][:alpha:]])",
+              "begin": "(?<=(?:\\P{word}rec|^rec))(?!\\p{word})",
+              "end": "((?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?=[^\\s[:alpha:]])",
               "endCaptures": {
                 "0": {
                   "name": "entity.name.function strong emphasis"
@@ -515,8 +515,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
-          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}module|^module))(?!\\p{word})",
+          "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
               "include": "#declModule"
@@ -524,8 +524,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]open|^open))(?![[:word:]]))",
-          "end": "(?=\\bin\\b)|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}open|^open))(?!\\p{word})",
+          "end": "(?=\\bin\\b)|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
               "include": "#pathModuleSimple"
@@ -533,8 +533,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])=(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "support.type strong"
@@ -542,8 +542,8 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-              "end": "\\btype\\b|(?=[^[:space:]])",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+              "end": "\\btype\\b|(?=\\S)",
               "endCaptures": {
                 "0": {
                   "name": "keyword.control"
@@ -551,8 +551,8 @@
               }
             },
             {
-              "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
-              "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$])",
+              "begin": "(?<=(?:\\P{word}type|^type))(?!\\p{word})",
+              "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])\\.(?![#\\-:!?.@*/\\&%^+<=>|~$])",
               "endCaptures": {
                 "0": {
                   "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -570,8 +570,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "\\band\\b|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -589,13 +589,13 @@
       "patterns": [
         {
           "applyEndPatternLast": true,
-          "begin": "~|\\?",
+          "begin": "[~?]",
           "beginCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
             }
           },
-          "end": ":|(?=[^[:space:]])",
+          "end": ":|(?=\\S)",
           "endCaptures": {
             "0": {
               "name": "keyword"
@@ -603,8 +603,8 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]~|^~|[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-              "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?<=\\))",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]~|^~|[^#\\-:!?.@*/\\&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+              "end": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*|(?<=\\))",
               "endCaptures": {
                 "0": {
                   "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
@@ -625,7 +625,7 @@
                   "patterns": [
                     {
                       "begin": "(?<=\\()",
-                      "end": ":|=",
+                      "end": "[:=]",
                       "endCaptures": {
                         "0": {
                           "name": "keyword"
@@ -633,7 +633,7 @@
                       },
                       "patterns": [
                         {
-                          "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+                          "match": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
                           "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
                         }
                       ]
@@ -653,7 +653,7 @@
                       ]
                     },
                     {
-                      "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+                      "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
                       "end": "(?=\\))",
                       "patterns": [
                         {
@@ -675,8 +675,8 @@
     "bindType": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]type|^type))(?![[:word:]]))",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\+=|=(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}|^)(?:and|type))(?!\\p{word})",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])\\+=|=(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "support.type strong"
@@ -690,7 +690,7 @@
               "include": "#pathType"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "match": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
               "name": "entity.name.function strong"
             },
             {
@@ -699,8 +699,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\+=|^\\+=|[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]\\+=|^\\+=|[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "\\band\\b|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -731,7 +731,7 @@
       ]
     },
     "commentBlock": {
-      "begin": "\\(\\*(?!\\*[^\\)])",
+      "begin": "\\(\\*(?!\\*[^)])",
       "contentName": "emphasis",
       "end": "\\*\\)",
       "name": "comment constant.regexp meta.separator.markdown",
@@ -789,7 +789,7 @@
           "name": "entity.name.class constant.numeric markup.underline"
         }
       },
-      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.tag"
@@ -803,13 +803,13 @@
           "include": "#pragma"
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]class|^class))(?![[:word:]]))",
+          "begin": "(?<=(?:\\P{word}class|^class))(?!\\p{word})",
           "beginCaptures": {
             "0": {
               "name": "entity.name.class constant.numeric markup.underline"
             }
           },
-          "end": "\\btype\\b|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|val)\\b)",
+          "end": "\\btype\\b|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|val)\\b)",
           "endCaptures": {
             "0": {
               "name": "keyword"
@@ -822,8 +822,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
-          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}type|^type))(?!\\p{word})",
+          "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
               "include": "#bindClassType"
@@ -839,7 +839,7 @@
           "name": "keyword markup.underline"
         }
       },
-      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.tag"
@@ -867,7 +867,7 @@
           "name": "variable.other.class.js message.error variable.interpolation string.regexp"
         }
       },
-      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.tag"
@@ -889,13 +889,13 @@
       ]
     },
     "declModule": {
-      "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))|\\bmodule\\b",
+      "begin": "(?<=(?:\\P{word}module|^module))(?!\\p{word})|\\bmodule\\b",
       "beginCaptures": {
         "0": {
           "name": "markup.inserted constant.language support.constant.property-value entity.name.filename markup.underline"
         }
       },
-      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.tag"
@@ -909,8 +909,8 @@
           "include": "#pragma"
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
-          "end": "(\\btype\\b)|(?=[[:upper:]])",
+          "begin": "(?<=(?:\\P{word}module|^module))(?!\\p{word})",
+          "end": "(\\btype\\b)|(?=\\p{upper})",
           "endCaptures": {
             "0": {
               "name": "keyword"
@@ -930,8 +930,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
-          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}type|^type))(?!\\p{word})",
+          "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
               "include": "#bindSignature"
@@ -939,8 +939,8 @@
           ]
         },
         {
-          "begin": "(?=[[:upper:]])",
-          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?=\\p{upper})",
+          "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
               "include": "#bindStructure"
@@ -956,7 +956,7 @@
           "name": "variable.other.class.js message.error variable.interpolation string.regexp"
         }
       },
-      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.tag"
@@ -993,7 +993,7 @@
           "name": "variable.other.class.js message.error variable.interpolation string.regexp"
         }
       },
-      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.tag"
@@ -1012,13 +1012,13 @@
       ]
     },
     "declType": {
-      "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))|\\btype\\b",
+      "begin": "(?<=(?:\\P{word}type|^type))(?!\\p{word})|\\btype\\b",
       "beginCaptures": {
         "0": {
           "name": "keyword markup.underline"
         }
       },
-      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.tag"
@@ -1037,7 +1037,7 @@
       ]
     },
     "extension": {
-      "begin": "(\\[)((?<![#\\-:!?.@*/&%^+<=>|~$])%{1,3}(?![#\\-:!?.@*/&%^+<=>|~$]))",
+      "begin": "(\\[)((?<![#\\-:!?.@*/\\&%^+<=>|~$])%{1,3}(?![#\\-:!?.@*/\\&%^+<=>|~$]))",
       "beginCaptures": {
         "1": {
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
@@ -1046,7 +1046,7 @@
           "name": "variable.other.class.js message.error variable.interpolation string.regexp"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
@@ -1099,7 +1099,7 @@
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
         }
       },
-      "end": "\\|\\]",
+      "end": "\\|]",
       "patterns": [
         {
           "include": "#term"
@@ -1111,7 +1111,7 @@
       "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
     },
     "literalCharacter": {
-      "begin": "(?<![[:word:]])'",
+      "begin": "(?<!\\p{word})'",
       "end": "'",
       "name": "markup.punctuation.quote.beginning",
       "patterns": [
@@ -1121,7 +1121,7 @@
       ]
     },
     "literalCharacterEscape": {
-      "match": "\\\\(?:[\\\\\"'ntbr]|[[:digit:]][[:digit:]][[:digit:]]|x[[:xdigit:]][[:xdigit:]]|o[0-3][0-7][0-7])"
+      "match": "\\\\(?:[\\\\\"'ntbr]|\\d\\d\\d|x\\h\\h|o[0-3][0-7][0-7])"
     },
     "literalClassType": {
       "patterns": [
@@ -1144,7 +1144,7 @@
                   "name": "variable.other.class.js message.error variable.interpolation string.regexp"
                 }
               },
-              "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.tag"
@@ -1158,7 +1158,7 @@
                       "name": "variable.other.class.js message.error variable.interpolation string.regexp"
                     }
                   },
-                  "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+                  "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
                   "patterns": [
                     {
                       "include": "#variablePattern"
@@ -1180,7 +1180,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]"
+          "end": "]"
         }
       ]
     },
@@ -1193,7 +1193,7 @@
               "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "patterns": [
             {
               "include": "#term"
@@ -1203,7 +1203,7 @@
       ]
     },
     "literalNumber": {
-      "match": "(?<![[:alpha:]])[[:digit:]][[:digit:]]*(\\.[[:digit:]][[:digit:]]*)?",
+      "match": "(?<!\\p{alpha})\\d\\d*(\\.\\d\\d*)?",
       "name": "constant.numeric"
     },
     "literalObjectTerm": {
@@ -1227,7 +1227,7 @@
                   "name": "variable.other.class.js message.error variable.interpolation string.regexp"
                 }
               },
-              "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.tag"
@@ -1241,7 +1241,7 @@
                       "name": "variable.other.class.js message.error variable.interpolation string.regexp"
                     }
                   },
-                  "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+                  "end": ";;|(?=[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
                   "patterns": [
                     {
                       "include": "#variablePattern"
@@ -1263,7 +1263,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]"
+          "end": "]"
         }
       ]
     },
@@ -1274,11 +1274,11 @@
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong strong"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
-          "begin": "(?<=\\{|;)",
-          "end": "(:)|(=)|(;)|(with)|(?=\\})",
+          "begin": "(?<=[{;])",
+          "end": "(:)|(=)|(;)|(with)|(?=})",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -1301,14 +1301,14 @@
               "include": "#pathModulePrefixSimple"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "match": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
-          "end": "(:)|(=)|(;)|(?=\\})",
+          "begin": "(?<=(?:\\P{word}with|^with))(?!\\p{word})",
+          "end": "(:)|(=)|(;)|(?=})",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -1322,14 +1322,14 @@
           },
           "patterns": [
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "match": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(;)|(=)|(?=\\})",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(;)|(=)|(?=})",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -1345,8 +1345,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": ";|(?=\\})",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": ";|(?=})",
           "endCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -1374,7 +1374,7 @@
         },
         {
           "begin": "(\\{)([_[:lower:]]*?)(\\|)",
-          "end": "(\\|)(\\2)(\\})",
+          "end": "(\\|)(\\2)(})",
           "name": "string beginning.punctuation.definition.quote.markdown",
           "patterns": [
             {
@@ -1385,7 +1385,7 @@
       ]
     },
     "literalStringEscape": {
-      "match": "\\\\(?:[\\\\\"ntbr]|[[:digit:]][[:digit:]][[:digit:]]|x[[:xdigit:]][[:xdigit:]]|o[0-3][0-7][0-7])"
+      "match": "\\\\(?:[\\\\\"ntbr]|\\d\\d\\d|x\\h\\h|o[0-3][0-7][0-7])"
     },
     "literalUnit": {
       "match": "\\(\\)",
@@ -1397,19 +1397,19 @@
           "include": "#pathModulePrefixExtended"
         },
         {
-          "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
+          "match": "\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*",
           "name": "entity.name.class constant.numeric"
         }
       ]
     },
     "pathModulePrefixExtended": {
-      "begin": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.|$|\\()",
+      "begin": "\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*(?=\\s*\\.|$|\\()",
       "beginCaptures": {
         "0": {
           "name": "entity.name.class constant.numeric"
         }
       },
-      "end": "(?![[:space:]\\.]|$|\\()",
+      "end": "(?![\\s.]|$|\\()",
       "patterns": [
         {
           "include": "#comment"
@@ -1424,7 +1424,7 @@
           "end": "\\)",
           "patterns": [
             {
-              "match": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\)))",
+              "match": "(\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*(?=\\s*\\)))",
               "name": "string.other.link variable.language variable.parameter emphasis"
             },
             {
@@ -1433,13 +1433,13 @@
           ]
         },
         {
-          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "begin": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])\\.(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "beginCaptures": {
             "0": {
               "name": "keyword strong"
             }
           },
-          "end": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.|$))|((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*(?:$|\\()))|((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\)))|(?![[:space:]\\.[:upper:]]|$|\\()",
+          "end": "(\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*(?=\\s*\\.|$))|(\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*(?=\\s*(?:$|\\()))|(\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*(?=\\s*\\)))|(?![\\s.[:upper:]]|$|\\()",
           "endCaptures": {
             "1": {
               "name": "entity.name.class constant.numeric"
@@ -1464,7 +1464,7 @@
       "end": "\\)",
       "patterns": [
         {
-          "match": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\)))",
+          "match": "(\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*(?=\\s*\\)))",
           "name": "string.other.link variable.language variable.parameter emphasis"
         },
         {
@@ -1473,25 +1473,25 @@
       ]
     },
     "pathModulePrefixSimple": {
-      "begin": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.)",
+      "begin": "\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*(?=\\s*\\.)",
       "beginCaptures": {
         "0": {
           "name": "entity.name.class constant.numeric"
         }
       },
-      "end": "(?![[:space:]\\.])",
+      "end": "(?![\\s.])",
       "patterns": [
         {
           "include": "#comment"
         },
         {
-          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "begin": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])\\.(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "beginCaptures": {
             "0": {
               "name": "keyword strong"
             }
           },
-          "end": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.))|((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*))|(?![[:space:]\\.[:upper:]])",
+          "end": "(\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*(?=\\s*\\.))|(\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*(?=\\s*))|(?![\\s.[:upper:]])",
           "endCaptures": {
             "1": {
               "name": "entity.name.class constant.numeric"
@@ -1509,7 +1509,7 @@
           "include": "#pathModulePrefixSimple"
         },
         {
-          "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
+          "match": "\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*",
           "name": "entity.name.class constant.numeric"
         }
       ]
@@ -1517,20 +1517,20 @@
     "pathRecord": {
       "patterns": [
         {
-          "begin": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
-          "end": "(?=[^[:space:]\\.])(?!\\(\\*)",
+          "begin": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
+          "end": "(?=[^\\s.])(?!\\(\\*)",
           "patterns": [
             {
               "include": "#comment"
             },
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\.|^\\.))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$])",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]\\.|^\\.))(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?<![#\\-:!?.@*/\\&%^+<=>|~$])\\.(?![#\\-:!?.@*/\\&%^+<=>|~$])",
               "beginCaptures": {
                 "0": {
                   "name": "keyword strong"
                 }
               },
-              "end": "((?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$]))|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|mutable|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(?<=\\))|(?<=\\])",
+              "end": "((?<![#\\-:!?.@*/\\&%^+<=>|~$])\\.(?![#\\-:!?.@*/\\&%^+<=>|~$]))|((?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|mutable|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?<=\\))|(?<=])",
               "endCaptures": {
                 "1": {
                   "name": "keyword strong"
@@ -1567,7 +1567,7 @@
                       "name": "variable.other.class.js message.error variable.interpolation string.regexp"
                     }
                   },
-                  "end": "\\]",
+                  "end": "]",
                   "patterns": [
                     {
                       "include": "#pattern"
@@ -1627,7 +1627,7 @@
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
         }
       },
-      "end": "\\|\\]",
+      "end": "\\|]",
       "patterns": [
         {
           "include": "#pattern"
@@ -1645,7 +1645,7 @@
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#pattern"
@@ -1664,7 +1664,7 @@
           "name": "variable.other.class.js message.error variable.interpolation string.regexp"
         }
       },
-      "match": "((?<![#\\-:!?.@*/&%^+<=>|~$]),(?![#\\-:!?.@*/&%^+<=>|~$]))|([#\\-:!?.@*/&%^+<=>|~$]+)|\\b(as)\\b"
+      "match": "((?<![#\\-:!?.@*/\\&%^+<=>|~$]),(?![#\\-:!?.@*/\\&%^+<=>|~$]))|([#\\-:!?.@*/\\&%^+<=>|~$]+)|\\b(as)\\b"
     },
     "patternModule": {
       "begin": "\\bmodule\\b",
@@ -1693,7 +1693,7 @@
           "include": "#comment"
         },
         {
-          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "begin": "(?<![#\\-:!?.@*/\\&%^+<=>|~$]):(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "beginCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -1718,11 +1718,11 @@
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong strong"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
-          "begin": "(?<=\\{|;)",
-          "end": "(:)|(=)|(;)|(with)|(?=\\})",
+          "begin": "(?<=[{;])",
+          "end": "(:)|(=)|(;)|(with)|(?=})",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -1745,14 +1745,14 @@
               "include": "#pathModulePrefixSimple"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "match": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
-          "end": "(:)|(=)|(;)|(?=\\})",
+          "begin": "(?<=(?:\\P{word}with|^with))(?!\\p{word})",
+          "end": "(:)|(=)|(;)|(?=})",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -1766,14 +1766,14 @@
           },
           "patterns": [
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "match": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(;)|(=)|(?=\\})",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(;)|(=)|(?=})",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -1789,8 +1789,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": ";|(?=\\})",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": ";|(?=})",
           "endCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -1819,13 +1819,13 @@
       ]
     },
     "pragma": {
-      "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])#(?![#\\-:!?.@*/&%^+<=>|~$])",
+      "begin": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])#(?![#\\-:!?.@*/\\&%^+<=>|~$])",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.tag"
         }
       },
-      "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "patterns": [
         {
           "include": "#comment"
@@ -1870,10 +1870,10 @@
           "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
         }
       },
-      "end": "(?=\\))|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "end": "(?=\\))|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
+          "begin": "(?<=(?:\\P{word}with|^with))(?!\\p{word})",
           "end": "\\b(?:(module)|(type))\\b",
           "endCaptures": {
             "1": {
@@ -1901,10 +1901,10 @@
               "name": "keyword"
             }
           },
-          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^[:word:]]functor|^functor))(?![[:word:]]))",
+              "begin": "(?<=(?:\\P{word}functor|^functor))(?!\\p{word})",
               "end": "(\\(\\))|(\\((?!\\)))",
               "endCaptures": {
                 "1": {
@@ -1933,7 +1933,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
               "end": "\\)",
               "endCaptures": {
                 "0": {
@@ -1948,7 +1948,7 @@
             },
             {
               "begin": "(?<=\\))",
-              "end": "(\\()|((?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "(\\()|((?<![#\\-:!?.@*/\\&%^+<=>|~$])->(?![#\\-:!?.@*/\\&%^+<=>|~$]))",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.tag"
@@ -1959,8 +1959,8 @@
               }
             },
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-              "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+              "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
               "patterns": [
                 {
                   "include": "#signature"
@@ -1970,7 +1970,7 @@
           ]
         },
         {
-          "match": "(?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "match": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])->(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "name": "support.type strong"
         }
       ]
@@ -2008,7 +2008,7 @@
           "include": "#comment"
         },
         {
-          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "begin": "(?<![#\\-:!?.@*/\\&%^+<=>|~$]):(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "beginCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -2029,8 +2029,8 @@
     "signatureRecovered": {
       "patterns": [
         {
-          "begin": "\\(|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:|[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]include|^include|[^[:word:]]open|^open))(?![[:word:]]))",
-          "end": "\\bmodule\\b|(?!$|[[:space:]]|\\bmodule\\b)",
+          "begin": "\\(|(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:|[^#\\-:!?.@*/\\&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?<=(?:\\P{word}|^)(?:include|open))(?!\\p{word})",
+          "end": "\\bmodule\\b|(?!$|\\s|\\bmodule\\b)",
           "endCaptures": {
             "0": {
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
@@ -2038,11 +2038,11 @@
           }
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
-          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "begin": "(?<=(?:\\P{word}module|^module))(?!\\p{word})",
+          "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
+              "begin": "(?<=(?:\\P{word}module|^module))(?!\\p{word})",
               "end": "\\btype\\b",
               "endCaptures": {
                 "0": {
@@ -2051,7 +2051,7 @@
               }
             },
             {
-              "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
+              "begin": "(?<=(?:\\P{word}type|^type))(?!\\p{word})",
               "end": "\\bof\\b",
               "endCaptures": {
                 "0": {
@@ -2060,8 +2060,8 @@
               }
             },
             {
-              "begin": "(?:(?<=(?:[^[:word:]]of|^of))(?![[:word:]]))",
-              "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "begin": "(?<=(?:\\P{word}of|^of))(?!\\p{word})",
+              "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
               "patterns": [
                 {
                   "include": "#signature"
@@ -2100,10 +2100,10 @@
               "name": "keyword"
             }
           },
-          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^[:word:]]functor|^functor))(?![[:word:]]))",
+              "begin": "(?<=(?:\\P{word}functor|^functor))(?!\\p{word})",
               "end": "(\\(\\))|(\\((?!\\)))",
               "endCaptures": {
                 "1": {
@@ -2132,7 +2132,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
               "end": "\\)",
               "endCaptures": {
                 "0": {
@@ -2147,7 +2147,7 @@
             },
             {
               "begin": "(?<=\\))",
-              "end": "(\\()|((?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "(\\()|((?<![#\\-:!?.@*/\\&%^+<=>|~$])->(?![#\\-:!?.@*/\\&%^+<=>|~$]))",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.tag"
@@ -2158,8 +2158,8 @@
               }
             },
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-              "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+              "end": "(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
               "patterns": [
                 {
                   "include": "#structure"
@@ -2169,7 +2169,7 @@
           ]
         },
         {
-          "match": "(?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "match": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])->(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "name": "support.type strong"
         }
       ]
@@ -2286,7 +2286,7 @@
           "include": "#pathModulePrefixSimple"
         },
         {
-          "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
+          "match": "\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*",
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
         }
       ]
@@ -2343,8 +2343,8 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^[:word:]]for|^for))(?![[:word:]]))",
-              "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])",
+              "begin": "(?<=(?:\\P{word}for|^for))(?!\\p{word})",
+              "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])=(?![#\\-:!?.@*/\\&%^+<=>|~$])",
               "endCaptures": {
                 "0": {
                   "name": "support.type strong"
@@ -2357,7 +2357,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
               "end": "\\b(?:downto|to)\\b",
               "endCaptures": {
                 "0": {
@@ -2371,7 +2371,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^[:word:]]to|^to))(?![[:word:]]))",
+              "begin": "(?<=(?:\\P{word}to|^to))(?!\\p{word})",
               "end": "\\bdo\\b",
               "endCaptures": {
                 "0": {
@@ -2385,7 +2385,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^[:word:]]do|^do))(?![[:word:]]))",
+              "begin": "(?<=(?:\\P{word}do|^do))(?!\\p{word})",
               "end": "(?=\\bdone\\b)",
               "patterns": [
                 {
@@ -2411,8 +2411,8 @@
     "termLet": {
       "patterns": [
         {
-          "begin": "(?:(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=|[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?<=;|\\())(?=[[:space:]]|\\blet\\b)|(?:(?<=(?:[^[:word:]]begin|^begin|[^[:word:]]do|^do|[^[:word:]]else|^else|[^[:word:]]in|^in|[^[:word:]]struct|^struct|[^[:word:]]then|^then|[^[:word:]]try|^try))(?![[:word:]]))|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]@@|^@@))(?![#\\-:!?.@*/&%^+<=>|~$]))[[:space:]]+",
-          "end": "\\b(?:(and)|(let))\\b|(?=[^[:space:]])(?!\\(\\*)",
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=|[^#\\-:!?.@*/\\&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?<=[;(]))(?=\\s|\\blet\\b)|(?<=(?:\\P{word}|^)(?:begin|do|else|in|struct|then|try))(?!\\p{word})|(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]@@|^@@))(?![#\\-:!?.@*/\\&%^+<=>|~$])\\s+",
+          "end": "\\b(?:(and)|(let))\\b|(?=\\S)(?!\\(\\*)",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -2428,13 +2428,13 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]let|^let))(?![[:word:]]))|(let)",
+          "begin": "(?<=(?:\\P{word}|^)(?:and|let))(?!\\p{word})|(let)",
           "beginCaptures": {
             "1": {
               "name": "storage.type markup.underline"
             }
           },
-          "end": "\\b(?:(and)|(in))\\b|(?=\\}|\\)|\\]|\\b(?:end|class|exception|external|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "end": "\\b(?:(and)|(in))\\b|(?=[})\\]]|\\b(?:end|class|exception|external|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -2468,8 +2468,8 @@
     "termMatchRule": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^[:word:]]fun|^fun|[^[:word:]]function|^function|[^[:word:]]with|^with))(?![[:word:]]))",
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(\\|)|(->)(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "begin": "(?<=(?:\\P{word}|^)(?:fun|function|with))(?!\\p{word})",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])(\\|)|(->)(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "endCaptures": {
             "1": {
               "name": "support.type strong"
@@ -2491,13 +2491,13 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^\\[#\\-:!?.@*/&%^+<=>|~$]\\||^\\|))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?<![#\\-:!?.@*/&%^+<=>|~$])\\|(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "begin": "(?<=(?:[^\\[#\\-:!?.@*/\\&%^+<=>|~$]\\||^\\|))(?![#\\-:!?.@*/\\&%^+<=>|~$])|(?<![#\\-:!?.@*/\\&%^+<=>|~$])\\|(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "beginCaptures": {
             "0": {
               "name": "support.type strong"
             }
           },
-          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(\\|)|(->)(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "end": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])(\\|)|(->)(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "endCaptures": {
             "1": {
               "name": "support.type strong"
@@ -2517,7 +2517,7 @@
                   "name": "variable.other.class.js message.error variable.interpolation string.regexp"
                 }
               },
-              "end": "(?=(?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "(?=(?<![#\\-:!?.@*/\\&%^+<=>|~$])->(?![#\\-:!?.@*/\\&%^+<=>|~$]))",
               "patterns": [
                 {
                   "include": "#term"
@@ -2531,13 +2531,13 @@
     "termOperator": {
       "patterns": [
         {
-          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])#(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "begin": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])#(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "beginCaptures": {
             "0": {
               "name": "keyword"
             }
           },
-          "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+          "end": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
           "endCaptures": {
             "0": {
               "name": "entity.name.function"
@@ -2561,7 +2561,7 @@
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
             }
           },
-          "match": "(,|[#\\-:!?.@*/&%^+<=>|~$]+)|(;)"
+          "match": "(,|[#\\-:!?.@*/\\&%^+<=>|~$]+)|(;)"
         },
         {
           "match": "\\b(?:and|assert|asr|land|lazy|lsr|lxor|mod|new|or)\\b",
@@ -2571,13 +2571,13 @@
     },
     "termPun": {
       "applyEndPatternLast": true,
-      "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\?|~(?![#\\-:!?.@*/&%^+<=>|~$])",
+      "begin": "(?<![#\\-:!?.@*/\\&%^+<=>|~$])\\?|~(?![#\\-:!?.@*/\\&%^+<=>|~$])",
       "beginCaptures": {
         "0": {
           "name": "variable.other.class.js message.error variable.interpolation string.regexp"
         }
       },
-      "end": ":|(?=[^[:space:]:])",
+      "end": ":|(?=[^\\s:])",
       "endCaptures": {
         "0": {
           "name": "keyword"
@@ -2585,8 +2585,8 @@
       },
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?|[^#\\-:!?.@*/&%^+<=>|~$]~|^~))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]\\?|^\\?|[^#\\-:!?.@*/\\&%^+<=>|~$]~|^~))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
           "endCaptures": {
             "0": {
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
@@ -2626,7 +2626,7 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^[:word:]]while|^while))(?![[:word:]]))",
+              "begin": "(?<=(?:\\P{word}while|^while))(?!\\p{word})",
               "end": "\\bdo\\b",
               "endCaptures": {
                 "0": {
@@ -2640,7 +2640,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^[:word:]]do|^do))(?![[:word:]]))",
+              "begin": "(?<=(?:\\P{word}do|^do))(?!\\p{word})",
               "end": "(?=\\bdone\\b)",
               "patterns": [
                 {
@@ -2690,7 +2690,7 @@
     "typeConstructor": {
       "patterns": [
         {
-          "begin": "(_)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(')((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(?<=[^\\*]\\)|\\])",
+          "begin": "(_)|((?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(')((?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?<=[^*]\\)|])",
           "beginCaptures": {
             "1": {
               "name": "comment constant.regexp meta.separator.markdown"
@@ -2702,7 +2702,7 @@
               "name": "keyword.control emphasis"
             }
           },
-          "end": "(?=\\((?!\\*)|\\*|:|,|=|\\.|>|-|\\{|\\[|\\+|\\}|\\)|\\]|;|\\|)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))[[:space:]]*(?!\\(\\*|[[:word:]])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "end": "(?=\\((?!\\*)|[*:,=.>\\-{\\[+})\\];|])|((?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[:space]*(?!\\(\\*|\\p{word})|(?=;;|[})\\]]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "entity.name.function strong"
@@ -2722,7 +2722,7 @@
     "typeLabel": {
       "patterns": [
         {
-          "begin": "(\\??)((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))[[:space:]]*((?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "begin": "(\\??)((?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)\\s*((?<![#\\-:!?.@*/\\&%^+<=>|~$]):(?![#\\-:!?.@*/\\&%^+<=>|~$]))",
           "captures": {
             "1": {
               "name": "keyword strong emphasis"
@@ -2734,7 +2734,7 @@
               "name": "keyword"
             }
           },
-          "end": "(?=(?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(?=(?<![#\\-:!?.@*/\\&%^+<=>|~$])->(?![#\\-:!?.@*/\\&%^+<=>|~$]))",
           "patterns": [
             {
               "include": "#type"
@@ -2770,7 +2770,7 @@
       "end": ">",
       "patterns": [
         {
-          "begin": "(?<=<|;)",
+          "begin": "(?<=[<;])",
           "end": "(:)|(?=>)",
           "endCaptures": {
             "1": {
@@ -2791,13 +2791,13 @@
               "include": "#pathModulePrefixSimple"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "match": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
           "end": "(;)|(?=>)",
           "endCaptures": {
             "1": {
@@ -2818,7 +2818,7 @@
     "typeOperator": {
       "patterns": [
         {
-          "match": ",|;|[#\\-:!?.@*/&%^+<=>|~$]+",
+          "match": "[,;]|[#\\-:!?.@*/\\&%^+<=>|~$]+",
           "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
         }
       ]
@@ -2846,7 +2846,7 @@
     },
     "typePolymorphicVariant": {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "patterns": [
       ]
     },
@@ -2857,11 +2857,11 @@
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong strong"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
-          "begin": "(?<=\\{|;)",
-          "end": "(:)|(=)|(;)|(with)|(?=\\})",
+          "begin": "(?<=[{;])",
+          "end": "(:)|(=)|(;)|(with)|(?=})",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -2884,14 +2884,14 @@
               "include": "#pathModulePrefixSimple"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "match": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
-          "end": "(:)|(=)|(;)|(?=\\})",
+          "begin": "(?<=(?:\\P{word}with|^with))(?!\\p{word})",
+          "end": "(:)|(=)|(;)|(?=})",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
@@ -2905,14 +2905,14 @@
           },
           "patterns": [
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "match": "(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(;)|(=)|(?=\\})",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": "(;)|(=)|(?=})",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -2928,8 +2928,8 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": ";|(?=\\})",
+          "begin": "(?<=(?:[^#\\-:!?.@*/\\&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/\\&%^+<=>|~$])",
+          "end": ";|(?=})",
           "endCaptures": {
             "0": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -2949,7 +2949,7 @@
           "name": "string.other.link variable.language variable.parameter emphasis"
         }
       },
-      "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)"
+      "match": "\\b(?=\\p{upper})[[:alpha:]_][[:word:]']*"
     },
     "variablePattern": {
       "captures": {
@@ -2960,7 +2960,7 @@
           "name": "string.other.link variable.language variable.parameter emphasis"
         }
       },
-      "match": "(\\b_\\b)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))"
+      "match": "(\\b_\\b)|((?!\\b(?:and|'|as|asr|assert|\\*|begin|class|[:,@]|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|[>-]|if|in|include|inherit|initializer|land|lazy|[{(\\[<]|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|[%+]|private|[?\"]|rec|[\\\\})\\];]|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)"
     }
   },
   "scopeName": "source.ocaml"
diff --git a/resources/languages/pascal.json b/resources/languages/pascal.json
index 0dafed5..bc73e71 100644
--- a/resources/languages/pascal.json
+++ b/resources/languages/pascal.json
@@ -9,7 +9,8 @@
     "dpr",
     "dpk",
     "lfm",
-    "lpr"
+    "lpr",
+    "ppr"
   ],
   "name": "pascal",
   "patterns": [
@@ -60,7 +61,7 @@
           "name": "string.regexp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "string.regexp"
     },
     {
@@ -68,11 +69,11 @@
       "name": "storage.support.type.pascal"
     },
     {
-      "match": "\\b(\\d+)|(\\d*\\.\\d+([eE][\\-+]?\\d+)?)\\b",
+      "match": "\\b(\\d+)|(\\d*\\.\\d+([eE][-+]?\\d+)?)\\b",
       "name": "constant.numeric.pascal"
     },
     {
-      "match": "\\$[0-9a-fA-F]{1,16}\\b",
+      "match": "\\$\\h{1,16}\\b",
       "name": "constant.numeric.hex.pascal"
     },
     {
@@ -121,7 +122,7 @@
           "name": "punctuation.definition.comment.pascal"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "comment.block.pascal.two"
     },
     {
@@ -146,7 +147,7 @@
       ]
     },
     {
-      "match": "\\#\\d+",
+      "match": "#\\d+",
       "name": "string.other.pascal"
     }
   ],
diff --git a/resources/languages/perl.json b/resources/languages/perl.json
index be52928..9189337 100644
--- a/resources/languages/perl.json
+++ b/resources/languages/perl.json
@@ -30,8 +30,7 @@
     {
       "applyEndPatternLast": 1,
       "begin": "\\b(?=qr\\s*[^\\s\\w])",
-      "comment": "string.regexp.compile.perl",
-      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;\\,\\#\\{\\}\\)]|\\s*$))",
+      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;,#{})]|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.compile.perl"
@@ -54,7 +53,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "string.regexp.compile.nested_braces.perl",
           "patterns": [
             {
@@ -78,7 +77,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.compile.nested_brackets.perl",
           "patterns": [
             {
@@ -130,8 +129,7 @@
           "name": "string.regexp.compile.nested_parens.perl",
           "patterns": [
             {
-              "comment": "This is to prevent thinks like qr/foo$/ to treat $/ as a variable",
-              "match": "\\$(?=[^\\s\\w\\\\'\\{\\[\\(\\<])"
+              "match": "\\$(?=[^\\s\\w\\\\'{\\[(<])"
             },
             {
               "include": "#escaped_char"
@@ -163,7 +161,7 @@
           ]
         },
         {
-          "begin": "(qr)\\s*([^\\s\\w'\\{\\[\\(\\<])",
+          "begin": "(qr)\\s*([^\\s\\w'{\\[(<])",
           "captures": {
             "0": {
               "name": "punctuation.definition.string.perl"
@@ -176,8 +174,7 @@
           "name": "string.regexp.compile.simple-delimiter.perl",
           "patterns": [
             {
-              "comment": "This is to prevent thinks like qr/foo$/ to treat $/ as a variable",
-              "match": "\\$(?=[^\\s\\w'\\{\\[\\(\\<])",
+              "match": "\\$(?=[^\\s\\w'{\\[(<])",
               "name": "keyword.control.anchor.perl"
             },
             {
@@ -195,9 +192,8 @@
     },
     {
       "applyEndPatternLast": 1,
-      "begin": "(?<!\\{|\\+|\\-)\\b(?=m\\s*[^\\sa-zA-Z0-9])",
-      "comment": "string.regexp.find-m.perl",
-      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;\\,\\#\\{\\}\\)]|\\s*$))",
+      "begin": "(?<![{+-])\\b(?=m\\s*[^\\sa-zA-Z0-9])",
+      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;,#{})]|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.find-m.perl"
@@ -220,7 +216,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "string.regexp.find-m.nested_braces.perl",
           "patterns": [
             {
@@ -244,7 +240,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.find-m.nested_brackets.perl",
           "patterns": [
             {
@@ -325,7 +321,7 @@
           ]
         },
         {
-          "begin": "\\G(?<!\\{|\\+|\\-)(m)(?!_)\\s*([^\\sa-zA-Z0-9'\\{\\[\\(\\<])",
+          "begin": "\\G(?<![{+-])(m)(?!_)\\s*([^\\sa-zA-Z0-9'{\\[(<])",
           "captures": {
             "0": {
               "name": "punctuation.definition.string.perl"
@@ -338,8 +334,7 @@
           "name": "string.regexp.find-m.simple-delimiter.perl",
           "patterns": [
             {
-              "comment": "This is to prevent thinks like qr/foo$/ to treat $/ as a variable",
-              "match": "\\$(?=[^\\sa-zA-Z0-9'\\{\\[\\(\\<])",
+              "match": "\\$(?=[^\\sa-zA-Z0-9'{\\[(<])",
               "name": "keyword.control.anchor.perl"
             },
             {
@@ -355,7 +350,7 @@
                   "name": "punctuation.definition.character-class.begin.perl"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.character-class.end.perl"
@@ -364,8 +359,7 @@
               "name": "constant.other.character-class.set.perl",
               "patterns": [
                 {
-                  "comment": "This is to prevent thinks like qr/foo$/ to treat $/ as a variable",
-                  "match": "\\$(?=[^\\s\\w'\\{\\[\\(\\<])",
+                  "match": "\\$(?=[^\\s\\w'{\\[(<])",
                   "name": "keyword.control.anchor.perl"
                 },
                 {
@@ -382,9 +376,8 @@
     },
     {
       "applyEndPatternLast": 1,
-      "begin": "\\b(?=(?<!\\&)(s)(\\s+\\S|\\s*[;\\,\\{\\}\\(\\)\\[<]|$))",
-      "comment": "string.regexp.replace.perl",
-      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;\\,\\{\\}\\)\\]>]|\\s*$))",
+      "begin": "\\b(?=(?<!&)(s)(\\s+\\S|\\s*[;,{}()\\[<]|$))",
+      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;,{})\\]>]|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.replace.perl"
@@ -407,7 +400,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "string.regexp.nested_braces.perl",
           "patterns": [
             {
@@ -428,7 +421,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.nested_brackets.perl",
           "patterns": [
             {
@@ -488,7 +481,7 @@
               "name": "punctuation.definition.string.perl"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "string.regexp.format.nested_braces.perl",
           "patterns": [
             {
@@ -509,7 +502,7 @@
               "name": "punctuation.definition.string.perl"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.format.nested_brackets.perl",
           "patterns": [
             {
@@ -605,9 +598,8 @@
       ]
     },
     {
-      "begin": "\\b(?=s([^\\sa-zA-Z0-9\\[({<]).*\\1([egimosxradlupcn]*)([\\}\\)\\;\\,]|\\s+))",
-      "comment": "string.regexp.replaceXXX",
-      "end": "((([egimosxradlupcn]*)))(?=([\\}\\)\\;\\,]|\\s+|\\s*$))",
+      "begin": "\\b(?=s([^\\sa-zA-Z0-9\\[({<]).*\\1([egimosxradlupcn]*)([});,]|\\s+))",
+      "end": "((([egimosxradlupcn]*)))(?=([});,]|\\s+|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.replace.perl"
@@ -676,7 +668,6 @@
     },
     {
       "begin": "\\b(?=(?<!\\\\)s\\s*([^\\s\\w\\[({<>]))",
-      "comment": "string.regexp.replace.extended",
       "end": "((([egimosradlupc]*x[egimosradlupc]*)))\\b",
       "endCaptures": {
         "1": {
@@ -744,7 +735,7 @@
       ]
     },
     {
-      "begin": "(?<=\\(|\\{|~|&|\\||if|unless|^)\\s*((\\/))",
+      "begin": "(?<=[({~\\&|]|if|unless|^)\\s*((/))",
       "beginCaptures": {
         "1": {
           "name": "string.regexp.find.perl"
@@ -754,7 +745,7 @@
         }
       },
       "contentName": "string.regexp.find.perl",
-      "end": "((\\1([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;\\,\\#\\{\\}\\)]|\\s*$))",
+      "end": "((\\1([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;,#{})]|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.find.perl"
@@ -768,8 +759,7 @@
       },
       "patterns": [
         {
-          "comment": "This is to prevent thinks like /foo$/ to treat $/ as a variable",
-          "match": "\\$(?=\\/)",
+          "match": "\\$(?=/)",
           "name": "keyword.control.anchor.perl"
         },
         {
@@ -789,7 +779,7 @@
       "match": "\\b(\\w+)\\s*(?==>)"
     },
     {
-      "match": "(?<={)\\s*\\w+\\s*(?=})",
+      "match": "(?<=\\{)\\s*\\w+\\s*(?=})",
       "name": "constant.other.bareword.perl"
     },
     {
@@ -816,7 +806,7 @@
           "name": "storage.type.method.perl"
         }
       },
-      "match": "\\b(sub)(?:\\s+([-a-zA-Z0-9_]+))?\\s*(?:\\([\\$\\@\\*;]*\\))?[^\\w\\{]",
+      "match": "\\b(sub)(?:\\s+([-a-zA-Z0-9_]+))?\\s*(?:\\([$@*;]*\\))?[^\\w{]",
       "name": "meta.function.perl"
     },
     {
@@ -871,11 +861,11 @@
       "name": "string.regexp.replace.perl"
     },
     {
-      "match": "\\b(__FILE__|__LINE__|__PACKAGE__|__SUB__)\\b",
+      "match": "\\b(__(?:FILE__|LINE__|PACKAGE__|SUB__))\\b",
       "name": "constant.language.perl"
     },
     {
-      "begin": "\\b(__DATA__|__END__)\\n?",
+      "begin": "\\b(__(?:DATA__|END__))\\n?",
       "beginCaptures": {
         "1": {
           "name": "constant.language.perl"
@@ -898,7 +888,7 @@
       "name": "storage.modifier.perl"
     },
     {
-      "match": "(?<!\\w)\\-[rwxoRWXOezsfdlpSbctugkTBMAC]\\b",
+      "match": "(?<!\\w)-[rwxoRWXOezsfdlpSbctugkTBMAC]\\b",
       "name": "keyword.operator.filetest.perl"
     },
     {
@@ -913,7 +903,7 @@
       "include": "#heredoc"
     },
     {
-      "begin": "\\bqq\\s*([^\\(\\{\\[\\<\\w\\s])",
+      "begin": "\\bqq\\s*([^({\\[<\\w\\s])",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
@@ -936,7 +926,7 @@
       ]
     },
     {
-      "begin": "\\bqx\\s*([^'\\(\\{\\[\\<\\w\\s])",
+      "begin": "\\bqx\\s*([^'({\\[<\\w\\s])",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
@@ -1002,7 +992,7 @@
       ]
     },
     {
-      "begin": "(?<!->)\\bqw?\\s*([^\\(\\{\\[\\<\\w\\s])",
+      "begin": "(?<!->)\\bqw?\\s*([^({\\[<\\w\\s])",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
@@ -1093,7 +1083,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1119,7 +1109,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1139,13 +1129,13 @@
       ]
     },
     {
-      "begin": "\\bqq\\s*\\<",
+      "begin": "\\bqq\\s*<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1197,7 +1187,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1223,7 +1213,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1243,13 +1233,13 @@
       ]
     },
     {
-      "begin": "\\bqx\\s*\\<",
+      "begin": "\\bqx\\s*<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1295,7 +1285,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1315,7 +1305,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1329,13 +1319,13 @@
       ]
     },
     {
-      "begin": "\\bqw?\\s*\\<",
+      "begin": "\\bqw?\\s*<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1408,8 +1398,7 @@
           "name": "punctuation.section.scope.end.perl"
         }
       },
-      "comment": "Match empty brackets for ↩ snippet",
-      "match": "(\\{)(\\})"
+      "match": "(\\{)(})"
     },
     {
       "captures": {
@@ -1420,7 +1409,6 @@
           "name": "punctuation.section.scope.end.perl"
         }
       },
-      "comment": "Match empty parenthesis for ↩ snippet",
       "match": "(\\()(\\))"
     }
   ],
@@ -1436,27 +1424,27 @@
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\g(?:\\{(?:\\w*|-\\d+)\\}|\\d+)",
+          "match": "\\\\g(?:\\{(?:\\w*|-\\d+)}|\\d+)",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\k(?:\\{\\w*\\}|<\\w*>|'\\w*')",
+          "match": "\\\\k(?:\\{\\w*}|<\\w*>|'\\w*')",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\N\\{[^\\}]*\\}",
+          "match": "\\\\N\\{[^}]*}",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\o\\{\\d*\\}",
+          "match": "\\\\o\\{\\d*}",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\(?:p|P)(?:\\{\\w*\\}|P)",
+          "match": "\\\\[pP](?:\\{\\w*}|P)",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\x(?:[0-9a-zA-Z]{2}|\\{\\w*\\})?",
+          "match": "\\\\x(?:[0-9a-zA-Z]{2}|\\{\\w*})?",
           "name": "constant.character.escape.perl"
         },
         {
@@ -1784,7 +1772,7 @@
           }
         },
         {
-          "begin": "((((<<(~)?) *\\\\)((?![=\\d\\$\\( ])[^;,'\"`\\s\\)]*)()))(.*)\\n?",
+          "begin": "((((<<(~)?) *\\\\)((?![=\\d$( ])[^;,'\"`\\s)]*)()))(.*)\\n?",
           "beginCaptures": {
             "1": {
               "name": "string.unquoted.heredoc.raw.perl"
@@ -2496,7 +2484,7 @@
           ]
         },
         {
-          "begin": "((((<<(~)?) *)((?![=\\d\\$\\( ])[^;,'\"`\\s\\)]*)()))(.*)\\n?",
+          "begin": "((((<<(~)?) *)((?![=\\d$( ])[^;,'\"`\\s)]*)()))(.*)\\n?",
           "beginCaptures": {
             "1": {
               "name": "string.unquoted.heredoc.interpolated.perl"
@@ -2613,7 +2601,7 @@
           "name": "punctuation.section.scope.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -2630,7 +2618,7 @@
           "name": "punctuation.section.scope.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -2650,7 +2638,7 @@
           "name": "punctuation.section.scope.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -2667,7 +2655,7 @@
           "name": "punctuation.section.scope.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -2738,8 +2726,7 @@
       "end": "\\)",
       "patterns": [
         {
-          "comment": "This is to prevent thinks like qr/foo$/ to treat $/ as a variable",
-          "match": "\\$(?=[^\\s\\w'\\{\\[\\(\\<])",
+          "match": "\\$(?=[^\\s\\w'{\\[(<])",
           "name": "keyword.control.anchor.perl"
         },
         {
@@ -2770,7 +2757,7 @@
             }
           },
           "contentName": "text.embedded.html.basic",
-          "end": "^(=end)\\s+(html)|^(?==cut)",
+          "end": "^(?:(=end)\\s+(html)|(?==cut))",
           "endCaptures": {
             "1": {
               "name": "storage.type.class.pod.perl"
@@ -2922,7 +2909,7 @@
               "name": "punctuation.definition.variable.perl"
             }
           },
-          "match": "(\\$)[_ab\\*\\.\\/\\|,\\\\;#%=\\-~^:?!\\$<>\\(\\)\\[\\]@](?![A-Za-z0-9_])",
+          "match": "(\\$)[_ab*./|,\\\\;#%=\\-~^:?!$<>()\\[\\]@](?![A-Za-z0-9_])",
           "name": "variable.other.predefined.perl"
         },
         {
@@ -2940,7 +2927,7 @@
               "name": "punctuation.definition.variable.perl"
             }
           },
-          "match": "([\\$\\@\\%](#)?)([a-zA-Zx7f-xff\\$]|::)([a-zA-Z0-9_x7f-xff\\$]|::)*\\b",
+          "match": "([$@%](#)?)([a-zA-Zx7f-xf$]|::)([a-zA-Z0-9_x7f-xf$]|::)*\\b",
           "name": "variable.other.readwrite.global.perl"
         },
         {
@@ -2952,7 +2939,7 @@
               "name": "punctuation.definition.variable.perl"
             }
           },
-          "match": "(\\$\\{)(?:[a-zA-Zx7f-xff\\$]|::)(?:[a-zA-Z0-9_x7f-xff\\$]|::)*(\\})",
+          "match": "(\\$\\{)(?:[a-zA-Zx7f-xf$]|::)(?:[a-zA-Z0-9_x7f-xf$]|::)*(})",
           "name": "variable.other.readwrite.global.perl"
         },
         {
@@ -2961,7 +2948,7 @@
               "name": "punctuation.definition.variable.perl"
             }
           },
-          "match": "([\\$\\@\\%](#)?)[0-9_]\\b",
+          "match": "([$@%](#)?)[0-9_]\\b",
           "name": "variable.other.readwrite.global.special.perl"
         }
       ]
diff --git a/resources/languages/php.json b/resources/languages/php.json
index 4f04f99..51bba67 100644
--- a/resources/languages/php.json
+++ b/resources/languages/php.json
@@ -23,7 +23,7 @@
           ]
         }
       },
-      "match": "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\s+([a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)(?=\\s*;)",
+      "match": "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\s+([a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)(?=\\s*;)",
       "name": "meta.namespace.php"
     },
     {
@@ -50,11 +50,11 @@
               ]
             }
           },
-          "match": "(?i)[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+",
+          "match": "(?i)[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+",
           "name": "entity.name.type.namespace.php"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.namespace.begin.bracket.curly.php"
@@ -73,7 +73,7 @@
           ]
         },
         {
-          "match": "[^\\s]+",
+          "match": "\\S+",
           "name": "invalid.illegal.identifier.php"
         }
       ]
@@ -96,7 +96,7 @@
           "name": "storage.type.${1:/downcase}.php"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.use.begin.bracket.curly.php"
@@ -124,7 +124,7 @@
                   "name": "entity.other.alias.php"
                 }
               },
-              "match": "(?xi)\n\\b(as)\n\\s+(final|abstract|public|private|protected|static)\n\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)"
+              "match": "(?i)\\b(as)\\s+(final|abstract|public|private|protected|static)\\s+([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)"
             },
             {
               "captures": {
@@ -144,7 +144,7 @@
                   ]
                 }
               },
-              "match": "(?xi)\n\\b(as)\n\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)"
+              "match": "(?i)\\b(as)\\s+([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)"
             },
             {
               "captures": {
@@ -155,7 +155,7 @@
                   "name": "support.class.php"
                 }
               },
-              "match": "(?i)\\b(insteadof)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)"
+              "match": "(?i)\\b(insteadof)\\s+([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)"
             },
             {
               "match": ";",
@@ -172,7 +172,7 @@
       ]
     },
     {
-      "begin": "(?ix)\n\\b(trait)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
+      "begin": "(?i)\\b(trait)\\s+([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.trait.php"
@@ -193,7 +193,7 @@
           "include": "#comments"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.trait.begin.bracket.curly.php"
@@ -210,7 +210,7 @@
       ]
     },
     {
-      "begin": "(?ix)\n\\b(interface)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
+      "begin": "(?i)\\b(interface)\\s+([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.interface.php"
@@ -234,7 +234,7 @@
           "include": "#interface-extends"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.interface.begin.bracket.curly.php"
@@ -254,7 +254,7 @@
       ]
     },
     {
-      "begin": "(?ix)\n\\b(enum)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\n(?: \\s* (:) \\s* (int | string) \\b )?",
+      "begin": "(?i)\\b(enum)\\s+([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)(?:\\s*(:)\\s*(int|string)\\b)?",
       "beginCaptures": {
         "1": {
           "name": "storage.type.enum.php"
@@ -284,7 +284,7 @@
           "include": "#class-implements"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.enum.begin.bracket.curly.php"
@@ -302,7 +302,7 @@
                   "name": "constant.enum.php"
                 }
               },
-              "match": "(?i)\\b(case)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)"
+              "match": "(?i)\\b(case)\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)"
             },
             {
               "include": "#class-constant"
@@ -315,7 +315,7 @@
       ]
     },
     {
-      "begin": "(?ix)\n(?:\n  \\b((?:(?:final|abstract|readonly)\\s+)*)(class)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\n  |\\b(new)\\b\\s*(\\#\\[.*\\])?\\s*(?:(readonly)\\s+)?\\b(class)\\b # anonymous class\n)",
+      "begin": "(?i)\\b(?:((?:(?:final|abstract|readonly)\\s+)*)(class)\\s+([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)|(new)\\b\\s*(#\\[.*])?\\s*(?:(readonly)\\s+)?\\b(class)\\b)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -393,7 +393,7 @@
           "include": "#class-implements"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.class.begin.bracket.curly.php"
@@ -441,7 +441,7 @@
           "name": "keyword.control.import.include.php"
         }
       },
-      "end": "(?=\\s|;|$|\\?>)",
+      "end": "(?=[\\s;]|$|\\?>)",
       "name": "meta.include.php",
       "patterns": [
         {
@@ -476,8 +476,8 @@
                   "name": "punctuation.separator.delimiter.php"
                 },
                 {
-                  "begin": "(?i)(?=[\\\\a-z_\\x{7f}-\\x{10ffff}])",
-                  "end": "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+                  "begin": "(?i)(?=[\\\\a-z_\\x7F-\\x{10FFFF}])",
+                  "end": "(?i)([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)(?![a-z0-9_\\x7F-\\x{10FFFF}\\\\])",
                   "endCaptures": {
                     "1": {
                       "name": "support.class.exception.php"
@@ -498,7 +498,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?xi)\n([a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)*) # union or single exception class\n\\s*\n((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?           # Variable"
+          "match": "(?i)([a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*\\|\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)*)\\s*((\\$+)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?"
         }
       ]
     },
@@ -513,7 +513,7 @@
           "name": "storage.type.function.php"
         }
       },
-      "end": "(?=\\s*{)",
+      "end": "(?=\\s*\\{)",
       "name": "meta.function.closure.php",
       "patterns": [
         {
@@ -576,7 +576,7 @@
                   "name": "punctuation.definition.variable.php"
                 }
               },
-              "match": "(?i)((?:(&)\\s*)?(\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(?=,|\\))"
+              "match": "(?i)((?:(&)\\s*)?(\\$+)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)\\s*(?=[,)])"
             }
           ]
         },
@@ -593,7 +593,7 @@
               ]
             }
           },
-          "match": "(?xi)\n(:)\\s*\n(\n  # nullable type\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n  # union, intersection or DNF type\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  (?: \\s*[|&]\\s*\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  )+\n)\n(?=\\s*(?:{|/[/*]|\\#|$))"
+          "match": "(?i)(:)\\s*((?:\\?\\s*)?[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\))(?:\\s*[|\\&]\\s*(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\)))+)(?=\\s*(?:\\{|/[/*]|#|$))"
         }
       ]
     },
@@ -648,7 +648,7 @@
               ]
             }
           },
-          "match": "(?xi)\n(:)\\s*\n(\n  # nullable type\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n  # union, intersection or DNF type\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  (?: \\s*[|&]\\s*\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  )+\n)\n(?=\\s*(?:=>|/[/*]|\\#|$))"
+          "match": "(?i)(:)\\s*((?:\\?\\s*)?[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\))(?:\\s*[|\\&]\\s*(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\)))+)(?=\\s*(?:=>|/[/*]|#|$))"
         }
       ]
     },
@@ -674,7 +674,7 @@
         }
       },
       "contentName": "meta.function.parameters.php",
-      "end": "(?xi)\n(\\)) \\s* ( : \\s*\n  (?:\\?\\s*)? (?!\\s) [a-z0-9_\\x{7f}-\\x{10ffff}\\\\\\s\\|&()]+ (?<!\\s)\n)?\n(?=\\s*(?:{|/[/*]|\\#|$|;))",
+      "end": "(?i)(\\))\\s*(:\\s*(?:\\?\\s*)?(?!\\s)[a-z0-9_\\x7F-\\x{10FFFF}\\\\\\s|\\&()]+(?<!\\s))?(?=\\s*(?:\\{|/[/*]|#|$|;))",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.parameters.end.bracket.round.php"
@@ -693,7 +693,7 @@
           "name": "punctuation.separator.delimiter.php"
         },
         {
-          "begin": "(?xi)\n((?:(?:public|private|protected|readonly)(?:\\s+|(?=\\?)))++)\n(?: (\n  # nullable type\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n  # union, intersection or DNF type\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  (?: \\s*[|&]\\s*\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  )+\n) \\s+ )?\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference",
+          "begin": "(?i)((?:(?:public|private|protected|readonly)(?:\\s+|(?=\\?)))++)(?:((?:\\?\\s*)?[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\))(?:\\s*[|\\&]\\s*(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\)))+)\\s+)?((?:(&)\\s*)?(\\$)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -720,7 +720,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
+          "end": "(?=\\s*(?:[,)]|/[/*]|#))",
           "name": "meta.function.parameter.promoted-property.php",
           "patterns": [
             {
@@ -730,7 +730,7 @@
                   "name": "keyword.operator.assignment.php"
                 }
               },
-              "end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
+              "end": "(?=\\s*(?:[,)]|/[/*]|#))",
               "patterns": [
                 {
                   "include": "#parameter-default-types"
@@ -745,7 +745,7 @@
       ]
     },
     {
-      "begin": "((?:(?:final|abstract|public|private|protected|static)\\s+)*)(function)\\s+(?i:(__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|clone|set_state|sleep|wakeup|autoload|invoke|callStatic|serialize|unserialize))|(?:(&)?\\s*([a-zA-Z_\\x{7f}-\\x{10ffff}][a-zA-Z0-9_\\x{7f}-\\x{10ffff}]*)))\\s*(\\()",
+      "begin": "((?:(?:final|abstract|public|private|protected|static)\\s+)*)(function)\\s+(?i:(__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|clone|set_state|sleep|wakeup|autoload|invoke|callStatic|serialize|unserialize))|(&)?\\s*([a-zA-Z_\\x7F-\\x{10FFFF}][a-zA-Z0-9_\\x7F-\\x{10FFFF}]*))\\s*(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -772,7 +772,7 @@
         }
       },
       "contentName": "meta.function.parameters.php",
-      "end": "(?xi)\n(\\)) (?: \\s* (:) \\s* (\n  # nullable type\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n  # union, intersection or DNF type\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  (?: \\s*[|&]\\s*\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  )+\n) )?\n(?=\\s*(?:{|/[/*]|\\#|$|;))",
+      "end": "(?i)(\\))(?:\\s*(:)\\s*((?:\\?\\s*)?[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\))(?:\\s*[|\\&]\\s*(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\)))+))?(?=\\s*(?:\\{|/[/*]|#|$|;))",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.parameters.end.bracket.round.php"
@@ -827,7 +827,7 @@
           "name": "punctuation.definition.variable.php"
         }
       },
-      "match": "(?xi)\n((?:(?:public|private|protected|static|readonly)(?:\\s+|(?=\\?)))++)                     # At least one modifier\n(\n  # nullable type\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n  # union, intersection or DNF type\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  (?: \\s*[|&]\\s*\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  )+\n)?\n\\s+ ((\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)          # Variable name"
+      "match": "(?i)((?:(?:public|private|protected|static|readonly)(?:\\s+|(?=\\?)))++)((?:\\?\\s*)?[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\))(?:\\s*[|\\&]\\s*(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\)))+)?\\s+((\\$)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)"
     },
     {
       "include": "#invoke-call"
@@ -946,7 +946,7 @@
           "name": "storage.modifier.reference.php"
         }
       },
-      "match": "(?i)(\\=)(&)|(&)(?=[$a-z_])"
+      "match": "(?i)(=)(&)|(&)(?=[$a-z_])"
     },
     {
       "match": "@",
@@ -957,19 +957,19 @@
       "name": "keyword.operator.comparison.php"
     },
     {
-      "match": "=|\\+=|\\-=|\\*\\*?=|/=|%=|&=|\\|=|\\^=|<<=|>>=|\\?\\?=",
+      "match": "=|\\+=|-=|\\*\\*?=|/=|%=|&=|\\|=|\\^=|<<=|>>=|\\?\\?=",
       "name": "keyword.operator.assignment.php"
     },
     {
-      "match": "<=>|<=|>=|<|>",
+      "match": "<=>|<=|>=|[<>]",
       "name": "keyword.operator.comparison.php"
     },
     {
-      "match": "\\-\\-|\\+\\+",
+      "match": "--|\\+\\+",
       "name": "keyword.operator.increment-decrement.php"
     },
     {
-      "match": "\\-|\\+|\\*\\*?|/|%",
+      "match": "[-+]|\\*\\*?|[/%]",
       "name": "keyword.operator.arithmetic.php"
     },
     {
@@ -980,7 +980,7 @@
       "include": "#function-call"
     },
     {
-      "match": "<<|>>|~|\\^|&|\\|",
+      "match": "<<|>>|[~^\\&|]",
       "name": "keyword.operator.bitwise.php"
     },
     {
@@ -990,7 +990,7 @@
           "name": "keyword.operator.type.php"
         }
       },
-      "end": "(?i)(?=[^\\\\$a-z0-9_\\x{7f}-\\x{10ffff}])",
+      "end": "(?i)(?=[^\\\\$a-z0-9_\\x7F-\\x{10FFFF}])",
       "patterns": [
         {
           "include": "#class-name"
@@ -1012,7 +1012,7 @@
           "name": "support.other.php"
         }
       },
-      "match": "(?i)(goto)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)"
+      "match": "(?i)(goto)\\s+([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)"
     },
     {
       "captures": {
@@ -1020,7 +1020,7 @@
           "name": "entity.name.goto-label.php"
         }
       },
-      "match": "(?i)^\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*(?<!default))\\s*:(?!:)"
+      "match": "(?i)^\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*(?<!default))\\s*:(?!:)"
     },
     {
       "include": "#string-backtick"
@@ -1035,7 +1035,7 @@
       "include": "#ternary_expression"
     },
     {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.begin.bracket.curly.php"
@@ -1060,7 +1060,7 @@
           "name": "punctuation.section.array.begin.php"
         }
       },
-      "end": "\\]|(?=\\?>)",
+      "end": "]|(?=\\?>)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.php"
@@ -1101,8 +1101,8 @@
   ],
   "repository": {
     "attribute": {
-      "begin": "\\#\\[",
-      "end": "\\]",
+      "begin": "#\\[",
+      "end": "]",
       "name": "meta.attribute.php",
       "patterns": [
         {
@@ -1110,7 +1110,7 @@
           "name": "punctuation.separator.delimiter.php"
         },
         {
-          "begin": "([a-zA-Z0-9_\\x{7f}-\\x{10ffff}\\\\]+)\\s*(\\()",
+          "begin": "([a-zA-Z0-9_\\x7F-\\x{10FFFF}\\\\]+)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1146,8 +1146,8 @@
     "attribute-name": {
       "patterns": [
         {
-          "begin": "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
-          "end": "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+          "begin": "(?i)(?=\\\\?[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*\\\\)",
+          "end": "(?i)([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?(?![a-z0-9_\\x7F-\\x{10FFFF}\\\\])",
           "endCaptures": {
             "1": {
               "name": "support.attribute.php"
@@ -1165,12 +1165,12 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "match": "(?xi)\n(\\\\)?\\b(Attribute|SensitiveParameter|AllowDynamicProperties|ReturnTypeWillChange)\\b",
+          "match": "(?i)(\\\\)?\\b(Attribute|SensitiveParameter|AllowDynamicProperties|ReturnTypeWillChange)\\b",
           "name": "support.attribute.builtin.php"
         },
         {
-          "begin": "(?i)(?=[\\\\a-z_\\x{7f}-\\x{10ffff}])",
-          "end": "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+          "begin": "(?i)(?=[\\\\a-z_\\x7F-\\x{10FFFF}])",
+          "end": "(?i)([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?(?![a-z0-9_\\x7F-\\x{10FFFF}\\\\])",
           "endCaptures": {
             "1": {
               "name": "support.attribute.php"
@@ -1192,7 +1192,7 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "match": "(?xi)\n(\\\\)?\\b\n(Attribute|(APC|Append)Iterator|Array(Access|Iterator|Object)\n|Bad(Function|Method)CallException\n|(Caching|CallbackFilter)Iterator|Collator|Collectable|Cond|Countable|CURLFile\n|Date(Interval|Period|Time(Interface|Immutable|Zone)?)?|Directory(Iterator)?|DomainException\n|DOM(Attr|CdataSection|CharacterData|Comment|Document(Fragment)?|Element|EntityReference\n    |Implementation|NamedNodeMap|Node(list)?|ProcessingInstruction|Text|XPath)\n|(Error)?Exception|EmptyIterator\n|finfo\n|Ev(Check|Child|Embed|Fork|Idle|Io|Loop|Periodic|Prepare|Signal|Stat|Timer|Watcher)?\n|Event(Base|Buffer(Event)?|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?\n|FANNConnection|(Filter|Filesystem)Iterator\n|Gender\\\\Gender|GlobIterator|Gmagick(Draw|Pixel)?\n|Haru(Annotation|Destination|Doc|Encoder|Font|Image|Outline|Page)\n|Http((Inflate|Deflate)?Stream|Message|Request(Pool)?|Response|QueryString)\n|HRTime\\\\(PerformanceCounter|StopWatch)\n|Intl(Calendar|((CodePoint|RuleBased)?Break|Parts)?Iterator|DateFormatter|TimeZone)\n|Imagick(Draw|Pixel(Iterator)?)?\n|InfiniteIterator|InvalidArgumentException|Iterator(Aggregate|Iterator)?\n|JsonSerializable\n|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|(AttachedPicture)?Frame))\n|Lapack|(Length|Locale|Logic)Exception|LimitIterator|Lua(Closure)?\n|Mongo(BinData|Client|Code|Collection|CommandCursor|Cursor(Exception)?|Date|DB(Ref)?|DeleteBatch\n      |Grid(FS(Cursor|File)?)|Id|InsertBatch|Int(32|64)|Log|Pool|Regex|ResultException|Timestamp\n      |UpdateBatch|Write(Batch|ConcernException))?\n|Memcache(d)?|MessageFormatter|MultipleIterator|Mutex\n|mysqli(_(driver|stmt|warning|result))?\n|MysqlndUh(Connection|PreparedStatement)\n|NoRewindIterator|Normalizer|NumberFormatter\n|OCI-(Collection|Lob)|OuterIterator|(OutOf(Bounds|Range)|Overflow)Exception\n|ParentIterator|PDO(Statement)?|Phar(Data|FileInfo)?|php_user_filter|Pool\n|QuickHash(Int(Set|StringHash)|StringIntHash)\n|Recursive(Array|Caching|Directory|Fallback|Filter|Iterator|Regex|Tree)?Iterator\n|Reflection(Class|Function(Abstract)?|Method|Object|Parameter|Property|(Zend)?Extension)?\n|RangeException|Reflector|RegexIterator|ResourceBundle|RuntimeException|RRD(Creator|Graph|Updater)\n|SAM(Connection|Message)|SCA(_(SoapProxy|LocalProxy))?\n|SDO_(DAS_(ChangeSummary|Data(Factory|Object)|Relational|Setting|XML(_Document)?)\n     |Data(Factory|Object)|Exception|List|Model_(Property|ReflectionDataObject|Type)|Sequence)\n|SeekableIterator|Serializable|SessionHandler(Interface)?|SimpleXML(Iterator|Element)|SNMP\n|Soap(Client|Fault|Header|Param|Server|Var)\n|SphinxClient|Spoofchecker\n|Spl(DoublyLinkedList|Enum|File(Info|Object)|FixedArray|(Max|Min)?Heap|Observer|ObjectStorage\n    |(Priority)?Queue|Stack|Subject|Type|TempFileObject)\n|SQLite(3(Result|Stmt)?|Database|Result|Unbuffered)\n|stdClass|streamWrapper|SVM(Model)?|Swish(Result(s)?|Search)?|Sync(Event|Mutex|ReaderWriter|Semaphore)\n|Thread(ed)?|tidy(Node)?|TokyoTyrant(Table|Iterator|Query)?|Transliterator|Traversable\n|UConverter|(Underflow|UnexpectedValue)Exception\n|V8Js(Exception)?|Varnish(Admin|Log|Stat)\n|Worker|Weak(Map|Ref)\n|XML(Diff\\\\(Base|DOM|File|Memory)|Reader|Writer)|XsltProcessor\n|Yaf_(Route_(Interface|Map|Regex|Rewrite|Simple|Supervar)\n     |Action_Abstract|Application|Config_(Simple|Ini|Abstract)|Controller_Abstract\n     |Dispatcher|Exception|Loader|Plugin_Abstract|Registry|Request_(Abstract|Simple|Http)\n     |Response_Abstract|Router|Session|View_(Simple|Interface))\n|Yar_(Client(_Exception)?|Concurrent_Client|Server(_Exception)?)\n|ZipArchive|ZMQ(Context|Device|Poll|Socket)?)\n\\b",
+          "match": "(?i)(\\\\)?\\b(Attribute|(A(?:PC|ppend))Iterator|Array(Access|Iterator|Object)|Bad(Function|Method)CallException|(Ca(?:ching|llbackFilter))Iterator|Collator|Collectable|Cond|Countable|CURLFile|Date(Interval|Period|Time(Interface|Immutable|Zone)?)?|Directory(Iterator)?|DomainException|DOM(Attr|CdataSection|CharacterData|Comment|Document(Fragment)?|Element|EntityReference|Implementation|NamedNodeMap|Node(list)?|ProcessingInstruction|Text|XPath)|(Error)?Exception|EmptyIterator|finfo|Ev(Check|Child|Embed|Fork|Idle|Io|Loop|Periodic|Prepare|Signal|Stat|Timer|Watcher)?|Event(Base|Buffer(Event)?|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?|FANNConnection|(Fil(?:ter|esystem))Iterator|Gender\\\\Gender|GlobIterator|Gmagick(Draw|Pixel)?|Haru(Annotation|Destination|Doc|Encoder|Font|Image|Outline|Page)|Http((Inflate|Deflate)?Stream|Message|Request(Pool)?|Response|QueryString)|HRTime\\\\(PerformanceCounter|StopWatch)|Intl(Calendar|((CodePoint|RuleBased)?Break|Parts)?Iterator|DateFormatter|TimeZone)|Imagick(Draw|Pixel(Iterator)?)?|InfiniteIterator|InvalidArgumentException|Iterator(Aggregate|Iterator)?|JsonSerializable|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|(AttachedPicture)?Frame))|Lapack|(L(?:ength|ocale|ogic))Exception|LimitIterator|Lua(Closure)?|Mongo(BinData|Client|Code|Collection|CommandCursor|Cursor(Exception)?|Date|DB(Ref)?|DeleteBatch|Grid(FS(Cursor|File)?)|Id|InsertBatch|Int(32|64)|Log|Pool|Regex|ResultException|Timestamp|UpdateBatch|Write(Batch|ConcernException))?|Memcache(d)?|MessageFormatter|MultipleIterator|Mutex|mysqli(_(driver|stmt|warning|result))?|MysqlndUh(Connection|PreparedStatement)|NoRewindIterator|Normalizer|NumberFormatter|OCI-(Collection|Lob)|OuterIterator|(O(?:utOf(Bounds|Range)|verflow))Exception|ParentIterator|PDO(Statement)?|Phar(Data|FileInfo)?|php_user_filter|Pool|QuickHash(Int(S(?:et|tringHash))|StringIntHash)|Recursive(Array|Caching|Directory|Fallback|Filter|Iterator|Regex|Tree)?Iterator|Reflection(Class|Function(Abstract)?|Method|Object|Parameter|Property|(Zend)?Extension)?|RangeException|Reflector|RegexIterator|ResourceBundle|RuntimeException|RRD(Creator|Graph|Updater)|SAM(Connection|Message)|SCA(_(SoapProxy|LocalProxy))?|SDO_(DAS_(ChangeSummary|Data(Factory|Object)|Relational|Setting|XML(_Document)?)|Data(Factory|Object)|Exception|List|Model_(Property|ReflectionDataObject|Type)|Sequence)|SeekableIterator|Serializable|SessionHandler(Interface)?|SimpleXML(Iterator|Element)|SNMP|Soap(Client|Fault|Header|Param|Server|Var)|SphinxClient|Spoofchecker|Spl(DoublyLinkedList|Enum|File(Info|Object)|FixedArray|(M(?:ax|in))?Heap|Observer|ObjectStorage|(Priority)?Queue|Stack|Subject|Type|TempFileObject)|SQLite(3(Result|Stmt)?|Database|Result|Unbuffered)|stdClass|streamWrapper|SVM(Model)?|Swish(Result(s)?|Search)?|Sync(Event|Mutex|ReaderWriter|Semaphore)|Thread(ed)?|tidy(Node)?|TokyoTyrant(Table|Iterator|Query)?|Transliterator|Traversable|UConverter|(Un(?:derflow|expectedValue))Exception|V8Js(Exception)?|Varnish(Admin|Log|Stat)|Worker|Weak(Map|Ref)|XML(Diff\\\\(Base|DOM|File|Memory)|Reader|Writer)|XsltProcessor|Yaf_(Route_(Interface|Map|Regex|Rewrite|Simple|Supervar)|Action_Abstract|Application|Config_(Simple|Ini|Abstract)|Controller_Abstract|Dispatcher|Exception|Loader|Plugin_Abstract|Registry|Request_(Abstract|Simple|Http)|Response_Abstract|Router|Session|View_(Simple|Interface))|Yar_(Client(_Exception)?|Concurrent_Client|Server(_Exception)?)|ZipArchive|ZMQ(Context|Device|Poll|Socket)?)\\b",
           "name": "support.class.builtin.php"
         }
       ]
@@ -1208,7 +1208,7 @@
               "name": "constant.other.php"
             }
           },
-          "match": "(?i)\\b(const)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)"
+          "match": "(?i)\\b(const)\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)"
         }
       ]
     },
@@ -1221,7 +1221,7 @@
               "name": "storage.modifier.extends.php"
             }
           },
-          "end": "(?i)(?=[^A-Za-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+          "end": "(?i)(?=[^A-Za-z0-9_\\x7F-\\x{10FFFF}\\\\])",
           "patterns": [
             {
               "include": "#comments"
@@ -1242,7 +1242,7 @@
               "name": "storage.modifier.implements.php"
             }
           },
-          "end": "(?i)(?={)",
+          "end": "(?i)(?=\\{)",
           "patterns": [
             {
               "include": "#comments"
@@ -1261,8 +1261,8 @@
     "class-name": {
       "patterns": [
         {
-          "begin": "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
-          "end": "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+          "begin": "(?i)(?=\\\\?[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*\\\\)",
+          "end": "(?i)([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?(?![a-z0-9_\\x7F-\\x{10FFFF}\\\\])",
           "endCaptures": {
             "1": {
               "name": "support.class.php"
@@ -1278,8 +1278,8 @@
           "include": "#class-builtin"
         },
         {
-          "begin": "(?i)(?=[\\\\a-z_\\x{7f}-\\x{10ffff}])",
-          "end": "(?xi)\n( [a-z_\\x{7f}-\\x{10ffff}] [a-z0-9_\\x{7f}-\\x{10ffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+          "begin": "(?i)(?=[\\\\a-z_\\x7F-\\x{10FFFF}])",
+          "end": "(?i)([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?(?![a-z0-9_\\x7F-\\x{10FFFF}\\\\])",
           "endCaptures": {
             "1": {
               "name": "support.class.php"
@@ -1381,7 +1381,7 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "match": "(\\\\)?\\b(DEFAULT_INCLUDE_PATH|EAR_(INSTALL|EXTENSION)_DIR|E_(ALL|COMPILE_(ERROR|WARNING)|CORE_(ERROR|WARNING)|DEPRECATED|ERROR|NOTICE|PARSE|RECOVERABLE_ERROR|STRICT|USER_(DEPRECATED|ERROR|NOTICE|WARNING)|WARNING)|PHP_(ROUND_HALF_(DOWN|EVEN|ODD|UP)|(MAJOR|MINOR|RELEASE)_VERSION|MAXPATHLEN|BINDIR|SHLIB_SUFFIX|SYSCONFDIR|SAPI|CONFIG_FILE_(PATH|SCAN_DIR)|INT_(MAX|SIZE)|ZTS|OS|OUTPUT_HANDLER_(START|CONT|END)|DEBUG|DATADIR|URL_(SCHEME|HOST|USER|PORT|PASS|PATH|QUERY|FRAGMENT)|PREFIX|EXTRA_VERSION|EXTENSION_DIR|EOL|VERSION(_ID)?|WINDOWS_(NT_(SERVER|DOMAIN_CONTROLLER|WORKSTATION)|VERSION_(MAJOR|MINOR)|BUILD|SUITEMASK|SP_(MAJOR|MINOR)|PRODUCTTYPE|PLATFORM)|LIBDIR|LOCALSTATEDIR)|STD(ERR|IN|OUT)|ZEND_(DEBUG_BUILD|THREAD_SAFE))\\b",
+          "match": "(\\\\)?\\b(DEFAULT_INCLUDE_PATH|EAR_(INSTALL|EXTENSION)_DIR|E_(ALL|COMPILE_(ERROR|WARNING)|CORE_(ERROR|WARNING)|DEPRECATED|ERROR|NOTICE|PARSE|RECOVERABLE_ERROR|STRICT|USER_(DEPRECATED|ERROR|NOTICE|WARNING)|WARNING)|PHP_(ROUND_HALF_(DOWN|EVEN|ODD|UP)|(MAJOR|MINOR|RELEASE)_VERSION|MAXPATHLEN|BINDIR|SHLIB_SUFFIX|SYSCONFDIR|SAPI|CONFIG_FILE_(PATH|SCAN_DIR)|INT_(MAX|SIZE)|ZTS|OS|OUTPUT_HANDLER_(START|CONT|END)|DEBUG|DATADIR|URL_(SCHEME|HOST|USER|PORT|PASS|PATH|QUERY|FRAGMENT)|PREFIX|EXTRA_VERSION|EXTENSION_DIR|EOL|VERSION(_ID)?|WINDOWS_(NT_(SERVER|DOMAIN_CONTROLLER|WORKSTATION)|VERSION_(M(?:AJOR|INOR))|BUILD|SUITEMASK|SP_(M(?:AJOR|INOR))|PRODUCTTYPE|PLATFORM)|LIBDIR|LOCALSTATEDIR)|STD(ERR|IN|OUT)|ZEND_(DEBUG_BUILD|THREAD_SAFE))\\b",
           "name": "support.constant.core.php"
         },
         {
@@ -1390,7 +1390,7 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "match": "(\\\\)?\\b(__COMPILER_HALT_OFFSET__|AB(MON_(1|2|3|4|5|6|7|8|9|10|11|12)|DAY[1-7])|AM_STR|ASSERT_(ACTIVE|BAIL|CALLBACK_QUIET_EVAL|WARNING)|ALT_DIGITS|CASE_(UPPER|LOWER)|CHAR_MAX|CONNECTION_(ABORTED|NORMAL|TIMEOUT)|CODESET|COUNT_(NORMAL|RECURSIVE)|CREDITS_(ALL|DOCS|FULLPAGE|GENERAL|GROUP|MODULES|QA|SAPI)|CRYPT_(BLOWFISH|EXT_DES|MD5|SHA(256|512)|SALT_LENGTH|STD_DES)|CURRENCY_SYMBOL|D_(T_)?FMT|DATE_(ATOM|COOKIE|ISO8601|RFC(822|850|1036|1123|2822|3339)|RSS|W3C)|DAY_[1-7]|DECIMAL_POINT|DIRECTORY_SEPARATOR|ENT_(COMPAT|IGNORE|(NO)?QUOTES)|EXTR_(IF_EXISTS|OVERWRITE|PREFIX_(ALL|IF_EXISTS|INVALID|SAME)|REFS|SKIP)|ERA(_(D_(T_)?FMT)|T_FMT|YEAR)?|FRAC_DIGITS|GROUPING|HASH_HMAC|HTML_(ENTITIES|SPECIALCHARS)|INF|INFO_(ALL|CREDITS|CONFIGURATION|ENVIRONMENT|GENERAL|LICENSEMODULES|VARIABLES)|INI_(ALL|CANNER_(NORMAL|RAW)|PERDIR|SYSTEM|USER)|INT_(CURR_SYMBOL|FRAC_DIGITS)|LC_(ALL|COLLATE|CTYPE|MESSAGES|MONETARY|NUMERIC|TIME)|LOCK_(EX|NB|SH|UN)|LOG_(ALERT|AUTH(PRIV)?|CRIT|CRON|CONS|DAEMON|DEBUG|EMERG|ERR|INFO|LOCAL[1-7]|LPR|KERN|MAIL|NEWS|NODELAY|NOTICE|NOWAIT|ODELAY|PID|PERROR|WARNING|SYSLOG|UCP|USER)|M_(1_PI|SQRT(1_2|2|3|PI)|2_(SQRT)?PI|PI(_(2|4))?|E(ULER)?|LN(10|2|PI)|LOG(10|2)E)|MON_(1|2|3|4|5|6|7|8|9|10|11|12|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|N_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN)|NAN|NEGATIVE_SIGN|NO(EXPR|STR)|P_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN)|PM_STR|POSITIVE_SIGN|PATH(_SEPARATOR|INFO_(EXTENSION|(BASE|DIR|FILE)NAME))|RADIXCHAR|SEEK_(CUR|END|SET)|SORT_(ASC|DESC|LOCALE_STRING|REGULAR|STRING)|STR_PAD_(BOTH|LEFT|RIGHT)|T_FMT(_AMPM)?|THOUSEP|THOUSANDS_SEP|UPLOAD_ERR_(CANT_WRITE|EXTENSION|(FORM|INI)_SIZE|NO_(FILE|TMP_DIR)|OK|PARTIAL)|YES(EXPR|STR))\\b",
+          "match": "(\\\\)?\\b(__COMPILER_HALT_OFFSET__|AB(MON_([123456789]|10|11|12)|DAY[1-7])|AM_STR|ASSERT_(ACTIVE|BAIL|CALLBACK_QUIET_EVAL|WARNING)|ALT_DIGITS|CASE_(UPPER|LOWER)|CHAR_MAX|CONNECTION_(ABORTED|NORMAL|TIMEOUT)|CODESET|COUNT_(NORMAL|RECURSIVE)|CREDITS_(ALL|DOCS|FULLPAGE|GENERAL|GROUP|MODULES|QA|SAPI)|CRYPT_(BLOWFISH|EXT_DES|MD5|SHA(256|512)|SALT_LENGTH|STD_DES)|CURRENCY_SYMBOL|D_(T_)?FMT|DATE_(ATOM|COOKIE|ISO8601|RFC(822|850|1036|1123|2822|3339)|RSS|W3C)|DAY_[1-7]|DECIMAL_POINT|DIRECTORY_SEPARATOR|ENT_(COMPAT|IGNORE|(NO)?QUOTES)|EXTR_(IF_EXISTS|OVERWRITE|PREFIX_(ALL|IF_EXISTS|INVALID|SAME)|REFS|SKIP)|ERA(_(D_(T_)?FMT)|T_FMT|YEAR)?|FRAC_DIGITS|GROUPING|HASH_HMAC|HTML_(ENTITIES|SPECIALCHARS)|INF|INFO_(ALL|CREDITS|CONFIGURATION|ENVIRONMENT|GENERAL|LICENSEMODULES|VARIABLES)|INI_(ALL|CANNER_(NORMAL|RAW)|PERDIR|SYSTEM|USER)|INT_(CURR_SYMBOL|FRAC_DIGITS)|LC_(ALL|COLLATE|CTYPE|MESSAGES|MONETARY|NUMERIC|TIME)|LOCK_(EX|NB|SH|UN)|LOG_(ALERT|AUTH(PRIV)?|CRIT|CRON|CONS|DAEMON|DEBUG|EMERG|ERR|INFO|LOCAL[1-7]|LPR|KERN|MAIL|NEWS|NODELAY|NOTICE|NOWAIT|ODELAY|PID|PERROR|WARNING|SYSLOG|UCP|USER)|M_(1_PI|SQRT(1_2|[23]|PI)|2_(SQRT)?PI|PI(_([24]))?|E(ULER)?|LN(10|2|PI)|LOG(10|2)E)|MON_([123456789]|10|11|12|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|N_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN)|NAN|NEGATIVE_SIGN|NO(EXPR|STR)|P_(CS_PRECEDES|SEP_BY_SPACE|SIGN_POSN)|PM_STR|POSITIVE_SIGN|PATH(_SEPARATOR|INFO_(EXTENSION|(BASE|DIR|FILE)NAME))|RADIXCHAR|SEEK_(CUR|END|SET)|SORT_(ASC|DESC|LOCALE_STRING|REGULAR|STRING)|STR_PAD_(BOTH|LEFT|RIGHT)|T_FMT(_AMPM)?|THOUSEP|THOUSANDS_SEP|UPLOAD_ERR_(CANT_WRITE|EXTENSION|(FORM|INI)_SIZE|NO_(FILE|TMP_DIR)|OK|PARTIAL)|YES(EXPR|STR))\\b",
           "name": "support.constant.std.php"
         },
         {
@@ -1399,7 +1399,7 @@
               "name": "punctuation.separator.inheritance.php"
             }
           },
-          "match": "(\\\\)?\\b(GLOB_(MARK|BRACE|NO(SORT|CHECK|ESCAPE)|ONLYDIR|ERR|AVAILABLE_FLAGS)|XML_(SAX_IMPL|(DTD|DOCUMENT(_(FRAG|TYPE))?|HTML_DOCUMENT|NOTATION|NAMESPACE_DECL|PI|COMMENT|DATA_SECTION|TEXT)_NODE|OPTION_(SKIP_(TAGSTART|WHITE)|CASE_FOLDING|TARGET_ENCODING)|ERROR_((BAD_CHAR|(ATTRIBUTE_EXTERNAL|BINARY|PARAM|RECURSIVE)_ENTITY)_REF|MISPLACED_XML_PI|SYNTAX|NONE|NO_(MEMORY|ELEMENTS)|TAG_MISMATCH|INCORRECT_ENCODING|INVALID_TOKEN|DUPLICATE_ATTRIBUTE|UNCLOSED_(CDATA_SECTION|TOKEN)|UNDEFINED_ENTITY|UNKNOWN_ENCODING|JUNK_AFTER_DOC_ELEMENT|PARTIAL_CHAR|EXTERNAL_ENTITY_HANDLING|ASYNC_ENTITY)|ENTITY_(((REF|DECL)_)?NODE)|ELEMENT(_DECL)?_NODE|LOCAL_NAMESPACE|ATTRIBUTE_(NMTOKEN(S)?|NOTATION|NODE)|CDATA|ID(REF(S)?)?|DECL_NODE|ENTITY|ENUMERATION)|MHASH_(RIPEMD(128|160|256|320)|GOST|MD(2|4|5)|SHA(1|224|256|384|512)|SNEFRU256|HAVAL(128|160|192|224|256)|CRC23(B)?|TIGER(128|160)?|WHIRLPOOL|ADLER32)|MYSQL_(BOTH|NUM|CLIENT_(SSL|COMPRESS|IGNORE_SPACE|INTERACTIVE|ASSOC))|MYSQLI_(REPORT_(STRICT|INDEX|OFF|ERROR|ALL)|REFRESH_(GRANT|MASTER|BACKUP_LOG|STATUS|SLAVE|HOSTS|THREADS|TABLES|LOG)|READ_DEFAULT_(FILE|GROUP)|(GROUP|MULTIPLE_KEY|BINARY|BLOB)_FLAG|BOTH|STMT_ATTR_(CURSOR_TYPE|UPDATE_MAX_LENGTH|PREFETCH_ROWS)|STORE_RESULT|SERVER_QUERY_(NO_((GOOD_)?INDEX_USED)|WAS_SLOW)|SET_(CHARSET_NAME|FLAG)|NO_(DEFAULT_VALUE_FLAG|DATA)|NOT_NULL_FLAG|NUM(_FLAG)?|CURSOR_TYPE_(READ_ONLY|SCROLLABLE|NO_CURSOR|FOR_UPDATE)|CLIENT_(SSL|NO_SCHEMA|COMPRESS|IGNORE_SPACE|INTERACTIVE|FOUND_ROWS)|TYPE_(GEOMETRY|((MEDIUM|LONG|TINY)_)?BLOB|BIT|SHORT|STRING|SET|YEAR|NULL|NEWDECIMAL|NEWDATE|CHAR|TIME(STAMP)?|TINY|INT24|INTERVAL|DOUBLE|DECIMAL|DATE(TIME)?|ENUM|VAR_STRING|FLOAT|LONG(LONG)?)|TIME_STAMP_FLAG|INIT_COMMAND|ZEROFILL_FLAG|ON_UPDATE_NOW_FLAG|OPT_(NET_((CMD|READ)_BUFFER_SIZE)|CONNECT_TIMEOUT|INT_AND_FLOAT_NATIVE|LOCAL_INFILE)|DEBUG_TRACE_ENABLED|DATA_TRUNCATED|USE_RESULT|(ENUM|(PART|PRI|UNIQUE)_KEY|UNSIGNED)_FLAG|ASSOC|ASYNC|AUTO_INCREMENT_FLAG)|MCRYPT_(RC(2|6)|RIJNDAEL_(128|192|256)|RAND|GOST|XTEA|MODE_(STREAM|NOFB|CBC|CFB|OFB|ECB)|MARS|BLOWFISH(_COMPAT)?|SERPENT|SKIPJACK|SAFER(64|128|PLUS)|CRYPT|CAST_(128|256)|TRIPLEDES|THREEWAY|TWOFISH|IDEA|(3)?DES|DECRYPT|DEV_(U)?RANDOM|PANAMA|ENCRYPT|ENIGNA|WAKE|LOKI97|ARCFOUR(_IV)?)|STREAM_(REPORT_ERRORS|MUST_SEEK|MKDIR_RECURSIVE|BUFFER_(NONE|FULL|LINE)|SHUT_(RD)?WR|SOCK_(RDM|RAW|STREAM|SEQPACKET|DGRAM)|SERVER_(BIND|LISTEN)|NOTIFY_(REDIRECTED|RESOLVE|MIME_TYPE_IS|SEVERITY_(INFO|ERR|WARN)|COMPLETED|CONNECT|PROGRESS|FILE_SIZE_IS|FAILURE|AUTH_(REQUIRED|RESULT))|CRYPTO_METHOD_((SSLv2(3)?|SSLv3|TLS)_(CLIENT|SERVER))|CLIENT_((ASYNC_)?CONNECT|PERSISTENT)|CAST_(AS_STREAM|FOR_SELECT)|(IGNORE|IS)_URL|IPPROTO_(RAW|TCP|ICMP|IP|UDP)|OOB|OPTION_(READ_(BUFFER|TIMEOUT)|BLOCKING|WRITE_BUFFER)|URL_STAT_(LINK|QUIET)|USE_PATH|PEEK|PF_(INET(6)?|UNIX)|ENFORCE_SAFE_MODE|FILTER_(ALL|READ|WRITE))|SUNFUNCS_RET_(DOUBLE|STRING|TIMESTAMP)|SQLITE_(READONLY|ROW|MISMATCH|MISUSE|BOTH|BUSY|SCHEMA|NOMEM|NOTFOUND|NOTADB|NOLFS|NUM|CORRUPT|CONSTRAINT|CANTOPEN|TOOBIG|INTERRUPT|INTERNAL|IOERR|OK|DONE|PROTOCOL|PERM|ERROR|EMPTY|FORMAT|FULL|LOCKED|ABORT|ASSOC|AUTH)|SQLITE3_(BOTH|BLOB|NUM|NULL|TEXT|INTEGER|OPEN_(READ(ONLY|WRITE)|CREATE)|FLOAT_ASSOC)|CURL(M_(BAD_((EASY)?HANDLE)|CALL_MULTI_PERFORM|INTERNAL_ERROR|OUT_OF_MEMORY|OK)|MSG_DONE|SSH_AUTH_(HOST|NONE|DEFAULT|PUBLICKEY|PASSWORD|KEYBOARD)|CLOSEPOLICY_(SLOWEST|CALLBACK|OLDEST|LEAST_(RECENTLY_USED|TRAFFIC)|INFO_(REDIRECT_(COUNT|TIME)|REQUEST_SIZE|SSL_VERIFYRESULT|STARTTRANSFER_TIME|(SIZE|SPEED)_(DOWNLOAD|UPLOAD)|HTTP_CODE|HEADER_(OUT|SIZE)|NAMELOOKUP_TIME|CONNECT_TIME|CONTENT_(TYPE|LENGTH_(DOWNLOAD|UPLOAD))|CERTINFO|TOTAL_TIME|PRIVATE|PRETRANSFER_TIME|EFFECTIVE_URL|FILETIME)|OPT_(RESUME_FROM|RETURNTRANSFER|REDIR_PROTOCOLS|REFERER|READ(DATA|FUNCTION)|RANGE|RANDOM_FILE|MAX(CONNECTS|REDIRS)|BINARYTRANSFER|BUFFERSIZE|SSH_(HOST_PUBLIC_KEY_MD5|(PRIVATE|PUBLIC)_KEYFILE)|AUTH_TYPES)|SSL(CERT(TYPE|PASSWD)?|ENGINE(_DEFAULT)?|VERSION|KEY(TYPE|PASSWD)?)|SSL_(CIPHER_LIST|VERIFY(HOST|PEER))|STDERR|HTTP(GET|HEADER|200ALIASES|_VERSION|PROXYTUNNEL|AUTH)|HEADER(FUNCTION)?|NO(BODY|SIGNAL|PROGRESS)|NETRC|CRLF|CONNECTTIMEOUT(_MS)?|COOKIE(SESSION|JAR|FILE)?|CUSTOMREQUEST|CERTINFO|CLOSEPOLICY|CA(INFO|PATH)|TRANSFERTEXT|TCP_NODELAY|TIME(CONDITION|OUT(_MS)?|VALUE)|INTERFACE|INFILE(SIZE)?|IPRESOLVE|DNS_(CACHE_TIMEOUT|USE_GLOBAL_CACHE)|URL|USER(AGENT|PWD)|UNRESTRICTED_AUTH|UPLOAD|PRIVATE|PROGRESSFUNCTION|PROXY(TYPE|USERPWD|PORT|AUTH)?|PROTOCOLS|PORT|POST(REDIR|QUOTE|FIELDS)?|PUT|EGDSOCKET|ENCODING|VERBOSE|KRB4LEVEL|KEYPASSWD|QUOTE|FRESH_CONNECT|FTP(APPEND|LISTONLY|PORT|SSLAUTH)|FTP_(SSL|SKIP_PASV_IP|CREATE_MISSING_DIRS|USE_EP(RT|SV)|FILEMETHOD)|FILE(TIME)?|FORBID_REUSE|FOLLOWLOCATION|FAILONERROR|WRITE(FUNCTION|HEADER)|LOW_SPEED_(LIMIT|TIME)|AUTOREFERER)|PROXY_(HTTP|SOCKS(4|5))|PROTO_(SCP|SFTP|HTTP(S)?|TELNET|TFTP|DICT|FTP(S)?|FILE|LDAP(S)?|ALL)|E_((RECV|READ)_ERROR|GOT_NOTHING|MALFORMAT_USER|BAD_(CONTENT_ENCODING|CALLING_ORDER|PASSWORD_ENTERED|FUNCTION_ARGUMENT)|SSH|SSL_(CIPHER|CONNECT_ERROR|CERTPROBLEM|CACERT|PEER_CERTIFICATE|ENGINE_(NOTFOUND|SETFAILED))|SHARE_IN_USE|SEND_ERROR|HTTP_(RANGE_ERROR|NOT_FOUND|PORT_FAILED|POST_ERROR)|COULDNT_(RESOLVE_(HOST|PROXY)|CONNECT)|TOO_MANY_REDIRECTS|TELNET_OPTION_SYNTAX|OBSOLETE|OUT_OF_MEMORY|OPERATION|TIMEOUTED|OK|URL_MALFORMAT(_USER)?|UNSUPPORTED_PROTOCOL|UNKNOWN_TELNET_OPTION|PARTIAL_FILE|FTP_(BAD_DOWNLOAD_RESUME|SSL_FAILED|COULDNT_(RETR_FILE|GET_SIZE|STOR_FILE|SET_(BINARY|ASCII)|USE_REST)|CANT_(GET_HOST|RECONNECT)|USER_PASSWORD_INCORRECT|PORT_FAILED|QUOTE_ERROR|WRITE_ERROR|WEIRD_((PASS|PASV|SERVER|USER)_REPLY|227_FORMAT)|ACCESS_DENIED)|FILESIZE_EXCEEDED|FILE_COULDNT_READ_FILE|FUNCTION_NOT_FOUND|FAILED_INIT|WRITE_ERROR|LIBRARY_NOT_FOUND|LDAP_(SEARCH_FAILED|CANNOT_BIND|INVALID_URL)|ABORTED_BY_CALLBACK)|VERSION_NOW|FTP(METHOD_(MULTI|SINGLE|NO)CWD|SSL_(ALL|NONE|CONTROL|TRY)|AUTH_(DEFAULT|SSL|TLS))|AUTH_(ANY(SAFE)?|BASIC|DIGEST|GSSNEGOTIATE|NTLM))|CURL_(HTTP_VERSION_(1_(0|1)|NONE)|NETRC_(REQUIRED|IGNORED|OPTIONAL)|TIMECOND_(IF(UN)?MODSINCE|LASTMOD)|IPRESOLVE_(V(4|6)|WHATEVER)|VERSION_(SSL|IPV6|KERBEROS4|LIBZ))|IMAGETYPE_(GIF|XBM|BMP|SWF|COUNT|TIFF_(MM|II)|ICO|IFF|UNKNOWN|JB2|JPX|JP2|JPC|JPEG(2000)?|PSD|PNG|WBMP)|INPUT_(REQUEST|GET|SERVER|SESSION|COOKIE|POST|ENV)|ICONV_(MIME_DECODE_(STRICT|CONTINUE_ON_ERROR)|IMPL|VERSION)|DNS_(MX|SRV|SOA|HINFO|NS|NAPTR|CNAME|TXT|PTR|ANY|ALL|AAAA|A(6)?)|DOM(STRING_SIZE_ERR)|DOM_((SYNTAX|HIERARCHY_REQUEST|NO_(MODIFICATION_ALLOWED|DATA_ALLOWED)|NOT_(FOUND|SUPPORTED)|NAMESPACE|INDEX_SIZE|USE_ATTRIBUTE|VALID_(MODIFICATION|STATE|CHARACTER|ACCESS)|PHP|VALIDATION|WRONG_DOCUMENT)_ERR)|JSON_(HEX_(TAG|QUOT|AMP|APOS)|NUMERIC_CHECK|ERROR_(SYNTAX|STATE_MISMATCH|NONE|CTRL_CHAR|DEPTH|UTF8)|FORCE_OBJECT)|PREG_((D_UTF8(_OFFSET)?|NO|INTERNAL|(BACKTRACK|RECURSION)_LIMIT)_ERROR|GREP_INVERT|SPLIT_(NO_EMPTY|(DELIM|OFFSET)_CAPTURE)|SET_ORDER|OFFSET_CAPTURE|PATTERN_ORDER)|PSFS_(PASS_ON|ERR_FATAL|FEED_ME|FLAG_(NORMAL|FLUSH_(CLOSE|INC)))|PCRE_VERSION|POSIX_((F|R|W|X)_OK|S_IF(REG|BLK|SOCK|CHR|IFO))|FNM_(NOESCAPE|CASEFOLD|PERIOD|PATHNAME)|FILTER_(REQUIRE_(SCALAR|ARRAY)|NULL_ON_FAILURE|CALLBACK|DEFAULT|UNSAFE_RAW|SANITIZE_(MAGIC_QUOTES|STRING|STRIPPED|SPECIAL_CHARS|NUMBER_(INT|FLOAT)|URL|EMAIL|ENCODED|FULL_SPCIAL_CHARS)|VALIDATE_(REGEXP|BOOLEAN|INT|IP|URL|EMAIL|FLOAT)|FORCE_ARRAY|FLAG_(SCHEME_REQUIRED|STRIP_(BACKTICK|HIGH|LOW)|HOST_REQUIRED|NONE|NO_(RES|PRIV)_RANGE|ENCODE_QUOTES|IPV(4|6)|PATH_REQUIRED|EMPTY_STRING_NULL|ENCODE_(HIGH|LOW|AMP)|QUERY_REQUIRED|ALLOW_(SCIENTIFIC|HEX|THOUSAND|OCTAL|FRACTION)))|FILE_(BINARY|SKIP_EMPTY_LINES|NO_DEFAULT_CONTEXT|TEXT|IGNORE_NEW_LINES|USE_INCLUDE_PATH|APPEND)|FILEINFO_(RAW|MIME(_(ENCODING|TYPE))?|SYMLINK|NONE|CONTINUE|DEVICES|PRESERVE_ATIME)|FORCE_(DEFLATE|GZIP)|LIBXML_(XINCLUDE|NSCLEAN|NO(XMLDECL|BLANKS|NET|CDATA|ERROR|EMPTYTAG|ENT|WARNING)|COMPACT|DTD(VALID|LOAD|ATTR)|((DOTTED|LOADED)_)?VERSION|PARSEHUGE|ERR_(NONE|ERROR|FATAL|WARNING)))\\b",
+          "match": "(\\\\)?\\b(GLOB_(MARK|BRACE|NO(SORT|CHECK|ESCAPE)|ONLYDIR|ERR|AVAILABLE_FLAGS)|XML_(SAX_IMPL|(DTD|DOCUMENT(_(FRAG|TYPE))?|HTML_DOCUMENT|NOTATION|NAMESPACE_DECL|PI|COMMENT|DATA_SECTION|TEXT)_NODE|OPTION_(SKIP_(TAGSTART|WHITE)|CASE_FOLDING|TARGET_ENCODING)|ERROR_((BAD_CHAR|(ATTRIBUTE_EXTERNAL|BINARY|PARAM|RECURSIVE)_ENTITY)_REF|MISPLACED_XML_PI|SYNTAX|NONE|NO_(MEMORY|ELEMENTS)|TAG_MISMATCH|INCORRECT_ENCODING|INVALID_TOKEN|DUPLICATE_ATTRIBUTE|UNCLOSED_(CDATA_SECTION|TOKEN)|UNDEFINED_ENTITY|UNKNOWN_ENCODING|JUNK_AFTER_DOC_ELEMENT|PARTIAL_CHAR|EXTERNAL_ENTITY_HANDLING|ASYNC_ENTITY)|ENTITY_(((REF|DECL)_)?NODE)|ELEMENT(_DECL)?_NODE|LOCAL_NAMESPACE|ATTRIBUTE_(N(?:MTOKEN(S)?|OTATION|ODE))|CDATA|ID(REF(S)?)?|DECL_NODE|ENTITY|ENUMERATION)|MHASH_(RIPEMD(128|160|256|320)|GOST|MD([245])|SHA(1|224|256|384|512)|SNEFRU256|HAVAL(128|160|192|224|256)|CRC23(B)?|TIGER(1(?:28|60))?|WHIRLPOOL|ADLER32)|MYSQL_(BOTH|NUM|CLIENT_(SSL|COMPRESS|IGNORE_SPACE|INTERACTIVE|ASSOC))|MYSQLI_(REPORT_(STRICT|INDEX|OFF|ERROR|ALL)|REFRESH_(GRANT|MASTER|BACKUP_LOG|STATUS|SLAVE|HOSTS|THREADS|TABLES|LOG)|READ_DEFAULT_(FILE|GROUP)|(GROUP|MULTIPLE_KEY|BINARY|BLOB)_FLAG|BOTH|STMT_ATTR_(CURSOR_TYPE|UPDATE_MAX_LENGTH|PREFETCH_ROWS)|STORE_RESULT|SERVER_QUERY_(NO_((GOOD_)?INDEX_USED)|WAS_SLOW)|SET_(CHARSET_NAME|FLAG)|NO_(D(?:EFAULT_VALUE_FLAG|ATA))|NOT_NULL_FLAG|NUM(_FLAG)?|CURSOR_TYPE_(READ_ONLY|SCROLLABLE|NO_CURSOR|FOR_UPDATE)|CLIENT_(SSL|NO_SCHEMA|COMPRESS|IGNORE_SPACE|INTERACTIVE|FOUND_ROWS)|TYPE_(GEOMETRY|((MEDIUM|LONG|TINY)_)?BLOB|BIT|SHORT|STRING|SET|YEAR|NULL|NEWDECIMAL|NEWDATE|CHAR|TIME(STAMP)?|TINY|INT24|INTERVAL|DOUBLE|DECIMAL|DATE(TIME)?|ENUM|VAR_STRING|FLOAT|LONG(LONG)?)|TIME_STAMP_FLAG|INIT_COMMAND|ZEROFILL_FLAG|ON_UPDATE_NOW_FLAG|OPT_(NET_((CMD|READ)_BUFFER_SIZE)|CONNECT_TIMEOUT|INT_AND_FLOAT_NATIVE|LOCAL_INFILE)|DEBUG_TRACE_ENABLED|DATA_TRUNCATED|USE_RESULT|(ENUM|(PART|PRI|UNIQUE)_KEY|UNSIGNED)_FLAG|ASSOC|ASYNC|AUTO_INCREMENT_FLAG)|MCRYPT_(RC([26])|RIJNDAEL_(128|192|256)|RAND|GOST|XTEA|MODE_(STREAM|NOFB|CBC|CFB|OFB|ECB)|MARS|BLOWFISH(_COMPAT)?|SERPENT|SKIPJACK|SAFER(64|128|PLUS)|CRYPT|CAST_(128|256)|TRIPLEDES|THREEWAY|TWOFISH|IDEA|(3)?DES|DECRYPT|DEV_(U)?RANDOM|PANAMA|ENCRYPT|ENIGNA|WAKE|LOKI97|ARCFOUR(_IV)?)|STREAM_(REPORT_ERRORS|MUST_SEEK|MKDIR_RECURSIVE|BUFFER_(NONE|FULL|LINE)|SHUT_(RD)?WR|SOCK_(RDM|RAW|STREAM|SEQPACKET|DGRAM)|SERVER_(BIND|LISTEN)|NOTIFY_(REDIRECTED|RESOLVE|MIME_TYPE_IS|SEVERITY_(INFO|ERR|WARN)|COMPLETED|CONNECT|PROGRESS|FILE_SIZE_IS|FAILURE|AUTH_(RE(?:QUIRED|SULT)))|CRYPTO_METHOD_((SSLv2(3)?|SSLv3|TLS)_(CLIENT|SERVER))|CLIENT_((ASYNC_)?CONNECT|PERSISTENT)|CAST_(AS_STREAM|FOR_SELECT)|(I(?:GNORE|S))_URL|IPPROTO_(RAW|TCP|ICMP|IP|UDP)|OOB|OPTION_(READ_(BUFFER|TIMEOUT)|BLOCKING|WRITE_BUFFER)|URL_STAT_(LINK|QUIET)|USE_PATH|PEEK|PF_(INET(6)?|UNIX)|ENFORCE_SAFE_MODE|FILTER_(ALL|READ|WRITE))|SUNFUNCS_RET_(DOUBLE|STRING|TIMESTAMP)|SQLITE_(READONLY|ROW|MISMATCH|MISUSE|BOTH|BUSY|SCHEMA|NOMEM|NOTFOUND|NOTADB|NOLFS|NUM|CORRUPT|CONSTRAINT|CANTOPEN|TOOBIG|INTERRUPT|INTERNAL|IOERR|OK|DONE|PROTOCOL|PERM|ERROR|EMPTY|FORMAT|FULL|LOCKED|ABORT|ASSOC|AUTH)|SQLITE3_(BOTH|BLOB|NUM|NULL|TEXT|INTEGER|OPEN_(READ(ONLY|WRITE)|CREATE)|FLOAT_ASSOC)|CURL(M_(BAD_((EASY)?HANDLE)|CALL_MULTI_PERFORM|INTERNAL_ERROR|OUT_OF_MEMORY|OK)|MSG_DONE|SSH_AUTH_(HOST|NONE|DEFAULT|PUBLICKEY|PASSWORD|KEYBOARD)|CLOSEPOLICY_(SLOWEST|CALLBACK|OLDEST|LEAST_(RECENTLY_USED|TRAFFIC)|INFO_(REDIRECT_(COUNT|TIME)|REQUEST_SIZE|SSL_VERIFYRESULT|STARTTRANSFER_TIME|(S(?:IZE|PEED))_(DOWNLOAD|UPLOAD)|HTTP_CODE|HEADER_(OUT|SIZE)|NAMELOOKUP_TIME|CONNECT_TIME|CONTENT_(TYPE|LENGTH_(DOWNLOAD|UPLOAD))|CERTINFO|TOTAL_TIME|PRIVATE|PRETRANSFER_TIME|EFFECTIVE_URL|FILETIME)|OPT_(RESUME_FROM|RETURNTRANSFER|REDIR_PROTOCOLS|REFERER|READ(DATA|FUNCTION)|RANGE|RANDOM_FILE|MAX(CONNECTS|REDIRS)|BINARYTRANSFER|BUFFERSIZE|SSH_(HOST_PUBLIC_KEY_MD5|(P(?:RIVATE|UBLIC))_KEYFILE)|AUTH_TYPES)|SSL(CERT(TYPE|PASSWD)?|ENGINE(_DEFAULT)?|VERSION|KEY(TYPE|PASSWD)?)|SSL_(CIPHER_LIST|VERIFY(HOST|PEER))|STDERR|HTTP(GET|HEADER|200ALIASES|_VERSION|PROXYTUNNEL|AUTH)|HEADER(FUNCTION)?|NO(BODY|SIGNAL|PROGRESS)|NETRC|CRLF|CONNECTTIMEOUT(_MS)?|COOKIE(SESSION|JAR|FILE)?|CUSTOMREQUEST|CERTINFO|CLOSEPOLICY|CA(INFO|PATH)|TRANSFERTEXT|TCP_NODELAY|TIME(CONDITION|OUT(_MS)?|VALUE)|INTERFACE|INFILE(SIZE)?|IPRESOLVE|DNS_(CACHE_TIMEOUT|USE_GLOBAL_CACHE)|URL|USER(AGENT|PWD)|UNRESTRICTED_AUTH|UPLOAD|PRIVATE|PROGRESSFUNCTION|PROXY(TYPE|USERPWD|PORT|AUTH)?|PROTOCOLS|PORT|POST(REDIR|QUOTE|FIELDS)?|PUT|EGDSOCKET|ENCODING|VERBOSE|KRB4LEVEL|KEYPASSWD|QUOTE|FRESH_CONNECT|FTP(APPEND|LISTONLY|PORT|SSLAUTH)|FTP_(SSL|SKIP_PASV_IP|CREATE_MISSING_DIRS|USE_EP(RT|SV)|FILEMETHOD)|FILE(TIME)?|FORBID_REUSE|FOLLOWLOCATION|FAILONERROR|WRITE(FUNCTION|HEADER)|LOW_SPEED_(LIMIT|TIME)|AUTOREFERER)|PROXY_(HTTP|SOCKS([45]))|PROTO_(SCP|SFTP|HTTP(S)?|TELNET|TFTP|DICT|FTP(S)?|FILE|LDAP(S)?|ALL)|E_((RE(?:CV|AD))_ERROR|GOT_NOTHING|MALFORMAT_USER|BAD_(CONTENT_ENCODING|CALLING_ORDER|PASSWORD_ENTERED|FUNCTION_ARGUMENT)|SSH|SSL_(CIPHER|CONNECT_ERROR|CERTPROBLEM|CACERT|PEER_CERTIFICATE|ENGINE_(NOTFOUND|SETFAILED))|SHARE_IN_USE|SEND_ERROR|HTTP_(RANGE_ERROR|NOT_FOUND|PORT_FAILED|POST_ERROR)|COULDNT_(RESOLVE_(HOST|PROXY)|CONNECT)|TOO_MANY_REDIRECTS|TELNET_OPTION_SYNTAX|OBSOLETE|OUT_OF_MEMORY|OPERATION|TIMEOUTED|OK|URL_MALFORMAT(_USER)?|UNSUPPORTED_PROTOCOL|UNKNOWN_TELNET_OPTION|PARTIAL_FILE|FTP_(BAD_DOWNLOAD_RESUME|SSL_FAILED|COULDNT_(RETR_FILE|GET_SIZE|STOR_FILE|SET_(BINARY|ASCII)|USE_REST)|CANT_(GET_HOST|RECONNECT)|USER_PASSWORD_INCORRECT|PORT_FAILED|QUOTE_ERROR|WRITE_ERROR|WEIRD_((PASS|PASV|SERVER|USER)_REPLY|227_FORMAT)|ACCESS_DENIED)|FILESIZE_EXCEEDED|FILE_COULDNT_READ_FILE|FUNCTION_NOT_FOUND|FAILED_INIT|WRITE_ERROR|LIBRARY_NOT_FOUND|LDAP_(SEARCH_FAILED|CANNOT_BIND|INVALID_URL)|ABORTED_BY_CALLBACK)|VERSION_NOW|FTP(METHOD_(MULTI|SINGLE|NO)CWD|SSL_(ALL|NONE|CONTROL|TRY)|AUTH_(DEFAULT|SSL|TLS))|AUTH_(ANY(SAFE)?|BASIC|DIGEST|GSSNEGOTIATE|NTLM))|CURL_(HTTP_VERSION_(1_([01])|NONE)|NETRC_(REQUIRED|IGNORED|OPTIONAL)|TIMECOND_(IF(UN)?MODSINCE|LASTMOD)|IPRESOLVE_(V([46])|WHATEVER)|VERSION_(SSL|IPV6|KERBEROS4|LIBZ))|IMAGETYPE_(GIF|XBM|BMP|SWF|COUNT|TIFF_(MM|II)|ICO|IFF|UNKNOWN|JB2|JPX|JP2|JPC|JPEG(2000)?|PSD|PNG|WBMP)|INPUT_(REQUEST|GET|SERVER|SESSION|COOKIE|POST|ENV)|ICONV_(MIME_DECODE_(STRICT|CONTINUE_ON_ERROR)|IMPL|VERSION)|DNS_(MX|SRV|SOA|HINFO|NS|NAPTR|CNAME|TXT|PTR|ANY|ALL|AAAA|A(6)?)|DOM(STRING_SIZE_ERR)|DOM_((SYNTAX|HIERARCHY_REQUEST|NO_(MODIFICATION_ALLOWED|DATA_ALLOWED)|NOT_(FOUND|SUPPORTED)|NAMESPACE|INDEX_SIZE|USE_ATTRIBUTE|VALID_(MODIFICATION|STATE|CHARACTER|ACCESS)|PHP|VALIDATION|WRONG_DOCUMENT)_ERR)|JSON_(HEX_(TAG|QUOT|AMP|APOS)|NUMERIC_CHECK|ERROR_(SYNTAX|STATE_MISMATCH|NONE|CTRL_CHAR|DEPTH|UTF8)|FORCE_OBJECT)|PREG_((D_UTF8(_OFFSET)?|NO|INTERNAL|(BACKTRACK|RECURSION)_LIMIT)_ERROR|GREP_INVERT|SPLIT_(NO_EMPTY|(DELIM|OFFSET)_CAPTURE)|SET_ORDER|OFFSET_CAPTURE|PATTERN_ORDER)|PSFS_(PASS_ON|ERR_FATAL|FEED_ME|FLAG_(NORMAL|FLUSH_(CLOSE|INC)))|PCRE_VERSION|POSIX_(([FRWX])_OK|S_IF(REG|BLK|SOCK|CHR|IFO))|FNM_(NOESCAPE|CASEFOLD|PERIOD|PATHNAME)|FILTER_(REQUIRE_(SCALAR|ARRAY)|NULL_ON_FAILURE|CALLBACK|DEFAULT|UNSAFE_RAW|SANITIZE_(MAGIC_QUOTES|STRING|STRIPPED|SPECIAL_CHARS|NUMBER_(INT|FLOAT)|URL|EMAIL|ENCODED|FULL_SPCIAL_CHARS)|VALIDATE_(REGEXP|BOOLEAN|INT|IP|URL|EMAIL|FLOAT)|FORCE_ARRAY|FLAG_(SCHEME_REQUIRED|STRIP_(BACKTICK|HIGH|LOW)|HOST_REQUIRED|NONE|NO_(RES|PRIV)_RANGE|ENCODE_QUOTES|IPV([46])|PATH_REQUIRED|EMPTY_STRING_NULL|ENCODE_(HIGH|LOW|AMP)|QUERY_REQUIRED|ALLOW_(SCIENTIFIC|HEX|THOUSAND|OCTAL|FRACTION)))|FILE_(BINARY|SKIP_EMPTY_LINES|NO_DEFAULT_CONTEXT|TEXT|IGNORE_NEW_LINES|USE_INCLUDE_PATH|APPEND)|FILEINFO_(RAW|MIME(_(ENCODING|TYPE))?|SYMLINK|NONE|CONTINUE|DEVICES|PRESERVE_ATIME)|FORCE_(DEFLATE|GZIP)|LIBXML_(XINCLUDE|NSCLEAN|NO(XMLDECL|BLANKS|NET|CDATA|ERROR|EMPTYTAG|ENT|WARNING)|COMPACT|DTD(VALID|LOAD|ATTR)|((DOTTED|LOADED)_)?VERSION|PARSEHUGE|ERR_(NONE|ERROR|FATAL|WARNING)))\\b",
           "name": "support.constant.ext.php"
         },
         {
@@ -1412,7 +1412,7 @@
           "name": "support.constant.parser-token.php"
         },
         {
-          "match": "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
+          "match": "(?i)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*",
           "name": "constant.other.php"
         }
       ]
@@ -1420,7 +1420,7 @@
     "function-call": {
       "patterns": [
         {
-          "begin": "(\\\\?(?<![a-zA-Z0-9_\\x{7f}-\\x{10ffff}])[a-zA-Z_\\x{7f}-\\x{10ffff}][a-zA-Z0-9_\\x{7f}-\\x{10ffff}]*(?:\\\\[a-zA-Z_\\x{7f}-\\x{10ffff}][a-zA-Z0-9_\\x{7f}-\\x{10ffff}]*)+)\\s*(\\()",
+          "begin": "(\\\\?(?<![a-zA-Z0-9_\\x7F-\\x{10FFFF}])[a-zA-Z_\\x7F-\\x{10FFFF}][a-zA-Z0-9_\\x7F-\\x{10FFFF}]*(?:\\\\[a-zA-Z_\\x7F-\\x{10FFFF}][a-zA-Z0-9_\\x7F-\\x{10FFFF}]*)+)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1428,7 +1428,7 @@
                   "include": "#namespace"
                 },
                 {
-                  "match": "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
+                  "match": "(?i)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*",
                   "name": "entity.name.function.php"
                 }
               ]
@@ -1454,7 +1454,7 @@
           ]
         },
         {
-          "begin": "(\\\\)?(?<![a-zA-Z0-9_\\x{7f}-\\x{10ffff}])([a-zA-Z_\\x{7f}-\\x{10ffff}][a-zA-Z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(\\()",
+          "begin": "(\\\\)?(?<![a-zA-Z0-9_\\x7F-\\x{10FFFF}])([a-zA-Z_\\x7F-\\x{10FFFF}][a-zA-Z0-9_\\x7F-\\x{10FFFF}]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1469,7 +1469,7 @@
                   "include": "#support"
                 },
                 {
-                  "match": "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
+                  "match": "(?i)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*",
                   "name": "entity.name.function.php"
                 }
               ]
@@ -1534,11 +1534,11 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?xi)\n(?: (\n  # nullable type\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n  # union, intersection or DNF type\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  (?: \\s*[|&]\\s*\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  )+\n) \\s+ )?\n((?:(&)\\s*)?(\\.\\.\\.)(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference\n(?=\\s*(?:,|\\)|/[/*]|\\#|$)) # A closing parentheses (end of argument list) or a comma or a comment",
+          "match": "(?i)(?:((?:\\?\\s*)?[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\))(?:\\s*[|\\&]\\s*(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\)))+)\\s+)?((?:(&)\\s*)?(\\.\\.\\.)(\\$)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)(?=\\s*(?:[,)]|/[/*]|#|$))",
           "name": "meta.function.parameter.variadic.php"
         },
         {
-          "begin": "(?xi)\n(\n  # nullable type\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n  # union, intersection or DNF type\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  (?: \\s*[|&]\\s*\n  (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n  )+\n)\n\\s+ ((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference",
+          "begin": "(?i)((?:\\?\\s*)?[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\))(?:\\s*[|\\&]\\s*(?:[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+|\\(\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)+\\s*\\)))+)\\s+((?:(&)\\s*)?(\\$)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1557,7 +1557,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
+          "end": "(?=\\s*(?:[,)]|/[/*]|#))",
           "name": "meta.function.parameter.typehinted.php",
           "patterns": [
             {
@@ -1567,7 +1567,7 @@
                   "name": "keyword.operator.assignment.php"
                 }
               },
-              "end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
+              "end": "(?=\\s*(?:[,)]|/[/*]|#))",
               "patterns": [
                 {
                   "include": "#parameter-default-types"
@@ -1588,11 +1588,11 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?xi)\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference\n(?=\\s*(?:,|\\)|/[/*]|\\#|$)) # A closing parentheses (end of argument list) or a comma or a comment",
+          "match": "(?i)((?:(&)\\s*)?(\\$)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)(?=\\s*(?:[,)]|/[/*]|#|$))",
           "name": "meta.function.parameter.no-default.php"
         },
         {
-          "begin": "(?xi)\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference\n\\s*(=)\\s*",
+          "begin": "(?i)((?:(&)\\s*)?(\\$)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)\\s*(=)\\s*",
           "beginCaptures": {
             "1": {
               "name": "variable.other.php"
@@ -1607,7 +1607,7 @@
               "name": "keyword.operator.assignment.php"
             }
           },
-          "end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
+          "end": "(?=\\s*(?:[,)]|/[/*]|#))",
           "name": "meta.function.parameter.default.php",
           "patterns": [
             {
@@ -1620,7 +1620,7 @@
     "heredoc": {
       "patterns": [
         {
-          "begin": "(?i)(?=<<<\\s*(\"?)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)(\\1)\\s*$)",
+          "begin": "(?i)(?=<<<\\s*(\"?)([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)(\\1)\\s*$)",
           "end": "(?!\\G)",
           "name": "string.unquoted.heredoc.php",
           "patterns": [
@@ -1660,7 +1660,7 @@
             }
           },
           "contentName": "text.html",
-          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -1696,7 +1696,7 @@
             }
           },
           "contentName": "text.xml",
-          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -1732,7 +1732,7 @@
             }
           },
           "contentName": "source.sql",
-          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -1752,7 +1752,7 @@
           ]
         },
         {
-          "begin": "(<<<)\\s*(\"?)(JAVASCRIPT|JS)(\\2)(\\s*)$",
+          "begin": "(<<<)\\s*(\"?)(J(?:AVASCRIPT|S))(\\2)(\\s*)$",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.embedded.begin.php"
@@ -1768,7 +1768,7 @@
             }
           },
           "contentName": "source.js",
-          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -1804,7 +1804,7 @@
             }
           },
           "contentName": "source.json",
-          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -1840,7 +1840,7 @@
             }
           },
           "contentName": "source.css",
-          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -1876,7 +1876,7 @@
             }
           },
           "contentName": "string.regexp.heredoc.php",
-          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -1902,17 +1902,17 @@
                   "name": "punctuation.definition.arbitrary-repitition.php"
                 }
               },
-              "match": "({)\\d+(,\\d+)?(})",
+              "match": "(\\{)\\d+(,\\d+)?(})",
               "name": "string.regexp.arbitrary-repitition.php"
             },
             {
-              "begin": "\\[(?:\\^?\\])?",
+              "begin": "\\[(?:\\^?])?",
               "captures": {
                 "0": {
                   "name": "punctuation.definition.character-class.php"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "name": "string.regexp.character-class.php",
               "patterns": [
                 {
@@ -1926,7 +1926,7 @@
               "name": "keyword.operator.regexp.php"
             },
             {
-              "begin": "(?i)(?<=^|\\s)(#)\\s(?=[[a-z0-9_\\x{7f}-\\x{10ffff},. \\t?!-][^\\x{00}-\\x{7f}]]*$)",
+              "begin": "(?i)(?<=^|\\s)(#)\\s(?=[a-z0-9_\\x7F-\\x{10FFFF},. \\t?!\\-[^\\x00-\\x7F]]*$)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.comment.php"
@@ -1959,7 +1959,7 @@
             }
           },
           "contentName": "text.html.php.blade",
-          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -1976,7 +1976,7 @@
           ]
         },
         {
-          "begin": "(?i)(<<<)\\s*(\"?)([a-z_\\x{7f}-\\x{10ffff}]+[a-z0-9_\\x{7f}-\\x{10ffff}]*)(\\2)(\\s*)",
+          "begin": "(?i)(<<<)\\s*(\"?)([a-z_\\x7F-\\x{10FFFF}]+[a-z0-9_\\x7F-\\x{10FFFF}]*)(\\2)(\\s*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.php"
@@ -1988,7 +1988,7 @@
               "name": "invalid.illegal.trailing-whitespace.php"
             }
           },
-          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\3)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.php"
@@ -2005,8 +2005,8 @@
     "inheritance-single": {
       "patterns": [
         {
-          "begin": "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
-          "end": "(?i)([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
+          "begin": "(?i)(?=\\\\?[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*\\\\)",
+          "end": "(?i)([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?(?=[^a-z0-9_\\x7F-\\x{10FFFF}\\\\])",
           "endCaptures": {
             "1": {
               "name": "entity.other.inherited-class.php"
@@ -2025,29 +2025,74 @@
           "include": "#namespace"
         },
         {
-          "match": "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
+          "match": "(?i)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*",
           "name": "entity.other.inherited-class.php"
         }
       ]
     },
     "instantiation": {
-      "begin": "(?i)(new)\\s+(?!class\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.new.php"
-        }
-      },
-      "end": "(?i)(?=[^a-z0-9_\\x{7f}-\\x{10ffff}\\\\])",
       "patterns": [
         {
-          "match": "(?i)(parent|static|self)(?![a-z0-9_\\x{7f}-\\x{10ffff}])",
-          "name": "storage.type.php"
-        },
-        {
-          "include": "#class-name"
+          "captures": {
+            "1": {
+              "name": "keyword.other.new.php"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "match": "(?i)(parent|static|self)(?![a-z0-9_\\x7F-\\x{10FFFF}])",
+                  "name": "storage.type.php"
+                },
+                {
+                  "include": "#class-name"
+                },
+                {
+                  "include": "#variable-name"
+                }
+              ]
+            }
+          },
+          "match": "(?i)(new)\\s+(?!class\\b)([$a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)(?![a-z0-9_\\x7F-\\x{10FFFF}\\\\(])"
         },
         {
-          "include": "#variable-name"
+          "begin": "(?i)(new)\\s+(?!class\\b)([$a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)\\s*(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.new.php"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "match": "(?i)(parent|static|self)(?![a-z0-9_\\x7F-\\x{10FFFF}])",
+                  "name": "storage.type.php"
+                },
+                {
+                  "include": "#class-name"
+                },
+                {
+                  "include": "#variable-name"
+                }
+              ]
+            },
+            "3": {
+              "name": "punctuation.definition.arguments.begin.bracket.round.php"
+            }
+          },
+          "contentName": "meta.function-call.php",
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.arguments.end.bracket.round.php"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#named-arguments"
+            },
+            {
+              "include": "$self"
+            }
+          ]
         }
       ]
     },
@@ -2060,7 +2105,7 @@
               "name": "storage.modifier.extends.php"
             }
           },
-          "end": "(?i)(?={)",
+          "end": "(?i)(?=\\{)",
           "patterns": [
             {
               "include": "#comments"
@@ -2083,11 +2128,11 @@
           "name": "constant.character.escape.octal.php"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f]{1,2}",
+          "match": "\\\\x\\h{1,2}",
           "name": "constant.character.escape.hex.php"
         },
         {
-          "match": "\\\\u{[0-9A-Fa-f]+}",
+          "match": "\\\\u\\{\\h+}",
           "name": "constant.character.escape.unicode.php"
         },
         {
@@ -2095,7 +2140,7 @@
           "name": "constant.character.escape.php"
         },
         {
-          "begin": "{(?=\\$.*?})",
+          "begin": "\\{(?=\\$.*?})",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.variable.php"
@@ -2138,7 +2183,7 @@
           "name": "punctuation.definition.variable.php"
         }
       },
-      "match": "(?i)((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)(?=\\s*\\()",
+      "match": "(?i)((\\$+)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)(?=\\s*\\()",
       "name": "meta.function-call.invoke.php"
     },
     "match_statement": {
@@ -2181,7 +2226,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.section.match-block.begin.bracket.curly.php"
@@ -2211,10 +2256,10 @@
           "name": "punctuation.separator.colon.php"
         }
       },
-      "match": "(?i)(?<=^|\\(|,)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(:)(?!:)"
+      "match": "(?i)(?<=^|[(,])\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)\\s*(:)(?!:)"
     },
     "namespace": {
-      "begin": "(?i)(?:(namespace)|[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?(\\\\)",
+      "begin": "(?i)(?:(namespace)|[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?(\\\\)",
       "beginCaptures": {
         "1": {
           "name": "variable.language.namespace.php"
@@ -2223,7 +2268,7 @@
           "name": "punctuation.separator.inheritance.php"
         }
       },
-      "end": "(?i)(?![a-z0-9_\\x{7f}-\\x{10ffff}]*\\\\)",
+      "end": "(?i)(?![a-z0-9_\\x7F-\\x{10FFFF}]*\\\\)",
       "name": "support.other.namespace.php",
       "patterns": [
         {
@@ -2251,7 +2296,7 @@
             }
           },
           "contentName": "text.html",
-          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -2284,7 +2329,7 @@
             }
           },
           "contentName": "text.xml",
-          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -2317,7 +2362,7 @@
             }
           },
           "contentName": "source.sql",
-          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -2334,7 +2379,7 @@
           ]
         },
         {
-          "begin": "(<<<)\\s*'(JAVASCRIPT|JS)'(\\s*)$",
+          "begin": "(<<<)\\s*'(J(?:AVASCRIPT|S))'(\\s*)$",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.embedded.begin.php"
@@ -2350,7 +2395,7 @@
             }
           },
           "contentName": "source.js",
-          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -2383,7 +2428,7 @@
             }
           },
           "contentName": "source.json",
-          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -2416,7 +2461,7 @@
             }
           },
           "contentName": "source.css",
-          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -2449,7 +2494,7 @@
             }
           },
           "contentName": "string.regexp.nowdoc.php",
-          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -2472,17 +2517,17 @@
                   "name": "punctuation.definition.arbitrary-repitition.php"
                 }
               },
-              "match": "({)\\d+(,\\d+)?(})",
+              "match": "(\\{)\\d+(,\\d+)?(})",
               "name": "string.regexp.arbitrary-repitition.php"
             },
             {
-              "begin": "\\[(?:\\^?\\])?",
+              "begin": "\\[(?:\\^?])?",
               "captures": {
                 "0": {
                   "name": "punctuation.definition.character-class.php"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "name": "string.regexp.character-class.php",
               "patterns": [
                 {
@@ -2496,7 +2541,7 @@
               "name": "keyword.operator.regexp.php"
             },
             {
-              "begin": "(?i)(?<=^|\\s)(#)\\s(?=[[a-z0-9_\\x{7f}-\\x{10ffff},. \\t?!-][^\\x{00}-\\x{7f}]]*$)",
+              "begin": "(?i)(?<=^|\\s)(#)\\s(?=[a-z0-9_\\x7F-\\x{10FFFF},. \\t?!\\-[^\\x00-\\x7F]]*$)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.comment.php"
@@ -2529,7 +2574,7 @@
             }
           },
           "contentName": "text.html.php.blade",
-          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.php"
@@ -2541,7 +2586,7 @@
           "name": "meta.embedded.php.blade"
         },
         {
-          "begin": "(?i)(<<<)\\s*'([a-z_\\x{7f}-\\x{10ffff}]+[a-z0-9_\\x{7f}-\\x{10ffff}]*)'(\\s*)",
+          "begin": "(?i)(<<<)\\s*'([a-z_\\x7F-\\x{10FFFF}]+[a-z0-9_\\x7F-\\x{10FFFF}]*)'(\\s*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.php"
@@ -2553,7 +2598,7 @@
               "name": "invalid.illegal.trailing-whitespace.php"
             }
           },
-          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x{7f}-\\x{10ffff}])",
+          "end": "^\\s*(\\2)(?![A-Za-z0-9_\\x7F-\\x{10FFFF}])",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.nowdoc.php"
@@ -2569,7 +2614,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "0[xX][0-9a-fA-F]+(?:_[0-9a-fA-F]+)*",
+          "match": "0[xX]\\h+(?:_\\h+)*",
           "name": "constant.numeric.hex.php"
         },
         {
@@ -2605,7 +2650,7 @@
     "object": {
       "patterns": [
         {
-          "begin": "(\\??->)\\s*(\\$?{)",
+          "begin": "(\\??->)\\s*(\\$?\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -2627,7 +2672,7 @@
           ]
         },
         {
-          "begin": "(?i)(\\??->)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(\\()",
+          "begin": "(?i)(\\??->)\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -2667,7 +2712,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?i)(\\??->)\\s*((\\$+)?[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?"
+          "match": "(?i)(\\??->)\\s*((\\$+)?[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?"
         }
       ]
     },
@@ -2727,7 +2772,7 @@
               "name": "punctuation.section.array.begin.php"
             }
           },
-          "end": "\\]|(?=\\?>)",
+          "end": "]|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.array.end.php"
@@ -2743,8 +2788,8 @@
           "include": "#instantiation"
         },
         {
-          "begin": "(?xi)\n(?=[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+\n  (::)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?\n)",
-          "end": "(?i)(::)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)?",
+          "begin": "(?i)(?=[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+(::)\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?)",
+          "end": "(?i)(::)\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)?",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -2771,7 +2816,7 @@
           "name": "keyword.operator.nullable-type.php"
         },
         {
-          "match": "[|&]",
+          "match": "[|\\&]",
           "name": "punctuation.separator.delimiter.php"
         },
         {
@@ -2798,7 +2843,7 @@
     "php_doc": {
       "patterns": [
         {
-          "match": "^(?!\\s*\\*).*?(?:(?=\\*\\/)|$\\n?)",
+          "match": "^(?!\\s*\\*).*?(?:(?=\\*/)|$\\n?)",
           "name": "invalid.illegal.missing-asterisk.phpdoc.php"
         },
         {
@@ -2813,7 +2858,7 @@
               "name": "invalid.illegal.wrong-access-type.phpdoc.php"
             }
           },
-          "match": "^\\s*\\*\\s*(@access)\\s+((public|private|protected)|(.+))\\s*$"
+          "match": "^\\s*\\*\\s*(@access)\\s+((p(?:ublic|rivate|rotected))|(.+))\\s*$"
         },
         {
           "captures": {
@@ -2827,7 +2872,7 @@
           "match": "(@xlink)\\s+(.+)\\s*$"
         },
         {
-          "begin": "(@(?:global|param|property(-(read|write))?|return|throws|var))\\s+(?=[?A-Za-z_\\x{7f}-\\x{10ffff}\\\\]|\\()",
+          "begin": "(@(?:global|param|property(-(read|write))?|return|throws|var))\\s+(?=[?A-Za-z_\\x7F-\\x{10FFFF}\\\\(])",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.phpdoc.php"
@@ -2844,6 +2889,10 @@
             },
             {
               "include": "#php_doc_types"
+            },
+            {
+              "match": "[|\\&]",
+              "name": "punctuation.separator.delimiter.php"
             }
           ]
         },
@@ -2857,7 +2906,7 @@
               "name": "keyword.other.phpdoc.php"
             }
           },
-          "match": "{(@(link|inherit[Dd]oc)).+?}",
+          "match": "\\{(@(link|inherit[Dd]oc)).+?}",
           "name": "meta.tag.inline.phpdoc.php"
         }
       ]
@@ -2878,21 +2927,13 @@
               "include": "#class-name"
             },
             {
-              "match": "[|&]",
+              "match": "[|\\&]",
               "name": "punctuation.separator.delimiter.php"
-            },
-            {
-              "match": "\\(",
-              "name": "punctuation.definition.type.begin.bracket.round.php"
-            },
-            {
-              "match": "\\)",
-              "name": "punctuation.definition.type.end.bracket.round.php"
             }
           ]
         }
       },
-      "match": "(?i)\\??[a-z_\\x{7f}-\\x{10ffff}\\\\][a-z0-9_\\x{7f}-\\x{10ffff}\\\\]*([|&]\\??[a-z_\\x{7f}-\\x{10ffff}\\\\][a-z0-9_\\x{7f}-\\x{10ffff}\\\\]*)*"
+      "match": "(?i)\\??[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+([|\\&]\\??[a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)*"
     },
     "php_doc_types_array_multiple": {
       "begin": "\\(",
@@ -2901,7 +2942,7 @@
           "name": "punctuation.definition.type.begin.bracket.round.phpdoc.php"
         }
       },
-      "end": "(\\))(\\[\\])|(?=\\*/)",
+      "end": "(\\))(\\[])?|(?=\\*/)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.type.end.bracket.round.phpdoc.php"
@@ -2921,7 +2962,7 @@
           "include": "#php_doc_types"
         },
         {
-          "match": "[|&]",
+          "match": "[|\\&]",
           "name": "punctuation.separator.delimiter.php"
         }
       ]
@@ -2939,7 +2980,7 @@
           "name": "keyword.other.array.phpdoc.php"
         }
       },
-      "match": "(?i)([a-z_\\x{7f}-\\x{10ffff}\\\\][a-z0-9_\\x{7f}-\\x{10ffff}\\\\]*)(\\[\\])"
+      "match": "(?i)([a-z0-9_\\x7F-\\x{10FFFF}\\\\]+)(\\[])"
     },
     "regex-double-quoted": {
       "begin": "\"/(?=(\\\\.|[^\"/])++/[imsxeADSUXu]*\")",
@@ -2972,17 +3013,17 @@
               "name": "punctuation.definition.arbitrary-repetition.php"
             }
           },
-          "match": "({)\\d+(,\\d+)?(})",
+          "match": "(\\{)\\d+(,\\d+)?(})",
           "name": "string.regexp.arbitrary-repetition.php"
         },
         {
-          "begin": "\\[(?:\\^?\\])?",
+          "begin": "\\[(?:\\^?])?",
           "captures": {
             "0": {
               "name": "punctuation.definition.character-class.php"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.character-class.php",
           "patterns": [
             {
@@ -3023,17 +3064,17 @@
               "name": "punctuation.definition.arbitrary-repetition.php"
             }
           },
-          "match": "({)\\d+(,\\d+)?(})",
+          "match": "(\\{)\\d+(,\\d+)?(})",
           "name": "string.regexp.arbitrary-repetition.php"
         },
         {
-          "begin": "\\[(?:\\^?\\])?",
+          "begin": "\\[(?:\\^?])?",
           "captures": {
             "0": {
               "name": "punctuation.definition.character-class.php"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.character-class.php"
         },
         {
@@ -3061,10 +3102,10 @@
               ]
             }
           },
-          "match": "([A-Za-z_\\x{7f}-\\x{10ffff}\\\\][A-Za-z0-9_\\x{7f}-\\x{10ffff}\\\\]*)(?=\\s*::)"
+          "match": "([A-Za-z_\\x7F-\\x{10FFFF}\\\\][A-Za-z0-9_\\x7F-\\x{10FFFF}\\\\]*)(?=\\s*::)"
         },
         {
-          "begin": "(?i)(::)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(\\()",
+          "begin": "(?i)(::)\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -3118,7 +3159,7 @@
               "name": "constant.other.class.php"
             }
           },
-          "match": "(?xi)\n(::)\\s*\n(?:\n  ((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable\n  |\n  ([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)       # Constant\n)?"
+          "match": "(?i)(::)\\s*(?:((\\$+)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)|([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*))?"
         }
       ]
     },
@@ -3341,15 +3382,15 @@
     "support": {
       "patterns": [
         {
-          "match": "(?xi)\n\\b\napc_(\n  store|sma_info|compile_file|clear_cache|cas|cache_info|inc|dec|define_constants|delete(_file)?|\n  exists|fetch|load_constants|add|bin_(dump|load)(file)?\n)\\b",
+          "match": "(?i)\\bapc_(store|sma_info|compile_file|clear_cache|cas|cache_info|inc|dec|define_constants|delete(_file)?|exists|fetch|load_constants|add|bin_(dump|load)(file)?)\\b",
           "name": "support.function.apc.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  shuffle|sizeof|sort|next|nat(case)?sort|count|compact|current|in_array|usort|uksort|uasort|\n  pos|prev|end|each|extract|ksort|key(_exists)?|krsort|list|asort|arsort|rsort|reset|range|\n  array(_(shift|sum|splice|search|slice|chunk|change_key_case|count_values|column|combine|\n          (diff|intersect)(_(u)?(key|assoc))?|u(diff|intersect)(_(u)?assoc)?|unshift|unique|\n          pop|push|pad|product|values|keys|key_exists|filter|fill(_keys)?|flip|walk(_recursive)?|\n          reduce|replace(_recursive)?|reverse|rand|multisort|merge(_recursive)?|map)?)\n)\\b",
+          "match": "(?i)\\b(shuffle|sizeof|sort|next|nat(case)?sort|count|compact|current|in_array|usort|uksort|uasort|pos|prev|end|each|extract|ksort|key(_exists)?|krsort|list|asort|arsort|rsort|reset|range|array(_(shift|sum|splice|search|slice|chunk|change_key_case|count_values|column|combine|(diff|intersect)(_(u)?(key|assoc))?|u(diff|intersect)(_(u)?assoc)?|unshift|unique|pop|push|pad|product|values|keys|key_exists|filter|fill(_keys)?|flip|walk(_recursive)?|reduce|replace(_recursive)?|reverse|rand|multisort|merge(_recursive)?|map)?))\\b",
           "name": "support.function.array.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  show_source|sys_getloadavg|sleep|highlight_(file|string)|constant|connection_(aborted|status)|\n  time_(nanosleep|sleep_until)|ignore_user_abort|die|define(d)?|usleep|uniqid|unpack|__halt_compiler|\n  php_(check_syntax|strip_whitespace)|pack|eval|exit|get_browser\n)\\b",
+          "match": "(?i)\\b(show_source|sys_getloadavg|sleep|highlight_(file|string)|constant|connection_(aborted|status)|time_(nanosleep|sleep_until)|ignore_user_abort|die|define(d)?|usleep|uniqid|unpack|__halt_compiler|php_(check_syntax|strip_whitespace)|pack|eval|exit|get_browser)\\b",
           "name": "support.function.basic_functions.php"
         },
         {
@@ -3365,15 +3406,15 @@
           "name": "support.function.bz2.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  (French|Gregorian|Jewish|Julian)ToJD|cal_(to_jd|info|days_in_month|from_jd)|unixtojd|\n  jdto(unix|jewish)|easter_(date|days)|JD(MonthName|To(Gregorian|Julian|French)|DayOfWeek)\n)\\b",
+          "match": "(?i)\\b((French|Gregorian|Jewish|Julian)ToJD|cal_(to_jd|info|days_in_month|from_jd)|unixtojd|jdto(unix|jewish)|easter_(da(?:te|ys))|JD(MonthName|To(Gregorian|Julian|French)|DayOfWeek))\\b",
           "name": "support.function.calendar.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  class_alias|all_user_method(_array)?|is_(a|subclass_of)|__autoload|(class|interface|method|property|trait)_exists|\n  get_(class(_(vars|methods))?|(called|parent)_class|object_vars|declared_(classes|interfaces|traits))\n)\\b",
+          "match": "(?i)\\b(class_alias|all_user_method(_array)?|is_(a|subclass_of)|__autoload|(class|interface|method|property|trait)_exists|get_(class(_(vars|methods))?|(called|parent)_class|object_vars|declared_(classes|interfaces|traits)))\\b",
           "name": "support.function.classobj.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  com_(create_guid|print_typeinfo|event_sink|load_typelib|get_active_object|message_pump)|\n  variant_(sub|set(_type)?|not|neg|cast|cat|cmp|int|idiv|imp|or|div|date_(from|to)_timestamp|\n           pow|eqv|fix|and|add|abs|round|get_type|xor|mod|mul)\n)\\b",
+          "match": "(?i)\\b(com_(create_guid|print_typeinfo|event_sink|load_typelib|get_active_object|message_pump)|variant_(sub|set(_type)?|not|neg|cast|cat|cmp|int|idiv|imp|or|div|date_(from|to)_timestamp|pow|eqv|fix|and|add|abs|round|get_type|xor|mod|mul))\\b",
           "name": "support.function.com.php"
         },
         {
@@ -3389,11 +3430,11 @@
           "name": "support.function.ctype.php"
         },
         {
-          "match": "(?xi)\\b\ncurl_(\n  share_(close|init|setopt)|strerror|setopt(_array)?|copy_handle|close|init|unescape|pause|escape|\n  errno|error|exec|version|file_create|reset|getinfo|\n  multi_(strerror|setopt|select|close|init|info_read|(add|remove)_handle|getcontent|exec)\n)\\b",
+          "match": "(?i)\\bcurl_(share_(close|init|setopt)|strerror|setopt(_array)?|copy_handle|close|init|unescape|pause|escape|errno|error|exec|version|file_create|reset|getinfo|multi_(strerror|setopt|select|close|init|info_read|(add|remove)_handle|getcontent|exec))\\b",
           "name": "support.function.curl.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  strtotime|str[fp]time|checkdate|time|timezone_name_(from_abbr|get)|idate|\n  timezone_((location|offset|transitions|version)_get|(abbreviations|identifiers)_list|open)|\n  date(_(sun(rise|set)|sun_info|sub|create(_(immutable_)?from_format)?|timestamp_(get|set)|timezone_(get|set)|time_set|\n         isodate_set|interval_(create_from_date_string|format)|offset_get|diff|default_timezone_(get|set)|date_set|\n         parse(_from_format)?|format|add|get_last_errors|modify))?|\n  localtime|get(date|timeofday)|gm(strftime|date|mktime)|microtime|mktime\n)\\b",
+          "match": "(?i)\\b(strtotime|str[fp]time|checkdate|time|timezone_name_(from_abbr|get)|idate|timezone_((location|offset|transitions|version)_get|(abbreviations|identifiers)_list|open)|date(_(sun(rise|set)|sun_info|sub|create(_(immutable_)?from_format)?|timestamp_(get|set)|timezone_(get|set)|time_set|isodate_set|interval_(create_from_date_string|format)|offset_get|diff|default_timezone_(get|set)|date_set|parse(_from_format)?|format|add|get_last_errors|modify))?|localtime|get(date|timeofday)|gm(strftime|date|mktime)|microtime|mktime)\\b",
           "name": "support.function.datetime.php"
         },
         {
@@ -3409,11 +3450,11 @@
           "name": "support.function.dir.php"
         },
         {
-          "match": "(?xi)\\b\neio_(\n  sync(fs)?|sync_file_range|symlink|stat(vfs)?|sendfile|set_min_parallel|set_max_(idle|poll_(reqs|time)|parallel)|\n  seek|n(threads|op|pending|reqs|ready)|chown|chmod|custom|close|cancel|truncate|init|open|dup2|unlink|utime|poll|\n  event_loop|f(sync|stat(vfs)?|chown|chmod|truncate|datasync|utime|allocate)|write|lstat|link|rename|realpath|\n  read(ahead|dir|link)?|rmdir|get_(event_stream|last_error)|grp(_(add|cancel|limit))?|mknod|mkdir|busy\n)\\b",
+          "match": "(?i)\\beio_(sync(fs)?|sync_file_range|symlink|stat(vfs)?|sendfile|set_min_parallel|set_max_(idle|poll_(reqs|time)|parallel)|seek|n(threads|op|pending|reqs|ready)|chown|chmod|custom|close|cancel|truncate|init|open|dup2|unlink|utime|poll|event_loop|f(sync|stat(vfs)?|chown|chmod|truncate|datasync|utime|allocate)|write|lstat|link|rename|realpath|read(ahead|dir|link)?|rmdir|get_(event_stream|last_error)|grp(_(add|cancel|limit))?|mknod|mkdir|busy)\\b",
           "name": "support.function.eio.php"
         },
         {
-          "match": "(?xi)\\b\nenchant_(\n  dict_(store_replacement|suggest|check|is_in_session|describe|quick_check|add_to_(personal|session)|get_error)|\n  broker_(set_ordering|init|dict_exists|describe|free(_dict)?|list_dicts|request_(pwl_)?dict|get_error)\n)\\b",
+          "match": "(?i)\\benchant_(dict_(store_replacement|suggest|check|is_in_session|describe|quick_check|add_to_(personal|session)|get_error)|broker_(set_ordering|init|dict_exists|describe|free(_dict)?|list_dicts|request_(pwl_)?dict|get_error))\\b",
           "name": "support.function.enchant.php"
         },
         {
@@ -3421,7 +3462,7 @@
           "name": "support.function.ereg.php"
         },
         {
-          "match": "(?i)\\b((restore|set)_(error_handler|exception_handler)|trigger_error|debug_(print_)?backtrace|user_error|error_(log|reporting|get_last))\\b",
+          "match": "(?i)\\b((restore|set)_(e(?:rror_handler|xception_handler))|trigger_error|debug_(print_)?backtrace|user_error|error_(log|reporting|get_last))\\b",
           "name": "support.function.errorfunc.php"
         },
         {
@@ -3433,11 +3474,11 @@
           "name": "support.function.exif.php"
         },
         {
-          "match": "(?xi)\\b\nfann_(\n  (duplicate|length|merge|shuffle|subset)_train_data|scale_(train(_data)?|(input|output)(_train_data)?)|\n  set_(scaling_params|sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|\n       cascade_(num_candidate_groups|candidate_(change_fraction|limit|stagnation_epochs)|\n                output_(change_fraction|stagnation_epochs)|weight_multiplier|activation_(functions|steepnesses)|\n                (max|min)_(cand|out)_epochs)|\n       callback|training_algorithm|train_(error|stop)_function|(input|output)_scaling_params|error_log|\n       quickprop_(decay|mu)|weight(_array)?|learning_(momentum|rate)|bit_fail_limit|\n       activation_(function|steepness)(_(hidden|layer|output))?|\n       rprop_((decrease|increase)_factor|delta_(max|min|zero)))|\n  save(_train)?|num_(input|output)_train_data|copy|clear_scaling_params|cascadetrain_on_(file|data)|\n  create_((sparse|shortcut|standard)(_array)?|train(_from_callback)?|from_file)|\n  test(_data)?|train(_(on_(file|data)|epoch))?|init_weights|descale_(input|output|train)|destroy(_train)?|\n  print_error|run|reset_(MSE|err(no|str))|read_train_from_file|randomize_weights|\n  get_(sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|num_(input|output|layers)|\n       network_type|MSE|connection_(array|rate)|bias_array|bit_fail(_limit)?|\n       cascade_(num_(candidates|candidate_groups)|(candidate|output)_(change_fraction|limit|stagnation_epochs)|\n                weight_multiplier|activation_(functions|steepnesses)(_count)?|(max|min)_(cand|out)_epochs)|\n       total_(connections|neurons)|training_algorithm|train_(error|stop)_function|err(no|str)|\n       quickprop_(decay|mu)|learning_(momentum|rate)|layer_array|activation_(function|steepness)|\n       rprop_((decrease|increase)_factor|delta_(max|min|zero)))\n)\\b",
+          "match": "(?i)\\bfann_((duplicate|length|merge|shuffle|subset)_train_data|scale_(train(_data)?|(input|output)(_train_data)?)|set_(scaling_params|sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|cascade_(num_candidate_groups|candidate_(change_fraction|limit|stagnation_epochs)|output_(change_fraction|stagnation_epochs)|weight_multiplier|activation_(functions|steepnesses)|(m(?:ax|in))_(cand|out)_epochs)|callback|training_algorithm|train_(error|stop)_function|(input|output)_scaling_params|error_log|quickprop_(decay|mu)|weight(_array)?|learning_(momentum|rate)|bit_fail_limit|activation_(function|steepness)(_(hidden|layer|output))?|rprop_((decrease|increase)_factor|delta_(max|min|zero)))|save(_train)?|num_(input|output)_train_data|copy|clear_scaling_params|cascadetrain_on_(file|data)|create_((s(?:parse|hortcut|tandard))(_array)?|train(_from_callback)?|from_file)|test(_data)?|train(_(on_(file|data)|epoch))?|init_weights|descale_(input|output|train)|destroy(_train)?|print_error|run|reset_(MSE|err(no|str))|read_train_from_file|randomize_weights|get_(sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|num_(input|output|layers)|network_type|MSE|connection_(array|rate)|bias_array|bit_fail(_limit)?|cascade_(num_(candidate(?:s|_groups))|(candidate|output)_(change_fraction|limit|stagnation_epochs)|weight_multiplier|activation_(functions|steepnesses)(_count)?|(m(?:ax|in))_(cand|out)_epochs)|total_(connections|neurons)|training_algorithm|train_(error|stop)_function|err(no|str)|quickprop_(decay|mu)|learning_(momentum|rate)|layer_array|activation_(function|steepness)|rprop_((decrease|increase)_factor|delta_(max|min|zero))))\\b",
           "name": "support.function.fann.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  symlink|stat|set_file_buffer|chown|chgrp|chmod|copy|clearstatcache|touch|tempnam|tmpfile|\n  is_(dir|(uploaded_)?file|executable|link|readable|writ(e)?able)|disk_(free|total)_space|diskfreespace|\n  dirname|delete|unlink|umask|pclose|popen|pathinfo|parse_ini_(file|string)|fscanf|fstat|fseek|fnmatch|\n  fclose|ftell|ftruncate|file(size|[acm]time|type|inode|owner|perms|group)?|file_(exists|(get|put)_contents)|\n  f(open|puts|putcsv|passthru|eof|flush|write|lock|read|gets(s)?|getc(sv)?)|lstat|lchown|lchgrp|link(info)?|\n  rename|rewind|read(file|link)|realpath(_cache_(get|size))?|rmdir|glob|move_uploaded_file|mkdir|basename\n)\\b",
+          "match": "(?i)\\b(symlink|stat|set_file_buffer|chown|chgrp|chmod|copy|clearstatcache|touch|tempnam|tmpfile|is_(dir|(uploaded_)?file|executable|link|readable|writ(e)?able)|disk_(free|total)_space|diskfreespace|dirname|delete|unlink|umask|pclose|popen|pathinfo|parse_ini_(file|string)|fscanf|fstat|fseek|fnmatch|fclose|ftell|ftruncate|file(size|[acm]time|type|inode|owner|perms|group)?|file_(exists|(get|put)_contents)|f(open|puts|putcsv|passthru|eof|flush|write|lock|read|gets(s)?|getc(sv)?)|lstat|lchown|lchgrp|link(info)?|rename|rewind|read(file|link)|realpath(_cache_(get|size))?|rmdir|glob|move_uploaded_file|mkdir|basename)\\b",
           "name": "support.function.file.php"
         },
         {
@@ -3461,7 +3502,7 @@
           "name": "support.function.gettext.php"
         },
         {
-          "match": "(?xi)\\b\ngmp_(\n  scan[01]|strval|sign|sub|setbit|sqrt(rem)?|hamdist|neg|nextprime|com|clrbit|cmp|testbit|\n  intval|init|invert|import|or|div(exact)?|div_(q|qr|r)|jacobi|popcount|pow(m)?|perfect_square|\n  prob_prime|export|fact|legendre|and|add|abs|root(rem)?|random(_(bits|range))?|gcd(ext)?|xor|mod|mul\n)\\b",
+          "match": "(?i)\\bgmp_(scan[01]|strval|sign|sub|setbit|sqrt(rem)?|hamdist|neg|nextprime|com|clrbit|cmp|testbit|intval|init|invert|import|or|div(exact)?|div_(q|qr|r)|jacobi|popcount|pow(m)?|perfect_square|prob_prime|export|fact|legendre|and|add|abs|root(rem)?|random(_(bits|range))?|gcd(ext)?|xor|mod|mul)\\b",
           "name": "support.function.gmp.php"
         },
         {
@@ -3469,7 +3510,7 @@
           "name": "support.function.hash.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  http_(support|send_(status|stream|content_(disposition|type)|data|file|last_modified)|head|\n        negotiate_(charset|content_type|language)|chunked_decode|cache_(etag|last_modified)|throttle|\n        inflate|deflate|date|post_(data|fields)|put_(data|file|stream)|persistent_handles_(count|clean|ident)|\n        parse_(cookie|headers|message|params)|redirect|request(_(method_(exists|name|(un)?register)|body_encode))?|\n        get(_request_(headers|body(_stream)?))?|match_(etag|modified|request_header)|build_(cookie|str|url))|\n  ob_(etag|deflate|inflate)handler\n)\\b",
+          "match": "(?i)\\b(http_(support|send_(status|stream|content_(disposition|type)|data|file|last_modified)|head|negotiate_(charset|content_type|language)|chunked_decode|cache_(etag|last_modified)|throttle|inflate|deflate|date|post_(data|fields)|put_(data|file|stream)|persistent_handles_(count|clean|ident)|parse_(cookie|headers|message|params)|redirect|request(_(method_(exists|name|(un)?register)|body_encode))?|get(_request_(headers|body(_stream)?))?|match_(etag|modified|request_header)|build_(cookie|str|url))|ob_(etag|deflate|inflate)handler)\\b",
           "name": "support.function.http.php"
         },
         {
@@ -3477,23 +3518,23 @@
           "name": "support.function.iconv.php"
         },
         {
-          "match": "(?i)\\biis_((start|stop)_(service|server)|set_(script_map|server_rights|dir_security|app_settings)|(add|remove)_server|get_(script_map|service_state|server_(rights|by_(comment|path))|dir_security))\\b",
+          "match": "(?i)\\biis_((st(?:art|op))_(serv(?:ice|er))|set_(script_map|server_rights|dir_security|app_settings)|(add|remove)_server|get_(script_map|service_state|server_(rights|by_(comment|path))|dir_security))\\b",
           "name": "support.function.iisfunc.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  iptc(embed|parse)|(jpeg|png)2wbmp|gd_info|getimagesize(fromstring)?|\n  image(s[xy]|scale|(char|string)(up)?|set(style|thickness|tile|interpolation|pixel|brush)|savealpha|\n        convolution|copy(resampled|resized|merge(gray)?)?|colors(forindex|total)|\n        color(set|closest(alpha|hwb)?|transparent|deallocate|(allocate|exact|resolve)(alpha)?|at|match)|\n        crop(auto)?|create(truecolor|from(string|jpeg|png|wbmp|webp|gif|gd(2(part)?)?|xpm|xbm))?|\n        types|ttf(bbox|text)|truecolortopalette|istruecolor|interlace|2wbmp|destroy|dashedline|jpeg|\n        _type_to_(extension|mime_type)|ps(slantfont|text|(encode|extend|free|load)font|bbox)|png|polygon|\n        palette(copy|totruecolor)|ellipse|ft(text|bbox)|filter|fill|filltoborder|\n        filled(arc|ellipse|polygon|rectangle)|font(height|width)|flip|webp|wbmp|line|loadfont|layereffect|\n        antialias|affine(matrix(concat|get))?|alphablending|arc|rotate|rectangle|gif|gd(2)?|gammacorrect|\n        grab(screen|window)|xbm)\n)\\b",
+          "match": "(?i)\\b(iptc(embed|parse)|(jpeg|png)2wbmp|gd_info|getimagesize(fromstring)?|image(s[xy]|scale|(char|string)(up)?|set(style|thickness|tile|interpolation|pixel|brush)|savealpha|convolution|copy(resampled|resized|merge(gray)?)?|colors(forindex|total)|color(set|closest(alpha|hwb)?|transparent|deallocate|(allocate|exact|resolve)(alpha)?|at|match)|crop(auto)?|create(truecolor|from(string|jpeg|png|wbmp|webp|gif|gd(2(part)?)?|xpm|xbm))?|types|ttf(bbox|text)|truecolortopalette|istruecolor|interlace|2wbmp|destroy|dashedline|jpeg|_type_to_(extension|mime_type)|ps(slantfont|text|(encode|extend|free|load)font|bbox)|png|polygon|palette(copy|totruecolor)|ellipse|ft(text|bbox)|filter|fill|filltoborder|filled(arc|ellipse|polygon|rectangle)|font(height|width)|flip|webp|wbmp|line|loadfont|layereffect|antialias|affine(matrix(concat|get))?|alphablending|arc|rotate|rectangle|gif|gd(2)?|gammacorrect|grab(screen|window)|xbm))\\b",
           "name": "support.function.image.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  sys_get_temp_dir|set_(time_limit|include_path|magic_quotes_runtime)|cli_(get|set)_process_title|\n  ini_(alter|get(_all)?|restore|set)|zend_(thread_id|version|logo_guid)|dl|php(credits|info|version)|\n  php_(sapi_name|ini_(scanned_files|loaded_file)|uname|logo_guid)|putenv|extension_loaded|version_compare|\n  assert(_options)?|restore_include_path|gc_(collect_cycles|disable|enable(d)?)|getopt|\n  get_(cfg_var|current_user|defined_constants|extension_funcs|include_path|included_files|loaded_extensions|\n       magic_quotes_(gpc|runtime)|required_files|resources)|\n  get(env|lastmod|rusage|my(inode|[gup]id))|\n  memory_get_(peak_)?usage|main|magic_quotes_runtime\n)\\b",
+          "match": "(?i)\\b(sys_get_temp_dir|set_(time_limit|include_path|magic_quotes_runtime)|cli_(get|set)_process_title|ini_(alter|get(_all)?|restore|set)|zend_(thread_id|version|logo_guid)|dl|php(credits|info|version)|php_(sapi_name|ini_(scanned_files|loaded_file)|uname|logo_guid)|putenv|extension_loaded|version_compare|assert(_options)?|restore_include_path|gc_(collect_cycles|disable|enable(d)?)|getopt|get_(cfg_var|current_user|defined_constants|extension_funcs|include_path|included_files|loaded_extensions|magic_quotes_(gpc|runtime)|required_files|resources)|get(env|lastmod|rusage|my(inode|[gup]id))|memory_get_(peak_)?usage|main|magic_quotes_runtime)\\b",
           "name": "support.function.info.php"
         },
         {
-          "match": "(?xi)\\b\nibase_(\n  set_event_handler|service_(attach|detach)|server_info|num_(fields|params)|name_result|connect|\n  commit(_ret)?|close|trans|delete_user|drop_db|db_info|pconnect|param_info|prepare|err(code|msg)|\n  execute|query|field_info|fetch_(assoc|object|row)|free_(event_handler|query|result)|wait_event|\n  add_user|affected_rows|rollback(_ret)?|restore|gen_id|modify_user|maintain_db|backup|\n  blob_(cancel|close|create|import|info|open|echo|add|get)\n)\\b",
+          "match": "(?i)\\bibase_(set_event_handler|service_(attach|detach)|server_info|num_(fields|params)|name_result|connect|commit(_ret)?|close|trans|delete_user|drop_db|db_info|pconnect|param_info|prepare|err(code|msg)|execute|query|field_info|fetch_(assoc|object|row)|free_(event_handler|query|result)|wait_event|add_user|affected_rows|rollback(_ret)?|restore|gen_id|modify_user|maintain_db|backup|blob_(cancel|close|create|import|info|open|echo|add|get))\\b",
           "name": "support.function.interbase.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  normalizer_(normalize|is_normalized)|idn_to_(unicode|utf8|ascii)|\n  numfmt_(set_(symbol|(text_)?attribute|pattern)|create|(parse|format)(_currency)?|\n          get_(symbol|(text_)?attribute|pattern|error_(code|message)|locale))|\n  collator_(sort(_with_sort_keys)?|set_(attribute|strength)|compare|create|asort|\n            get_(strength|sort_key|error_(code|message)|locale|attribute))|\n  transliterator_(create(_(inverse|from_rules))?|transliterate|list_ids|get_error_(code|message))|\n  intl(cal|tz)_get_error_(code|message)|intl_(is_failure|error_name|get_error_(code|message))|\n  datefmt_(set_(calendar|lenient|pattern|timezone(_id)?)|create|is_lenient|parse|format(_object)?|localtime|\n           get_(calendar(_object)?|time(type|zone(_id)?)|datetype|pattern|error_(code|message)|locale))|\n  locale_(set_default|compose|canonicalize|parse|filter_matches|lookup|accept_from_http|\n          get_(script|display_(script|name|variant|language|region)|default|primary_language|keywords|all_variants|region))|\n  resourcebundle_(create|count|locales|get(_(error_(code|message)))?)|\n  grapheme_(str(i?str|r?i?pos|len)|substr|extract)|\n  msgfmt_(set_pattern|create|(format|parse)(_message)?|get_(pattern|error_(code|message)|locale))\n)\\b",
+          "match": "(?i)\\b(normalizer_(normalize|is_normalized)|idn_to_(unicode|utf8|ascii)|numfmt_(set_(symbol|(text_)?attribute|pattern)|create|(parse|format)(_currency)?|get_(symbol|(text_)?attribute|pattern|error_(code|message)|locale))|collator_(sort(_with_sort_keys)?|set_(attribute|strength)|compare|create|asort|get_(strength|sort_key|error_(code|message)|locale|attribute))|transliterator_(create(_(inverse|from_rules))?|transliterate|list_ids|get_error_(code|message))|intl(cal|tz)_get_error_(code|message)|intl_(is_failure|error_name|get_error_(code|message))|datefmt_(set_(calendar|lenient|pattern|timezone(_id)?)|create|is_lenient|parse|format(_object)?|localtime|get_(calendar(_object)?|time(type|zone(_id)?)|datetype|pattern|error_(code|message)|locale))|locale_(set_default|compose|canonicalize|parse|filter_matches|lookup|accept_from_http|get_(script|display_(script|name|variant|language|region)|default|primary_language|keywords|all_variants|region))|resourcebundle_(create|count|locales|get(_(error_(code|message)))?)|grapheme_(str(i?str|r?i?pos|len)|substr|extract)|msgfmt_(set_pattern|create|(format|parse)(_message)?|get_(pattern|error_(code|message)|locale)))\\b",
           "name": "support.function.intl.php"
         },
         {
@@ -3501,7 +3542,7 @@
           "name": "support.function.json.php"
         },
         {
-          "match": "(?xi)\\b\nldap_(\n  start|tls|sort|search|sasl_bind|set_(option|rebind_proc)|(first|next)_(attribute|entry|reference)|\n  connect|control_paged_result(_response)?|count_entries|compare|close|t61_to_8859|8859_to_t61|\n  dn2ufn|delete|unbind|parse_(reference|result)|escape|errno|err2str|error|explode_dn|bind|\n  free_result|list|add|rename|read|get_(option|dn|entries|values(_len)?|attributes)|modify(_batch)?|\n  mod_(add|del|replace)\n)\\b",
+          "match": "(?i)\\bldap_(start|tls|sort|search|sasl_bind|set_(option|rebind_proc)|(first|next)_(attribute|entry|reference)|connect|control_paged_result(_response)?|count_entries|compare|close|t61_to_8859|8859_to_t61|dn2ufn|delete|unbind|parse_(re(?:ference|sult))|escape|errno|err2str|error|explode_dn|bind|free_result|list|add|rename|read|get_(option|dn|entries|values(_len)?|attributes)|modify(_batch)?|mod_(add|del|replace))\\b",
           "name": "support.function.ldap.php"
         },
         {
@@ -3513,15 +3554,15 @@
           "name": "support.function.mail.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  (a)?(cos|sin|tan)(h)?|sqrt|srand|hypot|hexdec|ceil|is_(nan|(in)?finite)|octdec|dec(hex|oct|bin)|deg2rad|\n  pi|pow|exp(m1)?|floor|fmod|lcg_value|log(1(p|0))?|atan2|abs|round|rand|rad2deg|getrandmax|\n  mt_(srand|rand|getrandmax)|max|min|bindec|base_convert\n)\\b",
+          "match": "(?i)\\b((a)?(cos|sin|tan)(h)?|sqrt|srand|hypot|hexdec|ceil|is_(nan|(in)?finite)|octdec|dec(hex|oct|bin)|deg2rad|pi|pow|exp(m1)?|floor|fmod|lcg_value|log(1([p0]))?|atan2|abs|round|rand|rad2deg|getrandmax|mt_(srand|rand|getrandmax)|max|min|bindec|base_convert)\\b",
           "name": "support.function.math.php"
         },
         {
-          "match": "(?xi)\\b\nmb_(\n  str(cut|str|to(lower|upper)|istr|ipos|imwidth|pos|width|len|rchr|richr|ripos|rpos)|\n  substitute_character|substr(_count)?|split|send_mail|http_(input|output)|check_encoding|\n  convert_(case|encoding|kana|variables)|internal_encoding|output_handler|decode_(numericentity|mimeheader)|\n  detect_(encoding|order)|parse_str|preferred_mime_name|encoding_aliases|encode_(numericentity|mimeheader)|\n  ereg(i(_replace)?)?|ereg_(search(_(get(pos|regs)|init|regs|(set)?pos))?|replace(_callback)?|match)|\n  list_encodings|language|regex_(set_options|encoding)|get_info\n)\\b",
+          "match": "(?i)\\bmb_(str(cut|str|to(lower|upper)|istr|ipos|imwidth|pos|width|len|rchr|richr|ripos|rpos)|substitute_character|substr(_count)?|split|send_mail|http_(input|output)|check_encoding|convert_(case|encoding|kana|variables)|internal_encoding|output_handler|decode_(numericentity|mimeheader)|detect_(encoding|order)|parse_str|preferred_mime_name|encoding_aliases|encode_(numericentity|mimeheader)|ereg(i(_replace)?)?|ereg_(search(_(get(pos|regs)|init|regs|(set)?pos))?|replace(_callback)?|match)|list_encodings|language|regex_(set_options|encoding)|get_info)\\b",
           "name": "support.function.mbstring.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  mcrypt_(\n    cfb|create_iv|cbc|ofb|decrypt|encrypt|ecb|list_(algorithms|modes)|generic(_((de)?init|end))?|\n    enc_(self_test|is_block_(algorithm|algorithm_mode|mode)|\n    get_(supported_key_sizes|(block|iv|key)_size|(algorithms|modes)_name))|\n    get_(cipher_name|(block|iv|key)_size)|\n    module_(close|self_test|is_block_(algorithm|algorithm_mode|mode)|open|\n            get_(supported_key_sizes|algo_(block|key)_size)))|\n  mdecrypt_generic\n)\\b",
+          "match": "(?i)\\b(m(?:crypt_(cfb|create_iv|cbc|ofb|decrypt|encrypt|ecb|list_(algorithms|modes)|generic(_((de)?init|end))?|enc_(self_test|is_block_(algorithm|algorithm_mode|mode)|get_(supported_key_sizes|(block|iv|key)_size|(algorithms|modes)_name))|get_(cipher_name|(block|iv|key)_size)|module_(close|self_test|is_block_(algorithm|algorithm_mode|mode)|open|get_(supported_key_sizes|algo_(block|key)_size)))|decrypt_generic))\\b",
           "name": "support.function.mcrypt.php"
         },
         {
@@ -3537,11 +3578,11 @@
           "name": "support.function.mongo.php"
         },
         {
-          "match": "(?xi)\\b\nmysql_(\n  stat|set_charset|select_db|num_(fields|rows)|connect|client_encoding|close|create_db|escape_string|\n  thread_id|tablename|insert_id|info|data_seek|drop_db|db_(name|query)|unbuffered_query|pconnect|ping|\n  errno|error|query|field_(seek|name|type|table|flags|len)|fetch_(object|field|lengths|assoc|array|row)|\n  free_result|list_(tables|dbs|processes|fields)|affected_rows|result|real_escape_string|\n  get_(client|host|proto|server)_info\n)\\b",
+          "match": "(?i)\\bmysql_(stat|set_charset|select_db|num_(fields|rows)|connect|client_encoding|close|create_db|escape_string|thread_id|tablename|insert_id|info|data_seek|drop_db|db_(name|query)|unbuffered_query|pconnect|ping|errno|error|query|field_(seek|name|type|table|flags|len)|fetch_(object|field|lengths|assoc|array|row)|free_result|list_(tables|dbs|processes|fields)|affected_rows|result|real_escape_string|get_(client|host|proto|server)_info)\\b",
           "name": "support.function.mysql.php"
         },
         {
-          "match": "(?xi)\\b\nmysqli_(\n  ssl_set|store_result|stat|send_(query|long_data)|set_(charset|opt|local_infile_(default|handler))|\n  stmt_(store_result|send_long_data|next_result|close|init|data_seek|prepare|execute|fetch|free_result|\n        attr_(get|set)|result_metadata|reset|get_(result|warnings)|more_results|bind_(param|result))|\n  select_db|slave_query|savepoint|next_result|change_user|character_set_name|connect|commit|\n  client_encoding|close|thread_safe|init|options|(enable|disable)_(reads_from_master|rpl_parse)|\n  dump_debug_info|debug|data_seek|use_result|ping|poll|param_count|prepare|escape_string|execute|\n  embedded_server_(start|end)|kill|query|field_seek|free_result|autocommit|rollback|report|refresh|\n  fetch(_(object|fields|field(_direct)?|assoc|all|array|row))?|rpl_(parse_enabled|probe|query_type)|\n  release_savepoint|reap_async_query|real_(connect|escape_string|query)|more_results|multi_query|\n  get_(charset|connection_stats|client_(stats|info|version)|cache_stats|warnings|links_stats|metadata)|\n  master_query|bind_(param|result)|begin_transaction\n)\\b",
+          "match": "(?i)\\bmysqli_(ssl_set|store_result|stat|send_(query|long_data)|set_(charset|opt|local_infile_(default|handler))|stmt_(store_result|send_long_data|next_result|close|init|data_seek|prepare|execute|fetch|free_result|attr_(get|set)|result_metadata|reset|get_(result|warnings)|more_results|bind_(param|result))|select_db|slave_query|savepoint|next_result|change_user|character_set_name|connect|commit|client_encoding|close|thread_safe|init|options|(enable|disable)_(r(?:eads_from_master|pl_parse))|dump_debug_info|debug|data_seek|use_result|ping|poll|param_count|prepare|escape_string|execute|embedded_server_(start|end)|kill|query|field_seek|free_result|autocommit|rollback|report|refresh|fetch(_(object|fields|field(_direct)?|assoc|all|array|row))?|rpl_(parse_enabled|probe|query_type)|release_savepoint|reap_async_query|real_(connect|escape_string|query)|more_results|multi_query|get_(charset|connection_stats|client_(stats|info|version)|cache_stats|warnings|links_stats|metadata)|master_query|bind_(param|result)|begin_transaction)\\b",
           "name": "support.function.mysqli.php"
         },
         {
@@ -3561,7 +3602,7 @@
           "name": "support.function.mysqlnd-uh.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  syslog|socket_(set_(blocking|timeout)|get_status)|set(raw)?cookie|http_response_code|openlog|\n  headers_(list|sent)|header(_(register_callback|remove))?|checkdnsrr|closelog|inet_(ntop|pton)|ip2long|\n  openlog|dns_(check_record|get_(record|mx))|define_syslog_variables|(p)?fsockopen|long2ip|\n  get(servby(name|port)|host(name|by(name(l)?|addr))|protoby(name|number)|mxrr)\n)\\b",
+          "match": "(?i)\\b(syslog|socket_(set_(blocking|timeout)|get_status)|set(raw)?cookie|http_response_code|openlog|headers_(list|sent)|header(_(re(?:gister_callback|move)))?|checkdnsrr|closelog|inet_(ntop|pton)|ip2long|openlog|dns_(check_record|get_(record|mx))|define_syslog_variables|(p)?fsockopen|long2ip|get(servby(name|port)|host(name|by(name(l)?|addr))|protoby(n(?:ame|umber))|mxrr))\\b",
           "name": "support.function.network.php"
         },
         {
@@ -3569,7 +3610,7 @@
           "name": "support.function.nsapi.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  oci(statementtype|setprefetch|serverversion|savelob(file)?|numcols|new(collection|cursor|descriptor)|nlogon|\n      column(scale|size|name|type(raw)?|isnull|precision)|coll(size|trim|assign(elem)?|append|getelem|max)|commit|\n      closelob|cancel|internaldebug|definebyname|plogon|parse|error|execute|fetch(statement|into)?|\n      free(statement|collection|cursor|desc)|write(temporarylob|lobtofile)|loadlob|log(on|off)|rowcount|rollback|\n      result|bindbyname)|\n  oci_(statement_type|set_(client_(info|identifier)|prefetch|edition|action|module_name)|server_version|\n       num_(fields|rows)|new_(connect|collection|cursor|descriptor)|connect|commit|client_version|close|cancel|\n       internal_debug|define_by_name|pconnect|password_change|parse|error|execute|bind_(array_)?by_name|\n       field_(scale|size|name|type(_raw)?|is_null|precision)|fetch(_(object|assoc|all|array|row))?|\n       free_(statement|descriptor)|lob_(copy|is_equal)|rollback|result|get_implicit_resultset)\n)\\b",
+          "match": "(?i)\\b(oci(?:(statementtype|setprefetch|serverversion|savelob(file)?|numcols|new(collection|cursor|descriptor)|nlogon|column(scale|size|name|type(raw)?|isnull|precision)|coll(size|trim|assign(elem)?|append|getelem|max)|commit|closelob|cancel|internaldebug|definebyname|plogon|parse|error|execute|fetch(statement|into)?|free(statement|collection|cursor|desc)|write(temporarylob|lobtofile)|loadlob|log(o(?:n|ff))|rowcount|rollback|result|bindbyname)|_(statement_type|set_(client_(i(?:nfo|dentifier))|prefetch|edition|action|module_name)|server_version|num_(fields|rows)|new_(connect|collection|cursor|descriptor)|connect|commit|client_version|close|cancel|internal_debug|define_by_name|pconnect|password_change|parse|error|execute|bind_(array_)?by_name|field_(scale|size|name|type(_raw)?|is_null|precision)|fetch(_(object|assoc|all|array|row))?|free_(statement|descriptor)|lob_(copy|is_equal)|rollback|result|get_implicit_resultset)))\\b",
           "name": "support.function.oci8.php"
         },
         {
@@ -3577,11 +3618,11 @@
           "name": "support.function.opcache.php"
         },
         {
-          "match": "(?xi)\\b\nopenssl_(\n  sign|spki_(new|export(_challenge)?|verify)|seal|csr_(sign|new|export(_to_file)?|get_(subject|public_key))|\n  cipher_iv_length|open|dh_compute_key|digest|decrypt|public_(decrypt|encrypt)|encrypt|error_string|\n  pkcs12_(export(_to_file)?|read)|pkcs7_(sign|decrypt|encrypt|verify)|verify|free_key|random_pseudo_bytes|\n  pkey_(new|export(_to_file)?|free|get_(details|public|private))|private_(decrypt|encrypt)|pbkdf2|\n  get_((cipher|md)_methods|cert_locations|(public|private)key)|\n  x509_(check_private_key|checkpurpose|parse|export(_to_file)?|fingerprint|free|read)\n)\\b",
+          "match": "(?i)\\bopenssl_(sign|spki_(new|export(_challenge)?|verify)|seal|csr_(sign|new|export(_to_file)?|get_(subject|public_key))|cipher_iv_length|open|dh_compute_key|digest|decrypt|public_(decrypt|encrypt)|encrypt|error_string|pkcs12_(export(_to_file)?|read)|pkcs7_(sign|decrypt|encrypt|verify)|verify|free_key|random_pseudo_bytes|pkey_(new|export(_to_file)?|free|get_(details|public|private))|private_(decrypt|encrypt)|pbkdf2|get_((cipher|md)_methods|cert_locations|(p(?:ublic|rivate))key)|x509_(check_private_key|checkpurpose|parse|export(_to_file)?|fingerprint|free|read))\\b",
           "name": "support.function.openssl.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  output_(add_rewrite_var|reset_rewrite_vars)|flush|\n  ob_(start|clean|implicit_flush|end_(clean|flush)|flush|list_handlers|gzhandler|\n      get_(status|contents|clean|flush|length|level))\n)\\b",
+          "match": "(?i)\\b(output_(add_rewrite_var|reset_rewrite_vars)|flush|ob_(start|clean|implicit_flush|end_(clean|flush)|flush|list_handlers|gzhandler|get_(status|contents|clean|flush|length|level)))\\b",
           "name": "support.function.output.php"
         },
         {
@@ -3589,11 +3630,11 @@
           "name": "support.function.password.php"
         },
         {
-          "match": "(?xi)\\b\npcntl_(\n  strerror|signal(_dispatch)?|sig(timedwait|procmask|waitinfo)|setpriority|errno|exec|fork|\n  w(stopsig|termsig|if(stopped|signaled|exited))|wait(pid)?|alarm|getpriority|get_last_error\n)\\b",
+          "match": "(?i)\\bpcntl_(strerror|signal(_dispatch)?|sig(timedwait|procmask|waitinfo)|setpriority|errno|exec|fork|w(stopsig|termsig|if(stopped|signaled|exited))|wait(pid)?|alarm|getpriority|get_last_error)\\b",
           "name": "support.function.pcntl.php"
         },
         {
-          "match": "(?xi)\\b\npg_(\n  socket|send_(prepare|execute|query(_params)?)|set_(client_encoding|error_verbosity)|select|host|\n  num_(fields|rows)|consume_input|connection_(status|reset|busy)|connect(_poll)?|convert|copy_(from|to)|\n  client_encoding|close|cancel_query|tty|transaction_status|trace|insert|options|delete|dbname|untrace|\n  unescape_bytea|update|pconnect|ping|port|put_line|parameter_status|prepare|version|query(_params)?|\n  escape_(string|identifier|literal|bytea)|end_copy|execute|flush|free_result|last_(notice|error|oid)|\n  field_(size|num|name|type(_oid)?|table|is_null|prtlen)|affected_rows|result_(status|seek|error(_field)?)|\n  fetch_(object|assoc|all(_columns)?|array|row|result)|get_(notify|pid|result)|meta_data|\n  lo_(seek|close|create|tell|truncate|import|open|unlink|export|write|read(_all)?)|\n)\\b",
+          "match": "(?i)\\bpg_(socket|send_(prepare|execute|query(_params)?)|set_(client_encoding|error_verbosity)|select|host|num_(fields|rows)|consume_input|connection_(status|reset|busy)|connect(_poll)?|convert|copy_(from|to)|client_encoding|close|cancel_query|tty|transaction_status|trace|insert|options|delete|dbname|untrace|unescape_bytea|update|pconnect|ping|port|put_line|parameter_status|prepare|version|query(_params)?|escape_(string|identifier|literal|bytea)|end_copy|execute|flush|free_result|last_(notice|error|oid)|field_(size|num|name|type(_oid)?|table|is_null|prtlen)|affected_rows|result_(status|seek|error(_field)?)|fetch_(object|assoc|all(_columns)?|array|row|result)|get_(notify|pid|result)|meta_data|lo_(seek|close|create|tell|truncate|import|open|unlink|export|write|read(_all)?)|)\\b",
           "name": "support.function.pgsql.php"
         },
         {
@@ -3605,19 +3646,19 @@
           "name": "support.function.php_dom.php"
         },
         {
-          "match": "(?xi)\\b\nftp_(\n  ssl_connect|systype|site|size|set_option|nlist|nb_(continue|f?(put|get))|ch(dir|mod)|connect|cdup|close|\n  delete|put|pwd|pasv|exec|quit|f(put|get)|login|alloc|rename|raw(list)?|rmdir|get(_option)?|mdtm|mkdir\n)\\b",
+          "match": "(?i)\\bftp_(ssl_connect|systype|site|size|set_option|nlist|nb_(continue|f?(put|get))|ch(dir|mod)|connect|cdup|close|delete|put|pwd|pasv|exec|quit|f(put|get)|login|alloc|rename|raw(list)?|rmdir|get(_option)?|mdtm|mkdir)\\b",
           "name": "support.function.php_ftp.php"
         },
         {
-          "match": "(?xi)\\b\nimap_(\n  (create|delete|list|rename|scan)(mailbox)?|status|sort|subscribe|set_quota|set(flag_full|acl)|search|savebody|\n  num_(recent|msg)|check|close|clearflag_full|thread|timeout|open|header(info)?|headers|append|alerts|reopen|\n  8bit|unsubscribe|undelete|utf7_(decode|encode)|utf8|uid|ping|errors|expunge|qprint|gc|\n  fetch(structure|header|text|mime|body)|fetch_overview|lsub|list(scan|subscribed)|last_error|\n  rfc822_(parse_(headers|adrlist)|write_address)|get(subscribed|acl|mailboxes)|get_quota(root)?|\n  msgno|mime_header_decode|mail_(copy|compose|move)|mail|mailboxmsginfo|binary|body(struct)?|base64\n)\\b",
+          "match": "(?i)\\bimap_((create|delete|list|rename|scan)(mailbox)?|status|sort|subscribe|set_quota|set(flag_full|acl)|search|savebody|num_(recent|msg)|check|close|clearflag_full|thread|timeout|open|header(info)?|headers|append|alerts|reopen|8bit|unsubscribe|undelete|utf7_(decode|encode)|utf8|uid|ping|errors|expunge|qprint|gc|fetch(structure|header|text|mime|body)|fetch_overview|lsub|list(s(?:can|ubscribed))|last_error|rfc822_(parse_(headers|adrlist)|write_address)|get(subscribed|acl|mailboxes)|get_quota(root)?|msgno|mime_header_decode|mail_(copy|compose|move)|mail|mailboxmsginfo|binary|body(struct)?|base64)\\b",
           "name": "support.function.php_imap.php"
         },
         {
-          "match": "(?xi)\\b\nmssql_(\n  select_db|num_(fields|rows)|next_result|connect|close|init|data_seek|pconnect|execute|query|\n  field_(seek|name|type|length)|fetch_(object|field|assoc|array|row|batch)|free_(statement|result)|\n  rows_affected|result|guid_string|get_last_message|min_(error|message)_severity|bind\n)\\b",
+          "match": "(?i)\\bmssql_(select_db|num_(fields|rows)|next_result|connect|close|init|data_seek|pconnect|execute|query|field_(seek|name|type|length)|fetch_(object|field|assoc|array|row|batch)|free_(statement|result)|rows_affected|result|guid_string|get_last_message|min_(error|message)_severity|bind)\\b",
           "name": "support.function.php_mssql.php"
         },
         {
-          "match": "(?xi)\\b\nodbc_(\n  statistics|specialcolumns|setoption|num_(fields|rows)|next_result|connect|columns|columnprivileges|commit|\n  cursor|close(_all)?|tables|tableprivileges|do|data_source|pconnect|primarykeys|procedures|procedurecolumns|\n  prepare|error(msg)?|exec(ute)?|field_(scale|num|name|type|precision|len)|foreignkeys|free_result|\n  fetch_(into|object|array|row)|longreadlen|autocommit|rollback|result(_all)?|gettypeinfo|binmode\n)\\b",
+          "match": "(?i)\\bodbc_(statistics|specialcolumns|setoption|num_(fields|rows)|next_result|connect|columns|columnprivileges|commit|cursor|close(_all)?|tables|tableprivileges|do|data_source|pconnect|primarykeys|procedures|procedurecolumns|prepare|error(msg)?|exec(ute)?|field_(scale|num|name|type|precision|len)|foreignkeys|free_result|fetch_(into|object|array|row)|longreadlen|autocommit|rollback|result(_all)?|gettypeinfo|binmode)\\b",
           "name": "support.function.php_odbc.php"
         },
         {
@@ -3633,7 +3674,7 @@
           "name": "support.function.php_zip.php"
         },
         {
-          "match": "(?xi)\\b\nposix_(\n  strerror|set(s|e?u|[ep]?g)id|ctermid|ttyname|times|isatty|initgroups|uname|errno|kill|access|\n  get(sid|cwd|uid|pid|ppid|pwnam|pwuid|pgid|pgrp|euid|egid|login|rlimit|gid|grnam|groups|grgid)|\n  get_last_error|mknod|mkfifo\n)\\b",
+          "match": "(?i)\\bposix_(strerror|set(s|e?u|[ep]?g)id|ctermid|ttyname|times|isatty|initgroups|uname|errno|kill|access|get(sid|cwd|uid|pid|ppid|pwnam|pwuid|pgid|pgrp|euid|egid|login|rlimit|gid|grnam|groups|grgid)|get_last_error|mknod|mkfifo)\\b",
           "name": "support.function.posix.php"
         },
         {
@@ -3641,7 +3682,7 @@
           "name": "support.function.proctitle.php"
         },
         {
-          "match": "(?xi)\\b\npspell_(\n  store_replacement|suggest|save_wordlist|new(_(config|personal))?|check|clear_session|\n  config_(save_repl|create|ignore|(data|dict)_dir|personal|runtogether|repl|mode)|add_to_(session|personal)\n)\\b",
+          "match": "(?i)\\bpspell_(store_replacement|suggest|save_wordlist|new(_(config|personal))?|check|clear_session|config_(save_repl|create|ignore|(d(?:ata|ict))_dir|personal|runtogether|repl|mode)|add_to_(session|personal))\\b",
           "name": "support.function.pspell.php"
         },
         {
@@ -3657,11 +3698,11 @@
           "name": "support.function.rrd.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  shm_((get|has|remove|put)_var|detach|attach|remove)|sem_(acquire|release|remove|get)|ftok|\n  msg_((get|remove|set|stat)_queue|send|queue_exists|receive)\n)\\b",
+          "match": "(?i)\\b(shm_((get|has|remove|put)_var|detach|attach|remove)|sem_(acquire|release|remove|get)|ftok|msg_((get|remove|set|stat)_queue|send|queue_exists|receive))\\b",
           "name": "support.function.sem.php"
         },
         {
-          "match": "(?xi)\\b\nsession_(\n  status|start|set_(save_handler|cookie_params)|save_path|name|commit|cache_(expire|limiter)|\n  is_registered|id|destroy|decode|unset|unregister|encode|write_close|abort|reset|register(_shutdown)?|\n  regenerate_id|get_cookie_params|module_name\n)\\b",
+          "match": "(?i)\\bsession_(status|start|set_(save_handler|cookie_params)|save_path|name|commit|cache_(expire|limiter)|is_registered|id|destroy|decode|unset|unregister|encode|write_close|abort|reset|register(_shutdown)?|regenerate_id|get_cookie_params|module_name)\\b",
           "name": "support.function.session.php"
         },
         {
@@ -3673,7 +3714,7 @@
           "name": "support.function.simplexml.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  snmp(walk(oid)?|realwalk|get(next)?|set)|\n  snmp_(set_(valueretrieval|quick_print|enum_print|oid_(numeric_print|output_format))|read_mib|\n        get_(valueretrieval|quick_print))|\n  snmp[23]_(set|walk|real_walk|get(next)?)\n)\\b",
+          "match": "(?i)\\b(snmp(?:(walk(oid)?|realwalk|get(next)?|set)|_(set_(valueretrieval|quick_print|enum_print|oid_(numeric_print|output_format))|read_mib|get_(valueretrieval|quick_print))|[23]_(set|walk|real_walk|get(next)?)))\\b",
           "name": "support.function.snmp.php"
         },
         {
@@ -3681,31 +3722,31 @@
           "name": "support.function.soap.php"
         },
         {
-          "match": "(?xi)\\b\nsocket_(\n  shutdown|strerror|send(to|msg)?|set_((non)?block|option)|select|connect|close|clear_error|bind|\n  create(_(pair|listen))?|cmsg_space|import_stream|write|listen|last_error|accept|recv(from|msg)?|\n  read|get(peer|sock)name|get_option\n)\\b",
+          "match": "(?i)\\bsocket_(shutdown|strerror|send(to|msg)?|set_((non)?block|option)|select|connect|close|clear_error|bind|create(_(pair|listen))?|cmsg_space|import_stream|write|listen|last_error|accept|recv(from|msg)?|read|get(peer|sock)name|get_option)\\b",
           "name": "support.function.sockets.php"
         },
         {
-          "match": "(?xi)\\b\nsqlite_(\n  single_query|seek|has_(more|prev)|num_(fields|rows)|next|changes|column|current|close|\n  create_(aggregate|function)|open|unbuffered_query|udf_(decode|encode)_binary|popen|prev|\n  escape_string|error_string|exec|valid|key|query|field_name|factory|\n  fetch_(string|single|column_types|object|all|array)|lib(encoding|version)|\n  last_(insert_rowid|error)|array_query|rewind|busy_timeout\n)\\b",
+          "match": "(?i)\\bsqlite_(single_query|seek|has_(more|prev)|num_(fields|rows)|next|changes|column|current|close|create_(aggregate|function)|open|unbuffered_query|udf_(decode|encode)_binary|popen|prev|escape_string|error_string|exec|valid|key|query|field_name|factory|fetch_(string|single|column_types|object|all|array)|lib(encoding|version)|last_(insert_rowid|error)|array_query|rewind|busy_timeout)\\b",
           "name": "support.function.sqlite.php"
         },
         {
-          "match": "(?xi)\\b\nsqlsrv_(\n  send_stream_data|server_info|has_rows|num_(fields|rows)|next_result|connect|configure|commit|\n  client_info|close|cancel|prepare|errors|execute|query|field_metadata|fetch(_(array|object))?|\n  free_stmt|rows_affected|rollback|get_(config|field)|begin_transaction\n)\\b",
+          "match": "(?i)\\bsqlsrv_(send_stream_data|server_info|has_rows|num_(fields|rows)|next_result|connect|configure|commit|client_info|close|cancel|prepare|errors|execute|query|field_metadata|fetch(_(array|object))?|free_stmt|rows_affected|rollback|get_(config|field)|begin_transaction)\\b",
           "name": "support.function.sqlsrv.php"
         },
         {
-          "match": "(?xi)\\b\nstats_(\n  harmonic_mean|covariance|standard_deviation|skew|\n  cdf_(noncentral_(chisquare|f)|negative_binomial|chisquare|cauchy|t|uniform|poisson|exponential|f|weibull|\n       logistic|laplace|gamma|binomial|beta)|\n  stat_(noncentral_t|correlation|innerproduct|independent_t|powersum|percentile|paired_t|gennch|binomial_coef)|\n  dens_(normal|negative_binomial|chisquare|cauchy|t|pmf_(hypergeometric|poisson|binomial)|exponential|f|\n        weibull|logistic|laplace|gamma|beta)|\n  den_uniform|variance|kurtosis|absolute_deviation|\n  rand_(setall|phrase_to_seeds|ranf|get_seeds|\n        gen_(noncentral_[ft]|noncenral_chisquare|normal|chisquare|t|int|\n             i(uniform|poisson|binomial(_negative)?)|exponential|f(uniform)?|gamma|beta))\n)\\b",
+          "match": "(?i)\\bstats_(harmonic_mean|covariance|standard_deviation|skew|cdf_(noncentral_(chisquare|f)|negative_binomial|chisquare|cauchy|t|uniform|poisson|exponential|f|weibull|logistic|laplace|gamma|binomial|beta)|stat_(noncentral_t|correlation|innerproduct|independent_t|powersum|percentile|paired_t|gennch|binomial_coef)|dens_(normal|negative_binomial|chisquare|cauchy|t|pmf_(hypergeometric|poisson|binomial)|exponential|f|weibull|logistic|laplace|gamma|beta)|den_uniform|variance|kurtosis|absolute_deviation|rand_(setall|phrase_to_seeds|ranf|get_seeds|gen_(noncentral_[ft]|noncenral_chisquare|normal|chisquare|t|int|i(uniform|poisson|binomial(_negative)?)|exponential|f(uniform)?|gamma|beta)))\\b",
           "name": "support.function.stats.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  set_socket_blocking|\n  stream_(socket_(shutdown|sendto|server|client|pair|enable_crypto|accept|recvfrom|get_name)|\n    set_(chunk_size|timeout|(read|write)_buffer|blocking)|select|notification_callback|supports_lock|\n    context_(set_(option|default|params)|create|get_(options|default|params))|copy_to_stream|is_local|\n    encoding|filter_(append|prepend|register|remove)|wrapper_((un)?register|restore)|\n    resolve_include_path|register_wrapper|get_(contents|transports|filters|wrappers|line|meta_data)|\n    bucket_(new|prepend|append|make_writeable)\n  )\n)\\b",
+          "match": "(?i)\\b(s(?:et_socket_blocking|tream_(socket_(shutdown|sendto|server|client|pair|enable_crypto|accept|recvfrom|get_name)|set_(chunk_size|timeout|(read|write)_buffer|blocking)|select|notification_callback|supports_lock|context_(set_(option|default|params)|create|get_(options|default|params))|copy_to_stream|is_local|encoding|filter_(append|prepend|register|remove)|wrapper_((un)?register|restore)|resolve_include_path|register_wrapper|get_(contents|transports|filters|wrappers|line|meta_data)|bucket_(new|prepend|append|make_writeable))))\\b",
           "name": "support.function.streamsfuncs.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  money_format|md5(_file)?|metaphone|bin2hex|sscanf|sha1(_file)?|\n  str(str|c?spn|n(at)?(case)?cmp|chr|coll|(case)?cmp|to(upper|lower)|tok|tr|istr|pos|pbrk|len|rchr|ri?pos|rev)|\n  str_(getcsv|ireplace|pad|repeat|replace|rot13|shuffle|split|word_count)|\n  strip(c?slashes|os)|strip_tags|similar_text|soundex|substr(_(count|compare|replace))?|setlocale|\n  html(specialchars(_decode)?|entities)|html_entity_decode|hex2bin|hebrev(c)?|number_format|nl2br|nl_langinfo|\n  chop|chunk_split|chr|convert_(cyr_string|uu(decode|encode))|count_chars|crypt|crc32|trim|implode|ord|\n  uc(first|words)|join|parse_str|print(f)?|echo|explode|v?[fs]?printf|quoted_printable_(decode|encode)|\n  quotemeta|wordwrap|lcfirst|[lr]trim|localeconv|levenshtein|addc?slashes|get_html_translation_table\n)\\b",
+          "match": "(?i)\\b(money_format|md5(_file)?|metaphone|bin2hex|sscanf|sha1(_file)?|str(str|c?spn|n(at)?(case)?cmp|chr|coll|(case)?cmp|to(upper|lower)|tok|tr|istr|pos|pbrk|len|rchr|ri?pos|rev)|str_(getcsv|ireplace|pad|repeat|replace|rot13|shuffle|split|word_count)|strip(c?slashes|os)|strip_tags|similar_text|soundex|substr(_(count|compare|replace))?|setlocale|html(specialchars(_decode)?|entities)|html_entity_decode|hex2bin|hebrev(c)?|number_format|nl2br|nl_langinfo|chop|chunk_split|chr|convert_(cyr_string|uu(decode|encode))|count_chars|crypt|crc32|trim|implode|ord|uc(first|words)|join|parse_str|print(f)?|echo|explode|v?[fs]?printf|quoted_printable_(decode|encode)|quotemeta|wordwrap|lcfirst|[lr]trim|localeconv|levenshtein|addc?slashes|get_html_translation_table)\\b",
           "name": "support.function.string.php"
         },
         {
-          "match": "(?xi)\\b\nsybase_(\n  set_message_handler|select_db|num_(fields|rows)|connect|close|deadlock_retry_count|data_seek|\n  unbuffered_query|pconnect|query|field_seek|fetch_(object|field|assoc|array|row)|free_result|\n  affected_rows|result|get_last_message|min_(client|error|message|server)_severity\n)\\b",
+          "match": "(?i)\\bsybase_(set_message_handler|select_db|num_(fields|rows)|connect|close|deadlock_retry_count|data_seek|unbuffered_query|pconnect|query|field_seek|fetch_(object|field|assoc|array|row)|free_result|affected_rows|result|get_last_message|min_(client|error|message|server)_severity)\\b",
           "name": "support.function.sybase.php"
         },
         {
@@ -3713,7 +3754,7 @@
           "name": "support.function.taint.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  tidy_((get|set)opt|set_encoding|save_config|config_count|clean_repair|is_(xhtml|xml)|diagnose|\n        (access|error|warning)_count|load_config|reset_config|(parse|repair)_(string|file)|\n        get_(status|html(_ver)?|head|config|output|opt_doc|root|release|body))|\n  ob_tidyhandler\n)\\b",
+          "match": "(?i)\\b(tidy_((get|set)opt|set_encoding|save_config|config_count|clean_repair|is_(x(?:html|ml))|diagnose|(access|error|warning)_count|load_config|reset_config|(parse|repair)_(string|file)|get_(status|html(_ver)?|head|config|output|opt_doc|root|release|body))|ob_tidyhandler)\\b",
           "name": "support.function.tidy.php"
         },
         {
@@ -3721,7 +3762,7 @@
           "name": "support.function.tokenizer.php"
         },
         {
-          "match": "(?xi)\\b\ntrader_(\n  stoch(f|r|rsi)?|stddev|sin(h)?|sum|sub|set_(compat|unstable_period)|sqrt|sar(ext)?|sma|\n  ht_(sine|trend(line|mode)|dc(period|phase)|phasor)|natr|cci|cos(h)?|correl|\n  cdl(shootingstar|shortline|sticksandwich|stalledpattern|spinningtop|separatinglines|\n      hikkake(mod)?|highwave|homingpigeon|hangingman|harami(cross)?|hammer|concealbabyswall|\n      counterattack|closingmarubozu|thrusting|tasukigap|takuri|tristar|inneck|invertedhammer|\n      identical3crows|2crows|onneck|doji(star)?|darkcloudcover|dragonflydoji|unique3river|\n      upsidegap2crows|3(starsinsouth|inside|outside|whitesoldiers|linestrike|blackcrows)|\n      piercing|engulfing|evening(doji)?star|kicking(bylength)?|longline|longleggeddoji|\n      ladderbottom|advanceblock|abandonedbaby|risefall3methods|rickshawman|gapsidesidewhite|\n      gravestonedoji|xsidegap3methods|morning(doji)?star|mathold|matchinglow|marubozu|\n      belthold|breakaway)|\n  ceil|cmo|tsf|typprice|t3|tema|tan(h)?|trix|trima|trange|obv|div|dema|dx|ultosc|ppo|\n  plus_d[im]|errno|exp|ema|var|kama|floor|wclprice|willr|wma|ln|log10|bop|beta|bbands|\n  linearreg(_(slope|intercept|angle))?|asin|acos|atan|atr|adosc|ad|add|adx(r)?|apo|avgprice|\n  aroon(osc)?|rsi|roc|rocp|rocr(100)?|get_(compat|unstable_period)|min(index)?|minus_d[im]|\n  minmax(index)?|mid(point|price)|mom|mult|medprice|mfi|macd(ext|fix)?|mavp|max(index)?|ma(ma)?\n)\\b",
+          "match": "(?i)\\btrader_(stoch([fr]|rsi)?|stddev|sin(h)?|sum|sub|set_(compat|unstable_period)|sqrt|sar(ext)?|sma|ht_(sine|trend(line|mode)|dc(p(?:eriod|hase))|phasor)|natr|cci|cos(h)?|correl|cdl(shootingstar|shortline|sticksandwich|stalledpattern|spinningtop|separatinglines|hikkake(mod)?|highwave|homingpigeon|hangingman|harami(cross)?|hammer|concealbabyswall|counterattack|closingmarubozu|thrusting|tasukigap|takuri|tristar|inneck|invertedhammer|identical3crows|2crows|onneck|doji(star)?|darkcloudcover|dragonflydoji|unique3river|upsidegap2crows|3(starsinsouth|inside|outside|whitesoldiers|linestrike|blackcrows)|piercing|engulfing|evening(doji)?star|kicking(bylength)?|longline|longleggeddoji|ladderbottom|advanceblock|abandonedbaby|risefall3methods|rickshawman|gapsidesidewhite|gravestonedoji|xsidegap3methods|morning(doji)?star|mathold|matchinglow|marubozu|belthold|breakaway)|ceil|cmo|tsf|typprice|t3|tema|tan(h)?|trix|trima|trange|obv|div|dema|dx|ultosc|ppo|plus_d[im]|errno|exp|ema|var|kama|floor|wclprice|willr|wma|ln|log10|bop|beta|bbands|linearreg(_(slope|intercept|angle))?|asin|acos|atan|atr|adosc|ad|add|adx(r)?|apo|avgprice|aroon(osc)?|rsi|roc|rocp|rocr(100)?|get_(compat|unstable_period)|min(index)?|minus_d[im]|minmax(index)?|mid(p(?:oint|rice))|mom|mult|medprice|mfi|macd(ext|fix)?|mavp|max(index)?|ma(ma)?)\\b",
           "name": "support.function.trader.php"
         },
         {
@@ -3733,11 +3774,11 @@
           "name": "support.function.url.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  strval|settype|serialize|(bool|double|float)val|debug_zval_dump|intval|import_request_variables|isset|\n  is_(scalar|string|null|numeric|callable|int(eger)?|object|double|float|long|array|resource|real|bool)|\n  unset|unserialize|print_r|empty|var_(dump|export)|gettype|get_(defined_vars|resource_type)\n)\\b",
+          "match": "(?i)\\b(strval|settype|serialize|(bool|double|float)val|debug_zval_dump|intval|import_request_variables|isset|is_(scalar|string|null|numeric|callable|int(eger)?|object|double|float|long|array|resource|real|bool)|unset|unserialize|print_r|empty|var_(dump|export)|gettype|get_(defined_vars|resource_type))\\b",
           "name": "support.function.var.php"
         },
         {
-          "match": "(?i)\\bwddx_(serialize_(value|vars)|deserialize|packet_(start|end)|add_vars)\\b",
+          "match": "(?i)\\bwddx_(serialize_(va(?:lue|rs))|deserialize|packet_(start|end)|add_vars)\\b",
           "name": "support.function.wddx.php"
         },
         {
@@ -3745,19 +3786,19 @@
           "name": "support.function.xhprof.php"
         },
         {
-          "match": "(?xi)\n\\b\n(\n  utf8_(decode|encode)|\n  xml_(set_((notation|(end|start)_namespace|unparsed_entity)_decl_handler|\n            (character_data|default|element|external_entity_ref|processing_instruction)_handler|object)|\n       parse(_into_struct)?|parser_((get|set)_option|create(_ns)?|free)|error_string|\n       get_(current_((column|line)_number|byte_index)|error_code))\n)\\b",
+          "match": "(?i)\\b(utf8_(decode|encode)|xml_(set_((notation|(end|start)_namespace|unparsed_entity)_decl_handler|(character_data|default|element|external_entity_ref|processing_instruction)_handler|object)|parse(_into_struct)?|parser_((get|set)_option|create(_ns)?|free)|error_string|get_(current_((column|line)_number|byte_index)|error_code)))\\b",
           "name": "support.function.xml.php"
         },
         {
-          "match": "(?xi)\\b\nxmlrpc_(\n  server_(call_method|create|destroy|add_introspection_data|register_(introspection_callback|method))|\n  is_fault|decode(_request)?|parse_method_descriptions|encode(_request)?|(get|set)_type\n)\\b",
+          "match": "(?i)\\bxmlrpc_(server_(call_method|create|destroy|add_introspection_data|register_(introspection_callback|method))|is_fault|decode(_request)?|parse_method_descriptions|encode(_request)?|(get|set)_type)\\b",
           "name": "support.function.xmlrpc.php"
         },
         {
-          "match": "(?xi)\\b\nxmlwriter_(\n  (end|start|write)_(comment|cdata|dtd(_(attlist|entity|element))?|document|pi|attribute|element)|\n  (start|write)_(attribute|element)_ns|write_raw|set_indent(_string)?|text|output_memory|open_(memory|uri)|\n  full_end_element|flush|\n)\\b",
+          "match": "(?i)\\bxmlwriter_((end|start|write)_(comment|cdata|dtd(_(attlist|entity|element))?|document|pi|attribute|element)|(start|write)_(attribute|element)_ns|write_raw|set_indent(_string)?|text|output_memory|open_(memory|uri)|full_end_element|flush|)\\b",
           "name": "support.function.xmlwriter.php"
         },
         {
-          "match": "(?xi)\\b\n(\n  zlib_(decode|encode|get_coding_type)|readgzfile|\n  gz(seek|compress|close|tell|inflate|open|decode|deflate|uncompress|puts|passthru|encode|eof|file|\n     write|rewind|read|getc|getss?)\n)\\b",
+          "match": "(?i)\\b(zlib_(decode|encode|get_coding_type)|readgzfile|gz(seek|compress|close|tell|inflate|open|decode|deflate|uncompress|puts|passthru|encode|eof|file|write|rewind|read|getc|getss?))\\b",
           "name": "support.function.zlib.php"
         },
         {
@@ -3806,7 +3847,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.section.switch-block.begin.bracket.curly.php"
@@ -3847,7 +3888,7 @@
               ]
             }
           },
-          "match": "(?i)^\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\\s*(?=:(?!:))"
+          "match": "(?i)^\\s*([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)\\s*(?=:(?!:))"
         },
         {
           "include": "$self"
@@ -3870,7 +3911,7 @@
               "name": "keyword.other.use-as.php"
             }
           },
-          "end": "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
+          "end": "(?i)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*",
           "endCaptures": {
             "0": {
               "name": "entity.other.alias.php"
@@ -3894,7 +3935,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?i)(\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*",
+          "match": "(?i)(\\$+)[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*",
           "name": "variable.other.php"
         }
       ]
@@ -3905,7 +3946,7 @@
           "name": "punctuation.definition.variable.php"
         }
       },
-      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg(v|c))\\b",
+      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg([vc]))\\b",
       "name": "variable.other.global.php"
     },
     "var_global_safer": {
@@ -3967,7 +4008,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?xi)\n((\\$)(?<name>[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*))\\s*\n(?:\n  (\\??->)\\s*(\\g<name>)\n  |\n  (\\[)(?:(\\d+)|((\\$)\\g<name>)|([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*))(\\])\n)?"
+          "match": "(?i)((\\$)(?<name>[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*))\\s*(?:(\\??->)\\s*(\\g<name>)|(\\[)(?:(\\d+)|((\\$)\\g<name>)|([a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*))(]))?"
         },
         {
           "captures": {
@@ -3981,7 +4022,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?i)((\\${)(?<name>[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)(}))"
+          "match": "(?i)((\\$\\{)(?<name>[a-z_\\x7F-\\x{10FFFF}][a-z0-9_\\x7F-\\x{10FFFF}]*)(}))"
         }
       ]
     },
@@ -4000,7 +4041,7 @@
           "include": "#var_basic"
         },
         {
-          "begin": "\\${(?=.*?})",
+          "begin": "\\$\\{(?=.*?})",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.variable.php"
diff --git a/resources/languages/plsql.json b/resources/languages/plsql.json
index d9857df..d7657c0 100644
--- a/resources/languages/plsql.json
+++ b/resources/languages/plsql.json
@@ -25,11 +25,11 @@
       "name": "comment.line.double-dash.oracle"
     },
     {
-      "match": "(?i)(?:^\\s*)rem(?:\\s+.*$)",
+      "match": "(?i)^\\s*rem\\s+.*$",
       "name": "comment.line.sqlplus.oracle"
     },
     {
-      "match": "(?i)(?:^\\s*)prompt(?:\\s+.*$)",
+      "match": "(?i)^\\s*prompt\\s+.*$",
       "name": "comment.line.sqlplus-prompt.oracle"
     },
     {
@@ -84,7 +84,7 @@
       "name": "meta.procedure.oracle"
     },
     {
-      "match": "[!<>:]?=|<>|<|>|\\+|(?<!\\.)\\*|-|(?<!^)/|\\|\\|",
+      "match": "[!<>:]?=|<>|[<>+]|(?<!\\.)\\*|-|(?<!^)/|\\|\\|",
       "name": "keyword.operator.oracle"
     },
     {
@@ -108,7 +108,7 @@
       "name": "support.function.oracle"
     },
     {
-      "match": "(?i)\\b(sql|sqlcode)\\b",
+      "match": "(?i)\\b(sql(?:|code))\\b",
       "name": "variable.language.oracle"
     },
     {
@@ -152,7 +152,7 @@
       "name": "keyword.other.pragma.oracle"
     },
     {
-      "match": "(?i)\\b(p(i|o|io)_[-a-z0-9_]+)\\b",
+      "match": "(?i)\\b(p([io]|io)_[-a-z0-9_]+)\\b",
       "name": "variable.parameter.oracle"
     },
     {
@@ -180,7 +180,7 @@
       "name": "keyword.other.ddl.oracle"
     },
     {
-      "match": "(?i)\\b(with|select|from|where|order\\s+(siblings\\s+)?by|group\\s+by|rollup|cube|((left|right|cross|natural)\\s+(outer\\s+)?)?join|on|asc|desc|update|set|insert|into|values|delete|distinct|union|minus|intersect|having|limit|table|between|like|of|row|(range|rows)\\s+between|nulls\\s+first|nulls\\s+last|before|after|all|any|exists|rownum|cursor|returning|over|partition\\s+by|merge|using|matched|pivot|unpivot)\\b",
+      "match": "(?i)\\b(with|select|from|where|order\\s+(siblings\\s+)?by|group\\s+by|rollup|cube|((left|right|cross|natural)\\s+(outer\\s+)?)?join|on|asc|desc|update|set|insert|into|values|delete|distinct|union|minus|intersect|having|limit|table|between|like|of|row|(r(?:ange|ows))\\s+between|nulls\\s+first|nulls\\s+last|before|after|all|any|exists|rownum|cursor|returning|over|partition\\s+by|merge|using|matched|pivot|unpivot)\\b",
       "name": "keyword.other.sql.oracle"
     },
     {
@@ -206,7 +206,7 @@
           "name": "support.class.oracle"
         }
       },
-      "match": "(?i)\\b((htf|htp)\\.(\\w+))\\b",
+      "match": "(?i)\\b((ht[fp])\\.(\\w+))\\b",
       "name": "support.function.oracle"
     },
     {
@@ -219,7 +219,7 @@
       "name": "support.function.user-defined.oracle"
     },
     {
-      "match": "(?i)\\b(raise|raise_application_error)\\b",
+      "match": "(?i)\\b(raise(?:|_application_error))\\b",
       "name": "support.function.oracle"
     },
     {
diff --git a/resources/languages/po.json b/resources/languages/po.json
index 491207d..9e4f879 100644
--- a/resources/languages/po.json
+++ b/resources/languages/po.json
@@ -8,8 +8,7 @@
   "name": "po",
   "patterns": [
     {
-      "begin": "^(?=(msgid(_plural)?|msgctxt)\\s*\"[^\"])|^\\s*$",
-      "comment": "Start of body of document, after header",
+      "begin": "^(?:(?=(msg(?:id(_plural)?|ctxt))\\s*\"[^\"])|\\s*$)",
       "end": "\\z",
       "patterns": [
         {
@@ -67,7 +66,7 @@
           ]
         },
         {
-          "begin": "^(msgstr)(?:(\\[)(\\d+)(\\]))?\\s+",
+          "begin": "^(msgstr)(?:(\\[)(\\d+)(]))?\\s+",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.msgstr.po"
@@ -99,7 +98,7 @@
           ]
         },
         {
-          "begin": "^(msgctxt)(?:(\\[)(\\d+)(\\]))?\\s+",
+          "begin": "^(msgctxt)(?:(\\[)(\\d+)(]))?\\s+",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.msgctxt.po"
@@ -143,7 +142,6 @@
           "include": "#comments"
         },
         {
-          "comment": "a line that does not begin with # or \". Could improve this regexp",
           "match": "^(?!\\s*$)[^#\"].*$\\n?",
           "name": "invalid.illegal.po"
         }
@@ -171,7 +169,7 @@
                       "name": "entity.name.type.flag.po"
                     }
                   },
-                  "match": "(?:\\G|,\\s*)((?:fuzzy)|(?:no-)?(?:c|objc|sh|lisp|elisp|librep|scheme|smalltalk|java|csharp|awk|object-pascal|ycp|tcl|perl|perl-brace|php|gcc-internal|qt|boost)-format)"
+                  "match": "(?:\\G|,\\s*)(fuzzy|(?:no-)?(?:c|objc|sh|lisp|elisp|librep|scheme|smalltalk|java|csharp|awk|object-pascal|ycp|tcl|perl|perl-brace|php|gcc-internal|qt|boost)-format)"
                 }
               ]
             },
diff --git a/resources/languages/polar.json b/resources/languages/polar.json
index a805046..9a6f04f 100644
--- a/resources/languages/polar.json
+++ b/resources/languages/polar.json
@@ -81,15 +81,15 @@
     "number": {
       "patterns": [
         {
-          "match": "\\b[+-]?\\d+(?:(\\.)\\d+(?:e[+-]?\\d+)?|(?:e[+-]?\\d+))\\b",
+          "match": "\\b[+-]?\\d+(?:(\\.)\\d+(?:e[+-]?\\d+)?|e[+-]?\\d+)\\b",
           "name": "constant.numeric.float"
         },
         {
-          "match": "\\b(\\+|\\-)[\\d]+\\b",
+          "match": "\\b([+-])\\d+\\b",
           "name": "constant.numeric.integer"
         },
         {
-          "match": "\\b[\\d]+\\b",
+          "match": "\\b\\d+\\b",
           "name": "constant.numeric.natural"
         }
       ]
@@ -101,7 +101,7 @@
           "name": "entity.name.type.resource"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "constant.other.object-literal",
       "patterns": [
         {
@@ -121,25 +121,21 @@
           "name": "keyword.control"
         }
       },
-      "match": "(\\+|-|\\*|\\/|<|>|=|!)"
+      "match": "([+\\-*/<>=!])"
     },
     "resource-block": {
-      "begin": "(?<resourceType>[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*){0}((?:(resource|actor)\\s+(\\g<resourceType>)(?:\\s+(extends)\\s+(\\g<resourceType>(?:\\s*,\\s*\\g<resourceType>)*)\\s*,?\\s*)?)|(global))\\s*{",
+      "begin": "(?<resourceType>[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*){0}((resource|actor)\\s+(\\g<resourceType>)(?:\\s+(extends)\\s+(\\g<resourceType>(?:\\s*,\\s*\\g<resourceType>)*)\\s*,?\\s*)?|(global))\\s*\\{",
       "beginCaptures": {
         "3": {
-          "comment": "actor|resource",
           "name": "keyword.control"
         },
         "4": {
-          "comment": "declared resource type",
           "name": "entity.name.type"
         },
         "5": {
-          "comment": "extends",
           "name": "keyword.control"
         },
         "6": {
-          "comment": "list of extended resources",
           "patterns": [
             {
               "match": "([a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*)",
@@ -148,11 +144,10 @@
           ]
         },
         "7": {
-          "comment": "global",
           "name": "keyword.control"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.resource-block",
       "patterns": [
         {
@@ -161,7 +156,7 @@
         },
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "name": "meta.relation-declaration",
           "patterns": [
             {
@@ -286,7 +281,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "name": "meta.bracket.list",
           "patterns": [
             {
@@ -300,7 +295,7 @@
         },
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "name": "meta.bracket.dict",
           "patterns": [
             {
@@ -334,7 +329,7 @@
           "name": "string.quoted.double"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.test-block",
       "patterns": [
         {
@@ -344,7 +339,7 @@
               "name": "keyword.control"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "meta.test-setup",
           "patterns": [
             {
@@ -362,11 +357,36 @@
           "include": "#rule"
         },
         {
-          "match": "\\b(assert|assert_not)\\b",
+          "match": "\\b(assert(?:|_not))\\b",
           "name": "keyword.other"
         },
         {
           "include": "#comment"
+        },
+        {
+          "name": "meta.iff-rule",
+          "patterns": [
+            {
+              "include": "#rule-functor"
+            },
+            {
+              "begin": "\\biff\\b",
+              "beginCaptures": {
+                "0": {
+                  "name": "keyword.control"
+                }
+              },
+              "end": ";",
+              "patterns": [
+                {
+                  "include": "#term"
+                }
+              ]
+            },
+            {
+              "match": ";"
+            }
+          ]
         }
       ]
     }
diff --git a/resources/languages/postcss.json b/resources/languages/postcss.json
index afd0be9..d419816 100644
--- a/resources/languages/postcss.json
+++ b/resources/languages/postcss.json
@@ -58,17 +58,17 @@
           "name": "keyword.control.at-rule.css.postcss"
         }
       },
-      "end": "(?=\\n|\\(|{|;)",
+      "end": "(?=[\\n({;])",
       "name": "support.function.name.postcss.library"
     },
     {
-      "begin": "@mixin|@function",
+      "begin": "@(?:mixin|function)",
       "captures": {
         "0": {
           "name": "keyword.control.at-rule.css.postcss"
         }
       },
-      "end": "$\\n?|(?=\\(|{)",
+      "end": "$\\n?|(?=[({])",
       "name": "support.function.name.postcss.no-completions",
       "patterns": [
         {
@@ -83,12 +83,12 @@
     },
     {
       "begin": "@",
-      "end": "$\\n?|\\s(?!(all|braille|embossed|handheld|print|projection|screen|speech|tty|tv|if|only|not)(\\s|,))|(?=;)",
+      "end": "$\\n?|\\s(?!(all|braille|embossed|handheld|print|projection|screen|speech|tty|tv|if|only|not)([\\s,]))|(?=;)",
       "name": "keyword.control.at-rule.css.postcss"
     },
     {
       "begin": "#",
-      "end": "$\\n?|(?=\\s|,|;|\\(|\\)|\\.|\\[|{|>)",
+      "end": "$\\n?|(?=[\\s,;().\\[{>])",
       "name": "entity.other.attribute-name.id.css.postcss",
       "patterns": [
         {
@@ -100,8 +100,8 @@
       ]
     },
     {
-      "begin": "\\.|(?<=&)(-|_)",
-      "end": "$\\n?|(?=\\s|,|;|\\(|\\)|\\[|{|>)",
+      "begin": "\\.|(?<=&)([-_])",
+      "end": "$\\n?|(?=[\\s,;()\\[{>])",
       "name": "entity.other.attribute-name.class.css.postcss",
       "patterns": [
         {
@@ -114,7 +114,7 @@
     },
     {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "name": "entity.other.attribute-selector.postcss",
       "patterns": [
         {
@@ -124,18 +124,18 @@
           "include": "#single-quoted"
         },
         {
-          "match": "\\^|\\$|\\*|~",
+          "match": "[\\^$*~]",
           "name": "keyword.other.regex.postcss"
         }
       ]
     },
     {
-      "match": "(?<=\\]|\\)|not\\(|\\*|>|>\\s):[a-z:-]+|(::|:-)[a-z:-]+",
+      "match": "(?<=[\\])]|not\\(|[*>]|>\\s):[a-z:-]+|(:[:-])[a-z:-]+",
       "name": "entity.other.attribute-name.pseudo-class.css.postcss"
     },
     {
       "begin": ":",
-      "end": "$\\n?|(?=;|\\s\\(|and\\(|{|}|\\),)",
+      "end": "$\\n?|(?=;|\\s\\(|and\\(|[{}]|\\),)",
       "name": "meta.property-list.css.postcss",
       "patterns": [
         {
@@ -195,8 +195,8 @@
       "include": "#function-content"
     },
     {
-      "begin": "(?<!\\-|\\()\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|u|x)\\b(?!-|\\)|:\\s)|&",
-      "end": "(?=\\s|,|;|\\(|\\)|\\.|\\[|{|>|-|_)",
+      "begin": "(?<![-(])\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|[ux])\\b(?![-)]|:\\s)|&",
+      "end": "(?=[\\s,;().\\[{>\\-_])",
       "name": "entity.name.tag.css.postcss.symbol",
       "patterns": [
         {
@@ -211,7 +211,7 @@
       "include": "#operator"
     },
     {
-      "match": "[a-z-]+((?=:|#{))",
+      "match": "[a-z-]+((?=:|#\\{))",
       "name": "support.type.property-name.css.postcss"
     },
     {
@@ -223,7 +223,7 @@
   ],
   "repository": {
     "comment-tag": {
-      "begin": "{{",
+      "begin": "\\{\\{",
       "end": "}}",
       "name": "comment.tags.postcss",
       "patterns": [
@@ -262,7 +262,7 @@
       "name": "keyword.other.important.css.postcss"
     },
     "function": {
-      "match": "(?<=[\\s|\\(|,|:])(?!url|format|attr)[\\w-][\\w-]*(?=\\()",
+      "match": "(?<=[\\s|(,:])(?!url|format|attr)[\\w-][\\w-]*(?=\\()",
       "name": "support.function.name.postcss"
     },
     "function-content": {
@@ -274,7 +274,7 @@
       "name": "variable.parameter.postcss"
     },
     "interpolation": {
-      "begin": "#{",
+      "begin": "#\\{",
       "end": "}",
       "name": "support.function.interpolation.postcss",
       "patterns": [
@@ -299,11 +299,11 @@
       ]
     },
     "numeric": {
-      "match": "(-|\\.)?[0-9]+(\\.[0-9]+)?",
+      "match": "([-.])?[0-9]+(\\.[0-9]+)?",
       "name": "constant.numeric.css.postcss"
     },
     "operator": {
-      "match": "\\+|\\s-\\s|\\s-(?=\\$)|(?<=\\()-(?=\\$)|\\s-(?=\\()|\\*|/|%|=|!|<|>|~",
+      "match": "\\+|\\s-\\s|\\s-(?=\\$)|(?<=\\()-(?=\\$)|\\s-(?=\\()|[*/%=!<>~]",
       "name": "keyword.operator.postcss"
     },
     "parent-selector": {
@@ -312,7 +312,7 @@
     },
     "placeholder-selector": {
       "begin": "(?<!\\d)%(?!\\d)",
-      "end": "$\\n?|\\s|(?=;|{)",
+      "end": "$\\n?|\\s|(?=[;{])",
       "name": "entity.other.attribute-name.placeholder-selector.postcss"
     },
     "property-value": {
@@ -324,7 +324,7 @@
       "name": "entity.other.attribute-name.pseudo-class.css.postcss"
     },
     "quoted-interpolation": {
-      "begin": "#{",
+      "begin": "#\\{",
       "end": "}",
       "name": "support.function.interpolation.postcss",
       "patterns": [
@@ -347,7 +347,7 @@
       "name": "support.type.property-name.css.postcss"
     },
     "rgb-value": {
-      "match": "(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\\b",
+      "match": "(#)(\\h{3}|\\h{6})\\b",
       "name": "constant.other.color.rgb-value.css.postcss"
     },
     "single-quoted": {
@@ -361,7 +361,7 @@
       ]
     },
     "unit": {
-      "match": "(?<=[\\d]|})(ch|cm|deg|dpcm|dpi|dppx|em|ex|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vw|%)",
+      "match": "(?<=[\\d}])(ch|cm|deg|dpcm|dpi|dppx|em|ex|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vw|%)",
       "name": "keyword.other.unit.css.postcss"
     },
     "variable": {
diff --git a/resources/languages/powerquery.json b/resources/languages/powerquery.json
index ec73c26..b170d48 100644
--- a/resources/languages/powerquery.json
+++ b/resources/languages/powerquery.json
@@ -83,17 +83,17 @@
           "match": "(#|\\h{4}|\\h{8}|cr|lf|tab)(?:,(#|\\h{4}|\\h{8}|cr|lf|tab))*"
         },
         {
-          "match": "[^\\)]",
+          "match": "[^)]",
           "name": "invalid.illegal.escapesequence.powerquery"
         }
       ]
     },
     "FloatNumber": {
-      "match": "(\\d*\\.)?\\d+(e|E)(\\+|-)?\\d+",
+      "match": "(\\d*\\.)?\\d+([eE])([+-])?\\d+",
       "name": "constant.numeric.float.powerquery"
     },
     "HexNumber": {
-      "match": "0(x|X)\\h+",
+      "match": "0([xX])\\h+",
       "name": "constant.numeric.integer.hexadecimal.powerquery"
     },
     "Identifier": {
@@ -105,7 +105,7 @@
           "name": "entity.name.powerquery"
         }
       },
-      "match": "(?:(?<![\\._\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Nd}\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}])(@?)([_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}][_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Nd}\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}]*(?:\\.[_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}][_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Nd}\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}])*)\\b)"
+      "match": "(?<![._\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\d\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}])(@?)([_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}][_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\d\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}]*(?:\\.[_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}][_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\d\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}])*)\\b"
     },
     "ImplicitVariable": {
       "match": "\\b_\\b",
@@ -133,7 +133,7 @@
           "name": "constant.language.intrinsicvariable.powerquery"
         }
       },
-      "match": "(?<![\\d\\w])(#sections|#shared)\\b"
+      "match": "(?<![\\d\\w])(#s(?:ections|hared))\\b"
     },
     "Keywords": {
       "captures": {
@@ -153,7 +153,7 @@
           "name": "keyword.powerquery"
         }
       },
-      "match": "\\b(?:(and|or|not)|(if|then|else)|(try|otherwise)|(as|each|in|is|let|meta|type|error)|(section|shared))\\b"
+      "match": "\\b(?:(and|or|not)|(if|then|else)|(try|otherwise)|(as|each|in|is|let|meta|type|error)|(s(?:ection|hared)))\\b"
     },
     "LineComment": {
       "match": "//.*",
@@ -214,7 +214,7 @@
           "name": "constant.language.numeric.float.powerquery"
         }
       },
-      "match": "(?<![\\d\\w])(#infinity|#nan)\\b"
+      "match": "(?<![\\d\\w])(#(?:infinity|nan))\\b"
     },
     "Operators": {
       "captures": {
@@ -240,7 +240,7 @@
           "name": "keyword.operator.optional.powerquery"
         }
       },
-      "match": "(=>)|(=)|(<>|<|>|<=|>=)|(&)|(\\+|-|\\*|\\/)|(!)|(\\?)"
+      "match": "(=>)|(=)|(<>|[<>]|<=|>=)|(&)|([+\\-*/])|(!)|(\\?)"
     },
     "Punctuation": {
       "captures": {
@@ -260,7 +260,7 @@
           "name": "punctuation.section.braces.end.powerquery"
         }
       },
-      "match": "(,)|(\\()|(\\))|({)|(})"
+      "match": "(,)|(\\()|(\\))|(\\{)|(})"
     },
     "QuotedIdentifier": {
       "begin": "#\"",
@@ -294,7 +294,7 @@
         }
       },
       "contentName": "meta.recordexpression.powerquery",
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.powerquery"
diff --git a/resources/languages/powershell.json b/resources/languages/powershell.json
index 1d04ac2..5f539d1 100644
--- a/resources/languages/powershell.json
+++ b/resources/languages/powershell.json
@@ -23,7 +23,7 @@
       ]
     },
     {
-      "match": "[2-6]>&1|>>|>|<<|<|>|>\\||[1-6]>|[1-6]>>",
+      "match": "[2-6]>&1|>>|>|<<|[<>]|>\\||[1-6]>|[1-6]>>",
       "name": "keyword.operator.redirection.powershell"
     },
     {
@@ -60,18 +60,17 @@
       "include": "#scriptblock"
     },
     {
-      "comment": "Needed to parse stuff correctly in 'argument mode'. (See about_parsing.)",
       "include": "#doubleQuotedStringEscapes"
     },
     {
       "applyEndPatternLast": true,
-      "begin": "['\\x{2018}-\\x{201B}]",
+      "begin": "['‘-‛]",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.powershell"
         }
       },
-      "end": "['\\x{2018}-\\x{201B}]",
+      "end": "['‘-‛]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.powershell"
@@ -80,19 +79,19 @@
       "name": "string.quoted.single.powershell",
       "patterns": [
         {
-          "match": "['\\x{2018}-\\x{201B}]{2}",
+          "match": "['‘-‛]{2}",
           "name": "constant.character.escape.powershell"
         }
       ]
     },
     {
-      "begin": "(@[\"\\x{201C}-\\x{201E}])\\s*$",
+      "begin": "(@[\"“-„])\\s*$",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.powershell"
         }
       },
-      "end": "^[\"\\x{201C}-\\x{201E}]@",
+      "end": "^[\"“-„]@",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.powershell"
@@ -112,13 +111,13 @@
       ]
     },
     {
-      "begin": "(@['\\x{2018}-\\x{201B}])\\s*$",
+      "begin": "(@['‘-‛])\\s*$",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.powershell"
         }
       },
-      "end": "^['\\x{2018}-\\x{201B}]@",
+      "end": "^['‘-‛]@",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.powershell"
@@ -165,7 +164,6 @@
           "name": "punctuation.section.group.begin.powershell"
         }
       },
-      "comment": "TODO: move to repo; make recursive.",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -180,15 +178,15 @@
       ]
     },
     {
-      "match": "(\\b(([A-Za-z0-9\\-_\\.]+)\\.(?i:exe|com|cmd|bat))\\b)",
+      "match": "(\\b(([A-Za-z0-9\\-_.]+)\\.(?i:exe|com|cmd|bat))\\b)",
       "name": "support.function.powershell"
     },
     {
-      "match": "(?<!\\w|-|\\.)((?i:begin|break|catch|clean|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|%|\\?)(?!\\w)",
+      "match": "(?<![\\w\\-.])((?i:begin|break|catch|clean|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|[%?])(?!\\w)",
       "name": "keyword.control.powershell"
     },
     {
-      "match": "(?<!\\w|-|[^\\)]\\.)((?i:(foreach|where)(?!-object))|%|\\?)(?!\\w)",
+      "match": "(?<![\\w-]|[^)]\\.)((?i:(foreach|where)(?!-object))|[%?])(?!\\w)",
       "name": "keyword.control.powershell"
     },
     {
@@ -198,7 +196,6 @@
           "name": "keyword.control.powershell"
         }
       },
-      "comment": "This should be moved to the repository at some point.",
       "end": "$",
       "patterns": [
         {
@@ -208,7 +205,6 @@
       ]
     },
     {
-      "comment": "This should only be relevant inside a class but will require a rework of how classes are matched. This is a temp fix.",
       "match": "(?<!\\w)((?i:hidden|static))(?!\\w)",
       "name": "storage.modifier.powershell"
     },
@@ -221,8 +217,7 @@
           "name": "entity.name.function"
         }
       },
-      "comment": "capture should be entity.name.type, but it doesn't provide a good color in the default schema.",
-      "match": "(?<!\\w|-)((?i:class)|%|\\?)(?:\\s)+((?:\\p{L}|\\d|_|-|)+)\\b"
+      "match": "(?<![\\w-])((?i:class)|[%?])\\s+((?:[\\p{L}\\d_-]|)+)\\b"
     },
     {
       "match": "(?<!\\w)-(?i:is(?:not)?|as)\\b",
@@ -257,12 +252,11 @@
       "name": "punctuation.terminator.statement.powershell"
     },
     {
-      "match": "&|(?<!\\w)\\.(?= )|`|,|\\|",
+      "match": "&|(?<!\\w)\\.(?= )|[`,|]",
       "name": "keyword.operator.other.powershell"
     },
     {
-      "comment": "This is very imprecise, is there a syntax for 'must come after...' ",
-      "match": "(?<!\\s|^)\\.\\.(?=\\-?\\d|\\(|\\$)",
+      "match": "(?<!\\s|^)\\.\\.(?=-?\\d|[($])",
       "name": "keyword.operator.range.powershell"
     }
   ],
@@ -278,7 +272,7 @@
       "name": "meta.requires.powershell",
       "patterns": [
         {
-          "match": "\\-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version|Assembly|PSEdition)",
+          "match": "-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version|Assembly|PSEdition)",
           "name": "keyword.other.powershell"
         },
         {
@@ -302,7 +296,7 @@
           "name": "variable.parameter.powershell"
         }
       },
-      "match": "(?<!\\w)(?i:(using))\\s+(?i:(namespace|module))\\s+(?i:((?:\\w+(?:\\.)?)+))"
+      "match": "(?<!\\w)(?i:(using))\\s+(?i:(namespace|module))\\s+(?i:((?:\\w+\\.?)+))"
     },
     "attribute": {
       "begin": "(\\[)\\s*\\b(?i)(cmdletbinding|alias|outputtype|parameter|validatenotnull|validatenotnullorempty|validatecount|validateset|allownull|allowemptycollection|allowemptystring|validatescript|validaterange|validatepattern|validatelength|supportswildcards)\\b",
@@ -314,7 +308,7 @@
           "name": "support.function.attribute.powershell"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.bracket.end.powershell"
@@ -348,7 +342,7 @@
                   "name": "keyword.operator.assignment.powershell"
                 }
               },
-              "match": "(?i)\\b(mandatory|valuefrompipeline|valuefrompipelinebypropertyname|valuefromremainingarguments|position|parametersetname|defaultparametersetname|supportsshouldprocess|supportspaging|positionalbinding|helpuri|confirmimpact|helpmessage)\\b(?:\\s+)?(=)?"
+              "match": "(?i)\\b(mandatory|valuefrompipeline|valuefrompipelinebypropertyname|valuefromremainingarguments|position|parametersetname|defaultparametersetname|supportsshouldprocess|supportspaging|positionalbinding|helpuri|confirmimpact|helpmessage)\\b\\s+{0,1}(=)?"
             }
           ]
         }
@@ -357,27 +351,22 @@
     "commands": {
       "patterns": [
         {
-          "comment": "Verb-Noun pattern:",
-          "match": "(?:(\\p{L}|\\d|_|-|\\\\|\\:)*\\\\)?\\b(?i:Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Deploy|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\\-.+?(?:\\.(?i:exe|cmd|bat|ps1))?\\b",
+          "match": "(?:([\\p{L}\\d_\\-\\\\:])*\\\\)?\\b(?i:Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Deploy|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)-.+?(?:\\.(?i:exe|cmd|bat|ps1))?\\b",
           "name": "support.function.powershell"
         },
         {
-          "comment": "Builtin cmdlets with reserved verbs",
           "match": "(?<!\\w)(?i:foreach-object)(?!\\w)",
           "name": "support.function.powershell"
         },
         {
-          "comment": "Builtin cmdlets with reserved verbs",
           "match": "(?<!\\w)(?i:where-object)(?!\\w)",
           "name": "support.function.powershell"
         },
         {
-          "comment": "Builtin cmdlets with reserved verbs",
           "match": "(?<!\\w)(?i:sort-object)(?!\\w)",
           "name": "support.function.powershell"
         },
         {
-          "comment": "Builtin cmdlets with reserved verbs",
           "match": "(?<!\\w)(?i:tee-object)(?!\\w)",
           "name": "support.function.powershell"
         }
@@ -394,7 +383,6 @@
               "name": "keyword.operator.documentation.powershell"
             }
           },
-          "comment": "these embedded doc keywords do not support arguments, must be the only thing on the line",
           "match": "(?:^|\\G)(?i:\\s*(\\.)(COMPONENT|DESCRIPTION|EXAMPLE|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|ROLE|SYNOPSIS))\\s*$",
           "name": "comment.documentation.embedded.powershell"
         },
@@ -410,7 +398,6 @@
               "name": "keyword.operator.documentation.powershell"
             }
           },
-          "comment": "these embedded doc keywords require arguments though the type required may be inconsistent, they may not all be able to use the same argument match",
           "match": "(?:^|\\G)(?i:\\s*(\\.)(EXTERNALHELP|FORWARDHELP(?:CATEGORY|TARGETNAME)|PARAMETER|REMOTEHELPRUNSPACE))\\s+(.+?)\\s*$",
           "name": "comment.documentation.embedded.powershell"
         }
@@ -436,13 +423,13 @@
     },
     "doubleQuotedString": {
       "applyEndPatternLast": true,
-      "begin": "[\"\\x{201C}-\\x{201E}]",
+      "begin": "[\"“-„]",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.powershell"
         }
       },
-      "end": "[\"\\x{201C}-\\x{201E}]",
+      "end": "[\"“-„]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.powershell"
@@ -460,7 +447,7 @@
           "include": "#doubleQuotedStringEscapes"
         },
         {
-          "match": "[\"\\x{201C}-\\x{201E}]{2}",
+          "match": "[\"“-„]{2}",
           "name": "constant.character.escape.powershell"
         },
         {
@@ -475,7 +462,7 @@
     "doubleQuotedStringEscapes": {
       "patterns": [
         {
-          "match": "`[`0abefnrtv'\"\\x{2018}-\\x{201E}$]",
+          "match": "`[`0abefnrtv'\"‘-„$]",
           "name": "constant.character.escape.powershell"
         },
         {
@@ -484,7 +471,7 @@
       ]
     },
     "function": {
-      "begin": "^(?:\\s*+)(?i)(function|filter|configuration|workflow)\\s+(?:(global|local|script|private):)?((?:\\p{L}|\\d|_|-|\\.)+)",
+      "begin": "^\\s*+(?i)(function|filter|configuration|workflow)\\s+(?:(global|local|script|private):)?([\\p{L}\\d_\\-.]+)",
       "beginCaptures": {
         "0": {
           "name": "meta.function.powershell"
@@ -499,7 +486,7 @@
           "name": "entity.name.function.powershell"
         }
       },
-      "end": "(?=\\{|\\()",
+      "end": "(?=[{(])",
       "patterns": [
         {
           "include": "#commentLine"
@@ -516,7 +503,7 @@
           "name": "punctuation.section.braces.begin.powershell"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.braces.end.powershell"
@@ -539,7 +526,7 @@
               "name": "keyword.operator.assignment.powershell"
             }
           },
-          "match": "\\b((?:\\'|\\\")?)(\\w+)((?:\\'|\\\")?)(?:\\s+)?(=)(?:\\s+)?",
+          "match": "\\b(['\"]?)(\\w+)(['\"]?)\\s+{0,1}(=)\\s+{0,1}",
           "name": "meta.hashtable.assignment.powershell"
         },
         {
@@ -597,7 +584,7 @@
               "name": "keyword.other.powershell"
             }
           },
-          "match": "(?<!\\w)([-+]?0(?:x|X)[0-9a-fA-F_]+(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\\b"
+          "match": "(?<!\\w)([-+]?0[xX][_\\h]+(?:[UuLl]|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\\b"
         },
         {
           "captures": {
@@ -608,7 +595,7 @@
               "name": "keyword.other.powershell"
             }
           },
-          "match": "(?<!\\w)([-+]?(?:[0-9_]+)?\\.[0-9_]+(?:(?:e|E)[0-9]+)?(?:F|f|D|d|M|m)?)((?i:[kmgtp]b)?)\\b"
+          "match": "(?<!\\w)([-+]?[0-9_]+{0,1}\\.[0-9_]+(?:[eE][0-9]+)?[FfDdMm]?)((?i:[kmgtp]b)?)\\b"
         },
         {
           "captures": {
@@ -619,7 +606,7 @@
               "name": "keyword.other.powershell"
             }
           },
-          "match": "(?<!\\w)([-+]?0(?:b|B)[01_]+(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\\b"
+          "match": "(?<!\\w)([-+]?0[bB][01_]+(?:[UuLl]|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\\b"
         },
         {
           "captures": {
@@ -630,7 +617,7 @@
               "name": "keyword.other.powershell"
             }
           },
-          "match": "(?<!\\w)([-+]?[0-9_]+(?:e|E)(?:[0-9_])?+(?:F|f|D|d|M|m)?)((?i:[kmgtp]b)?)\\b"
+          "match": "(?<!\\w)([-+]?[0-9_]+[eE][0-9_]?+[FfDdMm]?)((?i:[kmgtp]b)?)\\b"
         },
         {
           "captures": {
@@ -641,7 +628,7 @@
               "name": "keyword.other.powershell"
             }
           },
-          "match": "(?<!\\w)([-+]?[0-9_]+\\.(?:e|E)(?:[0-9_])?+(?:F|f|D|d|M|m)?)((?i:[kmgtp]b)?)\\b"
+          "match": "(?<!\\w)([-+]?[0-9_]+\\.[eE][0-9_]?+[FfDdMm]?)((?i:[kmgtp]b)?)\\b"
         },
         {
           "captures": {
@@ -652,7 +639,7 @@
               "name": "keyword.other.powershell"
             }
           },
-          "match": "(?<!\\w)([-+]?[0-9_]+[\\.]?(?:F|f|D|d|M|m))((?i:[kmgtp]b)?)\\b"
+          "match": "(?<!\\w)([-+]?[0-9_]+\\.?[FfDdMm])((?i:[kmgtp]b)?)\\b"
         },
         {
           "captures": {
@@ -663,7 +650,7 @@
               "name": "keyword.other.powershell"
             }
           },
-          "match": "(?<!\\w)([-+]?[0-9_]+[\\.]?(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\\b"
+          "match": "(?<!\\w)([-+]?[0-9_]+\\.?(?:[UuLl]|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\\b"
         }
       ]
     },
@@ -674,7 +661,7 @@
           "name": "punctuation.section.braces.begin.powershell"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.braces.end.powershell"
@@ -714,7 +701,7 @@
           "name": "punctuation.section.bracket.begin.powershell"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.bracket.end.powershell"
@@ -722,7 +709,7 @@
       },
       "patterns": [
         {
-          "match": "(?!\\d+|\\.)(?:\\p{L}|\\p{N}|\\.)+",
+          "match": "(?!\\d+|\\.)[\\p{L}\\p{N}.]+",
           "name": "storage.type.powershell"
         },
         {
@@ -731,14 +718,13 @@
       ]
     },
     "unicodeEscape": {
-      "comment": "`u{xxxx} added in PowerShell 6.0",
       "patterns": [
         {
-          "match": "`u\\{(?:(?:10)?([0-9a-fA-F]){1,4}|0?\\g<1>{1,5})}",
+          "match": "`u\\{(?:(?:10)?(\\h){1,4}|0?\\g<1>{1,5})}",
           "name": "constant.character.escape.powershell"
         },
         {
-          "match": "`u(?:\\{[0-9a-fA-F]{,6}.)?",
+          "match": "`u(?:\\{\\h{0,6}.)?",
           "name": "invalid.character.escape.powershell"
         }
       ]
@@ -754,7 +740,6 @@
               "name": "punctuation.definition.variable.powershell"
             }
           },
-          "comment": "These are special constants.",
           "match": "(\\$)(?i:(False|Null|True))\\b"
         },
         {
@@ -769,8 +754,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "comment": "These are the other built-in constants.",
-          "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?\\b"
+          "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))((?:\\.[\\p{L}\\d_]+)*\\b)?\\b"
         },
         {
           "captures": {
@@ -784,8 +768,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "comment": "Automatic variables are not constants, but they are read-only. In monokai (default) color schema support.variable doesn't have color, so we use constant.",
-          "match": "(\\$)((?:[$^?])|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\\b)((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
+          "match": "(\\$)([$^?]|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\\b)((?:\\.[\\p{L}\\d_]+)*\\b)?"
         },
         {
           "captures": {
@@ -799,8 +782,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "comment": "Style preference variables as language variables so that they stand out.",
-          "match": "(\\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|InformationPreference|LogCommandHealthEvent|LogCommandLifecycleEvent|LogEngineHealthEvent|LogEngineLifecycleEvent|LogProviderHealthEvent|LogProviderLifecycleEvent|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|PSCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoLoadingPreference|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|ProgressPreference|VerbosePreference|WarningPreference|WhatIfPreference))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?\\b"
+          "match": "(\\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|InformationPreference|LogCommandHealthEvent|LogCommandLifecycleEvent|LogEngineHealthEvent|LogEngineLifecycleEvent|LogProviderHealthEvent|LogProviderLifecycleEvent|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|PSCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoLoadingPreference|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|ProgressPreference|VerbosePreference|WarningPreference|WhatIfPreference))((?:\\.[\\p{L}\\d_]+)*\\b)?\\b"
         },
         {
           "captures": {
@@ -817,7 +799,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "match": "(?i:(\\$|@)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
+          "match": "(?i:([$@])(global|local|private|script|using|workflow):([\\p{L}\\d_]+))((?:\\.[\\p{L}\\d_]+)*\\b)?"
         },
         {
           "captures": {
@@ -840,7 +822,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
+          "match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(}))((?:\\.[\\p{L}\\d_]+)*\\b)?"
         },
         {
           "captures": {
@@ -857,7 +839,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "match": "(?i:(\\$|@)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
+          "match": "(?i:([$@])([\\p{L}\\d_]+:)?([\\p{L}\\d_]+))((?:\\.[\\p{L}\\d_]+)*\\b)?"
         },
         {
           "captures": {
@@ -880,7 +862,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "match": "(?i:(\\$)(\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
+          "match": "(?i:(\\$)(\\{)([\\p{L}\\d_]+:)?([^}]*[^}`])(}))((?:\\.[\\p{L}\\d_]+)*\\b)?"
         }
       ]
     },
@@ -895,7 +877,6 @@
               "name": "punctuation.definition.variable.powershell"
             }
           },
-          "comment": "These are special constants.",
           "match": "(\\$)(?i:(False|Null|True))\\b"
         },
         {
@@ -910,7 +891,6 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "comment": "These are the other built-in constants.",
           "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))\\b"
         },
         {
@@ -925,8 +905,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "comment": "Automatic variables are not constants, but they are read-only...",
-          "match": "(\\$)((?:[$^?])|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\\b)"
+          "match": "(\\$)([$^?]|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\\b)"
         },
         {
           "captures": {
@@ -940,7 +919,6 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "comment": "Style preference variables as language variables so that they stand out.",
           "match": "(\\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|InformationPreference|LogCommandHealthEvent|LogCommandLifecycleEvent|LogEngineHealthEvent|LogEngineLifecycleEvent|LogProviderHealthEvent|LogProviderLifecycleEvent|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|PSCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoLoadingPreference|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|ProgressPreference|VerbosePreference|WarningPreference|WhatIfPreference))\\b"
         },
         {
@@ -958,7 +936,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "match": "(?i:(\\$)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))"
+          "match": "(?i:(\\$)(global|local|private|script|using|workflow):([\\p{L}\\d_]+))"
         },
         {
           "captures": {
@@ -978,7 +956,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))"
+          "match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(}))"
         },
         {
           "captures": {
@@ -995,7 +973,7 @@
               "name": "variable.other.member.powershell"
             }
           },
-          "match": "(?i:(\\$)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))"
+          "match": "(?i:(\\$)([\\p{L}\\d_]+:)?([\\p{L}\\d_]+))"
         },
         {
           "captures": {
@@ -1015,7 +993,7 @@
               "name": "punctuation.section.braces.end"
             }
           },
-          "match": "(?i:(\\$)(\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))"
+          "match": "(?i:(\\$)(\\{)([\\p{L}\\d_]+:)?([^}]*[^}`])(}))"
         }
       ]
     }
diff --git a/resources/languages/prisma.json b/resources/languages/prisma.json
index 56cd92f..71fd201 100644
--- a/resources/languages/prisma.json
+++ b/resources/languages/prisma.json
@@ -35,7 +35,7 @@
           "name": "punctuation.definition.tag.prisma"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.prisma"
@@ -78,11 +78,11 @@
           "name": "entity.name.function.attribute.prisma"
         }
       },
-      "match": "(@@?[\\w\\.]+)",
+      "match": "(@@?[\\w.]+)",
       "name": "source.prisma.attribute"
     },
     "attribute_with_arguments": {
-      "begin": "(@@?[\\w\\.]+)(\\()",
+      "begin": "(@@?[\\w.]+)(\\()",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.attribute.prisma"
@@ -112,7 +112,7 @@
       "name": "constant.language.boolean.prisma"
     },
     "config_block_definition": {
-      "begin": "^\\s*(generator|datasource)\\s+([A-Za-z][\\w]*)\\s+({)",
+      "begin": "^\\s*(generator|datasource)\\s+([A-Za-z]\\w*)\\s+(\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.config.prisma"
@@ -124,7 +124,7 @@
           "name": "punctuation.definition.tag.prisma"
         }
       },
-      "end": "\\s*\\}",
+      "end": "\\s*}",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.prisma"
@@ -174,13 +174,13 @@
           "include": "#string_interpolation"
         },
         {
-          "match": "([\\w\\-\\/\\._\\\\%@:\\?=]+)",
+          "match": "([\\w\\-/._\\\\%@:?=]+)",
           "name": "string.quoted.double.prisma"
         }
       ]
     },
     "enum_block_definition": {
-      "begin": "^\\s*(enum)\\s+([A-Za-z][\\w]*)\\s+({)",
+      "begin": "^\\s*(enum)\\s+([A-Za-z]\\w*)\\s+(\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.enum.prisma"
@@ -192,7 +192,7 @@
           "name": "punctuation.definition.tag.prisma"
         }
       },
-      "end": "\\s*\\}",
+      "end": "\\s*}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.tag.prisma"
@@ -259,7 +259,7 @@
               "name": "invalid.illegal.required_type.prisma"
             }
           },
-          "match": "^\\s*(\\w+)(\\s*:)?\\s+((?!(?:Int|BigInt|String|DateTime|Bytes|Decimal|Float|Json|Boolean)\\b)\\b\\w+)?(Int|BigInt|String|DateTime|Bytes|Decimal|Float|Json|Boolean)?(\\[\\])?(\\?)?(\\!)?"
+          "match": "^\\s*(\\w+)(\\s*:)?\\s+((?!(?:Int|BigInt|String|DateTime|Bytes|Decimal|Float|Json|Boolean)\\b)\\b\\w+)?(Int|BigInt|String|DateTime|Bytes|Decimal|Float|Json|Boolean)?(\\[])?(\\?)?(!)?"
         },
         {
           "include": "#attribute_with_arguments"
@@ -334,7 +334,7 @@
       ]
     },
     "model_block_definition": {
-      "begin": "^\\s*(model|type|view)\\s+([A-Za-z][\\w]*)\\s*({)",
+      "begin": "^\\s*(model|type|view)\\s+([A-Za-z]\\w*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.model.prisma"
@@ -346,7 +346,7 @@
           "name": "punctuation.definition.tag.prisma"
         }
       },
-      "end": "\\s*\\}",
+      "end": "\\s*}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.tag.prisma"
@@ -385,7 +385,7 @@
       ]
     },
     "number": {
-      "match": "((0(x|X)[0-9a-fA-F]*)|(\\+|-)?\\b(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDdg]|UL|ul)?\\b",
+      "match": "((0([xX])\\h*)|([+-])?\\b(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([LlFfUuDdg]|UL|ul)?\\b",
       "name": "constant.numeric.prisma"
     },
     "string_interpolation": {
@@ -397,7 +397,7 @@
               "name": "keyword.control.interpolation.start.prisma"
             }
           },
-          "end": "\\s*\\}",
+          "end": "\\s*}",
           "endCaptures": {
             "0": {
               "name": "keyword.control.interpolation.end.prisma"
diff --git a/resources/languages/prolog.json b/resources/languages/prolog.json
index 6fc5869..34f4e59 100644
--- a/resources/languages/prolog.json
+++ b/resources/languages/prolog.json
@@ -186,7 +186,7 @@
           "name": "constant.other.atom.quoted.prolog"
         },
         {
-          "match": "\\[\\]",
+          "match": "\\[]",
           "name": "constant.other.atom.emptylist.prolog"
         }
       ]
@@ -224,7 +224,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "(?<![a-zA-Z]|/)(\\d+|(\\d+\\.\\d+))",
+          "match": "(?<![a-zA-Z/])(\\d+|(\\d+\\.\\d+))",
           "name": "constant.numeric.integer.prolog"
         },
         {
@@ -276,7 +276,7 @@
           "name": "keyword.control.cut.prolog"
         },
         {
-          "match": "(\\s(is)\\s)|=:=|=\\.\\.|=?\\\\?=|\\\\\\+|@?>|@?=?<|\\+|\\*|\\-",
+          "match": "(\\s(is)\\s)|=:=|=\\.\\.|=?\\\\?=|\\\\\\+|@?>|@?=?<|[+*-]",
           "name": "keyword.operator.prolog"
         }
       ]
diff --git a/resources/languages/proto.json b/resources/languages/proto.json
index d937ca9..b02535b 100644
--- a/resources/languages/proto.json
+++ b/resources/languages/proto.json
@@ -59,7 +59,7 @@
           "name": "entity.name.class.proto"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#reserved"
@@ -71,7 +71,7 @@
           "include": "#comments"
         },
         {
-          "begin": "([A-Za-z][A-Za-z0-9_]*)\\s*(=)\\s*(0[xX][0-9a-fA-F]+|[0-9]+)",
+          "begin": "([A-Za-z][A-Za-z0-9_]*)\\s*(=)\\s*(0[xX]\\h+|[0-9]+)",
           "beginCaptures": {
             "1": {
               "name": "variable.other.proto"
@@ -98,7 +98,7 @@
       ]
     },
     "field": {
-      "begin": "\\s*(optional|repeated|required)?\\s*\\b([\\w.]+)\\s+(\\w+)\\s*(=)\\s*(0[xX][0-9a-fA-F]+|[0-9]+)",
+      "begin": "\\s*(optional|repeated|required)?\\s*\\b([\\w.]+)\\s+(\\w+)\\s*(=)\\s*(0[xX]\\h+|[0-9]+)",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.proto"
@@ -130,7 +130,7 @@
     },
     "fieldOptions": {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#constants"
@@ -251,7 +251,7 @@
           "name": "entity.name.class.message.proto"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#reserved"
@@ -289,7 +289,7 @@
           "name": "entity.name.function"
         }
       },
-      "end": "\\}|(;)",
+      "end": "}|(;)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.proto"
@@ -311,7 +311,7 @@
       ]
     },
     "number": {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
+      "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)\\b",
       "name": "constant.numeric.proto"
     },
     "oneof": {
@@ -324,7 +324,7 @@
           "name": "variable.other.proto"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#optionStmt"
@@ -452,7 +452,7 @@
           "name": "entity.name.class.message.proto"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#comments"
@@ -470,12 +470,12 @@
       "name": "storage.type.proto"
     },
     "string": {
-      "match": "('([^']|\\')*')|(\"([^\"]|\\\")*\")",
+      "match": "('([[^']'])*')|(\"([[^\"]\"])*\")",
       "name": "string.quoted.double.proto"
     },
     "subMsgOption": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#kv"
diff --git a/resources/languages/pug.json b/resources/languages/pug.json
index 149209f..99cf5d1 100644
--- a/resources/languages/pug.json
+++ b/resources/languages/pug.json
@@ -3,19 +3,16 @@
   "name": "pug",
   "patterns": [
     {
-      "comment": "Doctype declaration.",
-      "match": "^(!!!|doctype)(\\s*[a-zA-Z0-9-_]+)?",
+      "match": "^(!!!|doctype)(\\s*[a-zA-Z0-9\\-_]+)?",
       "name": "meta.tag.sgml.doctype.html"
     },
     {
       "begin": "^(\\s*)//-",
-      "comment": "Unbuffered (pug-only) comments.",
       "end": "^(?!(\\1\\s)|\\s*$)",
       "name": "comment.unbuffered.block.pug"
     },
     {
       "begin": "^(\\s*)//",
-      "comment": "Buffered (html) comments.",
       "end": "^(?!(\\1\\s)|\\s*$)",
       "name": "string.comment.buffered.block.pug",
       "patterns": [
@@ -25,7 +22,6 @@
               "name": "invalid.illegal.comment.comment.block.pug"
             }
           },
-          "comment": "Buffered comments inside buffered comments will generate invalid html.",
           "match": "^\\s*(//)(?!-)",
           "name": "string.comment.buffered.block.pug"
         }
@@ -44,7 +40,6 @@
     },
     {
       "begin": "^(\\s*)-$",
-      "comment": "Unbuffered code block.",
       "end": "^(?!(\\1\\s)|\\s*$)",
       "name": "source.js",
       "patterns": [
@@ -60,7 +55,6 @@
           "name": "entity.name.tag.pug"
         }
       },
-      "comment": "Script tag with JavaScript code.",
       "end": "^(?!(\\1\\s)|\\s*$)",
       "name": "meta.tag.other",
       "patterns": [
@@ -94,7 +88,6 @@
           "name": "entity.name.tag.pug"
         }
       },
-      "comment": "Style tag with CSS code.",
       "end": "^(?!(\\1\\s)|\\s*$)",
       "name": "meta.tag.other",
       "patterns": [
@@ -235,7 +228,6 @@
           "name": "invalid.illegal.empty.generic.filter.pug"
         }
       },
-      "comment": "Generic Pug filter.",
       "end": "^(?!(\\1\\s)|\\s*$)",
       "patterns": [
         {
@@ -263,7 +255,7 @@
       ]
     },
     {
-      "begin": "^(\\s*)(?:(?=\\.$)|(?:(?=[\\w.#].*?\\.$)(?=(?:(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*)(?:(?:(?::\\s+)|(?<=\\)))(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*))*)\\.$)(?:(?:(#[\\w-]+)|(\\.[\\w-]+))|((?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))))",
+      "begin": "^(\\s*)(?:(?=\\.$)|(?=[\\w.#].*?\\.$)(?=(?:(?:#[\\w-]+|\\.[\\w-]+)|(?:[#!]\\{[^}]*}|\\w(?:[\\w:-]+[\\w-]|[\\w-]*)))(?:#[\\w-]+|\\.[\\w-]+|(?:\\((?:[^()'\"]*(?:'(?:[^']|(?<!\\\\)\\\\')*'|\"(?:[^\"]|(?<!\\\\)\\\\\")*\"))*[^()]*\\))*)*(?:(?::\\s+|(?<=\\)))(?:(?:#[\\w-]+|\\.[\\w-]+)|(?:[#!]\\{[^}]*}|\\w(?:[\\w:-]+[\\w-]|[\\w-]*)))(?:#[\\w-]+|\\.[\\w-]+|(?:\\((?:[^()'\"]*(?:'(?:[^']|(?<!\\\\)\\\\')*'|\"(?:[^\"]|(?<!\\\\)\\\\\")*\"))*[^()]*\\))*)*)*\\.$)(?:(?:(#[\\w-]+)|(\\.[\\w-]+))|([#!]\\{[^}]*}|\\w(?:[\\w:-]+[\\w-]|[\\w-]*))))",
       "beginCaptures": {
         "2": {
           "name": "meta.selector.css entity.other.attribute-name.id.css.pug"
@@ -275,7 +267,6 @@
           "name": "meta.tag.other entity.name.tag.pug"
         }
       },
-      "comment": "Generated from dot_block_tag.py",
       "end": "^(?!(\\1\\s)|\\s*$)",
       "patterns": [
         {
@@ -314,7 +305,6 @@
     },
     {
       "begin": "^\\s*",
-      "comment": "All constructs that generally span a single line starting with any number of white-spaces.",
       "end": "$",
       "patterns": [
         {
@@ -343,7 +333,6 @@
         },
         {
           "begin": "\\|",
-          "comment": "Tag pipe text line.",
           "end": "$",
           "name": "text.block.pipe.pug",
           "patterns": [
@@ -368,8 +357,7 @@
           "include": "#printed_expression"
         },
         {
-          "begin": "\\G(?=(#[^\\{\\w-])|[^\\w.#])",
-          "comment": "Line starting with characters incompatible with tag name/id/class is standalone text.",
+          "begin": "\\G(?=(#[^{\\w-])|[^\\w.#])",
           "end": "$",
           "patterns": [
             {
@@ -413,7 +401,7 @@
   "repository": {
     "babel_parens": {
       "begin": "\\(",
-      "end": "\\)|(({\\s*)?$)",
+      "end": "\\)|((\\{\\s*)?$)",
       "patterns": [
         {
           "include": "#babel_parens"
@@ -432,7 +420,6 @@
           "name": "variable.control.import.include.pug"
         }
       },
-      "comment": "Template blocks and includes.",
       "match": "(extends|include|yield|append|prepend|block( (append|prepend))?)\\s+(.*)$",
       "name": "meta.first-class.pug"
     },
@@ -443,7 +430,6 @@
           "name": "storage.type.function.pug"
         }
       },
-      "comment": "Pug case conditionals.",
       "end": "$",
       "name": "meta.control.flow.pug",
       "patterns": [
@@ -574,7 +560,6 @@
           "name": "storage.type.function.pug"
         }
       },
-      "comment": "Pug control flow.",
       "end": "$",
       "name": "meta.control.flow.pug",
       "patterns": [
@@ -619,11 +604,11 @@
     "html_entity": {
       "patterns": [
         {
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html.text.pug"
         },
         {
-          "match": "[<>&]",
+          "match": "[<>\\&]",
           "name": "invalid.illegal.html_entity.text.pug"
         }
       ]
@@ -638,7 +623,7 @@
           "name": "entity.name.function.pug"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "name": "inline.pug",
       "patterns": [
         {
@@ -648,8 +633,8 @@
           "include": "#mixin_call"
         },
         {
-          "begin": "(?<!\\])(?=[\\w.#])|(:\\s*)",
-          "end": "(?=\\]|(:.)|=|\\s)",
+          "begin": "(?<!])(?=[\\w.#])|(:\\s*)",
+          "end": "(?=]|(:.)|[=\\s])",
           "name": "tag.inline.pug",
           "patterns": [
             {
@@ -693,11 +678,11 @@
     },
     "inline_pug_text": {
       "begin": "",
-      "end": "(?=\\])",
+      "end": "(?=])",
       "patterns": [
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "patterns": [
             {
               "include": "#inline_pug_text"
@@ -726,12 +711,12 @@
       "name": "invalid.illegal.tag.pug"
     },
     "interpolated_value": {
-      "begin": "(?<!\\\\)[#!]\\{(?=.*?\\})",
-      "end": "\\}",
+      "begin": "(?<!\\\\)[#!]\\{(?=.*?})",
+      "end": "}",
       "name": "string.interpolated.pug",
       "patterns": [
         {
-          "match": "{",
+          "match": "\\{",
           "name": "invalid.illegal.tag.pug"
         },
         {
@@ -741,7 +726,7 @@
     },
     "js_braces": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#js_braces"
@@ -753,7 +738,7 @@
     },
     "js_brackets": {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#js_brackets"
@@ -776,7 +761,7 @@
       ]
     },
     "mixin_call": {
-      "begin": "((?:mixin\\s+)|\\+)([\\w-]+)",
+      "begin": "(mixin\\s+|\\+)([\\w-]+)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.pug"
@@ -831,16 +816,16 @@
           "name": "punctuation.definition.parameters.begin.js"
         }
       },
-      "match": "(mixin\\s+)([\\w-]+)(?:(\\()\\s*((?:[a-zA-Z_]\\w*\\s*)(?:,\\s*[a-zA-Z_]\\w*\\s*)*)(\\)))?$"
+      "match": "(mixin\\s+)([\\w-]+)(?:(\\()\\s*([a-zA-Z_]\\w*\\s*(?:,\\s*[a-zA-Z_]\\w*\\s*)*)(\\)))?$"
     },
     "printed_expression": {
-      "begin": "(!?\\=)\\s*",
+      "begin": "(!?=)\\s*",
       "captures": {
         "1": {
           "name": "constant"
         }
       },
-      "end": "(?=\\])|$",
+      "end": "(?=])|$",
       "name": "source.js",
       "patterns": [
         {
@@ -894,7 +879,7 @@
         },
         {
           "begin": "=\\s*",
-          "end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>?/])|\\))",
+          "end": "$|(?=,|\\s+[^!%\\&*\\-+~|<>?/]|\\))",
           "name": "attribute_value",
           "patterns": [
             {
@@ -912,8 +897,8 @@
           ]
         },
         {
-          "begin": "(?<=[%&*\\-+~|<>:?/])\\s+",
-          "end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>?/])|\\))",
+          "begin": "(?<=[%\\&*\\-+~|<>:?/])\\s+",
+          "end": "$|(?=,|\\s+[^!%\\&*\\-+~|<>?/]|\\))",
           "name": "attribute_value2",
           "patterns": [
             {
@@ -965,17 +950,17 @@
       ]
     },
     "tag_name": {
-      "begin": "([#!]\\{(?=.*?\\}))|(\\w(([\\w:-]+[\\w-])|([\\w-]*)))",
-      "end": "(\\G(?<!\\5[^\\w-]))|\\}|$",
+      "begin": "([#!]\\{(?=.*?}))|(\\w(([\\w:-]+[\\w-])|([\\w-]*)))",
+      "end": "(\\G(?<!\\5[^\\w-]))|}|$",
       "name": "meta.tag.other entity.name.tag.pug",
       "patterns": [
         {
           "begin": "\\G(?<=\\{)",
-          "end": "(?=\\})",
+          "end": "(?=})",
           "name": "meta.tag.other entity.name.tag.pug",
           "patterns": [
             {
-              "match": "{",
+              "match": "\\{",
               "name": "invalid.illegal.tag.pug"
             },
             {
@@ -1013,8 +998,7 @@
           "name": "variable.parameter.javascript.embedded.pug"
         }
       },
-      "comment": "name = function() {}",
-      "end": "(?=\\])|(({\\s*)?$)",
+      "end": "(?=])|((\\{\\s*)?$)",
       "name": "source.js",
       "patterns": [
         {
diff --git a/resources/languages/puppet.json b/resources/languages/puppet.json
index 4e974c8..ba81399 100644
--- a/resources/languages/puppet.json
+++ b/resources/languages/puppet.json
@@ -3,8 +3,8 @@
   "fileTypes": [
     "pp"
   ],
-  "foldingStartMarker": "(^\\s*/\\*|(\\{|\\[|\\()\\s*$)",
-  "foldingStopMarker": "(\\*/|^\\s*(\\}|\\]|\\)))",
+  "foldingStartMarker": "(^\\s*/\\*|([{\\[(])\\s*$)",
+  "foldingStopMarker": "(\\*/|^\\s*([}\\])]))",
   "name": "puppet",
   "patterns": [
     {
@@ -28,7 +28,7 @@
           "name": "entity.name.type.class.puppet"
         }
       },
-      "end": "(?={)",
+      "end": "(?=\\{)",
       "name": "meta.definition.class.puppet",
       "patterns": [
         {
@@ -53,7 +53,7 @@
           "name": "entity.name.type.class.puppet"
         }
       },
-      "end": "(?={)",
+      "end": "(?=\\{)",
       "name": "meta.definition.class.puppet",
       "patterns": [
         {
@@ -63,7 +63,7 @@
               "name": "storage.modifier.puppet"
             }
           },
-          "end": "(?=\\(|{)",
+          "end": "(?=[({])",
           "name": "meta.definition.class.inherits.puppet",
           "patterns": [
             {
@@ -93,7 +93,7 @@
           "name": "entity.name.type.plan.puppet"
         }
       },
-      "end": "(?={)",
+      "end": "(?=\\{)",
       "name": "meta.definition.plan.puppet",
       "patterns": [
         {
@@ -117,7 +117,7 @@
           "name": "entity.name.function.puppet"
         }
       },
-      "end": "(?={)",
+      "end": "(?=\\{)",
       "name": "meta.function.puppet",
       "patterns": [
         {
@@ -158,7 +158,7 @@
       "include": "#array"
     },
     {
-      "match": "((\\$?)\"?[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*\"?):(?=\\s+|$)",
+      "match": "((\\$?)\"?[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*\"?):(?=\\s+|$)",
       "name": "entity.name.section.puppet"
     },
     {
@@ -183,11 +183,11 @@
       "name": "constant.other.key.puppet"
     },
     {
-      "match": "(?<={)\\s*\\w+\\s*(?=})",
+      "match": "(?<=\\{)\\s*\\w+\\s*(?=})",
       "name": "constant.other.bareword.puppet"
     },
     {
-      "match": "\\b(alert|crit|debug|defined|emerg|err|escape|fail|failed|file|generate|gsub|info|notice|package|realize|search|tag|tagged|template|warning)\\b(?!.*{)",
+      "match": "\\b(alert|crit|debug|defined|emerg|err|escape|fail|failed|file|generate|gsub|info|notice|package|realize|search|tag|tagged|template|warning)\\b(?!.*\\{)",
       "name": "support.function.puppet"
     },
     {
@@ -214,7 +214,7 @@
           "name": "punctuation.definition.array.begin.puppet"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.array.end.puppet"
@@ -236,7 +236,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "\\b(absent|directory|false|file|present|running|stopped|true)\\b(?!.*{)",
+          "match": "\\b(absent|directory|false|file|present|running|stopped|true)\\b(?!.*\\{)",
           "name": "constant.language.puppet"
         }
       ]
@@ -289,7 +289,7 @@
           "name": "punctuation.definition.hash.begin.puppet"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.hash.end.puppet"
@@ -312,13 +312,13 @@
     "heredoc": {
       "patterns": [
         {
-          "begin": "@\\([[:blank:]]*\"([^:\\/) \\t]+)\"[[:blank:]]*(:[[:blank:]]*[a-z][a-zA-Z0-9_+]*[[:blank:]]*)?(\\/[[:blank:]]*[tsrnL$]*)?[[:blank:]]*\\)",
+          "begin": "@\\(\\p{blank}*\"([^:/) \\t]+)\"\\p{blank}*(:\\p{blank}*[a-z][a-zA-Z0-9_+]*\\p{blank}*)?(/\\p{blank}*[tsrnL$]*)?\\p{blank}*\\)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.puppet"
             }
           },
-          "end": "^[[:blank:]]*(\\|[[:blank:]]*-|\\||-)?[[:blank:]]*\\1",
+          "end": "^\\p{blank}*(\\|\\p{blank}*-|[|-])?\\p{blank}*\\1",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.puppet"
@@ -335,13 +335,13 @@
           ]
         },
         {
-          "begin": "@\\([[:blank:]]*([^:\\/) \\t]+)[[:blank:]]*(:[[:blank:]]*[a-z][a-zA-Z0-9_+]*[[:blank:]]*)?(\\/[[:blank:]]*[tsrnL$]*)?[[:blank:]]*\\)",
+          "begin": "@\\(\\p{blank}*([^:/) \\t]+)\\p{blank}*(:\\p{blank}*[a-z][a-zA-Z0-9_+]*\\p{blank}*)?(/\\p{blank}*[tsrnL$]*)?\\p{blank}*\\)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.puppet"
             }
           },
-          "end": "^[[:blank:]]*(\\|[[:blank:]]*-|\\||-)?[[:blank:]]*\\1",
+          "end": "^\\p{blank}*(\\|\\p{blank}*-|[|-])?\\p{blank}*\\1",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.puppet"
@@ -354,7 +354,7 @@
     "interpolated_puppet": {
       "patterns": [
         {
-          "begin": "(\\${)(\\d+)",
+          "begin": "(\\$\\{)(\\d+)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.begin.puppet"
@@ -378,7 +378,7 @@
           ]
         },
         {
-          "begin": "(\\${)(_[a-zA-Z0-9_]*)",
+          "begin": "(\\$\\{)(_[a-zA-Z0-9_]*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.begin.puppet"
@@ -402,7 +402,7 @@
           ]
         },
         {
-          "begin": "(\\${)(([a-z][a-z0-9_]*)?(?:::[a-z][a-z0-9_]*)*)",
+          "begin": "(\\$\\{)(([a-z][a-z0-9_]*)?(?:::[a-z][a-z0-9_]*)*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.begin.puppet"
@@ -426,7 +426,7 @@
           ]
         },
         {
-          "begin": "\\${",
+          "begin": "\\$\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.embedded.begin.puppet"
@@ -488,7 +488,7 @@
           "name": "punctuation.section.scope.puppet"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -505,7 +505,7 @@
           "name": "punctuation.section.scope.puppet"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -525,7 +525,7 @@
           "name": "punctuation.section.scope.puppet"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -542,7 +542,7 @@
           "name": "punctuation.section.scope.puppet"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -595,18 +595,15 @@
     "numbers": {
       "patterns": [
         {
-          "comment": "HEX 0x 0-f",
-          "match": "(?<!\\w|\\d)([-+]?)(?i:0x)(?i:[0-9a-f])+(?!\\w|\\d)",
+          "match": "(?<![\\w\\d])([-+]?)(?i:0x)(?i:[0-9a-f])+(?![\\w\\d])",
           "name": "constant.numeric.hexadecimal.puppet"
         },
         {
-          "comment": "INTEGERS [(+|-)] digits [e [(+|-)] digits]",
-          "match": "(?<!\\w|\\.)([-+]?)(?<!\\d)\\d+(?i:e(\\+|-){0,1}\\d+){0,1}(?!\\w|\\d|\\.)",
+          "match": "(?<![\\w.])([-+]?)(?<!\\d)\\d+(?i:e([+-])?\\d+)?(?![\\w\\d.])",
           "name": "constant.numeric.integer.puppet"
         },
         {
-          "comment": "FLOAT [(+|-)] digits . digits [e [(+|-)] digits]",
-          "match": "(?<!\\w)([-+]?)\\d+\\.\\d+(?i:e(\\+|-){0,1}\\d+){0,1}(?!\\w|\\d)",
+          "match": "(?<!\\w)([-+]?)\\d+\\.\\d+(?i:e([+-])?\\d+)?(?![\\w\\d])",
           "name": "constant.numeric.integer.puppet"
         }
       ]
@@ -642,19 +639,17 @@
     "puppet-datatypes": {
       "patterns": [
         {
-          "comment": "Puppet Data type",
-          "match": "(?<![a-zA-Z\\$])([A-Z][a-zA-Z0-9_]*)(?![a-zA-Z0-9_])",
+          "match": "(?<![a-zA-Z$])([A-Z][a-zA-Z0-9_]*)(?![a-zA-Z0-9_])",
           "name": "storage.type.puppet"
         }
       ]
     },
     "regex-literal": {
-      "comment": "Puppet Regular expression literal without interpolation",
-      "match": "(\\/)(.+?)(?:[^\\\\]\\/)",
+      "match": "(/)(.+?)[^\\\\]/",
       "name": "string.regexp.literal.puppet"
     },
     "resource-definition": {
-      "begin": "(?:^|\\b)(::[a-z][a-z0-9_]*|[a-z][a-z0-9_]*|(?:[a-z][a-z0-9_]*)?(?:::[a-z][a-z0-9_]*)+)\\s*({)\\s*",
+      "begin": "(?:^|\\b)(::[a-z][a-z0-9_]*|[a-z][a-z0-9_]*|(?:[a-z][a-z0-9_]*)?(?:::[a-z][a-z0-9_]*)+)\\s*(\\{)\\s*",
       "beginCaptures": {
         "1": {
           "name": "meta.definition.resource.puppet storage.type.puppet"
@@ -685,11 +680,11 @@
               "name": "punctuation.definition.variable.puppet"
             }
           },
-          "match": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=,|\\))",
+          "match": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=[,)])",
           "name": "meta.function.argument.puppet"
         },
         {
-          "begin": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)(?:\\s*(=)\\s*)\\s*",
+          "begin": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)\\s*(=)\\s*\\s*",
           "captures": {
             "1": {
               "name": "variable.other.puppet"
@@ -701,7 +696,7 @@
               "name": "keyword.operator.assignment.puppet"
             }
           },
-          "end": "(?=,|\\))",
+          "end": "(?=[,)])",
           "name": "meta.function.argument.puppet",
           "patterns": [
             {
diff --git a/resources/languages/purescript.json b/resources/languages/purescript.json
index 9497c9c..43df175 100644
--- a/resources/languages/purescript.json
+++ b/resources/languages/purescript.json
@@ -6,467 +6,95 @@
   "name": "purescript",
   "patterns": [
     {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.entity.purescript"
-        },
-        "2": {
-          "name": "punctuation.definition.entity.purescript"
-        }
-      },
-      "match": "(`)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(`)",
-      "name": "keyword.operator.function.infix.purescript"
+      "include": "#module_declaration"
     },
     {
-      "begin": "^\\s*\\b(module)(?!')\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.purescript"
-        }
-      },
-      "end": "(where)",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.other.purescript"
-        }
-      },
-      "name": "meta.declaration.module.purescript",
-      "patterns": [
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#module_name"
-        },
-        {
-          "include": "#module_exports"
-        },
-        {
-          "match": "[a-z]+",
-          "name": "invalid.purescript"
-        }
-      ]
+      "include": "#module_import"
     },
     {
-      "begin": "^\\s*\\b(class)(?!')\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.class.purescript"
-        }
-      },
-      "end": "\\b(where)\\b|$",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.other.purescript"
-        }
-      },
-      "name": "meta.declaration.typeclass.purescript",
-      "patterns": [
-        {
-          "include": "#type_signature"
-        }
-      ]
+      "include": "#type_synonym_declaration"
     },
     {
-      "begin": "^\\s*\\b(else\\s+)?(derive\\s+)?(newtype\\s+)?(instance)(?!')\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.purescript"
-        },
-        "2": {
-          "name": "keyword.other.purescript"
-        },
-        "3": {
-          "name": "keyword.other.purescript"
-        },
-        "4": {
-          "name": "keyword.other.purescript"
-        }
-      },
-      "contentName": "meta.type-signature.purescript",
-      "end": "\\b(where)\\b|$",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.other.purescript"
-        }
-      },
-      "name": "meta.declaration.instance.purescript",
-      "patterns": [
-        {
-          "include": "#type_signature"
-        }
-      ]
+      "include": "#data_type_declaration"
     },
     {
-      "begin": "^(\\s*)(foreign)\\s+(import)\\s+(data)\\s+([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)",
-      "beginCaptures": {
-        "2": {
-          "name": "keyword.other.purescript"
-        },
-        "3": {
-          "name": "keyword.other.purescript"
-        },
-        "4": {
-          "name": "keyword.other.purescript"
-        },
-        "5": {
-          "name": "entity.name.type.purescript"
-        },
-        "6": {
-          "name": "keyword.other.double-colon.purescript"
-        }
-      },
-      "contentName": "meta.kind-signature.purescript",
-      "end": "^(?!\\1[ \\t]|[ \\t]*$)",
-      "name": "meta.foreign.data.purescript",
-      "patterns": [
-        {
-          "include": "#double_colon"
-        },
-        {
-          "include": "#kind_signature"
-        }
-      ]
+      "include": "#typeclass_declaration"
     },
     {
-      "begin": "^(\\s*)(foreign)\\s+(import)\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)",
-      "beginCaptures": {
-        "2": {
-          "name": "keyword.other.purescript"
-        },
-        "3": {
-          "name": "keyword.other.purescript"
-        },
-        "4": {
-          "name": "entity.name.function.purescript"
-        }
-      },
-      "contentName": "meta.type-signature.purescript",
-      "end": "^(?!\\1[ \\t]|[ \\t]*$)",
-      "name": "meta.foreign.purescript",
-      "patterns": [
-        {
-          "include": "#double_colon"
-        },
-        {
-          "include": "#type_signature"
-        }
-      ]
+      "include": "#instance_declaration"
     },
     {
-      "begin": "^\\s*\\b(import)(?!')\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.purescript"
-        }
-      },
-      "end": "($|(?=--))",
-      "name": "meta.import.purescript",
-      "patterns": [
-        {
-          "include": "#module_name"
-        },
-        {
-          "include": "#module_exports"
-        },
-        {
-          "captures": {
-            "1": {
-              "name": "keyword.other.purescript"
-            }
-          },
-          "match": "\\b(as|hiding)\\b"
-        }
-      ]
+      "include": "#derive_declaration"
     },
     {
-      "begin": "^(\\s)*(data|newtype)\\s+(.+?)\\s*(?=\\=|$)",
-      "beginCaptures": {
-        "2": {
-          "name": "storage.type.data.purescript"
-        },
-        "3": {
-          "name": "meta.type-signature.purescript",
-          "patterns": [
-            {
-              "include": "#type_signature"
-            }
-          ]
-        }
-      },
-      "end": "^(?!\\1[ \\t]|[ \\t]*$)",
-      "name": "meta.declaration.type.data.purescript",
-      "patterns": [
-        {
-          "include": "#comments"
-        },
-        {
-          "captures": {
-            "0": {
-              "name": "keyword.operator.assignment.purescript"
-            }
-          },
-          "match": "="
-        },
-        {
-          "captures": {
-            "1": {
-              "patterns": [
-                {
-                  "include": "#data_ctor"
-                }
-              ]
-            },
-            "2": {
-              "name": "meta.type-signature.purescript",
-              "patterns": [
-                {
-                  "include": "#type_signature"
-                }
-              ]
-            }
-          },
-          "match": "(?:(?:\\b([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)\\s+)(?:(?<ctorArgs>(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:(?:[\\w()'→⇒\\[\\],]|->|=>)+\\s*)+))(?:\\s*(?:\\s+)\\s*\\g<ctorArgs>)?)?))"
-        },
-        {
-          "captures": {
-            "0": {
-              "name": "punctuation.separator.pipe.purescript"
-            }
-          },
-          "match": "\\|"
-        },
-        {
-          "include": "#record_types"
-        }
-      ]
+      "include": "#infix_op_declaration"
     },
     {
-      "begin": "^(\\s)*(type)\\s+(.+?)\\s*(?=\\=|$)",
-      "beginCaptures": {
-        "2": {
-          "name": "storage.type.data.purescript"
-        },
-        "3": {
-          "name": "meta.type-signature.purescript",
-          "patterns": [
-            {
-              "include": "#type_signature"
-            }
-          ]
-        }
-      },
-      "contentName": "meta.type-signature.purescript",
-      "end": "^(?!\\1[ \\t]|[ \\t]*$)",
-      "name": "meta.declaration.type.type.purescript",
-      "patterns": [
-        {
-          "captures": {
-            "0": {
-              "name": "keyword.operator.assignment.purescript"
-            }
-          },
-          "match": "="
-        },
-        {
-          "include": "#type_signature"
-        },
-        {
-          "include": "#record_types"
-        },
-        {
-          "include": "#comments"
-        }
-      ]
+      "include": "#foreign_import_data"
     },
     {
-      "match": "^\\s*\\b(derive|where|data|type|newtype|infix[lr]?|foreign(\\s+import)?(\\s+data)?)(?!')\\b",
-      "name": "keyword.other.purescript"
+      "include": "#foreign_import"
     },
     {
-      "match": "\\?(?:[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)",
-      "name": "entity.name.function.typed-hole.purescript"
+      "include": "#function_type_declaration"
     },
     {
-      "match": "^\\s*\\b(data|type|newtype)(?!')\\b",
-      "name": "storage.type.purescript"
+      "include": "#typed_hole"
     },
     {
-      "match": "\\b(do|ado|if|then|else|case|of|let|in)(?!('|\\s*(:|=)))\\b",
-      "name": "keyword.control.purescript"
+      "include": "#keywords_orphan"
     },
     {
-      "match": "\\b(?<!\\$)0(x|X)[0-9a-fA-F]+\\b(?!\\$)",
-      "name": "constant.numeric.hex.purescript"
+      "include": "#control_keywords"
     },
     {
-      "captures": {
-        "0": {
-          "name": "constant.numeric.decimal.purescript"
-        },
-        "1": {
-          "name": "meta.delimiter.decimal.period.purescript"
-        },
-        "2": {
-          "name": "meta.delimiter.decimal.period.purescript"
-        },
-        "3": {
-          "name": "meta.delimiter.decimal.period.purescript"
-        },
-        "4": {
-          "name": "meta.delimiter.decimal.period.purescript"
-        },
-        "5": {
-          "name": "meta.delimiter.decimal.period.purescript"
-        },
-        "6": {
-          "name": "meta.delimiter.decimal.period.purescript"
-        }
-      },
-      "match": "(?<!\\$)(?:(?:\\b[0-9]+(\\.)[0-9]+[eE][+-]?[0-9]+\\b)|(?:\\b[0-9]+[eE][+-]?[0-9]+\\b)|(?:\\b[0-9]+(\\.)[0-9]+\\b)|(?:\\b[0-9]+\\b(?!\\.)))(?!\\$)",
-      "name": "constant.numeric.decimal.purescript"
+      "include": "#function_infix"
     },
     {
-      "match": "\\b(true|false)\\b",
-      "name": "constant.language.boolean.purescript"
+      "include": "#data_ctor"
     },
     {
-      "match": "\\b(([0-9]+_?)*[0-9]+|0([xX][0-9a-fA-F]+|[oO][0-7]+))\\b",
-      "name": "constant.numeric.purescript"
+      "include": "#infix_op"
     },
     {
-      "begin": "\"\"\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.purescript"
-        }
-      },
-      "end": "\"\"\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.purescript"
-        }
-      },
-      "name": "string.quoted.triple.purescript"
+      "include": "#constants_numeric_decimal"
     },
     {
-      "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.purescript"
-        }
-      },
-      "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.purescript"
-        }
-      },
-      "name": "string.quoted.double.purescript",
-      "patterns": [
-        {
-          "include": "#characters"
-        },
-        {
-          "begin": "\\\\\\s",
-          "beginCaptures": {
-            "0": {
-              "name": "markup.other.escape.newline.begin.purescript"
-            }
-          },
-          "end": "\\\\",
-          "endCaptures": {
-            "0": {
-              "name": "markup.other.escape.newline.end.purescript"
-            }
-          },
-          "patterns": [
-            {
-              "match": "\\S+",
-              "name": "invalid.illegal.character-not-allowed-here.purescript"
-            }
-          ]
-        }
-      ]
+      "include": "#constant_numeric"
     },
     {
-      "match": "\\\\$",
-      "name": "markup.other.escape.newline.purescript"
+      "include": "#constant_boolean"
     },
     {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.string.begin.purescript"
-        },
-        "2": {
-          "patterns": [
-            {
-              "include": "#characters"
-            }
-          ]
-        },
-        "7": {
-          "name": "punctuation.definition.string.end.purescript"
-        }
-      },
-      "match": "(')((?:[ -\\[\\]-~]|(\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&]))|(\\\\o[0-7]+)|(\\\\x[0-9A-Fa-f]+)|(\\^[A-Z@\\[\\]\\\\\\^_])))(')",
-      "name": "string.quoted.single.purescript"
+      "include": "#string_triple_quoted"
     },
     {
-      "include": "#function_type_declaration"
+      "include": "#string_single_quoted"
     },
     {
-      "captures": {
-        "1": {
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
-        },
-        "2": {
-          "name": "keyword.other.double-colon.purescript"
-        },
-        "3": {
-          "name": "meta.type-signature.purescript",
-          "patterns": [
-            {
-              "include": "#type_signature"
-            }
-          ]
-        }
-      },
-      "match": "\\((?<paren>(?:[^()]|\\(\\g<paren>\\))*)(::|∷)(?<paren2>(?:[^()]|\\(\\g<paren2>\\))*)\\)"
+      "include": "#string_double_quoted"
     },
     {
-      "begin": "^(\\s*)(?:(::|∷))",
-      "beginCaptures": {
-        "2": {
-          "name": "keyword.other.double-colon.purescript"
-        }
-      },
-      "end": "^(?!\\1[ \\t]*|[ \\t]*$)",
-      "patterns": [
-        {
-          "include": "#type_signature"
-        }
-      ]
+      "include": "#markup_newline"
     },
     {
-      "include": "#data_ctor"
+      "include": "#double_colon_parens"
     },
     {
-      "include": "#comments"
+      "include": "#double_colon_inlined"
     },
     {
-      "include": "#infix_op"
+      "include": "#double_colon_orphan"
+    },
+    {
+      "include": "#comments"
     },
     {
-      "match": "\\<-|-\\>",
+      "match": "<-|->",
       "name": "keyword.other.arrow.purescript"
     },
     {
-      "match": "[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+",
+      "match": "[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+",
       "name": "keyword.operator.purescript"
     },
     {
@@ -485,7 +113,7 @@
               "name": "punctuation.definition.comment.documentation.purescript"
             }
           },
-          "end": "-\\}",
+          "end": "-}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.documentation.purescript"
@@ -506,7 +134,7 @@
               "name": "punctuation.definition.comment.purescript"
             }
           },
-          "end": "-\\}",
+          "end": "-}",
           "name": "comment.block.purescript",
           "patterns": [
             {
@@ -533,7 +161,7 @@
               "name": "constant.character.escape.control.purescript"
             }
           },
-          "match": "(?:[ -\\[\\]-~]|(\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&]))|(\\\\o[0-7]+)|(\\\\x[0-9A-Fa-f]+)|(\\^[A-Z@\\[\\]\\\\\\^_]))"
+          "match": "(?:[ -\\[\\]-~]|(\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\"'\\&]))|(\\\\o[0-7]+)|(\\\\x\\h+)|(\\^[A-Z@\\[\\]\\\\^_]))"
         }
       ]
     },
@@ -544,7 +172,7 @@
             "1": {
               "patterns": [
                 {
-                  "match": "\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*",
+                  "match": "\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*",
                   "name": "entity.name.type.purescript"
                 }
               ]
@@ -560,7 +188,7 @@
               ]
             }
           },
-          "match": "(?:(?:([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)\\s+)(?:(?<classConstraint>(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)(?:\\s*(?:\\s+)\\s*\\g<classConstraint>)?)))",
+          "match": "([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*)\\s+(?<classConstraint>(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)(?:\\s*\\s+\\s*(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*))*)",
           "name": "meta.class-constraint.purescript"
         }
       ]
@@ -568,31 +196,7 @@
     "comments": {
       "patterns": [
         {
-          "begin": "(^[ \\t]+)?(?=--+\\s+\\|)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.purescript"
-            }
-          },
-          "end": "(?!\\G)",
-          "patterns": [
-            {
-              "begin": "(--+)\\s+(\\|)",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.comment.purescript"
-                },
-                "2": {
-                  "name": "punctuation.definition.comment.documentation.purescript"
-                }
-              },
-              "end": "\\n",
-              "name": "comment.line.double-dash.documentation.purescript"
-            }
-          ]
-        },
-        {
-          "begin": "(^[ \\t]+)?(?=--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))",
+          "begin": "(^[ \\t]+)?(?=--+)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.whitespace.comment.leading.purescript"
@@ -617,43 +221,366 @@
         }
       ]
     },
-    "data_ctor": {
+    "constant_boolean": {
       "patterns": [
         {
-          "match": "\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*",
-          "name": "entity.name.tag.purescript"
+          "match": "\\b(true|false)(?!')\\b",
+          "name": "constant.language.boolean.purescript"
         }
       ]
     },
-    "double_colon": {
+    "constant_numeric": {
       "patterns": [
         {
-          "match": "(?:::|∷)",
-          "name": "keyword.other.double-colon.purescript"
+          "match": "\\b(([0-9]+_?)*[0-9]+|0([xX]\\h+|[oO][0-7]+))\\b",
+          "name": "constant.numeric.purescript"
         }
       ]
     },
-    "function_type_declaration": {
+    "constants_numeric_decimal": {
       "patterns": [
         {
-          "begin": "^(\\s*)([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)\\s*(?:(::|∷)(?!.*<-))",
-          "beginCaptures": {
+          "captures": {
+            "0": {
+              "name": "constant.numeric.decimal.purescript"
+            },
+            "1": {
+              "name": "meta.delimiter.decimal.period.purescript"
+            },
             "2": {
-              "name": "entity.name.function.purescript"
+              "name": "meta.delimiter.decimal.period.purescript"
             },
             "3": {
-              "name": "keyword.other.double-colon.purescript"
+              "name": "meta.delimiter.decimal.period.purescript"
+            },
+            "4": {
+              "name": "meta.delimiter.decimal.period.purescript"
+            },
+            "5": {
+              "name": "meta.delimiter.decimal.period.purescript"
+            },
+            "6": {
+              "name": "meta.delimiter.decimal.period.purescript"
             }
           },
-          "contentName": "meta.type-signature.purescript",
-          "end": "^(?!\\1[ \\t]|[ \\t]*$)",
-          "name": "meta.function.type-declaration.purescript",
-          "patterns": [
+          "match": "(?<!\\$)\\b(?:[0-9]+(\\.)[0-9]+[eE][+-]?[0-9]+\\b|[0-9]+[eE][+-]?[0-9]+\\b|[0-9]+(\\.)[0-9]+\\b|[0-9]+\\b(?!\\.))(?!\\$)",
+          "name": "constant.numeric.decimal.purescript"
+        }
+      ]
+    },
+    "control_keywords": {
+      "patterns": [
+        {
+          "match": "\\b(do|ado|if|then|else|case|of|let|in)(?!('|\\s*([:=])))\\b",
+          "name": "keyword.control.purescript"
+        }
+      ]
+    },
+    "data_ctor": {
+      "patterns": [
+        {
+          "match": "\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*",
+          "name": "entity.name.tag.purescript"
+        }
+      ]
+    },
+    "data_type_declaration": {
+      "patterns": [
+        {
+          "begin": "^(\\s)*(data|newtype)\\s+(.+?)\\s*(?==|$)",
+          "beginCaptures": {
+            "2": {
+              "name": "storage.type.data.purescript"
+            },
+            "3": {
+              "name": "meta.type-signature.purescript",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            }
+          },
+          "end": "^(?!\\1[ \\t]|[ \\t]*$)",
+          "name": "meta.declaration.type.data.purescript",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "captures": {
+                "2": {
+                  "patterns": [
+                    {
+                      "include": "#data_ctor"
+                    }
+                  ]
+                }
+              },
+              "match": "(?<=([|=])\\s*)([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)"
+            },
+            {
+              "captures": {
+                "0": {
+                  "name": "keyword.operator.pipe.purescript"
+                }
+              },
+              "match": "\\|"
+            },
+            {
+              "include": "#record_types"
+            },
+            {
+              "include": "#type_signature"
+            }
+          ]
+        }
+      ]
+    },
+    "derive_declaration": {
+      "patterns": [
+        {
+          "begin": "^\\s*\\b(derive)(\\s+newtype)?(\\s+instance)?(?!')\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.purescript"
+            },
+            "2": {
+              "name": "keyword.other.purescript"
+            },
+            "3": {
+              "name": "keyword.other.purescript"
+            },
+            "4": {
+              "name": "keyword.other.purescript"
+            }
+          },
+          "contentName": "meta.type-signature.purescript",
+          "end": "^(?=\\S)",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.other.purescript"
+            }
+          },
+          "name": "meta.declaration.derive.purescript",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ]
+        }
+      ]
+    },
+    "double_colon": {
+      "patterns": [
+        {
+          "match": "(?:::|∷)",
+          "name": "keyword.other.double-colon.purescript"
+        }
+      ]
+    },
+    "double_colon_inlined": {
+      "patterns": [
+        {
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "keyword.other.double-colon.purescript"
+                },
+                "2": {
+                  "name": "meta.type-signature.purescript",
+                  "patterns": [
+                    {
+                      "include": "#type_signature"
+                    }
+                  ]
+                }
+              },
+              "match": "((?:::|∷))(.*)(?=<-|\"\"\")"
+            }
+          ]
+        },
+        {
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "keyword.other.double-colon.purescript"
+                },
+                "2": {
+                  "name": "meta.type-signature.purescript",
+                  "patterns": [
+                    {
+                      "include": "#type_signature"
+                    }
+                  ]
+                }
+              },
+              "match": "((?:::|∷))(.*)"
+            }
+          ]
+        }
+      ]
+    },
+    "double_colon_orphan": {
+      "patterns": [
+        {
+          "begin": "(\\s*)(::|∷)(\\s*)$",
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.double-colon.purescript"
+            }
+          },
+          "end": "^(?!\\1[ \\t]*|[ \\t]*$)",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ]
+        }
+      ]
+    },
+    "double_colon_parens": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ]
+            },
+            "2": {
+              "name": "keyword.other.double-colon.purescript"
+            },
+            "3": {
+              "name": "meta.type-signature.purescript",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            }
+          },
+          "match": "\\((?<paren>(?:[^()]|\\(\\g<paren>\\))*)(::|∷)(?<paren2>(?:[^()]|\\(\\g<paren2>\\))*)\\)"
+        }
+      ]
+    },
+    "foreign_import": {
+      "patterns": [
+        {
+          "begin": "^(\\s*)(foreign)\\s+(import)\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)",
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.purescript"
+            },
+            "3": {
+              "name": "keyword.other.purescript"
+            },
+            "4": {
+              "name": "entity.name.function.purescript"
+            }
+          },
+          "contentName": "meta.type-signature.purescript",
+          "end": "^(?!\\1[ \\t]|[ \\t]*$)",
+          "name": "meta.foreign.purescript",
+          "patterns": [
             {
               "include": "#double_colon"
             },
             {
               "include": "#type_signature"
+            },
+            {
+              "include": "#record_types"
+            }
+          ]
+        }
+      ]
+    },
+    "foreign_import_data": {
+      "patterns": [
+        {
+          "begin": "^(\\s*)(foreign)\\s+(import)\\s+(data)(?:\\s+([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\\s*((?:::|∷)))?",
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.purescript"
+            },
+            "3": {
+              "name": "keyword.other.purescript"
+            },
+            "4": {
+              "name": "keyword.other.purescript"
+            },
+            "5": {
+              "name": "entity.name.type.purescript"
+            },
+            "6": {
+              "name": "keyword.other.double-colon.purescript"
+            }
+          },
+          "contentName": "meta.kind-signature.purescript",
+          "end": "^(?!\\1[ \\t]|[ \\t]*$)",
+          "name": "meta.foreign.data.purescript",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#type_signature"
+            },
+            {
+              "include": "#record_types"
+            }
+          ]
+        }
+      ]
+    },
+    "function_infix": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.purescript"
+            },
+            "2": {
+              "name": "punctuation.definition.entity.purescript"
+            }
+          },
+          "match": "(`)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(`)",
+          "name": "keyword.operator.function.infix.purescript"
+        }
+      ]
+    },
+    "function_type_declaration": {
+      "patterns": [
+        {
+          "begin": "^(\\s*)([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\\s*(::|∷)(?!.*<-)",
+          "beginCaptures": {
+            "2": {
+              "name": "entity.name.function.purescript"
+            },
+            "3": {
+              "name": "keyword.other.double-colon.purescript"
+            }
+          },
+          "contentName": "meta.type-signature.purescript",
+          "end": "^(?!\\1[ \\t]|[ \\t]*$)",
+          "name": "meta.function.type-declaration.purescript",
+          "patterns": [
+            {
+              "include": "#double_colon"
+            },
+            {
+              "include": "#type_signature"
+            },
+            {
+              "include": "#record_types"
+            },
+            {
+              "include": "#row_types"
             }
           ]
         }
@@ -662,7 +589,7 @@
     "generic_type": {
       "patterns": [
         {
-          "match": "\\b(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*",
+          "match": "\\b(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*",
           "name": "variable.other.generic-type.purescript"
         }
       ]
@@ -670,11 +597,106 @@
     "infix_op": {
       "patterns": [
         {
-          "match": "(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))",
+          "match": "\\((?!--+\\))[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+\\)",
           "name": "entity.name.function.infix.purescript"
         }
       ]
     },
+    "infix_op_declaration": {
+      "patterns": [
+        {
+          "begin": "^\\b(infix[l|r]?)(?!')\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.purescript"
+            }
+          },
+          "end": "($)",
+          "name": "meta.infix.declaration.purescript",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#data_ctor"
+            },
+            {
+              "match": "\\d+",
+              "name": "constant.numeric.purescript"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "keyword.other.purescript"
+                }
+              },
+              "match": "([[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+)"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "keyword.other.purescript"
+                },
+                "2": {
+                  "name": "entity.name.type.purescript"
+                }
+              },
+              "match": "\\b(type)\\s+([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*)\\b"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "keyword.other.purescript"
+                }
+              },
+              "match": "\\b(as|type)\\b"
+            }
+          ]
+        }
+      ]
+    },
+    "instance_declaration": {
+      "patterns": [
+        {
+          "begin": "^\\s*\\b(else\\s+)?(newtype\\s+)?(instance)(?!')\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.purescript"
+            },
+            "2": {
+              "name": "keyword.other.purescript"
+            },
+            "3": {
+              "name": "keyword.other.purescript"
+            },
+            "4": {
+              "name": "keyword.other.purescript"
+            }
+          },
+          "contentName": "meta.type-signature.purescript",
+          "end": "(\\bwhere\\b|(?=^\\S))",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.other.purescript"
+            }
+          },
+          "name": "meta.declaration.instance.purescript",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ]
+        }
+      ]
+    },
+    "keywords_orphan": {
+      "patterns": [
+        {
+          "match": "^\\s*\\b(derive|where|data|type|newtype|foreign(\\s+import)?(\\s+data)?)(?!')\\b",
+          "name": "keyword.other.purescript"
+        }
+      ]
+    },
     "kind_signature": {
       "patterns": [
         {
@@ -690,8 +712,50 @@
           "name": "keyword.other.pound-sign.purescript"
         },
         {
-          "match": "->|→",
-          "name": "keyword.other.arrow.purescript"
+          "match": "->|→",
+          "name": "keyword.other.arrow.purescript"
+        }
+      ]
+    },
+    "markup_newline": {
+      "patterns": [
+        {
+          "match": "\\\\$",
+          "name": "markup.other.escape.newline.purescript"
+        }
+      ]
+    },
+    "module_declaration": {
+      "patterns": [
+        {
+          "begin": "^\\s*\\b(module)(?!')\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.purescript"
+            }
+          },
+          "end": "(\\bwhere\\b)",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.other.purescript"
+            }
+          },
+          "name": "meta.declaration.module.purescript",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#module_name"
+            },
+            {
+              "include": "#module_exports"
+            },
+            {
+              "match": "[a-z]+",
+              "name": "invalid.purescript"
+            }
+          ]
         }
       ]
     },
@@ -706,7 +770,7 @@
               "include": "#comments"
             },
             {
-              "match": "\\b(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*",
+              "match": "\\b(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*",
               "name": "entity.name.function.purescript"
             },
             {
@@ -727,10 +791,46 @@
         }
       ]
     },
+    "module_import": {
+      "patterns": [
+        {
+          "begin": "^\\s*\\b(import)(?!')\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.purescript"
+            }
+          },
+          "end": "^(?=\\S)",
+          "name": "meta.import.purescript",
+          "patterns": [
+            {
+              "include": "#module_name"
+            },
+            {
+              "include": "#string_double_quoted"
+            },
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#module_exports"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "keyword.other.purescript"
+                }
+              },
+              "match": "\\b(as|hiding)\\b"
+            }
+          ]
+        }
+      ]
+    },
     "module_name": {
       "patterns": [
         {
-          "match": "(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)*[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.?",
+          "match": "(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)*[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.?",
           "name": "support.other.module.purescript"
         }
       ]
@@ -738,13 +838,17 @@
     "record_field_declaration": {
       "patterns": [
         {
-          "begin": "([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)\\s*(::|∷)",
+          "begin": "([ ,]\"(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\"|[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\\s*(::|∷)",
           "beginCaptures": {
             "1": {
               "patterns": [
                 {
-                  "match": "(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*",
+                  "match": "(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*",
                   "name": "entity.other.attribute-name.purescript"
+                },
+                {
+                  "match": "\"([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*|[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\"",
+                  "name": "string.quoted.double.purescript"
                 }
               ]
             },
@@ -753,14 +857,17 @@
             }
           },
           "contentName": "meta.type-signature.purescript",
-          "end": "(?=([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)\\s*(::|∷)|})",
+          "end": "(?=([ ,]\"(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\"|[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\\s*(::|∷)|}| \\)|^(?!\\1[ \\t]|[ \\t]*$))",
           "name": "meta.record-field.type-declaration.purescript",
           "patterns": [
+            {
+              "include": "#record_types"
+            },
             {
               "include": "#type_signature"
             },
             {
-              "include": "#record_types"
+              "include": "#comments"
             }
           ]
         }
@@ -769,13 +876,13 @@
     "record_types": {
       "patterns": [
         {
-          "begin": "\\{",
+          "begin": "\\{(?!-)",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.record.begin.purescript"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "keyword.operator.type.record.end.purescript"
@@ -787,11 +894,193 @@
               "match": ",",
               "name": "punctuation.separator.comma.purescript"
             },
+            {
+              "include": "#comments"
+            },
             {
               "include": "#record_field_declaration"
             },
+            {
+              "include": "#type_signature"
+            }
+          ]
+        }
+      ]
+    },
+    "row_types": {
+      "patterns": [
+        {
+          "begin": "\\((?=\\s*([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*|\"[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*\"|\"[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*\")\\s*(::|∷))",
+          "end": "(?=^\\S)",
+          "name": "meta.type.row.purescript",
+          "patterns": [
+            {
+              "match": ",",
+              "name": "punctuation.separator.comma.purescript"
+            },
             {
               "include": "#comments"
+            },
+            {
+              "include": "#record_field_declaration"
+            },
+            {
+              "include": "#type_signature"
+            }
+          ]
+        }
+      ]
+    },
+    "string_double_quoted": {
+      "patterns": [
+        {
+          "begin": "\"",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.purescript"
+            }
+          },
+          "end": "\"",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.purescript"
+            }
+          },
+          "name": "string.quoted.double.purescript",
+          "patterns": [
+            {
+              "include": "#characters"
+            },
+            {
+              "begin": "\\\\\\s",
+              "beginCaptures": {
+                "0": {
+                  "name": "markup.other.escape.newline.begin.purescript"
+                }
+              },
+              "end": "\\\\",
+              "endCaptures": {
+                "0": {
+                  "name": "markup.other.escape.newline.end.purescript"
+                }
+              },
+              "patterns": [
+                {
+                  "match": "\\S+",
+                  "name": "invalid.illegal.character-not-allowed-here.purescript"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "string_single_quoted": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.purescript"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#characters"
+                }
+              ]
+            },
+            "7": {
+              "name": "punctuation.definition.string.end.purescript"
+            }
+          },
+          "match": "(')((?:[ -\\[\\]-~]|(\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\"'\\&]))|(\\\\o[0-7]+)|(\\\\x\\h+)|(\\^[A-Z@\\[\\]\\\\^_])))(')",
+          "name": "string.quoted.single.purescript"
+        }
+      ]
+    },
+    "string_triple_quoted": {
+      "patterns": [
+        {
+          "begin": "\"\"\"",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.purescript"
+            }
+          },
+          "end": "\"\"\"",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.purescript"
+            }
+          },
+          "name": "string.quoted.triple.purescript"
+        }
+      ]
+    },
+    "type_kind_signature": {
+      "patterns": [
+        {
+          "begin": "^(data|newtype)\\s+([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)\\s*((?:::|∷))",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.data.purescript"
+            },
+            "2": {
+              "name": "meta.type-signature.purescript",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            },
+            "3": {
+              "name": "keyword.other.double-colon.purescript"
+            }
+          },
+          "end": "(?=^\\S)",
+          "name": "meta.declaration.type.data.signature.purescript",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            },
+            {
+              "captures": {
+                "0": {
+                  "name": "keyword.operator.assignment.purescript"
+                }
+              },
+              "match": "="
+            },
+            {
+              "captures": {
+                "1": {
+                  "patterns": [
+                    {
+                      "include": "#data_ctor"
+                    }
+                  ]
+                },
+                "2": {
+                  "name": "meta.type-signature.purescript",
+                  "patterns": [
+                    {
+                      "include": "#type_signature"
+                    }
+                  ]
+                }
+              },
+              "match": "\\b([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*)\\s+(?<ctorArgs>(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*|(?:(?:[\\w()'→⇒\\[\\],]|->|=>)+\\s*)+)(?:\\s*\\s+\\s*(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*|(?:(?:[\\w()'→⇒\\[\\],]|->|=>)+\\s*)+))*)?"
+            },
+            {
+              "captures": {
+                "0": {
+                  "name": "keyword.operator.pipe.purescript"
+                }
+              },
+              "match": "\\|"
+            },
+            {
+              "include": "#record_types"
             }
           ]
         }
@@ -800,13 +1089,16 @@
     "type_name": {
       "patterns": [
         {
-          "match": "\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*",
+          "match": "\\b[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*",
           "name": "entity.name.type.purescript"
         }
       ]
     },
     "type_signature": {
       "patterns": [
+        {
+          "include": "#record_types"
+        },
         {
           "captures": {
             "1": {
@@ -816,11 +1108,11 @@
                 }
               ]
             },
-            "4": {
+            "6": {
               "name": "keyword.other.big-arrow.purescript"
             }
           },
-          "match": "(?:(?:\\()(?:(?<classConstraints>(?:(?:(?:([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)\\s+)(?:(?<classConstraint>(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)(?:\\s*(?:\\s+)\\s*\\g<classConstraint>)?))))(?:\\s*(?:,)\\s*\\g<classConstraints>)?))(?:\\))(?:\\s*(=>|<=|⇐|⇒)))",
+          "match": "\\((?<classConstraints>([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*)\\s+(?<classConstraint>(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)(?:\\s*\\s+\\s*(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*))*)(?:\\s*,\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*)\\s+(?<classConstraint>(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)(?:\\s*\\s+\\s*(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*))*))*)\\)\\s*(=>|<=|[⇐⇒])",
           "name": "meta.class-constraints.purescript"
         },
         {
@@ -836,15 +1128,15 @@
               "name": "keyword.other.big-arrow.purescript"
             }
           },
-          "match": "((?:(?:([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)\\s+)(?:(?<classConstraint>(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)(?:\\s*(?:\\s+)\\s*\\g<classConstraint>)?))))\\s*(=>|<=|⇐|⇒)",
+          "match": "(([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*)\\s+(?<classConstraint>(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)(?:\\s*\\s+\\s*(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*))*))\\s*(=>|<=|[⇐⇒])",
           "name": "meta.class-constraints.purescript"
         },
         {
-          "match": "->|→",
+          "match": "(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(->|→)",
           "name": "keyword.other.arrow.purescript"
         },
         {
-          "match": "=>|⇒",
+          "match": "(?<![[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']])(=>|⇒)",
           "name": "keyword.other.big-arrow.purescript"
         },
         {
@@ -855,6 +1147,9 @@
           "match": "forall|∀",
           "name": "keyword.other.forall.purescript"
         },
+        {
+          "include": "#string_double_quoted"
+        },
         {
           "include": "#generic_type"
         },
@@ -863,6 +1158,87 @@
         },
         {
           "include": "#comments"
+        },
+        {
+          "match": "[[\\p{S}\\p{P}]&&[^(),;\\[\\]`{}_\"']]+",
+          "name": "keyword.other.purescript"
+        }
+      ]
+    },
+    "type_synonym_declaration": {
+      "patterns": [
+        {
+          "begin": "^(\\s)*(type)\\s+(.+?)\\s*(?==|$)",
+          "beginCaptures": {
+            "2": {
+              "name": "storage.type.data.purescript"
+            },
+            "3": {
+              "name": "meta.type-signature.purescript",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            }
+          },
+          "contentName": "meta.type-signature.purescript",
+          "end": "^(?!\\1[ \\t]|[ \\t]*$)",
+          "name": "meta.declaration.type.type.purescript",
+          "patterns": [
+            {
+              "captures": {
+                "0": {
+                  "name": "keyword.operator.assignment.purescript"
+                }
+              },
+              "match": "="
+            },
+            {
+              "include": "#type_signature"
+            },
+            {
+              "include": "#record_types"
+            },
+            {
+              "include": "#row_types"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        }
+      ]
+    },
+    "typeclass_declaration": {
+      "patterns": [
+        {
+          "begin": "^\\s*\\b(class)(?!')\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.class.purescript"
+            }
+          },
+          "end": "(\\bwhere\\b|(?=^\\S))",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.other.purescript"
+            }
+          },
+          "name": "meta.declaration.typeclass.purescript",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ]
+        }
+      ]
+    },
+    "typed_hole": {
+      "patterns": [
+        {
+          "match": "\\?(?:[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*|[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\d']*)",
+          "name": "entity.name.function.typed-hole.purescript"
         }
       ]
     }
diff --git a/resources/languages/python.json b/resources/languages/python.json
index bd2ec18..b39a234 100644
--- a/resources/languages/python.json
+++ b/resources/languages/python.json
@@ -41,8 +41,8 @@
       "name": "keyword.operator.assignment.python"
     },
     "backticks": {
-      "begin": "\\`",
-      "end": "(?:\\`|(?<!\\\\)(\\n))",
+      "begin": "`",
+      "end": "(?:`|(?<!\\\\)(\\n))",
       "name": "invalid.deprecated.backtick.python",
       "patterns": [
         {
@@ -101,7 +101,6 @@
     },
     "call-wrapper-inheritance": {
       "begin": "\\b(?=([[:alpha:]_]\\w*)\\s*(\\())",
-      "comment": "same as a function call, but in inheritance context",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -121,7 +120,7 @@
     "class-declaration": {
       "patterns": [
         {
-          "begin": "\\s*(class)\\s+(?=[[:alpha:]_]\\w*\\s*(:|\\())",
+          "begin": "\\s*(class)\\s+(?=[[:alpha:]_]\\w*\\s*([:(]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.python"
@@ -161,7 +160,7 @@
       "name": "meta.class.inheritance.python",
       "patterns": [
         {
-          "match": "(\\*\\*|\\*)",
+          "match": "(\\*(?:\\*|))",
           "name": "keyword.operator.unpacking.arguments.python"
         },
         {
@@ -227,12 +226,12 @@
           "name": "keyword.codetag.notation.python"
         }
       },
-      "match": "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)"
+      "match": "\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b"
     },
     "comments": {
       "patterns": [
         {
-          "begin": "(?:\\#\\s*(type:)\\s*+(?!$|\\#))",
+          "begin": "#\\s*(type:)\\s*+(?!$|#)",
           "beginCaptures": {
             "0": {
               "name": "meta.typehint.comment.python"
@@ -242,11 +241,11 @@
             }
           },
           "contentName": "meta.typehint.comment.python",
-          "end": "(?:$|(?=\\#))",
+          "end": "(?:$|(?=#))",
           "name": "comment.line.number-sign.python",
           "patterns": [
             {
-              "match": "\\Gignore(?=\\s*(?:$|\\#))",
+              "match": "\\Gignore(?=\\s*(?:$|#))",
               "name": "comment.typehint.ignore.notation.python"
             },
             {
@@ -254,7 +253,7 @@
               "name": "comment.typehint.type.notation.python"
             },
             {
-              "match": "([\\[\\]\\(\\),\\.\\=\\*]|(->))",
+              "match": "([\\[\\](),.=*]|(->))",
               "name": "comment.typehint.punctuation.notation.python"
             },
             {
@@ -269,7 +268,7 @@
       ]
     },
     "comments-base": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -284,7 +283,7 @@
       ]
     },
     "comments-string-double-three": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -299,7 +298,7 @@
       ]
     },
     "comments-string-single-three": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -320,7 +319,7 @@
           "name": "punctuation.definition.dict.begin.python"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dict.end.python"
@@ -346,7 +345,7 @@
           "name": "punctuation.definition.decorator.python"
         }
       },
-      "end": "(\\))(?:(.*?)(?=\\s*(?:\\#|$)))|(?=\\n|\\#)",
+      "end": "(\\))(.*?)(?=\\s*(?:#|$))|(?=[\\n#])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.arguments.end.python"
@@ -391,7 +390,7 @@
               "name": "invalid.illegal.decorator.python"
             }
           },
-          "match": "\\s*([^([:alpha:]\\s_\\.#\\\\].*?)(?=\\#|$)",
+          "match": "\\s*([^([:alpha:]\\s_.#\\\\].*?)(?=#|$)",
           "name": "invalid.illegal.decorator.python"
         }
       ]
@@ -399,7 +398,7 @@
     "docstring": {
       "patterns": [
         {
-          "begin": "(\\'\\'\\'|\\\"\\\"\\\")",
+          "begin": "('''|\"\"\")",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.python"
@@ -425,7 +424,7 @@
           ]
         },
         {
-          "begin": "([rR])(\\'\\'\\'|\\\"\\\"\\\")",
+          "begin": "([rR])('''|\"\"\")",
           "beginCaptures": {
             "1": {
               "name": "storage.type.string.python"
@@ -454,7 +453,7 @@
           ]
         },
         {
-          "begin": "(\\'|\\\")",
+          "begin": "(['\"])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.python"
@@ -480,7 +479,7 @@
           ]
         },
         {
-          "begin": "([rR])(\\'|\\\")",
+          "begin": "([rR])(['\"])",
           "beginCaptures": {
             "1": {
               "name": "storage.type.string.python"
@@ -529,12 +528,11 @@
           "name": "keyword.control.flow.python"
         }
       },
-      "match": "(?:(?:^|\\G)\\s*((?:>>>|\\.\\.\\.)\\s)(?=\\s*\\S))"
+      "match": "(?:^|\\G)\\s*((?:>>>|\\.\\.\\.)\\s)(?=\\s*\\S)"
     },
     "docstring-statement": {
-      "begin": "^(?=\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
-      "comment": "the string either terminates correctly or by the beginning of a new line (this is for single line docstrings that aren't terminated) AND it's not followed by another docstring",
-      "end": "((?<=\\1)|^)(?!\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
+      "begin": "^(?=\\s*[rR]?('''|\"\"\"|['\"]))",
+      "end": "((?<=\\1)|^)(?!\\s*[rR]?('''|\"\"\"|['\"]))",
       "patterns": [
         {
           "include": "#docstring"
@@ -544,10 +542,10 @@
     "double-one-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -559,7 +557,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\"))|((?=(?<!\\\\)\\n))",
+          "end": "(]|(?=\"))|((?=(?<!\\\\)\\n))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -574,7 +572,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -605,7 +603,7 @@
       ]
     },
     "double-one-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -773,7 +771,7 @@
       ]
     },
     "double-one-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -845,10 +843,10 @@
     "double-three-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -860,7 +858,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\"\"\"))",
+          "end": "(]|(?=\"\"\"))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -875,7 +873,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -906,7 +904,7 @@
       ]
     },
     "double-three-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -1092,7 +1090,7 @@
       ]
     },
     "double-three-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -1175,19 +1173,18 @@
       "name": "constant.other.ellipsis.python"
     },
     "escape-sequence": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|[0-7]{1,3}|[\\\\\"'abfnrtv])",
+      "match": "\\\\(x\\h{2}|[0-7]{1,3}|[\\\\\"'abfnrtv])",
       "name": "constant.character.escape.python"
     },
     "escape-sequence-unicode": {
       "patterns": [
         {
-          "match": "\\\\(u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8}|N\\{[\\w\\s]+?\\})",
+          "match": "\\\\(u\\h{4}|U\\h{8}|N\\{[\\w\\s]+?})",
           "name": "constant.character.escape.python"
         }
       ]
     },
     "expression": {
-      "comment": "All valid Python expressions",
       "patterns": [
         {
           "include": "#expression-base"
@@ -1196,13 +1193,11 @@
           "include": "#member-access"
         },
         {
-          "comment": "Tokenize identifiers to help linters",
           "match": "\\b([[:alpha:]_]\\w*)\\b"
         }
       ]
     },
     "expression-bare": {
-      "comment": "valid Python expressions w/o comments and line continuation",
       "patterns": [
         {
           "include": "#backticks"
@@ -1282,7 +1277,6 @@
       ]
     },
     "expression-base": {
-      "comment": "valid Python expressions with comments and line continuation",
       "patterns": [
         {
           "include": "#comments"
@@ -1296,7 +1290,6 @@
       ]
     },
     "f-expression": {
-      "comment": "All valid Python expressions, except comments and line continuation",
       "patterns": [
         {
           "include": "#expression-bare"
@@ -1305,7 +1298,6 @@
           "include": "#member-access"
         },
         {
-          "comment": "Tokenize identifiers to help linters",
           "match": "\\b([[:alpha:]_]\\w*)\\b"
         }
       ]
@@ -1319,7 +1311,7 @@
           "include": "#fstring-formatting-braces"
         },
         {
-          "match": "\\{.*?\\}"
+          "match": "\\{.*?}"
         },
         {
           "include": "#regexp-base-common"
@@ -1327,7 +1319,7 @@
       ]
     },
     "fregexp-quantifier": {
-      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}\\}",
+      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)}}",
       "name": "keyword.operator.quantifier.regexp"
     },
     "fstring-fnorm-quoted-multi-line": {
@@ -1430,11 +1422,10 @@
               "name": "constant.character.format.placeholder.other.python"
             }
           },
-          "comment": "empty braces are illegal",
-          "match": "({)(\\s*?)(})"
+          "match": "(\\{)(\\s*?)(})"
         },
         {
-          "match": "({{|}})",
+          "match": "(\\{\\{|}})",
           "name": "constant.character.escape.python"
         }
       ]
@@ -1473,8 +1464,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "comment": "it is illegal to have a multiline brace inside a single-line string",
-      "end": "(\\})|(?=\\n)",
+      "end": "(})|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1496,8 +1486,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "comment": "value interpolation using { ... }",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1513,7 +1502,7 @@
       ]
     },
     "fstring-multi-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|'''|\"\"\"))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|'''|\"\"\"))|\\n",
       "name": "string.interpolated.python string.quoted.multi.python"
     },
     "fstring-normf-quoted-multi-line": {
@@ -1603,7 +1592,7 @@
       ]
     },
     "fstring-raw-multi-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|'''|\"\"\"))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|'''|\"\"\"))|\\n",
       "name": "string.interpolated.python string.quoted.raw.multi.python"
     },
     "fstring-raw-quoted-multi-line": {
@@ -1677,7 +1666,7 @@
       ]
     },
     "fstring-raw-single-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n)))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|(['\"])|((?<!\\\\)\\n)))|\\n",
       "name": "string.interpolated.python string.quoted.raw.single.python"
     },
     "fstring-single-brace": {
@@ -1687,8 +1676,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "comment": "value interpolation using { ... }",
-      "end": "(\\})|(?=\\n)",
+      "end": "(})|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1704,7 +1692,7 @@
       ]
     },
     "fstring-single-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n)))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|(['\"])|((?<!\\\\)\\n)))|\\n",
       "name": "string.interpolated.python string.quoted.single.python"
     },
     "fstring-terminator-multi": {
@@ -1726,7 +1714,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "((?:=?)(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
+          "match": "(=?(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
         },
         {
           "include": "#fstring-terminator-multi-tail"
@@ -1734,7 +1722,7 @@
       ]
     },
     "fstring-terminator-multi-tail": {
-      "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
+      "begin": "(=?(?:![rsa])?)(:)(?=.*?\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.format.python"
@@ -1768,7 +1756,7 @@
           "name": "storage.type.format.python"
         },
         {
-          "match": "(\\#)",
+          "match": "(#)",
           "name": "storage.type.format.python"
         },
         {
@@ -1804,7 +1792,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "((?:=?)(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
+          "match": "(=?(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
         },
         {
           "include": "#fstring-terminator-single-tail"
@@ -1812,7 +1800,7 @@
       ]
     },
     "fstring-terminator-single-tail": {
-      "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
+      "begin": "(=?(?:![rsa])?)(:)(?=.*?\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.format.python"
@@ -1846,7 +1834,7 @@
           "name": "storage.type.format.python"
         },
         {
-          "match": "(\\#)",
+          "match": "(#)",
           "name": "storage.type.format.python"
         },
         {
@@ -1924,7 +1912,6 @@
     },
     "function-call": {
       "begin": "\\b(?=([[:alpha:]_]\\w*)\\s*(\\())",
-      "comment": "Regular function call of the type \"name(args)\"",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -1945,7 +1932,7 @@
       ]
     },
     "function-declaration": {
-      "begin": "\\s*(?:\\b(async)\\s+)?\\b(def)\\s+(?=[[:alpha:]_][[:word:]]*\\s*\\()",
+      "begin": "\\s*(?:\\b(async)\\s+)?\\b(def)\\s+(?=[[:alpha:]_]\\p{word}*\\s*\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.async.python"
@@ -1996,7 +1983,6 @@
           "include": "#builtin-possible-callables"
         },
         {
-          "comment": "Some color schemas support meta.function-call.generic scope",
           "match": "\\b([[:alpha:]_]\\w*)\\b",
           "name": "meta.function-call.generic.python"
         }
@@ -2009,7 +1995,6 @@
           "name": "keyword.control.flow.python"
         }
       },
-      "comment": "Match \"for ... in\" construct used in generators and for loops to\ncorrectly identify the \"in\" as a control flow keyword.\n",
       "end": "\\bin\\b",
       "endCaptures": {
         "0": {
@@ -2035,10 +2020,9 @@
           "name": "keyword.control.import.python"
         }
       },
-      "match": "\\b(?:(and|assert|async|await|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|in|is|(?<=\\.)lambda|lambda(?=\\s*[\\.=])|nonlocal|not|or|pass|raise|return|try|while|with|yield)|(as|import))\\b"
+      "match": "\\b(?:(and|assert|async|await|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|in|is|(?<=\\.)lambda|lambda(?=\\s*[.=])|nonlocal|not|or|pass|raise|return|try|while|with|yield)|(as|import))\\b"
     },
     "illegal-object-name": {
-      "comment": "It's illegal to name class or function \"True\"",
       "match": "\\b(True|False|None)\\b",
       "name": "keyword.illegal.name.python"
     },
@@ -2053,14 +2037,12 @@
           "name": "invalid.illegal.operator.python"
         },
         {
-          "comment": "We don't want `!` to flash when we're typing `!=`",
           "match": "!\\b",
           "name": "invalid.illegal.operator.python"
         }
       ]
     },
     "import": {
-      "comment": "Import statements used to correctly mark `from`, `import`, and `as`\n",
       "patterns": [
         {
           "begin": "\\b(?<!\\.)(from)\\b(?=.+import)",
@@ -2101,7 +2083,6 @@
       ]
     },
     "impossible": {
-      "comment": "This is a special rule that should be used where no match is desired. It is not a good idea to match something like '1{0}' because in some cases that can result in infinite loops in token generation. So the rule instead matches and impossible expression to allow a match to fail and move to the next token.",
       "match": "$.^"
     },
     "inheritance-identifier": {
@@ -2129,7 +2110,7 @@
       "patterns": [
         {
           "begin": "\\b(?=[[:alpha:]_]\\w*\\s*\\[)",
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.python"
@@ -2158,7 +2139,7 @@
         }
       },
       "contentName": "meta.item-access.arguments.python",
-      "end": "(?=\\])",
+      "end": "(?=])",
       "patterns": [
         {
           "match": ":",
@@ -2194,7 +2175,7 @@
               "name": "keyword.control.flow.python"
             }
           },
-          "match": "((?<=\\.)lambda|lambda(?=\\s*[\\.=]))"
+          "match": "((?<=\\.)lambda|lambda(?=\\s*[.=]))"
         },
         {
           "captures": {
@@ -2225,7 +2206,7 @@
               "name": "keyword.operator.positional.parameter.python"
             },
             {
-              "match": "(\\*\\*|\\*)",
+              "match": "(\\*(?:\\*|))",
               "name": "keyword.operator.unpacking.parameter.python"
             },
             {
@@ -2317,7 +2298,7 @@
               "name": "punctuation.separator.continuation.line.python"
             }
           },
-          "end": "(?=^\\s*$)|(?!(\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))|(\\G$))",
+          "end": "(?=^\\s*$)|(?!(\\s*[rR]?('''|\"\"\"|['\"]))|(\\G$))",
           "patterns": [
             {
               "include": "#regexp"
@@ -2336,7 +2317,7 @@
           "name": "punctuation.definition.list.begin.python"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.list.end.python"
@@ -2384,7 +2365,6 @@
           "name": "support.function.magic.python"
         }
       },
-      "comment": "these methods have magic interpretation by python and are generally called\nindirectly through syntactic constructs\n",
       "match": "\\b(__(?:abs|add|aenter|aexit|aiter|and|anext|await|bool|call|ceil|class_getitem|cmp|coerce|complex|contains|copy|deepcopy|del|delattr|delete|delitem|delslice|dir|div|divmod|enter|eq|exit|float|floor|floordiv|format|ge|get|getattr|getattribute|getinitargs|getitem|getnewargs|getslice|getstate|gt|hash|hex|iadd|iand|idiv|ifloordiv||ilshift|imod|imul|index|init|instancecheck|int|invert|ior|ipow|irshift|isub|iter|itruediv|ixor|le|len|long|lshift|lt|missing|mod|mul|ne|neg|new|next|nonzero|oct|or|pos|pow|radd|rand|rdiv|rdivmod|reduce|reduce_ex|repr|reversed|rfloordiv||rlshift|rmod|rmul|ror|round|rpow|rrshift|rshift|rsub|rtruediv|rxor|set|setattr|setitem|set_name|setslice|setstate|sizeof|str|sub|subclasscheck|truediv|trunc|unicode|xor|matmul|rmatmul|imatmul|init_subclass|set_name|fspath|bytes|prepare|length_hint)__)\\b"
     },
     "magic-names": {
@@ -2403,7 +2383,6 @@
           "name": "support.variable.magic.python"
         }
       },
-      "comment": "magic variables which a class/module may have.",
       "match": "\\b(__(?:all|annotations|bases|builtins|class|closure|code|debug|defaults|dict|doc|file|func|globals|kwdefaults|match_args|members|metaclass|methods|module|mro|mro_entries|name|qualname|post_init|self|signature|slots|subclasses|version|weakref|wrapped|classcell|spec|path|package|future|traceback)__)\\b"
     },
     "member-access": {
@@ -2428,7 +2407,6 @@
       ]
     },
     "member-access-attribute": {
-      "comment": "Highlight attribute access in otherwise non-specialized cases.",
       "match": "\\b([[:alpha:]_]\\w*)\\b",
       "name": "meta.attribute.python"
     },
@@ -2508,7 +2486,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[bB])(_?[01])+\\b",
+      "match": "(?<![\\w.])(0[bB])(_?[01])+\\b",
       "name": "constant.numeric.bin.python"
     },
     "number-dec": {
@@ -2520,7 +2498,7 @@
           "name": "invalid.illegal.dec.python"
         }
       },
-      "match": "(?<![\\w\\.])(?:[1-9](?:_?[0-9])*|0+|[0-9](?:_?[0-9])*([jJ])|0([0-9]+)(?![eE\\.]))\\b",
+      "match": "(?<![\\w.])(?:[1-9](?:_?[0-9])*|0+|[0-9](?:_?[0-9])*([jJ])|0([0-9]+)(?![eE.]))\\b",
       "name": "constant.numeric.dec.python"
     },
     "number-float": {
@@ -2529,7 +2507,7 @@
           "name": "storage.type.imaginary.number.python"
         }
       },
-      "match": "(?<!\\w)(?:(?:\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.)(?:[eE][+-]?[0-9](?:_?[0-9])*)?|[0-9](?:_?[0-9])*(?:[eE][+-]?[0-9](?:_?[0-9])*))([jJ])?\\b",
+      "match": "(?<!\\w)(?:(?:\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.)(?:[eE][+-]?[0-9](?:_?[0-9])*)?|[0-9](?:_?[0-9])*[eE][+-]?[0-9](?:_?[0-9])*)([jJ])?\\b",
       "name": "constant.numeric.float.python"
     },
     "number-hex": {
@@ -2538,7 +2516,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[xX])(_?[0-9a-fA-F])+\\b",
+      "match": "(?<![\\w.])(0[xX])(_?\\h)+\\b",
       "name": "constant.numeric.hex.python"
     },
     "number-long": {
@@ -2547,8 +2525,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "comment": "this is to support python2 syntax for long ints",
-      "match": "(?<![\\w\\.])([1-9][0-9]*|0)([lL])\\b",
+      "match": "(?<![\\w.])([1-9][0-9]*|0)([lL])\\b",
       "name": "constant.numeric.bin.python"
     },
     "number-oct": {
@@ -2557,12 +2534,11 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[oO])(_?[0-7])+\\b",
+      "match": "(?<![\\w.])(0[oO])(_?[0-7])+\\b",
       "name": "constant.numeric.oct.python"
     },
     "odd-function-call": {
-      "begin": "(?<=\\]|\\))\\s*(?=\\()",
-      "comment": "A bit obscured function call where there may have been an\narbitrary number of other operations to get the function.\nE.g. \"arr[idx](args)\"\n",
+      "begin": "(?<=[\\])])\\s*(?=\\()",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -2596,7 +2572,7 @@
           "name": "keyword.operator.assignment.python"
         }
       },
-      "match": "\\b(?<!\\.)(?:(and|or|not|in|is)|(for|if|else|await|(?:yield(?:\\s+from)?)))(?!\\s*:)\\b|(<<|>>|&|\\||\\^|~)|(\\*\\*|\\*|\\+|-|%|//|/|@)|(!=|==|>=|<=|<|>)|(:=)"
+      "match": "\\b(?<!\\.)(?:(and|or|not|in|is)|(for|if|else|await|yield(?:\\s+from)?))(?!\\s*:)\\b|(<<|>>|[\\&|^~])|(\\*\\*|[*+\\-%]|//|[/@])|(!=|==|>=|<=|[<>])|(:=)"
     },
     "parameter-special": {
       "captures": {
@@ -2635,7 +2611,7 @@
           "name": "keyword.operator.positional.parameter.python"
         },
         {
-          "match": "(\\*\\*|\\*)",
+          "match": "(\\*(?:\\*|))",
           "name": "keyword.operator.unpacking.parameter.python"
         },
         {
@@ -2712,7 +2688,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp"
         }
       },
-      "match": "(\\()(\\?P=\\w+(?:\\s+[[:alnum:]]+)?)(\\))",
+      "match": "(\\()(\\?P=\\w+(?:\\s+\\p{alnum}+)?)(\\))",
       "name": "meta.backreference.named.regexp"
     },
     "regexp-backreference-number": {
@@ -2854,7 +2830,7 @@
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-character": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|0[0-7]{1,2}|[0-7]{3})",
+      "match": "\\\\(x\\h{2}|0[0-7]{1,2}|[0-7]{3})",
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-sequence": {
@@ -2881,7 +2857,7 @@
       "name": "support.other.escape.special.regexp"
     },
     "regexp-escape-unicode": {
-      "match": "\\\\(u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+      "match": "\\\\(u\\h{4}|U\\h{8})",
       "name": "constant.character.unicode.regexp"
     },
     "regexp-flags": {
@@ -2889,11 +2865,11 @@
       "name": "storage.modifier.flag.regexp"
     },
     "regexp-quantifier": {
-      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}",
+      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)}",
       "name": "keyword.operator.quantifier.regexp"
     },
     "regexp-single-one-line": {
-      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\')",
+      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(')",
       "beginCaptures": {
         "2": {
           "name": "invalid.deprecated.prefix.python"
@@ -2908,7 +2884,7 @@
           "name": "punctuation.definition.string.begin.python"
         }
       },
-      "end": "(\\')|(?<!\\\\)(\\n)",
+      "end": "(')|(?<!\\\\)(\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.python"
@@ -2925,7 +2901,7 @@
       ]
     },
     "regexp-single-three-line": {
-      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\'\\'\\')",
+      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(''')",
       "beginCaptures": {
         "2": {
           "name": "invalid.deprecated.prefix.python"
@@ -2940,7 +2916,7 @@
           "name": "punctuation.definition.string.begin.python"
         }
       },
-      "end": "(\\'\\'\\')",
+      "end": "(''')",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.python"
@@ -2992,7 +2968,7 @@
     "semicolon": {
       "patterns": [
         {
-          "match": "\\;$",
+          "match": ";$",
           "name": "invalid.deprecated.semicolon.python"
         }
       ]
@@ -3000,10 +2976,10 @@
     "single-one-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -3015,7 +2991,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\\'))|((?=(?<!\\\\)\\n))",
+          "end": "(]|(?='))|((?=(?<!\\\\)\\n))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -3030,7 +3006,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -3044,7 +3020,7 @@
           "name": "punctuation.comment.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "punctuation.comment.end.regexp"
@@ -3061,7 +3037,7 @@
       ]
     },
     "single-one-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -3070,7 +3046,7 @@
           "name": "punctuation.parenthesis.conditional.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
@@ -3138,7 +3114,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3163,7 +3139,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3188,7 +3164,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3213,7 +3189,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3229,7 +3205,7 @@
       ]
     },
     "single-one-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -3238,7 +3214,7 @@
           "name": "entity.name.tag.named.group.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
@@ -3261,7 +3237,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
@@ -3283,7 +3259,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
@@ -3301,10 +3277,10 @@
     "single-three-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -3316,7 +3292,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\\'\\'\\'))",
+          "end": "(]|(?='''))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -3331,7 +3307,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -3345,7 +3321,7 @@
           "name": "punctuation.comment.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "punctuation.comment.end.regexp"
@@ -3362,7 +3338,7 @@
       ]
     },
     "single-three-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -3371,7 +3347,7 @@
           "name": "punctuation.parenthesis.conditional.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
@@ -3445,7 +3421,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3473,7 +3449,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3501,7 +3477,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3529,7 +3505,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3548,7 +3524,7 @@
       ]
     },
     "single-three-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -3557,7 +3533,7 @@
           "name": "entity.name.tag.named.group.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
@@ -3583,7 +3559,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
@@ -3608,7 +3584,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
@@ -3627,7 +3603,7 @@
       ]
     },
     "special-names": {
-      "match": "\\b(_*[[:upper:]][_\\d]*[[:upper:]])[[:upper:]\\d]*(_\\w*)?\\b",
+      "match": "\\b(_*\\p{upper}[_\\d]*\\p{upper})[[:upper:]\\d]*(_\\w*)?\\b",
       "name": "constant.other.caps.python"
     },
     "special-variables": {
@@ -3679,12 +3655,10 @@
           "name": "storage.type.function.python"
         },
         {
-          "comment": "if `as` is eventually followed by `:` or line continuation\nit's probably control flow like:\n    with foo as bar, \\\n         Foo as Bar:\n      try:\n        do_stuff()\n      except Exception as e:\n        pass\n",
           "match": "\\b(?<!\\.)as\\b(?=.*[:\\\\])",
           "name": "keyword.control.flow.python"
         },
         {
-          "comment": "other legal use of `as` is in an import",
           "match": "\\b(?<!\\.)as\\b",
           "name": "keyword.control.import.python"
         },
@@ -3822,7 +3796,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "({{|}}|(?:{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?}))",
+          "match": "(\\{\\{|}}|\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?})",
           "name": "meta.format.brace.python"
         },
         {
@@ -3837,7 +3811,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "({\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?\\}[^'\"{}\\n]*)*})",
+          "match": "(\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?}[^'\"{}\\n]*)*})",
           "name": "meta.format.brace.python"
         }
       ]
@@ -3872,8 +3846,7 @@
       "name": "constant.language.python"
     },
     "string-multi-bad-brace1-formatting-raw": {
-      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3882,8 +3855,7 @@
       ]
     },
     "string-multi-bad-brace1-formatting-unicode": {
-      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3898,8 +3870,7 @@
       ]
     },
     "string-multi-bad-brace2-formatting-raw": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:\\.\\[}\\w]).*?(?!'''|\"\"\")\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:.\\[}\\w]).*?(?!'''|\"\"\")})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3911,8 +3882,7 @@
       ]
     },
     "string-multi-bad-brace2-formatting-unicode": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:\\.\\[}\\w]).*?(?!'''|\"\"\")\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:.\\[}\\w]).*?(?!'''|\"\"\")})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -4139,8 +4109,7 @@
       ]
     },
     "string-single-bad-brace1-formatting-raw": {
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4149,8 +4118,7 @@
       ]
     },
     "string-single-bad-brace1-formatting-unicode": {
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4165,8 +4133,7 @@
       ]
     },
     "string-single-bad-brace2-formatting-raw": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4178,8 +4145,7 @@
       ]
     },
     "string-single-bad-brace2-formatting-unicode": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
diff --git a/resources/languages/qml.json b/resources/languages/qml.json
index 7d595cc..3573a73 100644
--- a/resources/languages/qml.json
+++ b/resources/languages/qml.json
@@ -39,9 +39,9 @@
     "attributes-value": {
       "patterns": [
         {
-          "begin": "(?<=\\w)\\s*\\:\\s*(?=[A-Z]\\w*\\s*\\{)",
+          "begin": "(?<=\\w)\\s*:\\s*(?=[A-Z]\\w*\\s*\\{)",
           "description": "A QML object as value.",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#object"
@@ -49,9 +49,9 @@
           ]
         },
         {
-          "begin": "(?<=\\w)\\s*\\:\\s*\\[",
+          "begin": "(?<=\\w)\\s*:\\s*\\[",
           "description": "A list as value.",
-          "end": "\\](.*)$",
+          "end": "](.*)$",
           "endCaptures": {
             "0": {
               "patterns": [
@@ -71,14 +71,14 @@
           ]
         },
         {
-          "begin": "(?<=\\w)\\s*\\:(?=\\s*\\{?\\s*$)",
+          "begin": "(?<=\\w)\\s*:(?=\\s*\\{?\\s*$)",
           "description": "A block of JavaScript code as value.",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "begin": "\\{",
               "contentName": "meta.embedded.block.js",
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.js"
@@ -88,10 +88,10 @@
           ]
         },
         {
-          "begin": "(?<=\\w)\\s*\\:",
+          "begin": "(?<=\\w)\\s*:",
           "contentName": "meta.embedded.line.js",
           "description": "A JavaScript expression as value.",
-          "end": ";|$|(?=\\})",
+          "end": ";|$|(?=})",
           "patterns": [
             {
               "include": "source.js"
@@ -103,7 +103,7 @@
     "comment": {
       "patterns": [
         {
-          "begin": "(\\/\\/:)",
+          "begin": "(//:)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.qml.tr"
@@ -117,7 +117,7 @@
           ]
         },
         {
-          "begin": "(\\/\\/[~|=])\\s*([A-Za-z_$][\\w$.\\[\\]]*)",
+          "begin": "(//[~|=])\\s*([A-Za-z_$][\\w$.\\[\\]]*)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.qml.tr"
@@ -134,7 +134,7 @@
           ]
         },
         {
-          "begin": "(\\/\\/)",
+          "begin": "(//)",
           "beginCaptures": {
             "1": {
               "name": "comment.line.double-slash.qml"
@@ -148,13 +148,13 @@
           ]
         },
         {
-          "begin": "(\\/\\*)",
+          "begin": "(/\\*)",
           "beginCaptures": {
             "1": {
               "name": "comment.line.double-slash.qml"
             }
           },
-          "end": "(\\*\\/)",
+          "end": "(\\*/)",
           "endCaptures": {
             "1": {
               "name": "comment.line.double-slash.qml"
@@ -207,7 +207,7 @@
               "name": "variable.parameter.qml"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "$self"
@@ -288,7 +288,7 @@
               "name": "storage.type.qml"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "begin": "([_a-zA-Z]\\w*)\\s*\\(",
@@ -307,7 +307,7 @@
             {
               "begin": "\\{",
               "contentName": "meta.embedded.block.js",
-              "end": "\\}",
+              "end": "}",
               "patterns": [
                 {
                   "include": "source.js"
@@ -327,7 +327,7 @@
               "name": "entity.name.type.qml"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "$self"
diff --git a/resources/languages/qss.json b/resources/languages/qss.json
index 4b5652d..a925c4b 100644
--- a/resources/languages/qss.json
+++ b/resources/languages/qss.json
@@ -38,7 +38,7 @@
           "name": "support.constant.property-value.named-color.qss"
         },
         {
-          "match": "#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})\\b",
+          "match": "#(\\h{3}|\\h{6}|\\h{8})\\b",
           "name": "support.constant.property-value.color.qss"
         }
       ]
@@ -117,7 +117,7 @@
       "patterns": [
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "patterns": [
             {
               "include": "#comment-block"
@@ -137,7 +137,7 @@
       "patterns": [
         {
           "begin": ":",
-          "end": ";|(?=\\})",
+          "end": ";|(?=})",
           "patterns": [
             {
               "include": "#comment-block"
@@ -146,7 +146,7 @@
               "include": "#color"
             },
             {
-              "begin": "\\b(qlineargradient|qradialgradient|qconicalgradient)\\s*\\(",
+              "begin": "\\b(q(?:lineargradient|radialgradient|conicalgradient))\\s*\\(",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.qss"
@@ -215,7 +215,7 @@
       "patterns": [
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#comment-block"
@@ -267,7 +267,7 @@
     "stylable-widgets": {
       "patterns": [
         {
-          "match": "\\b(QAbstractScrollArea|QAbstractItemView|QCheckBox|QColumnView|QComboBox|QDateEdit|QDateTimeEdit|QDialog|QDialogButtonBox|QDockWidget|QDoubleSpinBox|QFrame|QGroupBox|QHeaderView|QLabel|QLineEdit|QListView|QListWidget|QMainWindow|QMenu|QMenuBar|QMessageBox|QProgressBar|QPlainTextEdit|QPushButton|QRadioButton|QScrollBar|QSizeGrip|QSlider|QSpinBox|QSplitter|QStatusBar|QTabBar|QTabWidget|QTableView|QTableWidget|QTextEdit|QTimeEdit|QToolBar|QToolButton|QToolBox|QToolTip|QTreeView|QTreeWidget|QWidget)\\b",
+          "match": "\\b(Q(?:AbstractScrollArea|AbstractItemView|CheckBox|ColumnView|ComboBox|DateEdit|DateTimeEdit|Dialog|DialogButtonBox|DockWidget|DoubleSpinBox|Frame|GroupBox|HeaderView|Label|LineEdit|ListView|ListWidget|MainWindow|Menu|MenuBar|MessageBox|ProgressBar|PlainTextEdit|PushButton|RadioButton|ScrollBar|SizeGrip|Slider|SpinBox|Splitter|StatusBar|TabBar|TabWidget|TableView|TableWidget|TextEdit|TimeEdit|ToolBar|ToolButton|ToolBox|ToolTip|TreeView|TreeWidget|Widget))\\b",
           "name": "entity.name.type.qss"
         }
       ]
diff --git a/resources/languages/r.json b/resources/languages/r.json
index 8535af9..de5205d 100644
--- a/resources/languages/r.json
+++ b/resources/languages/r.json
@@ -68,7 +68,7 @@
               "name": "punctuation.section.brackets.single.begin.r"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.brackets.single.end.r"
@@ -88,7 +88,7 @@
             }
           },
           "contentName": "meta.item-access.arguments.r",
-          "end": "\\]\\]",
+          "end": "]]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.brackets.double.end.r"
@@ -107,7 +107,7 @@
               "name": "punctuation.section.braces.begin.r"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.braces.end.r"
@@ -221,35 +221,35 @@
           "name": "constant.language.r"
         },
         {
-          "match": "\\b0(x|X)[0-9a-fA-F]+i\\b",
+          "match": "\\b0([xX])\\h+i\\b",
           "name": "constant.numeric.imaginary.hexadecimal.r"
         },
         {
-          "match": "\\b[0-9]+\\.?[0-9]*(?:(e|E)(\\+|-)?[0-9]+)?i\\b",
+          "match": "\\b[0-9]+\\.?[0-9]*(?:([eE])([+-])?[0-9]+)?i\\b",
           "name": "constant.numeric.imaginary.decimal.r"
         },
         {
-          "match": "\\.[0-9]+(?:(e|E)(\\+|-)?[0-9]+)?i\\b",
+          "match": "\\.[0-9]+(?:([eE])([+-])?[0-9]+)?i\\b",
           "name": "constant.numeric.imaginary.decimal.r"
         },
         {
-          "match": "\\b0(x|X)[0-9a-fA-F]+L\\b",
+          "match": "\\b0([xX])\\h+L\\b",
           "name": "constant.numeric.integer.hexadecimal.r"
         },
         {
-          "match": "\\b(?:[0-9]+\\.?[0-9]*)(?:(e|E)(\\+|-)?[0-9]+)?L\\b",
+          "match": "\\b[0-9]+\\.?[0-9]*(?:([eE])([+-])?[0-9]+)?L\\b",
           "name": "constant.numeric.integer.decimal.r"
         },
         {
-          "match": "\\b0(x|X)[0-9a-fA-F]+\\b",
+          "match": "\\b0([xX])\\h+\\b",
           "name": "constant.numeric.float.hexadecimal.r"
         },
         {
-          "match": "\\b[0-9]+\\.?[0-9]*(?:(e|E)(\\+|-)?[0-9]+)?\\b",
+          "match": "\\b[0-9]+\\.?[0-9]*(?:([eE])([+-])?[0-9]+)?\\b",
           "name": "constant.numeric.float.decimal.r"
         },
         {
-          "match": "\\.[0-9]+(?:(e|E)(\\+|-)?[0-9]+)?\\b",
+          "match": "\\.[0-9]+(?:([eE])([+-])?[0-9]+)?\\b",
           "name": "constant.numeric.float.decimal.r"
         }
       ]
@@ -292,7 +292,7 @@
               "name": "keyword.control.r"
             }
           },
-          "match": "((?:`[^`\\\\]*(?:\\\\.[^`\\\\]*)*`)|(?:[[:alpha:].][[:alnum:]._]*))\\s*(<?<-|=(?!=))\\s*(function|\\\\)(?!\\w)",
+          "match": "(`[^`\\\\]*(?:\\\\.[^`\\\\]*)*`|[[:alpha:].][[:alnum:]._]*)\\s*(<?<-|=(?!=))\\s*(function|\\\\)(?!\\w)",
           "name": "meta.function.r",
           "patterns": [
             {
@@ -375,7 +375,7 @@
           "name": "keyword.control.r"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%\\/%|%%|%\\*%|%o%|%x%|\\^)",
+          "match": "([-+*/]|%/%|%%|%\\*%|%o%|%x%|\\^)",
           "name": "keyword.operator.arithmetic.r"
         },
         {
@@ -383,11 +383,11 @@
           "name": "keyword.operator.assignment.r"
         },
         {
-          "match": "(==|<=|>=|!=|<>|<|>|%in%)",
+          "match": "(==|<=|>=|!=|<>|[<>]|%in%)",
           "name": "keyword.operator.comparison.r"
         },
         {
-          "match": "(!|&{1,2}|[|]{1,2})",
+          "match": "(!|&{1,2}|\\|{1,2})",
           "name": "keyword.operator.logical.r"
         },
         {
@@ -395,11 +395,11 @@
           "name": "keyword.operator.pipe.r"
         },
         {
-          "match": "(%between%|%chin%|%like%|%\\+%|%\\+replace%|%:%|%do%|%dopar%|%>%|%<>%|%T>%|%\\$%)",
+          "match": "(%(?:between%|chin%|like%|\\+%|\\+replace%|:%|do%|dopar%|>%|<>%|T>%|\\$%))",
           "name": "keyword.operator.other.r"
         },
         {
-          "match": "(\\.\\.\\.|\\$|:|\\~|@)",
+          "match": "(\\.\\.\\.|[$:~@])",
           "name": "keyword.other.r"
         }
       ]
@@ -497,7 +497,7 @@
               "name": "punctuation.definition.string.raw.begin.r"
             }
           },
-          "end": "\\]\\1\"",
+          "end": "]\\1\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.raw.end.r"
@@ -512,7 +512,7 @@
               "name": "punctuation.definition.string.raw.begin.r"
             }
           },
-          "end": "\\]\\1'",
+          "end": "]\\1'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.raw.end.r"
@@ -527,7 +527,7 @@
               "name": "punctuation.definition.string.raw.begin.r"
             }
           },
-          "end": "\\}\\1\"",
+          "end": "}\\1\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.raw.end.r"
@@ -542,7 +542,7 @@
               "name": "punctuation.definition.string.raw.begin.r"
             }
           },
-          "end": "\\}\\1'",
+          "end": "}\\1'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.raw.end.r"
diff --git a/resources/languages/racket.json b/resources/languages/racket.json
index 54365a0..7de351d 100644
--- a/resources/languages/racket.json
+++ b/resources/languages/racket.json
@@ -32,7 +32,7 @@
           "include": "#default-args"
         },
         {
-          "match": "[^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*",
+          "match": "[^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*",
           "name": "variable.parameter.racket"
         }
       ]
@@ -53,7 +53,7 @@
           }
         },
         {
-          "begin": "(?<=[(\\[{])\\s*(\\#%|\\\\\\ |[^\\#()\\[\\]{}\",'`;\\s])",
+          "begin": "(?<=[(\\[{])\\s*(#%|\\\\ |[^#()\\[\\]{}\",'`;\\s])",
           "beginCaptures": {
             "1": {
               "name": "variable.parameter.racket"
@@ -95,7 +95,7 @@
           }
         },
         {
-          "begin": "(?<=[(\\[{])\\s*(\\#%|\\\\\\ |[^\\#()\\[\\]{}\",'`;\\s])",
+          "begin": "(?<=[(\\[{])\\s*(#%|\\\\ |[^#()\\[\\]{}\",'`;\\s])",
           "beginCaptures": {
             "1": {
               "name": "variable.other.member.racket"
@@ -190,7 +190,7 @@
           }
         },
         {
-          "begin": "(?<=[(\\[{])\\s*(\\#%|\\\\\\ |[^\\#()\\[\\]{}\",'`;\\s])",
+          "begin": "(?<=[(\\[{])\\s*(#%|\\\\ |[^#()\\[\\]{}\",'`;\\s])",
           "beginCaptures": {
             "1": {
               "name": "entity.name.constant"
@@ -219,7 +219,7 @@
     "bool": {
       "patterns": [
         {
-          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])\\#(?:[tT](?:rue)?|[fF](?:alse)?)(?=[()\\[\\]{}\",'`;\\s])",
+          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])#(?:[tT](?:rue)?|[fF](?:alse)?)(?=[()\\[\\]{}\",'`;\\s])",
           "name": "constant.language.racket"
         }
       ]
@@ -244,7 +244,7 @@
               "name": "support.function.racket"
             }
           },
-          "match": "(?<=$|[()\\[\\]{}\",'`;\\s])(\\.\\.\\.|_|syntax-id-rules|syntax-rules|\\#%app|\\#%datum|\\#%declare|\\#%expression|\\#%module-begin|\\#%plain-app|\\#%plain-lambda|\\#%plain-module-begin|\\#%printing-module-begin|\\#%provide|\\#%require|\\#%stratified-body|\\#%top|\\#%top-interaction|\\#%variable-reference|\\.\\.\\.|:do-in|=>|_|all-defined-out|all-from-out|and|apply|arity-at-least|begin|begin-for-syntax|begin0|call-with-input-file|call-with-input-file\\*|call-with-output-file|call-with-output-file\\*|case|case-lambda|combine-in|combine-out|cond|date|date\\*|define|define-for-syntax|define-logger|define-namespace-anchor|define-sequence-syntax|define-struct|define-struct\\/derived|define-syntax|define-syntax-rule|define-syntaxes|define-values|define-values-for-syntax|do|else|except-in|except-out|exn|exn:break|exn:break:hang-up|exn:break:terminate|exn:fail|exn:fail:contract|exn:fail:contract:arity|exn:fail:contract:continuation|exn:fail:contract:divide-by-zero|exn:fail:contract:non-fixnum-result|exn:fail:contract:variable|exn:fail:filesystem|exn:fail:filesystem:errno|exn:fail:filesystem:exists|exn:fail:filesystem:missing-module|exn:fail:filesystem:version|exn:fail:network|exn:fail:network:errno|exn:fail:out-of-memory|exn:fail:read|exn:fail:read:eof|exn:fail:read:non-char|exn:fail:syntax|exn:fail:syntax:missing-module|exn:fail:syntax:unbound|exn:fail:unsupported|exn:fail:user|file|for|for\\*|for\\*\\/and|for\\*\\/first|for\\*\\/fold|for\\*\\/fold\\/derived|for\\*\\/hash|for\\*\\/hasheq|for\\*\\/hasheqv|for\\*\\/last|for\\*\\/list|for\\*\\/lists|for\\*\\/or|for\\*\\/product|for\\*\\/sum|for\\*\\/vector|for-label|for-meta|for-syntax|for-template|for\\/and|for\\/first|for\\/fold|for\\/fold\\/derived|for\\/hash|for\\/hasheq|for\\/hasheqv|for\\/last|for\\/list|for\\/lists|for\\/or|for\\/product|for\\/sum|for\\/vector|gen:custom-write|gen:equal\\+hash|if|in-bytes|in-bytes-lines|in-directory|in-hash|in-hash-keys|in-hash-pairs|in-hash-values|in-immutable-hash|in-immutable-hash-keys|in-immutable-hash-pairs|in-immutable-hash-values|in-indexed|in-input-port-bytes|in-input-port-chars|in-lines|in-list|in-mlist|in-mutable-hash|in-mutable-hash-keys|in-mutable-hash-pairs|in-mutable-hash-values|in-naturals|in-port|in-producer|in-range|in-string|in-value|in-vector|in-weak-hash|in-weak-hash-keys|in-weak-hash-pairs|in-weak-hash-values|lambda|let|let\\*|let\\*-values|let-syntax|let-syntaxes|let-values|let\\/cc|let\\/ec|letrec|letrec-syntax|letrec-syntaxes|letrec-syntaxes\\+values|letrec-values|lib|local-require|log-debug|log-error|log-fatal|log-info|log-warning|module|module\\*|module\\+|only-in|only-meta-in|open-input-file|open-input-output-file|open-output-file|or|parameterize|parameterize\\*|parameterize-break|planet|prefix-in|prefix-out|protect-out|provide|quasiquote|quasisyntax|quasisyntax\\/loc|quote|quote-syntax|quote-syntax\\/prune|regexp-match\\*|regexp-match-peek-positions\\*|regexp-match-positions\\*|relative-in|rename-in|rename-out|require|set!|set!-values|sort|srcloc|struct|struct-copy|struct-field-index|struct-out|submod|syntax|syntax-case|syntax-case\\*|syntax-id-rules|syntax-rules|syntax\\/loc|time|unless|unquote|unquote-splicing|unsyntax|unsyntax-splicing|when|with-continuation-mark|with-handlers|with-handlers\\*|with-input-from-file|with-output-to-file|with-syntax|λ|\\#%app|\\#%datum|\\#%declare|\\#%expression|\\#%module-begin|\\#%plain-app|\\#%plain-lambda|\\#%plain-module-begin|\\#%printing-module-begin|\\#%provide|\\#%require|\\#%stratified-body|\\#%top|\\#%top-interaction|\\#%variable-reference|->|->\\*|->\\*m|->d|->dm|->i|->m|\\.\\.\\.|:do-in|<=\\/c|=\\/c|==|=>|>=\\/c|_|absent|abstract|add-between|all-defined-out|all-from-out|and|and\\/c|any|any\\/c|apply|arity-at-least|arrow-contract-info|augment|augment\\*|augment-final|augment-final\\*|augride|augride\\*|bad-number-of-results|begin|begin-for-syntax|begin0|between\\/c|blame-add-context|box-immutable\\/c|box\\/c|call-with-atomic-output-file|call-with-file-lock\\/timeout|call-with-input-file|call-with-input-file\\*|call-with-output-file|call-with-output-file\\*|case|case->|case->m|case-lambda|channel\\/c|char-in\\/c|check-duplicates|class|class\\*|class-field-accessor|class-field-mutator|class\\/c|class\\/derived|combine-in|combine-out|command-line|compound-unit|compound-unit\\/infer|cond|cons\\/c|cons\\/dc|continuation-mark-key\\/c|contract|contract-exercise|contract-out|contract-struct|contracted|copy-directory\\/files|current-contract-region|date|date\\*|define|define-compound-unit|define-compound-unit\\/infer|define-contract-struct|define-custom-hash-types|define-custom-set-types|define-for-syntax|define-local-member-name|define-logger|define-match-expander|define-member-name|define-module-boundary-contract|define-namespace-anchor|define-opt\\/c|define-sequence-syntax|define-serializable-class|define-serializable-class\\*|define-signature|define-signature-form|define-struct|define-struct\\/contract|define-struct\\/derived|define-syntax|define-syntax-rule|define-syntaxes|define-unit|define-unit-binding|define-unit-from-context|define-unit\\/contract|define-unit\\/new-import-export|define-unit\\/s|define-values|define-values-for-export|define-values-for-syntax|define-values\\/invoke-unit|define-values\\/invoke-unit\\/infer|define\\/augment|define\\/augment-final|define\\/augride|define\\/contract|define\\/final-prop|define\\/match|define\\/overment|define\\/override|define\\/override-final|define\\/private|define\\/public|define\\/public-final|define\\/pubment|define\\/subexpression-pos-prop|define\\/subexpression-pos-prop\\/name|delay|delay\\/idle|delay\\/name|delay\\/strict|delay\\/sync|delay\\/thread|delete-directory\\/files|dict->list|dict-can-functional-set\\?|dict-can-remove-keys\\?|dict-clear|dict-clear!|dict-copy|dict-count|dict-empty\\?|dict-for-each|dict-has-key\\?|dict-implements\\/c|dict-implements\\?|dict-iterate-first|dict-iterate-key|dict-iterate-next|dict-iterate-value|dict-keys|dict-map|dict-mutable\\?|dict-ref|dict-ref!|dict-remove|dict-remove!|dict-set|dict-set!|dict-set\\*|dict-set\\*!|dict-update|dict-update!|dict-values|dict\\?|display-lines|display-lines-to-file|display-to-file|do|dynamic->\\*|dynamic-place|dynamic-place\\*|else|eof-evt|except|except-in|except-out|exn|exn:break|exn:break:hang-up|exn:break:terminate|exn:fail|exn:fail:contract|exn:fail:contract:arity|exn:fail:contract:blame|exn:fail:contract:continuation|exn:fail:contract:divide-by-zero|exn:fail:contract:non-fixnum-result|exn:fail:contract:variable|exn:fail:filesystem|exn:fail:filesystem:errno|exn:fail:filesystem:exists|exn:fail:filesystem:missing-module|exn:fail:filesystem:version|exn:fail:network|exn:fail:network:errno|exn:fail:object|exn:fail:out-of-memory|exn:fail:read|exn:fail:read:eof|exn:fail:read:non-char|exn:fail:syntax|exn:fail:syntax:missing-module|exn:fail:syntax:unbound|exn:fail:unsupported|exn:fail:user|export|extends|failure-cont|field|field-bound\\?|file|file->bytes|file->bytes-lines|file->lines|file->list|file->string|file->value|find-files|find-relative-path|first-or\\/c|flat-contract-with-explanation|flat-murec-contract|flat-rec-contract|for|for\\*|for\\*\\/and|for\\*\\/async|for\\*\\/first|for\\*\\/fold|for\\*\\/fold\\/derived|for\\*\\/hash|for\\*\\/hasheq|for\\*\\/hasheqv|for\\*\\/last|for\\*\\/list|for\\*\\/lists|for\\*\\/mutable-set|for\\*\\/mutable-seteq|for\\*\\/mutable-seteqv|for\\*\\/or|for\\*\\/product|for\\*\\/set|for\\*\\/seteq|for\\*\\/seteqv|for\\*\\/stream|for\\*\\/sum|for\\*\\/vector|for\\*\\/weak-set|for\\*\\/weak-seteq|for\\*\\/weak-seteqv|for-label|for-meta|for-syntax|for-template|for\\/and|for\\/async|for\\/first|for\\/fold|for\\/fold\\/derived|for\\/hash|for\\/hasheq|for\\/hasheqv|for\\/last|for\\/list|for\\/lists|for\\/mutable-set|for\\/mutable-seteq|for\\/mutable-seteqv|for\\/or|for\\/product|for\\/set|for\\/seteq|for\\/seteqv|for\\/stream|for\\/sum|for\\/vector|for\\/weak-set|for\\/weak-seteq|for\\/weak-seteqv|gen:custom-write|gen:dict|gen:equal\\+hash|gen:set|gen:stream|generic|get-field|get-preference|hash\\/c|hash\\/dc|if|implies|import|in-bytes|in-bytes-lines|in-dict|in-dict-keys|in-dict-values|in-directory|in-hash|in-hash-keys|in-hash-pairs|in-hash-values|in-immutable-hash|in-immutable-hash-keys|in-immutable-hash-pairs|in-immutable-hash-values|in-immutable-set|in-indexed|in-input-port-bytes|in-input-port-chars|in-lines|in-list|in-mlist|in-mutable-hash|in-mutable-hash-keys|in-mutable-hash-pairs|in-mutable-hash-values|in-mutable-set|in-naturals|in-port|in-producer|in-range|in-set|in-slice|in-stream|in-string|in-syntax|in-value|in-vector|in-weak-hash|in-weak-hash-keys|in-weak-hash-pairs|in-weak-hash-values|in-weak-set|include|include-at\\/relative-to|include-at\\/relative-to\\/reader|include\\/reader|inherit|inherit-field|inherit\\/inner|inherit\\/super|init|init-depend|init-field|init-rest|inner|inspect|instantiate|integer-in|interface|interface\\*|invariant-assertion|invoke-unit|invoke-unit\\/infer|lambda|lazy|let|let\\*|let\\*-values|let-syntax|let-syntaxes|let-values|let\\/cc|let\\/ec|letrec|letrec-syntax|letrec-syntaxes|letrec-syntaxes\\+values|letrec-values|lib|link|list\\*of|list\\/c|listof|local|local-require|log-debug|log-error|log-fatal|log-info|log-warning|make-custom-hash|make-custom-hash-types|make-custom-set|make-custom-set-types|make-handle-get-preference-locked|make-immutable-custom-hash|make-mutable-custom-set|make-object|make-temporary-file|make-weak-custom-hash|make-weak-custom-set|match|match\\*|match\\*\\/derived|match-define|match-define-values|match-lambda|match-lambda\\*|match-lambda\\*\\*|match-let|match-let\\*|match-let\\*-values|match-let-values|match-letrec|match-letrec-values|match\\/derived|match\\/values|member-name-key|mixin|module|module\\*|module\\+|nand|new|new-∀\\/c|new-∃\\/c|non-empty-listof|none\\/c|nor|not\\/c|object-contract|object\\/c|one-of\\/c|only|only-in|only-meta-in|open|open-input-file|open-input-output-file|open-output-file|opt\\/c|or|or\\/c|overment|overment\\*|override|override\\*|override-final|override-final\\*|parameter\\/c|parameterize|parameterize\\*|parameterize-break|parametric->\\/c|pathlist-closure|peek-bytes!-evt|peek-bytes-avail!-evt|peek-bytes-evt|peek-string!-evt|peek-string-evt|peeking-input-port|place|place\\*|place\\/context|planet|port->bytes|port->bytes-lines|port->lines|port->string|prefix|prefix-in|prefix-out|pretty-format|private|private\\*|procedure-arity-includes\\/c|process|process\\*|process\\*\\/ports|process\\/ports|promise\\/c|prompt-tag\\/c|prop:dict\\/contract|protect-out|provide|provide-signature-elements|provide\\/contract|public|public\\*|public-final|public-final\\*|pubment|pubment\\*|quasiquote|quasisyntax|quasisyntax\\/loc|quote|quote-syntax|quote-syntax\\/prune|raise-blame-error|raise-not-cons-blame-error|range|read-bytes!-evt|read-bytes-avail!-evt|read-bytes-evt|read-bytes-line-evt|read-line-evt|read-string!-evt|read-string-evt|real-in|recontract-out|recursive-contract|regexp-match\\*|regexp-match-evt|regexp-match-peek-positions\\*|regexp-match-positions\\*|relative-in|relocate-input-port|relocate-output-port|remove-duplicates|rename|rename-in|rename-inner|rename-out|rename-super|require|send|send\\*|send\\+|send-generic|send\\/apply|send\\/keyword-apply|sequence\\/c|set!|set!-values|set-field!|set\\/c|shared|sort|srcloc|stream|stream\\*|stream-cons|string-join|string-len\\/c|string-normalize-spaces|string-replace|string-split|string-trim|struct|struct\\*|struct-copy|struct-field-index|struct-out|struct\\/c|struct\\/ctc|struct\\/dc|submod|super|super-instantiate|super-make-object|super-new|symbols|syntax|syntax-case|syntax-case\\*|syntax-id-rules|syntax-rules|syntax\\/c|syntax\\/loc|system|system\\*|system\\*\\/exit-code|system\\/exit-code|tag|this|this%|thunk|thunk\\*|time|transplant-input-port|transplant-output-port|unconstrained-domain->|unit|unit-from-context|unit\\/c|unit\\/new-import-export|unit\\/s|unless|unquote|unquote-splicing|unsyntax|unsyntax-splicing|values\\/drop|vector-immutable\\/c|vector-immutableof|vector-sort|vector-sort!|vector\\/c|vectorof|when|with-continuation-mark|with-contract|with-contract-continuation-mark|with-handlers|with-handlers\\*|with-input-from-file|with-method|with-output-to-file|with-syntax|wrapped-extra-arg-arrow|write-to-file|~\\.a|~\\.s|~\\.v|~a|~e|~r|~s|~v|λ|expand-for-clause|for-clause-syntax-protect|syntax-pattern-variable\\?|\\*|\\+|-|\\/|<|<=|=|>|>=|abort-current-continuation|abs|absolute-path\\?|acos|add1|alarm-evt|always-evt|andmap|angle|append|arithmetic-shift|arity-at-least-value|arity-at-least\\?|asin|assf|assoc|assq|assv|atan|banner|bitwise-and|bitwise-bit-field|bitwise-bit-set\\?|bitwise-ior|bitwise-not|bitwise-xor|boolean\\?|bound-identifier=\\?|box|box-cas!|box-immutable|box\\?|break-enabled|break-parameterization\\?|break-thread|build-list|build-path|build-path\\/convention-type|build-string|build-vector|byte-pregexp|byte-pregexp\\?|byte-ready\\?|byte-regexp|byte-regexp\\?|byte\\?|bytes|bytes->immutable-bytes|bytes->list|bytes->path|bytes->path-element|bytes->string\\/latin-1|bytes->string\\/locale|bytes->string\\/utf-8|bytes-append|bytes-close-converter|bytes-convert|bytes-convert-end|bytes-converter\\?|bytes-copy|bytes-copy!|bytes-environment-variable-name\\?|bytes-fill!|bytes-length|bytes-open-converter|bytes-ref|bytes-set!|bytes-utf-8-index|bytes-utf-8-length|bytes-utf-8-ref|bytes<\\?|bytes=\\?|bytes>\\?|bytes\\?|caaaar|caaadr|caaar|caadar|caaddr|caadr|caar|cadaar|cadadr|cadar|caddar|cadddr|caddr|cadr|call-in-nested-thread|call-with-break-parameterization|call-with-composable-continuation|call-with-continuation-barrier|call-with-continuation-prompt|call-with-current-continuation|call-with-default-reading-parameterization|call-with-escape-continuation|call-with-exception-handler|call-with-immediate-continuation-mark|call-with-parameterization|call-with-semaphore|call-with-semaphore\\/enable-break|call-with-values|call\\/cc|call\\/ec|car|cdaaar|cdaadr|cdaar|cdadar|cdaddr|cdadr|cdar|cddaar|cddadr|cddar|cdddar|cddddr|cdddr|cddr|cdr|ceiling|channel-get|channel-put|channel-put-evt|channel-put-evt\\?|channel-try-get|channel\\?|chaperone-box|chaperone-channel|chaperone-continuation-mark-key|chaperone-evt|chaperone-hash|chaperone-of\\?|chaperone-procedure|chaperone-procedure\\*|chaperone-prompt-tag|chaperone-struct|chaperone-struct-type|chaperone-vector|chaperone-vector\\*|chaperone\\?|char->integer|char-alphabetic\\?|char-blank\\?|char-ci<=\\?|char-ci<\\?|char-ci=\\?|char-ci>=\\?|char-ci>\\?|char-downcase|char-foldcase|char-general-category|char-graphic\\?|char-iso-control\\?|char-lower-case\\?|char-numeric\\?|char-punctuation\\?|char-ready\\?|char-symbolic\\?|char-title-case\\?|char-titlecase|char-upcase|char-upper-case\\?|char-utf-8-length|char-whitespace\\?|char<=\\?|char<\\?|char=\\?|char>=\\?|char>\\?|char\\?|check-duplicate-identifier|check-tail-contract|checked-procedure-check-and-extract|choice-evt|cleanse-path|close-input-port|close-output-port|collect-garbage|collection-file-path|collection-path|compile|compile-allow-set!-undefined|compile-context-preservation-enabled|compile-enforce-module-constants|compile-syntax|compiled-expression-recompile|compiled-expression\\?|compiled-module-expression\\?|complete-path\\?|complex\\?|compose|compose1|cons|continuation-mark-key\\?|continuation-mark-set->context|continuation-mark-set->list|continuation-mark-set->list\\*|continuation-mark-set-first|continuation-mark-set\\?|continuation-marks|continuation-prompt-available\\?|continuation-prompt-tag\\?|continuation\\?|copy-file|cos|current-break-parameterization|current-code-inspector|current-command-line-arguments|current-compile|current-compiled-file-roots|current-continuation-marks|current-custodian|current-directory|current-directory-for-user|current-drive|current-environment-variables|current-error-port|current-eval|current-evt-pseudo-random-generator|current-force-delete-permissions|current-gc-milliseconds|current-get-interaction-input-port|current-inexact-milliseconds|current-input-port|current-inspector|current-library-collection-links|current-library-collection-paths|current-load|current-load-extension|current-load-relative-directory|current-load\\/use-compiled|current-locale|current-logger|current-memory-use|current-milliseconds|current-module-declare-name|current-module-declare-source|current-module-name-resolver|current-module-path-for-load|current-namespace|current-output-port|current-parameterization|current-plumber|current-preserved-thread-cell-values|current-print|current-process-milliseconds|current-prompt-read|current-pseudo-random-generator|current-read-interaction|current-reader-guard|current-readtable|current-seconds|current-security-guard|current-subprocess-custodian-mode|current-thread|current-thread-group|current-thread-initial-stack-size|current-write-relative-directory|custodian-box-value|custodian-box\\?|custodian-limit-memory|custodian-managed-list|custodian-memory-accounting-available\\?|custodian-require-memory|custodian-shut-down\\?|custodian-shutdown-all|custodian\\?|custom-print-quotable-accessor|custom-print-quotable\\?|custom-write-accessor|custom-write\\?|date\\*-nanosecond|date\\*-time-zone-name|date\\*\\?|date-day|date-dst\\?|date-hour|date-minute|date-month|date-second|date-time-zone-offset|date-week-day|date-year|date-year-day|date\\?|datum->syntax|datum-intern-literal|default-continuation-prompt-tag|delete-directory|delete-file|denominator|directory-exists\\?|directory-list|display|displayln|double-flonum\\?|dump-memory-stats|dynamic-require|dynamic-require-for-syntax|dynamic-wind|environment-variables-copy|environment-variables-names|environment-variables-ref|environment-variables-set!|environment-variables\\?|eof|eof-object\\?|ephemeron-value|ephemeron\\?|eprintf|eq-hash-code|eq\\?|equal-hash-code|equal-secondary-hash-code|equal\\?|equal\\?\\/recur|eqv-hash-code|eqv\\?|error|error-display-handler|error-escape-handler|error-print-context-length|error-print-source-location|error-print-width|error-value->string-handler|eval|eval-jit-enabled|eval-syntax|even\\?|evt\\?|exact->inexact|exact-integer\\?|exact-nonnegative-integer\\?|exact-positive-integer\\?|exact\\?|executable-yield-handler|exit|exit-handler|exn-continuation-marks|exn-message|exn:break-continuation|exn:break:hang-up\\?|exn:break:terminate\\?|exn:break\\?|exn:fail:contract:arity\\?|exn:fail:contract:continuation\\?|exn:fail:contract:divide-by-zero\\?|exn:fail:contract:non-fixnum-result\\?|exn:fail:contract:variable-id|exn:fail:contract:variable\\?|exn:fail:contract\\?|exn:fail:filesystem:errno-errno|exn:fail:filesystem:errno\\?|exn:fail:filesystem:exists\\?|exn:fail:filesystem:missing-module-path|exn:fail:filesystem:missing-module\\?|exn:fail:filesystem:version\\?|exn:fail:filesystem\\?|exn:fail:network:errno-errno|exn:fail:network:errno\\?|exn:fail:network\\?|exn:fail:out-of-memory\\?|exn:fail:read-srclocs|exn:fail:read:eof\\?|exn:fail:read:non-char\\?|exn:fail:read\\?|exn:fail:syntax-exprs|exn:fail:syntax:missing-module-path|exn:fail:syntax:missing-module\\?|exn:fail:syntax:unbound\\?|exn:fail:syntax\\?|exn:fail:unsupported\\?|exn:fail:user\\?|exn:fail\\?|exn:missing-module-accessor|exn:missing-module\\?|exn:srclocs-accessor|exn:srclocs\\?|exn\\?|exp|expand|expand-for-clause|expand-once|expand-syntax|expand-syntax-once|expand-syntax-to-top-form|expand-to-top-form|expand-user-path|explode-path|expt|file-exists\\?|file-or-directory-identity|file-or-directory-modify-seconds|file-or-directory-permissions|file-position|file-position\\*|file-size|file-stream-buffer-mode|file-stream-port\\?|file-truncate|filesystem-change-evt|filesystem-change-evt-cancel|filesystem-change-evt\\?|filesystem-root-list|filter|find-executable-path|find-library-collection-links|find-library-collection-paths|find-system-path|findf|fixnum\\?|floating-point-bytes->real|flonum\\?|floor|flush-output|foldl|foldr|for-clause-syntax-protect|for-each|format|fprintf|free-identifier=\\?|free-label-identifier=\\?|free-template-identifier=\\?|free-transformer-identifier=\\?|gcd|generate-temporaries|gensym|get-output-bytes|get-output-string|getenv|global-port-print-handler|guard-evt|handle-evt|handle-evt\\?|hash|hash->list|hash-clear|hash-clear!|hash-copy|hash-copy-clear|hash-count|hash-empty\\?|hash-eq\\?|hash-equal\\?|hash-eqv\\?|hash-for-each|hash-has-key\\?|hash-iterate-first|hash-iterate-key|hash-iterate-key\\+value|hash-iterate-next|hash-iterate-pair|hash-iterate-value|hash-keys|hash-keys-subset\\?|hash-map|hash-placeholder\\?|hash-ref|hash-ref!|hash-remove|hash-remove!|hash-set|hash-set!|hash-set\\*|hash-set\\*!|hash-update|hash-update!|hash-values|hash-weak\\?|hash\\?|hasheq|hasheqv|identifier-binding|identifier-binding-symbol|identifier-label-binding|identifier-prune-lexical-context|identifier-prune-to-source-module|identifier-remove-from-definition-context|identifier-template-binding|identifier-transformer-binding|identifier\\?|imag-part|immutable\\?|impersonate-box|impersonate-channel|impersonate-continuation-mark-key|impersonate-hash|impersonate-procedure|impersonate-procedure\\*|impersonate-prompt-tag|impersonate-struct|impersonate-vector|impersonate-vector\\*|impersonator-ephemeron|impersonator-of\\?|impersonator-prop:application-mark|impersonator-property-accessor-procedure\\?|impersonator-property\\?|impersonator\\?|in-cycle|in-parallel|in-sequences|in-values\\*-sequence|in-values-sequence|inexact->exact|inexact-real\\?|inexact\\?|input-port\\?|inspector-superior\\?|inspector\\?|integer->char|integer->integer-bytes|integer-bytes->integer|integer-length|integer-sqrt|integer-sqrt\\/remainder|integer\\?|internal-definition-context-binding-identifiers|internal-definition-context-introduce|internal-definition-context-seal|internal-definition-context\\?|keyword->string|keyword-apply|keyword<\\?|keyword\\?|kill-thread|lcm|legacy-match-expander\\?|length|liberal-define-context\\?|link-exists\\?|list|list\\*|list->bytes|list->string|list->vector|list-ref|list-tail|list\\?|load|load-extension|load-on-demand-enabled|load-relative|load-relative-extension|load\\/cd|load\\/use-compiled|local-expand|local-expand\\/capture-lifts|local-transformer-expand|local-transformer-expand\\/capture-lifts|locale-string-encoding|log|log-all-levels|log-level-evt|log-level\\?|log-max-level|log-message|log-receiver\\?|logger-name|logger\\?|magnitude|make-arity-at-least|make-base-empty-namespace|make-base-namespace|make-bytes|make-channel|make-continuation-mark-key|make-continuation-prompt-tag|make-custodian|make-custodian-box|make-date|make-date\\*|make-derived-parameter|make-directory|make-do-sequence|make-empty-namespace|make-environment-variables|make-ephemeron|make-exn|make-exn:break|make-exn:break:hang-up|make-exn:break:terminate|make-exn:fail|make-exn:fail:contract|make-exn:fail:contract:arity|make-exn:fail:contract:continuation|make-exn:fail:contract:divide-by-zero|make-exn:fail:contract:non-fixnum-result|make-exn:fail:contract:variable|make-exn:fail:filesystem|make-exn:fail:filesystem:errno|make-exn:fail:filesystem:exists|make-exn:fail:filesystem:missing-module|make-exn:fail:filesystem:version|make-exn:fail:network|make-exn:fail:network:errno|make-exn:fail:out-of-memory|make-exn:fail:read|make-exn:fail:read:eof|make-exn:fail:read:non-char|make-exn:fail:syntax|make-exn:fail:syntax:missing-module|make-exn:fail:syntax:unbound|make-exn:fail:unsupported|make-exn:fail:user|make-file-or-directory-link|make-hash|make-hash-placeholder|make-hasheq|make-hasheq-placeholder|make-hasheqv|make-hasheqv-placeholder|make-immutable-hash|make-immutable-hasheq|make-immutable-hasheqv|make-impersonator-property|make-input-port|make-inspector|make-keyword-procedure|make-known-char-range-list|make-log-receiver|make-logger|make-output-port|make-parameter|make-phantom-bytes|make-pipe|make-placeholder|make-plumber|make-polar|make-prefab-struct|make-pseudo-random-generator|make-reader-graph|make-readtable|make-rectangular|make-rename-transformer|make-resolved-module-path|make-security-guard|make-semaphore|make-set!-transformer|make-shared-bytes|make-sibling-inspector|make-special-comment|make-srcloc|make-string|make-struct-field-accessor|make-struct-field-mutator|make-struct-type|make-struct-type-property|make-syntax-delta-introducer|make-syntax-introducer|make-thread-cell|make-thread-group|make-vector|make-weak-box|make-weak-hash|make-weak-hasheq|make-weak-hasheqv|make-will-executor|map|match-\\.\\.\\.-nesting|match-expander\\?|max|mcar|mcdr|mcons|member|memf|memq|memv|min|module->exports|module->imports|module->indirect-exports|module->language-info|module->namespace|module-compiled-cross-phase-persistent\\?|module-compiled-exports|module-compiled-imports|module-compiled-indirect-exports|module-compiled-language-info|module-compiled-name|module-compiled-submodules|module-declared\\?|module-path-index-join|module-path-index-resolve|module-path-index-split|module-path-index-submodule|module-path-index\\?|module-path\\?|module-predefined\\?|module-provide-protected\\?|modulo|mpair\\?|nack-guard-evt|namespace-anchor->empty-namespace|namespace-anchor->namespace|namespace-anchor\\?|namespace-attach-module|namespace-attach-module-declaration|namespace-base-phase|namespace-mapped-symbols|namespace-module-identifier|namespace-module-registry|namespace-require|namespace-require\\/constant|namespace-require\\/copy|namespace-require\\/expansion-time|namespace-set-variable-value!|namespace-symbol->identifier|namespace-syntax-introduce|namespace-undefine-variable!|namespace-unprotect-module|namespace-variable-value|namespace\\?|negative\\?|never-evt|newline|normal-case-path|not|null|null\\?|number->string|number\\?|numerator|object-name|odd\\?|open-input-bytes|open-input-string|open-output-bytes|open-output-string|ormap|output-port\\?|pair\\?|parameter-procedure=\\?|parameter\\?|parameterization\\?|parse-leftover->\\*|path->bytes|path->complete-path|path->directory-path|path->string|path-add-extension|path-add-suffix|path-convention-type|path-element->bytes|path-element->string|path-for-some-system\\?|path-list-string->path-list|path-replace-extension|path-replace-suffix|path-string\\?|path<\\?|path\\?|peek-byte|peek-byte-or-special|peek-bytes|peek-bytes!|peek-bytes-avail!|peek-bytes-avail!\\*|peek-bytes-avail!\\/enable-break|peek-char|peek-char-or-special|peek-string|peek-string!|phantom-bytes\\?|pipe-content-length|placeholder-get|placeholder-set!|placeholder\\?|plumber-add-flush!|plumber-flush-all|plumber-flush-handle-remove!|plumber-flush-handle\\?|plumber\\?|poll-guard-evt|port-closed-evt|port-closed\\?|port-commit-peeked|port-count-lines!|port-count-lines-enabled|port-counts-lines\\?|port-display-handler|port-file-identity|port-file-unlock|port-next-location|port-print-handler|port-progress-evt|port-provides-progress-evts\\?|port-read-handler|port-try-file-lock\\?|port-write-handler|port-writes-atomic\\?|port-writes-special\\?|port\\?|positive\\?|prefab-key->struct-type|prefab-key\\?|prefab-struct-key|pregexp|pregexp\\?|primitive-closure\\?|primitive-result-arity|primitive\\?|print|print-as-expression|print-boolean-long-form|print-box|print-graph|print-hash-table|print-mpair-curly-braces|print-pair-curly-braces|print-reader-abbreviations|print-struct|print-syntax-width|print-unreadable|print-vector-length|printf|println|procedure->method|procedure-arity|procedure-arity-includes\\?|procedure-arity\\?|procedure-closure-contents-eq\\?|procedure-extract-target|procedure-impersonator\\*\\?|procedure-keywords|procedure-reduce-arity|procedure-reduce-keyword-arity|procedure-rename|procedure-result-arity|procedure-specialize|procedure-struct-type\\?|procedure\\?|progress-evt\\?|prop:arity-string|prop:authentic|prop:checked-procedure|prop:custom-print-quotable|prop:custom-write|prop:equal\\+hash|prop:evt|prop:exn:missing-module|prop:exn:srclocs|prop:expansion-contexts|prop:impersonator-of|prop:input-port|prop:legacy-match-expander|prop:liberal-define-context|prop:match-expander|prop:object-name|prop:output-port|prop:procedure|prop:rename-transformer|prop:sequence|prop:set!-transformer|pseudo-random-generator->vector|pseudo-random-generator-vector\\?|pseudo-random-generator\\?|putenv|quotient|quotient\\/remainder|raise|raise-argument-error|raise-arguments-error|raise-arity-error|raise-mismatch-error|raise-range-error|raise-result-error|raise-syntax-error|raise-type-error|raise-user-error|random|random-seed|rational\\?|rationalize|read|read-accept-bar-quote|read-accept-box|read-accept-compiled|read-accept-dot|read-accept-graph|read-accept-infix-dot|read-accept-lang|read-accept-quasiquote|read-accept-reader|read-byte|read-byte-or-special|read-bytes|read-bytes!|read-bytes-avail!|read-bytes-avail!\\*|read-bytes-avail!\\/enable-break|read-bytes-line|read-case-sensitive|read-cdot|read-char|read-char-or-special|read-curly-brace-as-paren|read-curly-brace-with-tag|read-decimal-as-inexact|read-eval-print-loop|read-language|read-line|read-on-demand-source|read-square-bracket-as-paren|read-square-bracket-with-tag|read-string|read-string!|read-syntax|read-syntax\\/recursive|read\\/recursive|readtable-mapping|readtable\\?|real->decimal-string|real->double-flonum|real->floating-point-bytes|real->single-flonum|real-part|real\\?|regexp|regexp-match|regexp-match-exact\\?|regexp-match-peek|regexp-match-peek-immediate|regexp-match-peek-positions|regexp-match-peek-positions-immediate|regexp-match-peek-positions-immediate\\/end|regexp-match-peek-positions\\/end|regexp-match-positions|regexp-match-positions\\/end|regexp-match\\/end|regexp-match\\?|regexp-max-lookbehind|regexp-quote|regexp-replace|regexp-replace\\*|regexp-replace-quote|regexp-replaces|regexp-split|regexp-try-match|regexp\\?|relative-path\\?|remainder|remove|remove\\*|remq|remq\\*|remv|remv\\*|rename-file-or-directory|rename-transformer-target|rename-transformer\\?|replace-evt|reroot-path|resolve-path|resolved-module-path-name|resolved-module-path\\?|reverse|round|seconds->date|security-guard\\?|semaphore-peek-evt|semaphore-peek-evt\\?|semaphore-post|semaphore-try-wait\\?|semaphore-wait|semaphore-wait\\/enable-break|semaphore\\?|sequence->stream|sequence-generate|sequence-generate\\*|sequence\\?|set!-transformer-procedure|set!-transformer\\?|set-box!|set-mcar!|set-mcdr!|set-phantom-bytes!|set-port-next-location!|shared-bytes|shell-execute|simplify-path|sin|single-flonum\\?|sleep|special-comment-value|special-comment\\?|split-path|sqrt|srcloc->string|srcloc-column|srcloc-line|srcloc-position|srcloc-source|srcloc-span|srcloc\\?|stop-after|stop-before|string|string->bytes\\/latin-1|string->bytes\\/locale|string->bytes\\/utf-8|string->immutable-string|string->keyword|string->list|string->number|string->path|string->path-element|string->symbol|string->uninterned-symbol|string->unreadable-symbol|string-append|string-ci<=\\?|string-ci<\\?|string-ci=\\?|string-ci>=\\?|string-ci>\\?|string-copy|string-copy!|string-downcase|string-environment-variable-name\\?|string-fill!|string-foldcase|string-length|string-locale-ci<\\?|string-locale-ci=\\?|string-locale-ci>\\?|string-locale-downcase|string-locale-upcase|string-locale<\\?|string-locale=\\?|string-locale>\\?|string-normalize-nfc|string-normalize-nfd|string-normalize-nfkc|string-normalize-nfkd|string-port\\?|string-ref|string-set!|string-titlecase|string-upcase|string-utf-8-length|string<=\\?|string<\\?|string=\\?|string>=\\?|string>\\?|string\\?|struct->vector|struct-accessor-procedure\\?|struct-constructor-procedure\\?|struct-info|struct-mutator-procedure\\?|struct-predicate-procedure\\?|struct-type-info|struct-type-make-constructor|struct-type-make-predicate|struct-type-property-accessor-procedure\\?|struct-type-property\\?|struct-type\\?|struct:arity-at-least|struct:date|struct:date\\*|struct:exn|struct:exn:break|struct:exn:break:hang-up|struct:exn:break:terminate|struct:exn:fail|struct:exn:fail:contract|struct:exn:fail:contract:arity|struct:exn:fail:contract:continuation|struct:exn:fail:contract:divide-by-zero|struct:exn:fail:contract:non-fixnum-result|struct:exn:fail:contract:variable|struct:exn:fail:filesystem|struct:exn:fail:filesystem:errno|struct:exn:fail:filesystem:exists|struct:exn:fail:filesystem:missing-module|struct:exn:fail:filesystem:version|struct:exn:fail:network|struct:exn:fail:network:errno|struct:exn:fail:out-of-memory|struct:exn:fail:read|struct:exn:fail:read:eof|struct:exn:fail:read:non-char|struct:exn:fail:syntax|struct:exn:fail:syntax:missing-module|struct:exn:fail:syntax:unbound|struct:exn:fail:unsupported|struct:exn:fail:user|struct:srcloc|struct\\?|sub1|subbytes|subprocess|subprocess-group-enabled|subprocess-kill|subprocess-pid|subprocess-status|subprocess-wait|subprocess\\?|substring|symbol->string|symbol-interned\\?|symbol-unreadable\\?|symbol<\\?|symbol\\?|sync|sync\\/enable-break|sync\\/timeout|sync\\/timeout\\/enable-break|syntax->datum|syntax->list|syntax-arm|syntax-column|syntax-debug-info|syntax-disarm|syntax-e|syntax-line|syntax-local-bind-syntaxes|syntax-local-certifier|syntax-local-context|syntax-local-expand-expression|syntax-local-get-shadower|syntax-local-identifier-as-binding|syntax-local-introduce|syntax-local-lift-context|syntax-local-lift-expression|syntax-local-lift-module|syntax-local-lift-module-end-declaration|syntax-local-lift-provide|syntax-local-lift-require|syntax-local-lift-values-expression|syntax-local-make-definition-context|syntax-local-make-delta-introducer|syntax-local-match-introduce|syntax-local-module-defined-identifiers|syntax-local-module-exports|syntax-local-module-required-identifiers|syntax-local-name|syntax-local-phase-level|syntax-local-submodules|syntax-local-transforming-module-provides\\?|syntax-local-value|syntax-local-value\\/immediate|syntax-original\\?|syntax-pattern-variable\\?|syntax-position|syntax-property|syntax-property-preserved\\?|syntax-property-symbol-keys|syntax-protect|syntax-rearm|syntax-recertify|syntax-shift-phase-level|syntax-source|syntax-source-module|syntax-span|syntax-taint|syntax-tainted\\?|syntax-track-origin|syntax-transforming-module-expression\\?|syntax-transforming-with-lifts\\?|syntax-transforming\\?|syntax\\?|system-big-endian\\?|system-idle-evt|system-language\\+country|system-library-subpath|system-path-convention-type|system-type|tan|terminal-port\\?|thread|thread-cell-ref|thread-cell-set!|thread-cell-values\\?|thread-cell\\?|thread-dead-evt|thread-dead\\?|thread-group\\?|thread-receive|thread-receive-evt|thread-resume|thread-resume-evt|thread-rewind-receive|thread-running\\?|thread-send|thread-suspend|thread-suspend-evt|thread-try-receive|thread-wait|thread\\/suspend-to-kill|thread\\?|time-apply|truncate|unbox|uncaught-exception-handler|unquoted-printing-string|unquoted-printing-string-value|unquoted-printing-string\\?|use-collection-link-paths|use-compiled-file-check|use-compiled-file-paths|use-user-specific-search-paths|values|variable-reference->empty-namespace|variable-reference->module-base-phase|variable-reference->module-declaration-inspector|variable-reference->module-path-index|variable-reference->module-source|variable-reference->namespace|variable-reference->phase|variable-reference->resolved-module-path|variable-reference-constant\\?|variable-reference\\?|vector|vector->immutable-vector|vector->list|vector->pseudo-random-generator|vector->pseudo-random-generator!|vector->values|vector-cas!|vector-copy!|vector-fill!|vector-immutable|vector-length|vector-ref|vector-set!|vector-set-performance-stats!|vector\\?|version|void|void\\?|weak-box-value|weak-box\\?|will-execute|will-executor\\?|will-register|will-try-execute|wrap-evt|write|write-byte|write-bytes|write-bytes-avail|write-bytes-avail\\*|write-bytes-avail-evt|write-bytes-avail\\/enable-break|write-char|write-special|write-special-avail\\*|write-special-evt|write-string|writeln|zero\\?|\\*|\\*list\\/c|\\+|-|\\/|<|<\\/c|<=|=|>|>\\/c|>=|abort-current-continuation|abs|absolute-path\\?|acos|add1|alarm-evt|always-evt|andmap|angle|append|append\\*|append-map|argmax|argmin|arithmetic-shift|arity-at-least-value|arity-at-least\\?|arity-checking-wrapper|arity-includes\\?|arity=\\?|arrow-contract-info-accepts-arglist|arrow-contract-info-chaperone-procedure|arrow-contract-info-check-first-order|arrow-contract-info\\?|asin|assf|assoc|assq|assv|atan|banner|base->-doms\\/c|base->-rngs\\/c|base->\\?|bitwise-and|bitwise-bit-field|bitwise-bit-set\\?|bitwise-ior|bitwise-not|bitwise-xor|blame-add-car-context|blame-add-cdr-context|blame-add-missing-party|blame-add-nth-arg-context|blame-add-range-context|blame-add-unknown-context|blame-context|blame-contract|blame-fmt->-string|blame-missing-party\\?|blame-negative|blame-original\\?|blame-positive|blame-replace-negative|blame-source|blame-swap|blame-swapped\\?|blame-update|blame-value|blame\\?|boolean=\\?|boolean\\?|bound-identifier=\\?|box|box-cas!|box-immutable|box\\?|break-enabled|break-parameterization\\?|break-thread|build-chaperone-contract-property|build-compound-type-name|build-contract-property|build-flat-contract-property|build-list|build-path|build-path\\/convention-type|build-string|build-vector|byte-pregexp|byte-pregexp\\?|byte-ready\\?|byte-regexp|byte-regexp\\?|byte\\?|bytes|bytes->immutable-bytes|bytes->list|bytes->path|bytes->path-element|bytes->string\\/latin-1|bytes->string\\/locale|bytes->string\\/utf-8|bytes-append|bytes-append\\*|bytes-close-converter|bytes-convert|bytes-convert-end|bytes-converter\\?|bytes-copy|bytes-copy!|bytes-environment-variable-name\\?|bytes-fill!|bytes-join|bytes-length|bytes-no-nuls\\?|bytes-open-converter|bytes-ref|bytes-set!|bytes-utf-8-index|bytes-utf-8-length|bytes-utf-8-ref|bytes<\\?|bytes=\\?|bytes>\\?|bytes\\?|caaaar|caaadr|caaar|caadar|caaddr|caadr|caar|cadaar|cadadr|cadar|caddar|cadddr|caddr|cadr|call-in-nested-thread|call-with-break-parameterization|call-with-composable-continuation|call-with-continuation-barrier|call-with-continuation-prompt|call-with-current-continuation|call-with-default-reading-parameterization|call-with-escape-continuation|call-with-exception-handler|call-with-immediate-continuation-mark|call-with-input-bytes|call-with-input-string|call-with-output-bytes|call-with-output-string|call-with-parameterization|call-with-semaphore|call-with-semaphore\\/enable-break|call-with-values|call\\/cc|call\\/ec|car|cartesian-product|cdaaar|cdaadr|cdaar|cdadar|cdaddr|cdadr|cdar|cddaar|cddadr|cddar|cdddar|cddddr|cdddr|cddr|cdr|ceiling|channel-get|channel-put|channel-put-evt|channel-put-evt\\?|channel-try-get|channel\\?|chaperone-box|chaperone-channel|chaperone-continuation-mark-key|chaperone-contract-property\\?|chaperone-contract\\?|chaperone-evt|chaperone-hash|chaperone-hash-set|chaperone-of\\?|chaperone-procedure|chaperone-procedure\\*|chaperone-prompt-tag|chaperone-struct|chaperone-struct-type|chaperone-vector|chaperone-vector\\*|chaperone\\?|char->integer|char-alphabetic\\?|char-blank\\?|char-ci<=\\?|char-ci<\\?|char-ci=\\?|char-ci>=\\?|char-ci>\\?|char-downcase|char-foldcase|char-general-category|char-graphic\\?|char-in|char-iso-control\\?|char-lower-case\\?|char-numeric\\?|char-punctuation\\?|char-ready\\?|char-symbolic\\?|char-title-case\\?|char-titlecase|char-upcase|char-upper-case\\?|char-utf-8-length|char-whitespace\\?|char<=\\?|char<\\?|char=\\?|char>=\\?|char>\\?|char\\?|check-duplicate-identifier|checked-procedure-check-and-extract|choice-evt|class->interface|class-info|class-seal|class-unseal|class\\?|cleanse-path|close-input-port|close-output-port|coerce-chaperone-contract|coerce-chaperone-contracts|coerce-contract|coerce-contract\\/f|coerce-contracts|coerce-flat-contract|coerce-flat-contracts|collect-garbage|collection-file-path|collection-path|combinations|compile|compile-allow-set!-undefined|compile-context-preservation-enabled|compile-enforce-module-constants|compile-syntax|compiled-expression-recompile|compiled-expression\\?|compiled-module-expression\\?|complete-path\\?|complex\\?|compose|compose1|conjoin|conjugate|cons|cons\\?|const|continuation-mark-key\\?|continuation-mark-set->context|continuation-mark-set->list|continuation-mark-set->list\\*|continuation-mark-set-first|continuation-mark-set\\?|continuation-marks|continuation-prompt-available\\?|continuation-prompt-tag\\?|continuation\\?|contract-continuation-mark-key|contract-custom-write-property-proc|contract-first-order|contract-first-order-passes\\?|contract-late-neg-projection|contract-name|contract-proc|contract-projection|contract-property\\?|contract-random-generate|contract-random-generate-fail|contract-random-generate-fail\\?|contract-random-generate-get-current-environment|contract-random-generate-stash|contract-random-generate\\/choose|contract-stronger\\?|contract-struct-exercise|contract-struct-generate|contract-struct-late-neg-projection|contract-struct-list-contract\\?|contract-val-first-projection|contract\\?|convert-stream|copy-file|copy-port|cos|cosh|count|current-blame-format|current-break-parameterization|current-code-inspector|current-command-line-arguments|current-compile|current-compiled-file-roots|current-continuation-marks|current-custodian|current-directory|current-directory-for-user|current-drive|current-environment-variables|current-error-port|current-eval|current-evt-pseudo-random-generator|current-force-delete-permissions|current-future|current-gc-milliseconds|current-get-interaction-input-port|current-inexact-milliseconds|current-input-port|current-inspector|current-library-collection-links|current-library-collection-paths|current-load|current-load-extension|current-load-relative-directory|current-load\\/use-compiled|current-locale|current-logger|current-memory-use|current-milliseconds|current-module-declare-name|current-module-declare-source|current-module-name-resolver|current-module-path-for-load|current-namespace|current-output-port|current-parameterization|current-plumber|current-preserved-thread-cell-values|current-print|current-process-milliseconds|current-prompt-read|current-pseudo-random-generator|current-read-interaction|current-reader-guard|current-readtable|current-seconds|current-security-guard|current-subprocess-custodian-mode|current-thread|current-thread-group|current-thread-initial-stack-size|current-write-relative-directory|curry|curryr|custodian-box-value|custodian-box\\?|custodian-limit-memory|custodian-managed-list|custodian-memory-accounting-available\\?|custodian-require-memory|custodian-shut-down\\?|custodian-shutdown-all|custodian\\?|custom-print-quotable-accessor|custom-print-quotable\\?|custom-write-accessor|custom-write-property-proc|custom-write\\?|date\\*-nanosecond|date\\*-time-zone-name|date\\*\\?|date-day|date-dst\\?|date-hour|date-minute|date-month|date-second|date-time-zone-offset|date-week-day|date-year|date-year-day|date\\?|datum->syntax|datum-intern-literal|default-continuation-prompt-tag|degrees->radians|delete-directory|delete-file|denominator|dict-iter-contract|dict-key-contract|dict-value-contract|directory-exists\\?|directory-list|disjoin|display|displayln|double-flonum\\?|drop|drop-common-prefix|drop-right|dropf|dropf-right|dump-memory-stats|dup-input-port|dup-output-port|dynamic-get-field|dynamic-object\\/c|dynamic-require|dynamic-require-for-syntax|dynamic-send|dynamic-set-field!|dynamic-wind|eighth|empty|empty-sequence|empty-stream|empty\\?|environment-variables-copy|environment-variables-names|environment-variables-ref|environment-variables-set!|environment-variables\\?|eof|eof-object\\?|ephemeron-value|ephemeron\\?|eprintf|eq-contract-val|eq-contract\\?|eq-hash-code|eq\\?|equal-contract-val|equal-contract\\?|equal-hash-code|equal-secondary-hash-code|equal<%>|equal\\?|equal\\?\\/recur|eqv-hash-code|eqv\\?|error|error-display-handler|error-escape-handler|error-print-context-length|error-print-source-location|error-print-width|error-value->string-handler|eval|eval-jit-enabled|eval-syntax|even\\?|evt\\/c|evt\\?|exact->inexact|exact-ceiling|exact-floor|exact-integer\\?|exact-nonnegative-integer\\?|exact-positive-integer\\?|exact-round|exact-truncate|exact\\?|executable-yield-handler|exit|exit-handler|exn-continuation-marks|exn-message|exn:break-continuation|exn:break:hang-up\\?|exn:break:terminate\\?|exn:break\\?|exn:fail:contract:arity\\?|exn:fail:contract:blame-object|exn:fail:contract:blame\\?|exn:fail:contract:continuation\\?|exn:fail:contract:divide-by-zero\\?|exn:fail:contract:non-fixnum-result\\?|exn:fail:contract:variable-id|exn:fail:contract:variable\\?|exn:fail:contract\\?|exn:fail:filesystem:errno-errno|exn:fail:filesystem:errno\\?|exn:fail:filesystem:exists\\?|exn:fail:filesystem:missing-module-path|exn:fail:filesystem:missing-module\\?|exn:fail:filesystem:version\\?|exn:fail:filesystem\\?|exn:fail:network:errno-errno|exn:fail:network:errno\\?|exn:fail:network\\?|exn:fail:object\\?|exn:fail:out-of-memory\\?|exn:fail:read-srclocs|exn:fail:read:eof\\?|exn:fail:read:non-char\\?|exn:fail:read\\?|exn:fail:syntax-exprs|exn:fail:syntax:missing-module-path|exn:fail:syntax:missing-module\\?|exn:fail:syntax:unbound\\?|exn:fail:syntax\\?|exn:fail:unsupported\\?|exn:fail:user\\?|exn:fail\\?|exn:misc:match\\?|exn:missing-module-accessor|exn:missing-module\\?|exn:srclocs-accessor|exn:srclocs\\?|exn\\?|exp|expand|expand-once|expand-syntax|expand-syntax-once|expand-syntax-to-top-form|expand-to-top-form|expand-user-path|explode-path|expt|externalizable<%>|failure-result\\/c|false|false\\/c|false\\?|field-names|fifth|file-exists\\?|file-name-from-path|file-or-directory-identity|file-or-directory-modify-seconds|file-or-directory-permissions|file-position|file-position\\*|file-size|file-stream-buffer-mode|file-stream-port\\?|file-truncate|filename-extension|filesystem-change-evt|filesystem-change-evt-cancel|filesystem-change-evt\\?|filesystem-root-list|filter|filter-map|filter-not|filter-read-input-port|find-executable-path|find-library-collection-links|find-library-collection-paths|find-system-path|findf|first|fixnum\\?|flat-contract|flat-contract-predicate|flat-contract-property\\?|flat-contract\\?|flat-named-contract|flatten|floating-point-bytes->real|flonum\\?|floor|flush-output|fold-files|foldl|foldr|for-each|force|format|fourth|fprintf|free-identifier=\\?|free-label-identifier=\\?|free-template-identifier=\\?|free-transformer-identifier=\\?|fsemaphore-count|fsemaphore-post|fsemaphore-try-wait\\?|fsemaphore-wait|fsemaphore\\?|future|future\\?|futures-enabled\\?|gcd|generate-member-key|generate-temporaries|generic-set\\?|generic\\?|gensym|get-output-bytes|get-output-string|get\\/build-late-neg-projection|get\\/build-val-first-projection|getenv|global-port-print-handler|group-by|group-execute-bit|group-read-bit|group-write-bit|guard-evt|handle-evt|handle-evt\\?|has-blame\\?|has-contract\\?|hash|hash->list|hash-clear|hash-clear!|hash-copy|hash-copy-clear|hash-count|hash-empty\\?|hash-eq\\?|hash-equal\\?|hash-eqv\\?|hash-for-each|hash-has-key\\?|hash-iterate-first|hash-iterate-key|hash-iterate-key\\+value|hash-iterate-next|hash-iterate-pair|hash-iterate-value|hash-keys|hash-keys-subset\\?|hash-map|hash-placeholder\\?|hash-ref|hash-ref!|hash-remove|hash-remove!|hash-set|hash-set!|hash-set\\*|hash-set\\*!|hash-update|hash-update!|hash-values|hash-weak\\?|hash\\?|hasheq|hasheqv|identifier-binding|identifier-binding-symbol|identifier-label-binding|identifier-prune-lexical-context|identifier-prune-to-source-module|identifier-remove-from-definition-context|identifier-template-binding|identifier-transformer-binding|identifier\\?|identity|if\\/c|imag-part|immutable\\?|impersonate-box|impersonate-channel|impersonate-continuation-mark-key|impersonate-hash|impersonate-hash-set|impersonate-procedure|impersonate-procedure\\*|impersonate-prompt-tag|impersonate-struct|impersonate-vector|impersonate-vector\\*|impersonator-contract\\?|impersonator-ephemeron|impersonator-of\\?|impersonator-prop:application-mark|impersonator-prop:blame|impersonator-prop:contracted|impersonator-property-accessor-procedure\\?|impersonator-property\\?|impersonator\\?|implementation\\?|implementation\\?\\/c|in-combinations|in-cycle|in-dict-pairs|in-parallel|in-permutations|in-sequences|in-values\\*-sequence|in-values-sequence|index-of|index-where|indexes-of|indexes-where|inexact->exact|inexact-real\\?|inexact\\?|infinite\\?|input-port-append|input-port\\?|inspector-superior\\?|inspector\\?|instanceof\\/c|integer->char|integer->integer-bytes|integer-bytes->integer|integer-length|integer-sqrt|integer-sqrt\\/remainder|integer\\?|interface->method-names|interface-extension\\?|interface\\?|internal-definition-context-binding-identifiers|internal-definition-context-introduce|internal-definition-context-seal|internal-definition-context\\?|is-a\\?|is-a\\?\\/c|keyword->string|keyword-apply|keyword<\\?|keyword\\?|keywords-match|kill-thread|last|last-pair|lcm|length|liberal-define-context\\?|link-exists\\?|list|list\\*|list->bytes|list->mutable-set|list->mutable-seteq|list->mutable-seteqv|list->set|list->seteq|list->seteqv|list->string|list->vector|list->weak-set|list->weak-seteq|list->weak-seteqv|list-contract\\?|list-prefix\\?|list-ref|list-set|list-tail|list-update|list\\?|listen-port-number\\?|load|load-extension|load-on-demand-enabled|load-relative|load-relative-extension|load\\/cd|load\\/use-compiled|local-expand|local-expand\\/capture-lifts|local-transformer-expand|local-transformer-expand\\/capture-lifts|locale-string-encoding|log|log-all-levels|log-level-evt|log-level\\?|log-max-level|log-message|log-receiver\\?|logger-name|logger\\?|magnitude|make-arity-at-least|make-base-empty-namespace|make-base-namespace|make-bytes|make-channel|make-chaperone-contract|make-continuation-mark-key|make-continuation-prompt-tag|make-contract|make-custodian|make-custodian-box|make-date|make-date\\*|make-derived-parameter|make-directory|make-directory\\*|make-do-sequence|make-empty-namespace|make-environment-variables|make-ephemeron|make-exn|make-exn:break|make-exn:break:hang-up|make-exn:break:terminate|make-exn:fail|make-exn:fail:contract|make-exn:fail:contract:arity|make-exn:fail:contract:blame|make-exn:fail:contract:continuation|make-exn:fail:contract:divide-by-zero|make-exn:fail:contract:non-fixnum-result|make-exn:fail:contract:variable|make-exn:fail:filesystem|make-exn:fail:filesystem:errno|make-exn:fail:filesystem:exists|make-exn:fail:filesystem:missing-module|make-exn:fail:filesystem:version|make-exn:fail:network|make-exn:fail:network:errno|make-exn:fail:object|make-exn:fail:out-of-memory|make-exn:fail:read|make-exn:fail:read:eof|make-exn:fail:read:non-char|make-exn:fail:syntax|make-exn:fail:syntax:missing-module|make-exn:fail:syntax:unbound|make-exn:fail:unsupported|make-exn:fail:user|make-file-or-directory-link|make-flat-contract|make-fsemaphore|make-generic|make-hash|make-hash-placeholder|make-hasheq|make-hasheq-placeholder|make-hasheqv|make-hasheqv-placeholder|make-immutable-hash|make-immutable-hasheq|make-immutable-hasheqv|make-impersonator-property|make-input-port|make-input-port\\/read-to-peek|make-inspector|make-keyword-procedure|make-known-char-range-list|make-limited-input-port|make-list|make-lock-file-name|make-log-receiver|make-logger|make-mixin-contract|make-none\\/c|make-output-port|make-parameter|make-parent-directory\\*|make-phantom-bytes|make-pipe|make-pipe-with-specials|make-placeholder|make-plumber|make-polar|make-prefab-struct|make-primitive-class|make-proj-contract|make-pseudo-random-generator|make-reader-graph|make-readtable|make-rectangular|make-rename-transformer|make-resolved-module-path|make-security-guard|make-semaphore|make-set!-transformer|make-shared-bytes|make-sibling-inspector|make-special-comment|make-srcloc|make-string|make-struct-field-accessor|make-struct-field-mutator|make-struct-type|make-struct-type-property|make-syntax-delta-introducer|make-syntax-introducer|make-tentative-pretty-print-output-port|make-thread-cell|make-thread-group|make-vector|make-weak-box|make-weak-hash|make-weak-hasheq|make-weak-hasheqv|make-will-executor|map|match-equality-test|matches-arity-exactly\\?|max|mcar|mcdr|mcons|member|member-name-key-hash-code|member-name-key=\\?|member-name-key\\?|memf|memq|memv|merge-input|method-in-interface\\?|min|mixin-contract|module->exports|module->imports|module->indirect-exports|module->language-info|module->namespace|module-compiled-cross-phase-persistent\\?|module-compiled-exports|module-compiled-imports|module-compiled-indirect-exports|module-compiled-language-info|module-compiled-name|module-compiled-submodules|module-declared\\?|module-path-index-join|module-path-index-resolve|module-path-index-split|module-path-index-submodule|module-path-index\\?|module-path\\?|module-predefined\\?|module-provide-protected\\?|modulo|mpair\\?|mutable-set|mutable-seteq|mutable-seteqv|n->th|nack-guard-evt|namespace-anchor->empty-namespace|namespace-anchor->namespace|namespace-anchor\\?|namespace-attach-module|namespace-attach-module-declaration|namespace-base-phase|namespace-mapped-symbols|namespace-module-identifier|namespace-module-registry|namespace-require|namespace-require\\/constant|namespace-require\\/copy|namespace-require\\/expansion-time|namespace-set-variable-value!|namespace-symbol->identifier|namespace-syntax-introduce|namespace-undefine-variable!|namespace-unprotect-module|namespace-variable-value|namespace\\?|nan\\?|natural-number\\/c|natural\\?|negate|negative-integer\\?|negative\\?|never-evt|newline|ninth|non-empty-string\\?|nonnegative-integer\\?|nonpositive-integer\\?|normal-case-path|normalize-arity|normalize-path|normalized-arity\\?|not|null|null\\?|number->string|number\\?|numerator|object%|object->vector|object-info|object-interface|object-method-arity-includes\\?|object-name|object-or-false=\\?|object=\\?|object\\?|odd\\?|open-input-bytes|open-input-string|open-output-bytes|open-output-nowhere|open-output-string|order-of-magnitude|ormap|other-execute-bit|other-read-bit|other-write-bit|output-port\\?|pair\\?|parameter-procedure=\\?|parameter\\?|parameterization\\?|parse-command-line|partition|path->bytes|path->complete-path|path->directory-path|path->string|path-add-extension|path-add-suffix|path-convention-type|path-element->bytes|path-element->string|path-element\\?|path-for-some-system\\?|path-get-extension|path-has-extension\\?|path-list-string->path-list|path-only|path-replace-extension|path-replace-suffix|path-string\\?|path<\\?|path\\?|peek-byte|peek-byte-or-special|peek-bytes|peek-bytes!|peek-bytes-avail!|peek-bytes-avail!\\*|peek-bytes-avail!\\/enable-break|peek-char|peek-char-or-special|peek-string|peek-string!|permutations|phantom-bytes\\?|pi|pi\\.f|pipe-content-length|place-break|place-channel|place-channel-get|place-channel-put|place-channel-put\\/get|place-channel\\?|place-dead-evt|place-enabled\\?|place-kill|place-location\\?|place-message-allowed\\?|place-sleep|place-wait|place\\?|placeholder-get|placeholder-set!|placeholder\\?|plumber-add-flush!|plumber-flush-all|plumber-flush-handle-remove!|plumber-flush-handle\\?|plumber\\?|poll-guard-evt|port->list|port-closed-evt|port-closed\\?|port-commit-peeked|port-count-lines!|port-count-lines-enabled|port-counts-lines\\?|port-display-handler|port-file-identity|port-file-unlock|port-next-location|port-number\\?|port-print-handler|port-progress-evt|port-provides-progress-evts\\?|port-read-handler|port-try-file-lock\\?|port-write-handler|port-writes-atomic\\?|port-writes-special\\?|port\\?|positive-integer\\?|positive\\?|predicate\\/c|prefab-key->struct-type|prefab-key\\?|prefab-struct-key|preferences-lock-file-mode|pregexp|pregexp\\?|pretty-display|pretty-print|pretty-print-\\.-symbol-without-bars|pretty-print-abbreviate-read-macros|pretty-print-columns|pretty-print-current-style-table|pretty-print-depth|pretty-print-exact-as-decimal|pretty-print-extend-style-table|pretty-print-handler|pretty-print-newline|pretty-print-post-print-hook|pretty-print-pre-print-hook|pretty-print-print-hook|pretty-print-print-line|pretty-print-remap-stylable|pretty-print-show-inexactness|pretty-print-size-hook|pretty-print-style-table\\?|pretty-printing|pretty-write|primitive-closure\\?|primitive-result-arity|primitive\\?|print|print-as-expression|print-boolean-long-form|print-box|print-graph|print-hash-table|print-mpair-curly-braces|print-pair-curly-braces|print-reader-abbreviations|print-struct|print-syntax-width|print-unreadable|print-vector-length|printable\\/c|printable<%>|printf|println|procedure->method|procedure-arity|procedure-arity-includes\\?|procedure-arity\\?|procedure-closure-contents-eq\\?|procedure-extract-target|procedure-impersonator\\*\\?|procedure-keywords|procedure-reduce-arity|procedure-reduce-keyword-arity|procedure-rename|procedure-result-arity|procedure-specialize|procedure-struct-type\\?|procedure\\?|processor-count|progress-evt\\?|promise-forced\\?|promise-running\\?|promise\\/name\\?|promise\\?|prop:arity-string|prop:arrow-contract|prop:arrow-contract-get-info|prop:arrow-contract\\?|prop:authentic|prop:blame|prop:chaperone-contract|prop:checked-procedure|prop:contract|prop:contracted|prop:custom-print-quotable|prop:custom-write|prop:dict|prop:equal\\+hash|prop:evt|prop:exn:missing-module|prop:exn:srclocs|prop:expansion-contexts|prop:flat-contract|prop:impersonator-of|prop:input-port|prop:liberal-define-context|prop:object-name|prop:opt-chaperone-contract|prop:opt-chaperone-contract-get-test|prop:opt-chaperone-contract\\?|prop:orc-contract|prop:orc-contract-get-subcontracts|prop:orc-contract\\?|prop:output-port|prop:place-location|prop:procedure|prop:recursive-contract|prop:recursive-contract-unroll|prop:recursive-contract\\?|prop:rename-transformer|prop:sequence|prop:set!-transformer|prop:stream|proper-subset\\?|pseudo-random-generator->vector|pseudo-random-generator-vector\\?|pseudo-random-generator\\?|put-preferences|putenv|quotient|quotient\\/remainder|radians->degrees|raise|raise-argument-error|raise-arguments-error|raise-arity-error|raise-contract-error|raise-mismatch-error|raise-range-error|raise-result-error|raise-syntax-error|raise-type-error|raise-user-error|random|random-seed|rational\\?|rationalize|read|read-accept-bar-quote|read-accept-box|read-accept-compiled|read-accept-dot|read-accept-graph|read-accept-infix-dot|read-accept-lang|read-accept-quasiquote|read-accept-reader|read-byte|read-byte-or-special|read-bytes|read-bytes!|read-bytes-avail!|read-bytes-avail!\\*|read-bytes-avail!\\/enable-break|read-bytes-line|read-case-sensitive|read-cdot|read-char|read-char-or-special|read-curly-brace-as-paren|read-curly-brace-with-tag|read-decimal-as-inexact|read-eval-print-loop|read-language|read-line|read-on-demand-source|read-square-bracket-as-paren|read-square-bracket-with-tag|read-string|read-string!|read-syntax|read-syntax\\/recursive|read\\/recursive|readtable-mapping|readtable\\?|real->decimal-string|real->double-flonum|real->floating-point-bytes|real->single-flonum|real-part|real\\?|reencode-input-port|reencode-output-port|regexp|regexp-match|regexp-match-exact\\?|regexp-match-peek|regexp-match-peek-immediate|regexp-match-peek-positions|regexp-match-peek-positions-immediate|regexp-match-peek-positions-immediate\\/end|regexp-match-peek-positions\\/end|regexp-match-positions|regexp-match-positions\\/end|regexp-match\\/end|regexp-match\\?|regexp-max-lookbehind|regexp-quote|regexp-replace|regexp-replace\\*|regexp-replace-quote|regexp-replaces|regexp-split|regexp-try-match|regexp\\?|relative-path\\?|remainder|remf|remf\\*|remove|remove\\*|remq|remq\\*|remv|remv\\*|rename-contract|rename-file-or-directory|rename-transformer-target|rename-transformer\\?|replace-evt|reroot-path|resolve-path|resolved-module-path-name|resolved-module-path\\?|rest|reverse|round|second|seconds->date|security-guard\\?|semaphore-peek-evt|semaphore-peek-evt\\?|semaphore-post|semaphore-try-wait\\?|semaphore-wait|semaphore-wait\\/enable-break|semaphore\\?|sequence->list|sequence->stream|sequence-add-between|sequence-andmap|sequence-append|sequence-count|sequence-filter|sequence-fold|sequence-for-each|sequence-generate|sequence-generate\\*|sequence-length|sequence-map|sequence-ormap|sequence-ref|sequence-tail|sequence\\?|set|set!-transformer-procedure|set!-transformer\\?|set->list|set->stream|set-add|set-add!|set-box!|set-clear|set-clear!|set-copy|set-copy-clear|set-count|set-empty\\?|set-eq\\?|set-equal\\?|set-eqv\\?|set-first|set-for-each|set-implements\\/c|set-implements\\?|set-intersect|set-intersect!|set-map|set-mcar!|set-mcdr!|set-member\\?|set-mutable\\?|set-phantom-bytes!|set-port-next-location!|set-remove|set-remove!|set-rest|set-subtract|set-subtract!|set-symmetric-difference|set-symmetric-difference!|set-union|set-union!|set-weak\\?|set=\\?|set\\?|seteq|seteqv|seventh|sgn|shared-bytes|shell-execute|shrink-path-wrt|shuffle|simple-form-path|simplify-path|sin|single-flonum\\?|sinh|sixth|skip-projection-wrapper\\?|sleep|some-system-path->string|special-comment-value|special-comment\\?|special-filter-input-port|split-at|split-at-right|split-common-prefix|split-path|splitf-at|splitf-at-right|sqr|sqrt|srcloc->string|srcloc-column|srcloc-line|srcloc-position|srcloc-source|srcloc-span|srcloc\\?|stop-after|stop-before|stream->list|stream-add-between|stream-andmap|stream-append|stream-count|stream-empty\\?|stream-filter|stream-first|stream-fold|stream-for-each|stream-length|stream-map|stream-ormap|stream-ref|stream-rest|stream-tail|stream\\/c|stream\\?|string|string->bytes\\/latin-1|string->bytes\\/locale|string->bytes\\/utf-8|string->immutable-string|string->keyword|string->list|string->number|string->path|string->path-element|string->some-system-path|string->symbol|string->uninterned-symbol|string->unreadable-symbol|string-append|string-append\\*|string-ci<=\\?|string-ci<\\?|string-ci=\\?|string-ci>=\\?|string-ci>\\?|string-contains\\?|string-copy|string-copy!|string-downcase|string-environment-variable-name\\?|string-fill!|string-foldcase|string-length|string-locale-ci<\\?|string-locale-ci=\\?|string-locale-ci>\\?|string-locale-downcase|string-locale-upcase|string-locale<\\?|string-locale=\\?|string-locale>\\?|string-no-nuls\\?|string-normalize-nfc|string-normalize-nfd|string-normalize-nfkc|string-normalize-nfkd|string-port\\?|string-prefix\\?|string-ref|string-set!|string-suffix\\?|string-titlecase|string-upcase|string-utf-8-length|string<=\\?|string<\\?|string=\\?|string>=\\?|string>\\?|string\\?|struct->vector|struct-accessor-procedure\\?|struct-constructor-procedure\\?|struct-info|struct-mutator-procedure\\?|struct-predicate-procedure\\?|struct-type-info|struct-type-make-constructor|struct-type-make-predicate|struct-type-property-accessor-procedure\\?|struct-type-property\\/c|struct-type-property\\?|struct-type\\?|struct:arity-at-least|struct:arrow-contract-info|struct:date|struct:date\\*|struct:exn|struct:exn:break|struct:exn:break:hang-up|struct:exn:break:terminate|struct:exn:fail|struct:exn:fail:contract|struct:exn:fail:contract:arity|struct:exn:fail:contract:blame|struct:exn:fail:contract:continuation|struct:exn:fail:contract:divide-by-zero|struct:exn:fail:contract:non-fixnum-result|struct:exn:fail:contract:variable|struct:exn:fail:filesystem|struct:exn:fail:filesystem:errno|struct:exn:fail:filesystem:exists|struct:exn:fail:filesystem:missing-module|struct:exn:fail:filesystem:version|struct:exn:fail:network|struct:exn:fail:network:errno|struct:exn:fail:object|struct:exn:fail:out-of-memory|struct:exn:fail:read|struct:exn:fail:read:eof|struct:exn:fail:read:non-char|struct:exn:fail:syntax|struct:exn:fail:syntax:missing-module|struct:exn:fail:syntax:unbound|struct:exn:fail:unsupported|struct:exn:fail:user|struct:srcloc|struct:wrapped-extra-arg-arrow|struct\\?|sub1|subbytes|subclass\\?|subclass\\?\\/c|subprocess|subprocess-group-enabled|subprocess-kill|subprocess-pid|subprocess-status|subprocess-wait|subprocess\\?|subset\\?|substring|suggest\\/c|symbol->string|symbol-interned\\?|symbol-unreadable\\?|symbol<\\?|symbol=\\?|symbol\\?|sync|sync\\/enable-break|sync\\/timeout|sync\\/timeout\\/enable-break|syntax->datum|syntax->list|syntax-arm|syntax-column|syntax-debug-info|syntax-disarm|syntax-e|syntax-line|syntax-local-bind-syntaxes|syntax-local-certifier|syntax-local-context|syntax-local-expand-expression|syntax-local-get-shadower|syntax-local-identifier-as-binding|syntax-local-introduce|syntax-local-lift-context|syntax-local-lift-expression|syntax-local-lift-module|syntax-local-lift-module-end-declaration|syntax-local-lift-provide|syntax-local-lift-require|syntax-local-lift-values-expression|syntax-local-make-definition-context|syntax-local-make-delta-introducer|syntax-local-module-defined-identifiers|syntax-local-module-exports|syntax-local-module-required-identifiers|syntax-local-name|syntax-local-phase-level|syntax-local-submodules|syntax-local-transforming-module-provides\\?|syntax-local-value|syntax-local-value\\/immediate|syntax-original\\?|syntax-position|syntax-property|syntax-property-preserved\\?|syntax-property-symbol-keys|syntax-protect|syntax-rearm|syntax-recertify|syntax-shift-phase-level|syntax-source|syntax-source-module|syntax-span|syntax-taint|syntax-tainted\\?|syntax-track-origin|syntax-transforming-module-expression\\?|syntax-transforming-with-lifts\\?|syntax-transforming\\?|syntax\\?|system-big-endian\\?|system-idle-evt|system-language\\+country|system-library-subpath|system-path-convention-type|system-type|tail-marks-match\\?|take|take-common-prefix|take-right|takef|takef-right|tan|tanh|tcp-abandon-port|tcp-accept|tcp-accept-evt|tcp-accept-ready\\?|tcp-accept\\/enable-break|tcp-addresses|tcp-close|tcp-connect|tcp-connect\\/enable-break|tcp-listen|tcp-listener\\?|tcp-port\\?|tentative-pretty-print-port-cancel|tentative-pretty-print-port-transfer|tenth|terminal-port\\?|the-unsupplied-arg|third|thread|thread-cell-ref|thread-cell-set!|thread-cell-values\\?|thread-cell\\?|thread-dead-evt|thread-dead\\?|thread-group\\?|thread-receive|thread-receive-evt|thread-resume|thread-resume-evt|thread-rewind-receive|thread-running\\?|thread-send|thread-suspend|thread-suspend-evt|thread-try-receive|thread-wait|thread\\/suspend-to-kill|thread\\?|time-apply|touch|true|truncate|udp-addresses|udp-bind!|udp-bound\\?|udp-close|udp-connect!|udp-connected\\?|udp-multicast-interface|udp-multicast-join-group!|udp-multicast-leave-group!|udp-multicast-loopback\\?|udp-multicast-set-interface!|udp-multicast-set-loopback!|udp-multicast-set-ttl!|udp-multicast-ttl|udp-open-socket|udp-receive!|udp-receive!\\*|udp-receive!-evt|udp-receive!\\/enable-break|udp-receive-ready-evt|udp-send|udp-send\\*|udp-send-evt|udp-send-ready-evt|udp-send-to|udp-send-to\\*|udp-send-to-evt|udp-send-to\\/enable-break|udp-send\\/enable-break|udp\\?|unbox|uncaught-exception-handler|unit\\?|unquoted-printing-string|unquoted-printing-string-value|unquoted-printing-string\\?|unspecified-dom|unsupplied-arg\\?|use-collection-link-paths|use-compiled-file-check|use-compiled-file-paths|use-user-specific-search-paths|user-execute-bit|user-read-bit|user-write-bit|value-blame|value-contract|values|variable-reference->empty-namespace|variable-reference->module-base-phase|variable-reference->module-declaration-inspector|variable-reference->module-path-index|variable-reference->module-source|variable-reference->namespace|variable-reference->phase|variable-reference->resolved-module-path|variable-reference-constant\\?|variable-reference\\?|vector|vector->immutable-vector|vector->list|vector->pseudo-random-generator|vector->pseudo-random-generator!|vector->values|vector-append|vector-argmax|vector-argmin|vector-cas!|vector-copy|vector-copy!|vector-count|vector-drop|vector-drop-right|vector-fill!|vector-filter|vector-filter-not|vector-immutable|vector-length|vector-map|vector-map!|vector-member|vector-memq|vector-memv|vector-ref|vector-set!|vector-set\\*!|vector-set-performance-stats!|vector-split-at|vector-split-at-right|vector-take|vector-take-right|vector\\?|version|void|void\\?|weak-box-value|weak-box\\?|weak-set|weak-seteq|weak-seteqv|will-execute|will-executor\\?|will-register|will-try-execute|with-input-from-bytes|with-input-from-string|with-output-to-bytes|with-output-to-string|would-be-future|wrap-evt|wrapped-extra-arg-arrow-extra-neg-party-argument|wrapped-extra-arg-arrow-real-func|wrapped-extra-arg-arrow\\?|writable<%>|write|write-byte|write-bytes|write-bytes-avail|write-bytes-avail\\*|write-bytes-avail-evt|write-bytes-avail\\/enable-break|write-char|write-special|write-special-avail\\*|write-special-evt|write-string|writeln|xor|zero\\?)(?=$|[()\\[\\]{}\",'`;\\s])"
+          "match": "(?<=$|[()\\[\\]{}\",'`;\\s])(\\.\\.\\.|_|syntax-id-rules|syntax-rules|#%app|#%datum|#%declare|#%expression|#%module-begin|#%plain-app|#%plain-lambda|#%plain-module-begin|#%printing-module-begin|#%provide|#%require|#%stratified-body|#%top|#%top-interaction|#%variable-reference|\\.\\.\\.|:do-in|=>|_|all-defined-out|all-from-out|and|apply|arity-at-least|begin|begin-for-syntax|begin0|call-with-input-file|call-with-input-file\\*|call-with-output-file|call-with-output-file\\*|case|case-lambda|combine-in|combine-out|cond|date|date\\*|define|define-for-syntax|define-logger|define-namespace-anchor|define-sequence-syntax|define-struct|define-struct/derived|define-syntax|define-syntax-rule|define-syntaxes|define-values|define-values-for-syntax|do|else|except-in|except-out|exn|exn:break|exn:break:hang-up|exn:break:terminate|exn:fail|exn:fail:contract|exn:fail:contract:arity|exn:fail:contract:continuation|exn:fail:contract:divide-by-zero|exn:fail:contract:non-fixnum-result|exn:fail:contract:variable|exn:fail:filesystem|exn:fail:filesystem:errno|exn:fail:filesystem:exists|exn:fail:filesystem:missing-module|exn:fail:filesystem:version|exn:fail:network|exn:fail:network:errno|exn:fail:out-of-memory|exn:fail:read|exn:fail:read:eof|exn:fail:read:non-char|exn:fail:syntax|exn:fail:syntax:missing-module|exn:fail:syntax:unbound|exn:fail:unsupported|exn:fail:user|file|for|for\\*|for\\*/and|for\\*/first|for\\*/fold|for\\*/fold/derived|for\\*/hash|for\\*/hasheq|for\\*/hasheqv|for\\*/last|for\\*/list|for\\*/lists|for\\*/or|for\\*/product|for\\*/sum|for\\*/vector|for-label|for-meta|for-syntax|for-template|for/and|for/first|for/fold|for/fold/derived|for/hash|for/hasheq|for/hasheqv|for/last|for/list|for/lists|for/or|for/product|for/sum|for/vector|gen:custom-write|gen:equal\\+hash|if|in-bytes|in-bytes-lines|in-directory|in-hash|in-hash-keys|in-hash-pairs|in-hash-values|in-immutable-hash|in-immutable-hash-keys|in-immutable-hash-pairs|in-immutable-hash-values|in-indexed|in-input-port-bytes|in-input-port-chars|in-lines|in-list|in-mlist|in-mutable-hash|in-mutable-hash-keys|in-mutable-hash-pairs|in-mutable-hash-values|in-naturals|in-port|in-producer|in-range|in-string|in-value|in-vector|in-weak-hash|in-weak-hash-keys|in-weak-hash-pairs|in-weak-hash-values|lambda|let|let\\*|let\\*-values|let-syntax|let-syntaxes|let-values|let/cc|let/ec|letrec|letrec-syntax|letrec-syntaxes|letrec-syntaxes\\+values|letrec-values|lib|local-require|log-debug|log-error|log-fatal|log-info|log-warning|module|module\\*|module\\+|only-in|only-meta-in|open-input-file|open-input-output-file|open-output-file|or|parameterize|parameterize\\*|parameterize-break|planet|prefix-in|prefix-out|protect-out|provide|quasiquote|quasisyntax|quasisyntax/loc|quote|quote-syntax|quote-syntax/prune|regexp-match\\*|regexp-match-peek-positions\\*|regexp-match-positions\\*|relative-in|rename-in|rename-out|require|set!|set!-values|sort|srcloc|struct|struct-copy|struct-field-index|struct-out|submod|syntax|syntax-case|syntax-case\\*|syntax-id-rules|syntax-rules|syntax/loc|time|unless|unquote|unquote-splicing|unsyntax|unsyntax-splicing|when|with-continuation-mark|with-handlers|with-handlers\\*|with-input-from-file|with-output-to-file|with-syntax|λ|#%app|#%datum|#%declare|#%expression|#%module-begin|#%plain-app|#%plain-lambda|#%plain-module-begin|#%printing-module-begin|#%provide|#%require|#%stratified-body|#%top|#%top-interaction|#%variable-reference|->|->\\*|->\\*m|->d|->dm|->i|->m|\\.\\.\\.|:do-in|<=/c|=/c|==|=>|>=/c|_|absent|abstract|add-between|all-defined-out|all-from-out|and|and/c|any|any/c|apply|arity-at-least|arrow-contract-info|augment|augment\\*|augment-final|augment-final\\*|augride|augride\\*|bad-number-of-results|begin|begin-for-syntax|begin0|between/c|blame-add-context|box-immutable/c|box/c|call-with-atomic-output-file|call-with-file-lock/timeout|call-with-input-file|call-with-input-file\\*|call-with-output-file|call-with-output-file\\*|case|case->|case->m|case-lambda|channel/c|char-in/c|check-duplicates|class|class\\*|class-field-accessor|class-field-mutator|class/c|class/derived|combine-in|combine-out|command-line|compound-unit|compound-unit/infer|cond|cons/c|cons/dc|continuation-mark-key/c|contract|contract-exercise|contract-out|contract-struct|contracted|copy-directory/files|current-contract-region|date|date\\*|define|define-compound-unit|define-compound-unit/infer|define-contract-struct|define-custom-hash-types|define-custom-set-types|define-for-syntax|define-local-member-name|define-logger|define-match-expander|define-member-name|define-module-boundary-contract|define-namespace-anchor|define-opt/c|define-sequence-syntax|define-serializable-class|define-serializable-class\\*|define-signature|define-signature-form|define-struct|define-struct/contract|define-struct/derived|define-syntax|define-syntax-rule|define-syntaxes|define-unit|define-unit-binding|define-unit-from-context|define-unit/contract|define-unit/new-import-export|define-unit/s|define-values|define-values-for-export|define-values-for-syntax|define-values/invoke-unit|define-values/invoke-unit/infer|define/augment|define/augment-final|define/augride|define/contract|define/final-prop|define/match|define/overment|define/override|define/override-final|define/private|define/public|define/public-final|define/pubment|define/subexpression-pos-prop|define/subexpression-pos-prop/name|delay|delay/idle|delay/name|delay/strict|delay/sync|delay/thread|delete-directory/files|dict->list|dict-can-functional-set\\?|dict-can-remove-keys\\?|dict-clear|dict-clear!|dict-copy|dict-count|dict-empty\\?|dict-for-each|dict-has-key\\?|dict-implements/c|dict-implements\\?|dict-iterate-first|dict-iterate-key|dict-iterate-next|dict-iterate-value|dict-keys|dict-map|dict-mutable\\?|dict-ref|dict-ref!|dict-remove|dict-remove!|dict-set|dict-set!|dict-set\\*|dict-set\\*!|dict-update|dict-update!|dict-values|dict\\?|display-lines|display-lines-to-file|display-to-file|do|dynamic->\\*|dynamic-place|dynamic-place\\*|else|eof-evt|except|except-in|except-out|exn|exn:break|exn:break:hang-up|exn:break:terminate|exn:fail|exn:fail:contract|exn:fail:contract:arity|exn:fail:contract:blame|exn:fail:contract:continuation|exn:fail:contract:divide-by-zero|exn:fail:contract:non-fixnum-result|exn:fail:contract:variable|exn:fail:filesystem|exn:fail:filesystem:errno|exn:fail:filesystem:exists|exn:fail:filesystem:missing-module|exn:fail:filesystem:version|exn:fail:network|exn:fail:network:errno|exn:fail:object|exn:fail:out-of-memory|exn:fail:read|exn:fail:read:eof|exn:fail:read:non-char|exn:fail:syntax|exn:fail:syntax:missing-module|exn:fail:syntax:unbound|exn:fail:unsupported|exn:fail:user|export|extends|failure-cont|field|field-bound\\?|file|file->bytes|file->bytes-lines|file->lines|file->list|file->string|file->value|find-files|find-relative-path|first-or/c|flat-contract-with-explanation|flat-murec-contract|flat-rec-contract|for|for\\*|for\\*/and|for\\*/async|for\\*/first|for\\*/fold|for\\*/fold/derived|for\\*/hash|for\\*/hasheq|for\\*/hasheqv|for\\*/last|for\\*/list|for\\*/lists|for\\*/mutable-set|for\\*/mutable-seteq|for\\*/mutable-seteqv|for\\*/or|for\\*/product|for\\*/set|for\\*/seteq|for\\*/seteqv|for\\*/stream|for\\*/sum|for\\*/vector|for\\*/weak-set|for\\*/weak-seteq|for\\*/weak-seteqv|for-label|for-meta|for-syntax|for-template|for/and|for/async|for/first|for/fold|for/fold/derived|for/hash|for/hasheq|for/hasheqv|for/last|for/list|for/lists|for/mutable-set|for/mutable-seteq|for/mutable-seteqv|for/or|for/product|for/set|for/seteq|for/seteqv|for/stream|for/sum|for/vector|for/weak-set|for/weak-seteq|for/weak-seteqv|gen:custom-write|gen:dict|gen:equal\\+hash|gen:set|gen:stream|generic|get-field|get-preference|hash/c|hash/dc|if|implies|import|in-bytes|in-bytes-lines|in-dict|in-dict-keys|in-dict-values|in-directory|in-hash|in-hash-keys|in-hash-pairs|in-hash-values|in-immutable-hash|in-immutable-hash-keys|in-immutable-hash-pairs|in-immutable-hash-values|in-immutable-set|in-indexed|in-input-port-bytes|in-input-port-chars|in-lines|in-list|in-mlist|in-mutable-hash|in-mutable-hash-keys|in-mutable-hash-pairs|in-mutable-hash-values|in-mutable-set|in-naturals|in-port|in-producer|in-range|in-set|in-slice|in-stream|in-string|in-syntax|in-value|in-vector|in-weak-hash|in-weak-hash-keys|in-weak-hash-pairs|in-weak-hash-values|in-weak-set|include|include-at/relative-to|include-at/relative-to/reader|include/reader|inherit|inherit-field|inherit/inner|inherit/super|init|init-depend|init-field|init-rest|inner|inspect|instantiate|integer-in|interface|interface\\*|invariant-assertion|invoke-unit|invoke-unit/infer|lambda|lazy|let|let\\*|let\\*-values|let-syntax|let-syntaxes|let-values|let/cc|let/ec|letrec|letrec-syntax|letrec-syntaxes|letrec-syntaxes\\+values|letrec-values|lib|link|list\\*of|list/c|listof|local|local-require|log-debug|log-error|log-fatal|log-info|log-warning|make-custom-hash|make-custom-hash-types|make-custom-set|make-custom-set-types|make-handle-get-preference-locked|make-immutable-custom-hash|make-mutable-custom-set|make-object|make-temporary-file|make-weak-custom-hash|make-weak-custom-set|match|match\\*|match\\*/derived|match-define|match-define-values|match-lambda|match-lambda\\*|match-lambda\\*\\*|match-let|match-let\\*|match-let\\*-values|match-let-values|match-letrec|match-letrec-values|match/derived|match/values|member-name-key|mixin|module|module\\*|module\\+|nand|new|new-∀/c|new-∃/c|non-empty-listof|none/c|nor|not/c|object-contract|object/c|one-of/c|only|only-in|only-meta-in|open|open-input-file|open-input-output-file|open-output-file|opt/c|or|or/c|overment|overment\\*|override|override\\*|override-final|override-final\\*|parameter/c|parameterize|parameterize\\*|parameterize-break|parametric->/c|pathlist-closure|peek-bytes!-evt|peek-bytes-avail!-evt|peek-bytes-evt|peek-string!-evt|peek-string-evt|peeking-input-port|place|place\\*|place/context|planet|port->bytes|port->bytes-lines|port->lines|port->string|prefix|prefix-in|prefix-out|pretty-format|private|private\\*|procedure-arity-includes/c|process|process\\*|process\\*/ports|process/ports|promise/c|prompt-tag/c|prop:dict/contract|protect-out|provide|provide-signature-elements|provide/contract|public|public\\*|public-final|public-final\\*|pubment|pubment\\*|quasiquote|quasisyntax|quasisyntax/loc|quote|quote-syntax|quote-syntax/prune|raise-blame-error|raise-not-cons-blame-error|range|read-bytes!-evt|read-bytes-avail!-evt|read-bytes-evt|read-bytes-line-evt|read-line-evt|read-string!-evt|read-string-evt|real-in|recontract-out|recursive-contract|regexp-match\\*|regexp-match-evt|regexp-match-peek-positions\\*|regexp-match-positions\\*|relative-in|relocate-input-port|relocate-output-port|remove-duplicates|rename|rename-in|rename-inner|rename-out|rename-super|require|send|send\\*|send\\+|send-generic|send/apply|send/keyword-apply|sequence/c|set!|set!-values|set-field!|set/c|shared|sort|srcloc|stream|stream\\*|stream-cons|string-join|string-len/c|string-normalize-spaces|string-replace|string-split|string-trim|struct|struct\\*|struct-copy|struct-field-index|struct-out|struct/c|struct/ctc|struct/dc|submod|super|super-instantiate|super-make-object|super-new|symbols|syntax|syntax-case|syntax-case\\*|syntax-id-rules|syntax-rules|syntax/c|syntax/loc|system|system\\*|system\\*/exit-code|system/exit-code|tag|this|this%|thunk|thunk\\*|time|transplant-input-port|transplant-output-port|unconstrained-domain->|unit|unit-from-context|unit/c|unit/new-import-export|unit/s|unless|unquote|unquote-splicing|unsyntax|unsyntax-splicing|values/drop|vector-immutable/c|vector-immutableof|vector-sort|vector-sort!|vector/c|vectorof|when|with-continuation-mark|with-contract|with-contract-continuation-mark|with-handlers|with-handlers\\*|with-input-from-file|with-method|with-output-to-file|with-syntax|wrapped-extra-arg-arrow|write-to-file|~\\.a|~\\.s|~\\.v|~a|~e|~r|~s|~v|λ|expand-for-clause|for-clause-syntax-protect|syntax-pattern-variable\\?|[*+\\-/<]|<=|[=>]|>=|abort-current-continuation|abs|absolute-path\\?|acos|add1|alarm-evt|always-evt|andmap|angle|append|arithmetic-shift|arity-at-least-value|arity-at-least\\?|asin|assf|assoc|assq|assv|atan|banner|bitwise-and|bitwise-bit-field|bitwise-bit-set\\?|bitwise-ior|bitwise-not|bitwise-xor|boolean\\?|bound-identifier=\\?|box|box-cas!|box-immutable|box\\?|break-enabled|break-parameterization\\?|break-thread|build-list|build-path|build-path/convention-type|build-string|build-vector|byte-pregexp|byte-pregexp\\?|byte-ready\\?|byte-regexp|byte-regexp\\?|byte\\?|bytes|bytes->immutable-bytes|bytes->list|bytes->path|bytes->path-element|bytes->string/latin-1|bytes->string/locale|bytes->string/utf-8|bytes-append|bytes-close-converter|bytes-convert|bytes-convert-end|bytes-converter\\?|bytes-copy|bytes-copy!|bytes-environment-variable-name\\?|bytes-fill!|bytes-length|bytes-open-converter|bytes-ref|bytes-set!|bytes-utf-8-index|bytes-utf-8-length|bytes-utf-8-ref|bytes<\\?|bytes=\\?|bytes>\\?|bytes\\?|caaaar|caaadr|caaar|caadar|caaddr|caadr|caar|cadaar|cadadr|cadar|caddar|cadddr|caddr|cadr|call-in-nested-thread|call-with-break-parameterization|call-with-composable-continuation|call-with-continuation-barrier|call-with-continuation-prompt|call-with-current-continuation|call-with-default-reading-parameterization|call-with-escape-continuation|call-with-exception-handler|call-with-immediate-continuation-mark|call-with-parameterization|call-with-semaphore|call-with-semaphore/enable-break|call-with-values|call/cc|call/ec|car|cdaaar|cdaadr|cdaar|cdadar|cdaddr|cdadr|cdar|cddaar|cddadr|cddar|cdddar|cddddr|cdddr|cddr|cdr|ceiling|channel-get|channel-put|channel-put-evt|channel-put-evt\\?|channel-try-get|channel\\?|chaperone-box|chaperone-channel|chaperone-continuation-mark-key|chaperone-evt|chaperone-hash|chaperone-of\\?|chaperone-procedure|chaperone-procedure\\*|chaperone-prompt-tag|chaperone-struct|chaperone-struct-type|chaperone-vector|chaperone-vector\\*|chaperone\\?|char->integer|char-alphabetic\\?|char-blank\\?|char-ci<=\\?|char-ci<\\?|char-ci=\\?|char-ci>=\\?|char-ci>\\?|char-downcase|char-foldcase|char-general-category|char-graphic\\?|char-iso-control\\?|char-lower-case\\?|char-numeric\\?|char-punctuation\\?|char-ready\\?|char-symbolic\\?|char-title-case\\?|char-titlecase|char-upcase|char-upper-case\\?|char-utf-8-length|char-whitespace\\?|char<=\\?|char<\\?|char=\\?|char>=\\?|char>\\?|char\\?|check-duplicate-identifier|check-tail-contract|checked-procedure-check-and-extract|choice-evt|cleanse-path|close-input-port|close-output-port|collect-garbage|collection-file-path|collection-path|compile|compile-allow-set!-undefined|compile-context-preservation-enabled|compile-enforce-module-constants|compile-syntax|compiled-expression-recompile|compiled-expression\\?|compiled-module-expression\\?|complete-path\\?|complex\\?|compose|compose1|cons|continuation-mark-key\\?|continuation-mark-set->context|continuation-mark-set->list|continuation-mark-set->list\\*|continuation-mark-set-first|continuation-mark-set\\?|continuation-marks|continuation-prompt-available\\?|continuation-prompt-tag\\?|continuation\\?|copy-file|cos|current-break-parameterization|current-code-inspector|current-command-line-arguments|current-compile|current-compiled-file-roots|current-continuation-marks|current-custodian|current-directory|current-directory-for-user|current-drive|current-environment-variables|current-error-port|current-eval|current-evt-pseudo-random-generator|current-force-delete-permissions|current-gc-milliseconds|current-get-interaction-input-port|current-inexact-milliseconds|current-input-port|current-inspector|current-library-collection-links|current-library-collection-paths|current-load|current-load-extension|current-load-relative-directory|current-load/use-compiled|current-locale|current-logger|current-memory-use|current-milliseconds|current-module-declare-name|current-module-declare-source|current-module-name-resolver|current-module-path-for-load|current-namespace|current-output-port|current-parameterization|current-plumber|current-preserved-thread-cell-values|current-print|current-process-milliseconds|current-prompt-read|current-pseudo-random-generator|current-read-interaction|current-reader-guard|current-readtable|current-seconds|current-security-guard|current-subprocess-custodian-mode|current-thread|current-thread-group|current-thread-initial-stack-size|current-write-relative-directory|custodian-box-value|custodian-box\\?|custodian-limit-memory|custodian-managed-list|custodian-memory-accounting-available\\?|custodian-require-memory|custodian-shut-down\\?|custodian-shutdown-all|custodian\\?|custom-print-quotable-accessor|custom-print-quotable\\?|custom-write-accessor|custom-write\\?|date\\*-nanosecond|date\\*-time-zone-name|date\\*\\?|date-day|date-dst\\?|date-hour|date-minute|date-month|date-second|date-time-zone-offset|date-week-day|date-year|date-year-day|date\\?|datum->syntax|datum-intern-literal|default-continuation-prompt-tag|delete-directory|delete-file|denominator|directory-exists\\?|directory-list|display|displayln|double-flonum\\?|dump-memory-stats|dynamic-require|dynamic-require-for-syntax|dynamic-wind|environment-variables-copy|environment-variables-names|environment-variables-ref|environment-variables-set!|environment-variables\\?|eof|eof-object\\?|ephemeron-value|ephemeron\\?|eprintf|eq-hash-code|eq\\?|equal-hash-code|equal-secondary-hash-code|equal\\?|equal\\?/recur|eqv-hash-code|eqv\\?|error|error-display-handler|error-escape-handler|error-print-context-length|error-print-source-location|error-print-width|error-value->string-handler|eval|eval-jit-enabled|eval-syntax|even\\?|evt\\?|exact->inexact|exact-integer\\?|exact-nonnegative-integer\\?|exact-positive-integer\\?|exact\\?|executable-yield-handler|exit|exit-handler|exn-continuation-marks|exn-message|exn:break-continuation|exn:break:hang-up\\?|exn:break:terminate\\?|exn:break\\?|exn:fail:contract:arity\\?|exn:fail:contract:continuation\\?|exn:fail:contract:divide-by-zero\\?|exn:fail:contract:non-fixnum-result\\?|exn:fail:contract:variable-id|exn:fail:contract:variable\\?|exn:fail:contract\\?|exn:fail:filesystem:errno-errno|exn:fail:filesystem:errno\\?|exn:fail:filesystem:exists\\?|exn:fail:filesystem:missing-module-path|exn:fail:filesystem:missing-module\\?|exn:fail:filesystem:version\\?|exn:fail:filesystem\\?|exn:fail:network:errno-errno|exn:fail:network:errno\\?|exn:fail:network\\?|exn:fail:out-of-memory\\?|exn:fail:read-srclocs|exn:fail:read:eof\\?|exn:fail:read:non-char\\?|exn:fail:read\\?|exn:fail:syntax-exprs|exn:fail:syntax:missing-module-path|exn:fail:syntax:missing-module\\?|exn:fail:syntax:unbound\\?|exn:fail:syntax\\?|exn:fail:unsupported\\?|exn:fail:user\\?|exn:fail\\?|exn:missing-module-accessor|exn:missing-module\\?|exn:srclocs-accessor|exn:srclocs\\?|exn\\?|exp|expand|expand-for-clause|expand-once|expand-syntax|expand-syntax-once|expand-syntax-to-top-form|expand-to-top-form|expand-user-path|explode-path|expt|file-exists\\?|file-or-directory-identity|file-or-directory-modify-seconds|file-or-directory-permissions|file-position|file-position\\*|file-size|file-stream-buffer-mode|file-stream-port\\?|file-truncate|filesystem-change-evt|filesystem-change-evt-cancel|filesystem-change-evt\\?|filesystem-root-list|filter|find-executable-path|find-library-collection-links|find-library-collection-paths|find-system-path|findf|fixnum\\?|floating-point-bytes->real|flonum\\?|floor|flush-output|foldl|foldr|for-clause-syntax-protect|for-each|format|fprintf|free-identifier=\\?|free-label-identifier=\\?|free-template-identifier=\\?|free-transformer-identifier=\\?|gcd|generate-temporaries|gensym|get-output-bytes|get-output-string|getenv|global-port-print-handler|guard-evt|handle-evt|handle-evt\\?|hash|hash->list|hash-clear|hash-clear!|hash-copy|hash-copy-clear|hash-count|hash-empty\\?|hash-eq\\?|hash-equal\\?|hash-eqv\\?|hash-for-each|hash-has-key\\?|hash-iterate-first|hash-iterate-key|hash-iterate-key\\+value|hash-iterate-next|hash-iterate-pair|hash-iterate-value|hash-keys|hash-keys-subset\\?|hash-map|hash-placeholder\\?|hash-ref|hash-ref!|hash-remove|hash-remove!|hash-set|hash-set!|hash-set\\*|hash-set\\*!|hash-update|hash-update!|hash-values|hash-weak\\?|hash\\?|hasheq|hasheqv|identifier-binding|identifier-binding-symbol|identifier-label-binding|identifier-prune-lexical-context|identifier-prune-to-source-module|identifier-remove-from-definition-context|identifier-template-binding|identifier-transformer-binding|identifier\\?|imag-part|immutable\\?|impersonate-box|impersonate-channel|impersonate-continuation-mark-key|impersonate-hash|impersonate-procedure|impersonate-procedure\\*|impersonate-prompt-tag|impersonate-struct|impersonate-vector|impersonate-vector\\*|impersonator-ephemeron|impersonator-of\\?|impersonator-prop:application-mark|impersonator-property-accessor-procedure\\?|impersonator-property\\?|impersonator\\?|in-cycle|in-parallel|in-sequences|in-values\\*-sequence|in-values-sequence|inexact->exact|inexact-real\\?|inexact\\?|input-port\\?|inspector-superior\\?|inspector\\?|integer->char|integer->integer-bytes|integer-bytes->integer|integer-length|integer-sqrt|integer-sqrt/remainder|integer\\?|internal-definition-context-binding-identifiers|internal-definition-context-introduce|internal-definition-context-seal|internal-definition-context\\?|keyword->string|keyword-apply|keyword<\\?|keyword\\?|kill-thread|lcm|legacy-match-expander\\?|length|liberal-define-context\\?|link-exists\\?|list|list\\*|list->bytes|list->string|list->vector|list-ref|list-tail|list\\?|load|load-extension|load-on-demand-enabled|load-relative|load-relative-extension|load/cd|load/use-compiled|local-expand|local-expand/capture-lifts|local-transformer-expand|local-transformer-expand/capture-lifts|locale-string-encoding|log|log-all-levels|log-level-evt|log-level\\?|log-max-level|log-message|log-receiver\\?|logger-name|logger\\?|magnitude|make-arity-at-least|make-base-empty-namespace|make-base-namespace|make-bytes|make-channel|make-continuation-mark-key|make-continuation-prompt-tag|make-custodian|make-custodian-box|make-date|make-date\\*|make-derived-parameter|make-directory|make-do-sequence|make-empty-namespace|make-environment-variables|make-ephemeron|make-exn|make-exn:break|make-exn:break:hang-up|make-exn:break:terminate|make-exn:fail|make-exn:fail:contract|make-exn:fail:contract:arity|make-exn:fail:contract:continuation|make-exn:fail:contract:divide-by-zero|make-exn:fail:contract:non-fixnum-result|make-exn:fail:contract:variable|make-exn:fail:filesystem|make-exn:fail:filesystem:errno|make-exn:fail:filesystem:exists|make-exn:fail:filesystem:missing-module|make-exn:fail:filesystem:version|make-exn:fail:network|make-exn:fail:network:errno|make-exn:fail:out-of-memory|make-exn:fail:read|make-exn:fail:read:eof|make-exn:fail:read:non-char|make-exn:fail:syntax|make-exn:fail:syntax:missing-module|make-exn:fail:syntax:unbound|make-exn:fail:unsupported|make-exn:fail:user|make-file-or-directory-link|make-hash|make-hash-placeholder|make-hasheq|make-hasheq-placeholder|make-hasheqv|make-hasheqv-placeholder|make-immutable-hash|make-immutable-hasheq|make-immutable-hasheqv|make-impersonator-property|make-input-port|make-inspector|make-keyword-procedure|make-known-char-range-list|make-log-receiver|make-logger|make-output-port|make-parameter|make-phantom-bytes|make-pipe|make-placeholder|make-plumber|make-polar|make-prefab-struct|make-pseudo-random-generator|make-reader-graph|make-readtable|make-rectangular|make-rename-transformer|make-resolved-module-path|make-security-guard|make-semaphore|make-set!-transformer|make-shared-bytes|make-sibling-inspector|make-special-comment|make-srcloc|make-string|make-struct-field-accessor|make-struct-field-mutator|make-struct-type|make-struct-type-property|make-syntax-delta-introducer|make-syntax-introducer|make-thread-cell|make-thread-group|make-vector|make-weak-box|make-weak-hash|make-weak-hasheq|make-weak-hasheqv|make-will-executor|map|match-\\.\\.\\.-nesting|match-expander\\?|max|mcar|mcdr|mcons|member|memf|memq|memv|min|module->exports|module->imports|module->indirect-exports|module->language-info|module->namespace|module-compiled-cross-phase-persistent\\?|module-compiled-exports|module-compiled-imports|module-compiled-indirect-exports|module-compiled-language-info|module-compiled-name|module-compiled-submodules|module-declared\\?|module-path-index-join|module-path-index-resolve|module-path-index-split|module-path-index-submodule|module-path-index\\?|module-path\\?|module-predefined\\?|module-provide-protected\\?|modulo|mpair\\?|nack-guard-evt|namespace-anchor->empty-namespace|namespace-anchor->namespace|namespace-anchor\\?|namespace-attach-module|namespace-attach-module-declaration|namespace-base-phase|namespace-mapped-symbols|namespace-module-identifier|namespace-module-registry|namespace-require|namespace-require/constant|namespace-require/copy|namespace-require/expansion-time|namespace-set-variable-value!|namespace-symbol->identifier|namespace-syntax-introduce|namespace-undefine-variable!|namespace-unprotect-module|namespace-variable-value|namespace\\?|negative\\?|never-evt|newline|normal-case-path|not|null|null\\?|number->string|number\\?|numerator|object-name|odd\\?|open-input-bytes|open-input-string|open-output-bytes|open-output-string|ormap|output-port\\?|pair\\?|parameter-procedure=\\?|parameter\\?|parameterization\\?|parse-leftover->\\*|path->bytes|path->complete-path|path->directory-path|path->string|path-add-extension|path-add-suffix|path-convention-type|path-element->bytes|path-element->string|path-for-some-system\\?|path-list-string->path-list|path-replace-extension|path-replace-suffix|path-string\\?|path<\\?|path\\?|peek-byte|peek-byte-or-special|peek-bytes|peek-bytes!|peek-bytes-avail!|peek-bytes-avail!\\*|peek-bytes-avail!/enable-break|peek-char|peek-char-or-special|peek-string|peek-string!|phantom-bytes\\?|pipe-content-length|placeholder-get|placeholder-set!|placeholder\\?|plumber-add-flush!|plumber-flush-all|plumber-flush-handle-remove!|plumber-flush-handle\\?|plumber\\?|poll-guard-evt|port-closed-evt|port-closed\\?|port-commit-peeked|port-count-lines!|port-count-lines-enabled|port-counts-lines\\?|port-display-handler|port-file-identity|port-file-unlock|port-next-location|port-print-handler|port-progress-evt|port-provides-progress-evts\\?|port-read-handler|port-try-file-lock\\?|port-write-handler|port-writes-atomic\\?|port-writes-special\\?|port\\?|positive\\?|prefab-key->struct-type|prefab-key\\?|prefab-struct-key|pregexp|pregexp\\?|primitive-closure\\?|primitive-result-arity|primitive\\?|print|print-as-expression|print-boolean-long-form|print-box|print-graph|print-hash-table|print-mpair-curly-braces|print-pair-curly-braces|print-reader-abbreviations|print-struct|print-syntax-width|print-unreadable|print-vector-length|printf|println|procedure->method|procedure-arity|procedure-arity-includes\\?|procedure-arity\\?|procedure-closure-contents-eq\\?|procedure-extract-target|procedure-impersonator\\*\\?|procedure-keywords|procedure-reduce-arity|procedure-reduce-keyword-arity|procedure-rename|procedure-result-arity|procedure-specialize|procedure-struct-type\\?|procedure\\?|progress-evt\\?|prop:arity-string|prop:authentic|prop:checked-procedure|prop:custom-print-quotable|prop:custom-write|prop:equal\\+hash|prop:evt|prop:exn:missing-module|prop:exn:srclocs|prop:expansion-contexts|prop:impersonator-of|prop:input-port|prop:legacy-match-expander|prop:liberal-define-context|prop:match-expander|prop:object-name|prop:output-port|prop:procedure|prop:rename-transformer|prop:sequence|prop:set!-transformer|pseudo-random-generator->vector|pseudo-random-generator-vector\\?|pseudo-random-generator\\?|putenv|quotient|quotient/remainder|raise|raise-argument-error|raise-arguments-error|raise-arity-error|raise-mismatch-error|raise-range-error|raise-result-error|raise-syntax-error|raise-type-error|raise-user-error|random|random-seed|rational\\?|rationalize|read|read-accept-bar-quote|read-accept-box|read-accept-compiled|read-accept-dot|read-accept-graph|read-accept-infix-dot|read-accept-lang|read-accept-quasiquote|read-accept-reader|read-byte|read-byte-or-special|read-bytes|read-bytes!|read-bytes-avail!|read-bytes-avail!\\*|read-bytes-avail!/enable-break|read-bytes-line|read-case-sensitive|read-cdot|read-char|read-char-or-special|read-curly-brace-as-paren|read-curly-brace-with-tag|read-decimal-as-inexact|read-eval-print-loop|read-language|read-line|read-on-demand-source|read-square-bracket-as-paren|read-square-bracket-with-tag|read-string|read-string!|read-syntax|read-syntax/recursive|read/recursive|readtable-mapping|readtable\\?|real->decimal-string|real->double-flonum|real->floating-point-bytes|real->single-flonum|real-part|real\\?|regexp|regexp-match|regexp-match-exact\\?|regexp-match-peek|regexp-match-peek-immediate|regexp-match-peek-positions|regexp-match-peek-positions-immediate|regexp-match-peek-positions-immediate/end|regexp-match-peek-positions/end|regexp-match-positions|regexp-match-positions/end|regexp-match/end|regexp-match\\?|regexp-max-lookbehind|regexp-quote|regexp-replace|regexp-replace\\*|regexp-replace-quote|regexp-replaces|regexp-split|regexp-try-match|regexp\\?|relative-path\\?|remainder|remove|remove\\*|remq|remq\\*|remv|remv\\*|rename-file-or-directory|rename-transformer-target|rename-transformer\\?|replace-evt|reroot-path|resolve-path|resolved-module-path-name|resolved-module-path\\?|reverse|round|seconds->date|security-guard\\?|semaphore-peek-evt|semaphore-peek-evt\\?|semaphore-post|semaphore-try-wait\\?|semaphore-wait|semaphore-wait/enable-break|semaphore\\?|sequence->stream|sequence-generate|sequence-generate\\*|sequence\\?|set!-transformer-procedure|set!-transformer\\?|set-box!|set-mcar!|set-mcdr!|set-phantom-bytes!|set-port-next-location!|shared-bytes|shell-execute|simplify-path|sin|single-flonum\\?|sleep|special-comment-value|special-comment\\?|split-path|sqrt|srcloc->string|srcloc-column|srcloc-line|srcloc-position|srcloc-source|srcloc-span|srcloc\\?|stop-after|stop-before|string|string->bytes/latin-1|string->bytes/locale|string->bytes/utf-8|string->immutable-string|string->keyword|string->list|string->number|string->path|string->path-element|string->symbol|string->uninterned-symbol|string->unreadable-symbol|string-append|string-ci<=\\?|string-ci<\\?|string-ci=\\?|string-ci>=\\?|string-ci>\\?|string-copy|string-copy!|string-downcase|string-environment-variable-name\\?|string-fill!|string-foldcase|string-length|string-locale-ci<\\?|string-locale-ci=\\?|string-locale-ci>\\?|string-locale-downcase|string-locale-upcase|string-locale<\\?|string-locale=\\?|string-locale>\\?|string-normalize-nfc|string-normalize-nfd|string-normalize-nfkc|string-normalize-nfkd|string-port\\?|string-ref|string-set!|string-titlecase|string-upcase|string-utf-8-length|string<=\\?|string<\\?|string=\\?|string>=\\?|string>\\?|string\\?|struct->vector|struct-accessor-procedure\\?|struct-constructor-procedure\\?|struct-info|struct-mutator-procedure\\?|struct-predicate-procedure\\?|struct-type-info|struct-type-make-constructor|struct-type-make-predicate|struct-type-property-accessor-procedure\\?|struct-type-property\\?|struct-type\\?|struct:arity-at-least|struct:date|struct:date\\*|struct:exn|struct:exn:break|struct:exn:break:hang-up|struct:exn:break:terminate|struct:exn:fail|struct:exn:fail:contract|struct:exn:fail:contract:arity|struct:exn:fail:contract:continuation|struct:exn:fail:contract:divide-by-zero|struct:exn:fail:contract:non-fixnum-result|struct:exn:fail:contract:variable|struct:exn:fail:filesystem|struct:exn:fail:filesystem:errno|struct:exn:fail:filesystem:exists|struct:exn:fail:filesystem:missing-module|struct:exn:fail:filesystem:version|struct:exn:fail:network|struct:exn:fail:network:errno|struct:exn:fail:out-of-memory|struct:exn:fail:read|struct:exn:fail:read:eof|struct:exn:fail:read:non-char|struct:exn:fail:syntax|struct:exn:fail:syntax:missing-module|struct:exn:fail:syntax:unbound|struct:exn:fail:unsupported|struct:exn:fail:user|struct:srcloc|struct\\?|sub1|subbytes|subprocess|subprocess-group-enabled|subprocess-kill|subprocess-pid|subprocess-status|subprocess-wait|subprocess\\?|substring|symbol->string|symbol-interned\\?|symbol-unreadable\\?|symbol<\\?|symbol\\?|sync|sync/enable-break|sync/timeout|sync/timeout/enable-break|syntax->datum|syntax->list|syntax-arm|syntax-column|syntax-debug-info|syntax-disarm|syntax-e|syntax-line|syntax-local-bind-syntaxes|syntax-local-certifier|syntax-local-context|syntax-local-expand-expression|syntax-local-get-shadower|syntax-local-identifier-as-binding|syntax-local-introduce|syntax-local-lift-context|syntax-local-lift-expression|syntax-local-lift-module|syntax-local-lift-module-end-declaration|syntax-local-lift-provide|syntax-local-lift-require|syntax-local-lift-values-expression|syntax-local-make-definition-context|syntax-local-make-delta-introducer|syntax-local-match-introduce|syntax-local-module-defined-identifiers|syntax-local-module-exports|syntax-local-module-required-identifiers|syntax-local-name|syntax-local-phase-level|syntax-local-submodules|syntax-local-transforming-module-provides\\?|syntax-local-value|syntax-local-value/immediate|syntax-original\\?|syntax-pattern-variable\\?|syntax-position|syntax-property|syntax-property-preserved\\?|syntax-property-symbol-keys|syntax-protect|syntax-rearm|syntax-recertify|syntax-shift-phase-level|syntax-source|syntax-source-module|syntax-span|syntax-taint|syntax-tainted\\?|syntax-track-origin|syntax-transforming-module-expression\\?|syntax-transforming-with-lifts\\?|syntax-transforming\\?|syntax\\?|system-big-endian\\?|system-idle-evt|system-language\\+country|system-library-subpath|system-path-convention-type|system-type|tan|terminal-port\\?|thread|thread-cell-ref|thread-cell-set!|thread-cell-values\\?|thread-cell\\?|thread-dead-evt|thread-dead\\?|thread-group\\?|thread-receive|thread-receive-evt|thread-resume|thread-resume-evt|thread-rewind-receive|thread-running\\?|thread-send|thread-suspend|thread-suspend-evt|thread-try-receive|thread-wait|thread/suspend-to-kill|thread\\?|time-apply|truncate|unbox|uncaught-exception-handler|unquoted-printing-string|unquoted-printing-string-value|unquoted-printing-string\\?|use-collection-link-paths|use-compiled-file-check|use-compiled-file-paths|use-user-specific-search-paths|values|variable-reference->empty-namespace|variable-reference->module-base-phase|variable-reference->module-declaration-inspector|variable-reference->module-path-index|variable-reference->module-source|variable-reference->namespace|variable-reference->phase|variable-reference->resolved-module-path|variable-reference-constant\\?|variable-reference\\?|vector|vector->immutable-vector|vector->list|vector->pseudo-random-generator|vector->pseudo-random-generator!|vector->values|vector-cas!|vector-copy!|vector-fill!|vector-immutable|vector-length|vector-ref|vector-set!|vector-set-performance-stats!|vector\\?|version|void|void\\?|weak-box-value|weak-box\\?|will-execute|will-executor\\?|will-register|will-try-execute|wrap-evt|write|write-byte|write-bytes|write-bytes-avail|write-bytes-avail\\*|write-bytes-avail-evt|write-bytes-avail/enable-break|write-char|write-special|write-special-avail\\*|write-special-evt|write-string|writeln|zero\\?|\\*|\\*list/c|[+\\-/<]|</c|<=|[=>]|>/c|>=|abort-current-continuation|abs|absolute-path\\?|acos|add1|alarm-evt|always-evt|andmap|angle|append|append\\*|append-map|argmax|argmin|arithmetic-shift|arity-at-least-value|arity-at-least\\?|arity-checking-wrapper|arity-includes\\?|arity=\\?|arrow-contract-info-accepts-arglist|arrow-contract-info-chaperone-procedure|arrow-contract-info-check-first-order|arrow-contract-info\\?|asin|assf|assoc|assq|assv|atan|banner|base->-doms/c|base->-rngs/c|base->\\?|bitwise-and|bitwise-bit-field|bitwise-bit-set\\?|bitwise-ior|bitwise-not|bitwise-xor|blame-add-car-context|blame-add-cdr-context|blame-add-missing-party|blame-add-nth-arg-context|blame-add-range-context|blame-add-unknown-context|blame-context|blame-contract|blame-fmt->-string|blame-missing-party\\?|blame-negative|blame-original\\?|blame-positive|blame-replace-negative|blame-source|blame-swap|blame-swapped\\?|blame-update|blame-value|blame\\?|boolean=\\?|boolean\\?|bound-identifier=\\?|box|box-cas!|box-immutable|box\\?|break-enabled|break-parameterization\\?|break-thread|build-chaperone-contract-property|build-compound-type-name|build-contract-property|build-flat-contract-property|build-list|build-path|build-path/convention-type|build-string|build-vector|byte-pregexp|byte-pregexp\\?|byte-ready\\?|byte-regexp|byte-regexp\\?|byte\\?|bytes|bytes->immutable-bytes|bytes->list|bytes->path|bytes->path-element|bytes->string/latin-1|bytes->string/locale|bytes->string/utf-8|bytes-append|bytes-append\\*|bytes-close-converter|bytes-convert|bytes-convert-end|bytes-converter\\?|bytes-copy|bytes-copy!|bytes-environment-variable-name\\?|bytes-fill!|bytes-join|bytes-length|bytes-no-nuls\\?|bytes-open-converter|bytes-ref|bytes-set!|bytes-utf-8-index|bytes-utf-8-length|bytes-utf-8-ref|bytes<\\?|bytes=\\?|bytes>\\?|bytes\\?|caaaar|caaadr|caaar|caadar|caaddr|caadr|caar|cadaar|cadadr|cadar|caddar|cadddr|caddr|cadr|call-in-nested-thread|call-with-break-parameterization|call-with-composable-continuation|call-with-continuation-barrier|call-with-continuation-prompt|call-with-current-continuation|call-with-default-reading-parameterization|call-with-escape-continuation|call-with-exception-handler|call-with-immediate-continuation-mark|call-with-input-bytes|call-with-input-string|call-with-output-bytes|call-with-output-string|call-with-parameterization|call-with-semaphore|call-with-semaphore/enable-break|call-with-values|call/cc|call/ec|car|cartesian-product|cdaaar|cdaadr|cdaar|cdadar|cdaddr|cdadr|cdar|cddaar|cddadr|cddar|cdddar|cddddr|cdddr|cddr|cdr|ceiling|channel-get|channel-put|channel-put-evt|channel-put-evt\\?|channel-try-get|channel\\?|chaperone-box|chaperone-channel|chaperone-continuation-mark-key|chaperone-contract-property\\?|chaperone-contract\\?|chaperone-evt|chaperone-hash|chaperone-hash-set|chaperone-of\\?|chaperone-procedure|chaperone-procedure\\*|chaperone-prompt-tag|chaperone-struct|chaperone-struct-type|chaperone-vector|chaperone-vector\\*|chaperone\\?|char->integer|char-alphabetic\\?|char-blank\\?|char-ci<=\\?|char-ci<\\?|char-ci=\\?|char-ci>=\\?|char-ci>\\?|char-downcase|char-foldcase|char-general-category|char-graphic\\?|char-in|char-iso-control\\?|char-lower-case\\?|char-numeric\\?|char-punctuation\\?|char-ready\\?|char-symbolic\\?|char-title-case\\?|char-titlecase|char-upcase|char-upper-case\\?|char-utf-8-length|char-whitespace\\?|char<=\\?|char<\\?|char=\\?|char>=\\?|char>\\?|char\\?|check-duplicate-identifier|checked-procedure-check-and-extract|choice-evt|class->interface|class-info|class-seal|class-unseal|class\\?|cleanse-path|close-input-port|close-output-port|coerce-chaperone-contract|coerce-chaperone-contracts|coerce-contract|coerce-contract/f|coerce-contracts|coerce-flat-contract|coerce-flat-contracts|collect-garbage|collection-file-path|collection-path|combinations|compile|compile-allow-set!-undefined|compile-context-preservation-enabled|compile-enforce-module-constants|compile-syntax|compiled-expression-recompile|compiled-expression\\?|compiled-module-expression\\?|complete-path\\?|complex\\?|compose|compose1|conjoin|conjugate|cons|cons\\?|const|continuation-mark-key\\?|continuation-mark-set->context|continuation-mark-set->list|continuation-mark-set->list\\*|continuation-mark-set-first|continuation-mark-set\\?|continuation-marks|continuation-prompt-available\\?|continuation-prompt-tag\\?|continuation\\?|contract-continuation-mark-key|contract-custom-write-property-proc|contract-first-order|contract-first-order-passes\\?|contract-late-neg-projection|contract-name|contract-proc|contract-projection|contract-property\\?|contract-random-generate|contract-random-generate-fail|contract-random-generate-fail\\?|contract-random-generate-get-current-environment|contract-random-generate-stash|contract-random-generate/choose|contract-stronger\\?|contract-struct-exercise|contract-struct-generate|contract-struct-late-neg-projection|contract-struct-list-contract\\?|contract-val-first-projection|contract\\?|convert-stream|copy-file|copy-port|cos|cosh|count|current-blame-format|current-break-parameterization|current-code-inspector|current-command-line-arguments|current-compile|current-compiled-file-roots|current-continuation-marks|current-custodian|current-directory|current-directory-for-user|current-drive|current-environment-variables|current-error-port|current-eval|current-evt-pseudo-random-generator|current-force-delete-permissions|current-future|current-gc-milliseconds|current-get-interaction-input-port|current-inexact-milliseconds|current-input-port|current-inspector|current-library-collection-links|current-library-collection-paths|current-load|current-load-extension|current-load-relative-directory|current-load/use-compiled|current-locale|current-logger|current-memory-use|current-milliseconds|current-module-declare-name|current-module-declare-source|current-module-name-resolver|current-module-path-for-load|current-namespace|current-output-port|current-parameterization|current-plumber|current-preserved-thread-cell-values|current-print|current-process-milliseconds|current-prompt-read|current-pseudo-random-generator|current-read-interaction|current-reader-guard|current-readtable|current-seconds|current-security-guard|current-subprocess-custodian-mode|current-thread|current-thread-group|current-thread-initial-stack-size|current-write-relative-directory|curry|curryr|custodian-box-value|custodian-box\\?|custodian-limit-memory|custodian-managed-list|custodian-memory-accounting-available\\?|custodian-require-memory|custodian-shut-down\\?|custodian-shutdown-all|custodian\\?|custom-print-quotable-accessor|custom-print-quotable\\?|custom-write-accessor|custom-write-property-proc|custom-write\\?|date\\*-nanosecond|date\\*-time-zone-name|date\\*\\?|date-day|date-dst\\?|date-hour|date-minute|date-month|date-second|date-time-zone-offset|date-week-day|date-year|date-year-day|date\\?|datum->syntax|datum-intern-literal|default-continuation-prompt-tag|degrees->radians|delete-directory|delete-file|denominator|dict-iter-contract|dict-key-contract|dict-value-contract|directory-exists\\?|directory-list|disjoin|display|displayln|double-flonum\\?|drop|drop-common-prefix|drop-right|dropf|dropf-right|dump-memory-stats|dup-input-port|dup-output-port|dynamic-get-field|dynamic-object/c|dynamic-require|dynamic-require-for-syntax|dynamic-send|dynamic-set-field!|dynamic-wind|eighth|empty|empty-sequence|empty-stream|empty\\?|environment-variables-copy|environment-variables-names|environment-variables-ref|environment-variables-set!|environment-variables\\?|eof|eof-object\\?|ephemeron-value|ephemeron\\?|eprintf|eq-contract-val|eq-contract\\?|eq-hash-code|eq\\?|equal-contract-val|equal-contract\\?|equal-hash-code|equal-secondary-hash-code|equal<%>|equal\\?|equal\\?/recur|eqv-hash-code|eqv\\?|error|error-display-handler|error-escape-handler|error-print-context-length|error-print-source-location|error-print-width|error-value->string-handler|eval|eval-jit-enabled|eval-syntax|even\\?|evt/c|evt\\?|exact->inexact|exact-ceiling|exact-floor|exact-integer\\?|exact-nonnegative-integer\\?|exact-positive-integer\\?|exact-round|exact-truncate|exact\\?|executable-yield-handler|exit|exit-handler|exn-continuation-marks|exn-message|exn:break-continuation|exn:break:hang-up\\?|exn:break:terminate\\?|exn:break\\?|exn:fail:contract:arity\\?|exn:fail:contract:blame-object|exn:fail:contract:blame\\?|exn:fail:contract:continuation\\?|exn:fail:contract:divide-by-zero\\?|exn:fail:contract:non-fixnum-result\\?|exn:fail:contract:variable-id|exn:fail:contract:variable\\?|exn:fail:contract\\?|exn:fail:filesystem:errno-errno|exn:fail:filesystem:errno\\?|exn:fail:filesystem:exists\\?|exn:fail:filesystem:missing-module-path|exn:fail:filesystem:missing-module\\?|exn:fail:filesystem:version\\?|exn:fail:filesystem\\?|exn:fail:network:errno-errno|exn:fail:network:errno\\?|exn:fail:network\\?|exn:fail:object\\?|exn:fail:out-of-memory\\?|exn:fail:read-srclocs|exn:fail:read:eof\\?|exn:fail:read:non-char\\?|exn:fail:read\\?|exn:fail:syntax-exprs|exn:fail:syntax:missing-module-path|exn:fail:syntax:missing-module\\?|exn:fail:syntax:unbound\\?|exn:fail:syntax\\?|exn:fail:unsupported\\?|exn:fail:user\\?|exn:fail\\?|exn:misc:match\\?|exn:missing-module-accessor|exn:missing-module\\?|exn:srclocs-accessor|exn:srclocs\\?|exn\\?|exp|expand|expand-once|expand-syntax|expand-syntax-once|expand-syntax-to-top-form|expand-to-top-form|expand-user-path|explode-path|expt|externalizable<%>|failure-result/c|false|false/c|false\\?|field-names|fifth|file-exists\\?|file-name-from-path|file-or-directory-identity|file-or-directory-modify-seconds|file-or-directory-permissions|file-position|file-position\\*|file-size|file-stream-buffer-mode|file-stream-port\\?|file-truncate|filename-extension|filesystem-change-evt|filesystem-change-evt-cancel|filesystem-change-evt\\?|filesystem-root-list|filter|filter-map|filter-not|filter-read-input-port|find-executable-path|find-library-collection-links|find-library-collection-paths|find-system-path|findf|first|fixnum\\?|flat-contract|flat-contract-predicate|flat-contract-property\\?|flat-contract\\?|flat-named-contract|flatten|floating-point-bytes->real|flonum\\?|floor|flush-output|fold-files|foldl|foldr|for-each|force|format|fourth|fprintf|free-identifier=\\?|free-label-identifier=\\?|free-template-identifier=\\?|free-transformer-identifier=\\?|fsemaphore-count|fsemaphore-post|fsemaphore-try-wait\\?|fsemaphore-wait|fsemaphore\\?|future|future\\?|futures-enabled\\?|gcd|generate-member-key|generate-temporaries|generic-set\\?|generic\\?|gensym|get-output-bytes|get-output-string|get/build-late-neg-projection|get/build-val-first-projection|getenv|global-port-print-handler|group-by|group-execute-bit|group-read-bit|group-write-bit|guard-evt|handle-evt|handle-evt\\?|has-blame\\?|has-contract\\?|hash|hash->list|hash-clear|hash-clear!|hash-copy|hash-copy-clear|hash-count|hash-empty\\?|hash-eq\\?|hash-equal\\?|hash-eqv\\?|hash-for-each|hash-has-key\\?|hash-iterate-first|hash-iterate-key|hash-iterate-key\\+value|hash-iterate-next|hash-iterate-pair|hash-iterate-value|hash-keys|hash-keys-subset\\?|hash-map|hash-placeholder\\?|hash-ref|hash-ref!|hash-remove|hash-remove!|hash-set|hash-set!|hash-set\\*|hash-set\\*!|hash-update|hash-update!|hash-values|hash-weak\\?|hash\\?|hasheq|hasheqv|identifier-binding|identifier-binding-symbol|identifier-label-binding|identifier-prune-lexical-context|identifier-prune-to-source-module|identifier-remove-from-definition-context|identifier-template-binding|identifier-transformer-binding|identifier\\?|identity|if/c|imag-part|immutable\\?|impersonate-box|impersonate-channel|impersonate-continuation-mark-key|impersonate-hash|impersonate-hash-set|impersonate-procedure|impersonate-procedure\\*|impersonate-prompt-tag|impersonate-struct|impersonate-vector|impersonate-vector\\*|impersonator-contract\\?|impersonator-ephemeron|impersonator-of\\?|impersonator-prop:application-mark|impersonator-prop:blame|impersonator-prop:contracted|impersonator-property-accessor-procedure\\?|impersonator-property\\?|impersonator\\?|implementation\\?|implementation\\?/c|in-combinations|in-cycle|in-dict-pairs|in-parallel|in-permutations|in-sequences|in-values\\*-sequence|in-values-sequence|index-of|index-where|indexes-of|indexes-where|inexact->exact|inexact-real\\?|inexact\\?|infinite\\?|input-port-append|input-port\\?|inspector-superior\\?|inspector\\?|instanceof/c|integer->char|integer->integer-bytes|integer-bytes->integer|integer-length|integer-sqrt|integer-sqrt/remainder|integer\\?|interface->method-names|interface-extension\\?|interface\\?|internal-definition-context-binding-identifiers|internal-definition-context-introduce|internal-definition-context-seal|internal-definition-context\\?|is-a\\?|is-a\\?/c|keyword->string|keyword-apply|keyword<\\?|keyword\\?|keywords-match|kill-thread|last|last-pair|lcm|length|liberal-define-context\\?|link-exists\\?|list|list\\*|list->bytes|list->mutable-set|list->mutable-seteq|list->mutable-seteqv|list->set|list->seteq|list->seteqv|list->string|list->vector|list->weak-set|list->weak-seteq|list->weak-seteqv|list-contract\\?|list-prefix\\?|list-ref|list-set|list-tail|list-update|list\\?|listen-port-number\\?|load|load-extension|load-on-demand-enabled|load-relative|load-relative-extension|load/cd|load/use-compiled|local-expand|local-expand/capture-lifts|local-transformer-expand|local-transformer-expand/capture-lifts|locale-string-encoding|log|log-all-levels|log-level-evt|log-level\\?|log-max-level|log-message|log-receiver\\?|logger-name|logger\\?|magnitude|make-arity-at-least|make-base-empty-namespace|make-base-namespace|make-bytes|make-channel|make-chaperone-contract|make-continuation-mark-key|make-continuation-prompt-tag|make-contract|make-custodian|make-custodian-box|make-date|make-date\\*|make-derived-parameter|make-directory|make-directory\\*|make-do-sequence|make-empty-namespace|make-environment-variables|make-ephemeron|make-exn|make-exn:break|make-exn:break:hang-up|make-exn:break:terminate|make-exn:fail|make-exn:fail:contract|make-exn:fail:contract:arity|make-exn:fail:contract:blame|make-exn:fail:contract:continuation|make-exn:fail:contract:divide-by-zero|make-exn:fail:contract:non-fixnum-result|make-exn:fail:contract:variable|make-exn:fail:filesystem|make-exn:fail:filesystem:errno|make-exn:fail:filesystem:exists|make-exn:fail:filesystem:missing-module|make-exn:fail:filesystem:version|make-exn:fail:network|make-exn:fail:network:errno|make-exn:fail:object|make-exn:fail:out-of-memory|make-exn:fail:read|make-exn:fail:read:eof|make-exn:fail:read:non-char|make-exn:fail:syntax|make-exn:fail:syntax:missing-module|make-exn:fail:syntax:unbound|make-exn:fail:unsupported|make-exn:fail:user|make-file-or-directory-link|make-flat-contract|make-fsemaphore|make-generic|make-hash|make-hash-placeholder|make-hasheq|make-hasheq-placeholder|make-hasheqv|make-hasheqv-placeholder|make-immutable-hash|make-immutable-hasheq|make-immutable-hasheqv|make-impersonator-property|make-input-port|make-input-port/read-to-peek|make-inspector|make-keyword-procedure|make-known-char-range-list|make-limited-input-port|make-list|make-lock-file-name|make-log-receiver|make-logger|make-mixin-contract|make-none/c|make-output-port|make-parameter|make-parent-directory\\*|make-phantom-bytes|make-pipe|make-pipe-with-specials|make-placeholder|make-plumber|make-polar|make-prefab-struct|make-primitive-class|make-proj-contract|make-pseudo-random-generator|make-reader-graph|make-readtable|make-rectangular|make-rename-transformer|make-resolved-module-path|make-security-guard|make-semaphore|make-set!-transformer|make-shared-bytes|make-sibling-inspector|make-special-comment|make-srcloc|make-string|make-struct-field-accessor|make-struct-field-mutator|make-struct-type|make-struct-type-property|make-syntax-delta-introducer|make-syntax-introducer|make-tentative-pretty-print-output-port|make-thread-cell|make-thread-group|make-vector|make-weak-box|make-weak-hash|make-weak-hasheq|make-weak-hasheqv|make-will-executor|map|match-equality-test|matches-arity-exactly\\?|max|mcar|mcdr|mcons|member|member-name-key-hash-code|member-name-key=\\?|member-name-key\\?|memf|memq|memv|merge-input|method-in-interface\\?|min|mixin-contract|module->exports|module->imports|module->indirect-exports|module->language-info|module->namespace|module-compiled-cross-phase-persistent\\?|module-compiled-exports|module-compiled-imports|module-compiled-indirect-exports|module-compiled-language-info|module-compiled-name|module-compiled-submodules|module-declared\\?|module-path-index-join|module-path-index-resolve|module-path-index-split|module-path-index-submodule|module-path-index\\?|module-path\\?|module-predefined\\?|module-provide-protected\\?|modulo|mpair\\?|mutable-set|mutable-seteq|mutable-seteqv|n->th|nack-guard-evt|namespace-anchor->empty-namespace|namespace-anchor->namespace|namespace-anchor\\?|namespace-attach-module|namespace-attach-module-declaration|namespace-base-phase|namespace-mapped-symbols|namespace-module-identifier|namespace-module-registry|namespace-require|namespace-require/constant|namespace-require/copy|namespace-require/expansion-time|namespace-set-variable-value!|namespace-symbol->identifier|namespace-syntax-introduce|namespace-undefine-variable!|namespace-unprotect-module|namespace-variable-value|namespace\\?|nan\\?|natural-number/c|natural\\?|negate|negative-integer\\?|negative\\?|never-evt|newline|ninth|non-empty-string\\?|nonnegative-integer\\?|nonpositive-integer\\?|normal-case-path|normalize-arity|normalize-path|normalized-arity\\?|not|null|null\\?|number->string|number\\?|numerator|object%|object->vector|object-info|object-interface|object-method-arity-includes\\?|object-name|object-or-false=\\?|object=\\?|object\\?|odd\\?|open-input-bytes|open-input-string|open-output-bytes|open-output-nowhere|open-output-string|order-of-magnitude|ormap|other-execute-bit|other-read-bit|other-write-bit|output-port\\?|pair\\?|parameter-procedure=\\?|parameter\\?|parameterization\\?|parse-command-line|partition|path->bytes|path->complete-path|path->directory-path|path->string|path-add-extension|path-add-suffix|path-convention-type|path-element->bytes|path-element->string|path-element\\?|path-for-some-system\\?|path-get-extension|path-has-extension\\?|path-list-string->path-list|path-only|path-replace-extension|path-replace-suffix|path-string\\?|path<\\?|path\\?|peek-byte|peek-byte-or-special|peek-bytes|peek-bytes!|peek-bytes-avail!|peek-bytes-avail!\\*|peek-bytes-avail!/enable-break|peek-char|peek-char-or-special|peek-string|peek-string!|permutations|phantom-bytes\\?|pi|pi\\.f|pipe-content-length|place-break|place-channel|place-channel-get|place-channel-put|place-channel-put/get|place-channel\\?|place-dead-evt|place-enabled\\?|place-kill|place-location\\?|place-message-allowed\\?|place-sleep|place-wait|place\\?|placeholder-get|placeholder-set!|placeholder\\?|plumber-add-flush!|plumber-flush-all|plumber-flush-handle-remove!|plumber-flush-handle\\?|plumber\\?|poll-guard-evt|port->list|port-closed-evt|port-closed\\?|port-commit-peeked|port-count-lines!|port-count-lines-enabled|port-counts-lines\\?|port-display-handler|port-file-identity|port-file-unlock|port-next-location|port-number\\?|port-print-handler|port-progress-evt|port-provides-progress-evts\\?|port-read-handler|port-try-file-lock\\?|port-write-handler|port-writes-atomic\\?|port-writes-special\\?|port\\?|positive-integer\\?|positive\\?|predicate/c|prefab-key->struct-type|prefab-key\\?|prefab-struct-key|preferences-lock-file-mode|pregexp|pregexp\\?|pretty-display|pretty-print|pretty-print-\\.-symbol-without-bars|pretty-print-abbreviate-read-macros|pretty-print-columns|pretty-print-current-style-table|pretty-print-depth|pretty-print-exact-as-decimal|pretty-print-extend-style-table|pretty-print-handler|pretty-print-newline|pretty-print-post-print-hook|pretty-print-pre-print-hook|pretty-print-print-hook|pretty-print-print-line|pretty-print-remap-stylable|pretty-print-show-inexactness|pretty-print-size-hook|pretty-print-style-table\\?|pretty-printing|pretty-write|primitive-closure\\?|primitive-result-arity|primitive\\?|print|print-as-expression|print-boolean-long-form|print-box|print-graph|print-hash-table|print-mpair-curly-braces|print-pair-curly-braces|print-reader-abbreviations|print-struct|print-syntax-width|print-unreadable|print-vector-length|printable/c|printable<%>|printf|println|procedure->method|procedure-arity|procedure-arity-includes\\?|procedure-arity\\?|procedure-closure-contents-eq\\?|procedure-extract-target|procedure-impersonator\\*\\?|procedure-keywords|procedure-reduce-arity|procedure-reduce-keyword-arity|procedure-rename|procedure-result-arity|procedure-specialize|procedure-struct-type\\?|procedure\\?|processor-count|progress-evt\\?|promise-forced\\?|promise-running\\?|promise/name\\?|promise\\?|prop:arity-string|prop:arrow-contract|prop:arrow-contract-get-info|prop:arrow-contract\\?|prop:authentic|prop:blame|prop:chaperone-contract|prop:checked-procedure|prop:contract|prop:contracted|prop:custom-print-quotable|prop:custom-write|prop:dict|prop:equal\\+hash|prop:evt|prop:exn:missing-module|prop:exn:srclocs|prop:expansion-contexts|prop:flat-contract|prop:impersonator-of|prop:input-port|prop:liberal-define-context|prop:object-name|prop:opt-chaperone-contract|prop:opt-chaperone-contract-get-test|prop:opt-chaperone-contract\\?|prop:orc-contract|prop:orc-contract-get-subcontracts|prop:orc-contract\\?|prop:output-port|prop:place-location|prop:procedure|prop:recursive-contract|prop:recursive-contract-unroll|prop:recursive-contract\\?|prop:rename-transformer|prop:sequence|prop:set!-transformer|prop:stream|proper-subset\\?|pseudo-random-generator->vector|pseudo-random-generator-vector\\?|pseudo-random-generator\\?|put-preferences|putenv|quotient|quotient/remainder|radians->degrees|raise|raise-argument-error|raise-arguments-error|raise-arity-error|raise-contract-error|raise-mismatch-error|raise-range-error|raise-result-error|raise-syntax-error|raise-type-error|raise-user-error|random|random-seed|rational\\?|rationalize|read|read-accept-bar-quote|read-accept-box|read-accept-compiled|read-accept-dot|read-accept-graph|read-accept-infix-dot|read-accept-lang|read-accept-quasiquote|read-accept-reader|read-byte|read-byte-or-special|read-bytes|read-bytes!|read-bytes-avail!|read-bytes-avail!\\*|read-bytes-avail!/enable-break|read-bytes-line|read-case-sensitive|read-cdot|read-char|read-char-or-special|read-curly-brace-as-paren|read-curly-brace-with-tag|read-decimal-as-inexact|read-eval-print-loop|read-language|read-line|read-on-demand-source|read-square-bracket-as-paren|read-square-bracket-with-tag|read-string|read-string!|read-syntax|read-syntax/recursive|read/recursive|readtable-mapping|readtable\\?|real->decimal-string|real->double-flonum|real->floating-point-bytes|real->single-flonum|real-part|real\\?|reencode-input-port|reencode-output-port|regexp|regexp-match|regexp-match-exact\\?|regexp-match-peek|regexp-match-peek-immediate|regexp-match-peek-positions|regexp-match-peek-positions-immediate|regexp-match-peek-positions-immediate/end|regexp-match-peek-positions/end|regexp-match-positions|regexp-match-positions/end|regexp-match/end|regexp-match\\?|regexp-max-lookbehind|regexp-quote|regexp-replace|regexp-replace\\*|regexp-replace-quote|regexp-replaces|regexp-split|regexp-try-match|regexp\\?|relative-path\\?|remainder|remf|remf\\*|remove|remove\\*|remq|remq\\*|remv|remv\\*|rename-contract|rename-file-or-directory|rename-transformer-target|rename-transformer\\?|replace-evt|reroot-path|resolve-path|resolved-module-path-name|resolved-module-path\\?|rest|reverse|round|second|seconds->date|security-guard\\?|semaphore-peek-evt|semaphore-peek-evt\\?|semaphore-post|semaphore-try-wait\\?|semaphore-wait|semaphore-wait/enable-break|semaphore\\?|sequence->list|sequence->stream|sequence-add-between|sequence-andmap|sequence-append|sequence-count|sequence-filter|sequence-fold|sequence-for-each|sequence-generate|sequence-generate\\*|sequence-length|sequence-map|sequence-ormap|sequence-ref|sequence-tail|sequence\\?|set|set!-transformer-procedure|set!-transformer\\?|set->list|set->stream|set-add|set-add!|set-box!|set-clear|set-clear!|set-copy|set-copy-clear|set-count|set-empty\\?|set-eq\\?|set-equal\\?|set-eqv\\?|set-first|set-for-each|set-implements/c|set-implements\\?|set-intersect|set-intersect!|set-map|set-mcar!|set-mcdr!|set-member\\?|set-mutable\\?|set-phantom-bytes!|set-port-next-location!|set-remove|set-remove!|set-rest|set-subtract|set-subtract!|set-symmetric-difference|set-symmetric-difference!|set-union|set-union!|set-weak\\?|set=\\?|set\\?|seteq|seteqv|seventh|sgn|shared-bytes|shell-execute|shrink-path-wrt|shuffle|simple-form-path|simplify-path|sin|single-flonum\\?|sinh|sixth|skip-projection-wrapper\\?|sleep|some-system-path->string|special-comment-value|special-comment\\?|special-filter-input-port|split-at|split-at-right|split-common-prefix|split-path|splitf-at|splitf-at-right|sqr|sqrt|srcloc->string|srcloc-column|srcloc-line|srcloc-position|srcloc-source|srcloc-span|srcloc\\?|stop-after|stop-before|stream->list|stream-add-between|stream-andmap|stream-append|stream-count|stream-empty\\?|stream-filter|stream-first|stream-fold|stream-for-each|stream-length|stream-map|stream-ormap|stream-ref|stream-rest|stream-tail|stream/c|stream\\?|string|string->bytes/latin-1|string->bytes/locale|string->bytes/utf-8|string->immutable-string|string->keyword|string->list|string->number|string->path|string->path-element|string->some-system-path|string->symbol|string->uninterned-symbol|string->unreadable-symbol|string-append|string-append\\*|string-ci<=\\?|string-ci<\\?|string-ci=\\?|string-ci>=\\?|string-ci>\\?|string-contains\\?|string-copy|string-copy!|string-downcase|string-environment-variable-name\\?|string-fill!|string-foldcase|string-length|string-locale-ci<\\?|string-locale-ci=\\?|string-locale-ci>\\?|string-locale-downcase|string-locale-upcase|string-locale<\\?|string-locale=\\?|string-locale>\\?|string-no-nuls\\?|string-normalize-nfc|string-normalize-nfd|string-normalize-nfkc|string-normalize-nfkd|string-port\\?|string-prefix\\?|string-ref|string-set!|string-suffix\\?|string-titlecase|string-upcase|string-utf-8-length|string<=\\?|string<\\?|string=\\?|string>=\\?|string>\\?|string\\?|struct->vector|struct-accessor-procedure\\?|struct-constructor-procedure\\?|struct-info|struct-mutator-procedure\\?|struct-predicate-procedure\\?|struct-type-info|struct-type-make-constructor|struct-type-make-predicate|struct-type-property-accessor-procedure\\?|struct-type-property/c|struct-type-property\\?|struct-type\\?|struct:arity-at-least|struct:arrow-contract-info|struct:date|struct:date\\*|struct:exn|struct:exn:break|struct:exn:break:hang-up|struct:exn:break:terminate|struct:exn:fail|struct:exn:fail:contract|struct:exn:fail:contract:arity|struct:exn:fail:contract:blame|struct:exn:fail:contract:continuation|struct:exn:fail:contract:divide-by-zero|struct:exn:fail:contract:non-fixnum-result|struct:exn:fail:contract:variable|struct:exn:fail:filesystem|struct:exn:fail:filesystem:errno|struct:exn:fail:filesystem:exists|struct:exn:fail:filesystem:missing-module|struct:exn:fail:filesystem:version|struct:exn:fail:network|struct:exn:fail:network:errno|struct:exn:fail:object|struct:exn:fail:out-of-memory|struct:exn:fail:read|struct:exn:fail:read:eof|struct:exn:fail:read:non-char|struct:exn:fail:syntax|struct:exn:fail:syntax:missing-module|struct:exn:fail:syntax:unbound|struct:exn:fail:unsupported|struct:exn:fail:user|struct:srcloc|struct:wrapped-extra-arg-arrow|struct\\?|sub1|subbytes|subclass\\?|subclass\\?/c|subprocess|subprocess-group-enabled|subprocess-kill|subprocess-pid|subprocess-status|subprocess-wait|subprocess\\?|subset\\?|substring|suggest/c|symbol->string|symbol-interned\\?|symbol-unreadable\\?|symbol<\\?|symbol=\\?|symbol\\?|sync|sync/enable-break|sync/timeout|sync/timeout/enable-break|syntax->datum|syntax->list|syntax-arm|syntax-column|syntax-debug-info|syntax-disarm|syntax-e|syntax-line|syntax-local-bind-syntaxes|syntax-local-certifier|syntax-local-context|syntax-local-expand-expression|syntax-local-get-shadower|syntax-local-identifier-as-binding|syntax-local-introduce|syntax-local-lift-context|syntax-local-lift-expression|syntax-local-lift-module|syntax-local-lift-module-end-declaration|syntax-local-lift-provide|syntax-local-lift-require|syntax-local-lift-values-expression|syntax-local-make-definition-context|syntax-local-make-delta-introducer|syntax-local-module-defined-identifiers|syntax-local-module-exports|syntax-local-module-required-identifiers|syntax-local-name|syntax-local-phase-level|syntax-local-submodules|syntax-local-transforming-module-provides\\?|syntax-local-value|syntax-local-value/immediate|syntax-original\\?|syntax-position|syntax-property|syntax-property-preserved\\?|syntax-property-symbol-keys|syntax-protect|syntax-rearm|syntax-recertify|syntax-shift-phase-level|syntax-source|syntax-source-module|syntax-span|syntax-taint|syntax-tainted\\?|syntax-track-origin|syntax-transforming-module-expression\\?|syntax-transforming-with-lifts\\?|syntax-transforming\\?|syntax\\?|system-big-endian\\?|system-idle-evt|system-language\\+country|system-library-subpath|system-path-convention-type|system-type|tail-marks-match\\?|take|take-common-prefix|take-right|takef|takef-right|tan|tanh|tcp-abandon-port|tcp-accept|tcp-accept-evt|tcp-accept-ready\\?|tcp-accept/enable-break|tcp-addresses|tcp-close|tcp-connect|tcp-connect/enable-break|tcp-listen|tcp-listener\\?|tcp-port\\?|tentative-pretty-print-port-cancel|tentative-pretty-print-port-transfer|tenth|terminal-port\\?|the-unsupplied-arg|third|thread|thread-cell-ref|thread-cell-set!|thread-cell-values\\?|thread-cell\\?|thread-dead-evt|thread-dead\\?|thread-group\\?|thread-receive|thread-receive-evt|thread-resume|thread-resume-evt|thread-rewind-receive|thread-running\\?|thread-send|thread-suspend|thread-suspend-evt|thread-try-receive|thread-wait|thread/suspend-to-kill|thread\\?|time-apply|touch|true|truncate|udp-addresses|udp-bind!|udp-bound\\?|udp-close|udp-connect!|udp-connected\\?|udp-multicast-interface|udp-multicast-join-group!|udp-multicast-leave-group!|udp-multicast-loopback\\?|udp-multicast-set-interface!|udp-multicast-set-loopback!|udp-multicast-set-ttl!|udp-multicast-ttl|udp-open-socket|udp-receive!|udp-receive!\\*|udp-receive!-evt|udp-receive!/enable-break|udp-receive-ready-evt|udp-send|udp-send\\*|udp-send-evt|udp-send-ready-evt|udp-send-to|udp-send-to\\*|udp-send-to-evt|udp-send-to/enable-break|udp-send/enable-break|udp\\?|unbox|uncaught-exception-handler|unit\\?|unquoted-printing-string|unquoted-printing-string-value|unquoted-printing-string\\?|unspecified-dom|unsupplied-arg\\?|use-collection-link-paths|use-compiled-file-check|use-compiled-file-paths|use-user-specific-search-paths|user-execute-bit|user-read-bit|user-write-bit|value-blame|value-contract|values|variable-reference->empty-namespace|variable-reference->module-base-phase|variable-reference->module-declaration-inspector|variable-reference->module-path-index|variable-reference->module-source|variable-reference->namespace|variable-reference->phase|variable-reference->resolved-module-path|variable-reference-constant\\?|variable-reference\\?|vector|vector->immutable-vector|vector->list|vector->pseudo-random-generator|vector->pseudo-random-generator!|vector->values|vector-append|vector-argmax|vector-argmin|vector-cas!|vector-copy|vector-copy!|vector-count|vector-drop|vector-drop-right|vector-fill!|vector-filter|vector-filter-not|vector-immutable|vector-length|vector-map|vector-map!|vector-member|vector-memq|vector-memv|vector-ref|vector-set!|vector-set\\*!|vector-set-performance-stats!|vector-split-at|vector-split-at-right|vector-take|vector-take-right|vector\\?|version|void|void\\?|weak-box-value|weak-box\\?|weak-set|weak-seteq|weak-seteqv|will-execute|will-executor\\?|will-register|will-try-execute|with-input-from-bytes|with-input-from-string|with-output-to-bytes|with-output-to-string|would-be-future|wrap-evt|wrapped-extra-arg-arrow-extra-neg-party-argument|wrapped-extra-arg-arrow-real-func|wrapped-extra-arg-arrow\\?|writable<%>|write|write-byte|write-bytes|write-bytes-avail|write-bytes-avail\\*|write-bytes-avail-evt|write-bytes-avail/enable-break|write-char|write-special|write-special-avail\\*|write-special-evt|write-string|writeln|xor|zero\\?)(?=$|[()\\[\\]{}\",'`;\\s])"
         }
       ]
     },
@@ -279,7 +279,7 @@
     "character": {
       "patterns": [
         {
-          "match": "\\#\\\\(?:(?:[0-7]{3})|(?:u[0-9a-fA-F]{1,4})|(?:U[0-9a-fA-F]{1,6})|(?:(?:null?|newline|linefeed|backspace|v?tab|page|return|space|rubout|(?:[^\\w\\s]|\\d))(?![a-zA-Z]))|(?:[^\\W\\d](?=[\\W\\d])|\\W))",
+          "match": "#\\\\(?:[0-7]{3}|u\\h{1,4}|U\\h{1,6}|(?:null?|newline|linefeed|backspace|v?tab|page|return|space|rubout|[[^\\w\\s]\\d])(?![a-zA-Z])|(?:[^\\W\\d](?=[\\W\\d])|\\W))",
           "name": "string.quoted.single.racket"
         }
       ]
@@ -379,7 +379,7 @@
               "name": "punctuation.section.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.end.racket"
@@ -392,7 +392,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.begin.racket"
@@ -453,7 +453,7 @@
               "name": "punctuation.section.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.end.racket"
@@ -466,7 +466,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.begin.racket"
@@ -546,7 +546,7 @@
               "name": "punctuation.section.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.end.racket"
@@ -559,7 +559,7 @@
           ]
         },
         {
-          "begin": "(?<=[(\\[{])\\s*(define(?:(?:-for)?-syntax)?)\\s*({)",
+          "begin": "(?<=[(\\[{])\\s*(define(?:(?:-for)?-syntax)?)\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.lambda.racket"
@@ -593,7 +593,7 @@
               "name": "entity.name.constant.racket"
             }
           },
-          "match": "(?<=[(\\[{])\\s*(define(?:(?:-for)?-syntax)?)\\s+([^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)"
+          "match": "(?<=[(\\[{])\\s*(define(?:(?:-for)?-syntax)?)\\s+([^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)"
         }
       ]
     },
@@ -617,7 +617,7 @@
           },
           "patterns": [
             {
-              "match": "[^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*",
+              "match": "[^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*",
               "name": "entity.name.constant"
             }
           ]
@@ -632,7 +632,7 @@
               "name": "punctuation.section.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.end.racket"
@@ -640,13 +640,13 @@
           },
           "patterns": [
             {
-              "match": "[^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*",
+              "match": "[^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*",
               "name": "entity.name.constant"
             }
           ]
         },
         {
-          "begin": "(?<=[(\\[{])\\s*(define-(?:values(?:-for-syntax)?|syntaxes)?)\\s*({)",
+          "begin": "(?<=[(\\[{])\\s*(define-(?:values(?:-for-syntax)?|syntaxes)?)\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.racket"
@@ -663,7 +663,7 @@
           },
           "patterns": [
             {
-              "match": "[^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*",
+              "match": "[^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*",
               "name": "entity.name.constant"
             }
           ]
@@ -684,7 +684,7 @@
           "include": "#escape-char-base"
         },
         {
-          "match": "\\\\(?:(?:u[\\da-fA-F]{1,4})|(?:U[\\da-fA-F]{1,8}))",
+          "match": "\\\\(?:u[\\da-fA-F]{1,4}|U[\\da-fA-F]{1,8})",
           "name": "constant.character.escape.racket"
         },
         {
@@ -695,7 +695,7 @@
     "escape-char-base": {
       "patterns": [
         {
-          "match": "\\\\(?:(?:[abtnvfre\"'\\\\])|(?:[0-7]{1,3})|(?:x[\\da-fA-F]{1,2}))",
+          "match": "\\\\(?:[abtnvfre\"'\\\\]|[0-7]{1,3}|x[\\da-fA-F]{1,2})",
           "name": "constant.character.escape.racket"
         }
       ]
@@ -741,7 +741,7 @@
     "format-string": {
       "patterns": [
         {
-          "match": "~(?:(?:\\.?[n%aAsSvV])|[cCbBoOxX~\\s])",
+          "match": "~(?:\\.?[n%aAsSvV]|[cCbBoOxX~\\s])",
           "name": "constant.other.placeholder.racket"
         }
       ]
@@ -779,7 +779,7 @@
           "name": "entity.name.function.racket"
         },
         {
-          "begin": "(?<=[(\\[{])\\s*(\\#%|\\\\\\ |[^\\#()\\[\\]{}\",'`;\\s])",
+          "begin": "(?<=[(\\[{])\\s*(#%|\\\\ |[^#()\\[\\]{}\",'`;\\s])",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.racket"
@@ -808,7 +808,7 @@
     "hash": {
       "patterns": [
         {
-          "begin": "\\#hash(?:eq(?:v)?)?\\(",
+          "begin": "#hash(?:eqv?)?\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.hash.begin.racket"
@@ -828,13 +828,13 @@
           ]
         },
         {
-          "begin": "\\#hash(?:eq(?:v)?)?\\[",
+          "begin": "#hash(?:eqv?)?\\[",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.hash.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.hash.end.racket"
@@ -848,7 +848,7 @@
           ]
         },
         {
-          "begin": "\\#hash(?:eq(?:v)?)?\\{",
+          "begin": "#hash(?:eqv?)?\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.hash.begin.racket"
@@ -891,7 +891,7 @@
     "keyword": {
       "patterns": [
         {
-          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])\\#:[^()\\[\\]{}\",'`;\\s]+",
+          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])#:[^()\\[\\]{}\",'`;\\s]+",
           "name": "keyword.other.racket"
         }
       ]
@@ -932,7 +932,7 @@
           ]
         },
         {
-          "begin": "(?<=[(\\[{])\\s*(lambda|λ)\\s+({)",
+          "begin": "(?<=[(\\[{])\\s*(lambda|λ)\\s+(\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.lambda.racket"
@@ -964,7 +964,7 @@
               "name": "punctuation.section.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.end.racket"
@@ -989,7 +989,7 @@
             "name": "variable.parameter.racket"
           }
         },
-        "match": "(?<=[(\\[{])\\s*(lambda|λ)\\s+([^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)",
+        "match": "(?<=[(\\[{])\\s*(lambda|λ)\\s+([^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)",
         "name": "meta.lambda.racket"
       }
     ],
@@ -1022,7 +1022,7 @@
               "name": "punctuation.section.list.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.list.end.racket"
@@ -1036,7 +1036,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.list.begin.racket"
@@ -1085,11 +1085,11 @@
           "include": "#list"
         },
         {
-          "match": "(?<=^|[()\\[\\]{}\\\",'`;\\s])(?:\\#[cC][iI]|\\#[cC][sS])(?=\\s)",
+          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])#(?:[cC][iI]|[cC][sS])(?=\\s)",
           "name": "keyword.control.racket"
         },
         {
-          "match": "(?<=^|[()\\[\\]{}\\\",'`;\\s])(?:\\#&)",
+          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])#&",
           "name": "support.function.racket"
         }
       ]
@@ -1113,7 +1113,7 @@
     "number-bin": {
       "patterns": [
         {
-          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:\\#[bB](?:\\#[eEiI])?|(?:\\#[eEiI])?\\#[bB])(?:(?:(?:(?:(?:(?:[+-]?[01]+\\#*\\/[01]+\\#*)|(?:[+-]?[01]+\\.[01]+\\#*)|(?:[+-]?[01]+\\#*\\.\\#*)|(?:[+-]?[01]+\\#*))(?:[sldefSLDEF][+-]?[01]+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f]))@(?:(?:(?:(?:[+-]?[01]+\\#*\\/[01]+\\#*)|(?:[+-]?[01]+\\.[01]+\\#*)|(?:[+-]?[01]+\\#*\\.\\#*)|(?:[+-]?[01]+\\#*))(?:[sldefSLDEF][+-]?[01]+)?)|(?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])))|(?:(?:(?:(?:(?:[+-]?[01]+\\#*\\/[01]+\\#*)|(?:[+-]?[01]+\\.[01]+\\#*)|(?:[+-]?[01]+\\#*\\.\\#*)|(?:[+-]?[01]+\\#*))(?:[sldefSLDEF][+-]?[01]+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f]))?[+-](?:(?:(?:(?:[+-]?[01]+\\#*\\/[01]+\\#*)|(?:[+-]?[01]+\\.[01]+\\#*)|(?:[+-]?[01]+\\#*\\.\\#*)|(?:[+-]?[01]+\\#*))(?:[sldefSLDEF][+-]?[01]+)?)|(?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])|)i)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])|(?:(?:[+-]?[01]+\\#*\\/[01]+\\#*)|(?:[+-]?[01]*\\.[01]+\\#*)|(?:[+-]?[01]+\\#*\\.\\#*)|(?:[+-]?[01]+\\#*))(?:[sldefSLDEF][+-]?[01]+)?)(?=$|[()\\[\\]{}\",'`;\\s])",
+          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:#[bB](?:#[eEiI])?|(?:#[eEiI])?#[bB])(?:(?:(?:[+-]?[01]+#*/[01]+#*|[+-]?[01]+\\.[01]+#*|[+-]?[01]+#*\\.#*|[+-]?[01]+#*)(?:[sldefSLDEF][+-]?[01]+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))@(?:(?:[+-]?[01]+#*/[01]+#*|[+-]?[01]+\\.[01]+#*|[+-]?[01]+#*\\.#*|[+-]?[01]+#*)(?:[sldefSLDEF][+-]?[01]+)?|(?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))|(?:(?:[+-]?[01]+#*/[01]+#*|[+-]?[01]+\\.[01]+#*|[+-]?[01]+#*\\.#*|[+-]?[01]+#*)(?:[sldefSLDEF][+-]?[01]+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))?[+-](?:(?:[+-]?[01]+#*/[01]+#*|[+-]?[01]+\\.[01]+#*|[+-]?[01]+#*\\.#*|[+-]?[01]+#*)(?:[sldefSLDEF][+-]?[01]+)?|(?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f])|)i|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f])|(?:[+-]?[01]+#*/[01]+#*|[+-]?[01]*\\.[01]+#*|[+-]?[01]+#*\\.#*|[+-]?[01]+#*)(?:[sldefSLDEF][+-]?[01]+)?)(?=$|[()\\[\\]{}\",'`;\\s])",
           "name": "constant.numeric.bin.racket"
         }
       ]
@@ -1121,7 +1121,7 @@
     "number-dec": {
       "patterns": [
         {
-          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:(?:\\#[dD])?(?:\\#[eEiI])?|(?:\\#[eEiI])?(?:\\#[dD])?)(?:(?:(?:(?:(?:(?:[+-]?\\d+\\#*\\/\\d+\\#*)|(?:[+-]?\\d+\\.\\d+\\#*)|(?:[+-]?\\d+\\#*\\.\\#*)|(?:[+-]?\\d+\\#*))(?:[sldefSLDEF][+-]?\\d+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f]))@(?:(?:(?:(?:[+-]?\\d+\\#*\\/\\d+\\#*)|(?:[+-]?\\d+\\.\\d+\\#*)|(?:[+-]?\\d+\\#*\\.\\#*)|(?:[+-]?\\d+\\#*))(?:[sldefSLDEF][+-]?\\d+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])))|(?:(?:(?:(?:(?:[+-]?\\d+\\#*\\/\\d+\\#*)|(?:[+-]?\\d+\\.\\d+\\#*)|(?:[+-]?\\d+\\#*\\.\\#*)|(?:[+-]?\\d+\\#*))(?:[sldefSLDEF][+-]?\\d+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f]))?[+-](?:(?:(?:(?:[+-]?\\d+\\#*\\/\\d+\\#*)|(?:[+-]?\\d+\\.\\d+\\#*)|(?:[+-]?\\d+\\#*\\.\\#*)|(?:[+-]?\\d+\\#*))(?:[sldefSLDEF][+-]?\\d+)?)|(?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])|)i)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])|(?:(?:[+-]?\\d+\\#*\\/\\d+\\#*)|(?:[+-]?\\d*\\.\\d+\\#*)|(?:[+-]?\\d+\\#*\\.\\#*)|(?:[+-]?\\d+\\#*))(?:[sldefSLDEF][+-]?\\d+)?)(?=$|[()\\[\\]{}\",'`;\\s])",
+          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:(?:#[dD])?(?:#[eEiI])?|(?:#[eEiI])?(?:#[dD])?)(?:(?:(?:[+-]?\\d+#*/\\d+#*|[+-]?\\d+\\.\\d+#*|[+-]?\\d+#*\\.#*|[+-]?\\d+#*)(?:[sldefSLDEF][+-]?\\d+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))@(?:(?:[+-]?\\d+#*/\\d+#*|[+-]?\\d+\\.\\d+#*|[+-]?\\d+#*\\.#*|[+-]?\\d+#*)(?:[sldefSLDEF][+-]?\\d+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))|(?:(?:[+-]?\\d+#*/\\d+#*|[+-]?\\d+\\.\\d+#*|[+-]?\\d+#*\\.#*|[+-]?\\d+#*)(?:[sldefSLDEF][+-]?\\d+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))?[+-](?:(?:[+-]?\\d+#*/\\d+#*|[+-]?\\d+\\.\\d+#*|[+-]?\\d+#*\\.#*|[+-]?\\d+#*)(?:[sldefSLDEF][+-]?\\d+)?|(?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f])|)i|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f])|(?:[+-]?\\d+#*/\\d+#*|[+-]?\\d*\\.\\d+#*|[+-]?\\d+#*\\.#*|[+-]?\\d+#*)(?:[sldefSLDEF][+-]?\\d+)?)(?=$|[()\\[\\]{}\",'`;\\s])",
           "name": "constant.numeric.racket"
         }
       ]
@@ -1129,7 +1129,7 @@
     "number-hex": {
       "patterns": [
         {
-          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:\\#[xX](?:\\#[eEiI])?|(?:\\#[eEiI])?\\#[xX])(?:(?:(?:(?:(?:(?:[+-]?[0-9a-fA-F]+\\#*\\/[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]\\.[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*\\.\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*))(?:[slSL][+-]?[0-9a-fA-F]+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f]))@(?:(?:(?:(?:[+-]?[0-9a-fA-F]+\\#*\\/[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]+\\.[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*\\.\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*))(?:[slSL][+-]?[0-9a-fA-F]+)?)|(?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])))|(?:(?:(?:(?:(?:[+-]?[0-9a-fA-F]+\\#*\\/[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]+\\.[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*\\.\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*))(?:[slSL][+-]?[0-9a-fA-F]+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f]))?[+-](?:(?:(?:(?:[+-]?[0-9a-fA-F]+\\#*\\/[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]+\\.[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*\\.\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*))(?:[slSL][+-]?[0-9a-fA-F]+)?)|(?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])|)i)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])|(?:(?:[+-]?[0-9a-fA-F]+\\#*\\/[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]*\\.[0-9a-fA-F]+\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*\\.\\#*)|(?:[+-]?[0-9a-fA-F]+\\#*))(?:[slSL][+-]?[0-9a-fA-F]+)?)(?=$|[()\\[\\]{}\",'`;\\s])",
+          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:#[xX](?:#[eEiI])?|(?:#[eEiI])?#[xX])(?:(?:(?:[+-]?\\h+#*/\\h+#*|[+-]?\\h\\.\\h+#*|[+-]?\\h+#*\\.#*|[+-]?\\h+#*)(?:[slSL][+-]?\\h+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))@(?:(?:[+-]?\\h+#*/\\h+#*|[+-]?\\h+\\.\\h+#*|[+-]?\\h+#*\\.#*|[+-]?\\h+#*)(?:[slSL][+-]?\\h+)?|(?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))|(?:(?:[+-]?\\h+#*/\\h+#*|[+-]?\\h+\\.\\h+#*|[+-]?\\h+#*\\.#*|[+-]?\\h+#*)(?:[slSL][+-]?\\h+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))?[+-](?:(?:[+-]?\\h+#*/\\h+#*|[+-]?\\h+\\.\\h+#*|[+-]?\\h+#*\\.#*|[+-]?\\h+#*)(?:[slSL][+-]?\\h+)?|(?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f])|)i|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f])|(?:[+-]?\\h+#*/\\h+#*|[+-]?\\h*\\.\\h+#*|[+-]?\\h+#*\\.#*|[+-]?\\h+#*)(?:[slSL][+-]?\\h+)?)(?=$|[()\\[\\]{}\",'`;\\s])",
           "name": "constant.numeric.hex.racket"
         }
       ]
@@ -1137,7 +1137,7 @@
     "number-oct": {
       "patterns": [
         {
-          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:\\#[oO](?:\\#[eEiI])?|(?:\\#[eEiI])?\\#[oO])(?:(?:(?:(?:(?:(?:[+-]?[0-7]+\\#*\\/[0-7]+\\#*)|(?:[+-]?[0-7]+\\.[0-7]+\\#*)|(?:[+-]?[0-7]+\\#*\\.\\#*)|(?:[+-]?[0-7]+\\#*))(?:[sldefSLDEF][+-]?[0-7]+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f]))@(?:(?:(?:(?:[+-]?[0-7]+\\#*\\/[0-7]+\\#*)|(?:[+-]?[0-7]+\\.[0-7]+\\#*)|(?:[+-]?[0-7]+\\#*\\.\\#*)|(?:[+-]?[0-7]+\\#*))(?:[sldefSLDEF][+-]?[0-7]+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])))|(?:(?:(?:(?:(?:[+-]?[0-7]+\\#*\\/[0-7]+\\#*)|(?:[+-]?[0-7]+\\.[0-7]+\\#*)|(?:[+-]?[0-7]+\\#*\\.\\#*)|(?:[+-]?[0-7]+\\#*))(?:[sldefSLDEF][+-]?[0-7]+)?)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f]))?[+-](?:(?:(?:(?:[+-]?[0-7]+\\#*\\/[0-7]+\\#*)|(?:[+-]?[0-7]+\\.[0-7]+\\#*)|(?:[+-]?[0-7]+\\#*\\.\\#*)|(?:[+-]?[0-7]+\\#*))(?:[sldefSLDEF][+-]?[0-7]+)?)|(?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])|)i)|[+-](?:(?:[iI][nN][fF])\\.[0f]|(?:[nN][aA][nN])\\.[0f])|(?:(?:[+-]?[0-7]+\\#*\\/[0-7]+\\#*)|(?:[+-]?[0-7]*\\.[0-7]+\\#*)|(?:[+-]?[0-7]+\\#*\\.\\#*)|(?:[+-]?[0-7]+\\#*))(?:[sldefSLDEF][+-]?[0-7]+)?)(?=$|[()\\[\\]{}\",'`;\\s])",
+          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:#[oO](?:#[eEiI])?|(?:#[eEiI])?#[oO])(?:(?:(?:[+-]?[0-7]+#*/[0-7]+#*|[+-]?[0-7]+\\.[0-7]+#*|[+-]?[0-7]+#*\\.#*|[+-]?[0-7]+#*)(?:[sldefSLDEF][+-]?[0-7]+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))@(?:(?:[+-]?[0-7]+#*/[0-7]+#*|[+-]?[0-7]+\\.[0-7]+#*|[+-]?[0-7]+#*\\.#*|[+-]?[0-7]+#*)(?:[sldefSLDEF][+-]?[0-7]+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))|(?:(?:[+-]?[0-7]+#*/[0-7]+#*|[+-]?[0-7]+\\.[0-7]+#*|[+-]?[0-7]+#*\\.#*|[+-]?[0-7]+#*)(?:[sldefSLDEF][+-]?[0-7]+)?|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f]))?[+-](?:(?:[+-]?[0-7]+#*/[0-7]+#*|[+-]?[0-7]+\\.[0-7]+#*|[+-]?[0-7]+#*\\.#*|[+-]?[0-7]+#*)(?:[sldefSLDEF][+-]?[0-7]+)?|(?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f])|)i|[+-](?:[iI][nN][fF]\\.[0f]|[nN][aA][nN]\\.[0f])|(?:[+-]?[0-7]+#*/[0-7]+#*|[+-]?[0-7]*\\.[0-7]+#*|[+-]?[0-7]+#*\\.#*|[+-]?[0-7]+#*)(?:[sldefSLDEF][+-]?[0-7]+)?)(?=$|[()\\[\\]{}\",'`;\\s])",
           "name": "constant.numeric.octal.racket"
         }
       ]
@@ -1184,7 +1184,7 @@
               "name": "punctuation.section.pair.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.pair.end.racket"
@@ -1198,7 +1198,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.pair.begin.racket"
@@ -1248,7 +1248,7 @@
               "name": "punctuation.section.prefab-struct.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.prefab-struct.end.racket"
@@ -1262,7 +1262,7 @@
           ]
         },
         {
-          "begin": "#s{",
+          "begin": "#s\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.prefab-struct.begin.racket"
@@ -1286,7 +1286,7 @@
     "quote": {
       "patterns": [
         {
-          "match": "(?<=^|[()\\[\\]{}\\\",'`;\\s])(?:,@|'|`|,|\\#'|\\#`|\\#,|\\#~|\\#,@)+(?=[()\\[\\]{}\\\",'`;\\s]|\\#[^%]|[^()\\[\\]{}\",'`;\\s])",
+          "match": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:,@|['`,]|#'|#`|#,|#~|#,@)+(?=[()\\[\\]{}\",'`;\\s]|#[^%]|[^()\\[\\]{}\",'`;\\s])",
           "name": "support.function.racket"
         }
       ]
@@ -1294,7 +1294,7 @@
     "regexp-byte-string": {
       "patterns": [
         {
-          "begin": "#(r|p)x#\"",
+          "begin": "#([rp])x#\"",
           "beginCaptures": {
             "0": [
               {
@@ -1322,7 +1322,7 @@
     "regexp-string": {
       "patterns": [
         {
-          "begin": "#(r|p)x\"",
+          "begin": "#([rp])x\"",
           "beginCaptures": {
             "0": [
               {
@@ -1369,7 +1369,7 @@
     "struct": {
       "patterns": [
         {
-          "begin": "(?<=[(\\[{])\\s*(struct)\\s+([^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)(?:\\s+[^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)?\\s*(\\()",
+          "begin": "(?<=[(\\[{])\\s*(struct)\\s+([^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)(?:\\s+[^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)?\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.struct.racket"
@@ -1401,7 +1401,7 @@
           ]
         },
         {
-          "begin": "(?<=[(\\[{])\\s*(struct)\\s+([^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)(?:\\s+[^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)?\\s*(\\[)",
+          "begin": "(?<=[(\\[{])\\s*(struct)\\s+([^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)(?:\\s+[^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)?\\s*(\\[)",
           "beginCaptures": {
             "1": {
               "name": "storage.struct.racket"
@@ -1413,7 +1413,7 @@
               "name": "punctuation.section.fields.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.fields.end.racket"
@@ -1430,7 +1430,7 @@
           ]
         },
         {
-          "begin": "(?<=[(\\[{])\\s*(struct)\\s+([^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)(?:\\s+[^(\\#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)?\\s*(\\{)",
+          "begin": "(?<=[(\\[{])\\s*(struct)\\s+([^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)(?:\\s+[^(#)\\[\\]{}\",'`;\\s][^()\\[\\]{}\",'`;\\s]*)?\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.struct.racket"
@@ -1478,7 +1478,7 @@
           }
         },
         {
-          "begin": "(?<=^|[()\\[\\]{}\",'`;\\s])(\\#%|\\\\\\ |[^\\#()\\[\\]{}\",'`;\\s])",
+          "begin": "(?<=^|[()\\[\\]{}\",'`;\\s])(#%|\\\\ |[^#()\\[\\]{}\",'`;\\s])",
           "beginCaptures": {
             "1": {
               "name": "variable.other.member.racket"
@@ -1511,7 +1511,7 @@
     "symbol": {
       "patterns": [
         {
-          "begin": "(?<=^|[()\\[\\]{}\",;\\s])(?:`|')+(\\|)",
+          "begin": "(?<=^|[()\\[\\]{}\",;\\s])[`']+(\\|)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.verbatim.begin.racket"
@@ -1526,7 +1526,7 @@
           "name": "string.quoted.single.racket"
         },
         {
-          "begin": "(?<=^|[()\\[\\]{}\",;\\s])(?:`|')+(?:\\#%|\\\\\\ |[^\\#()\\[\\]{}\",'`;\\s])",
+          "begin": "(?<=^|[()\\[\\]{}\",;\\s])[`']+(?:#%|\\\\ |[^#()\\[\\]{}\",'`;\\s])",
           "end": "(?=[()\\[\\]{}\",'`;\\s])",
           "name": "string.quoted.single.racket",
           "patterns": [
@@ -1568,7 +1568,7 @@
           }
         },
         {
-          "begin": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:\\#%|\\\\\\ |[^\\#()\\[\\]{}\",'`;\\s])",
+          "begin": "(?<=^|[()\\[\\]{}\",'`;\\s])(?:#%|\\\\ |[^#()\\[\\]{}\",'`;\\s])",
           "end": "(?=[()\\[\\]{}\",'`;\\s])",
           "patterns": [
             {
@@ -1595,7 +1595,7 @@
     "vector": {
       "patterns": [
         {
-          "begin": "\\#(?:fl|Fl|fx|Fx)?[0-9]*\\(",
+          "begin": "#(?:[fF][lx])?[0-9]*\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.vector.begin.racket"
@@ -1615,13 +1615,13 @@
           ]
         },
         {
-          "begin": "\\#(?:fl|Fl|fx|Fx)?[0-9]*\\[",
+          "begin": "#(?:[fF][lx])?[0-9]*\\[",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.vector.begin.racket"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.vector.end.racket"
@@ -1635,7 +1635,7 @@
           ]
         },
         {
-          "begin": "\\#(?:fl|Fl|fx|Fx)?[0-9]*{",
+          "begin": "#(?:[fF][lx])?[0-9]*\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.vector.begin.racket"
diff --git a/resources/languages/raku.json b/resources/languages/raku.json
index 9a1d521..9b0a28d 100644
--- a/resources/languages/raku.json
+++ b/resources/languages/raku.json
@@ -37,7 +37,7 @@
           "name": "entity.name.type.class.perl.6"
         }
       },
-      "match": "(class|enum|grammar|knowhow|module|package|role|slang|subset)(\\s+)(((?:::|')?(?:([a-zA-Z_\\x{C0}-\\x{FF}\\$])([a-zA-Z0-9_\\x{C0}-\\x{FF}\\\\$]|[\\-'][a-zA-Z0-9_\\x{C0}-\\x{FF}\\$])*))+)",
+      "match": "(class|enum|grammar|knowhow|module|package|role|slang|subset)(\\s+)(((?:::|')?([a-zA-Z_À-ÿ$])([a-zA-Z0-9_À-ÿ\\\\$]|[-'][a-zA-Z0-9_À-ÿ$])*)+)",
       "name": "meta.class.perl.6"
     },
     {
@@ -88,7 +88,7 @@
       "name": "string.quoted.single.heredoc.perl"
     },
     {
-      "begin": "(q|Q)(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*{{",
+      "begin": "([qQ])(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\{\\{",
       "end": "}}",
       "name": "string.quoted.double.heredoc.brace.perl",
       "patterns": [
@@ -98,7 +98,7 @@
       ]
     },
     {
-      "begin": "(q|Q)(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\(\\(",
+      "begin": "([qQ])(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\(\\(",
       "end": "\\)\\)",
       "name": "string.quoted.double.heredoc.paren.perl",
       "patterns": [
@@ -108,8 +108,8 @@
       ]
     },
     {
-      "begin": "(q|Q)(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\[\\[",
-      "end": "\\]\\]",
+      "begin": "([qQ])(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\[\\[",
+      "end": "]]",
       "name": "string.quoted.double.heredoc.bracket.perl",
       "patterns": [
         {
@@ -118,7 +118,7 @@
       ]
     },
     {
-      "begin": "(q|Q)(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*{",
+      "begin": "([qQ])(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\{",
       "end": "}",
       "name": "string.quoted.single.heredoc.brace.perl",
       "patterns": [
@@ -128,7 +128,7 @@
       ]
     },
     {
-      "begin": "(q|Q)(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*/",
+      "begin": "([qQ])(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*/",
       "end": "/",
       "name": "string.quoted.single.heredoc.slash.perl",
       "patterns": [
@@ -138,7 +138,7 @@
       ]
     },
     {
-      "begin": "(q|Q)(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\(",
+      "begin": "([qQ])(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\(",
       "end": "\\)",
       "name": "string.quoted.single.heredoc.paren.perl",
       "patterns": [
@@ -148,8 +148,8 @@
       ]
     },
     {
-      "begin": "(q|Q)(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\[",
-      "end": "\\]",
+      "begin": "([qQ])(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\\[",
+      "end": "]",
       "name": "string.quoted.single.heredoc.bracket.perl",
       "patterns": [
         {
@@ -158,7 +158,7 @@
       ]
     },
     {
-      "begin": "(q|Q)(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*'",
+      "begin": "([qQ])(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*'",
       "end": "'",
       "name": "string.quoted.single.heredoc.single.perl",
       "patterns": [
@@ -168,7 +168,7 @@
       ]
     },
     {
-      "begin": "(q|Q)(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\"",
+      "begin": "([qQ])(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*:?(x|exec|w|words|ww|quotewords|v|val|q|single|qq|double|s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash|regexp|substr|trans|codes|p|path)*\\s*\"",
       "end": "\"",
       "name": "string.quoted.single.heredoc.double.perl",
       "patterns": [
@@ -242,7 +242,7 @@
       "name": "keyword.operator.perl"
     },
     {
-      "match": "(\\$|@|%|&)(\\*|:|!|\\^|~|=|\\?|(<(?=.+>)))?([a-zA-Z_\\x{C0}-\\x{FF}\\$])([a-zA-Z0-9_\\x{C0}-\\x{FF}\\$]|[\\-'][a-zA-Z0-9_\\x{C0}-\\x{FF}\\$])*",
+      "match": "([$@%\\&])([*:!^~=?]|(<(?=.+>)))?([a-zA-Z_À-ÿ$])([a-zA-Z0-9_À-ÿ$]|[-'][a-zA-Z0-9_À-ÿ$])*",
       "name": "variable.other.identifier.perl.6"
     },
     {
@@ -252,7 +252,7 @@
   ],
   "repository": {
     "qq_brace_string_content": {
-      "begin": "{",
+      "begin": "\\{",
       "end": "}",
       "patterns": [
         {
@@ -262,7 +262,7 @@
     },
     "qq_bracket_string_content": {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#qq_bracket_string_content"
diff --git a/resources/languages/razor.json b/resources/languages/razor.json
index 7d21d2c..6731779 100644
--- a/resources/languages/razor.json
+++ b/resources/languages/razor.json
@@ -73,7 +73,7 @@
           "name": "keyword.control.razor.directive.attribute"
         }
       },
-      "end": "(?<=\\])|$",
+      "end": "(?<=])|$",
       "name": "meta.directive",
       "patterns": [
         {
@@ -92,7 +92,7 @@
           "name": "punctuation.squarebracket.open.cs"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.squarebracket.close.cs"
@@ -126,7 +126,7 @@
       ]
     },
     "catch-clause": {
-      "begin": "(?:^|(?<=}))\\s*(catch)\\b\\s*?(?=[\\n\\(\\{])",
+      "begin": "(?:^|(?<=}))\\s*(catch)\\b\\s*?(?=[\\n({])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.try.catch.cs"
@@ -176,7 +176,7 @@
               "name": "entity.name.variable.local.cs"
             }
           },
-          "match": "(?<type-name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name-and-type-args>\\g<identifier>\\s*(?<type-args>\\s*<(?:[^<>]|\\g<type-args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name-and-type-args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(?:(\\g<identifier>)\\b)?"
+          "match": "(?<type-name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name-and-type-args>\\g<identifier>\\s*(?<type-args>\\s*<(?:[^<>]|\\g<type-args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name-and-type-args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s*(?:(\\g<identifier>)\\b)?"
         }
       ]
     },
@@ -208,7 +208,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.curlybrace.close.cs"
@@ -257,7 +257,7 @@
         }
       },
       "contentName": "source.cs",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "keyword.control.razor.directive.codeblock.close"
@@ -277,7 +277,7 @@
           "name": "keyword.control.razor.directive.codeblock.open"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "keyword.control.razor.directive.codeblock.close"
@@ -349,7 +349,7 @@
       ]
     },
     "do-statement": {
-      "begin": "(?:(@))(do)\\b\\s",
+      "begin": "(@)(do)\\b\\s",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -405,7 +405,7 @@
       ]
     },
     "else-part": {
-      "begin": "(?:^|(?<=}))\\s*(else)\\b\\s*?(?: (if))?\\s*?(?=[\\n\\(\\{])",
+      "begin": "(?:^|(?<=}))\\s*(else)\\b\\s*?(?: (if))?\\s*?(?=[\\n({])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.conditional.else.cs"
@@ -460,7 +460,7 @@
       ]
     },
     "finally-clause": {
-      "begin": "(?:^|(?<=}))\\s*(finally)\\b\\s*?(?=[\\n\\{])",
+      "begin": "(?:^|(?<=}))\\s*(finally)\\b\\s*?(?=[\\n{])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.try.finally.cs"
@@ -478,7 +478,7 @@
       ]
     },
     "for-statement": {
-      "begin": "(?:(@))(for)\\b\\s*(?=\\()",
+      "begin": "(@)(for)\\b\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -566,7 +566,7 @@
               "name": "keyword.control.loop.in.cs"
             }
           },
-          "match": "(?:(\\bvar\\b)|(?<type-name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name-and-type-args>\\g<identifier>\\s*(?<type-args>\\s*<(?:[^<>]|\\g<type-args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name-and-type-args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*)))\\s+(\\g<identifier>)\\s+\\b(in)\\b"
+          "match": "(?:(\\bvar\\b)|(?<type-name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name-and-type-args>\\g<identifier>\\s*(?<type-args>\\s*<(?:[^<>]|\\g<type-args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name-and-type-args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*))\\s+(\\g<identifier>)\\s+\\b(in)\\b"
         },
         {
           "captures": {
@@ -584,7 +584,7 @@
               "name": "keyword.control.loop.in.cs"
             }
           },
-          "match": "(?:\\b(var)\\b\\s*)?(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s+\\b(in)\\b"
+          "match": "(?:\\b(var)\\b\\s*)?(?<tuple>\\((?:[^()]|\\g<tuple>)+\\))\\s+\\b(in)\\b"
         },
         {
           "include": "source.cs#expression"
@@ -592,7 +592,7 @@
       ]
     },
     "foreach-statement": {
-      "begin": "(?:(@)(await\\s+)?)(foreach)\\b\\s*(?=\\()",
+      "begin": "(@)(await\\s+)?(foreach)\\b\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -683,7 +683,7 @@
       ]
     },
     "if-statement": {
-      "begin": "(?:(@))(if)\\b\\s*(?=\\()",
+      "begin": "(@)(if)\\b\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -773,7 +773,7 @@
         }
       },
       "contentName": "source.cs",
-      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
+      "end": "(?=[\\s<>{})\\]'\"])",
       "name": "meta.expression.implicit.cshtml",
       "patterns": [
         {
@@ -795,7 +795,7 @@
           "name": "variable.other.object.cs"
         }
       },
-      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
+      "end": "(?=[\\s<>{})\\]'\"])",
       "patterns": [
         {
           "include": "#implicit-expression-continuation"
@@ -803,7 +803,7 @@
       ]
     },
     "implicit-expression-body": {
-      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
+      "end": "(?=[\\s<>{})\\]'\"])",
       "patterns": [
         {
           "include": "#implicit-expression-invocation-start"
@@ -814,7 +814,7 @@
       ]
     },
     "implicit-expression-continuation": {
-      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
+      "end": "(?=[\\s<>{})\\]'\"])",
       "patterns": [
         {
           "include": "#balanced-parenthesis-csharp"
@@ -852,7 +852,7 @@
           "name": "entity.name.function.cs"
         }
       },
-      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
+      "end": "(?=[\\s<>{})\\]'\"])",
       "patterns": [
         {
           "include": "#implicit-expression-continuation"
@@ -873,7 +873,7 @@
           "name": "keyword.operator.logical.cs"
         }
       },
-      "match": "(\\!)(?=(?:\\.[_[:alpha:]][_[:alnum:]]*)|\\?|[\\[\\(])"
+      "match": "(!)(?=\\.[_[:alpha:]][_[:alnum:]]*|[?\\[(])"
     },
     "implicit-expression-operator": {
       "patterns": [
@@ -961,7 +961,7 @@
       "name": "meta.directive"
     },
     "lock-statement": {
-      "begin": "(?:(@))(lock)\\b\\s*(?=\\()",
+      "begin": "(@)(lock)\\b\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1059,7 +1059,7 @@
           ]
         }
       },
-      "match": "(@)(namespace)\\s+([^\\s]+)?",
+      "match": "(@)(namespace)\\s+(\\S+)?",
       "name": "meta.directive"
     },
     "namespace-directive-argument": {
@@ -1253,7 +1253,7 @@
         }
       },
       "contentName": "source.cs",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "keyword.control.razor.directive.codeblock.close"
@@ -1356,7 +1356,7 @@
           ]
         }
       },
-      "match": "(\\@\\:)([^$]*)$"
+      "match": "(@:)([^$]*)$"
     },
     "removeTagHelper-directive": {
       "captures": {
@@ -1436,7 +1436,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.curlybrace.close.cs"
@@ -1456,7 +1456,7 @@
       ]
     },
     "switch-statement": {
-      "begin": "(?:(@))(switch)\\b\\s*(?=\\()",
+      "begin": "(@)(switch)\\b\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1605,7 +1605,7 @@
       ]
     },
     "try-block": {
-      "begin": "(?:(@))(try)\\b\\s*",
+      "begin": "(@)(try)\\b\\s*",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1760,7 +1760,7 @@
           "name": "keyword.control.razor.optionalSemicolon"
         }
       },
-      "match": "(@)(using)\\b\\s+(?!\\(|\\s)(.+?)?(;)?$",
+      "match": "(@)(using)\\b\\s+(?![(\\s])(.+?)?(;)?$",
       "name": "meta.directive"
     },
     "using-standard-directive": {
@@ -1772,7 +1772,7 @@
       "match": "([_[:alpha:]][_[:alnum:]]*)\\s*"
     },
     "using-statement": {
-      "begin": "(?:(@))(using)\\b\\s*(?=\\()",
+      "begin": "(@)(using)\\b\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
diff --git a/resources/languages/reg.json b/resources/languages/reg.json
index 4e1a0d5..63f028c 100644
--- a/resources/languages/reg.json
+++ b/resources/languages/reg.json
@@ -31,7 +31,7 @@
           "name": "punctuation.definition.section.reg"
         }
       },
-      "match": "^\\s*(\\[(?!-))(.*?)(\\])",
+      "match": "^\\s*(\\[(?!-))(.*?)(])",
       "name": "entity.name.function.section.add.reg"
     },
     {
@@ -46,7 +46,7 @@
           "name": "punctuation.definition.section.reg"
         }
       },
-      "match": "^\\s*(\\[-)(.*?)(\\])",
+      "match": "^\\s*(\\[-)(.*?)(])",
       "name": "entity.name.function.section.delete.reg"
     },
     {
@@ -112,7 +112,7 @@
           "name": "punctuation.definition.quote.reg"
         }
       },
-      "match": "^(\\s*([\"']?)(.+?)([\"']?)\\s*(=))?\\s*((-)|(([\"'])(.*?)([\"']))|(((?i:dword))(\\:)\\s*([\\dabcdefABCDEF]{1,8}))|(((?i:hex))((\\()([\\d]*)(\\)))?(\\:)(.*?)(\\\\?)))\\s*(;.*)?$",
+      "match": "^(\\s*([\"']?)(.+?)([\"']?)\\s*(=))?\\s*((-)|(([\"'])(.*?)([\"']))|(((?i:dword))(:)\\s*([\\dabcdefABCDEF]{1,8}))|(((?i:hex))((\\()(\\d*)(\\)))?(:)(.*?)(\\\\?)))\\s*(;.*)?$",
       "name": "meta.declaration.reg"
     },
     {
diff --git a/resources/languages/regexp.json b/resources/languages/regexp.json
index 426ed0d..a50f401 100644
--- a/resources/languages/regexp.json
+++ b/resources/languages/regexp.json
@@ -16,7 +16,7 @@
           "name": "keyword.codetag.notation.python"
         }
       },
-      "match": "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)"
+      "match": "\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b"
     },
     "fregexp-base-expression": {
       "patterns": [
@@ -27,7 +27,7 @@
           "include": "#fstring-formatting-braces"
         },
         {
-          "match": "\\{.*?\\}"
+          "match": "\\{.*?}"
         },
         {
           "include": "#regexp-base-common"
@@ -35,7 +35,7 @@
       ]
     },
     "fregexp-quantifier": {
-      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}\\}",
+      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)}}",
       "name": "keyword.operator.quantifier.regexp"
     },
     "fstring-formatting-braces": {
@@ -52,11 +52,10 @@
               "name": "constant.character.format.placeholder.other.python"
             }
           },
-          "comment": "empty braces are illegal",
-          "match": "({)(\\s*?)(})"
+          "match": "(\\{)(\\s*?)(})"
         },
         {
-          "match": "({{|}})",
+          "match": "(\\{\\{|}})",
           "name": "constant.character.escape.python"
         }
       ]
@@ -73,7 +72,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp"
         }
       },
-      "match": "(\\()(\\?P=\\w+(?:\\s+[[:alnum:]]+)?)(\\))",
+      "match": "(\\()(\\?P=\\w+(?:\\s+\\p{alnum}+)?)(\\))",
       "name": "meta.backreference.named.regexp"
     },
     "regexp-backreference-number": {
@@ -125,10 +124,10 @@
     "regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -140,7 +139,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -155,7 +154,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -210,7 +209,7 @@
       ]
     },
     "regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -239,7 +238,7 @@
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-character": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|0[0-7]{1,2}|[0-7]{3})",
+      "match": "\\\\(x\\h{2}|0[0-7]{1,2}|[0-7]{3})",
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-sequence": {
@@ -266,7 +265,7 @@
       "name": "support.other.escape.special.regexp"
     },
     "regexp-escape-unicode": {
-      "match": "\\\\(u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+      "match": "\\\\(u\\h{4}|U\\h{8})",
       "name": "constant.character.unicode.regexp"
     },
     "regexp-expression": {
@@ -417,7 +416,7 @@
       ]
     },
     "regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -487,7 +486,7 @@
       ]
     },
     "regexp-quantifier": {
-      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}",
+      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)}",
       "name": "keyword.operator.quantifier.regexp"
     }
   },
diff --git a/resources/languages/rel.json b/resources/languages/rel.json
index 9c7f407..38b5819 100644
--- a/resources/languages/rel.json
+++ b/resources/languages/rel.json
@@ -125,7 +125,7 @@
     "keywords": {
       "patterns": [
         {
-          "match": "(\\b(def|entity|bound|include|ic|forall|exists|∀|∃|return|module|^end)\\b)|(((\\<)?\\|(\\>)?)|∀|∃)",
+          "match": "(\\b(def|entity|bound|include|ic|forall|exists|[∀∃]|return|module|^end)\\b)|(((<)?\\|(>)?)|[∀∃])",
           "name": "keyword.control.rel"
         }
       ]
@@ -133,7 +133,7 @@
     "operators": {
       "patterns": [
         {
-          "match": "(\\b(if|then|else|and|or|not|eq|neq|lt|lt_eq|gt|gt_eq)\\b)|(\\+|\\-|\\*|\\/|÷|\\^|\\%|\\=|\\!\\=|≠|\\<|\\<\\=|≤|\\>|\\>\\=|≥|\\&)|\\s+(end)",
+          "match": "(\\b(if|then|else|and|or|not|eq|neq|lt|lt_eq|gt|gt_eq)\\b)|([+\\-*/÷^%=]|!=|[≠<]|<=|[≤>]|>=|[≥\\&])|\\s+(end)",
           "name": "keyword.other.rel"
         }
       ]
@@ -141,7 +141,7 @@
     "otherkeywords": {
       "patterns": [
         {
-          "match": "\\s*(@inline)\\s*|\\s*(@auto_number)\\s*|\\s*(function)\\s|(\\b(implies|select|from|∈|where|for|in)\\b)|(((\\<)?\\|(\\>)?)|∈)",
+          "match": "\\s*(@inline)\\s*|\\s*(@auto_number)\\s*|\\s*(function)\\s|(\\b(implies|select|from|∈|where|for|in)\\b)|(((<)?\\|(>)?)|∈)",
           "name": "keyword.other.rel"
         }
       ]
@@ -182,7 +182,7 @@
     "symbols": {
       "patterns": [
         {
-          "match": "(:[\\[_$[:alpha:]](\\]|[_$[:alnum:]]*))",
+          "match": "(:[\\[_$[:alpha:]](]|[_$[:alnum:]]*))",
           "name": "variable.parameter.rel"
         }
       ]
diff --git a/resources/languages/riscv.json b/resources/languages/riscv.json
index 5cb3404..9022653 100644
--- a/resources/languages/riscv.json
+++ b/resources/languages/riscv.json
@@ -9,8 +9,7 @@
   "name": "riscv",
   "patterns": [
     {
-      "comment": "ok actually this are instructions, but one also could call them funtions…",
-      "match": "\\b(la|lb|lh|lw|ld|nop|li|mv|not|neg|negw|sext\\.w|seqz|snez|sltz|sgtz|beqz|bnez|blez|bgez|bltz|bgtz|bgt|ble|bgtu|bleu|j|jal|jr|ret|call|tail|fence|csr[r|w|s|c]|csr[w|s|c]i)\\b",
+      "match": "\\b(la|lb|lh|lw|ld|nop|li|mv|not|neg|negw|sext\\.w|seqz|snez|sltz|sgtz|beqz|bnez|blez|bgez|bltz|bgtz|bgt|ble|bgtu|bleu|j|jal|jr|ret|call|tail|fence|csr[r|wsc]|csr[w|sc]i)\\b",
       "name": "support.function.pseudo.riscv"
     },
     {
@@ -18,37 +17,31 @@
       "name": "support.function.riscv"
     },
     {
-      "comment": "priviledged instructions",
       "match": "\\b(ecall|ebreak|sfence\\.vma|mret|sret|uret|wfi)\\b",
       "name": "support.function.riscv.privileged"
     },
     {
-      "comment": "M extension (multiplication and division)",
       "match": "\\b(mul|mulh|mulhsu|mulhu|div|divu|rem|remu|mulw|divw|divuw|remw|remuw)\\b",
       "name": "support.function.riscv.m"
     },
     {
-      "comment": "C extension (compressed instructions)",
-      "match": "\\b(c\\.addi4spn|c\\.fld|c\\.lq|c\\.lw|c\\.flw|c\\.ld|c\\.fsd|c\\.sq|c\\.sw|c\\.fsw|c\\.sd|c\\.nop|c\\.addi|c\\.jal|c\\.addiw|c\\.li|c\\.addi16sp|c\\.lui|c\\.srli|c\\.srli64|c\\.srai|c\\.srai64|c\\.andi|c\\.sub|c\\.xor|c\\.or|c\\.and|c\\.subw|c\\.addw|c\\.j|c\\.beqz|c\\.bnez)\\b",
+      "match": "\\b(c\\.(?:addi4spn|fld|lq|lw|flw|ld|fsd|sq|sw|fsw|sd|nop|addi|jal|addiw|li|addi16sp|lui|srli|srli64|srai|srai64|andi|sub|xor|or|and|subw|addw|j|beqz|bnez))\\b",
       "name": "support.function.riscv.c"
     },
     {
-      "comment": "A extension (atomic instructions)",
       "match": "\\b(lr\\.[w|d]|sc\\.[w|d]|amoswap\\.[w|d]|amoadd\\.[w|d]|amoxor\\.[w|d]|amoand\\.[w|d]|amoor\\.[w|d]|amomin\\.[w|d]|amomax\\.[w|d]|amominu\\.[w|d]|amomaxu\\.[w|d])\\b",
       "name": "support.function.riscv.a"
     },
     {
-      "comment": "F extension (single precision floating point)",
-      "match": "\\b(flw|fsw|fmadd\\.s|fmsub\\.s|fnmsub\\.s|fnmadd\\.s|fadd\\.s|fsub\\.s|fmul\\.s|fdiv\\.s|fsqrt\\.s|fsgnj\\.s|fsgnjn\\.s|fsgnjx\\.s|fmin\\.s|fmax\\.s|fcvt\\.w\\.s|fcvt\\.wu\\.s|fmv\\.x\\.w|feq\\.s|flt\\.s|fle\\.s|fclass\\.s|fcvt\\.s\\.w|fcvt\\.s\\.wu|fmv\\.w\\.x|fcvt\\.l\\.s|fcvt\\.lu\\.s|fcvt\\.s\\.l|fcvt\\.s\\.lu)\\b",
+      "match": "\\b(f(?:lw|sw|madd\\.s|msub\\.s|nmsub\\.s|nmadd\\.s|add\\.s|sub\\.s|mul\\.s|div\\.s|sqrt\\.s|sgnj\\.s|sgnjn\\.s|sgnjx\\.s|min\\.s|max\\.s|cvt\\.w\\.s|cvt\\.wu\\.s|mv\\.x\\.w|eq\\.s|lt\\.s|le\\.s|class\\.s|cvt\\.s\\.w|cvt\\.s\\.wu|mv\\.w\\.x|cvt\\.l\\.s|cvt\\.lu\\.s|cvt\\.s\\.l|cvt\\.s\\.lu))\\b",
       "name": "support.function.riscv.f"
     },
     {
-      "comment": "D extension (double precision floating point)",
-      "match": "\\b(fld|fsd|fmadd\\.d|fmsub\\.d|fnmsub\\.d|fnmadd\\.d|fadd\\.d|fsub\\.d|fmul\\.d|fdiv\\.d|fsqrt\\.d|fsgnj\\.d|fsgnjn\\.d|fsgnjx\\.d|fmin\\.d|fmax\\.d|fcvt\\.s\\.d|fcvt\\.d\\.s|feq\\.d|flt\\.d|fle\\.d|fclass\\.d|fcvt\\.w\\.d|fcvt\\.wu\\.d|fcvt\\.d\\.w|fcvt\\.d\\.wu|fcvt\\.l\\.d|fcvt\\.lu\\.d|fmv\\.x\\.d|fcvt\\.d\\.l|fcvt\\.d\\.lu|fmv\\.d\\.x)\\b",
+      "match": "\\b(f(?:ld|sd|madd\\.d|msub\\.d|nmsub\\.d|nmadd\\.d|add\\.d|sub\\.d|mul\\.d|div\\.d|sqrt\\.d|sgnj\\.d|sgnjn\\.d|sgnjx\\.d|min\\.d|max\\.d|cvt\\.s\\.d|cvt\\.d\\.s|eq\\.d|lt\\.d|le\\.d|class\\.d|cvt\\.w\\.d|cvt\\.wu\\.d|cvt\\.d\\.w|cvt\\.d\\.wu|cvt\\.l\\.d|cvt\\.lu\\.d|mv\\.x\\.d|cvt\\.d\\.l|cvt\\.d\\.lu|mv\\.d\\.x))\\b",
       "name": "support.function.riscv.d"
     },
     {
-      "match": "\\.(skip|ascii|asciiz|byte|[2|4|8]byte|data|double|float|half|kdata|ktext|space|text|word|dword|dtprelword|dtpreldword|set\\s*(noat|at)|[s|u]leb128|string|incbin|zero|rodata|comm|common)\\b",
+      "match": "\\.(skip|ascii|asciiz|byte|[2|48]byte|data|double|float|half|kdata|ktext|space|text|word|dword|dtprelword|dtpreldword|set\\s*(noat|at)|[s|u]leb128|string|incbin|zero|rodata|comm|common)\\b",
       "name": "storage.type.riscv"
     },
     {
@@ -105,7 +98,7 @@
       "name": "constant.numeric.float.riscv"
     },
     {
-      "match": "\\b(\\d+|0(x|X)[a-fA-F0-9]+)\\b",
+      "match": "\\b(\\d+|0([xX])\\h+)\\b",
       "name": "constant.numeric.integer.riscv"
     },
     {
@@ -151,17 +144,17 @@
       ]
     },
     {
-      "begin": "\\/\\*",
-      "end": "\\*\\/",
+      "begin": "/\\*",
+      "end": "\\*/",
       "name": "comment.block"
     },
     {
-      "begin": "\\/\\/",
+      "begin": "//",
       "end": "\\n",
       "name": "comment.line.double-slash"
     },
     {
-      "begin": "^\\s*\\#\\s*(define)\\s+((?<id>[a-zA-Z_][a-zA-Z0-9_]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
+      "begin": "^\\s*#\\s*(define)\\s+((?<id>[a-zA-Z_][a-zA-Z0-9_]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.import.define.c"
@@ -182,7 +175,7 @@
           "name": "punctuation.definition.parameters.c"
         }
       },
-      "end": "(?=(?://|/\\*))|$",
+      "end": "(?=/[/*])|$",
       "name": "meta.preprocessor.macro.c",
       "patterns": [
         {
@@ -211,13 +204,13 @@
       ]
     },
     {
-      "begin": "^\\s*#\\s*(include|import)\\b\\s+",
+      "begin": "^\\s*#\\s*(i(?:nclude|mport))\\b\\s+",
       "captures": {
         "1": {
           "name": "keyword.control.import.include.c"
         }
       },
-      "end": "(?=(?://|/\\*))|$",
+      "end": "(?=/[/*])|$",
       "name": "meta.preprocessor.c.include",
       "patterns": [
         {
@@ -263,7 +256,7 @@
           "name": "keyword.control.import.c"
         }
       },
-      "end": "(?=(?://|/\\*))|$",
+      "end": "(?=/[/*])|$",
       "name": "meta.preprocessor.c",
       "patterns": [
         {
@@ -282,7 +275,7 @@
       "end": "(?!\\G)",
       "patterns": [
         {
-          "begin": "#|(\\/\\/)",
+          "begin": "#|(//)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.riscv"
diff --git a/resources/languages/rst.json b/resources/languages/rst.json
index ff0593a..701faaa 100644
--- a/resources/languages/rst.json
+++ b/resources/languages/rst.json
@@ -33,13 +33,13 @@
     },
     "block-comment": {
       "begin": "^(\\s*)\\.{2}(\\s+|$)",
-      "end": "^(?=\\S)|^\\s*$",
+      "end": "^(?:(?=\\S)|\\s*$)",
       "name": "comment.block",
       "patterns": [
         {
           "begin": "^\\s{3,}(?=\\S)",
           "name": "comment.block",
-          "while": "^\\s{3}.*|^\\s*$"
+          "while": "^(?:\\s{3}.*|\\s*$)"
         }
       ]
     },
@@ -177,11 +177,11 @@
     "citation": {
       "applyEndPatternLast": 0,
       "begin": "(?<=[\\s\"'(\\[{<]|^)`[^\\s`]",
-      "end": "`_{,2}|^\\s*$",
+      "end": "`_{0,2}|^\\s*$",
       "name": "entity.name.tag"
     },
     "code-block": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -192,10 +192,10 @@
           "include": "#block-param"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "code-block-cmake": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(cmake)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(cmake)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -212,10 +212,10 @@
           "include": "source.cmake"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "code-block-console": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(console|shell|bash)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(console|shell|bash)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -232,10 +232,10 @@
           "include": "source.shell"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "code-block-cpp": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(c|c\\+\\+|cpp|C|C\\+\\+|CPP|Cpp)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(c|c\\+\\+|cpp|C|C\\+\\+|CPP|Cpp)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -252,10 +252,10 @@
           "include": "source.cpp"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "code-block-dts": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(dts|DTS|devicetree)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(dts|DTS|devicetree)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -272,10 +272,10 @@
           "include": "source.dts"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "code-block-javascript": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(javascript)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(javascript)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -292,10 +292,10 @@
           "include": "source.js"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "code-block-kconfig": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*([kK]config)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*([kK]config)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -312,10 +312,10 @@
           "include": "source.kconfig"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "code-block-py": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(python)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(python)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -332,10 +332,10 @@
           "include": "source.python"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "code-block-ruby": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(ruby)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(ruby)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -352,10 +352,10 @@
           "include": "source.ruby"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "code-block-yaml": {
-      "begin": "^(\\s*)(\\.{2}\\s+(code|code-block)::)\\s*(ya?ml)\\s*$",
+      "begin": "^(\\s*)(\\.{2}\\s+(code(?:|-block))::)\\s*(ya?ml)\\s*$",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -372,7 +372,7 @@
           "include": "source.yaml"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "doctest": {
       "begin": "^(>>>)\\s*(.*)",
@@ -405,7 +405,7 @@
           "include": "source.python"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "domain-auto": {
       "begin": "^(\\s*)(\\.{2}\\s+auto(?:class|module|exception|function|decorator|data|method|attribute|property)::)\\s*(.*)",
@@ -429,10 +429,10 @@
           "include": "#body"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "domain-cpp": {
-      "begin": "^(\\s*)(\\.{2}\\s+(?:cpp|c):(?:class|struct|function|member|var|type|enum|enum-struct|enum-class|enumerator|union|concept)::)\\s*(?:(@\\w+)|(.*))",
+      "begin": "^(\\s*)(\\.{2}\\s+c(?:pp|):(?:class|struct|function|member|var|type|enum|enum-struct|enum-class|enumerator|union|concept)::)\\s*(?:(@\\w+)|(.*))",
       "beginCaptures": {
         "2": {
           "name": "keyword.control"
@@ -456,7 +456,7 @@
           "include": "#body"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "domain-js": {
       "begin": "^(\\s*)(\\.{2}\\s+js:\\w+::)\\s*(.*)",
@@ -504,7 +504,7 @@
           "include": "#body"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "domains": {
       "patterns": [
@@ -527,11 +527,11 @@
       "name": "constant.character.escape"
     },
     "footnote": {
-      "match": "^\\s*\\.{2}\\s+\\[(?:[\\w\\.-]+|[#*]|#\\w+)\\]\\s+",
+      "match": "^\\s*\\.{2}\\s+\\[(?:[\\w.-]+|[#*]|#\\w+)]\\s+",
       "name": "entity.name.tag"
     },
     "footnote-ref": {
-      "match": "\\[(?:[\\w\\.-]+|[#*])\\]_",
+      "match": "\\[(?:[\\w.-]+|[#*])]_",
       "name": "entity.name.tag"
     },
     "ignore": {
@@ -543,13 +543,13 @@
           "match": "<[`*]+>"
         },
         {
-          "match": "{[`*]+}"
+          "match": "\\{[`*]+}"
         },
         {
           "match": "\\([`*]+\\)"
         },
         {
-          "match": "\\[[`*]+\\]"
+          "match": "\\[[`*]+]"
         },
         {
           "match": "\"[`*]+\""
@@ -634,10 +634,10 @@
           "name": "keyword.control"
         }
       },
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "macro": {
-      "match": "\\|[^\\|]+\\|",
+      "match": "\\|[^|]+\\|",
       "name": "entity.name.tag"
     },
     "monospaced": {
@@ -667,7 +667,7 @@
           "include": "text.html.derivative"
         }
       ],
-      "while": "^\\1(?=\\s)|^\\s*$"
+      "while": "^(?:\\1(?=\\s)|\\s*$)"
     },
     "ref": {
       "begin": "(:ref:)`",
@@ -701,7 +701,7 @@
           "name": "keyword.control"
         }
       },
-      "match": "^\\s*(\\.{2})\\s+(\\|[^\\|]+\\|)\\s+(replace::)"
+      "match": "^\\s*(\\.{2})\\s+(\\|[^|]+\\|)\\s+(replace::)"
     },
     "simple-table": {
       "match": "^[=\\s]+$",
@@ -727,7 +727,7 @@
       ]
     },
     "title": {
-      "match": "^(\\*{3,}|#{3,}|\\={3,}|~{3,}|\\+{3,}|-{3,}|`{3,}|\\^{3,}|:{3,}|\"{3,}|_{3,}|'{3,})$",
+      "match": "^(\\*{3,}|#{3,}|={3,}|~{3,}|\\+{3,}|-{3,}|`{3,}|\\^{3,}|:{3,}|\"{3,}|_{3,}|'{3,})$",
       "name": "markup.heading"
     }
   },
diff --git a/resources/languages/ruby.json b/resources/languages/ruby.json
index 675adbe..0977feb 100644
--- a/resources/languages/ruby.json
+++ b/resources/languages/ruby.json
@@ -23,8 +23,7 @@
           "name": "entity.other.inherited-class.ruby"
         }
       },
-      "comment": "class Namespace::ClassName < OtherNamespace::OtherClassName",
-      "match": "\b(class)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)\\s*((<)\\s*(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*))?",
+      "match": "\\b(class)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)\\s*((<)\\s*(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*))?",
       "name": "meta.class.ruby"
     },
     {
@@ -39,7 +38,7 @@
           "name": "punctuation.separator.namespace.ruby"
         }
       },
-      "match": "\b(module)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)",
+      "match": "\\b(module)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)",
       "name": "meta.module.ruby"
     },
     {
@@ -51,11 +50,10 @@
           "name": "punctuation.separator.inheritance.ruby"
         }
       },
-      "match": "\b(class)\\s*(<<)\\s*",
+      "match": "\\b(class)\\s*(<<)\\s*",
       "name": "meta.class.ruby"
     },
     {
-      "comment": "else if is a common mistake carried over from other languages. it works if you put in a second end, but it’s never what you want.",
       "match": "(?<!\\.)\\belse(\\s)+if\\b",
       "name": "invalid.deprecated.ruby"
     },
@@ -68,7 +66,6 @@
           "name": "keyword.operator.assignment.augmented.ruby"
         }
       },
-      "comment": "A local variable and/or assignment",
       "match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*((&&|\\|\\|)=)"
     },
     {
@@ -83,7 +80,6 @@
           "name": "keyword.operator.assignment.augmented.ruby"
         }
       },
-      "comment": "A local variable and/or assignment in a condition",
       "match": "(?<!\\.)\\b(case|if|elsif|unless|until|while)\\b\\s*(\\()*?\\s*([a-z]([A-Za-z0-9_])*)\\s*((&&|\\|\\|)=)"
     },
     {
@@ -95,8 +91,7 @@
           "name": "keyword.operator.assignment.augmented.ruby"
         }
       },
-      "comment": "A local variable operation assignment (+=, -=, *=, /=)",
-      "match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*((\\+|\\*|-|\\/|%|\\*\\*|&|\\||\\^|<<|>>)=)"
+      "match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*(([+*\\-/%]|\\*\\*|[\\&|^]|<<|>>)=)"
     },
     {
       "captures": {
@@ -110,8 +105,7 @@
           "name": "keyword.operator.assignment.augmented.ruby"
         }
       },
-      "comment": "A local variable operation assignment in a condition",
-      "match": "(?<!\\.)\\b(case|if|elsif|unless|until|while)\\b\\s*(\\()*?\\s*([a-z]([A-Za-z0-9_])*)\\s*((\\+|\\*|-|\\/|%|\\*\\*|&|\\||\\^|<<|>>)=)"
+      "match": "(?<!\\.)\\b(case|if|elsif|unless|until|while)\\b\\s*(\\()*?\\s*([a-z]([A-Za-z0-9_])*)\\s*(([+*\\-/%]|\\*\\*|[\\&|^]|<<|>>)=)"
     },
     {
       "captures": {
@@ -119,8 +113,7 @@
           "name": "variable.ruby"
         }
       },
-      "comment": "A local variable assignment",
-      "match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*=[^=>]"
+      "match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*(?==[^=>])"
     },
     {
       "captures": {
@@ -131,7 +124,6 @@
           "name": "variable.ruby"
         }
       },
-      "comment": "A local variable assignment in a condition",
       "match": "(?<!\\.)\\b(case|if|elsif|unless|until|while)\\b\\s*(\\()*?\\s*([a-z]([A-Za-z0-9_])*)\\s*=[^=>]"
     },
     {
@@ -140,8 +132,7 @@
           "name": "punctuation.definition.constant.hashkey.ruby"
         }
       },
-      "comment": "symbols as hash key (1.9 syntax)",
-      "match": "(?>[a-zA-Z_]\\w*(?>[?!])?)(:)(?!:)",
+      "match": "(?>[a-zA-Z_]\\w*[?!]?)(:)(?!:)",
       "name": "constant.language.symbol.hashkey.ruby"
     },
     {
@@ -150,23 +141,19 @@
           "name": "punctuation.definition.constant.ruby"
         }
       },
-      "comment": "symbols as hash key (1.8 syntax)",
-      "match": "(?<!:)(:)(?>[a-zA-Z_]\\w*(?>[?!])?)(?=\\s*=>)",
+      "match": "(?<!:)(:)(?>[a-zA-Z_]\\w*[?!]?)(?=\\s*=>)",
       "name": "constant.language.symbol.hashkey.ruby"
     },
     {
-      "comment": "everything being a reserved word, not a value and needing a 'end' is a..",
       "match": "(?<!\\.)\\b(BEGIN|begin|case|class|else|elsif|END|end|ensure|for|if|in|module|rescue|then|unless|until|when|while)\\b(?![?!])",
       "name": "keyword.control.ruby"
     },
     {
-      "comment": "contextual smart pair support for block parameters",
       "match": "(?<!\\.)\\bdo\\b",
       "name": "keyword.control.start-block.ruby"
     },
     {
-      "comment": "contextual smart pair support",
-      "match": "(?<={)(\\s+)",
+      "match": "(?<=\\{)(\\s+)",
       "name": "meta.syntax.ruby.start-block"
     },
     {
@@ -190,18 +177,17 @@
       "name": "variable.language.self.ruby"
     },
     {
-      "comment": " everything being a method but having a special function is a..",
       "match": "\\b(initialize|new|loop|include|extend|prepend|raise|fail|attr_reader|attr_writer|attr_accessor|attr|catch|throw|private|private_class_method|module_function|public|public_class_method|protected|refine|using)\\b(?![?!])",
       "name": "keyword.other.special-method.ruby"
     },
     {
-      "begin": "\\b(?<!\\.|::)(require|require_relative)\\b(?![?!])",
+      "begin": "\\b(?<!\\.|::)(require(?:|_relative))\\b(?![?!])",
       "captures": {
         "1": {
           "name": "keyword.other.special-method.ruby"
         }
       },
-      "end": "$|(?=#|})",
+      "end": "$|(?=[#}])",
       "name": "meta.require.ruby",
       "patterns": [
         {
@@ -242,7 +228,7 @@
           "name": "punctuation.definition.variable.ruby"
         }
       },
-      "match": "(\\$)(!|@|&|`|'|\\+|\\d+|~|=|/|\\\\|,|;|\\.|<|>|_|\\*|\\$|\\?|:|\"|-[0adFiIlpv])",
+      "match": "(\\$)([!@\\&`'+]|\\d+|[~=/\\\\,;.<>_*$?:\"]|-[0adFiIlpv])",
       "name": "variable.other.readwrite.global.pre-defined.ruby"
     },
     {
@@ -279,11 +265,10 @@
           "name": "support.function.kernel.ruby"
         }
       },
-      "comment": "Lambda parameters.",
       "end": "\\)",
       "patterns": [
         {
-          "begin": "(?=[&*_a-zA-Z])",
+          "begin": "(?=[\\&*_a-zA-Z])",
           "end": "(?=[,)])",
           "patterns": [
             {
@@ -297,7 +282,7 @@
       ]
     },
     {
-      "begin": "(?=def\\b)(?<=^|\\s)(def)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?))\\s*(\\()",
+      "begin": "(?=def\\b)(?<=^|\\s)(def)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|!=|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[]=?))\\s*(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.def.ruby"
@@ -309,7 +294,6 @@
           "name": "punctuation.definition.parameters.ruby"
         }
       },
-      "comment": "The method pattern comes from the symbol pattern. See there for an explanation.",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -319,7 +303,7 @@
       "name": "meta.function.method.with-arguments.ruby",
       "patterns": [
         {
-          "begin": "(?=[&*_a-zA-Z])",
+          "begin": "(?=[\\&*_a-zA-Z])",
           "end": "(?=[,)])",
           "patterns": [
             {
@@ -333,7 +317,7 @@
       ]
     },
     {
-      "begin": "(?=def\\b)(?<=^|\\s)(def)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?))[ \\t](?=[ \\t]*[^\\s#;])",
+      "begin": "(?=def\\b)(?<=^|\\s)(def)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|!=|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[]=?))[ \\t](?=[ \\t]*[^\\s#;])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.def.ruby"
@@ -342,13 +326,12 @@
           "name": "entity.name.function.ruby"
         }
       },
-      "comment": "same as the previous rule, but without parentheses around the arguments",
       "end": "(?=;)|(?<=[\\w\\])}`'\"!?])(?=\\s*#|\\s*$)",
       "name": "meta.function.method.with-arguments.ruby",
       "patterns": [
         {
-          "begin": "(?=[&*_a-zA-Z])",
-          "end": "(?=,|;|\\s*#|\\s*$)",
+          "begin": "(?=[\\&*_a-zA-Z])",
+          "end": "(?=[,;]|\\s*#|\\s*$)",
           "patterns": [
             {
               "include": "#method_parameters"
@@ -369,12 +352,11 @@
           "name": "entity.name.function.ruby"
         }
       },
-      "comment": " the optional name is just to catch the def also without a method-name",
-      "match": "(?=def\\b)(?<=^|\\s)(def)\\b(\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?)))?",
+      "match": "(?=def\\b)(?<=^|\\s)(def)\\b(\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|!=|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[]=?)))?",
       "name": "meta.function.method.without-arguments.ruby"
     },
     {
-      "match": "\\b([\\d](?>_?\\d)*(\\.(?![^[:space:][:digit:]])(?>_?\\d)*)?([eE][-+]?\\d(?>_?\\d)*)?|0(?:[xX]\\h(?>_?\\h)*|[oO]?[0-7](?>_?[0-7])*|[bB][01](?>_?[01])*|[dD]\\d(?>_?\\d)*))\\b",
+      "match": "\\b(\\d(?>_?\\d)*(\\.(?![^\\s\\d])(?>_?\\d)*)?([eE][-+]?\\d(?>_?\\d)*)?|0(?:[xX]\\h(?>_?\\h)*|[oO]?[0-7](?>_?[0-7])*|[bB][01](?>_?[01])*|[dD]\\d(?>_?\\d)*))\\b",
       "name": "constant.numeric.ruby"
     },
     {
@@ -384,7 +366,6 @@
           "name": "punctuation.definition.symbol.begin.ruby"
         }
       },
-      "comment": "symbol literal with '' delimiter",
       "end": "'",
       "endCaptures": {
         "0": {
@@ -406,7 +387,6 @@
           "name": "punctuation.section.symbol.begin.ruby"
         }
       },
-      "comment": "symbol literal with \"\" delimiter",
       "end": "\"",
       "endCaptures": {
         "0": {
@@ -424,7 +404,6 @@
       ]
     },
     {
-      "comment": "Needs higher precedence than regular expressions.",
       "match": "(?<!\\()/=",
       "name": "keyword.operator.assignment.augmented.ruby"
     },
@@ -435,7 +414,6 @@
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "comment": "string literal with '' delimiter",
       "end": "'",
       "endCaptures": {
         "0": {
@@ -445,7 +423,7 @@
       "name": "string.quoted.single.ruby",
       "patterns": [
         {
-          "match": "\\\\'|\\\\\\\\",
+          "match": "\\\\['\\\\]",
           "name": "constant.character.escape.ruby"
         }
       ]
@@ -457,7 +435,6 @@
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "comment": "string literal with interpolation and \"\" delimiter",
       "end": "\"",
       "endCaptures": {
         "0": {
@@ -481,7 +458,6 @@
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "comment": "execute string (allows for interpolation)",
       "end": "`",
       "endCaptures": {
         "0": {
@@ -508,7 +484,6 @@
           "name": "punctuation.section.regexp.ruby"
         }
       },
-      "comment": "regular expression literal with interpolation",
       "contentName": "string.regexp.interpolated.ruby",
       "end": "((/[eimnosux]*))",
       "patterns": [
@@ -518,7 +493,7 @@
       ]
     },
     {
-      "begin": "%r{",
+      "begin": "%r\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.regexp.begin.ruby"
@@ -610,7 +585,7 @@
       ]
     },
     {
-      "begin": "%r([^\\w])",
+      "begin": "%r(\\W)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.regexp.begin.ruby"
@@ -708,7 +683,7 @@
       ]
     },
     {
-      "begin": "%I{",
+      "begin": "%I\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
@@ -734,7 +709,7 @@
       ]
     },
     {
-      "begin": "%I([^\\w])",
+      "begin": "%I(\\W)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
@@ -772,7 +747,7 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "match": "\\\\]|\\\\\\\\",
+          "match": "\\\\[\\]\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -796,7 +771,7 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "match": "\\\\\\)|\\\\\\\\",
+          "match": "\\\\[)\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -820,7 +795,7 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "match": "\\\\>|\\\\\\\\",
+          "match": "\\\\[>\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -829,7 +804,7 @@
       ]
     },
     {
-      "begin": "%i{",
+      "begin": "%i\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
@@ -844,7 +819,7 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "match": "\\\\}|\\\\\\\\",
+          "match": "\\\\[}\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -853,7 +828,7 @@
       ]
     },
     {
-      "begin": "%i([^\\w])",
+      "begin": "%i(\\W)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
@@ -868,7 +843,6 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "comment": "Cant be named because its not necessarily an escape.",
           "match": "\\\\."
         }
       ]
@@ -952,7 +926,7 @@
       ]
     },
     {
-      "begin": "%W{",
+      "begin": "%W\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
@@ -978,7 +952,7 @@
       ]
     },
     {
-      "begin": "%W([^\\w])",
+      "begin": "%W(\\W)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
@@ -1016,7 +990,7 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "match": "\\\\]|\\\\\\\\",
+          "match": "\\\\[\\]\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1040,7 +1014,7 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "match": "\\\\\\)|\\\\\\\\",
+          "match": "\\\\[)\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1064,7 +1038,7 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "match": "\\\\>|\\\\\\\\",
+          "match": "\\\\[>\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1073,7 +1047,7 @@
       ]
     },
     {
-      "begin": "%w{",
+      "begin": "%w\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
@@ -1088,7 +1062,7 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "match": "\\\\}|\\\\\\\\",
+          "match": "\\\\[}\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1097,7 +1071,7 @@
       ]
     },
     {
-      "begin": "%w([^\\w])",
+      "begin": "%w(\\W)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
@@ -1112,7 +1086,6 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "comment": "Cant be named because its not necessarily an escape.",
           "match": "\\\\."
         }
       ]
@@ -1170,7 +1143,7 @@
       ]
     },
     {
-      "begin": "%[Qx]?{",
+      "begin": "%[Qx]?\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
@@ -1222,7 +1195,7 @@
       ]
     },
     {
-      "begin": "%[Qx]([^\\w])",
+      "begin": "%[Qx](\\W)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
@@ -1283,7 +1256,7 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "match": "\\\\\\)|\\\\\\\\",
+          "match": "\\\\[)\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1307,7 +1280,7 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "match": "\\\\>|\\\\\\\\",
+          "match": "\\\\[>\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1331,7 +1304,7 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "match": "\\\\]|\\\\\\\\",
+          "match": "\\\\[\\]\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1340,7 +1313,7 @@
       ]
     },
     {
-      "begin": "%q{",
+      "begin": "%q\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
@@ -1355,7 +1328,7 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "match": "\\\\}|\\\\\\\\",
+          "match": "\\\\[}\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1364,7 +1337,7 @@
       ]
     },
     {
-      "begin": "%q([^\\w])",
+      "begin": "%q(\\W)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
@@ -1379,7 +1352,6 @@
       "name": "string.quoted.other.ruby",
       "patterns": [
         {
-          "comment": "Cant be named because its not necessarily an escape.",
           "match": "\\\\."
         }
       ]
@@ -1400,7 +1372,7 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "match": "\\\\\\)|\\\\\\\\",
+          "match": "\\\\[)\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1424,7 +1396,7 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "match": "\\\\>|\\\\\\\\",
+          "match": "\\\\[>\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1448,7 +1420,7 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "match": "\\\\]|\\\\\\\\",
+          "match": "\\\\[\\]\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1457,7 +1429,7 @@
       ]
     },
     {
-      "begin": "%s{",
+      "begin": "%s\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.begin.ruby"
@@ -1472,7 +1444,7 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "match": "\\\\}|\\\\\\\\",
+          "match": "\\\\[}\\\\]",
           "name": "constant.character.escape.ruby"
         },
         {
@@ -1481,7 +1453,7 @@
       ]
     },
     {
-      "begin": "%s([^\\w])",
+      "begin": "%s(\\W)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.begin.ruby"
@@ -1496,7 +1468,6 @@
       "name": "constant.language.symbol.ruby",
       "patterns": [
         {
-          "comment": "Cant be named because its not necessarily an escape.",
           "match": "\\\\."
         }
       ]
@@ -1507,8 +1478,7 @@
           "name": "punctuation.definition.constant.ruby"
         }
       },
-      "comment": "symbols",
-      "match": "(?<!:)(:)(?>[$a-zA-Z_]\\w*(?>[?!]|=(?![>=]))?|===?|<=>|>[>=]?|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?|@@?[a-zA-Z_]\\w*)",
+      "match": "(?<!:)(:)(?>[$a-zA-Z_]\\w*(?>[?!]|=(?![>=]))?|===?|<=>|>[>=]?|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[]=?|@@?[a-zA-Z_]\\w*)",
       "name": "constant.language.symbol.ruby"
     },
     {
@@ -1518,7 +1488,6 @@
           "name": "punctuation.definition.comment.ruby"
         }
       },
-      "comment": "multiline comments",
       "end": "^=end",
       "name": "comment.block.documentation.ruby"
     },
@@ -1547,7 +1516,6 @@
       ]
     },
     {
-      "comment": "\n\t\t\tmatches questionmark-letters.\n\n\t\t\texamples (1st alternation = hex):\n\t\t\t?\\x1     ?\\x61\n\n\t\t\texamples (2nd alternation = octal):\n\t\t\t?\\0      ?\\07     ?\\017\n\n\t\t\texamples (3rd alternation = escaped):\n\t\t\t?\\n      ?\\b\n\n\t\t\texamples (4th alternation = meta-ctrl):\n\t\t\t?\\C-a    ?\\M-a    ?\\C-\\M-\\C-\\M-a\n\n\t\t\texamples (4th alternation = normal):\n\t\t\t?a       ?A       ?0 \n\t\t\t?*       ?\"       ?( \n\t\t\t?.       ?#\n\t\t\t\n\t\t\t\n\t\t\tthe negative lookbehind prevents against matching\n\t\t\tp(42.tainted?)\n\t\t\t",
       "match": "(?<!\\w)\\?(\\\\(x\\h{1,2}(?!\\h)\\b|0[0-7]{0,2}(?![0-7])\\b|[^x0MC])|(\\\\[MC]-)+\\w|[^\\s\\\\])",
       "name": "constant.numeric.ruby"
     },
@@ -1558,7 +1526,6 @@
           "name": "string.unquoted.program-block.ruby"
         }
       },
-      "comment": "__END__ marker",
       "contentName": "text.plain",
       "end": "(?=not)impossible",
       "patterns": [
@@ -1576,7 +1543,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HTML)\\b\\1))",
-      "comment": "Heredoc with embedded HTML",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.html",
       "patterns": [
@@ -1614,7 +1580,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HAML)\\b\\1))",
-      "comment": "Heredoc with embedded HAML",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.haml",
       "patterns": [
@@ -1652,7 +1617,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)XML)\\b\\1))",
-      "comment": "Heredoc with embedded XML",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.xml",
       "patterns": [
@@ -1690,7 +1654,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SQL)\\b\\1))",
-      "comment": "Heredoc with embedded SQL",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.sql",
       "patterns": [
@@ -1727,13 +1690,12 @@
       ]
     },
     {
-      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1))",
-      "comment": "Heredoc with embedded GraphQL",
+      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)G(?:RAPHQL|QL))\\b\\1))",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.graphql",
       "patterns": [
         {
-          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1)",
+          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)G(?:RAPHQL|QL))\\b\\1)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
@@ -1766,7 +1728,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CSS)\\b\\1))",
-      "comment": "Heredoc with embedded CSS",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.css",
       "patterns": [
@@ -1804,7 +1765,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CPP)\\b\\1))",
-      "comment": "Heredoc with embedded C++",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.cpp",
       "patterns": [
@@ -1842,7 +1802,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)C)\\b\\1))",
-      "comment": "Heredoc with embedded C",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.c",
       "patterns": [
@@ -1879,13 +1838,12 @@
       ]
     },
     {
-      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1))",
-      "comment": "Heredoc with embedded Javascript",
+      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)J(?:S|AVASCRIPT))\\b\\1))",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.js",
       "patterns": [
         {
-          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1)",
+          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)J(?:S|AVASCRIPT))\\b\\1)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
@@ -1918,7 +1876,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)JQUERY)\\b\\1))",
-      "comment": "Heredoc with embedded jQuery Javascript",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.js.jquery",
       "patterns": [
@@ -1955,13 +1912,12 @@
       ]
     },
     {
-      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1))",
-      "comment": "Heredoc with embedded Shell",
+      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SH(?:|ELL))\\b\\1))",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.shell",
       "patterns": [
         {
-          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1)",
+          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SH(?:|ELL))\\b\\1)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
@@ -1994,7 +1950,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)LUA)\\b\\1))",
-      "comment": "Heredoc with embedded Lua",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.lua",
       "patterns": [
@@ -2032,7 +1987,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)RUBY)\\b\\1))",
-      "comment": "Heredoc with embedded Ruby",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.ruby",
       "patterns": [
@@ -2069,13 +2023,12 @@
       ]
     },
     {
-      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1))",
-      "comment": "Heredoc with embedded YAML",
+      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)Y(?:AML|ML))\\b\\1))",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.yaml",
       "patterns": [
         {
-          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1)",
+          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)Y(?:AML|ML))\\b\\1)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
@@ -2108,7 +2061,6 @@
     },
     {
       "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SLIM)\\b\\1))",
-      "comment": "Heredoc with embedded Slim",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.slim",
       "patterns": [
@@ -2184,7 +2136,6 @@
           ]
         }
       },
-      "comment": "heredoc with multiple inputs and indented terminator",
       "end": "^\\s*\\6$",
       "endCaptures": {
         "0": {
@@ -2205,7 +2156,7 @@
       ]
     },
     {
-      "begin": "(?<={|{\\s|[^A-Za-z0-9_:@$]do|^do|[^A-Za-z0-9_:@$]do\\s|^do\\s)(\\|)",
+      "begin": "(?<=\\{|\\{\\s+|[^A-Za-z0-9_:@$]do|^do|[^A-Za-z0-9_:@$]do\\s+|^do\\s+)(\\|)",
       "captures": {
         "1": {
           "name": "punctuation.separator.variable.ruby"
@@ -2225,12 +2176,9 @@
                 },
                 "2": {
                   "name": "variable.other.block.ruby"
-                },
-                "3": {
-                  "name": "variable.other.block.unused.ruby variable.other.constant.ruby"
                 }
               },
-              "match": "\\G([&*]?)([a-zA-Z][\\w_]*)|(_[\\w_]*)"
+              "match": "\\G((?:&|\\*\\*?)?)([a-zA-Z_][\\w_]*)"
             }
           ]
         },
@@ -2253,7 +2201,7 @@
       "name": "keyword.operator.assignment.augmented.ruby"
     },
     {
-      "match": "<=>|<(?!<|=)|>(?!<|=|>)|<=|>=|===|==|=~|!=|!~|(?<=[ \\t])\\?",
+      "match": "<=>|<(?![<=])|>(?![<=>])|<=|>=|===|==|=~|!=|!~|(?<=[ \\t])\\?",
       "name": "keyword.operator.comparison.ruby"
     },
     {
@@ -2270,11 +2218,10 @@
           "name": "keyword.operator.logical.ruby"
         }
       },
-      "comment": "Safe navigation operator",
       "match": "(&\\.)\\s*(?![A-Z])"
     },
     {
-      "match": "(%|&|\\*\\*|\\*|\\+|-|/)",
+      "match": "([%\\&]|\\*\\*|[*+\\-/])",
       "name": "keyword.operator.arithmetic.ruby"
     },
     {
@@ -2282,7 +2229,7 @@
       "name": "keyword.operator.assignment.ruby"
     },
     {
-      "match": "\\||~|>>",
+      "match": "[|~]|>>",
       "name": "keyword.operator.other.ruby"
     },
     {
@@ -2299,7 +2246,6 @@
           "name": "punctuation.separator.namespace.ruby"
         }
       },
-      "comment": "Mark as namespace separator if double colons followed by capital letter",
       "match": "(::)\\s*(?=[A-Z])"
     },
     {
@@ -2308,16 +2254,14 @@
           "name": "punctuation.separator.method.ruby"
         }
       },
-      "comment": "Mark as method separator if double colons not followed by capital letter",
       "match": "(\\.|::)\\s*(?![A-Z])"
     },
     {
-      "comment": "Must come after method and constant separators to prefer double colons",
       "match": ":",
       "name": "punctuation.separator.other.ruby"
     },
     {
-      "match": "{",
+      "match": "\\{",
       "name": "punctuation.section.scope.begin.ruby"
     },
     {
@@ -2333,11 +2277,11 @@
       "name": "punctuation.section.array.end.ruby"
     },
     {
-      "match": "\\(|\\)",
+      "match": "[()]",
       "name": "punctuation.section.function.ruby"
     },
     {
-      "begin": "(?<=[^\\.]\\.|::)(?=[a-zA-Z][a-zA-Z0-9_!?]*[^a-zA-Z0-9_!?])",
+      "begin": "(?<=[^.]\\.|::)(?=[a-zA-Z][a-zA-Z0-9_!?]*[^a-zA-Z0-9_!?])",
       "end": "(?<=[a-zA-Z0-9_!?])(?=[^a-zA-Z0-9_!?])",
       "name": "meta.function-call.ruby",
       "patterns": [
@@ -2388,7 +2332,7 @@
     "interpolated_ruby": {
       "patterns": [
         {
-          "begin": "#{",
+          "begin": "#\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.embedded.begin.ruby"
@@ -2466,7 +2410,7 @@
               "name": "punctuation.section.scope.begin.ruby"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.scope.end.ruby"
@@ -2494,7 +2438,7 @@
               "name": "punctuation.section.array.begin.ruby"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.array.end.ruby"
@@ -2614,7 +2558,7 @@
       ]
     },
     "nest_curly": {
-      "begin": "{",
+      "begin": "\\{",
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
@@ -2630,7 +2574,7 @@
     "nest_curly_and_self": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "captures": {
             "0": {
               "name": "punctuation.section.scope.ruby"
@@ -2649,7 +2593,7 @@
       ]
     },
     "nest_curly_i": {
-      "begin": "{",
+      "begin": "\\{",
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
@@ -2669,7 +2613,7 @@
       ]
     },
     "nest_curly_r": {
-      "begin": "{",
+      "begin": "\\{",
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
@@ -2804,7 +2748,7 @@
               "name": "punctuation.definition.arbitrary-repetition.ruby"
             }
           },
-          "match": "({)\\d+(,\\d+)?(})",
+          "match": "(\\{)\\d+(,\\d+)?(})",
           "name": "string.regexp.arbitrary-repetition.ruby"
         },
         {
@@ -2858,13 +2802,12 @@
           ]
         },
         {
-          "begin": "(?<=^|\\s)(#)\\s(?=[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$)",
+          "begin": "(?<=^|\\s)(#)\\s(?=[a-zA-Z0-9,. \\t?!\\-[^\\x00-\\x7F]]*$)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.ruby"
             }
           },
-          "comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
           "end": "$\\n?",
           "endCaptures": {
             "0": {
@@ -2916,7 +2859,6 @@
           "name": "comment.line.keyword.yard.ruby"
         }
       },
-      "comment": "For YARD tags that follow the tag-comment pattern",
       "contentName": "comment.line.string.yard.ruby",
       "end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
       "name": "comment.line.number-sign.ruby",
@@ -2955,7 +2897,6 @@
           "name": "comment.line.punctuation.yard.ruby"
         }
       },
-      "comment": "For YARD directives",
       "contentName": "comment.line.string.yard.ruby",
       "end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
       "name": "comment.line.number-sign.ruby",
@@ -2993,7 +2934,6 @@
           "name": "comment.line.punctuation.yard.ruby"
         }
       },
-      "comment": "separate rule for attribute and macro tags because name goes after []",
       "contentName": "comment.line.string.yard.ruby",
       "end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
       "name": "comment.line.number-sign.ruby",
@@ -3046,7 +2986,6 @@
           "name": "comment.line.punctuation.yard.ruby"
         }
       },
-      "comment": "For YARD option tag that follow the tag-name-types-key-(value)-description pattern",
       "contentName": "comment.line.string.yard.ruby",
       "end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
       "name": "comment.line.number-sign.ruby",
@@ -3096,7 +3035,6 @@
           "name": "comment.line.punctuation.yard.ruby"
         }
       },
-      "comment": "For YARD tags that follow the tag-name-types-description or tag-types-name-description pattern",
       "contentName": "comment.line.string.yard.ruby",
       "end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
       "name": "comment.line.number-sign.ruby",
@@ -3125,7 +3063,6 @@
           "name": "comment.line.parameter.yard.ruby"
         }
       },
-      "comment": "separate rule for @see because name could contain url",
       "contentName": "comment.line.string.yard.ruby",
       "end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
       "name": "comment.line.number-sign.ruby",
@@ -3150,7 +3087,6 @@
           "name": "comment.line.keyword.yard.ruby"
         }
       },
-      "comment": "For YARD tags that are just the tag",
       "match": "^(\\s*)(#)(\\s*)(@)(private)$",
       "name": "comment.line.number-sign.ruby"
     },
@@ -3176,7 +3112,6 @@
           "name": "comment.line.punctuation.yard.ruby"
         }
       },
-      "comment": "For YARD tags that follow the tag-types-comment pattern",
       "contentName": "comment.line.string.yard.ruby",
       "end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
       "name": "comment.line.number-sign.ruby",
diff --git a/resources/languages/rust.json b/resources/languages/rust.json
index 6f9c60e..4d599cb 100644
--- a/resources/languages/rust.json
+++ b/resources/languages/rust.json
@@ -12,7 +12,6 @@
           "name": "punctuation.brackets.square.rust"
         }
       },
-      "comment": "boxed slice literal",
       "end": ">",
       "endCaptures": {
         "0": {
@@ -61,8 +60,7 @@
           "name": "variable.other.metavariable.specifier.rust"
         }
       },
-      "comment": "macro type metavariables",
-      "match": "(\\$)((crate)|([A-Z][A-Za-z0-9_]*))((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?",
+      "match": "(\\$)((crate)|([A-Z]\\w*))(\\s*(:)\\s*(block|expr(?:_2021)?|ident|item|lifetime|literal|meta|pat(?:_param)?|path|stmt|tt|ty|vis)\\b)?",
       "name": "meta.macro.metavariable.type.rust",
       "patterns": [
         {
@@ -85,8 +83,7 @@
           "name": "variable.other.metavariable.specifier.rust"
         }
       },
-      "comment": "macro metavariables",
-      "match": "(\\$)([a-z][A-Za-z0-9_]*)((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?",
+      "match": "(\\$)([a-z]\\w*)(\\s*(:)\\s*(block|expr(?:_2021)?|ident|item|lifetime|literal|meta|pat(?:_param)?|path|stmt|tt|ty|vis)\\b)?",
       "name": "meta.macro.metavariable.rust",
       "patterns": [
         {
@@ -109,7 +106,6 @@
           "name": "punctuation.brackets.curly.rust"
         }
       },
-      "comment": "macro rules",
       "match": "\\b(macro_rules!)\\s+(([a-z0-9_]+)|([A-Z][a-z0-9_]*))\\s+(\\{)",
       "name": "meta.macro.rules.rust"
     },
@@ -122,7 +118,6 @@
           "name": "entity.name.module.rust"
         }
       },
-      "comment": "modules",
       "match": "(mod)\\s+((?:r#(?!crate|[Ss]elf|super))?[a-z][A-Za-z0-9_]*)"
     },
     {
@@ -135,7 +130,6 @@
           "name": "keyword.other.crate.rust"
         }
       },
-      "comment": "external crate imports",
       "end": ";",
       "endCaptures": {
         "0": {
@@ -165,7 +159,6 @@
           "name": "keyword.other.rust"
         }
       },
-      "comment": "use statements",
       "end": ";",
       "endCaptures": {
         "0": {
@@ -245,7 +238,7 @@
   ],
   "repository": {
     "attributes": {
-      "begin": "(#)(\\!?)(\\[)",
+      "begin": "(#)(!?)(\\[)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.attribute.rust"
@@ -254,8 +247,7 @@
           "name": "punctuation.brackets.attribute.rust"
         }
       },
-      "comment": "attributes",
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.brackets.attribute.rust"
@@ -292,13 +284,11 @@
     "block-comments": {
       "patterns": [
         {
-          "comment": "empty block comments",
           "match": "/\\*\\*/",
           "name": "comment.block.rust"
         },
         {
           "begin": "/\\*\\*",
-          "comment": "block documentation comments",
           "end": "\\*/",
           "name": "comment.block.documentation.rust",
           "patterns": [
@@ -309,7 +299,6 @@
         },
         {
           "begin": "/\\*(?!\\*)",
-          "comment": "block comments",
           "end": "\\*/",
           "name": "comment.block.rust",
           "patterns": [
@@ -328,7 +317,6 @@
               "name": "punctuation.definition.comment.rust"
             }
           },
-          "comment": "documentation comments",
           "match": "(///).*$",
           "name": "comment.line.documentation.rust"
         },
@@ -338,7 +326,6 @@
               "name": "punctuation.definition.comment.rust"
             }
           },
-          "comment": "line comments",
           "match": "(//).*$",
           "name": "comment.line.double-slash.rust"
         }
@@ -347,7 +334,6 @@
     "constants": {
       "patterns": [
         {
-          "comment": "ALL CAPS constants",
           "match": "\\b[A-Z]{2}[A-Z0-9_]*\\b",
           "name": "constant.other.caps.rust"
         },
@@ -360,7 +346,6 @@
               "name": "constant.other.caps.rust"
             }
           },
-          "comment": "constant declarations",
           "match": "\\b(const)\\s+([A-Z][A-Za-z0-9_]*)\\b"
         },
         {
@@ -381,8 +366,7 @@
               "name": "entity.name.type.numeric.rust"
             }
           },
-          "comment": "decimal integers and floats",
-          "match": "\\b\\d[\\d_]*(\\.?)[\\d_]*(?:(E|e)([+-]?)([\\d_]+))?(f32|f64|i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)?\\b",
+          "match": "\\b\\d[\\d_]*(\\.?)[\\d_]*(?:([Ee])([+-]?)([\\d_]+))?(f32|f64|i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)?\\b",
           "name": "constant.numeric.decimal.rust"
         },
         {
@@ -391,7 +375,6 @@
               "name": "entity.name.type.numeric.rust"
             }
           },
-          "comment": "hexadecimal integers",
           "match": "\\b0x[\\da-fA-F_]+(i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)?\\b",
           "name": "constant.numeric.hex.rust"
         },
@@ -401,7 +384,6 @@
               "name": "entity.name.type.numeric.rust"
             }
           },
-          "comment": "octal integers",
           "match": "\\b0o[0-7_]+(i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)?\\b",
           "name": "constant.numeric.oct.rust"
         },
@@ -411,12 +393,10 @@
               "name": "entity.name.type.numeric.rust"
             }
           },
-          "comment": "binary integers",
           "match": "\\b0b[01_]+(i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)?\\b",
           "name": "constant.numeric.bin.rust"
         },
         {
-          "comment": "booleans",
           "match": "\\b(true|false)\\b",
           "name": "constant.language.bool.rust"
         }
@@ -440,8 +420,7 @@
           "name": "constant.character.escape.unicode.punctuation.rust"
         }
       },
-      "comment": "escapes: ASCII, byte, Unicode, quote, regex",
-      "match": "(\\\\)(?:(?:(x[0-7][\\da-fA-F])|(u(\\{)[\\da-fA-F]{4,6}(\\}))|.))",
+      "match": "(\\\\)(?:(x[0-7][\\da-fA-F])|(u(\\{)[\\da-fA-F]{4,6}(}))|.)",
       "name": "constant.character.escape.rust"
     },
     "functions": {
@@ -455,7 +434,6 @@
               "name": "punctuation.brackets.round.rust"
             }
           },
-          "comment": "pub as a function",
           "match": "\\b(pub)(\\()"
         },
         {
@@ -474,7 +452,6 @@
               "name": "punctuation.brackets.angle.rust"
             }
           },
-          "comment": "function definition",
           "end": "(\\{)|(;)",
           "endCaptures": {
             "1": {
@@ -540,7 +517,6 @@
               "name": "punctuation.brackets.round.rust"
             }
           },
-          "comment": "function/method calls, chaining",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -603,7 +579,6 @@
               "name": "entity.name.function.rust"
             }
           },
-          "comment": "function/method calls with turbofish",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -664,12 +639,10 @@
     "gtypes": {
       "patterns": [
         {
-          "comment": "option types",
           "match": "\\b(Some|None)\\b",
           "name": "entity.name.type.option.rust"
         },
         {
-          "comment": "result types",
           "match": "\\b(Ok|Err)\\b",
           "name": "entity.name.type.result.rust"
         }
@@ -684,99 +657,80 @@
           "name": "punctuation.definition.interpolation.rust"
         }
       },
-      "comment": "curly brace interpolations",
-      "match": "({)[^\"{}]*(})",
+      "match": "(\\{)[^\"{}]*(})",
       "name": "meta.interpolation.rust"
     },
     "keywords": {
       "patterns": [
         {
-          "comment": "control flow keywords",
           "match": "\\b(await|break|continue|do|else|for|if|loop|match|return|try|while|yield)\\b",
           "name": "keyword.control.rust"
         },
         {
-          "comment": "storage keywords",
           "match": "\\b(extern|let|macro|mod)\\b",
           "name": "keyword.other.rust storage.type.rust"
         },
         {
-          "comment": "const keyword",
           "match": "\\b(const)\\b",
           "name": "storage.modifier.rust"
         },
         {
-          "comment": "type keyword",
           "match": "\\b(type)\\b",
           "name": "keyword.declaration.type.rust storage.type.rust"
         },
         {
-          "comment": "enum keyword",
           "match": "\\b(enum)\\b",
           "name": "keyword.declaration.enum.rust storage.type.rust"
         },
         {
-          "comment": "trait keyword",
           "match": "\\b(trait)\\b",
           "name": "keyword.declaration.trait.rust storage.type.rust"
         },
         {
-          "comment": "struct keyword",
           "match": "\\b(struct)\\b",
           "name": "keyword.declaration.struct.rust storage.type.rust"
         },
         {
-          "comment": "storage modifiers",
           "match": "\\b(abstract|static)\\b",
           "name": "storage.modifier.rust"
         },
         {
-          "comment": "other keywords",
           "match": "\\b(as|async|become|box|dyn|move|final|gen|impl|in|override|priv|pub|ref|typeof|union|unsafe|unsized|use|virtual|where)\\b",
           "name": "keyword.other.rust"
         },
         {
-          "comment": "fn",
           "match": "\\bfn\\b",
           "name": "keyword.other.fn.rust"
         },
         {
-          "comment": "crate",
           "match": "\\bcrate\\b",
           "name": "keyword.other.crate.rust"
         },
         {
-          "comment": "mut",
           "match": "\\bmut\\b",
           "name": "storage.modifier.mut.rust"
         },
         {
-          "comment": "logical operators",
-          "match": "(\\^|\\||\\|\\||&&|<<|>>|!)(?!=)",
+          "match": "([\\^|]|\\|\\||&&|<<|>>|!)(?!=)",
           "name": "keyword.operator.logical.rust"
         },
         {
-          "comment": "logical AND, borrow references",
-          "match": "&(?![&=])",
+          "match": "&(?![\\&=])",
           "name": "keyword.operator.borrow.and.rust"
         },
         {
-          "comment": "assignment operators",
           "match": "(\\+=|-=|\\*=|/=|%=|\\^=|&=|\\|=|<<=|>>=)",
           "name": "keyword.operator.assignment.rust"
         },
         {
-          "comment": "single equal",
-          "match": "(?<![<>])=(?!=|>)",
+          "match": "(?<![<>])=(?![=>])",
           "name": "keyword.operator.assignment.equal.rust"
         },
         {
-          "comment": "comparison operators",
           "match": "(=(=)?(?!>)|!=|<=|(?<!=)>=)",
           "name": "keyword.operator.comparison.rust"
         },
         {
-          "comment": "math operators",
           "match": "(([+%]|(\\*(?!\\w)))(?!=))|(-(?!>))|(/(?!/))",
           "name": "keyword.operator.math.rust"
         },
@@ -804,11 +758,9 @@
               "name": "punctuation.brackets.curly.rust"
             }
           },
-          "comment": "less than, greater than (special case)",
-          "match": "(?:\\b|(?:(\\))|(\\])|(\\})))[ \\t]+([<>])[ \\t]+(?:\\b|(?:(\\()|(\\[)|(\\{)))"
+          "match": "(?:\\b|(?:(\\))|(])|(})))[ \\t]+([<>])[ \\t]+(?:\\b|(?:(\\()|(\\[)|(\\{)))"
         },
         {
-          "comment": "namespace operator",
           "match": "::",
           "name": "keyword.operator.namespace.rust"
         },
@@ -818,46 +770,37 @@
               "name": "keyword.operator.dereference.rust"
             }
           },
-          "comment": "dereference asterisk",
           "match": "(\\*)(?=\\w+)"
         },
         {
-          "comment": "subpattern binding",
           "match": "@",
           "name": "keyword.operator.subpattern.rust"
         },
         {
-          "comment": "dot access",
           "match": "\\.(?!\\.)",
           "name": "keyword.operator.access.dot.rust"
         },
         {
-          "comment": "ranges, range patterns",
-          "match": "\\.{2}(=|\\.)?",
+          "match": "\\.{2}([=.])?",
           "name": "keyword.operator.range.rust"
         },
         {
-          "comment": "colon",
           "match": ":(?!:)",
           "name": "keyword.operator.key-value.rust"
         },
         {
-          "comment": "dashrocket, skinny arrow",
           "match": "->|<-",
           "name": "keyword.operator.arrow.skinny.rust"
         },
         {
-          "comment": "hashrocket, fat arrow",
           "match": "=>",
           "name": "keyword.operator.arrow.fat.rust"
         },
         {
-          "comment": "dollar macros",
           "match": "\\$",
           "name": "keyword.operator.macro.dollar.rust"
         },
         {
-          "comment": "question mark operator, questionably sized, macro kleene matcher",
           "match": "\\?",
           "name": "keyword.operator.question.rust"
         }
@@ -874,8 +817,7 @@
               "name": "entity.name.type.lifetime.rust"
             }
           },
-          "comment": "named lifetime parameters",
-          "match": "(['])([a-zA-Z_][0-9a-zA-Z_]*)(?!['])\\b"
+          "match": "(')([a-zA-Z_][0-9a-zA-Z_]*)(?!')\\b"
         },
         {
           "captures": {
@@ -889,20 +831,17 @@
               "name": "entity.name.type.lifetime.rust"
             }
           },
-          "comment": "borrowing references to named lifetimes",
-          "match": "(\\&)(['])([a-zA-Z_][0-9a-zA-Z_]*)(?!['])\\b"
+          "match": "(&)(')([a-zA-Z_][0-9a-zA-Z_]*)(?!')\\b"
         }
       ]
     },
     "lvariables": {
       "patterns": [
         {
-          "comment": "self",
           "match": "\\b[Ss]elf\\b",
           "name": "variable.language.self.rust"
         },
         {
-          "comment": "super",
           "match": "\\bsuper\\b",
           "name": "variable.language.super.rust"
         }
@@ -919,7 +858,6 @@
               "name": "entity.name.type.macro.rust"
             }
           },
-          "comment": "macros",
           "match": "(([a-z_][A-Za-z0-9_]*!)|([A-Z_][A-Za-z0-9_]*!))",
           "name": "meta.macro.rust"
         }
@@ -936,40 +874,33 @@
               "name": "keyword.operator.namespace.rust"
             }
           },
-          "comment": "namespace (non-type, non-function path segment)",
-          "match": "(?<![A-Za-z0-9_])([A-Za-z0-9_]+)((?<!super|self)::)"
+          "match": "(?<![A-Za-z0-9_])([A-Za-z0-9_]+)((?<!s(?:uper|elf))::)"
         }
       ]
     },
     "punctuation": {
       "patterns": [
         {
-          "comment": "comma",
           "match": ",",
           "name": "punctuation.comma.rust"
         },
         {
-          "comment": "curly braces",
           "match": "[{}]",
           "name": "punctuation.brackets.curly.rust"
         },
         {
-          "comment": "parentheses, round brackets",
           "match": "[()]",
           "name": "punctuation.brackets.round.rust"
         },
         {
-          "comment": "semicolon",
           "match": ";",
           "name": "punctuation.semi.rust"
         },
         {
-          "comment": "square brackets",
           "match": "[\\[\\]]",
           "name": "punctuation.brackets.square.rust"
         },
         {
-          "comment": "angle brackets",
           "match": "(?<!=)[<>]",
           "name": "punctuation.brackets.angle.rust"
         }
@@ -987,7 +918,6 @@
               "name": "punctuation.definition.string.rust"
             }
           },
-          "comment": "double-quoted strings and byte strings",
           "end": "\"",
           "endCaptures": {
             "0": {
@@ -1017,7 +947,6 @@
               "name": "punctuation.definition.string.rust"
             }
           },
-          "comment": "double-quoted raw strings and raw byte strings",
           "end": "(\")(\\2)",
           "endCaptures": {
             "1": {
@@ -1039,7 +968,6 @@
               "name": "punctuation.definition.char.rust"
             }
           },
-          "comment": "characters and bytes",
           "end": "'",
           "endCaptures": {
             "0": {
@@ -1063,7 +991,6 @@
               "name": "entity.name.type.numeric.rust"
             }
           },
-          "comment": "numeric types",
           "match": "(?<![A-Za-z])(f32|f64|i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)\\b"
         },
         {
@@ -1076,7 +1003,6 @@
               "name": "punctuation.brackets.angle.rust"
             }
           },
-          "comment": "parameterized types",
           "end": ">",
           "endCaptures": {
             "0": {
@@ -1111,7 +1037,6 @@
           ]
         },
         {
-          "comment": "primitive types",
           "match": "\\b(bool|char|str)\\b",
           "name": "entity.name.type.primitive.rust"
         },
@@ -1124,7 +1049,6 @@
               "name": "entity.name.type.trait.rust"
             }
           },
-          "comment": "trait declarations",
           "match": "\\b(trait)\\s+(_?[A-Z][A-Za-z0-9_]*)\\b"
         },
         {
@@ -1136,7 +1060,6 @@
               "name": "entity.name.type.struct.rust"
             }
           },
-          "comment": "struct declarations",
           "match": "\\b(struct)\\s+(_?[A-Z][A-Za-z0-9_]*)\\b"
         },
         {
@@ -1148,7 +1071,6 @@
               "name": "entity.name.type.enum.rust"
             }
           },
-          "comment": "enum declarations",
           "match": "\\b(enum)\\s+(_?[A-Z][A-Za-z0-9_]*)\\b"
         },
         {
@@ -1160,11 +1082,9 @@
               "name": "entity.name.type.declaration.rust"
             }
           },
-          "comment": "type declarations",
           "match": "\\b(type)\\s+(_?[A-Z][A-Za-z0-9_]*)\\b"
         },
         {
-          "comment": "types",
           "match": "\\b_?[A-Z][A-Za-z0-9_]*\\b(?!!)",
           "name": "entity.name.type.rust"
         }
@@ -1173,7 +1093,6 @@
     "variables": {
       "patterns": [
         {
-          "comment": "variables",
           "match": "\\b(?<!(?<!\\.)\\.)(?:r#(?!(crate|[Ss]elf|super)))?[a-z0-9_]+\\b",
           "name": "variable.other.rust"
         }
diff --git a/resources/languages/sas.json b/resources/languages/sas.json
index c82e0c7..0a94341 100644
--- a/resources/languages/sas.json
+++ b/resources/languages/sas.json
@@ -32,7 +32,6 @@
           "name": "keyword.other.sas"
         }
       },
-      "comment": "Begins a DATA step and provides names for any output SAS data sets, views, or programs.",
       "end": "(;)",
       "patterns": [
         {
@@ -50,7 +49,7 @@
               "name": "keyword.other.sas"
             }
           },
-          "match": "(?i:(?:(stack|pgm|view|source)\\s?=\\s?)|(debug|nesting|nolist))"
+          "match": "(?i:(stack|pgm|view|source)\\s?=\\s?|(debug|nesting|nolist))"
         }
       ]
     },
@@ -67,7 +66,6 @@
           "name": "entity.name.class.sas"
         }
       },
-      "comment": "DATA set File-Handling Statements for DATA step",
       "end": "(;)",
       "patterns": [
         {
@@ -104,7 +102,6 @@
           "name": "support.class.sas"
         }
       },
-      "comment": "Looks like for this to work there must be a *name* as well as the patterns/include bit.",
       "end": "(?i:\\b(quit)\\s*;)",
       "endCaptures": {
         "1": {
@@ -141,7 +138,7 @@
       "name": "meta.function-call.sas"
     },
     {
-      "match": "(?i:\\b(_n_|_error_)\\b)",
+      "match": "(?i:\\b(_(?:n_|error_))\\b)",
       "name": "variable.language.sas"
     },
     {
@@ -150,7 +147,7 @@
           "name": "support.class.sas"
         }
       },
-      "match": "\\b(?i:(_all_|_character_|_cmd_|_freq_|_i_|_infile_|_last_|_msg_|_null_|_numeric_|_temporary_|_type_|abort|abs|addr|adjrsq|airy|alpha|alter|altlog|altprint|and|arcos|array|arsin|as|atan|attrc|attrib|attrn|authserver|autoexec|awscontrol|awsdef|awsmenu|awsmenumerge|awstitle|backward|band|base|betainv|between|blocksize|blshift|bnot|bor|brshift|bufno|bufsize|bxor|by|byerr|byline|byte|calculated|call|cards|cards4|case|catcache|cbufno|cdf|ceil|center|cexist|change|chisq|cinv|class|cleanup|close|cnonct|cntllev|coalesce|codegen|col|collate|collin|column|comamid|comaux1|comaux2|comdef|compbl|compound|compress|config|continue|convert|cos|cosh|cpuid|create|cross|crosstab|css|curobs|cv|daccdb|daccdbsl|daccsl|daccsyd|dacctab|dairy|datalines|datalines4|date|datejul|datepart|datetime|day|dbcslang|dbcstype|dclose|ddm|delete|delimiter|depdb|depdbsl|depsl|depsyd|deptab|dequote|descending|descript|design=|device|dflang|dhms|dif|digamma|dim|dinfo|display|distinct|dkricond|dkrocond|dlm|dnum|do|dopen|doptname|doptnum|dread|drop|dropnote|dsname|dsnferr|echo|else|emaildlg|emailid|emailpw|emailserver|emailsys|encrypt|end|endsas|engine|eof|eov|erf|erfc|error|errorcheck|errors|exist|exp|fappend|fclose|fcol|fdelete|feedback|fetch|fetchobs|fexist|fget|file|fileclose|fileexist|filefmt|filename|fileref|filevar|finfo|finv|fipname|fipnamel|fipstate|first|firstobs|floor|fmterr|fmtsearch|fnonct|fnote|font|fontalias|footnote[1-9]?|fopen|foptname|foptnum|force|formatted|formchar|formdelim|formdlim|forward|fpoint|fpos|fput|fread|frewind|frlen|from|fsep|full|fullstimer|fuzz|fwrite|gaminv|gamma|getoption|getvarc|getvarn|go|goto|group|gwindow|hbar|hbound|helpenv|helploc|hms|honorappearance|hosthelp|hostprint|hour|hpct|html|hvar|ibessel|ibr|id|if|index|indexc|indexw|infile|informat|initcmd|initstmt|inner|input|inputc|inputn|inr|insert|int|intck|intnx|into|intrr|invaliddata|irr|is|jbessel|join|juldate|keep|kentb|kurtosis|label|lag|last|lbound|leave|left|length|levels|lgamma|lib|libname|library|libref|line|linesize|link|list|log|log10|log2|logpdf|logpmf|logsdf|lostcard|lowcase|lrecl|ls|macro|macrogen|maps|mautosource|max|maxdec|maxr|mdy|mean|measures|median|memtype|merge|merror|min|minute|missing|missover|mlogic|mod|mode|model|modify|month|mopen|mort|mprint|mrecall|msglevel|msymtabmax|mvarsize|myy|n|nest|netpv|new|news|nmiss|no|nobatch|nobs|nocaps|nocardimage|nocenter|nocharcode|nocmdmac|nocol|nocum|nodate|nodbcs|nodetails|nodmr|nodms|nodmsbatch|nodup|nodupkey|noduplicates|noechoauto|noequals|noerrorabend|noexitwindows|nofullstimer|noicon|noimplmac|noint|nolist|noloadlist|nomiss|nomlogic|nomprint|nomrecall|nomsgcase|nomstored|nomultenvappl|nonotes|nonumber|noobs|noovp|nopad|nopercent|noprint|noprintinit|normal|norow|norsasuser|nosetinit|nosource|nosource2|nosplash|nosymbolgen|note|notes|notitle|notitles|notsorted|noverbose|noxsync|noxwait|npv|null|number|numkeys|nummousekeys|nway|obs|ods|on|open|option|order|ordinal|otherwise|out|outer|outp=|output|over|ovp|p(1|5|10|25|50|75|90|95|99)|pad|pad2|page|pageno|pagesize|paired|parm|parmcards|path|pathdll|pathname|pdf|peek|peekc|pfkey|pmf|point|poisson|poke|position|printer|probbeta|probbnml|probchi|probf|probgam|probhypr|probit|probnegb|probnorm|probsig|probt|procleave|project|prt|propcase|prxmatch|prxparse|prxchange|prxposn|ps|put|putc|putn|pw|pwreq|qtr|quote|r|ranbin|rancau|ranexp|rangam|range|ranks|rannor|ranpoi|rantbl|rantri|ranuni|read|recfm|register|regr|remote|remove|rename|repeat|replace|resolve|retain|return|reuse|reverse|rewind|right|round|rsquare|rtf|rtrace|rtraceloc|s|s2|samploc|sasautos|sascontrol|sasfrscr|sashelp|sasmsg|sasmstore|sasscript|sasuser|saving|scan|sdf|second|select|selection|separated|seq|serror|set|setcomm|setot|sign|simple|sin|sinh|siteinfo|skewness|skip|sle|sls|sortedby|sortpgm|sortseq|sortsize|soundex|source2|spedis|splashlocation|split|spool|sqrt|start|std|stderr|stdin|stfips|stimer|stname|stnamel|stop|stopover|strip|subgroup|subpopn|substr|sum|sumwgt|symbol|symbolgen|symget|symput|sysget|sysin|sysleave|sysmsg|sysparm|sysprint|sysprintfont|sysprod|sysrc|system|t|table|tables|tan|tanh|tapeclose|tbufsize|terminal|test|then|time|timepart|tinv|title[1-9]?|tnonct|to|today|tol|tooldef|totper|transformout|translate|trantab|tranwrd|trigamma|trim|trimn|trunc|truncover|type|unformatted|uniform|union|until|upcase|update|user|usericon|uss|validate|value|var|varfmt|varinfmt|varlabel|varlen|varname|varnum|varray|varrayx|vartype|verify|vformat|vformatd|vformatdx|vformatn|vformatnx|vformatw|vformatwx|vformatx|vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|vinformatn|vinformatnx|vinformatw|vinformatwx|vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|vnamex|vnferr|vtype|vtypex|weekday|weight|when|where|while|wincharset|window|work|workinit|workterm|write|wsum|wsumx|x|xsync|xwait|year|yearcutoff|yes|yyq|zipfips|zipname|zipnamel|zipstate))\\b",
+      "match": "\\b(?i:(_all_|_character_|_cmd_|_freq_|_i_|_infile_|_last_|_msg_|_null_|_numeric_|_temporary_|_type_|abort|abs|addr|adjrsq|airy|alpha|alter|altlog|altprint|and|arcos|array|arsin|as|atan|attrc|attrib|attrn|authserver|autoexec|awscontrol|awsdef|awsmenu|awsmenumerge|awstitle|backward|band|base|betainv|between|blocksize|blshift|bnot|bor|brshift|bufno|bufsize|bxor|by|byerr|byline|byte|calculated|call|cards|cards4|case|catcache|cbufno|cdf|ceil|center|cexist|change|chisq|cinv|class|cleanup|close|cnonct|cntllev|coalesce|codegen|col|collate|collin|column|comamid|comaux1|comaux2|comdef|compbl|compound|compress|config|continue|convert|cos|cosh|cpuid|create|cross|crosstab|css|curobs|cv|daccdb|daccdbsl|daccsl|daccsyd|dacctab|dairy|datalines|datalines4|date|datejul|datepart|datetime|day|dbcslang|dbcstype|dclose|ddm|delete|delimiter|depdb|depdbsl|depsl|depsyd|deptab|dequote|descending|descript|design=|device|dflang|dhms|dif|digamma|dim|dinfo|display|distinct|dkricond|dkrocond|dlm|dnum|do|dopen|doptname|doptnum|dread|drop|dropnote|dsname|dsnferr|echo|else|emaildlg|emailid|emailpw|emailserver|emailsys|encrypt|end|endsas|engine|eof|eov|erf|erfc|error|errorcheck|errors|exist|exp|fappend|fclose|fcol|fdelete|feedback|fetch|fetchobs|fexist|fget|file|fileclose|fileexist|filefmt|filename|fileref|filevar|finfo|finv|fipname|fipnamel|fipstate|first|firstobs|floor|fmterr|fmtsearch|fnonct|fnote|font|fontalias|footnote[1-9]?|fopen|foptname|foptnum|force|formatted|formchar|formdelim|formdlim|forward|fpoint|fpos|fput|fread|frewind|frlen|from|fsep|full|fullstimer|fuzz|fwrite|gaminv|gamma|getoption|getvarc|getvarn|go|goto|group|gwindow|hbar|hbound|helpenv|helploc|hms|honorappearance|hosthelp|hostprint|hour|hpct|html|hvar|ibessel|ibr|id|if|index|indexc|indexw|infile|informat|initcmd|initstmt|inner|input|inputc|inputn|inr|insert|int|intck|intnx|into|intrr|invaliddata|irr|is|jbessel|join|juldate|keep|kentb|kurtosis|label|lag|last|lbound|leave|left|length|levels|lgamma|lib|libname|library|libref|line|linesize|link|list|log|log10|log2|logpdf|logpmf|logsdf|lostcard|lowcase|lrecl|ls|macro|macrogen|maps|mautosource|max|maxdec|maxr|mdy|mean|measures|median|memtype|merge|merror|min|minute|missing|missover|mlogic|mod|mode|model|modify|month|mopen|mort|mprint|mrecall|msglevel|msymtabmax|mvarsize|myy|n|nest|netpv|new|news|nmiss|no|nobatch|nobs|nocaps|nocardimage|nocenter|nocharcode|nocmdmac|nocol|nocum|nodate|nodbcs|nodetails|nodmr|nodms|nodmsbatch|nodup|nodupkey|noduplicates|noechoauto|noequals|noerrorabend|noexitwindows|nofullstimer|noicon|noimplmac|noint|nolist|noloadlist|nomiss|nomlogic|nomprint|nomrecall|nomsgcase|nomstored|nomultenvappl|nonotes|nonumber|noobs|noovp|nopad|nopercent|noprint|noprintinit|normal|norow|norsasuser|nosetinit|nosource|nosource2|nosplash|nosymbolgen|note|notes|notitle|notitles|notsorted|noverbose|noxsync|noxwait|npv|null|number|numkeys|nummousekeys|nway|obs|ods|on|open|option|order|ordinal|otherwise|out|outer|outp=|output|over|ovp|p([15]|10|25|50|75|90|95|99)|pad|pad2|page|pageno|pagesize|paired|parm|parmcards|path|pathdll|pathname|pdf|peek|peekc|pfkey|pmf|point|poisson|poke|position|printer|probbeta|probbnml|probchi|probf|probgam|probhypr|probit|probnegb|probnorm|probsig|probt|procleave|project|prt|propcase|prxmatch|prxparse|prxchange|prxposn|ps|put|putc|putn|pw|pwreq|qtr|quote|r|ranbin|rancau|ranexp|rangam|range|ranks|rannor|ranpoi|rantbl|rantri|ranuni|read|recfm|register|regr|remote|remove|rename|repeat|replace|resolve|retain|return|reuse|reverse|rewind|right|round|rsquare|rtf|rtrace|rtraceloc|s|s2|samploc|sasautos|sascontrol|sasfrscr|sashelp|sasmsg|sasmstore|sasscript|sasuser|saving|scan|sdf|second|select|selection|separated|seq|serror|set|setcomm|setot|sign|simple|sin|sinh|siteinfo|skewness|skip|sle|sls|sortedby|sortpgm|sortseq|sortsize|soundex|source2|spedis|splashlocation|split|spool|sqrt|start|std|stderr|stdin|stfips|stimer|stname|stnamel|stop|stopover|strip|subgroup|subpopn|substr|sum|sumwgt|symbol|symbolgen|symget|symput|sysget|sysin|sysleave|sysmsg|sysparm|sysprint|sysprintfont|sysprod|sysrc|system|t|table|tables|tan|tanh|tapeclose|tbufsize|terminal|test|then|time|timepart|tinv|title[1-9]?|tnonct|to|today|tol|tooldef|totper|transformout|translate|trantab|tranwrd|trigamma|trim|trimn|trunc|truncover|type|unformatted|uniform|union|until|upcase|update|user|usericon|uss|validate|value|var|varfmt|varinfmt|varlabel|varlen|varname|varnum|varray|varrayx|vartype|verify|vformat|vformatd|vformatdx|vformatn|vformatnx|vformatw|vformatwx|vformatx|vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|vinformatn|vinformatnx|vinformatw|vinformatwx|vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|vnamex|vnferr|vtype|vtypex|weekday|weight|when|where|while|wincharset|window|work|workinit|workterm|write|wsum|wsumx|x|xsync|xwait|year|yearcutoff|yes|yyq|zipfips|zipname|zipnamel|zipstate))\\b",
       "name": "support.function.sas"
     }
   ],
@@ -158,8 +155,8 @@
     "blockComment": {
       "patterns": [
         {
-          "begin": "\\/\\*",
-          "end": "\\*\\/",
+          "begin": "/\\*",
+          "end": "\\*/",
           "name": "comment.block.slashstar.sas"
         }
       ]
@@ -167,17 +164,14 @@
     "constant": {
       "patterns": [
         {
-          "comment": "numeric constant",
-          "match": "(?<![&\\}])\\b[0-9]*\\.?[0-9]+([eEdD][-+]?[0-9]+)?\\b",
+          "match": "(?<![\\&}])\\b[0-9]*\\.?[0-9]+([eEdD][-+]?[0-9]+)?\\b",
           "name": "constant.numeric.sas"
         },
         {
-          "comment": "single quote numeric-type constant",
           "match": "(')([^']+)(')(dt|[dt])",
           "name": "constant.numeric.quote.single.sas"
         },
         {
-          "comment": "double quote numeric-type constant",
           "match": "(\")([^\"]+)(\")(dt|[dt])",
           "name": "constant.numeric.quote.double.sas"
         }
@@ -195,7 +189,6 @@
               "name": "entity.name.class.dsname.sas"
             }
           },
-          "comment": "data set with options",
           "end": "\\)",
           "patterns": [
             {
@@ -227,7 +220,6 @@
               "name": "entity.name.class.dsname.sas"
             }
           },
-          "comment": "data set without options",
           "match": "\\b((\\w+)\\.)?(\\w+)\\b"
         }
       ]
@@ -235,7 +227,7 @@
     "dataSetOptions": {
       "patterns": [
         {
-          "match": "(?<=\\s|\\(|\\))(?i:ALTER|BUFNO|BUFSIZE|CNTLLEV|COMPRESS|DLDMGACTION|ENCRYPT|ENCRYPTKEY|EXTENDOBSCOUNTER|GENMAX|GENNUM|INDEX|LABEL|OBSBUF|OUTREP|PW|PWREQ|READ|REPEMPTY|REPLACE|REUSE|ROLE|SORTEDBY|SPILL|TOBSNO|TYPE|WRITE|FILECLOSE|FIRSTOBS|IN|OBS|POINTOBS|WHERE|WHEREUP|IDXNAME|IDXWHERE|DROP|KEEP|RENAME)\\s?=",
+          "match": "(?<=[\\s()])(?i:ALTER|BUFNO|BUFSIZE|CNTLLEV|COMPRESS|DLDMGACTION|ENCRYPT|ENCRYPTKEY|EXTENDOBSCOUNTER|GENMAX|GENNUM|INDEX|LABEL|OBSBUF|OUTREP|PW|PWREQ|READ|REPEMPTY|REPLACE|REUSE|ROLE|SORTEDBY|SPILL|TOBSNO|TYPE|WRITE|FILECLOSE|FIRSTOBS|IN|OBS|POINTOBS|WHERE|WHEREUP|IDXNAME|IDXWHERE|DROP|KEEP|RENAME)\\s?=",
           "name": "keyword.other.sas"
         }
       ]
@@ -251,7 +243,7 @@
     "operator": {
       "patterns": [
         {
-          "match": "([\\+\\-\\*\\^\\/])",
+          "match": "([+\\-*^/])",
           "name": "keyword.operator.arithmetic.sas"
         },
         {
@@ -259,7 +251,7 @@
           "name": "keyword.operator.comparison.sas"
         },
         {
-          "match": "([¬<>^~]?=(:)?|>|<|\\||!|¦|¬|^|~|<>|><|\\|\\|)",
+          "match": "([¬<>^~]?=(:)?|[><|!¦¬]|^|~|<>|><|\\|\\|)",
           "name": "keyword.operator.sas"
         }
       ]
@@ -268,13 +260,11 @@
       "patterns": [
         {
           "begin": "(?<!%)(')",
-          "comment": "single quoted string block",
           "end": "(')([bx])?",
           "name": "string.quoted.single.sas"
         },
         {
           "begin": "(\")",
-          "comment": "double quoted string block",
           "end": "(\")([bx])?",
           "name": "string.quoted.double.sas"
         }
diff --git a/resources/languages/sass.json b/resources/languages/sass.json
index 720217d..29d3c58 100644
--- a/resources/languages/sass.json
+++ b/resources/languages/sass.json
@@ -70,7 +70,7 @@
           "name": "variable.other.name"
         }
       },
-      "end": "$\\n?|(?=\\)\\s\\)|\\)\\n)",
+      "end": "$\\n?|(?=\\)(?:\\s\\)|\\n))",
       "name": "sass.script.maps",
       "patterns": [
         {
@@ -151,13 +151,13 @@
       "include": "#dotdotdot"
     },
     {
-      "begin": "@include|\\+(?!\\W|\\d)",
+      "begin": "@include|\\+(?![\\W\\d])",
       "captures": {
         "0": {
           "name": "keyword.control.at-rule.css.sass"
         }
       },
-      "end": "(?=\\n|\\()",
+      "end": "(?=[\\n(])",
       "name": "support.function.name.sass.library"
     },
     {
@@ -234,12 +234,12 @@
     },
     {
       "begin": "@",
-      "end": "$\\n?|\\s(?!(all|braille|embossed|handheld|print|projection|screen|speech|tty|tv|if|only|not)(\\s|,))",
+      "end": "$\\n?|\\s(?!(all|braille|embossed|handheld|print|projection|screen|speech|tty|tv|if|only|not)([\\s,]))",
       "name": "keyword.control.at-rule.css.sass"
     },
     {
-      "begin": "(?<!\\-|\\()\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|u|slot)\\b(?!-|\\)|:\\s)|&",
-      "end": "$\\n?|(?=\\s|,|\\(|\\)|\\.|\\#|\\[|>|-|_)",
+      "begin": "(?<![-(])\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|u|slot)\\b(?![-)]|:\\s)|&",
+      "end": "$\\n?|(?=[\\s,().#\\[>\\-_])",
       "name": "entity.name.tag.css.sass.symbol",
       "patterns": [
         {
@@ -252,7 +252,7 @@
     },
     {
       "begin": "#",
-      "end": "$\\n?|(?=\\s|,|\\(|\\)|\\.|\\[|>)",
+      "end": "$\\n?|(?=[\\s,().\\[>])",
       "name": "entity.other.attribute-name.id.css.sass",
       "patterns": [
         {
@@ -264,8 +264,8 @@
       ]
     },
     {
-      "begin": "\\.|(?<=&)(-|_)",
-      "end": "$\\n?|(?=\\s|,|\\(|\\)|\\[|>)",
+      "begin": "\\.|(?<=&)([-_])",
+      "end": "$\\n?|(?=[\\s,()\\[>])",
       "name": "entity.other.attribute-name.class.css.sass",
       "patterns": [
         {
@@ -278,7 +278,7 @@
     },
     {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "name": "entity.other.attribute-selector.sass",
       "patterns": [
         {
@@ -288,13 +288,13 @@
           "include": "#single-quoted"
         },
         {
-          "match": "\\^|\\$|\\*|~",
+          "match": "[\\^$*~]",
           "name": "keyword.other.regex.sass"
         }
       ]
     },
     {
-      "match": "^((?<=\\]|\\)|not\\(|\\*|>|>\\s)|\n*):[a-z:-]+|(::|:-)[a-z:-]+",
+      "match": "^((?<=[\\])]|not\\(|[*>]|>\\s)|\\n*):[a-z:-]+|(:[:-])[a-z:-]+",
       "name": "entity.other.attribute-name.pseudo-class.css.sass"
     },
     {
@@ -395,8 +395,8 @@
       "include": "#function-content"
     },
     {
-      "begin": "(?<=})(?!\\n|\\(|\\)|[a-zA-Z0-9_-]+:)",
-      "end": "\\s|(?=,|\\.|\\[|\\)|\\n)",
+      "begin": "(?<=})(?![\\n()]|[a-zA-Z0-9_-]+:)",
+      "end": "\\s|(?=[,.\\[)\\n])",
       "name": "entity.name.tag.css.sass",
       "patterns": [
         {
@@ -411,7 +411,7 @@
       "include": "#operator"
     },
     {
-      "match": "[a-z-]+((?=:|#{))",
+      "match": "[a-z-]+((?=:|#\\{))",
       "name": "support.type.property-name.css.sass.prop.name"
     },
     {
@@ -431,16 +431,16 @@
       "name": "comment.punctuation.comma.sass"
     },
     "comment-param": {
-      "match": "\\@(\\w+)",
+      "match": "@(\\w+)",
       "name": "storage.type.class.jsdoc"
     },
     "comment-tag": {
-      "begin": "(?<={{)",
+      "begin": "(?<=\\{\\{)",
       "end": "(?=}})",
       "name": "comment.tag.sass"
     },
     "curly-brackets": {
-      "match": "{|}",
+      "match": "[{}]",
       "name": "invalid"
     },
     "dotdotdot": {
@@ -472,7 +472,7 @@
       "name": "keyword.other.important.css.sass"
     },
     "function": {
-      "match": "(?<=[\\s|\\(|,|:])(?!url|format|attr)[a-zA-Z0-9_-][\\w-]*(?=\\()",
+      "match": "(?<=[\\s|(,:])(?!url|format|attr)[a-zA-Z0-9_-][\\w-]*(?=\\()",
       "name": "support.function.name.sass"
     },
     "function-content": {
@@ -485,7 +485,7 @@
       "name": "constant.character.css.sass"
     },
     "interpolation": {
-      "begin": "#{",
+      "begin": "#\\{",
       "end": "}",
       "name": "support.function.interpolation.sass",
       "patterns": [
@@ -525,11 +525,11 @@
       "name": "constant.character.module"
     },
     "numeric": {
-      "match": "(-|\\.)?[0-9]+(\\.[0-9]+)?",
+      "match": "([-.])?[0-9]+(\\.[0-9]+)?",
       "name": "constant.numeric.css.sass"
     },
     "operator": {
-      "match": "\\+|\\s-\\s|\\s-(?=\\$)|(?<=\\()-(?=\\$)|\\s-(?=\\()|\\*|/|%|=|!|<|>|~",
+      "match": "\\+|\\s-\\s|\\s-(?=\\$)|(?<=\\()-(?=\\$)|\\s-(?=\\()|[*/%=!<>~]",
       "name": "keyword.operator.sass"
     },
     "parent-selector": {
@@ -558,7 +558,7 @@
       "name": "entity.other.attribute-name.pseudo-class.css.sass"
     },
     "quoted-interpolation": {
-      "begin": "#{",
+      "begin": "#\\{",
       "end": "}",
       "name": "support.function.interpolation.sass",
       "patterns": [
@@ -584,7 +584,7 @@
       "name": "support.type.property-name.css.sass"
     },
     "rgb-value": {
-      "match": "(#)([0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})\\b",
+      "match": "(#)(\\h{3,4}|\\h{6}|\\h{8})\\b",
       "name": "constant.language.color.rgb-value.css.sass"
     },
     "semicolon": {
@@ -602,7 +602,7 @@
       ]
     },
     "unit": {
-      "match": "(?<=[\\d]|})(ch|cm|deg|dpcm|dpi|dppx|em|ex|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vw|fr|%)",
+      "match": "(?<=[\\d}])(ch|cm|deg|dpcm|dpi|dppx|em|ex|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vw|fr|%)",
       "name": "keyword.control.unit.css.sass"
     },
     "variable": {
diff --git a/resources/languages/scala.json b/resources/languages/scala.json
index d539c9c..ca5e3be 100644
--- a/resources/languages/scala.json
+++ b/resources/languages/scala.json
@@ -5,7 +5,7 @@
   ],
   "firstLineMatch": "^#!/.*\\b\\w*scala\\b",
   "foldingStartMarker": "/\\*\\*|\\{\\s*$",
-  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
+  "foldingStopMarker": "\\*\\*/|^\\s*}",
   "name": "scala",
   "patterns": [
     {
@@ -62,7 +62,7 @@
                   "name": "entity.name.class"
                 }
               },
-              "match": "(@(?:tparam|throws))\\s+(\\S+)"
+              "match": "(@t(?:param|hrows))\\s+(\\S+)"
             },
             {
               "match": "@(return|see|note|example|constructor|usecase|author|version|since|todo|deprecated|migration|define|inheritdoc|groupname|groupprio|groupdesc|group|contentDiagram|documentable|syntax)\\b",
@@ -80,7 +80,7 @@
                   "name": "punctuation.definition.documentation.link.scala"
                 }
               },
-              "match": "(\\[\\[)([^\\]]+)(\\]\\])"
+              "match": "(\\[\\[)([^\\]]+)(]])"
             },
             {
               "include": "#block-comments"
@@ -134,7 +134,7 @@
           "name": "string.quoted.other constant.character.literal.scala",
           "patterns": [
             {
-              "match": "\\\\(?:[btnfr\\\\\"']|[0-7]{1,3}|u[0-9A-Fa-f]{4})",
+              "match": "\\\\(?:[btnfr\\\\\"']|[0-7]{1,3}|u\\h{4})",
               "name": "constant.character.escape.scala"
             },
             {
@@ -276,15 +276,15 @@
           "name": "constant.language.scala"
         },
         {
-          "match": "\\b(0[xX][0-9a-fA-F_]*)\\b",
+          "match": "\\b(0[xX][_\\h]*)\\b",
           "name": "constant.numeric.scala"
         },
         {
-          "match": "\\b(([0-9][0-9_]*(\\.[0-9][0-9_]*)?)([eE](\\+|-)?[0-9][0-9_]*)?|[0-9][0-9_]*)[LlFfDd]?\\b",
+          "match": "\\b(([0-9][0-9_]*(\\.[0-9][0-9_]*)?)([eE]([+-])?[0-9][0-9_]*)?|[0-9][0-9_]*)[LlFfDd]?\\b",
           "name": "constant.numeric.scala"
         },
         {
-          "match": "(\\.[0-9][0-9_]*)([eE](\\+|-)?[0-9][0-9_]*)?[LlFfDd]?\\b",
+          "match": "(\\.[0-9][0-9_]*)([eE]([+-])?[0-9][0-9_]*)?[LlFfDd]?\\b",
           "name": "constant.numeric.scala"
         },
         {
@@ -304,7 +304,7 @@
           "name": "punctuation.section.block.begin.scala"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.block.end.scala"
@@ -327,7 +327,7 @@
               "name": "entity.name.function.declaration"
             }
           },
-          "match": "\\b(def)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "\\b(def)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "captures": {
@@ -338,7 +338,7 @@
               "name": "entity.name.class.declaration"
             }
           },
-          "match": "\\b(trait)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "\\b(trait)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "captures": {
@@ -352,7 +352,7 @@
               "name": "entity.name.class.declaration"
             }
           },
-          "match": "\\b(?:(case)\\s+)?(class|object|enum)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "\\b(?:(case)\\s+)?(class|object|enum)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "captures": {
@@ -363,7 +363,7 @@
               "name": "entity.name.type.declaration"
             }
           },
-          "match": "(?<!\\.)\\b(type)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "(?<!\\.)\\b(type)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "captures": {
@@ -374,7 +374,7 @@
               "name": "keyword.declaration.volatile.scala"
             }
           },
-          "match": "\\b(?:(val)|(var))\\b\\s*(?!//|/\\*)(?=(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)?\\()"
+          "match": "\\b(?:(val)|(var))\\b\\s*(?!/[/*])(?=(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)?\\()"
         },
         {
           "captures": {
@@ -385,7 +385,7 @@
               "name": "variable.stable.declaration.scala"
             }
           },
-          "match": "\\b(val)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")"
+          "match": "\\b(val)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")"
         },
         {
           "captures": {
@@ -396,7 +396,7 @@
               "name": "variable.volatile.declaration.scala"
             }
           },
-          "match": "\\b(var)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")"
+          "match": "\\b(var)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")"
         },
         {
           "captures": {
@@ -410,7 +410,7 @@
               "name": "entity.name.class.declaration"
             }
           },
-          "match": "\\b(package)\\s+(object)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "\\b(package)\\s+(object)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "begin": "\\b(package)\\s+",
@@ -426,7 +426,7 @@
               "include": "#comments"
             },
             {
-              "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))",
+              "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))",
               "name": "entity.name.package.scala"
             },
             {
@@ -444,7 +444,7 @@
               "name": "entity.name.given.declaration"
             }
           },
-          "match": "\\b(given)\\b\\s*([_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|`[^`]+`)?"
+          "match": "\\b(given)\\b\\s*([_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|`[^`]+`)?"
         }
       ]
     },
@@ -475,11 +475,11 @@
           "name": "keyword.other.export.given.scala"
         },
         {
-          "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?",
+          "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?",
           "name": "entity.name.class.export.scala"
         },
         {
-          "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))",
+          "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))",
           "name": "entity.name.export.scala"
         },
         {
@@ -487,7 +487,7 @@
           "name": "punctuation.definition.export"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "meta.bracket.scala"
@@ -522,7 +522,7 @@
                   "name": "entity.name.export.renamed-to.scala"
                 }
               },
-              "match": "(given\\s)?\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*(=>)\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*"
+              "match": "(given\\s)?\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*(=>)\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*"
             },
             {
               "match": "\\b(given)\\b",
@@ -540,7 +540,7 @@
                   "name": "entity.name.export.scala"
                 }
               },
-              "match": "(given\\s+)?(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))"
+              "match": "(given\\s+)?(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))"
             }
           ]
         }
@@ -554,7 +554,7 @@
               "name": "keyword.declaration.scala"
             }
           },
-          "match": "^\\s*(extension)\\s+(?=[\\[\\(])"
+          "match": "^\\s*(extension)\\s+(?=[\\[(])"
         }
       ]
     },
@@ -580,11 +580,11 @@
           "name": "keyword.other.import.as.scala"
         },
         {
-          "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?",
+          "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?",
           "name": "entity.name.class.import.scala"
         },
         {
-          "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))",
+          "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))",
           "name": "entity.name.import.scala"
         },
         {
@@ -592,7 +592,7 @@
           "name": "punctuation.definition.import"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "meta.bracket.scala"
@@ -627,7 +627,7 @@
                   "name": "entity.name.import.renamed-to.scala"
                 }
               },
-              "match": "(given\\s)?\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*(=>)\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*"
+              "match": "(given\\s)?\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*(=>)\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*"
             },
             {
               "match": "\\b(given)\\b",
@@ -645,7 +645,7 @@
                   "name": "entity.name.import.scala"
                 }
               },
-              "match": "(given\\s+)?(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))"
+              "match": "(given\\s+)?(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))"
             }
           ]
         }
@@ -662,7 +662,7 @@
               "name": "entity.name.class"
             }
           },
-          "match": "\\b(extends|with|derives)\\b\\s*([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|`[^`]+`|(?=\\([^\\)]+=>)|(?=(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))|(?=\"))?"
+          "match": "\\b(extends|with|derives)\\b\\s*([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|`[^`]+`|(?=\\([^)]+=>)|(?=(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))|(?=\"))?"
         }
       ]
     },
@@ -677,7 +677,7 @@
     "inline": {
       "patterns": [
         {
-          "match": "\\b(inline)(?=\\s+((?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)\\s*:)",
+          "match": "\\b(inline)(?=\\s+((?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)\\s*:)",
           "name": "storage.modifier.other"
         },
         {
@@ -701,15 +701,15 @@
           "name": "keyword.control.flow.scala"
         },
         {
-          "match": "^\\s*(end)\\s+(if|while|for|match)(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)",
+          "match": "^\\s*(end)\\s+(if|while|for|match)(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)",
           "name": "keyword.control.flow.end.scala"
         },
         {
-          "match": "^\\s*(end)\\s+(val)(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)",
+          "match": "^\\s*(end)\\s+(val)(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)",
           "name": "keyword.declaration.stable.end.scala"
         },
         {
-          "match": "^\\s*(end)\\s+(var)(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)",
+          "match": "^\\s*(end)\\s+(var)(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)",
           "name": "keyword.declaration.volatile.end.scala"
         },
         {
@@ -724,14 +724,14 @@
               "name": "entity.name.type.declaration"
             }
           },
-          "match": "^\\s*(end)\\s+(?:(new|extension)|([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?))(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)"
+          "match": "^\\s*(end)\\s+(?:(new|extension)|([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?))(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)"
         },
         {
           "match": "\\b(catch|finally|try)\\b",
           "name": "keyword.control.exception.scala"
         },
         {
-          "match": "^\\s*(end)\\s+(try)(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)",
+          "match": "^\\s*(end)\\s+(try)(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)",
           "name": "keyword.control.exception.end.scala"
         },
         {
@@ -743,10 +743,10 @@
               "name": "entity.name.declaration"
             }
           },
-          "match": "^\\s*(end)\\s+(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))?(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)"
+          "match": "^\\s*(end)\\s+(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))?(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)"
         },
         {
-          "match": "([!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]|[\\\\]){3,}",
+          "match": "([!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}\\\\]){3,}",
           "name": "keyword.operator.scala"
         },
         {
@@ -758,7 +758,7 @@
                   "name": "keyword.operator.logical.scala"
                 },
                 {
-                  "match": "(\\!=|==|\\<=|>=)",
+                  "match": "(!=|==|<=|>=)",
                   "name": "keyword.operator.comparison.scala"
                 },
                 {
@@ -768,22 +768,22 @@
               ]
             }
           },
-          "match": "((?:[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]|[\\\\]){2,}|_\\*)"
+          "match": "([!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}\\\\]{2,}|_\\*)"
         },
         {
           "captures": {
             "1": {
               "patterns": [
                 {
-                  "match": "(\\!)",
+                  "match": "(!)",
                   "name": "keyword.operator.logical.scala"
                 },
                 {
-                  "match": "(\\*|-|\\+|/|%|~)",
+                  "match": "([*\\-+/%~])",
                   "name": "keyword.operator.arithmetic.scala"
                 },
                 {
-                  "match": "(=|\\<|>)",
+                  "match": "([=<>])",
                   "name": "keyword.operator.comparison.scala"
                 },
                 {
@@ -793,36 +793,31 @@
               ]
             }
           },
-          "match": "(?<!_)([!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]|\\\\)"
+          "match": "(?<!_)([!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}\\\\])"
         }
       ]
     },
     "meta-bounds": {
-      "comment": "For themes: Matching view bounds",
       "match": "<%|=:=|<:<|<%<|>:|<:",
       "name": "meta.bounds.scala"
     },
     "meta-brackets": {
-      "comment": "For themes: Brackets look nice when colored.",
       "patterns": [
         {
-          "comment": "The punctuation.section.*.begin is needed for return snippet in source bundle",
           "match": "\\{",
           "name": "punctuation.section.block.begin.scala"
         },
         {
-          "comment": "The punctuation.section.*.end is needed for return snippet in source bundle",
-          "match": "\\}",
+          "match": "}",
           "name": "punctuation.section.block.end.scala"
         },
         {
-          "match": "{|}|\\(|\\)|\\[|\\]",
+          "match": "[{}()\\[\\]]",
           "name": "meta.bracket.scala"
         }
       ]
     },
     "meta-colons": {
-      "comment": "For themes: Matching type colons",
       "patterns": [
         {
           "match": "(?<!:):(?!:)",
@@ -841,7 +836,7 @@
               "name": "variable.stable.declaration.scala"
             }
           },
-          "match": "\\s+(as)\\s+([_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)\\b"
+          "match": "\\s+(as)\\s+([_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)\\b"
         }
       ]
     },
@@ -856,7 +851,7 @@
               "name": "meta.colon.scala"
             }
           },
-          "match": "(?<=[^\\._$a-zA-Z0-9])(`[^`]+`|[_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)\\s*(:)\\s+"
+          "match": "(?<=[^._$a-zA-Z0-9])(`[^`]+`|[_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)\\s*(:)\\s+"
         }
       ]
     },
@@ -866,7 +861,7 @@
           "name": "entity.name.class"
         }
       },
-      "match": "(\\b([A-Z][\\w]*)(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)"
+      "match": "(\\b([A-Z]\\w*)(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)"
     },
     "scala-quoted-or-symbol": {
       "patterns": [
@@ -879,7 +874,7 @@
               "name": "constant.other.symbol.scala"
             }
           },
-          "match": "(')((?>(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))(?!')"
+          "match": "(')((?>(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))(?!')"
         },
         {
           "match": "'(?=\\s*\\{(?!'))",
@@ -910,12 +905,12 @@
           "name": "keyword.type.scala"
         }
       },
-      "match": "\\.(type)(?![A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[0-9])"
+      "match": "\\.(type)(?![A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[0-9])"
     },
     "storage-modifiers": {
       "patterns": [
         {
-          "match": "\\b(private\\[\\S+\\]|protected\\[\\S+\\]|private|protected)\\b",
+          "match": "\\b(pr(?:ivate\\[\\S+]|otected\\[\\S+]|ivate|otected))\\b",
           "name": "storage.modifier.access"
         },
         {
@@ -940,7 +935,7 @@
               "name": "punctuation.definition.template-expression.begin.scala"
             }
           },
-          "match": "(\\$)([A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\p{Lo}\\p{Nl}\\p{Ll}0-9]*)",
+          "match": "(\\$)([A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\p{Lo}\\p{Nl}\\p{Ll}0-9]*)",
           "name": "meta.template.expression.scala"
         },
         {
@@ -951,7 +946,7 @@
             }
           },
           "contentName": "meta.embedded.line.scala",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.template-expression.end.scala"
@@ -984,7 +979,7 @@
           "name": "string.quoted.triple.scala",
           "patterns": [
             {
-              "match": "\\\\\\\\|\\\\u[0-9A-Fa-f]{4}",
+              "match": "\\\\(?:\\\\|u\\h{4})",
               "name": "constant.character.escape.scala"
             }
           ]
@@ -999,7 +994,7 @@
               "name": "string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala"
             }
           },
-          "end": "(\"\"\")(?!\")|\\$\n|(\\$[^\\$\"_{A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}])",
+          "end": "(\"\"\")(?!\")|\\$\\n|(\\$[^$\"_{A-Z\\p{Lt}\\p{Lu}a-z\\p{Lo}\\p{Nl}\\p{Ll}])",
           "endCaptures": {
             "1": {
               "name": "string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala"
@@ -1010,7 +1005,7 @@
           },
           "patterns": [
             {
-              "match": "\\$[\\$\"]",
+              "match": "\\$[$\"]",
               "name": "constant.character.escape.scala"
             },
             {
@@ -1023,7 +1018,7 @@
           ]
         },
         {
-          "begin": "\\b((?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?))(\"\"\")",
+          "begin": "\\b([A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)(\"\"\")",
           "beginCaptures": {
             "1": {
               "name": "keyword.interpolation.scala"
@@ -1032,7 +1027,7 @@
               "name": "string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala"
             }
           },
-          "end": "(\"\"\")(?!\")|\\$\n|(\\$[^\\$\"_{A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}])",
+          "end": "(\"\"\")(?!\")|\\$\\n|(\\$[^$\"_{A-Z\\p{Lt}\\p{Lu}a-z\\p{Lo}\\p{Nl}\\p{Ll}])",
           "endCaptures": {
             "1": {
               "name": "string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala"
@@ -1046,7 +1041,7 @@
               "include": "#string-interpolation"
             },
             {
-              "match": "\\\\\\\\|\\\\u[0-9A-Fa-f]{4}",
+              "match": "\\\\(?:\\\\|u\\h{4})",
               "name": "constant.character.escape.scala"
             },
             {
@@ -1071,7 +1066,7 @@
           "name": "string.quoted.double.scala",
           "patterns": [
             {
-              "match": "\\\\(?:[btnfr\\\\\"']|[0-7]{1,3}|u[0-9A-Fa-f]{4})",
+              "match": "\\\\(?:[btnfr\\\\\"']|[0-7]{1,3}|u\\h{4})",
               "name": "constant.character.escape.scala"
             },
             {
@@ -1090,7 +1085,7 @@
               "name": "string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala"
             }
           },
-          "end": "(\")|\\$\n|(\\$[^\\$\"_{A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}])",
+          "end": "(\")|\\$\\n|(\\$[^$\"_{A-Z\\p{Lt}\\p{Lu}a-z\\p{Lo}\\p{Nl}\\p{Ll}])",
           "endCaptures": {
             "1": {
               "name": "string.quoted.double.interpolated.scala punctuation.definition.string.end.scala"
@@ -1101,7 +1096,7 @@
           },
           "patterns": [
             {
-              "match": "\\$[\\$\"]",
+              "match": "\\$[$\"]",
               "name": "constant.character.escape.scala"
             },
             {
@@ -1114,7 +1109,7 @@
           ]
         },
         {
-          "begin": "\\b((?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?))(\")",
+          "begin": "\\b([A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)(\")",
           "beginCaptures": {
             "1": {
               "name": "keyword.interpolation.scala"
@@ -1123,7 +1118,7 @@
               "name": "string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala"
             }
           },
-          "end": "(\")|\\$\n|(\\$[^\\$\"_{A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}])",
+          "end": "(\")|\\$\\n|(\\$[^$\"_{A-Z\\p{Lt}\\p{Lu}a-z\\p{Lo}\\p{Nl}\\p{Ll}])",
           "endCaptures": {
             "1": {
               "name": "string.quoted.double.interpolated.scala punctuation.definition.string.end.scala"
@@ -1134,14 +1129,14 @@
           },
           "patterns": [
             {
-              "match": "\\$[\\$\"]",
+              "match": "\\$[$\"]",
               "name": "constant.character.escape.scala"
             },
             {
               "include": "#string-interpolation"
             },
             {
-              "match": "\\\\(?:[btnfr\\\\\"']|[0-7]{1,3}|u[0-9A-Fa-f]{4})",
+              "match": "\\\\(?:[btnfr\\\\\"']|[0-7]{1,3}|u\\h{4})",
               "name": "constant.character.escape.scala"
             },
             {
@@ -1169,7 +1164,7 @@
       ]
     },
     "using-directive": {
-      "begin": "^\\s*(//>)\\s*(using)[^\\S\\n]+(?:(\\S+))?",
+      "begin": "^\\s*(//>)\\s*(using)[^\\S\\n]+(\\S+)?",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.scala"
@@ -1180,7 +1175,7 @@
         "3": {
           "patterns": [
             {
-              "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)",
+              "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)",
               "name": "entity.name.import.scala"
             },
             {
@@ -1228,7 +1223,7 @@
     "xml-embedded-content": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "captures": {
             "0": {
               "name": "meta.bracket.scala"
@@ -1276,7 +1271,7 @@
           "name": "punctuation.definition.constant.xml"
         }
       },
-      "match": "(&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+      "match": "(&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x\\h+)(;)",
       "name": "constant.character.entity.xml"
     },
     "xml-literal": {
@@ -1300,7 +1295,6 @@
               "name": "entity.name.tag.localname.xml"
             }
           },
-          "comment": "We do not allow a tag name to start with a - since this would likely conflict with the <- operator. This is not very common for tag names anyway.  Also code such as -- if (val <val2 || val> val3) will falsly be recognized as an xml tag.  The solution is to put a space on either side of the comparison operator",
           "end": "(>(<))/(?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]*[_a-zA-Z0-9])(>)",
           "endCaptures": {
             "1": {
diff --git a/resources/languages/scheme.json b/resources/languages/scheme.json
index 8bb3132..41fd5b4 100644
--- a/resources/languages/scheme.json
+++ b/resources/languages/scheme.json
@@ -32,9 +32,9 @@
   ],
   "repository": {
     "block-comment": {
-      "begin": "\\#\\|",
+      "begin": "#\\|",
       "contentName": "comment",
-      "end": "\\|\\#",
+      "end": "\\|#",
       "name": "comment",
       "patterns": [
         {
@@ -71,7 +71,7 @@
           "name": "constant.language.boolean.scheme"
         },
         {
-          "match": "(?<=[\\(\\s])((#e|#i)?[0-9]+(\\.[0-9]+)?|(#x)[0-9a-fA-F]+|(#o)[0-7]+|(#b)[01]+)(?=[\\s;()'\",\\[\\]])",
+          "match": "(?<=[(\\s])((#[ei])?[0-9]+(\\.[0-9]+)?|(#x)\\h+|(#o)[0-7]+|(#b)[01]+)(?=[\\s;()'\",\\[\\]])",
           "name": "constant.numeric.scheme"
         }
       ]
@@ -83,37 +83,32 @@
     "language-functions": {
       "patterns": [
         {
-          "match": "(?<=(\\s|\\(|\\[))(do|or|and|else|quasiquote|begin|if|case|set!|cond|let|unquote|define|let\\*|unquote-splicing|delay|letrec)(?=(\\s|\\())",
+          "match": "(?<=([\\s(\\[]))(do|or|and|else|quasiquote|begin|if|case|set!|cond|let|unquote|define|let\\*|unquote-splicing|delay|letrec)(?=([\\s(]))",
           "name": "keyword.control.scheme"
         },
         {
-          "comment": "\n\t\t\t\t\t\tThese functions run a test, and return a boolean\n\t\t\t\t\t\tanswer.\n\t\t\t\t\t",
-          "match": "(?<=(\\s|\\())(char-alphabetic|char-lower-case|char-numeric|char-ready|char-upper-case|char-whitespace|(?:char|string)(?:-ci)?(?:=|<=?|>=?)|atom|boolean|bound-identifier=|char|complex|identifier|integer|symbol|free-identifier=|inexact|eof-object|exact|list|(?:input|output)-port|pair|real|rational|zero|vector|negative|odd|null|string|eq|equal|eqv|even|number|positive|procedure)(\\?)(?=(\\s|\\())",
+          "match": "(?<=([\\s(]))(char-alphabetic|char-lower-case|char-numeric|char-ready|char-upper-case|char-whitespace|(?:char|string)(?:-ci)?(?:=|<=?|>=?)|atom|boolean|bound-identifier=|char|complex|identifier|integer|symbol|free-identifier=|inexact|eof-object|exact|list|(?:input|output)-port|pair|real|rational|zero|vector|negative|odd|null|string|eq|equal|eqv|even|number|positive|procedure)(\\?)(?=([\\s(]))",
           "name": "support.function.boolean-test.scheme"
         },
         {
-          "comment": "\n\t\t\t\t\t\tThese functions change one type into another.\n\t\t\t\t\t",
-          "match": "(?<=(\\s|\\())(char->integer|exact->inexact|inexact->exact|integer->char|symbol->string|list->vector|list->string|identifier->symbol|vector->list|string->list|string->number|string->symbol|number->string)(?=(\\s|\\())",
+          "match": "(?<=([\\s(]))(char->integer|exact->inexact|inexact->exact|integer->char|symbol->string|list->vector|list->string|identifier->symbol|vector->list|string->list|string->number|string->symbol|number->string)(?=([\\s(]))",
           "name": "support.function.convert-type.scheme"
         },
         {
-          "comment": "\n\t\t\t\t\t\tThese functions are potentially dangerous because\n\t\t\t\t\t\tthey have side-effects which could affect other\n\t\t\t\t\t\tparts of the program.\n\t\t\t\t\t",
-          "match": "(?<=(\\s|\\())(set-(?:car|cdr)|(?:vector|string)-(?:fill|set))(!)(?=(\\s|\\())",
+          "match": "(?<=([\\s(]))(set-c(?:ar|dr)|(?:vector|string)-(?:fill|set))(!)(?=([\\s(]))",
           "name": "support.function.with-side-effects.scheme"
         },
         {
-          "comment": "\n\t\t\t\t\t\t+, -, *, /, =, >, etc. \n\t\t\t\t\t",
-          "match": "(?<=(\\s|\\())(>=?|<=?|=|[*/+-])(?=(\\s|\\())",
+          "match": "(?<=([\\s(]))(>=?|<=?|[=*/+-])(?=([\\s(]))",
           "name": "keyword.operator.arithmetic.scheme"
         },
         {
-          "match": "(?<=(\\s|\\())(append|apply|approximate|call-with-current-continuation|call/cc|catch|construct-identifier|define-syntax|display|foo|for-each|force|format|cd|gen-counter|gen-loser|generate-identifier|last-pair|length|let-syntax|letrec-syntax|list|list-ref|list-tail|load|log|macro|magnitude|map|map-streams|max|member|memq|memv|min|newline|nil|not|peek-char|rationalize|read|read-char|return|reverse|sequence|substring|syntax|syntax-rules|transcript-off|transcript-on|truncate|unwrap-syntax|values-list|write|write-char|cons|c(a|d){1,4}r|abs|acos|angle|asin|assoc|assq|assv|atan|ceiling|cos|floor|round|sin|sqrt|tan|(?:real|imag)-part|numerator|denominatormodulo|exp|expt|remainder|quotient|lcm|call-with-(?:input|output)-file|(?:close|current)-(?:input|output)-port|with-(?:input|output)-from-file|open-(?:input|output)-file|char-(?:downcase|upcase|ready)|make-(?:polar|promise|rectangular|string|vector)string(?:-(?:append|copy|length|ref))?|vector(?:-length|-ref))(?=(\\s|\\())",
+          "match": "(?<=([\\s(]))(append|apply|approximate|call-with-current-continuation|call/cc|catch|construct-identifier|define-syntax|display|foo|for-each|force|format|cd|gen-counter|gen-loser|generate-identifier|last-pair|length|let-syntax|letrec-syntax|list|list-ref|list-tail|load|log|macro|magnitude|map|map-streams|max|member|memq|memv|min|newline|nil|not|peek-char|rationalize|read|read-char|return|reverse|sequence|substring|syntax|syntax-rules|transcript-off|transcript-on|truncate|unwrap-syntax|values-list|write|write-char|cons|c([ad]){1,4}r|abs|acos|angle|asin|assoc|assq|assv|atan|ceiling|cos|floor|round|sin|sqrt|tan|(?:real|imag)-part|numerator|denominatormodulo|exp|expt|remainder|quotient|lcm|call-with-(?:input|output)-file|c(?:lose|urrent)-(?:input|output)-port|with-(?:input|output)-from-file|open-(?:input|output)-file|char-(?:downcase|upcase|ready)|make-(?:polar|promise|rectangular|string|vector)string(?:-(?:append|copy|length|ref))?|vector-(?:length|ref))(?=([\\s(]))",
           "name": "support.function.general.scheme"
         }
       ]
     },
     "quote": {
-      "comment": "\n\t\t\t\tWe need to be able to quote any kind of item, which creates\n\t\t\t\ta tiny bit of complexity in our grammar.  It is hopefully\n\t\t\t\tnot overwhelming complexity.\n\t\t\t\t\n\t\t\t\tNote: the first two matches are special cases.  quoted\n\t\t\t\tsymbols, and quoted empty lists are considered constant.other\n\t\t\t\t\n\t\t\t",
       "patterns": [
         {
           "captures": {
@@ -121,7 +116,7 @@
               "name": "punctuation.section.quoted.symbol.scheme"
             }
           },
-          "match": "(')\\s*([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*)",
+          "match": "(')\\s*(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*)",
           "name": "constant.other.symbol.scheme"
         },
         {
@@ -149,7 +144,6 @@
               "name": "punctuation.section.quoted.scheme"
             }
           },
-          "comment": "quoted double-quoted string or s-expression",
           "end": "(?=[\\s()])|(?<=\\n)",
           "name": "string.other.quoted-object.scheme",
           "patterns": [
@@ -167,7 +161,6 @@
           "name": "keyword.control.quote.scheme"
         }
       },
-      "comment": "\n\t\t\t\tSomething quoted with (quote «thing»).  In this case «thing»\n\t\t\t\twill not be evaluated, so we are considering it a string.\n\t\t\t",
       "contentName": "string.other.quote.scheme",
       "end": "(?=[\\s)])|(?<=\\n)",
       "patterns": [
@@ -231,7 +224,7 @@
           "include": "#comment"
         },
         {
-          "begin": "(?<=\\()(define)\\s+(\\()([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*)((\\s+([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*|[._]))*)\\s*(\\))",
+          "begin": "(?<=\\()(define)\\s+(\\()(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*)((\\s+(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*|[._]))*)\\s*(\\))",
           "captures": {
             "1": {
               "name": "keyword.control.scheme"
@@ -264,7 +257,7 @@
           ]
         },
         {
-          "begin": "(?<=\\()(lambda)\\s+(\\()((?:([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*|[._])\\s+)*(?:([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*|[._]))?)(\\))",
+          "begin": "(?<=\\()(lambda)\\s+(\\()((?:(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*|[._])\\s+)*(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*|[._])?)(\\))",
           "captures": {
             "1": {
               "name": "keyword.control.scheme"
@@ -279,7 +272,6 @@
               "name": "punctuation.definition.variable.scheme"
             }
           },
-          "comment": "\n\t\t\t\t\t\tNot sure this one is quite correct.  That \\s* is\n\t\t\t\t\t\tparticularly troubling\n\t\t\t\t\t",
           "end": "(?=\\))",
           "name": "meta.declaration.procedure.scheme",
           "patterns": [
@@ -295,7 +287,7 @@
           ]
         },
         {
-          "begin": "(?<=\\()(define)\\s([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*)\\s*.*?",
+          "begin": "(?<=\\()(define)\\s(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*)\\s*.*?",
           "captures": {
             "1": {
               "name": "keyword.control.scheme"
@@ -334,19 +326,18 @@
           "include": "#constants"
         },
         {
-          "match": "(?<=[\\(\\s])(#\\\\)(space|newline|tab)(?=[\\s\\)])",
+          "match": "(?<=[(\\s])(#\\\\)(space|newline|tab)(?=[\\s)])",
           "name": "constant.character.named.scheme"
         },
         {
-          "match": "(?<=[\\(\\s])(#\\\\)x[0-9A-F]{2,4}(?=[\\s\\)])",
+          "match": "(?<=[(\\s])(#\\\\)x[0-9A-F]{2,4}(?=[\\s)])",
           "name": "constant.character.hex-literal.scheme"
         },
         {
-          "match": "(?<=[\\(\\s])(#\\\\).(?=[\\s\\)])",
+          "match": "(?<=[(\\s])(#\\\\).(?=[\\s)])",
           "name": "constant.character.escape.scheme"
         },
         {
-          "comment": "\n\t\t\t\t\t\tthe . in (a . b) which conses together two elements\n\t\t\t\t\t\ta and b. (a b c) == (a . (b . (c . nil)))\n\t\t\t\t\t",
           "match": "(?<=[ ()])\\.(?=[ ()])",
           "name": "punctuation.separator.cons.scheme"
         },
diff --git a/resources/languages/scss.json b/resources/languages/scss.json
index ec7207b..dfe27b9 100644
--- a/resources/languages/scss.json
+++ b/resources/languages/scss.json
@@ -78,7 +78,7 @@
           "name": "punctuation.definition.keyword.scss"
         }
       },
-      "end": "\\s*(?={)",
+      "end": "\\s*(?=\\{)",
       "name": "meta.at-rule.at-root.scss",
       "patterns": [
         {
@@ -175,7 +175,7 @@
           "name": "punctuation.definition.keyword.scss"
         }
       },
-      "end": "\\s*(?={)",
+      "end": "\\s*(?=\\{)",
       "name": "meta.at-rule.else.scss",
       "patterns": [
         {
@@ -225,7 +225,7 @@
               "name": "punctuation.definition.keyword.scss"
             }
           },
-          "end": "\\s*(?={)",
+          "end": "\\s*(?=\\{)",
           "name": "meta.at-rule.fontface.scss",
           "patterns": [
             {
@@ -245,11 +245,11 @@
           "name": "punctuation.definition.keyword.scss"
         }
       },
-      "end": "\\s*(?={)",
+      "end": "\\s*(?=\\{)",
       "name": "meta.at-rule.for.scss",
       "patterns": [
         {
-          "match": "(==|!=|<=|>=|<|>|from|to|through)",
+          "match": "(==|!=|<=|>=|[<>]|from|to|through)",
           "name": "keyword.control.operator"
         },
         {
@@ -327,7 +327,7 @@
               "name": "entity.name.function.scss"
             }
           },
-          "end": "\\s*(?={)",
+          "end": "\\s*(?=\\{)",
           "name": "meta.at-rule.function.scss",
           "patterns": [
             {
@@ -362,7 +362,7 @@
           "name": "punctuation.definition.keyword.scss"
         }
       },
-      "end": "\\s*(?={)",
+      "end": "\\s*(?=\\{)",
       "name": "meta.at-rule.if.scss",
       "patterns": [
         {
@@ -542,7 +542,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.keyframes.begin.scss"
@@ -556,7 +556,7 @@
           },
           "patterns": [
             {
-              "match": "\\b(?:(?:100|[1-9]\\d|\\d)%|from|to)(?=\\s*{)",
+              "match": "\\b(?:(?:100|[1-9]\\d|\\d)%|from|to)(?=\\s*\\{)",
               "name": "entity.other.attribute-name.scss"
             },
             {
@@ -587,7 +587,7 @@
               "name": "punctuation.definition.keyword.scss"
             }
           },
-          "end": "\\s*(?={)",
+          "end": "\\s*(?=\\{)",
           "name": "meta.at-rule.media.scss",
           "patterns": [
             {
@@ -632,14 +632,14 @@
                   ]
                 },
                 {
-                  "begin": "(:)\\s*(?!(\\s*{))",
+                  "begin": "(:)\\s*(?!(\\s*\\{))",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.separator.key-value.scss"
                     }
                   },
                   "contentName": "meta.property-value.media-query.scss",
-                  "end": "\\s*(;|(?=}|\\)))",
+                  "end": "\\s*(;|(?=[})]))",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.terminator.rule.scss"
@@ -788,7 +788,7 @@
     "at_rule_page": {
       "patterns": [
         {
-          "begin": "^\\s*((@)page)(?=:|\\s)\\s*([-:\\w]*)",
+          "begin": "^\\s*((@)page)(?=[:\\s])\\s*([-:\\w]*)",
           "captures": {
             "1": {
               "name": "keyword.control.at-rule.page.scss"
@@ -800,7 +800,7 @@
               "name": "entity.name.function.scss"
             }
           },
-          "end": "\\s*(?={)",
+          "end": "\\s*(?=\\{)",
           "name": "meta.at-rule.page.scss"
         }
       ]
@@ -836,7 +836,7 @@
           "name": "punctuation.definition.keyword.scss"
         }
       },
-      "end": "(?={)|$",
+      "end": "(?=\\{)|$",
       "name": "meta.at-rule.supports.scss",
       "patterns": [
         {
@@ -1005,7 +1005,7 @@
       "name": "comment.line.scss"
     },
     "comparison_operators": {
-      "match": "==|!=|<=|>=|<|>",
+      "match": "==|!=|<=|>=|[<>]",
       "name": "keyword.operator.comparison.scss"
     },
     "conditional_operators": {
@@ -1055,7 +1055,7 @@
       "name": "keyword.other.important.scss"
     },
     "constant_mathematical_symbols": {
-      "match": "\\b(\\+|-|\\*|/)\\b",
+      "match": "\\b([+\\-*/])\\b",
       "name": "support.constant.mathematical-symbols.scss"
     },
     "constant_optional": {
@@ -1063,7 +1063,7 @@
       "name": "keyword.other.optional.scss"
     },
     "constant_sass_functions": {
-      "begin": "(headings|stylesheet-url|rgba?|hsla?|ie-hex-str|red|green|blue|alpha|opacity|hue|saturation|lightness|prefixed|prefix|-moz|-svg|-css2|-pie|-webkit|-ms|font-(?:files|url)|grid-image|image-(?:width|height|url|color)|sprites?|sprite-(?:map|map-name|file|url|position)|inline-(?:font-files|image)|opposite-position|grad-point|grad-end-position|color-stops|color-stops-in-percentages|grad-color-stops|(?:radial|linear)-(?:gradient|svg-gradient)|opacify|fade-?in|transparentize|fade-?out|lighten|darken|saturate|desaturate|grayscale|adjust-(?:hue|lightness|saturation|color)|scale-(?:lightness|saturation|color)|change-color|spin|complement|invert|mix|-compass-(?:list|space-list|slice|nth|list-size)|blank|compact|nth|first-value-of|join|length|append|nest|append-selector|headers|enumerate|range|percentage|unitless|unit|if|type-of|comparable|elements-of-type|quote|unquote|escape|e|sin|cos|tan|abs|round|ceil|floor|pi|translate(?:X|Y))(\\()",
+      "begin": "(headings|stylesheet-url|rgba?|hsla?|ie-hex-str|red|green|blue|alpha|opacity|hue|saturation|lightness|prefixed|prefix|-moz|-svg|-css2|-pie|-webkit|-ms|font-(?:files|url)|grid-image|image-(?:width|height|url|color)|sprites?|sprite-(?:map|map-name|file|url|position)|inline-(?:font-files|image)|opposite-position|grad-point|grad-end-position|color-stops|color-stops-in-percentages|grad-color-stops|(?:radial|linear)-(?:gradient|svg-gradient)|opacify|fade-?in|transparentize|fade-?out|lighten|darken|saturate|desaturate|grayscale|adjust-(?:hue|lightness|saturation|color)|scale-(?:lightness|saturation|color)|change-color|spin|complement|invert|mix|-compass-(?:list|space-list|slice|nth|list-size)|blank|compact|nth|first-value-of|join|length|append|nest|append-selector|headers|enumerate|range|percentage|unitless|unit|if|type-of|comparable|elements-of-type|quote|unquote|escape|e|sin|cos|tan|abs|round|ceil|floor|pi|translate[XY])(\\()",
       "beginCaptures": {
         "1": {
           "name": "support.function.misc.scss"
@@ -1122,7 +1122,7 @@
           "include": "#property_values"
         },
         {
-          "match": "[={}\\?;@]",
+          "match": "[={}?;@]",
           "name": "invalid.illegal.scss"
         }
       ]
@@ -1130,7 +1130,7 @@
     "functions": {
       "patterns": [
         {
-          "begin": "([\\w-]{1,})(\\()\\s*",
+          "begin": "([\\w-]+)(\\()\\s*",
           "beginCaptures": {
             "1": {
               "name": "support.function.misc.scss"
@@ -1152,7 +1152,7 @@
           ]
         },
         {
-          "match": "([\\w-]{1,})",
+          "match": "([\\w-]+)",
           "name": "support.function.misc.scss"
         }
       ]
@@ -1174,7 +1174,7 @@
       ]
     },
     "interpolation": {
-      "begin": "#{",
+      "begin": "#\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.interpolation.begin.bracket.curly.scss"
@@ -1305,17 +1305,17 @@
               "include": "#interpolation"
             },
             {
-              "match": "\\\\([0-9a-fA-F]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.scss"
             },
             {
-              "match": "\\$|}",
+              "match": "[$}]",
               "name": "invalid.illegal.identifier.scss"
             }
           ]
         }
       },
-      "match": "(?<=&)((?:[-a-zA-Z_0-9]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.)|\\#\\{|\\$|})+)(?=$|[\\s,.\\#)\\[:{>+~|]|/\\*)",
+      "match": "(?<=&)((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|[$}])+)(?=$|[\\s,.#)\\[:{>+~|]|/\\*)",
       "name": "entity.other.attribute-name.parent-selector-suffix.css"
     },
     "properties": {
@@ -1334,14 +1334,14 @@
           ]
         },
         {
-          "begin": "(:)\\s*(?!(\\s*{))",
+          "begin": "(:)\\s*(?!(\\s*\\{))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.key-value.scss"
             }
           },
           "contentName": "meta.property-value.scss",
-          "end": "\\s*(;|(?=}|\\)))",
+          "end": "\\s*(;|(?=[})]))",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.rule.scss"
@@ -1359,7 +1359,7 @@
       ]
     },
     "property_list": {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.property-list.begin.bracket.curly.scss"
@@ -1488,11 +1488,11 @@
               "include": "#interpolation"
             },
             {
-              "match": "\\\\([0-9a-fA-F]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.scss"
             },
             {
-              "match": "\\$|}",
+              "match": "[$}]",
               "name": "invalid.illegal.scss"
             }
           ]
@@ -1510,11 +1510,11 @@
               "include": "#interpolation"
             },
             {
-              "match": "\\\\([0-9a-fA-F]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.scss"
             },
             {
-              "match": "\\$|}",
+              "match": "[$}]",
               "name": "invalid.illegal.scss"
             }
           ]
@@ -1529,11 +1529,11 @@
               "include": "#interpolation"
             },
             {
-              "match": "\\\\([0-9a-fA-F]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.scss"
             },
             {
-              "match": "\\$|}",
+              "match": "[$}]",
               "name": "invalid.illegal.scss"
             }
           ]
@@ -1550,11 +1550,11 @@
               "include": "#interpolation"
             },
             {
-              "match": "\\\\([0-9a-fA-F]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.scss"
             },
             {
-              "match": "\\$|}",
+              "match": "[$}]",
               "name": "invalid.illegal.scss"
             }
           ]
@@ -1566,7 +1566,7 @@
           "name": "string.quoted.single.attribute-value.scss"
         }
       },
-      "match": "(?xi)\n(\\[)\n\\s*\n(\n  (?:\n    [-a-zA-Z_0-9]|[^\\x00-\\x7F]       # Valid identifier characters\n    | \\\\(?:[0-9a-fA-F]{1,6}|.)       # Escape sequence\n    | \\#\\{                           # Interpolation (escaped to avoid Coffeelint errors)\n    | \\.?\\$                          # Possible start of interpolation variable\n    | }                                # Possible end of interpolation\n  )+?\n)\n(?:\n  \\s*([~|^$*]?=)\\s*\n  (?:\n    (\n      (?:\n        [-a-zA-Z_0-9]|[^\\x00-\\x7F]       # Valid identifier characters\n        | \\\\(?:[0-9a-fA-F]{1,6}|.)       # Escape sequence\n        | \\#\\{                           # Interpolation (escaped to avoid Coffeelint errors)\n        | \\.?\\$                          # Possible start of interpolation variable\n        | }                                # Possible end of interpolation\n      )+\n    )\n    |\n    ((\")(.*?)(\"))\n    |\n    ((')(.*?)('))\n  )\n)?\n\\s*\n(\\])",
+      "match": "(?i)(\\[)\\s*((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+?)(?:\\s*([~|^$*]?=)\\s*(?:((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+)|((\")(.*?)(\"))|((')(.*?)('))))?\\s*(])",
       "name": "meta.attribute-selector.scss"
     },
     "selector_class": {
@@ -1580,21 +1580,21 @@
               "include": "#interpolation"
             },
             {
-              "match": "\\\\([0-9a-fA-F]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.scss"
             },
             {
-              "match": "\\$|}",
+              "match": "[$}]",
               "name": "invalid.illegal.scss"
             }
           ]
         }
       },
-      "match": "(\\.)((?:[-a-zA-Z_0-9]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.)|\\#\\{|\\.?\\$|})+)(?=$|[\\s,\\#)\\[:{>+~|]|\\.[^$]|/\\*|;)",
+      "match": "(\\.)((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+)(?=$|[\\s,#)\\[:{>+~|]|\\.[^$]|/\\*|;)",
       "name": "entity.other.attribute-name.class.css"
     },
     "selector_custom": {
-      "match": "\\b([a-zA-Z0-9]+(-[a-zA-Z0-9]+)+)(?=\\.|\\s++[^:]|\\s*[,\\[{]|:(link|visited|hover|active|focus|target|lang|disabled|enabled|checked|indeterminate|root|nth-(child|last-child|of-type|last-of-type)|first-child|last-child|first-of-type|last-of-type|only-child|only-of-type|empty|not|valid|invalid)(\\([0-9A-Za-z]*\\))?)",
+      "match": "\\b([a-zA-Z0-9]+(-[a-zA-Z0-9]+)+)(?=\\.|\\s++[^:]|\\s*[,\\[{]|:(link|visited|hover|active|focus|target|lang|disabled|enabled|checked|indeterminate|root|nth-((?:|last-)(?:child|of-type))|first-child|last-child|first-of-type|last-of-type|only-child|only-of-type|empty|not|valid|invalid)(\\([0-9A-Za-z]*\\))?)",
       "name": "entity.name.tag.custom.scss"
     },
     "selector_id": {
@@ -1608,17 +1608,17 @@
               "include": "#interpolation"
             },
             {
-              "match": "\\\\([0-9a-fA-F]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.scss"
             },
             {
-              "match": "\\$|}",
+              "match": "[$}]",
               "name": "invalid.illegal.identifier.scss"
             }
           ]
         }
       },
-      "match": "(\\#)((?:[-a-zA-Z_0-9]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.)|\\#\\{|\\.?\\$|})+)(?=$|[\\s,\\#)\\[:{>+~|]|\\.[^$]|/\\*)",
+      "match": "(#)((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+)(?=$|[\\s,#)\\[:{>+~|]|\\.[^$]|/\\*)",
       "name": "entity.other.attribute-name.id.css"
     },
     "selector_placeholder": {
@@ -1632,23 +1632,23 @@
               "include": "#interpolation"
             },
             {
-              "match": "\\\\([0-9a-fA-F]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.scss"
             },
             {
-              "match": "\\$|}",
+              "match": "[$}]",
               "name": "invalid.illegal.identifier.scss"
             }
           ]
         }
       },
-      "match": "(%)((?:[-a-zA-Z_0-9]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.)|\\#\\{|\\.\\$|\\$|})+)(?=;|$|[\\s,\\#)\\[:{>+~|]|\\.[^$]|/\\*)",
+      "match": "(%)((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.\\$|[$}])+)(?=;|$|[\\s,#)\\[:{>+~|]|\\.[^$]|/\\*)",
       "name": "entity.other.attribute-name.placeholder.css"
     },
     "selector_pseudo_class": {
       "patterns": [
         {
-          "begin": "((:)\\bnth-(?:child|last-child|of-type|last-of-type))(\\()",
+          "begin": "((:)\\bnth-(?:|last-)(?:child|of-type))(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.other.attribute-name.pseudo-class.css"
@@ -1864,7 +1864,7 @@
           "match": "\\b([\\w-]+)(\\.)(\\$[\\w-]+)\\b"
         },
         {
-          "match": "(\\$|\\-\\-)[A-Za-z0-9_-]+\\b",
+          "match": "(\\$|--)[A-Za-z0-9_-]+\\b",
           "name": "variable.scss"
         }
       ]
diff --git a/resources/languages/sdbl.json b/resources/languages/sdbl.json
index 3d9caae..b29e443 100644
--- a/resources/languages/sdbl.json
+++ b/resources/languages/sdbl.json
@@ -17,12 +17,12 @@
       "name": "comment.line.double-slash.sdbl"
     },
     {
-      "begin": "\\\"",
-      "end": "\\\"(?![\\\"])",
+      "begin": "\"",
+      "end": "\"(?!\")",
       "name": "string.quoted.double.sdbl",
       "patterns": [
         {
-          "match": "\\\"\\\"",
+          "match": "\"\"",
           "name": "constant.character.escape.sdbl"
         },
         {
@@ -32,69 +32,63 @@
       ]
     },
     {
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Неопределено|Undefined|Истина|True|Ложь|False|NULL)(?=[^\\wа-яё\\.]|$)",
+      "match": "(?i)(?<=[^\\wа-яё.]|^)(Неопределено|Undefined|Истина|True|Ложь|False|NULL)(?=[^\\wа-яё.]|$)",
       "name": "constant.language.sdbl"
     },
     {
-      "match": "(?<=[^\\wа-яё\\.]|^)(\\d+\\.?\\d*)(?=[^\\wа-яё\\.]|$)",
+      "match": "(?<=[^\\wа-яё.]|^)(\\d+\\.?\\d*)(?=[^\\wа-яё.]|$)",
       "name": "constant.numeric.sdbl"
     },
     {
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Выбор|Case|Когда|When|Тогда|Then|Иначе|Else|Конец|End)(?=[^\\wа-яё\\.]|$)",
+      "match": "(?i)(?<=[^\\wа-яё.]|^)(Выбор|Case|Когда|When|Тогда|Then|Иначе|Else|Конец|End)(?=[^\\wа-яё.]|$)",
       "name": "keyword.control.conditional.sdbl"
     },
     {
-      "match": "(?i)(?<!КАК\\s|AS\\s)(?<=[^\\wа-яё\\.]|^)(НЕ|NOT|И|AND|ИЛИ|OR|В\\s+ИЕРАРХИИ|IN\\s+HIERARCHY|В|In|Между|Between|Есть(\\s+НЕ)?\\s+NULL|Is(\\s+NOT)?\\s+NULL|Ссылка|Refs|Подобно|Like)(?=[^\\wа-яё\\.]|$)",
+      "match": "(?i)(?<!КАК\\s|AS\\s)(?<=[^\\wа-яё.]|^)(НЕ|NOT|И|AND|ИЛИ|OR|В\\s+ИЕРАРХИИ|IN\\s+HIERARCHY|В|In|Между|Between|Есть(\\s+НЕ)?\\s+NULL|Is(\\s+NOT)?\\s+NULL|Ссылка|Refs|Подобно|Like)(?=[^\\wа-яё.]|$)",
       "name": "keyword.operator.logical.sdbl"
     },
     {
-      "match": "<=|>=|=|<|>",
+      "match": "<=|>=|[=<>]",
       "name": "keyword.operator.comparison.sdbl"
     },
     {
-      "match": "(\\+|-|\\*|/|%)",
+      "match": "([+\\-*/%])",
       "name": "keyword.operator.arithmetic.sdbl"
     },
     {
-      "match": "(,|;)",
+      "match": "([,;])",
       "name": "keyword.operator.sdbl"
     },
     {
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Выбрать|Select|Разрешенные|Allowed|Различные|Distinct|Первые|Top|Как|As|ПустаяТаблица|EmptyTable|Поместить|Into|Уничтожить|Drop|Из|From|((Левое|Left|Правое|Right|Полное|Full)\\s+(Внешнее\\s+|Outer\\s+)?Соединение|Join)|((Внутреннее|Inner)\\s+Соединение|Join)|Где|Where|(Сгруппировать\\s+По(\\s+Группирующим\\s+Наборам)?)|(Group\\s+By(\\s+Grouping\\s+Set)?)|Имеющие|Having|Объединить(\\s+Все)?|Union(\\s+All)?|(Упорядочить\\s+По)|(Order\\s+By)|Автоупорядочивание|Autoorder|Итоги|Totals|По(\\s+Общие)?|By(\\s+Overall)?|(Только\\s+)?Иерархия|(Only\\s+)?Hierarchy|Периодами|Periods|Индексировать|Index|Выразить|Cast|Возр|Asc|Убыв|Desc|Для\\s+Изменения|(For\\s+Update(\\s+Of)?)|Спецсимвол|Escape|СгруппированоПо|GroupedBy)(?=[^\\wа-яё\\.]|$)",
+      "match": "(?i)(?<=[^\\wа-яё.]|^)(Выбрать|Select|Разрешенные|Allowed|Различные|Distinct|Первые|Top|Как|As|ПустаяТаблица|EmptyTable|Поместить|Into|Уничтожить|Drop|Из|From|((Левое|Left|Правое|Right|Полное|Full)\\s+(Внешнее\\s+|Outer\\s+)?Соединение|Join)|((Внутреннее|Inner)\\s+Соединение|Join)|Где|Where|(Сгруппировать\\s+По(\\s+Группирующим\\s+Наборам)?)|(Group\\s+By(\\s+Grouping\\s+Set)?)|Имеющие|Having|Объединить(\\s+Все)?|Union(\\s+All)?|(Упорядочить\\s+По)|(Order\\s+By)|Автоупорядочивание|Autoorder|Итоги|Totals|По(\\s+Общие)?|By(\\s+Overall)?|(Только\\s+)?Иерархия|(Only\\s+)?Hierarchy|Периодами|Periods|Индексировать|Index|Выразить|Cast|Возр|Asc|Убыв|Desc|Для\\s+Изменения|(For\\s+Update(\\s+Of)?)|Спецсимвол|Escape|СгруппированоПо|GroupedBy)(?=[^\\wа-яё.]|$)",
       "name": "keyword.control.sdbl"
     },
     {
-      "comment": "Функции языка запросов",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Значение|Value|ДатаВремя|DateTime|Тип|Type)(?=\\()",
+      "match": "(?i)(?<=[^\\wа-яё.]|^)(Значение|Value|ДатаВремя|DateTime|Тип|Type)(?=\\()",
       "name": "support.function.sdbl"
     },
     {
-      "comment": "Функции работы со строками",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Подстрока|Substring|НРег|Lower|ВРег|Upper|Лев|Left|Прав|Right|ДлинаСтроки|StringLength|СтрНайти|StrFind|СтрЗаменить|StrReplace|СокрЛП|TrimAll|СокрЛ|TrimL|СокрП|TrimR)(?=\\()",
+      "match": "(?i)(?<=[^\\wа-яё.]|^)(Подстрока|Substring|НРег|Lower|ВРег|Upper|Лев|Left|Прав|Right|ДлинаСтроки|StringLength|СтрНайти|StrFind|СтрЗаменить|StrReplace|СокрЛП|TrimAll|СокрЛ|TrimL|СокрП|TrimR)(?=\\()",
       "name": "support.function.sdbl"
     },
     {
-      "comment": "Функции работы с датами",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Год|Year|Квартал|Quarter|Месяц|Month|ДеньГода|DayOfYear|День|Day|Неделя|Week|ДеньНедели|Weekday|Час|Hour|Минута|Minute|Секунда|Second|НачалоПериода|BeginOfPeriod|КонецПериода|EndOfPeriod|ДобавитьКДате|DateAdd|РазностьДат|DateDiff|Полугодие|HalfYear|Декада|TenDays)(?=\\()",
+      "match": "(?i)(?<=[^\\wа-яё.]|^)(Год|Year|Квартал|Quarter|Месяц|Month|ДеньГода|DayOfYear|День|Day|Неделя|Week|ДеньНедели|Weekday|Час|Hour|Минута|Minute|Секунда|Second|НачалоПериода|BeginOfPeriod|КонецПериода|EndOfPeriod|ДобавитьКДате|DateAdd|РазностьДат|DateDiff|Полугодие|HalfYear|Декада|TenDays)(?=\\()",
       "name": "support.function.sdbl"
     },
     {
-      "comment": "Функции работы с числами",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(ACOS|COS|ASIN|SIN|ATAN|TAN|EXP|POW|LOG|LOG10|Цел|Int|Окр|Round|SQRT)(?=\\()",
+      "match": "(?i)(?<=[^\\wа-яё.]|^)(ACOS|COS|ASIN|SIN|ATAN|TAN|EXP|POW|LOG|LOG10|Цел|Int|Окр|Round|SQRT)(?=\\()",
       "name": "support.function.sdbl"
     },
     {
-      "comment": "Агрегатные функции",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Сумма|Sum|Среднее|Avg|Минимум|Min|Максимум|Max|Количество|Count)(?=\\()",
+      "match": "(?i)(?<=[^\\wа-яё.]|^)(Сумма|Sum|Среднее|Avg|Минимум|Min|Максимум|Max|Количество|Count)(?=\\()",
       "name": "support.function.sdbl"
     },
     {
-      "comment": "Прочие функции",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(ЕстьNULL|IsNULL|Представление|Presentation|ПредставлениеСсылки|RefPresentation|ТипЗначения|ValueType|АвтономерЗаписи|RecordAutoNumber|РазмерХранимыхДанных|StoredDataSize|УникальныйИдентификатор|UUID)(?=\\()",
+      "match": "(?i)(?<=[^\\wа-яё.]|^)(ЕстьNULL|IsNULL|Представление|Presentation|ПредставлениеСсылки|RefPresentation|ТипЗначения|ValueType|АвтономерЗаписи|RecordAutoNumber|РазмерХранимыхДанных|StoredDataSize|УникальныйИдентификатор|UUID)(?=\\()",
       "name": "support.function.sdbl"
     },
     {
-      "match": "(?i)(?<=[^\\wа-яё\\.])(Число|Number|Строка|String|Дата|Date|Булево|Boolean)(?=[^\\wа-яё\\.]|$)",
+      "match": "(?i)(?<=[^\\wа-яё.])(Число|Number|Строка|String|Дата|Date|Булево|Boolean)(?=[^\\wа-яё.]|$)",
       "name": "support.type.sdbl"
     },
     {
diff --git a/resources/languages/shaderlab.json b/resources/languages/shaderlab.json
index 66cf43d..fc3594f 100644
--- a/resources/languages/shaderlab.json
+++ b/resources/languages/shaderlab.json
@@ -55,12 +55,12 @@
       "name": "support.constant.property-value.blendfactors.shaderlab"
     },
     {
-      "match": "\\[([a-zA-Z_][a-zA-Z0-9_]*)\\](?!\\s*[a-zA-Z_][a-zA-Z0-9_]*\\s*\\(\")",
+      "match": "\\[([a-zA-Z_][a-zA-Z0-9_]*)](?!\\s*[a-zA-Z_][a-zA-Z0-9_]*\\s*\\(\")",
       "name": "support.variable.reference.shaderlab"
     },
     {
       "begin": "(\\[)",
-      "end": "(\\])",
+      "end": "(])",
       "name": "meta.attribute.shaderlab",
       "patterns": [
         {
@@ -77,7 +77,7 @@
       "name": "support.variable.declaration.shaderlab"
     },
     {
-      "begin": "\\b(CGPROGRAM|CGINCLUDE)\\b",
+      "begin": "\\b(CG(?:PROGRAM|INCLUDE))\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.other"
@@ -97,7 +97,7 @@
       ]
     },
     {
-      "begin": "\\b(HLSLPROGRAM|HLSLINCLUDE)\\b",
+      "begin": "\\b(HLSL(?:PROGRAM|INCLUDE))\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.other"
@@ -157,7 +157,7 @@
           "name": "support.variable.various.shaderlab"
         },
         {
-          "match": "\\b(SHADER_API_D3D9|SHADER_API_D3D11|SHADER_API_GLCORE|SHADER_API_OPENGL|SHADER_API_GLES|SHADER_API_GLES3|SHADER_API_METAL|SHADER_API_D3D11_9X|SHADER_API_PSSL|SHADER_API_XBOXONE|SHADER_API_PSP2|SHADER_API_WIIU|SHADER_API_MOBILE|SHADER_API_GLSL)\\b",
+          "match": "\\b(SHADER_API_(?:D3D9|D3D11|GLCORE|OPENGL|GLES|GLES3|METAL|D3D11_9X|PSSL|XBOXONE|PSP2|WIIU|MOBILE|GLSL))\\b",
           "name": "support.variable.preprocessor.targetplatform.shaderlab"
         },
         {
@@ -169,15 +169,15 @@
           "name": "support.variable.preprocessor.unityversion.shaderlab"
         },
         {
-          "match": "\\b(UNITY_BRANCH|UNITY_FLATTEN|UNITY_NO_SCREENSPACE_SHADOWS|UNITY_NO_LINEAR_COLORSPACE|UNITY_NO_RGBM|UNITY_NO_DXT5nm|UNITY_FRAMEBUFFER_FETCH_AVAILABLE|UNITY_USE_RGBA_FOR_POINT_SHADOWS|UNITY_ATTEN_CHANNEL|UNITY_HALF_TEXEL_OFFSET|UNITY_UV_STARTS_AT_TOP|UNITY_MIGHT_NOT_HAVE_DEPTH_Texture|UNITY_NEAR_CLIP_VALUE|UNITY_VPOS_TYPE|UNITY_CAN_COMPILE_TESSELLATION|UNITY_COMPILER_HLSL|UNITY_COMPILER_HLSL2GLSL|UNITY_COMPILER_CG|UNITY_REVERSED_Z)\\b",
+          "match": "\\b(UNITY_(?:BRANCH|FLATTEN|NO_SCREENSPACE_SHADOWS|NO_LINEAR_COLORSPACE|NO_RGBM|NO_DXT5nm|FRAMEBUFFER_FETCH_AVAILABLE|USE_RGBA_FOR_POINT_SHADOWS|ATTEN_CHANNEL|HALF_TEXEL_OFFSET|UV_STARTS_AT_TOP|MIGHT_NOT_HAVE_DEPTH_Texture|NEAR_CLIP_VALUE|VPOS_TYPE|CAN_COMPILE_TESSELLATION|COMPILER_HLSL|COMPILER_HLSL2GLSL|COMPILER_CG|REVERSED_Z))\\b",
           "name": "support.variable.preprocessor.platformdifference.shaderlab"
         },
         {
-          "match": "\\b(UNITY_PASS_FORWARDBASE|UNITY_PASS_FORWARDADD|UNITY_PASS_DEFERRED|UNITY_PASS_SHADOWCASTER|UNITY_PASS_PREPASSBASE|UNITY_PASS_PREPASSFINAL)\\b",
+          "match": "\\b(UNITY_PASS_(?:FORWARDBASE|FORWARDADD|DEFERRED|SHADOWCASTER|PREPASSBASE|PREPASSFINAL))\\b",
           "name": "support.variable.preprocessor.texture2D.shaderlab"
         },
         {
-          "match": "\\b(appdata_base|appdata_tan|appdata_full|appdata_img)\\b",
+          "match": "\\b(appdata_(?:base|tan|full|img))\\b",
           "name": "support.class.structures.shaderlab"
         },
         {
diff --git a/resources/languages/shellscript.json b/resources/languages/shellscript.json
index 4a67df6..17b6c9d 100644
--- a/resources/languages/shellscript.json
+++ b/resources/languages/shellscript.json
@@ -8,7 +8,7 @@
   ],
   "repository": {
     "alias_statement": {
-      "begin": "(?:(?:[ \\t]*+)(alias)(?:[ \\t]*+)((?:(?:((?<!\\w)-\\w+\\b)(?:[ \\t]*+))*))(?:(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(\\=)|(\\+\\=))|(\\-\\=))))",
+      "begin": "[ \\t]*+(alias)[ \\t]*+((?:((?<!\\w)-\\w+\\b)[ \\t]*+)*)[ \\t]*+((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*)|(-?\\d+)))(]))?(?:(?:(=)|(\\+=))|(-=))",
       "beginCaptures": {
         "1": {
           "name": "storage.type.alias.shell"
@@ -49,7 +49,7 @@
           "name": "keyword.operator.assignment.shell"
         }
       },
-      "end": "(?:(?= |\\t|$)|(?:(?:(?:(;)|(&&))|(\\|\\|))|(&)))",
+      "end": "(?:(?=[ \\t]|$)|(?:(?:(?:(;)|(&&))|(\\|\\|))|(&)))",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.semicolon.shell"
@@ -72,10 +72,10 @@
       ]
     },
     "argument": {
-      "begin": "(?:[ \\t]++)(?!(?:&|\\||\\(|\\[|#|\\n|$|;))",
+      "begin": "[ \\t]++(?!(?:[\\&|(\\[#\\n]|$|;))",
       "beginCaptures": {
       },
-      "end": "(?= |\\t|;|\\||&|$|\\n|\\)|\\`)",
+      "end": "(?=[ \\t;|\\&]|$|[\\n)`])",
       "endCaptures": {
       },
       "name": "meta.argument.shell",
@@ -116,7 +116,7 @@
               ]
             }
           },
-          "match": "(?:[ \\t]*+)((?:[^ \t\n>&;<>\\(\\)\\$`\\\\\"'<\\|]+)(?!>))"
+          "match": "[ \\t]*+([^ \\t\\n>\\&;<()$`\\\\\"'|]+(?!>))"
         },
         {
           "include": "#normal_context"
@@ -132,7 +132,7 @@
               "name": "punctuation.section.arithmetic.double.shell"
             }
           },
-          "end": "\\)(?:\\s*)\\)",
+          "end": "\\)\\s*\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.arithmetic.double.shell"
@@ -199,10 +199,10 @@
           "name": "punctuation.section.array.shell"
         }
       },
-      "match": "(?:(\\[)([^\\[\\]]+)(\\]))"
+      "match": "(\\[)([^\\[\\]]+)(])"
     },
     "array_value": {
-      "begin": "(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(\\=)|(\\+\\=))|(\\-\\=))(?:[ \\t]*+)(\\()",
+      "begin": "[ \\t]*+((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*)|(-?\\d+)))(]))?(?:(?:(=)|(\\+=))|(-=))[ \\t]*+(\\()",
       "beginCaptures": {
         "1": {
           "name": "variable.other.assignment.shell"
@@ -251,7 +251,7 @@
               "name": "keyword.operator.assignment.shell punctuation.definition.assignment.shell"
             }
           },
-          "match": "(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(\\=))"
+          "match": "((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(=)"
         },
         {
           "captures": {
@@ -268,7 +268,7 @@
               "name": "punctuation.definition.assignment.shell"
             }
           },
-          "match": "(?:(\\[)(.+?)(\\])(\\=))"
+          "match": "(\\[)(.+?)(])(=)"
         },
         {
           "include": "#normal_context"
@@ -304,7 +304,7 @@
               "name": "keyword.control.$0.shell"
             },
             {
-              "match": "(?<!\\w)(?:(?:unfunction|continue|autoload|unsetopt|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|suspend|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|:|\\.)(?!\\/))(?!\\w)(?!-)",
+              "match": "(?<!\\w)(?:unfunction|continue|autoload|unsetopt|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|suspend|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|[:.])(?!/)(?!\\w)(?!-)",
               "name": "support.function.builtin.shell"
             },
             {
@@ -313,17 +313,17 @@
           ]
         }
       },
-      "match": "(?:(?:(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!nocorrect |nocorrect\t|nocorrect$|readonly |readonly\t|readonly$|function |function\t|function$|foreach |foreach\t|foreach$|coproc |coproc\t|coproc$|logout |logout\t|logout$|export |export\t|export$|select |select\t|select$|repeat |repeat\t|repeat$|pushd |pushd\t|pushd$|until |until\t|until$|while |while\t|while$|local |local\t|local$|case |case\t|case$|done |done\t|done$|elif |elif\t|elif$|else |else\t|else$|esac |esac\t|esac$|popd |popd\t|popd$|then |then\t|then$|time |time\t|time$|for |for\t|for$|end |end\t|end$|fi |fi\t|fi$|do |do\t|do$|in |in\t|in$|if |if\t|if$))(?:((?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$))|((?!\"|'|\\\\\\n?$)(?:[^!'\"<> \\t\\n\\r]+?)))(?:(?= |\\t)|(?:(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\))))",
+      "match": "(?!(?:[!\\&|(){\\[<>#\\n]|$|[; \\t]))(?!nocorrect |nocorrect\\t|nocorrect$|readonly |readonly\\t|readonly$|function |function\\t|function$|foreach |foreach\\t|foreach$|coproc |coproc\\t|coproc$|logout |logout\\t|logout$|export |export\\t|export$|select |select\\t|select$|repeat |repeat\\t|repeat$|pushd |pushd\\t|pushd$|until |until\\t|until$|while |while\\t|while$|local |local\\t|local$|case |case\\t|case$|done |done\\t|done$|elif |elif\\t|elif$|else |else\\t|else$|esac |esac\\t|esac$|popd |popd\\t|popd$|then |then\\t|then$|time |time\\t|time$|for |for\\t|for$|end |end\\t|end$|fi |fi\\t|fi$|do |do\\t|do$|in |in\\t|in$|if |if\\t|if$)(?:((?<=^|[;\\& \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t;\\&]|$))|((?![\"']|\\\\\\n?$)[^!'\"<> \\t\\n\\r]+?))(?:(?=[ \\t])|(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\))",
       "name": "meta.statement.command.name.basic.shell"
     },
     "block_comment": {
-      "begin": "(?:(?:\\s*+)(\\/\\*))",
+      "begin": "\\s*+(/\\*)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.begin.shell"
         }
       },
-      "end": "\\*\\/",
+      "end": "\\*/",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.shell"
@@ -336,7 +336,7 @@
       "name": "constant.language.$0.shell"
     },
     "case_statement": {
-      "begin": "(?:(\\bcase\\b)(?:[ \\t]*+)(.+?)(?:[ \\t]*+)(\\bin\\b))",
+      "begin": "(\\bcase\\b)[ \\t]*+(.+?)[ \\t]*+(\\bin\\b)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.case.shell"
@@ -369,10 +369,10 @@
               "name": "keyword.operator.pattern.case.default.shell"
             }
           },
-          "match": "(?:[ \\t]*+)(\\* *\\))"
+          "match": "[ \\t]*+(\\* *\\))"
         },
         {
-          "begin": "(?<!\\))(?!(?:[ \\t]*+)(?:esac\\b|$))",
+          "begin": "(?<!\\))(?![ \\t]*+(?:esac\\b|$))",
           "beginCaptures": {
           },
           "end": "(?:(?=\\besac\\b)|(\\)))",
@@ -437,7 +437,7 @@
           "name": "constant.character.escape.shell"
         },
         {
-          "match": "(?<=\\tin| in| |\\t|;;)\\(",
+          "match": "(?<=\\tin| in|[ \\t]|;;)\\(",
           "name": "keyword.operator.pattern.case.shell"
         },
         {
@@ -467,7 +467,7 @@
               "name": "punctuation.definition.character-class.shell"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.character-class.shell"
@@ -485,7 +485,7 @@
           "include": "#string"
         },
         {
-          "match": "[^) \\t\\n\\[\\?\\*\\|\\@]",
+          "match": "[^) \\t\\n\\[?*|@]",
           "name": "string.unquoted.pattern.shell string.regexp.unquoted.shell"
         }
       ]
@@ -494,7 +494,7 @@
       "begin": "\\G",
       "beginCaptures": {
       },
-      "end": "(?:(?= |\\t|;|\\||&|$|\\n|\\)|\\`)|(?=<))",
+      "end": "(?:(?=[ \\t;|\\&]|$|[\\n)`])|(?=<))",
       "endCaptures": {
       },
       "name": "meta.statement.command.name.shell",
@@ -504,7 +504,7 @@
           "name": "entity.name.function.call.shell entity.name.command.shell keyword.control.$0.shell"
         },
         {
-          "match": "(?<!\\w)(?:(?:unfunction|continue|autoload|unsetopt|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|suspend|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|:|\\.)(?!\\/))(?!\\w)(?!-)",
+          "match": "(?<!\\w)(?:unfunction|continue|autoload|unsetopt|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|suspend|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|[:.])(?!/)(?!\\w)(?!-)",
           "name": "entity.name.function.call.shell entity.name.command.shell support.function.builtin.shell"
         },
         {
@@ -516,10 +516,10 @@
               "name": "entity.name.function.call.shell entity.name.command.shell"
             }
           },
-          "match": "(?:(?<!\\w)(?<=\\G|'|\"|\\}|\\))([^ \\n\\t\\r\"'=;&\\|`\\)\\{<>]+))"
+          "match": "(?<!\\w)(?<=\\G|['\"})])([^ \\n\\t\\r\"'=;\\&|`){<>]+)"
         },
         {
-          "begin": "(?:(?:\\G|(?<! |\\t|;|\\||&|\\n|\\{|#))(?:(\\$?)((?:(\")|(')))))",
+          "begin": "(?:\\G|(?<![ \\t;|\\&\\n{#]))(\\$?)((?:(\")|(')))",
           "beginCaptures": {
             "1": {
               "name": "meta.statement.command.name.quoted.shell punctuation.definition.string.shell entity.name.function.call.shell entity.name.command.shell"
@@ -533,7 +533,7 @@
               "name": "meta.statement.command.name.quoted.shell string.quoted.single.shell punctuation.definition.string.begin.shell entity.name.function.call.shell entity.name.command.shell"
             }
           },
-          "end": "(?<!\\G)(?<=(?:\\2))",
+          "end": "(?<!\\G)(?<=\\2)",
           "endCaptures": {
           },
           "patterns": [
@@ -554,10 +554,10 @@
       ]
     },
     "command_statement": {
-      "begin": "(?:(?:[ \\t]*+)(?:(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!nocorrect |nocorrect\t|nocorrect$|readonly |readonly\t|readonly$|function |function\t|function$|foreach |foreach\t|foreach$|coproc |coproc\t|coproc$|logout |logout\t|logout$|export |export\t|export$|select |select\t|select$|repeat |repeat\t|repeat$|pushd |pushd\t|pushd$|until |until\t|until$|while |while\t|while$|local |local\t|local$|case |case\t|case$|done |done\t|done$|elif |elif\t|elif$|else |else\t|else$|esac |esac\t|esac$|popd |popd\t|popd$|then |then\t|then$|time |time\t|time$|for |for\t|for$|end |end\t|end$|fi |fi\t|fi$|do |do\t|do$|in |in\t|in$|if |if\t|if$)(?!\\\\\\n?$)))",
+      "begin": "[ \\t]*+(?!(?:[!\\&|(){\\[<>#\\n]|$|[; \\t]))(?!nocorrect |nocorrect\\t|nocorrect$|readonly |readonly\\t|readonly$|function |function\\t|function$|foreach |foreach\\t|foreach$|coproc |coproc\\t|coproc$|logout |logout\\t|logout$|export |export\\t|export$|select |select\\t|select$|repeat |repeat\\t|repeat$|pushd |pushd\\t|pushd$|until |until\\t|until$|while |while\\t|while$|local |local\\t|local$|case |case\\t|case$|done |done\\t|done$|elif |elif\\t|elif$|else |else\\t|else$|esac |esac\\t|esac$|popd |popd\\t|popd$|then |then\\t|then$|time |time\\t|time$|for |for\\t|for$|end |end\\t|end$|fi |fi\\t|fi$|do |do\\t|do$|in |in\\t|in$|if |if\\t|if$)(?!\\\\\\n?$)",
       "beginCaptures": {
       },
-      "end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+      "end": "(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\)",
       "endCaptures": {
       },
       "name": "meta.statement.command.shell",
@@ -597,7 +597,7 @@
           "name": "punctuation.definition.comment.shell"
         }
       },
-      "match": "(?:(?:^|(?:[ \\t]++))(?:((?:(#!)(?:.*)))|((?:(#)(?:.*)))))"
+      "match": "(?:^|[ \\t]++)(?:((#!).*)|((#).*))"
     },
     "comments": {
       "patterns": [
@@ -618,7 +618,7 @@
               "name": "punctuation.definition.logical-expression.shell"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.logical-expression.shell"
@@ -635,7 +635,7 @@
           ]
         },
         {
-          "begin": "(?<=\\s|^){(?=\\s|$)",
+          "begin": "(?<=\\s|^)\\{(?=\\s|$)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.shell"
@@ -657,7 +657,7 @@
       ]
     },
     "continuation_of_double_quoted_command_name": {
-      "begin": "(?:\\G(?<=\"))",
+      "begin": "\\G(?<=\")",
       "beginCaptures": {
       },
       "contentName": "meta.statement.command.name.continuation string.quoted.double entity.name.function.call entity.name.command",
@@ -669,7 +669,7 @@
       },
       "patterns": [
         {
-          "match": "\\\\[\\$\\n`\"\\\\]",
+          "match": "\\\\[$\\n`\"\\\\]",
           "name": "constant.character.escape.shell"
         },
         {
@@ -681,7 +681,7 @@
       ]
     },
     "continuation_of_single_quoted_command_name": {
-      "begin": "(?:\\G(?<='))",
+      "begin": "\\G(?<=')",
       "beginCaptures": {
       },
       "contentName": "meta.statement.command.name.continuation string.quoted.single entity.name.function.call entity.name.command",
@@ -703,7 +703,7 @@
     "double_quote_context": {
       "patterns": [
         {
-          "match": "\\\\[\\$`\"\\\\\\n]",
+          "match": "\\\\[$`\"\\\\\\n]",
           "name": "constant.character.escape.shell"
         },
         {
@@ -715,13 +715,13 @@
       ]
     },
     "double_quote_escape_char": {
-      "match": "\\\\[\\$`\"\\\\\\n]",
+      "match": "\\\\[$`\"\\\\\\n]",
       "name": "constant.character.escape.shell"
     },
     "floating_keyword": {
       "patterns": [
         {
-          "match": "(?<=^|;|&| |\\t)(?:then|elif|else|done|end|do|if|fi)(?= |\\t|;|&|$)",
+          "match": "(?<=^|[;\\& \\t])(?:then|elif|else|done|end|do|if|fi)(?=[ \\t;\\&]|$)",
           "name": "keyword.control.$0.shell"
         }
       ]
@@ -729,7 +729,7 @@
     "for_statement": {
       "patterns": [
         {
-          "begin": "(?:(\\bfor\\b)(?:(?:[ \\t]*+)((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:[ \\t]*+)(\\bin\\b)))",
+          "begin": "(\\bfor\\b)[ \\t]*+((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))[ \\t]*+(\\bin\\b)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.for.shell"
@@ -741,7 +741,7 @@
               "name": "keyword.control.in.shell"
             }
           },
-          "end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+          "end": "(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\)",
           "endCaptures": {
           },
           "name": "meta.for.in.shell",
@@ -764,7 +764,7 @@
               "name": "keyword.control.for.shell"
             }
           },
-          "end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+          "end": "(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\)",
           "endCaptures": {
           },
           "name": "meta.for.shell",
@@ -781,7 +781,7 @@
     },
     "function_definition": {
       "applyEndPatternLast": 1,
-      "begin": "(?:[ \\t]*+)(?:(?:(\\bfunction\\b)(?:[ \\t]*+)([^ \\t\\n\\r\\(\\)=\"']+)(?:(?:(\\()(?:[ \\t]*+)(\\)))?))|(?:([^ \\t\\n\\r\\(\\)=\"']+)(?:[ \\t]*+)(\\()(?:[ \\t]*+)(\\))))",
+      "begin": "[ \\t]*+(?:(\\bfunction\\b)[ \\t]*+([^ \\t\\n\\r()=\"']+)(?:(\\()[ \\t]*+(\\)))?|([^ \\t\\n\\r()=\"']+)[ \\t]*+(\\()[ \\t]*+(\\)))",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.shell"
@@ -805,13 +805,13 @@
           "name": "punctuation.definition.arguments.shell"
         }
       },
-      "end": "(?<=\\}|\\))",
+      "end": "(?<=[})])",
       "endCaptures": {
       },
       "name": "meta.function.shell",
       "patterns": [
         {
-          "match": "(?:\\G(?:\\t| |\\n))"
+          "match": "\\G[\\t \\n]"
         },
         {
           "begin": "\\{",
@@ -820,7 +820,7 @@
               "name": "punctuation.definition.group.shell punctuation.section.function.definition.shell"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.group.shell punctuation.section.function.definition.shell"
@@ -861,7 +861,7 @@
     "heredoc": {
       "patterns": [
         {
-          "begin": "(?:((?<!<)(?:<<-))(?:[ \\t]*+)(\"|')(?:[ \\t]*+)([^\"']+?)(?=\\s|;|&|<|\"|')((?:\\2))(.*))",
+          "begin": "((?<!<)<<-)[ \\t]*+([\"'])[ \\t]*+([^\"']+?)(?=[\\s;\\&<\"'])(\\2)(.*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -887,7 +887,7 @@
             }
           },
           "contentName": "string.quoted.heredoc.indent.$3",
-          "end": "(?:(?:^\\t*)(?:\\3)(?=\\s|;|&|$))",
+          "end": "^\\t*\\3(?=[\\s;\\&]|$)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.heredoc.$0.shell"
@@ -897,7 +897,7 @@
           ]
         },
         {
-          "begin": "(?:((?<!<)(?:<<)(?!<))(?:[ \\t]*+)(\"|')(?:[ \\t]*+)([^\"']+?)(?=\\s|;|&|<|\"|')((?:\\2))(.*))",
+          "begin": "((?<!<)<<(?!<))[ \\t]*+([\"'])[ \\t]*+([^\"']+?)(?=[\\s;\\&<\"'])(\\2)(.*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -923,7 +923,7 @@
             }
           },
           "contentName": "string.quoted.heredoc.no-indent.$3",
-          "end": "(?:^(?:\\3)(?=\\s|;|&|$))",
+          "end": "^\\3(?=[\\s;\\&]|$)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.heredoc.delimiter.shell"
@@ -933,7 +933,7 @@
           ]
         },
         {
-          "begin": "(?:((?<!<)(?:<<-))(?:[ \\t]*+)([^\"' \\t]+)(?=\\s|;|&|<|\"|')(.*))",
+          "begin": "((?<!<)<<-)[ \\t]*+([^\"' \\t]+)(?=[\\s;\\&<\"'])(.*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -953,7 +953,7 @@
             }
           },
           "contentName": "string.unquoted.heredoc.indent.$2",
-          "end": "(?:(?:^\\t*)(?:\\2)(?=\\s|;|&|$))",
+          "end": "^\\t*\\2(?=[\\s;\\&]|$)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.heredoc.delimiter.shell"
@@ -972,7 +972,7 @@
           ]
         },
         {
-          "begin": "(?:((?<!<)(?:<<)(?!<))(?:[ \\t]*+)([^\"' \\t]+)(?=\\s|;|&|<|\"|')(.*))",
+          "begin": "((?<!<)<<(?!<))[ \\t]*+([^\"' \\t]+)(?=[\\s;\\&<\"'])(.*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.heredoc.shell"
@@ -992,7 +992,7 @@
             }
           },
           "contentName": "string.unquoted.heredoc.no-indent.$2",
-          "end": "(?:^(?:\\2)(?=\\s|;|&|$))",
+          "end": "^\\2(?=[\\s;\\&]|$)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.heredoc.delimiter.shell"
@@ -1175,7 +1175,7 @@
         "3": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.shell punctuation.definition.comment.end.shell"
             },
             {
@@ -1185,7 +1185,7 @@
           ]
         }
       },
-      "match": "(\\/\\*)((?:(?:[^\\*]|(?:(?:\\*++)[^\\/]))*+)((?:(?:\\*++)\\/)))"
+      "match": "(/\\*)((?:[^*]|\\*++[^/])*+(\\*++/))"
     },
     "interpolation": {
       "patterns": [
@@ -1215,7 +1215,7 @@
               "name": "constant.character.escape.shell"
             },
             {
-              "begin": "(?<=\\W)(?=#)(?!#{)",
+              "begin": "(?<=\\W)(?=#)(?!#\\{)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.whitespace.comment.leading.shell"
@@ -1245,17 +1245,17 @@
     "keyword": {
       "patterns": [
         {
-          "match": "(?<=^|;|&|\\s)(then|else|elif|fi|for|in|do|done|select|continue|esac|while|until|return)(?=\\s|;|&|$)",
+          "match": "(?<=^|[;\\&\\s])(then|else|elif|fi|for|in|do|done|select|continue|esac|while|until|return)(?=[\\s;\\&]|$)",
           "name": "keyword.control.shell"
         },
         {
-          "match": "(?<=^|;|&|\\s)(?:export|declare|typeset|local|readonly)(?=\\s|;|&|$)",
+          "match": "(?<=^|[;\\&\\s])(?:export|declare|typeset|local|readonly)(?=[\\s;\\&]|$)",
           "name": "storage.modifier.shell"
         }
       ]
     },
     "line_comment": {
-      "begin": "(?:\\s*+)(\\/\\/)",
+      "begin": "\\s*+(//)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.shell"
@@ -1281,8 +1281,7 @@
           "include": "#arithmetic_no_dollar"
         },
         {
-          "comment": "do we want a special rule for ( expr )?",
-          "match": "=[=~]?|!=?|<|>|&&|\\|\\|",
+          "match": "=[=~]?|!=?|[<>]|&&|\\|\\|",
           "name": "keyword.operator.logical.shell"
         },
         {
@@ -1359,7 +1358,7 @@
           "name": "punctuation.definition.logical-expression.shell"
         }
       },
-      "end": "\\]\\]",
+      "end": "]]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.logical-expression.shell"
@@ -1379,7 +1378,7 @@
           "name": "punctuation.definition.logical-expression.shell"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.logical-expression.shell"
@@ -1395,7 +1394,7 @@
     "loop": {
       "patterns": [
         {
-          "begin": "(?<=^|;|&|\\s)(for)\\s+(.+?)\\s+(in)(?=\\s|;|&|$)",
+          "begin": "(?<=^|[;\\&\\s])(for)\\s+(.+?)\\s+(in)(?=[\\s;\\&]|$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
@@ -1412,7 +1411,7 @@
               "name": "keyword.control.shell"
             }
           },
-          "end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
+          "end": "(?<=^|[;\\&\\s])done(?=[\\s;\\&]|$|\\))",
           "endCaptures": {
             "0": {
               "name": "keyword.control.shell"
@@ -1426,13 +1425,13 @@
           ]
         },
         {
-          "begin": "(?<=^|;|&|\\s)(while|until)(?=\\s|;|&|$)",
+          "begin": "(?<=^|[;\\&\\s])(while|until)(?=[\\s;\\&]|$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
             }
           },
-          "end": "(?<=^|;|&|\\s)done(?=\\s|;|&|$|\\))",
+          "end": "(?<=^|[;\\&\\s])done(?=[\\s;\\&]|$|\\))",
           "endCaptures": {
             "0": {
               "name": "keyword.control.shell"
@@ -1446,7 +1445,7 @@
           ]
         },
         {
-          "begin": "(?<=^|;|&|\\s)(select)\\s+((?:[^\\s\\\\]|\\\\.)+)(?=\\s|;|&|$)",
+          "begin": "(?<=^|[;\\&\\s])(select)\\s+((?:[^\\s\\\\]|\\\\.)+)(?=[\\s;\\&]|$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.shell"
@@ -1455,7 +1454,7 @@
               "name": "variable.other.loop.shell"
             }
           },
-          "end": "(?<=^|;|&|\\s)(done)(?=\\s|;|&|$|\\))",
+          "end": "(?<=^|[;\\&\\s])(done)(?=[\\s;\\&]|$|\\))",
           "endCaptures": {
             "1": {
               "name": "keyword.control.shell"
@@ -1469,13 +1468,13 @@
           ]
         },
         {
-          "begin": "(?<=^|;|&|\\s)if(?=\\s|;|&|$)",
+          "begin": "(?<=^|[;\\&\\s])if(?=[\\s;\\&]|$)",
           "beginCaptures": {
             "0": {
               "name": "keyword.control.if.shell"
             }
           },
-          "end": "(?<=^|;|&|\\s)fi(?=\\s|;|&|$)",
+          "end": "(?<=^|[;\\&\\s])fi(?=[\\s;\\&]|$)",
           "endCaptures": {
             "0": {
               "name": "keyword.control.fi.shell"
@@ -1496,11 +1495,11 @@
           "include": "#variable"
         },
         {
-          "match": "\\+{1,2}|-{1,2}|!|~|\\*{1,2}|/|%|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|\\?|\\:|,|=|[*/%+\\-&^|]=|<<=|>>=",
+          "match": "\\+{1,2}|-{1,2}|[!~]|\\*{1,2}|[/%]|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|[?:,=]|[*/%+\\-\\&^|]=|<<=|>>=",
           "name": "keyword.operator.arithmetic.shell"
         },
         {
-          "match": "0[xX][0-9A-Fa-f]+",
+          "match": "0[xX]\\h+",
           "name": "constant.numeric.hex.shell"
         },
         {
@@ -1520,7 +1519,7 @@
           "name": "constant.numeric.integer.shell"
         },
         {
-          "match": "(?<!\\w)(?:[a-zA-Z_0-9]+)(?!\\w)",
+          "match": "(?<!\\w)[a-zA-Z_0-9]+(?!\\w)",
           "name": "variable.other.normal.shell"
         }
       ]
@@ -1528,11 +1527,11 @@
     "math_operators": {
       "patterns": [
         {
-          "match": "\\+{1,2}|-{1,2}|!|~|\\*{1,2}|/|%|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|\\?|\\:|,|=|[*/%+\\-&^|]=|<<=|>>=",
+          "match": "\\+{1,2}|-{1,2}|[!~]|\\*{1,2}|[/%]|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|[?:,=]|[*/%+\\-\\&^|]=|<<=|>>=",
           "name": "keyword.operator.arithmetic.shell"
         },
         {
-          "match": "0[xX][0-9A-Fa-f]+",
+          "match": "0[xX]\\h+",
           "name": "constant.numeric.hex.shell"
         },
         {
@@ -1561,7 +1560,7 @@
           "include": "#subshell_dollar"
         },
         {
-          "begin": "(?<![^ \\t])({)(?!\\w|\\$)",
+          "begin": "(?<![^ \\t])(\\{)(?![\\w$])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.group.shell"
@@ -1583,13 +1582,13 @@
       ]
     },
     "modified_assignment_statement": {
-      "begin": "(?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$)",
+      "begin": "(?<=^|[;\\& \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t;\\&]|$)",
       "beginCaptures": {
         "0": {
           "name": "storage.modifier.$0.shell"
         }
       },
-      "end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+      "end": "(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\)",
       "endCaptures": {
       },
       "name": "meta.statement.shell meta.expression.assignment.modified.shell",
@@ -1646,7 +1645,7 @@
               "name": "constant.numeric.shell constant.numeric.hex.shell"
             }
           },
-          "match": "(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?)(?:(?:(?:(\\=)|(\\+\\=))|(\\-\\=))?)(?:(?:(?<==| |\\t|^|\\{|\\(|\\[)(?:(?:(?:(?:(?:(0[xX][0-9A-Fa-f]+)|(0\\d+))|(\\d{1,2}#[0-9a-zA-Z@_]+))|(-?\\d+(?:\\.\\d+)))|(-?\\d+(?:\\.\\d+)+))|(-?\\d+))(?= |\\t|$|\\}|\\)|;))?))"
+          "match": "((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*)|(-?\\d+)))(]))?(?:(?:(=)|(\\+=))|(-=))?(?:(?<=[= \\t]|^|[{(\\[])(?:(?:(?:(?:(?:(0[xX]\\h+)|(0\\d+))|(\\d{1,2}#[0-9a-zA-Z@_]+))|(-?\\d+\\.\\d+))|(-?\\d+(?:\\.\\d+)+))|(-?\\d+))(?=[ \\t]|$|[});]))?"
         },
         {
           "include": "#normal_context"
@@ -1654,11 +1653,11 @@
       ]
     },
     "modifiers": {
-      "match": "(?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$)",
+      "match": "(?<=^|[;\\& \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t;\\&]|$)",
       "name": "storage.modifier.$0.shell"
     },
     "normal_assignment_statement": {
-      "begin": "(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
+      "begin": "[ \\t]*+((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*)|(-?\\d+)))(]))?(?:(?:(=)|(\\+=))|(-=))",
       "beginCaptures": {
         "1": {
           "name": "variable.other.assignment.shell"
@@ -1685,7 +1684,7 @@
           "name": "keyword.operator.assignment.compound.shell"
         }
       },
-      "end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+      "end": "(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\)",
       "endCaptures": {
       },
       "name": "meta.expression.assignment.shell",
@@ -1700,10 +1699,10 @@
           "include": "#normal_assignment_statement"
         },
         {
-          "begin": "(?<= |\\t)(?! |\\t|\\w+=)",
+          "begin": "(?<=[ \\t])(?![ \\t]|\\w+=)",
           "beginCaptures": {
           },
-          "end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+          "end": "(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\)",
           "endCaptures": {
           },
           "name": "meta.statement.command.env.shell",
@@ -1789,10 +1788,10 @@
       ]
     },
     "normal_statement": {
-      "begin": "(?:(?!^[ \\t]*+$)(?:(?<=^until | until |\\tuntil |^while | while |\\twhile |^elif | elif |\\telif |^else | else |\\telse |^then | then |\\tthen |^do | do |\\tdo |^if | if |\\tif )|(?<=(?:^|;|\\||&|!|\\(|\\{|\\`)))(?:[ \\t]*+)(?!nocorrect\\W|nocorrect\\$|function\\W|function\\$|foreach\\W|foreach\\$|repeat\\W|repeat\\$|logout\\W|logout\\$|coproc\\W|coproc\\$|select\\W|select\\$|while\\W|while\\$|pushd\\W|pushd\\$|until\\W|until\\$|case\\W|case\\$|done\\W|done\\$|elif\\W|elif\\$|else\\W|else\\$|esac\\W|esac\\$|popd\\W|popd\\$|then\\W|then\\$|time\\W|time\\$|for\\W|for\\$|end\\W|end\\$|fi\\W|fi\\$|do\\W|do\\$|in\\W|in\\$|if\\W|if\\$))",
+      "begin": "(?!^[ \\t]*+$)(?:(?<=^until | until |\\tuntil |^while | while |\\twhile |^elif | elif |\\telif |^else | else |\\telse |^then | then |\\tthen |^do | do |\\tdo |^if | if |\\tif )|(?<=(?:^|[;|\\&!({`])))[ \\t]*+(?!nocorrect\\W|nocorrect\\$|function\\W|function\\$|foreach\\W|foreach\\$|repeat\\W|repeat\\$|logout\\W|logout\\$|coproc\\W|coproc\\$|select\\W|select\\$|while\\W|while\\$|pushd\\W|pushd\\$|until\\W|until\\$|case\\W|case\\$|done\\W|done\\$|elif\\W|elif\\$|else\\W|else\\$|esac\\W|esac\\$|popd\\W|popd\\$|then\\W|then\\$|time\\W|time\\$|for\\W|for\\$|end\\W|end\\$|fi\\W|fi\\$|do\\W|do\\$|in\\W|in\\$|if\\W|if\\$)",
       "beginCaptures": {
       },
-      "end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+      "end": "(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\)",
       "endCaptures": {
       },
       "name": "meta.statement.shell",
@@ -1840,10 +1839,10 @@
           "name": "constant.numeric.shell constant.numeric.integer.shell"
         }
       },
-      "match": "(?<==| |\\t|^|\\{|\\(|\\[)(?:(?:(?:(?:(?:(0[xX][0-9A-Fa-f]+)|(0\\d+))|(\\d{1,2}#[0-9a-zA-Z@_]+))|(-?\\d+(?:\\.\\d+)))|(-?\\d+(?:\\.\\d+)+))|(-?\\d+))(?= |\\t|$|\\}|\\)|;)"
+      "match": "(?<=[= \\t]|^|[{(\\[])(?:(?:(?:(?:(?:(0[xX]\\h+)|(0\\d+))|(\\d{1,2}#[0-9a-zA-Z@_]+))|(-?\\d+\\.\\d+))|(-?\\d+(?:\\.\\d+)+))|(-?\\d+))(?=[ \\t]|$|[});])"
     },
     "option": {
-      "begin": "(?:(?:[ \\t]++)(-)((?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))))",
+      "begin": "[ \\t]++(-)((?!(?:[!\\&|(){\\[<>#\\n]|$|[; \\t])))",
       "beginCaptures": {
         "1": {
           "name": "string.unquoted.argument.shell constant.other.option.dash.shell"
@@ -1853,7 +1852,7 @@
         }
       },
       "contentName": "string.unquoted.argument constant.other.option",
-      "end": "(?:(?=[ \\t])|(?:(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)))",
+      "end": "(?:(?=[ \\t])|(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\))",
       "endCaptures": {
       },
       "patterns": [
@@ -1923,11 +1922,11 @@
     "pathname": {
       "patterns": [
         {
-          "match": "(?<=\\s|:|=|^)~",
+          "match": "(?<=[\\s:=]|^)~",
           "name": "keyword.operator.tilde.shell"
         },
         {
-          "match": "\\*|\\?",
+          "match": "[*?]",
           "name": "keyword.operator.glob.shell"
         },
         {
@@ -1958,7 +1957,7 @@
     "pipeline": {
       "patterns": [
         {
-          "match": "(?<=^|;|&|\\s)(time)(?=\\s|;|&|$)",
+          "match": "(?<=^|[;\\&\\s])(time)(?=[\\s;\\&]|$)",
           "name": "keyword.other.shell"
         },
         {
@@ -1976,7 +1975,7 @@
           "name": "string.unquoted.argument.shell"
         }
       },
-      "match": "(?:(>>?)(?:[ \\t]*+)([^ \t\n>&;<>\\(\\)\\$`\\\\\"'<\\|]+))"
+      "match": "(>>?)[ \\t]*+([^ \\t\\n>\\&;<()$`\\\\\"'|]+)"
     },
     "redirect_number": {
       "captures": {
@@ -1990,7 +1989,7 @@
           "name": "keyword.operator.redirect.$3.shell"
         }
       },
-      "match": "(?<=[ \\t])(?:(?:(1)|(2)|(\\d+))(?=>))"
+      "match": "(?<=[ \\t])(?:(1)|(2)|(\\d+))(?=>)"
     },
     "redirection": {
       "patterns": [
@@ -2015,19 +2014,19 @@
           ]
         },
         {
-          "match": "(?<![<>])(&>|\\d*>&\\d*|\\d*(>>|>|<)|\\d*<&|\\d*<>)(?![<>])",
+          "match": "(?<![<>])(&>|\\d*>&\\d*|\\d*(>>|[><])|\\d*<&|\\d*<>)(?![<>])",
           "name": "keyword.operator.redirect.shell"
         }
       ]
     },
     "regex_comparison": {
-      "match": "\\=~",
+      "match": "=~",
       "name": "keyword.operator.logical.regex.shell"
     },
     "regexp": {
       "patterns": [
         {
-          "match": "(?:.+)"
+          "match": ".+"
         }
       ]
     },
@@ -2044,23 +2043,23 @@
                   "name": "string.unquoted.argument.shell constant.other.option.shell"
                 }
               },
-              "match": "(?:[ \\t]++)(\\-)(\\w+)"
+              "match": "[ \\t]++(-)(\\w+)"
             }
           ]
         }
       },
-      "match": "(?:(?:[ \\t]++)\\-(?:\\w+))*"
+      "match": "(?:[ \\t]++-\\w+)*"
     },
     "simple_unquoted": {
-      "match": "[^ \\t\\n>&;<>\\(\\)\\$`\\\\\"'<\\|]",
+      "match": "[^ \\t\\n>\\&;<()$`\\\\\"'|]",
       "name": "string.unquoted.shell"
     },
     "special_expansion": {
-      "match": "!|:[-=?]?|\\*|@|##|#|%%|%|\\/",
+      "match": "!|:[-=?]?|[*@]|##|#|%%|[%/]",
       "name": "keyword.operator.expansion.shell"
     },
     "start_of_command": {
-      "match": "(?:(?:[ \\t]*+)(?:(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!nocorrect |nocorrect\t|nocorrect$|readonly |readonly\t|readonly$|function |function\t|function$|foreach |foreach\t|foreach$|coproc |coproc\t|coproc$|logout |logout\t|logout$|export |export\t|export$|select |select\t|select$|repeat |repeat\t|repeat$|pushd |pushd\t|pushd$|until |until\t|until$|while |while\t|while$|local |local\t|local$|case |case\t|case$|done |done\t|done$|elif |elif\t|elif$|else |else\t|else$|esac |esac\t|esac$|popd |popd\t|popd$|then |then\t|then$|time |time\t|time$|for |for\t|for$|end |end\t|end$|fi |fi\t|fi$|do |do\t|do$|in |in\t|in$|if |if\t|if$)(?!\\\\\\n?$)))"
+      "match": "[ \\t]*+(?!(?:[!\\&|(){\\[<>#\\n]|$|[; \\t]))(?!nocorrect |nocorrect\\t|nocorrect$|readonly |readonly\\t|readonly$|function |function\\t|function$|foreach |foreach\\t|foreach$|coproc |coproc\\t|coproc$|logout |logout\\t|logout$|export |export\\t|export$|select |select\\t|select$|repeat |repeat\\t|repeat$|pushd |pushd\\t|pushd$|until |until\\t|until$|while |while\\t|while$|local |local\\t|local$|case |case\\t|case$|done |done\\t|done$|elif |elif\\t|elif$|else |else\\t|else$|esac |esac\\t|esac$|popd |popd\\t|popd$|then |then\\t|then$|time |time\\t|time$|for |for\\t|for$|end |end\\t|end$|fi |fi\\t|fi$|do |do\\t|do$|in |in\\t|in$|if |if\\t|if$)(?!\\\\\\n?$)"
     },
     "string": {
       "patterns": [
@@ -2099,7 +2098,7 @@
           "name": "string.quoted.double.shell",
           "patterns": [
             {
-              "match": "\\\\[\\$\\n`\"\\\\]",
+              "match": "\\\\[$\\n`\"\\\\]",
               "name": "constant.character.escape.shell"
             },
             {
@@ -2126,7 +2125,7 @@
           "name": "string.quoted.single.dollar.shell",
           "patterns": [
             {
-              "match": "\\\\(?:a|b|e|f|n|r|t|v|\\\\|')",
+              "match": "\\\\[abefnrtv\\\\']",
               "name": "constant.character.escape.ansi-c.shell"
             },
             {
@@ -2134,7 +2133,7 @@
               "name": "constant.character.escape.octal.shell"
             },
             {
-              "match": "\\\\x[0-9a-fA-F]{2}\"",
+              "match": "\\\\x\\h{2}\"",
               "name": "constant.character.escape.hex.shell"
             },
             {
@@ -2148,7 +2147,7 @@
     "subshell_dollar": {
       "patterns": [
         {
-          "begin": "(?:\\$\\()",
+          "begin": "\\$\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.subshell.single.shell"
@@ -2175,7 +2174,7 @@
     "support": {
       "patterns": [
         {
-          "match": "(?<=^|;|&|\\s)(?::|\\.)(?=\\s|;|&|$)",
+          "match": "(?<=^|[;\\&\\s])[:.](?=[\\s;\\&]|$)",
           "name": "support.function.builtin.shell"
         }
       ]
@@ -2222,7 +2221,7 @@
               "name": "variable.parameter.positional.all.shell"
             }
           },
-          "match": "(?:(\\$)(\\@(?!\\w)))"
+          "match": "(\\$)(@(?!\\w))"
         },
         {
           "captures": {
@@ -2233,7 +2232,7 @@
               "name": "variable.parameter.positional.shell"
             }
           },
-          "match": "(?:(\\$)([0-9](?!\\w)))"
+          "match": "(\\$)([0-9](?!\\w))"
         },
         {
           "captures": {
@@ -2244,10 +2243,10 @@
               "name": "variable.language.special.shell"
             }
           },
-          "match": "(?:(\\$)([-*#?$!0_](?!\\w)))"
+          "match": "(\\$)([-*#?$!0_](?!\\w))"
         },
         {
-          "begin": "(?:(\\$)(\\{)(?:[ \\t]*+)(?=\\d))",
+          "begin": "(\\$)(\\{)[ \\t]*+(?=\\d)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.variable.shell variable.parameter.positional.shell"
@@ -2257,7 +2256,7 @@
             }
           },
           "contentName": "meta.parameter-expansion",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.bracket.curly.variable.end.shell punctuation.definition.variable.shell variable.parameter.positional.shell"
@@ -2275,7 +2274,7 @@
               "name": "variable.parameter.positional.shell"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w)",
+              "match": "(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)",
               "name": "variable.other.normal.shell"
             },
             {
@@ -2287,7 +2286,7 @@
           ]
         },
         {
-          "begin": "(?:(\\$)(\\{))",
+          "begin": "(\\$)(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.variable.shell"
@@ -2297,7 +2296,7 @@
             }
           },
           "contentName": "meta.parameter-expansion",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.bracket.curly.variable.end.shell punctuation.definition.variable.shell"
@@ -2311,7 +2310,7 @@
               "include": "#array_access_inline"
             },
             {
-              "match": "(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w)",
+              "match": "(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)",
               "name": "variable.other.normal.shell"
             },
             {
@@ -2331,7 +2330,7 @@
               "name": "variable.other.normal.shell"
             }
           },
-          "match": "(?:(\\$)((?:\\w+)(?!\\w)))"
+          "match": "(\\$)(\\w+(?!\\w))"
         }
       ]
     },
@@ -2344,7 +2343,7 @@
               "name": "keyword.control.while.shell"
             }
           },
-          "end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+          "end": "(?=[;|\\&\\n)`{}]|[ \\t]*#|])(?<!\\\\)",
           "endCaptures": {
           },
           "name": "meta.while.shell",
diff --git a/resources/languages/shellsession.json b/resources/languages/shellsession.json
index 513d85e..b494ca6 100644
--- a/resources/languages/shellsession.json
+++ b/resources/languages/shellsession.json
@@ -22,7 +22,7 @@
           ]
         }
       },
-      "match": "^(?:((?:\\(\\S+\\)\\s*)?(?:sh\\S*?|\\w+\\S+[@:]\\S+(?:\\s+\\S+)?|\\[\\S+?[@:][^\\n]+?\\].*?))\\s*)?([>$#%❯➜]|\\p{Greek})\\s+(.*)$"
+      "match": "^(?:((?:\\(\\S+\\)\\s*)?(?:sh\\S*?|\\w+\\S+[@:]\\S+(?:\\s+\\S+)?|\\[\\S+?[@:]\\N+?].*?))\\s*)?([>$#%❯➜\\p{Greek}])\\s+(.*)$"
     },
     {
       "match": "^.+$",
diff --git a/resources/languages/smalltalk.json b/resources/languages/smalltalk.json
index a6016e5..fa5e83d 100644
--- a/resources/languages/smalltalk.json
+++ b/resources/languages/smalltalk.json
@@ -4,7 +4,7 @@
     "st"
   ],
   "foldingStartMarker": "\\[",
-  "foldingStopMarker": "^\\s*\\]|^\\s\\]",
+  "foldingStopMarker": "^(?:\\s*]|\\s])",
   "name": "smalltalk",
   "patterns": [
     {
@@ -28,7 +28,6 @@
       "name": "keyword.operator.assignment.smalltalk"
     },
     {
-      "comment": "Parse the variable declaration like: |a b c|",
       "match": "/^:\\w*\\s*\\|/",
       "name": "constant.other.block.smalltalk"
     },
@@ -62,18 +61,17 @@
           ]
         }
       },
-      "comment": "Parse the blocks like: [ :a :b | ...... ]",
       "match": "\\[((\\s+|:\\w+)*)\\|"
     },
     {
       "include": "#numeric"
     },
     {
-      "match": "<(?!<|=)|>(?!<|=|>)|<=|>=|=|==|~=|~~|>>|\\^",
+      "match": "<(?![<=])|>(?![<=>])|<=|>=|=|==|~=|~~|>>|\\^",
       "name": "keyword.operator.comparison.smalltalk"
     },
     {
-      "match": "(\\*|\\+|\\-|/|\\\\)",
+      "match": "([*+\\-/\\\\])",
       "name": "keyword.operator.arithmetic.smalltalk"
     },
     {
@@ -81,12 +79,10 @@
       "name": "keyword.operator.logical.smalltalk"
     },
     {
-      "comment": "Fake reserved word -> main Smalltalk messages",
       "match": "(?<!\\.)\\b(ensure|resume|retry|signal)\\b(?![?!])",
       "name": "keyword.control.smalltalk"
     },
     {
-      "comment": "Fake conditionals. Smalltalk Methods.",
       "match": "ifCurtailed:|ifTrue:|ifFalse:|whileFalse:|whileTrue:",
       "name": "keyword.control.conditionals.smalltalk"
     },
@@ -134,8 +130,7 @@
           "name": "punctuation.definition.constant.smalltalk"
         }
       },
-      "comment": "messages/methods",
-      "match": "(?>[a-zA-Z_]\\w*(?>[?!])?)(:)(?!:)",
+      "match": "(?>[a-zA-Z_]\\w*[?!]?)(:)(?!:)",
       "name": "constant.other.messages.smalltalk"
     },
     {
@@ -144,7 +139,6 @@
           "name": "punctuation.definition.constant.smalltalk"
         }
       },
-      "comment": "symbols",
       "match": "(#)[a-zA-Z_][a-zA-Z0-9_:]*",
       "name": "constant.other.symbol.smalltalk"
     },
@@ -155,7 +149,7 @@
           "name": "punctuation.definition.constant.begin.smalltalk"
         }
       ],
-      "end": "\\]",
+      "end": "]",
       "endCaptures": [
         {
           "name": "punctuation.definition.constant.end.smalltalk"
@@ -180,7 +174,6 @@
           "name": "punctuation.definition.constant.begin.smalltalk"
         }
       ],
-      "comment": "Array Constructor",
       "end": "\\)",
       "endCaptures": [
         {
diff --git a/resources/languages/solidity.json b/resources/languages/solidity.json
index 87af9d9..8025a5c 100644
--- a/resources/languages/solidity.json
+++ b/resources/languages/solidity.json
@@ -176,11 +176,11 @@
               "name": "keyword.control.import"
             }
           },
-          "end": "(?=\\;)",
+          "end": "(?=;)",
           "patterns": [
             {
               "begin": "((?=\\{))",
-              "end": "((?=\\}))",
+              "end": "((?=}))",
               "patterns": [
                 {
                   "match": "\\b(\\w+)\\b",
@@ -222,7 +222,7 @@
           "name": "constant.other.pragma"
         }
       },
-      "match": "\\b(pragma)(?:\\s+([A-Za-z_]\\w+)\\s+([^\\s]+))?\\b"
+      "match": "\\b(pragma)(?:\\s+([A-Za-z_]\\w+)\\s+(\\S+))?\\b"
     },
     "control-unchecked": {
       "match": "\\b(unchecked)\\b",
@@ -383,7 +383,7 @@
               "name": "entity.name.type.enum"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "match": "\\b(\\w+)\\b",
@@ -479,7 +479,7 @@
               "name": "entity.name.function"
             }
           },
-          "end": "(?=\\{|;)",
+          "end": "(?=[{;])",
           "patterns": [
             {
               "include": "#natspec"
@@ -700,6 +700,9 @@
         {
           "include": "#type-modifier-immutable"
         },
+        {
+          "include": "#type-modifier-transient"
+        },
         {
           "include": "#type-modifier-extend-scope"
         },
@@ -777,7 +780,7 @@
               "name": "entity.name.type.struct"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "#type-primitive"
@@ -837,7 +840,7 @@
           "name": "keyword.control.exceptions"
         },
         {
-          "match": "\\b(selfdestruct|suicide)\\b",
+          "match": "\\b(s(?:elfdestruct|uicide))\\b",
           "name": "keyword.control.contract"
         },
         {
@@ -1012,7 +1015,7 @@
       "name": "constant.numeric.decimal"
     },
     "number-hex": {
-      "match": "\\b(0[xX][a-fA-F0-9]+)\\b",
+      "match": "\\b(0[xX]\\h+)\\b",
       "name": "constant.numeric.hexadecimal"
     },
     "number-scientific": {
@@ -1039,19 +1042,19 @@
       ]
     },
     "operator-arithmetic": {
-      "match": "(\\+|\\-|\\/|\\*)",
+      "match": "([+\\-/*])",
       "name": "keyword.operator.arithmetic"
     },
     "operator-assignment": {
-      "match": "(\\:?=)",
+      "match": "(:?=)",
       "name": "keyword.operator.assignment"
     },
     "operator-binary": {
-      "match": "(\\^|\\&|\\||<<|>>)",
+      "match": "([\\^\\&|]|<<|>>)",
       "name": "keyword.operator.binary"
     },
     "operator-logic": {
-      "match": "(==|\\!=|<(?!<)|<=|>(?!>)|>=|\\&\\&|\\|\\||\\:(?!=)|\\?|\\!)",
+      "match": "(==|!=|<(?!<)|<=|>(?!>)|>=|&&|\\|\\||:(?!=)|[?!])",
       "name": "keyword.operator.logic"
     },
     "operator-mapping": {
@@ -1093,7 +1096,7 @@
           "name": "punctuation.brace.curly.begin"
         },
         {
-          "match": "\\}",
+          "match": "}",
           "name": "punctuation.brace.curly.end"
         },
         {
@@ -1101,7 +1104,7 @@
           "name": "punctuation.brace.square.begin"
         },
         {
-          "match": "\\]",
+          "match": "]",
           "name": "punctuation.brace.square.end"
         },
         {
@@ -1117,11 +1120,11 @@
     "string": {
       "patterns": [
         {
-          "match": "\\\"(?:\\\\\"|[^\\\"])*\\\"",
+          "match": "\"(?:\\\\\"|[^\"])*\"",
           "name": "string.quoted.double"
         },
         {
-          "match": "\\'(?:\\\\'|[^\\'])*\\'",
+          "match": "'(?:\\\\'|[^'])*'",
           "name": "string.quoted.single"
         }
       ]
@@ -1146,10 +1149,14 @@
       "match": "\\b(nonpayable|payable)\\b",
       "name": "storage.type.modifier.payable"
     },
+    "type-modifier-transient": {
+      "match": "\\b(transient)\\b",
+      "name": "storage.type.modifier.readonly"
+    },
     "type-primitive": {
       "patterns": [
         {
-          "begin": "\\b(address|string\\d*|bytes\\d*|int\\d*|uint\\d*|bool|hash\\d*)\\b(?:\\[\\])(\\()",
+          "begin": "\\b(address|string\\d*|bytes\\d*|int\\d*|uint\\d*|bool|hash\\d*)\\b\\[](\\()",
           "beginCaptures": {
             "1": {
               "name": "support.type.primitive"
@@ -1185,7 +1192,7 @@
               "name": "variable.parameter.function"
             }
           },
-          "match": "\\b(\\_\\w+)\\b"
+          "match": "\\b(_\\w+)\\b"
         },
         {
           "captures": {
@@ -1193,7 +1200,7 @@
               "name": "support.variable.property"
             }
           },
-          "match": "(?:\\.)(\\w+)\\b"
+          "match": "\\.(\\w+)\\b"
         },
         {
           "captures": {
diff --git a/resources/languages/soy.json b/resources/languages/soy.json
index 5dcd691..02398c0 100644
--- a/resources/languages/soy.json
+++ b/resources/languages/soy.json
@@ -46,7 +46,7 @@
           "name": "entity.name.type.soy"
         }
       },
-      "match": "{(alias)\\s+([\\w\\.]+)(?:\\s+(as)\\s+(\\w+))?}"
+      "match": "\\{(alias)\\s+([\\w.]+)(?:\\s+(as)\\s+(\\w+))?}"
     },
     "attribute": {
       "captures": {
@@ -109,7 +109,7 @@
     "call": {
       "patterns": [
         {
-          "begin": "{((?:del)?call)\\s+([\\w\\.]+)(?=[^/]*?})",
+          "begin": "\\{((?:del)?call)\\s+([\\w.]+)(?=[^/]*?})",
           "beginCaptures": {
             "1": {
               "name": "storage.type.function.soy"
@@ -118,7 +118,7 @@
               "name": "entity.name.function.soy"
             }
           },
-          "end": "{/(\\1)}",
+          "end": "\\{/(\\1)}",
           "endCaptures": {
             "1": {
               "name": "storage.type.function.soy"
@@ -140,7 +140,7 @@
           ]
         },
         {
-          "begin": "{((?:del)?call)(\\s+[\\w\\.]+)",
+          "begin": "\\{((?:del)?call)(\\s+[\\w.]+)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.function.soy"
@@ -182,13 +182,13 @@
           ]
         },
         {
-          "match": "^\\s*(\\/\\/.*)$",
+          "match": "^\\s*(//.*)$",
           "name": "comment.line.double-slash.soy"
         }
       ]
     },
     "condition": {
-      "begin": "{/?(if|elseif|switch|case)\\s*",
+      "begin": "\\{/?(if|elseif|switch|case)\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.soy"
@@ -210,10 +210,10 @@
           "name": "keyword.control.soy"
         }
       },
-      "match": "{(else|ifempty|default)}"
+      "match": "\\{(else|ifempty|default)}"
     },
     "css": {
-      "begin": "{(css)\\s+",
+      "begin": "\\{(css)\\s+",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.soy"
@@ -235,7 +235,7 @@
           "name": "entity.name.type.soy"
         }
       },
-      "match": "{(delpackage)\\s+([\\w\\.]+)}"
+      "match": "\\{(delpackage)\\s+([\\w.]+)}"
     },
     "expression": {
       "patterns": [
@@ -263,7 +263,7 @@
       ]
     },
     "for": {
-      "begin": "{/?(foreach|for)(?=\\s|})",
+      "begin": "\\{/?(for(?:each|))(?=[\\s}])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.soy"
@@ -300,7 +300,7 @@
     "let": {
       "patterns": [
         {
-          "begin": "{(let)\\s+(\\$\\w+\\s*:)",
+          "begin": "\\{(let)\\s+(\\$\\w+\\s*:)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.soy"
@@ -320,7 +320,7 @@
           ]
         },
         {
-          "begin": "{(let)\\s+(\\$\\w+)",
+          "begin": "\\{(let)\\s+(\\$\\w+)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.soy"
@@ -329,7 +329,7 @@
               "name": "variable.soy"
             }
           },
-          "end": "{/(\\1)}",
+          "end": "\\{/(\\1)}",
           "endCaptures": {
             "1": {
               "name": "storage.type.soy"
@@ -347,13 +347,13 @@
       ]
     },
     "literal": {
-      "begin": "{(literal)}",
+      "begin": "\\{(literal)}",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.soy"
         }
       },
-      "end": "{/(\\1)}",
+      "end": "\\{/(\\1)}",
       "endCaptures": {
         "1": {
           "name": "keyword.other.soy"
@@ -368,7 +368,7 @@
         }
       },
       "end": "}",
-      "match": "{/?(msg|fallbackmsg)",
+      "match": "\\{/?(msg|fallbackmsg)",
       "patterns": [
         {
           "include": "#attribute"
@@ -384,24 +384,24 @@
           "name": "entity.name.type.soy"
         }
       },
-      "match": "{(namespace)\\s+([\\w\\.]+)}"
+      "match": "\\{(namespace)\\s+([\\w.]+)}"
     },
     "null": {
       "match": "null",
       "name": "language.constant.null.soy"
     },
     "number": {
-      "match": "-?\\.?\\d+|\\d[\\.\\d]*",
+      "match": "-?\\.?\\d+|\\d[.\\d]*",
       "name": "language.constant.numeric"
     },
     "operator": {
-      "match": "-|not|\\*|\\/|%|\\+|<=|>=|<|>|==|!=|and|or|\\?:|\\?|:",
+      "match": "-|not|[*/%+]|<=|>=|[<>]|==|!=|and|or|\\?:|[?:]",
       "name": "keyword.operator.soy"
     },
     "param": {
       "patterns": [
         {
-          "begin": "{(param)\\s+(\\w+\\s*\\:)",
+          "begin": "\\{(param)\\s+(\\w+\\s*:)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.soy"
@@ -418,7 +418,7 @@
           ]
         },
         {
-          "begin": "{(param)\\s+(\\w+)",
+          "begin": "\\{(param)\\s+(\\w+)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.soy"
@@ -427,7 +427,7 @@
               "name": "variable.parameter.soy"
             }
           },
-          "end": "{/(\\1)}",
+          "end": "\\{/(\\1)}",
           "endCaptures": {
             "1": {
               "name": "storage.type.soy"
@@ -445,7 +445,7 @@
       ]
     },
     "print": {
-      "begin": "{(print)?\\s*",
+      "begin": "\\{(print)?\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.soy"
@@ -472,7 +472,7 @@
           "name": "language.support.constant"
         }
       },
-      "match": "{(sp|nil|\\\\r|\\\\n|\\\\t|lb|rb)}"
+      "match": "\\{(sp|nil|\\\\r|\\\\n|\\\\t|lb|rb)}"
     },
     "string": {
       "begin": "'",
@@ -480,13 +480,13 @@
       "name": "string.quoted.single.soy",
       "patterns": [
         {
-          "match": "\\\\(?:[\\\\'\"nrtbf]|u[0-9a-fA-F]{4})",
+          "match": "\\\\(?:[\\\\'\"nrtbf]|u\\h{4})",
           "name": "constant.character.escape.soy"
         }
       ]
     },
     "template": {
-      "begin": "{(template|deltemplate)\\s([\\w\\.]+)",
+      "begin": "\\{(template|deltemplate)\\s([\\w.]+)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.soy"
@@ -495,7 +495,7 @@
           "name": "entity.name.function.soy"
         }
       },
-      "end": "{(/\\1)}",
+      "end": "\\{(/\\1)}",
       "endCaptures": {
         "1": {
           "name": "storage.type.soy"
@@ -503,7 +503,7 @@
       },
       "patterns": [
         {
-          "begin": "{(@param)(\\??)\\s+(\\S+\\s*:)",
+          "begin": "\\{(@param)(\\??)\\s+(\\S+\\s*:)",
           "beginCaptures": {
             "1": {
               "name": "keyword.parameter.soy"
@@ -565,7 +565,7 @@
       ]
     },
     "variable-ref": {
-      "match": "\\$[\\a-zA-Z_][\\w\\.]*",
+      "match": "\\$[\\a-zA-Z_][\\w.]*",
       "name": "variable.other.soy"
     },
     "variant": {
@@ -592,7 +592,7 @@
       ]
     },
     "xid": {
-      "begin": "{(xid)\\s+",
+      "begin": "\\{(xid)\\s+",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.soy"
diff --git a/resources/languages/sparql.json b/resources/languages/sparql.json
index acd3d23..9671de8 100644
--- a/resources/languages/sparql.json
+++ b/resources/languages/sparql.json
@@ -25,7 +25,7 @@
   ],
   "repository": {
     "expression-operators": {
-      "match": "(?:\\|\\||&&|=|!=|<|>|<=|>=|\\*|/|\\+|-|\\||\\^|\\?|\\!)",
+      "match": "(?:\\|\\||&&|=|!=|[<>]|<=|>=|[*/+\\-|^?!])",
       "name": "support.class.sparql"
     },
     "functions": {
diff --git a/resources/languages/splunk.json b/resources/languages/splunk.json
index dbcd233..c28053a 100644
--- a/resources/languages/splunk.json
+++ b/resources/languages/splunk.json
@@ -7,57 +7,46 @@
   "name": "splunk",
   "patterns": [
     {
-      "comment": "Splunk Built-in functions",
-      "match": "(?<=(\\||\\[))([\\s]*)\\b(abstract|accum|addcoltotals|addinfo|addtotals|analyzefields|anomalies|anomalousvalue|append|appendcols|appendpipe|arules|associate|audit|autoregress|bucket|bucketdir|chart|cluster|collect|concurrency|contingency|convert|correlate|crawl|datamodel|dbinspect|dbxquery|dbxlookup|dedup|delete|delta|diff|dispatch|erex|eval|eventcount|eventstats|extract|fieldformat|fields|fieldsummary|file|filldown|fillnull|findtypes|folderize|foreach|format|from|gauge|gentimes|geostats|head|highlight|history|input|inputcsv|inputlookup|iplocation|join|kmeans|kvform|loadjob|localize|localop|lookup|makecontinuous|makemv|makeresults|map|metadata|metasearch|multikv|multisearch|mvcombine|mvexpand|nomv|outlier|outputcsv|outputlookup|outputtext|overlap|pivot|predict|rangemap|rare|regex|relevancy|reltime|rename|replace|rest|return|reverse|rex|rtorder|run|savedsearch|script|scrub|search|searchtxn|selfjoin|sendemail|set|setfields|sichart|sirare|sistats|sitimechart|sitop|sort|spath|stats|strcat|streamstats|table|tags|tail|timechart|top|transaction|transpose|trendline|tscollect|tstats|typeahead|typelearner|typer|uniq|untable|where|x11|xmlkv|xmlunescape|xpath|xyseries)\\b(?=[\\s])",
+      "match": "(?<=([|\\[]))(\\s*)\\b(abstract|accum|addcoltotals|addinfo|addtotals|analyzefields|anomalies|anomalousvalue|append|appendcols|appendpipe|arules|associate|audit|autoregress|bucket|bucketdir|chart|cluster|collect|concurrency|contingency|convert|correlate|crawl|datamodel|dbinspect|dbxquery|dbxlookup|dedup|delete|delta|diff|dispatch|erex|eval|eventcount|eventstats|extract|fieldformat|fields|fieldsummary|file|filldown|fillnull|findtypes|folderize|foreach|format|from|gauge|gentimes|geostats|head|highlight|history|input|inputcsv|inputlookup|iplocation|join|kmeans|kvform|loadjob|localize|localop|lookup|makecontinuous|makemv|makeresults|map|metadata|metasearch|multikv|multisearch|mvcombine|mvexpand|nomv|outlier|outputcsv|outputlookup|outputtext|overlap|pivot|predict|rangemap|rare|regex|relevancy|reltime|rename|replace|rest|return|reverse|rex|rtorder|run|savedsearch|script|scrub|search|searchtxn|selfjoin|sendemail|set|setfields|sichart|sirare|sistats|sitimechart|sitop|sort|spath|stats|strcat|streamstats|table|tags|tail|timechart|top|transaction|transpose|trendline|tscollect|tstats|typeahead|typelearner|typer|uniq|untable|where|x11|xmlkv|xmlunescape|xpath|xyseries)\\b(?=\\s)",
       "name": "support.class.splunk_search"
     },
     {
-      "comment": "Splunk Eval functions",
       "match": "\\b(abs|acos|acosh|asin|asinh|atan|atan2|atanh|case|cidrmatch|ceiling|coalesce|commands|cos|cosh|exact|exp|floor|hypot|if|in|isbool|isint|isnotnull|isnull|isnum|isstr|len|like|ln|log|lower|ltrim|match|max|md5|min|mvappend|mvcount|mvdedup|mvfilter|mvfind|mvindex|mvjoin|mvrange|mvsort|mvzip|now|null|nullif|pi|pow|printf|random|relative_time|replace|round|rtrim|searchmatch|sha1|sha256|sha512|sigfig|sin|sinh|spath|split|sqrt|strftime|strptime|substr|tan|tanh|time|tonumber|tostring|trim|typeof|upper|urldecode|validate)(?=\\()\\b",
       "name": "support.function.splunk_search"
     },
     {
-      "comment": "Splunk Transforming functions",
       "match": "\\b(avg|count|distinct_count|estdc|estdc_error|eval|max|mean|median|min|mode|percentile|range|stdev|stdevp|sum|sumsq|var|varp|first|last|list|values|earliest|earliest_time|latest|latest_time|per_day|per_hour|per_minute|per_second|rate)\\b",
       "name": "support.function.splunk_search"
     },
     {
-      "comment": "Splunk Macro Names",
-      "match": "(?<=\\`)[\\w]+(?=\\(|\\`)",
+      "match": "(?<=`)\\w+(?=[(`])",
       "name": "entity.name.function.splunk_search"
     },
     {
-      "comment": "Digits",
       "match": "\\b(\\d+)\\b",
       "name": "constant.numeric.splunk_search"
     },
     {
-      "comment": "Escape Characters",
-      "match": "(\\\\\\\\|\\\\\\||\\\\\\*|\\\\\\=)",
+      "match": "(\\\\[\\\\|*=])",
       "name": "contant.character.escape.splunk_search"
     },
     {
-      "comment": "Splunk Operators",
       "match": "(\\|,)",
       "name": "keyword.operator.splunk_search"
     },
     {
-      "comment": "Splunk Language Constants",
       "match": "(?i)\\b(as|by|or|and|over|where|output|outputnew)\\b|(?-i)\\b(NOT|true|false)\\b",
       "name": "constant.language.splunk_search"
     },
     {
-      "comment": "Splunk Macro Parameters",
-      "match": "(?<=\\(|,|[^=]\\s{300})([^\\(\\)\\\",=]+)(?=\\)|,)",
+      "match": "(?<=[(,]|[^=]\\s{300})([^()\",=]+)(?=[),])",
       "name": "variable.parameter.splunk_search"
     },
     {
-      "comment": "Splunk Variables",
-      "match": "([\\w\\.]+)(\\[\\]|\\{\\})?([\\s]*)(?=\\=)",
+      "match": "([\\w.]+)(\\[]|\\{})?(\\s*)(?==)",
       "name": "variable.splunk_search"
     },
     {
-      "comment": "Comparison or assignment",
       "match": "=",
       "name": "keyword.operator.splunk_search"
     },
@@ -72,7 +61,7 @@
       "name": "string.quoted.single.splunk_search"
     },
     {
-      "begin": "query=\\\"",
+      "begin": "query=\"",
       "end": "(?<!\\\\)\"",
       "name": "meta.embedded.block.sql"
     },
diff --git a/resources/languages/sql.json b/resources/languages/sql.json
index 83db1e2..52f417d 100644
--- a/resources/languages/sql.json
+++ b/resources/languages/sql.json
@@ -7,7 +7,7 @@
       "name": "text.variable"
     },
     {
-      "match": "(\\[)[^\\]]*(\\])",
+      "match": "(\\[)[^\\]]*(])",
       "name": "text.bracketed"
     },
     {
@@ -118,7 +118,7 @@
           "name": "storage.type.sql"
         }
       },
-      "match": "(?xi)\n\n\t\t\t\t# normal stuff, capture 1\n\t\t\t\t \\b(bigint|bigserial|bit|boolean|box|bytea|cidr|circle|date|double\\sprecision|inet|int|integer|line|lseg|macaddr|money|oid|path|point|polygon|real|serial|smallint|sysdate|text)\\b\n\n\t\t\t\t# numeric suffix, capture 2 + 3i\n\t\t\t\t|\\b(bit\\svarying|character\\s(?:varying)?|tinyint|var\\schar|float|interval)\\((\\d+)\\)\n\n\t\t\t\t# optional numeric suffix, capture 4 + 5i\n\t\t\t\t|\\b(char|number|varchar\\d?)\\b(?:\\((\\d+)\\))?\n\n\t\t\t\t# special case, capture 6 + 7i + 8i\n\t\t\t\t|\\b(numeric|decimal)\\b(?:\\((\\d+),(\\d+)\\))?\n\n\t\t\t\t# special case, captures 9, 10i, 11\n\t\t\t\t|\\b(times?)\\b(?:\\((\\d+)\\))?(\\swith(?:out)?\\stime\\szone\\b)?\n\n\t\t\t\t# special case, captures 12, 13, 14i, 15\n\t\t\t\t|\\b(timestamp)(?:(s|tz))?\\b(?:\\((\\d+)\\))?(\\s(with|without)\\stime\\szone\\b)?\n\n\t\t\t"
+      "match": "(?i)\\b(bigint|bigserial|bit|boolean|box|bytea|cidr|circle|date|double\\sprecision|inet|int|integer|line|lseg|macaddr|money|oid|path|point|polygon|real|serial|smallint|sysdate|text)\\b|\\b(bit\\svarying|character\\s(?:varying)?|tinyint|var\\schar|float|interval)\\((\\d+)\\)|\\b(char|number|varchar\\d?)\\b(?:\\((\\d+)\\))?|\\b(numeric|decimal)\\b(?:\\((\\d+),(\\d+)\\))?|\\b(times?)\\b(?:\\((\\d+)\\))?(\\swith(?:out)?\\stime\\szone\\b)?|\\b(timestamp)(s|tz)?\\b(?:\\((\\d+)\\))?(\\s(with(?:|out))\\stime\\szone\\b)?"
     },
     {
       "match": "(?i:\\b((?:primary|foreign)\\s+key|references|on\\sdelete(\\s+cascade)?|nocheck|check|constraint|collate|default)\\b)",
@@ -169,11 +169,11 @@
       "name": "keyword.operator.star.sql"
     },
     {
-      "match": "[!<>]?=|<>|<|>",
+      "match": "[!<>]?=|<>|[<>]",
       "name": "keyword.operator.comparison.sql"
     },
     {
-      "match": "-|\\+|/",
+      "match": "[-+/]",
       "name": "keyword.operator.math.sql"
     },
     {
@@ -366,7 +366,7 @@
       "include": "#regexps"
     },
     {
-      "match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|connection|containment|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_fulltext_language|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filegrowth|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|for|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|incremental|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|match|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|nested_triggers|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|seconds|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|shortest_path|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|target_recovery_time|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|transform_noise_words|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|two_digit_year_cutoff|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b",
+      "match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|connection|containment|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_fulltext_language|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filegrowth|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|for|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|incremental|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|match|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|nested_triggers|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|seconds|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|shortest_path|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|target_recovery_time|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|transform_noise_words|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|two_digit_year_cutoff|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|vector|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b",
       "name": "keyword.other.sql"
     },
     {
@@ -378,7 +378,6 @@
           "name": "punctuation.section.scope.end.sql"
         }
       },
-      "comment": "Allow for special ↩ behavior",
       "match": "(\\()(\\))",
       "name": "meta.block.sql"
     }
@@ -471,8 +470,7 @@
               "name": "punctuation.definition.string.begin.sql"
             }
           },
-          "comment": "We should probably handle nested bracket pairs!?! -- Allan",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.sql"
@@ -500,7 +498,7 @@
           "name": "punctuation.definition.string.end.sql"
         }
       },
-      "match": "(#\\{)([^\\}]*)(\\})",
+      "match": "(#\\{)([^}]*)(})",
       "name": "string.interpolated.sql"
     },
     "strings": {
@@ -514,7 +512,6 @@
               "name": "punctuation.definition.string.end.sql"
             }
           },
-          "comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
           "match": "(N)?(')[^']*(')",
           "name": "string.quoted.single.sql"
         },
@@ -547,7 +544,6 @@
               "name": "punctuation.definition.string.end.sql"
             }
           },
-          "comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
           "match": "(`)[^`\\\\]*(`)",
           "name": "string.quoted.other.backtick.sql"
         },
@@ -580,7 +576,6 @@
               "name": "punctuation.definition.string.end.sql"
             }
           },
-          "comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
           "match": "(\")[^\"#]*(\")",
           "name": "string.quoted.double.sql"
         },
@@ -611,7 +606,7 @@
               "name": "punctuation.definition.string.begin.sql"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.sql"
diff --git a/resources/languages/ssh-config.json b/resources/languages/ssh-config.json
index a22a6fa..4de5898 100644
--- a/resources/languages/ssh-config.json
+++ b/resources/languages/ssh-config.json
@@ -8,7 +8,7 @@
   "name": "ssh-config",
   "patterns": [
     {
-      "match": "\\b(A(cceptEnv|dd(ressFamily|KeysToAgent)|llow(AgentForwarding|Groups|StreamLocalForwarding|TcpForwarding|Users)|uth(enticationMethods|orized((Keys(Command(User)?|File)|Principals(Command(User)?|File)))))|B(anner|atchMode|ind(Address|Interface))|C(anonical(Domains|ize(FallbackLocal|Hostname|MaxDots|PermittedCNAMEs))|ertificateFile|hallengeResponseAuthentication|heckHostIP|hrootDirectory|iphers?|learAllForwardings|ientAlive(CountMax|Interval)|ompression(Level)?|onnect(Timeout|ionAttempts)|ontrolMaster|ontrolPath|ontrolPersist)|D(eny(Groups|Users)|isableForwarding|ynamicForward)|E(nableSSHKeysign|scapeChar|xitOnForwardFailure|xposeAuthInfo)|F(ingerprintHash|orceCommand|orward(Agent|X11(Timeout|Trusted)?))|G(atewayPorts|SSAPI(Authentication|CleanupCredentials|ClientIdentity|DelegateCredentials|KeyExchange|RenewalForcesRekey|ServerIdentity|StrictAcceptorCheck|TrustDns)|atewayPorts|lobalKnownHostsFile)|H(ashKnownHosts|ost(based(AcceptedKeyTypes|Authentication|KeyTypes|UsesNameFromPacketOnly)|Certificate|Key(Agent|Algorithms|Alias)?|Name))|I(dentit(iesOnly|y(Agent|File))|gnore(Rhosts|Unknown|UserKnownHosts)|nclude|PQoS)|K(bdInteractive(Authentication|Devices)|erberos(Authentication|GetAFSToken|OrLocalPasswd|TicketCleanup)|exAlgorithms)|L(istenAddress|ocal(Command|Forward)|oginGraceTime|ogLevel)|M(ACs|atch|ax(AuthTries|Sessions|Startups))|N(oHostAuthenticationForLocalhost|umberOfPasswordPrompts)|P(KCS11Provider|asswordAuthentication|ermit(EmptyPasswords|LocalCommand|Open|RootLogin|TTY|Tunnel|User(Environment|RC))|idFile|ort|referredAuthentications|rint(LastLog|Motd)|rotocol|roxy(Command|Jump|UseFdpass)|ubkey(AcceptedKeyTypes|Authentication))|R(Domain|SAAuthentication|ekeyLimit|emote(Command|Forward)|equestTTY|evoked(HostKeys|Keys)|hostsRSAAuthentication)|S(endEnv|erverAlive(CountMax|Interval)|treamLocalBind(Mask|Unlink)|trict(HostKeyChecking|Modes)|ubsystem|yslogFacility)|T(CPKeepAlive|rustedUserCAKeys|unnel(Device)?)|U(pdateHostKeys|se(BlacklistedKeys|DNS|Keychain|PAM|PrivilegedPort|r(KnownHostsFile)?))|V(erifyHostKeyDNS|ersionAddendum|isualHostKey)|X(11(DisplayOffset|Forwarding|UseLocalhost)|AuthLocation))\\b",
+      "match": "\\b(A(cceptEnv|dd(ressFamily|KeysToAgent)|llow(AgentForwarding|Groups|StreamLocalForwarding|TcpForwarding|Users)|uth(enticationMethods|orized((Keys(Command(User)?|File)|Principals(Command(User)?|File)))))|B(anner|atchMode|ind(Address|Interface))|C(anonical(Domains|ize(FallbackLocal|Hostname|MaxDots|PermittedCNAMEs))|ertificateFile|hallengeResponseAuthentication|heckHostIP|hrootDirectory|iphers?|learAllForwardings|ientAlive(CountMax|Interval)|ompression(Level)?|onnect(Timeout|ionAttempts)|ontrolMaster|ontrolPath|ontrolPersist)|D(eny(Groups|Users)|isableForwarding|ynamicForward)|E(nableSSHKeysign|scapeChar|xitOnForwardFailure|xposeAuthInfo)|F(ingerprintHash|orceCommand|orward(Agent|X11(T(?:imeout|rusted))?))|G(atewayPorts|SSAPI(Authentication|CleanupCredentials|ClientIdentity|DelegateCredentials|KeyExchange|RenewalForcesRekey|ServerIdentity|StrictAcceptorCheck|TrustDns)|atewayPorts|lobalKnownHostsFile)|H(ashKnownHosts|ost(based(AcceptedKeyTypes|Authentication|KeyTypes|UsesNameFromPacketOnly)|Certificate|Key(A(?:gent|lgorithms|lias))?|Name))|I(dentit(iesOnly|y(Agent|File))|gnore(Rhosts|Unknown|UserKnownHosts)|nclude|PQoS)|K(bdInteractive(Authentication|Devices)|erberos(Authentication|GetAFSToken|OrLocalPasswd|TicketCleanup)|exAlgorithms)|L(istenAddress|ocal(Command|Forward)|oginGraceTime|ogLevel)|M(ACs|atch|ax(AuthTries|Sessions|Startups))|N(oHostAuthenticationForLocalhost|umberOfPasswordPrompts)|P(KCS11Provider|asswordAuthentication|ermit(EmptyPasswords|LocalCommand|Open|RootLogin|TTY|Tunnel|User(Environment|RC))|idFile|ort|referredAuthentications|rint(LastLog|Motd)|rotocol|roxy(Command|Jump|UseFdpass)|ubkey(A(?:cceptedKeyTypes|uthentication)))|R(Domain|SAAuthentication|ekeyLimit|emote(Command|Forward)|equestTTY|evoked(HostKeys|Keys)|hostsRSAAuthentication)|S(endEnv|erverAlive(CountMax|Interval)|treamLocalBind(Mask|Unlink)|trict(HostKeyChecking|Modes)|ubsystem|yslogFacility)|T(CPKeepAlive|rustedUserCAKeys|unnel(Device)?)|U(pdateHostKeys|se(BlacklistedKeys|DNS|Keychain|PAM|PrivilegedPort|r(KnownHostsFile)?))|V(erifyHostKeyDNS|ersionAddendum|isualHostKey)|X(11(DisplayOffset|Forwarding|UseLocalhost)|AuthLocation))\\b",
       "name": "keyword.other.ssh-config"
     },
     {
@@ -65,7 +65,7 @@
           "name": "meta.toc-list.ssh-config"
         }
       },
-      "match": "(?:^| |\\t)(Host)\\s+((.*))$"
+      "match": "(?:^|[ \\t])(Host)\\s+((.*))$"
     },
     {
       "match": "\\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b",
diff --git a/resources/languages/stata.json b/resources/languages/stata.json
index 0dffd1e..744dc8a 100644
--- a/resources/languages/stata.json
+++ b/resources/languages/stata.json
@@ -6,7 +6,7 @@
     "mata"
   ],
   "foldingStartMarker": "\\{\\s*$",
-  "foldingStopMarker": "^\\s*\\}",
+  "foldingStopMarker": "^\\s*}",
   "name": "stata",
   "patterns": [
     {
@@ -49,7 +49,6 @@
       "include": "#macro-commands"
     },
     {
-      "comment": "keywords that delimit flow conditionals",
       "match": "\\b(if|else if|else)\\b",
       "name": "keyword.control.conditional.stata"
     },
@@ -59,10 +58,10 @@
           "name": "storage.type.scalar.stata"
         }
       },
-      "match": "^\\s*(sca(lar|la|l)?(\\s+de(fine|fin|fi|f)?)?)\\s+(?!(drop|dir?|l(ist|is|i)?)\\s+)"
+      "match": "^\\s*(sca(l(?:ar|a|))?(\\s+de(f(?:ine|in|i|))?)?)\\s+(?!(drop|dir?|l(i(?:st|s|))?)\\s+)"
     },
     {
-      "begin": "\\b(mer(ge|g)?)\\s+(1|m|n)(:)(1|m|n)",
+      "begin": "\\b(mer(g(?:e|))?)\\s+([1mn])(:)([1mn])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.flow.stata"
@@ -73,7 +72,7 @@
               "include": "#constants"
             },
             {
-              "match": "m|n",
+              "match": "[mn]",
               "name": ""
             }
           ]
@@ -87,7 +86,7 @@
               "include": "#constants"
             },
             {
-              "match": "m|n",
+              "match": "[mn]",
               "name": ""
             }
           ]
@@ -131,10 +130,10 @@
           "name": "keyword.control.flow.stata"
         }
       },
-      "match": "\\b(foreach)\\s+((?!in|of).+)\\s+(in|of var(list|lis|li|l)?|of new(list|lis|li|l)?|of num(list|lis|li|l)?)\\b"
+      "match": "\\b(foreach)\\s+((?!in|of).+)\\s+(in|of var(l(?:ist|is|i|))?|of new(l(?:ist|is|i|))?|of num(l(?:ist|is|i|))?)\\b"
     },
     {
-      "begin": "\\b(foreach)\\s+((?!in|of).+)\\s+(of loc(al|a)?|of glo(bal|ba|b)?)\\b\\s*",
+      "begin": "\\b(foreach)\\s+((?!in|of).+)\\s+(of (?:loc(a(?:l|))?|glo(b(?:al|a|))?))\\b\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.flow.stata"
@@ -170,13 +169,13 @@
       ]
     },
     {
-      "begin": "\\b(forvalues|forvalue|forvalu|forval|forva|forv)\\s*",
+      "begin": "\\b(forv(?:alues|alue|alu|al|a|))\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.flow.stata"
         }
       },
-      "end": "\\s*(=)\\s*([^\\{]+)\\s*|(?=\\n)",
+      "end": "\\s*(=)\\s*([^{]+)\\s*|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.assignment.stata"
@@ -211,7 +210,6 @@
       ]
     },
     {
-      "comment": "keywords that delimit loops",
       "match": "\\b(while|continue)\\b",
       "name": "keyword.control.flow.stata"
     },
@@ -221,17 +219,14 @@
           "name": "keyword.other.stata"
         }
       },
-      "comment": "keywords that haven't fit into other groups (yet).",
-      "match": "\\b(as|ass|asse|asser|assert)\\b"
+      "match": "\\b(as(?:|s|se|ser|sert))\\b"
     },
     {
-      "comment": "prefixes that require a colon",
-      "match": "\\b(by(sort|sor|so|s)?|statsby|rolling|bootstrap|jackknife|permute|simulate|svy|mi est(imate|imat|ima|im|i)?|nestreg|stepwise|xi|fp|mfp|vers(ion|io|i)?)\\b",
+      "match": "\\b(by(s(?:ort|or|o|))?|statsby|rolling|bootstrap|jackknife|permute|simulate|svy|mi est(i(?:mate|mat|ma|m|))?|nestreg|stepwise|xi|fp|mfp|vers(i(?:on|o|))?)\\b",
       "name": "storage.type.function.stata"
     },
     {
-      "comment": "prefixes that don't need a colon",
-      "match": "\\b(qui(etly|etl|et|e)?|n(oisily|oisil|oisi|ois|oi|o)?|cap(ture|tur|tu|t)?)\\b:?",
+      "match": "\\b(qui(e(?:tly|tl|t|))?|n(o(?:isily|isil|isi|is|i|))?|cap(t(?:ure|ur|u|))?)\\b:?",
       "name": "keyword.control.flow.stata"
     },
     {
@@ -246,10 +241,10 @@
           "name": "entity.name.function.stata"
         }
       },
-      "match": "\\s*(pr(ogram|ogra|ogr|og|o)?)\\s+((di(r)?|drop|l(ist|is|i)?)\\s+)([\\w&&[^0-9]]\\w{0,31})"
+      "match": "\\s*(pr(o(?:gram|gra|gr|g|))?)\\s+((di(r)?|drop|l(i(?:st|s|))?)\\s+)([\\w&&[^0-9]]\\w{0,31})"
     },
     {
-      "begin": "^\\s*(pr(ogram|ogra|ogr|og|o)?)\\s+(de(fine|fin|fi|f)?\\s+)?",
+      "begin": "^\\s*(pr(o(?:gram|gra|gr|g|))?)\\s+(de(f(?:ine|in|i|))?\\s+)?",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.stata"
@@ -258,7 +253,7 @@
           "name": "storage.type.function.stata"
         }
       },
-      "end": "(?=,|\\n|/)",
+      "end": "(?=[,\\n/])",
       "patterns": [
         {
           "include": "#macro-local"
@@ -280,7 +275,7 @@
       "captures": {
         "1": "keyword.functions.data.stata.test"
       },
-      "match": "\\b(form(at|a)?)\\s*([\\w&&[^0-9]]\\w{0,31})*\\s*(%)(-)?(0)?([0-9]+)(.)([0-9]+)(e|f|g)(c)?"
+      "match": "\\b(form(a(?:t|))?)\\s*([\\w&&[^0-9]]\\w{0,31})*\\s*(%)(-)?(0)?([0-9]+)(.)([0-9]+)([efg])(c)?"
     },
     {
       "include": "#braces-with-error"
@@ -296,8 +291,7 @@
               "name": "keyword.functions.program.stata"
             }
           },
-          "comment": "color before the comma",
-          "end": "(?=,|\\n)",
+          "end": "(?=[,\\n])",
           "patterns": [
             {
               "begin": "///",
@@ -309,7 +303,7 @@
               "name": "punctuation.definition.parameters.begin.stata"
             },
             {
-              "match": "\\]",
+              "match": "]",
               "name": "punctuation.definition.parameters.end.stata"
             },
             {
@@ -368,7 +362,6 @@
               "name": "punctuation.definition.variable.begin.stata"
             }
           },
-          "comment": "things to color after the comma",
           "end": "(?=\\n)",
           "patterns": [
             {
@@ -380,7 +373,6 @@
               "begin": "([^\\s\\[\\]]+)(\\()",
               "beginCaptures": {
                 "1": {
-                  "comment": "these are the names that become macros",
                   "patterns": [
                     {
                       "include": "#macro-local-identifiers"
@@ -397,7 +389,6 @@
                   "name": "keyword.operator.parentheses.stata"
                 }
               },
-              "comment": "color options with parentheses",
               "end": "\\)",
               "endCaptures": {
                 "0": {
@@ -411,7 +402,6 @@
                       "name": "support.type.stata"
                     }
                   },
-                  "comment": "the first word is often a type",
                   "match": "\\b(integer|intege|integ|inte|int|real|string|strin|stri|str)\\b"
                 },
                 {
@@ -471,12 +461,10 @@
           "name": "keyword.functions.data.stata"
         }
       },
-      "comment": "one-word commands",
-      "match": "\\b(sa(v|ve)|saveold|destring|tostring|u(se|s)?|note(s)?|form(at|a)?)\\b"
+      "match": "\\b(sa(v(?:|e))|saveold|destring|tostring|u(s(?:e|))?|note(s)?|form(a(?:t|))?)\\b"
     },
     {
-      "comment": "programming commands",
-      "match": "\\b(exit|end)\\b",
+      "match": "\\b(e(?:xit|nd))\\b",
       "name": "keyword.functions.data.stata"
     },
     {
@@ -525,7 +513,7 @@
           "name": "keyword.operator.assignment.stata"
         }
       },
-      "match": "\\b(g(enerate|enerat|enera|ener|ene|en|e)?|egen)\\s+((byte|int|long|float|double|str[1-9]?[0-9]?[0-9]?[0-9]?|strL)\\s+)?([^=\\s]+)\\s*((==)|(=))"
+      "match": "\\b(g(e(?:nerate|nerat|nera|ner|ne|n|))?|egen)\\s+((byte|int|long|float|double|str[1-9]?[0-9]?[0-9]?[0-9]?|strL)\\s+)?([^=\\s]+)\\s*((==)|(=))"
     },
     {
       "captures": {
@@ -536,7 +524,7 @@
           "name": "support.type.stata"
         }
       },
-      "match": "\\b(set ty(pe|p)?)\\s+((byte|int|long|float|double|str[1-9]?[0-9]?[0-9]?[0-9]?|strL)?\\s+)\\b"
+      "match": "\\b(set ty(p(?:e|))?)\\s+((byte|int|long|float|double|str[1-9]?[0-9]?[0-9]?[0-9]?|strL)?\\s+)\\b"
     },
     {
       "captures": {
@@ -567,7 +555,7 @@
               "include": "#macro-global"
             },
             {
-              "match": "[^`\\$]{81,}",
+              "match": "[^`$]{81,}",
               "name": "invalid.illegal.name.stata"
             },
             {
@@ -580,7 +568,7 @@
           "name": "punctuation.definition.string.begin.stata"
         }
       },
-      "match": "\\b(la(bel|be|b)?)\\s+(var(iable|iabl|iab|ia|i)?)\\s+([\\w&&[^0-9]]\\w{0,31})\\s+(`\")(.+)(\"')"
+      "match": "\\b(la(b(?:el|e|))?)\\s+(var(i(?:able|abl|ab|a|))?)\\s+([\\w&&[^0-9]]\\w{0,31})\\s+(`\")(.+)(\"')"
     },
     {
       "captures": {
@@ -608,7 +596,7 @@
               "include": "#macro-global"
             },
             {
-              "match": "[^`\\$]{81,}",
+              "match": "[^`$]{81,}",
               "name": "invalid.illegal.name.stata"
             },
             {
@@ -621,7 +609,7 @@
           "name": "punctuation.definition.string.begin.stata"
         }
       },
-      "match": "\\b(la(bel|be|b)?)\\s+(var(iable|iabl|iab|ia|i)?)\\s+([\\w&&[^0-9]]\\w{0,31})\\s+(\")(.+)(\")"
+      "match": "\\b(la(b(?:el|e|))?)\\s+(var(i(?:able|abl|ab|a|))?)\\s+([\\w&&[^0-9]]\\w{0,31})\\s+(\")(.+)(\")"
     },
     {
       "captures": {
@@ -632,10 +620,10 @@
           "name": "keyword.functions.data.stata"
         }
       },
-      "match": "\\b(la(bel|be|b)?)\\s+(da(ta|t)?|var(iable|iabl|iab|ia|i)?|de(f|fi|fin|fine)?|val(ues|ue|u)?|di(r)?|l(ist|is|i)?|copy|drop|save|lang(uage|uag|ua|u)?)\\b"
+      "match": "\\b(la(b(?:el|e|))?)\\s+(da(t(?:a|))?|var(i(?:able|abl|ab|a|))?|de(f(?:|i|in|ine))?|val(u(?:es|e|))?|di(r)?|l(i(?:st|s|))?|copy|drop|save|lang(u(?:age|ag|a|))?)\\b"
     },
     {
-      "begin": "\\b(drop|keep)\\b(?!\\s+(if|in)\\b)",
+      "begin": "\\b(drop|keep)\\b(?!\\s+(i[fn])\\b)",
       "beginCaptures": {
         "1": {
           "name": "keyword.functions.data.stata"
@@ -644,7 +632,7 @@
       "end": "\\n",
       "patterns": [
         {
-          "match": "\\b(if|in)\\b",
+          "match": "\\b(i[fn])\\b",
           "name": "invalid.illegal.name.stata"
         },
         {
@@ -670,11 +658,10 @@
           "name": "keyword.functions.data.stata"
         }
       },
-      "match": "\\b(drop|keep)\\s+(if|in)\\b"
+      "match": "\\b(drop|keep)\\s+(i[fn])\\b"
     },
     {
       "begin": "^\\s*mata:?\\s*$",
-      "comment": "won't match single-line Mata statements",
       "end": "^\\s*end\\s*$\\n?",
       "name": "meta.embedded.block.mata",
       "patterns": [
@@ -695,7 +682,6 @@
           "name": "storage.type.mata"
         },
         {
-          "comment": "need to end with whitespace character here or last group doesn't match",
           "match": "\\b(transmorphic|string|numeric|real|complex|(pointer(\\([^)]+\\))?))\\s",
           "name": "storage.type.eltype.mata"
         },
@@ -704,7 +690,7 @@
           "name": "storage.type.orgtype.mata"
         },
         {
-          "match": "\\!|\\+\\+|\\-\\-|\\&|\\'|\\?|\\\\|\\:\\:|\\,|\\.\\.|\\||\\=|\\=\\=|\\>\\=|\\<\\=|\\<|\\>|\\!\\=|\\#|\\+|\\-|\\*|\\^|\\/",
+          "match": "!|\\+\\+|--|[\\&'?\\\\]|::|,|\\.\\.|[|=]|==|>=|<=|[<>]|!=|[#+\\-*^/]",
           "name": "keyword.operator.mata"
         },
         {
@@ -761,7 +747,7 @@
     "ascii-regex-character-class": {
       "patterns": [
         {
-          "match": "\\\\[\\*\\+\\?\\-\\.\\^\\$\\|\\[\\]\\(\\)\\\\]",
+          "match": "\\\\[*+?\\-.^$|\\[\\]()\\\\]",
           "name": "constant.character.escape.backslash.stata"
         },
         {
@@ -782,7 +768,7 @@
               "name": "keyword.operator.negation.stata"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.stata"
@@ -802,7 +788,7 @@
                   "name": "constant.character.escape.backslash.stata"
                 }
               },
-              "match": "((\\\\.)|.)\\-((\\\\.)|[^\\]])",
+              "match": "((\\\\.)|.)-((\\\\.)|[^\\]])",
               "name": "constant.other.character-class.range.stata"
             }
           ]
@@ -868,7 +854,6 @@
               "name": "punctuation.definition.parameters.end.stata"
             }
           },
-          "comment": "color regexm with regular quotes i.e. \" ",
           "match": "\\b(regexm)(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)\\s*(\\))"
         },
         {
@@ -925,7 +910,6 @@
               "name": "punctuation.definition.parameters.end.stata"
             }
           },
-          "comment": "color regexm with compound quotes",
           "match": "\\b(regexm)(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')\\s*(\\))"
         },
         {
@@ -1015,8 +999,7 @@
               ]
             }
           },
-          "comment": "color regexr with regular quotes i.e. \" ",
-          "match": "\\b(regexr)(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)\\s*([^\\)]*)(\\))"
+          "match": "\\b(regexr)(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)\\s*([^)]*)(\\))"
         },
         {
           "captures": {
@@ -1102,8 +1085,7 @@
               "name": "punctuation.definition.parameters.end.stata"
             }
           },
-          "comment": "color regexr with compound quotes i.e. `\"text\"' ",
-          "match": "\\b(regexr)(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')\\s*([^\\)]*)(\\))"
+          "match": "\\b(regexr)(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')\\s*([^)]*)(\\))"
         }
       ]
     },
@@ -1114,12 +1096,11 @@
           "name": "keyword.control.anchor.stata"
         },
         {
-          "comment": "matched when not a global, but must be ascii",
-          "match": "\\$(?![a-zA-Z_\\{])",
+          "match": "\\$(?![a-zA-Z_{])",
           "name": "keyword.control.anchor.stata"
         },
         {
-          "match": "[\\?\\+\\*]",
+          "match": "[?+*]",
           "name": "keyword.control.quantifier.stata"
         },
         {
@@ -1127,7 +1108,7 @@
           "name": "keyword.control.or.stata"
         },
         {
-          "begin": "(\\()(?=\\?|\\*|\\+)",
+          "begin": "(\\()(?=[?*+])",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.group.stata"
@@ -1170,7 +1151,6 @@
           "include": "#macro-global"
         },
         {
-          "comment": "NOTE: Error if I have .+ No idea why but it works fine it seems with just .",
           "match": ".",
           "name": "string.quoted.stata"
         }
@@ -1196,8 +1176,7 @@
               ]
             }
           },
-          "comment": "correct with nothing else on the line but whitespace; before and after; before; after; correct",
-          "end": "^\\s*(\\})\\s*$|^\\s*([^\\*\"\\}]+)\\s+(\\})\\s*([^\\*\"\\}/\\n]+)|^\\s*([^\"\\*\\}]+)\\s+(\\})|\\s*(\\})\\s*([^\"\\*\\}/\\n]+)|(\\})$",
+          "end": "^\\s*(})\\s*$|^\\s*([^*\"}]+)\\s+(})\\s*([^*\"}/\\n]+)|^\\s*([^\"*}]+)\\s+(})|\\s*(})\\s*([^\"*}/\\n]+)|(})$",
           "endCaptures": {
             "1": {
               "name": "keyword.control.block.end.stata"
@@ -1244,7 +1223,7 @@
               "name": "keyword.control.block.begin.stata"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "keyword.control.block.end.stata"
@@ -1264,7 +1243,7 @@
     "builtin_variables": {
       "patterns": [
         {
-          "match": "\\b(_b|_coef|_cons|_n|_N|_rc|_se)\\b",
+          "match": "\\b(_(?:b|coef|cons|[nN]|rc|se))\\b",
           "name": "variable.object.stata"
         }
       ]
@@ -1272,12 +1251,10 @@
     "commands-other": {
       "patterns": [
         {
-          "comment": "Add on commands",
           "match": "\\b(reghdfe|ivreghdfe|ivreg2|outreg|gcollapse|gcontract|gegen|gisid|glevelsof|gquantiles)\\b",
           "name": "keyword.control.flow.stata"
         },
         {
-          "comment": "Built in commands",
           "match": "\\b(about|ac|acprplot|ado|adopath|adoupdate|alpha|ameans|an|ano|anov|anova|anova_terms|anovadef|aorder|ap|app|appe|appen|append|arch|arch_dr|arch_estat|arch_p|archlm|areg|areg_p|args|arima|arima_dr|arima_estat|arima_p|asmprobit|asmprobit_estat|asmprobit_lf|asmprobit_mfx__dlg|asmprobit_p|avplot|avplots|bcskew0|bgodfrey|binreg|bip0_lf|biplot|bipp_lf|bipr_lf|bipr_p|biprobit|bitest|bitesti|bitowt|blogit|bmemsize|boot|bootsamp|boxco_l|boxco_p|boxcox|boxcox_p|bprobit|br|break|brier|bro|brow|brows|browse|brr|brrstat|bs|bsampl_w|bsample|bsqreg|bstat|bstrap|ca|ca_estat|ca_p|cabiplot|camat|canon|canon_estat|canon_p|caprojection|cat|cc|cchart|cci|cd|censobs_table|centile|cf|char|chdir|checkdlgfiles|checkestimationsample|checkhlpfiles|checksum|chelp|ci|cii|cl|class|classutil|clear|cli|clis|clist|clog|clog_lf|clog_p|clogi|clogi_sw|clogit|clogit_lf|clogit_p|clogitp|clogl_sw|cloglog|clonevar|clslistarray|cluster|cluster_measures|cluster_stop|cluster_tree|cluster_tree_8|clustermat|cmdlog|cnr|cnre|cnreg|cnreg_p|cnreg_sw|cnsreg|codebook|collaps4|collapse|colormult_nb|colormult_nw|compare|compress|conf|confi|confir|confirm|conren|cons|const|constr|constra|constrai|constrain|constraint|contract|copy|copyright|copysource|cor|corc|corr|corr2data|corr_anti|corr_kmo|corr_smc|corre|correl|correla|correlat|correlate|corrgram|cou|coun|count|cprplot|crc|cret|cretu|cretur|creturn|cross|cs|cscript|cscript_log|csi|ct|ct_is|ctset|ctst_st|cttost|cumsp|cumul|cusum|cutil|d|datasig|datasign|datasigna|datasignat|datasignatu|datasignatur|datasignature|datetof|db|dbeta|de|dec|deco|decod|decode|deff|des|desc|descr|descri|describ|describe|dfbeta|dfgls|dfuller|di|di_g|dir|dirstats|dis|discard|disp|disp_res|disp_s|displ|displa|display|do|doe|doed|doedi|doedit|dotplot|dprobit|drawnorm|ds|ds_util|dstdize|duplicates|durbina|dwstat|dydx|ed|edi|edit|eivreg|emdef|en|enc|enco|encod|encode|eq|erase|ereg|ereg_lf|ereg_p|ereg_sw|ereghet|ereghet_glf|ereghet_glf_sh|ereghet_gp|ereghet_ilf|ereghet_ilf_sh|ereghet_ip|eret|eretu|eretur|ereturn|err|erro|error|est|est_cfexist|est_cfname|est_clickable|est_expand|est_hold|est_table|est_unhold|est_unholdok|estat|estat_default|estat_summ|estat_vce_only|esti|estimates|etodow|etof|etomdy|expand|expandcl|fac|fact|facto|factor|factor_estat|factor_p|factor_pca_rotated|factor_rotate|factormat|fcast|fcast_compute|fcast_graph|fdades|fdadesc|fdadescr|fdadescri|fdadescrib|fdadescribe|fdasav|fdasave|fdause|fh_st|file|filefilter|fillin|find_hlp_file|findfile|findit|fit|fl|fli|flis|flist|fpredict|frac_adj|frac_chk|frac_cox|frac_ddp|frac_dis|frac_dv|frac_in|frac_mun|frac_pp|frac_pq|frac_pv|frac_wgt|frac_xo|fracgen|fracplot|fracpoly|fracpred|fron_ex|fron_hn|fron_p|fron_tn|fron_tn2|frontier|ftodate|ftoe|ftomdy|ftowdate|gamhet_glf|gamhet_gp|gamhet_ilf|gamhet_ip|gamma|gamma_d2|gamma_p|gamma_sw|gammahet|gdi_hexagon|gdi_spokes|genrank|genstd|genvmean|gettoken|gladder|glim_l01|glim_l02|glim_l03|glim_l04|glim_l05|glim_l06|glim_l07|glim_l08|glim_l09|glim_l10|glim_l11|glim_l12|glim_lf|glim_mu|glim_nw1|glim_nw2|glim_nw3|glim_p|glim_v1|glim_v2|glim_v3|glim_v4|glim_v5|glim_v6|glim_v7|glm|glm_p|glm_sw|glmpred|glogit|glogit_p|gmeans|gnbre_lf|gnbreg|gnbreg_p|gomp_lf|gompe_sw|gomper_p|gompertz|gompertzhet|gomphet_glf|gomphet_glf_sh|gomphet_gp|gomphet_ilf|gomphet_ilf_sh|gomphet_ip|gphdot|gphpen|gphprint|gprefs|gprobi_p|gprobit|gr|gr7|gr_copy|gr_current|gr_db|gr_describe|gr_dir|gr_draw|gr_draw_replay|gr_drop|gr_edit|gr_editviewopts|gr_example|gr_example2|gr_export|gr_print|gr_qscheme|gr_query|gr_read|gr_rename|gr_replay|gr_save|gr_set|gr_setscheme|gr_table|gr_undo|gr_use|graph|grebar|greigen|grmeanby|gs_fileinfo|gs_filetype|gs_graphinfo|gs_stat|gsort|gwood|h|hareg|hausman|haver|he|heck_d2|heckma_p|heckman|heckp_lf|heckpr_p|heckprob|hel|help|hereg|hetpr_lf|hetpr_p|hetprob|hettest|hexdump|hilite|hist|histogram|hlogit|hlu|hmeans|hotel|hotelling|hprobit|hreg|hsearch|icd9|icd9_ff|icd9p|iis|impute|imtest|inbase|include|inf|infi|infil|infile|infix|inp|inpu|input|ins|insheet|insp|inspe|inspec|inspect|integ|inten|intreg|intreg_p|intrg2_ll|intrg_ll|intrg_ll2|ipolate|iqreg|ir|irf|irf_create|irfm|iri|is_svy|is_svysum|isid|istdize|ivprobit|ivprobit_p|ivreg|ivreg_footnote|ivtob_lf|ivtobit|ivtobit_p|jacknife|jknife|jkstat|joinby|kalarma1|kap|kapmeier|kappa|kapwgt|kdensity|ksm|ksmirnov|ktau|kwallis|labelbook|ladder|levelsof|leverage|lfit|lfit_p|li|lincom|line|linktest|lis|list|lloghet_glf|lloghet_glf_sh|lloghet_gp|lloghet_ilf|lloghet_ilf_sh|lloghet_ip|llogi_sw|llogis_p|llogist|llogistic|llogistichet|lnorm_lf|lnorm_sw|lnorma_p|lnormal|lnormalhet|lnormhet_glf|lnormhet_glf_sh|lnormhet_gp|lnormhet_ilf|lnormhet_ilf_sh|lnormhet_ip|lnskew0|loadingplot|(?<!\\.)log|logi|logis_lf|logistic|logistic_p|logit|logit_estat|logit_p|loglogs|logrank|loneway|lookfor|lookup|lowess|lpredict|lrecomp|lroc|lrtest|ls|lsens|lsens_x|lstat|ltable|ltriang|lv|lvr2plot|m|ma|mac|macr|macro|makecns|man|manova|manovatest|mantel|mark|markin|markout|marksample|mat|mat_capp|mat_order|mat_put_rr|mat_rapp|mata|mata_clear|mata_describe|mata_drop|mata_matdescribe|mata_matsave|mata_matuse|mata_memory|mata_mlib|mata_mosave|mata_rename|mata_which|matalabel|matcproc|matlist|matname|matr|matri|matrix|matrix_input__dlg|matstrik|mcc|mcci|md0_|md1_|md1debug_|md2_|md2debug_|mds|mds_estat|mds_p|mdsconfig|mdslong|mdsmat|mdsshepard|mdytoe|mdytof|me_derd|mean|means|median|memory|memsize|mfp|mfx|mhelp|mhodds|minbound|mixed_ll|mixed_ll_reparm|mkassert|mkdir|mkmat|mkspline|ml|ml_adjs|ml_bhhhs|ml_c_d|ml_check|ml_clear|ml_cnt|ml_debug|ml_defd|ml_e0|ml_e0_bfgs|ml_e0_cycle|ml_e0_dfp|ml_e0i|ml_e1|ml_e1_bfgs|ml_e1_bhhh|ml_e1_cycle|ml_e1_dfp|ml_e2|ml_e2_cycle|ml_ebfg0|ml_ebfr0|ml_ebfr1|ml_ebh0q|ml_ebhh0|ml_ebhr0|ml_ebr0i|ml_ecr0i|ml_edfp0|ml_edfr0|ml_edfr1|ml_edr0i|ml_eds|ml_eer0i|ml_egr0i|ml_elf|ml_elf_bfgs|ml_elf_bhhh|ml_elf_cycle|ml_elf_dfp|ml_elfi|ml_elfs|ml_enr0i|ml_enrr0|ml_erdu0|ml_erdu0_bfgs|ml_erdu0_bhhh|ml_erdu0_bhhhq|ml_erdu0_cycle|ml_erdu0_dfp|ml_erdu0_nrbfgs|ml_exde|ml_footnote|ml_geqnr|ml_grad0|ml_graph|ml_hbhhh|ml_hd0|ml_hold|ml_init|ml_inv|ml_log|ml_max|ml_mlout|ml_mlout_8|ml_model|ml_nb0|ml_opt|ml_p|ml_plot|ml_query|ml_rdgrd|ml_repor|ml_s_e|ml_score|ml_searc|ml_technique|ml_unhold|mleval|mlf_|mlmatbysum|mlmatsum|mlog|mlogi|mlogit|mlogit_footnote|mlogit_p|mlopts|mlsum|mlvecsum|mnl0_|mor|more|mov|move|mprobit|mprobit_lf|mprobit_p|mrdu0_|mrdu1_|mvdecode|mvencode|mvreg|mvreg_estat|nbreg|nbreg_al|nbreg_lf|nbreg_p|nbreg_sw|nestreg|net|newey|newey_p|news|nl|nlcom|nlcom_p|nlexp2|nlexp2a|nlexp3|nlgom3|nlgom4|nlinit|nllog3|nllog4|nlog_rd|nlogit|nlogit_p|nlogitgen|nlogittree|nlpred|nobreak|notes_dlg|nptrend|numlabel|numlist|old_ver|olo|olog|ologi|ologi_sw|ologit|ologit_p|ologitp|on|one|onew|onewa|oneway|op_colnm|op_comp|op_diff|op_inv|op_str|opr|opro|oprob|oprob_sw|oprobi|oprobi_p|oprobit|oprobitp|opts_exclusive|order|orthog|orthpoly|ou|out|outf|outfi|outfil|outfile|outs|outsh|outshe|outshee|outsheet|ovtest|pac|palette|parse_dissim|pause|pca|pca_display|pca_estat|pca_p|pca_rotate|pcamat|pchart|pchi|pcorr|pctile|pentium|pergram|personal|peto_st|pkcollapse|pkcross|pkequiv|pkexamine|pkshape|pksumm|plugin|pnorm|poisgof|poiss_lf|poiss_sw|poisso_p|poisson|poisson_estat|post|postclose|postfile|postutil|pperron|prais|prais_e|prais_e2|prais_p|predict|predictnl|preserve|print|prob|probi|probit|probit_estat|probit_p|proc_time|procoverlay|procrustes|procrustes_estat|procrustes_p|profiler|prop|proportion|prtest|prtesti|pwcorr|pwd|qs|qby|qbys|qchi|qladder|qnorm|qqplot|qreg|qreg_c|qreg_p|qreg_sw|qu|quadchk|quantile|que|quer|query|range|ranksum|ratio|rchart|rcof|recast|recode|reg|reg3|reg3_p|regdw|regr|regre|regre_p2|regres|regres_p|regress|regress_estat|regriv_p|remap|ren|rena|renam|rename|renpfix|repeat|reshape|restore|ret|retu|retur|return|rmdir|robvar|roccomp|rocf_lf|rocfit|rocgold|rocplot|roctab|rologit|rologit_p|rot|rota|rotat|rotate|rotatemat|rreg|rreg_p|ru|run|runtest|rvfplot|rvpplot|safesum|sample|sampsi|savedresults|sc|scatter|scm_mine|sco|scob_lf|scob_p|scobi_sw|scobit|scor|score|scoreplot|scoreplot_help|scree|screeplot|screeplot_help|sdtest|sdtesti|se|search|separate|seperate|serrbar|serset|set|set_defaults|sfrancia|sh|she|shel|shell|shewhart|signestimationsample|signrank|signtest|simul|sktest|sleep|slogit|slogit_d2|slogit_p|smooth|snapspan|so|sor|sort|spearman|spikeplot|spikeplt|spline_x|split|sqreg|sqreg_p|sret|sretu|sretur|sreturn|ssc|st|st_ct|st_hc|st_hcd|st_hcd_sh|st_is|st_issys|st_note|st_promo|st_set|st_show|st_smpl|st_subid|stack|stbase|stci|stcox|stcox_estat|stcox_fr|stcox_fr_ll|stcox_p|stcox_sw|stcoxkm|stcstat|stcurv|stcurve|stdes|stem|stepwise|stfill|stgen|stir|stjoin|stmc|stmh|stphplot|stphtest|stptime|strate|streg|streg_sw|streset|sts|stset|stsplit|stsum|sttocc|sttoct|stvary|su|suest|sum|summ|summa|summar|summari|summariz|summarize|sunflower|sureg|survcurv|survsum|svar|svar_p|svmat|svy_disp|svy_dreg|svy_est|svy_est_7|svy_estat|svy_get|svy_gnbreg_p|svy_head|svy_header|svy_heckman_p|svy_heckprob_p|svy_intreg_p|svy_ivreg_p|svy_logistic_p|svy_logit_p|svy_mlogit_p|svy_nbreg_p|svy_ologit_p|svy_oprobit_p|svy_poisson_p|svy_probit_p|svy_regress_p|svy_sub|svy_sub_7|svy_x|svy_x_7|svy_x_p|svydes|svygen|svygnbreg|svyheckman|svyheckprob|svyintreg|svyintrg|svyivreg|svylc|svylog_p|svylogit|svymarkout|svymean|svymlog|svymlogit|svynbreg|svyolog|svyologit|svyoprob|svyoprobit|svyopts|svypois|svypoisson|svyprobit|svyprobt|svyprop|svyratio|svyreg|svyreg_p|svyregress|svyset|svytab|svytest|svytotal|sw|swilk|symmetry|symmi|symplot|sysdescribe|sysdir|sysuse|szroeter|ta|tab|tab1|tab2|tab_or|tabd|tabdi|tabdis|tabdisp|tabi|table|tabodds|tabstat|tabu|tabul|tabula|tabulat|tabulate|te|tes|test|testnl|testparm|teststd|tetrachoric|time_it|timer|tis|tob|tobi|tobit|tobit_p|tobit_sw|token|tokeni|tokeniz|tokenize|total|translate|translator|transmap|treat_ll|treatr_p|treatreg|trim|trnb_cons|trnb_mean|trpoiss_d2|trunc_ll|truncr_p|truncreg|tsappend|tset|tsfill|tsline|tsline_ex|tsreport|tsrevar|tsrline|tsset|tssmooth|tsunab|ttest|ttesti|tut_chk|tut_wait|tutorial|tw|tware_st|two|twoway|twoway__fpfit_serset|twoway__function_gen|twoway__histogram_gen|twoway__ipoint_serset|twoway__ipoints_serset|twoway__kdensity_gen|twoway__lfit_serset|twoway__normgen_gen|twoway__pci_serset|twoway__qfit_serset|twoway__scatteri_serset|twoway__sunflower_gen|twoway_ksm_serset|ty|typ|type|typeof|unab|unabbrev|unabcmd|update|uselabel|var|var_mkcompanion|var_p|varbasic|varfcast|vargranger|varirf|varirf_add|varirf_cgraph|varirf_create|varirf_ctable|varirf_describe|varirf_dir|varirf_drop|varirf_erase|varirf_graph|varirf_ograph|varirf_rename|varirf_set|varirf_table|varlmar|varnorm|varsoc|varstable|varstable_w|varstable_w2|varwle|vec|vec_fevd|vec_mkphi|vec_p|vec_p_w|vecirf_create|veclmar|veclmar_w|vecnorm|vecnorm_w|vecrank|vecstable|verinst|vers|versi|versio|version|view|viewsource|vif|vwls|wdatetof|webdescribe|webseek|webuse|wh|whelp|whi|which|wilc_st|wilcoxon|win|wind|windo|window|winexec|wntestb|wntestq|xchart|xcorr|xi|xmlsav|xmlsave|xmluse|xpose|xsh|xshe|xshel|xshell|xt_iis|xt_tis|xtab_p|xtabond|xtbin_p|xtclog|xtcloglog|xtcloglog_d2|xtcloglog_pa_p|xtcloglog_re_p|xtcnt_p|xtcorr|xtdata|xtdes|xtfront_p|xtfrontier|xtgee|xtgee_elink|xtgee_estat|xtgee_makeivar|xtgee_p|xtgee_plink|xtgls|xtgls_p|xthaus|xthausman|xtht_p|xthtaylor|xtile|xtint_p|xtintreg|xtintreg_d2|xtintreg_p|xtivreg|xtline|xtline_ex|xtlogit|xtlogit_d2|xtlogit_fe_p|xtlogit_pa_p|xtlogit_re_p|xtmixed|xtmixed_estat|xtmixed_p|xtnb_fe|xtnb_lf|xtnbreg|xtnbreg_pa_p|xtnbreg_refe_p|xtpcse|xtpcse_p|xtpois|xtpoisson|xtpoisson_d2|xtpoisson_pa_p|xtpoisson_refe_p|xtpred|xtprobit|xtprobit_d2|xtprobit_re_p|xtps_fe|xtps_lf|xtps_ren|xtps_ren_8|xtrar_p|xtrc|xtrc_p|xtrchh|xtrefe_p|yx|yxview__barlike_draw|yxview_area_draw|yxview_bar_draw|yxview_dot_draw|yxview_dropline_draw|yxview_function_draw|yxview_iarrow_draw|yxview_ilabels_draw|yxview_normal_draw|yxview_pcarrow_draw|yxview_pcbarrow_draw|yxview_pccapsym_draw|yxview_pcscatter_draw|yxview_pcspike_draw|yxview_rarea_draw|yxview_rbar_draw|yxview_rbarm_draw|yxview_rcap_draw|yxview_rcapsym_draw|yxview_rconnected_draw|yxview_rline_draw|yxview_rscatter_draw|yxview_rspike_draw|yxview_spike_draw|yxview_sunflower_draw|zap_s|zinb|zinb_llf|zinb_plf|zip|zip_llf|zip_p|zip_plf|zt_ct_5|zt_hc_5|zt_hcd_5|zt_is_5|zt_iss_5|zt_sho_5|zt_smp_5|ztnb|ztnb_p|ztp|ztp_p|prtab|prchange|eststo|estout|esttab|estadd|estpost|ivregress|xtreg|xtreg_be|xtreg_fe|xtreg_ml|xtreg_pa_p|xtreg_re|xtregar|xtrere_p|xtset|xtsf_ll|xtsf_llti|xtsum|xttab|xttest0|xttobit|xttobit_p|xttrans)\\b",
           "name": "keyword.control.flow.stata"
         }
@@ -1317,7 +1294,6 @@
           "name": "comment.block.stata",
           "patterns": [
             {
-              "comment": "this ends and restarts a comment block. but need to catch this so that it doesn't start _another_ level of comment blocks",
               "match": "\\*/\\*"
             },
             {
@@ -1361,7 +1337,6 @@
               "name": "punctuation.definition.comment.stata"
             }
           },
-          "comment": "TODO! need to except out the occasion that a * comes after a /// on the previous line. May be easiest to join with the comment.line.triple-slash.stata below",
           "end": "(?=\\n)",
           "name": "comment.line.star.stata",
           "patterns": [
@@ -1405,15 +1380,15 @@
           "include": "#factorvariables"
         },
         {
-          "match": "\\b(?i:(\\d+\\.\\d*(e[\\-\\+]?\\d+)?))(?=[^a-zA-Z_])",
+          "match": "\\b(?i:(\\d+\\.\\d*(e[-+]?\\d+)?))(?=[^a-zA-Z_])",
           "name": "constant.numeric.float.stata"
         },
         {
-          "match": "(?<=[^0-9a-zA-Z_])(?i:(\\.\\d+(e[\\-\\+]?\\d+)?))",
+          "match": "(?<=[^0-9a-zA-Z_])(?i:(\\.\\d+(e[-+]?\\d+)?))",
           "name": "constant.numeric.float.stata"
         },
         {
-          "match": "\\b(?i:(\\d+e[\\-\\+]?\\d+))",
+          "match": "\\b(?i:(\\d+e[-+]?\\d+))",
           "name": "constant.numeric.float.stata"
         },
         {
@@ -1421,7 +1396,7 @@
           "name": "constant.numeric.integer.decimal.stata"
         },
         {
-          "match": "(?<![\\w])(\\.(?![\\./]))(?![\\w])",
+          "match": "(?<!\\w)(\\.(?![./]))(?!\\w)",
           "name": "constant.language.missing.stata"
         },
         {
@@ -1487,7 +1462,7 @@
     "factorvariables": {
       "patterns": [
         {
-          "match": "\\b(i|c|o)\\.(?=[\\w&&[^0-9]]|\\([\\w&&[^0-9]])",
+          "match": "\\b([ico])\\.(?=[\\w&&[^0-9]]|\\([\\w&&[^0-9]])",
           "name": "constant.language.factorvars.stata"
         },
         {
@@ -1707,7 +1682,7 @@
     "macro-commands": {
       "patterns": [
         {
-          "begin": "\\b(loc(al|a)?)\\s+([\\w'`\\$\\(\\)\\{\\}]+)\\s*(?=:|=)",
+          "begin": "\\b(loc(a(?:l|))?)\\s+([\\w'`$(){}]+)\\s*(?=[:=])",
           "beginCaptures": {
             "1": {
               "name": "keyword.macro.stata"
@@ -1759,13 +1734,13 @@
           ]
         },
         {
-          "begin": "\\b(gl(obal|oba|ob|o)?)\\s+(?=[\\w`\\$])",
+          "begin": "\\b(gl(o(?:bal|ba|b|))?)\\s+(?=[\\w`$])",
           "beginCaptures": {
             "1": {
               "name": "keyword.macro.stata"
             }
           },
-          "end": "(\\})|(?=\\\"|\\s|\\n|/|,|=)",
+          "end": "(})|(?=[\"\\s\\n/,=])",
           "patterns": [
             {
               "include": "#reserved-names"
@@ -1783,7 +1758,7 @@
           ]
         },
         {
-          "begin": "\\b(loc(al|a)?)\\s+(\\+\\+|\\-\\-)?(?=[\\w`\\$])",
+          "begin": "\\b(loc(a(?:l|))?)\\s+(\\+\\+|--)?(?=[\\w`$])",
           "beginCaptures": {
             "1": {
               "name": "keyword.macro.stata"
@@ -1792,7 +1767,7 @@
               "name": "keyword.operator.arithmetic.stata"
             }
           },
-          "end": "(?=\\\"|\\s|\\n|/|,|=)",
+          "end": "(?=[\"\\s\\n/,=])",
           "patterns": [
             {
               "include": "#macro-local-identifiers"
@@ -1806,7 +1781,7 @@
           ]
         },
         {
-          "begin": "\\b(tempvar|tempname|tempfile)\\s*(?=\\s)",
+          "begin": "\\b(temp(?:var|name|file))\\s*(?=\\s)",
           "beginCaptures": {
             "1": {
               "name": "keyword.macro.stata"
@@ -1831,7 +1806,7 @@
           ]
         },
         {
-          "begin": "\\b(ma(cro|cr|c)?)\\s+(drop|l(ist|is|i)?)\\s*(?=\\s)",
+          "begin": "\\b(ma(c(?:ro|r|))?)\\s+(drop|l(i(?:st|s|))?)\\s*(?=\\s)",
           "beginCaptures": {
             "0": {
               "name": "keyword.macro.stata"
@@ -1875,7 +1850,7 @@
           "name": "keyword.macro.extendedfcn.stata"
         },
         {
-          "match": "\\b(t(ype|yp|y)?|f(ormat|orma|orm|or|o)?|val(ue|u)?\\s+l(able|abl|ab|a)?|var(iable|iabl|iab|ia|i)?\\s+l(abel|abe|ab|a)?|data\\s+l(able|abl|ab|a)?|sort(edby|edb|ed|e)?|lab(el|e)?|maxlength|constraint|char)\\b",
+          "match": "\\b(t(y(?:pe|p|))?|f(o(?:rmat|rma|rm|r|))?|val(u(?:e|))?\\s+l(a(?:ble|bl|b|))?|var(i(?:able|abl|ab|a|))?\\s+l(a(?:bel|be|b|))?|data\\s+l(a(?:ble|bl|b|))?|sort(e(?:dby|db|d|))?|lab(e(?:l|))?|maxlength|constraint|char)\\b",
           "name": "keyword.macro.extendedfcn.stata"
         },
         {
@@ -1887,7 +1862,7 @@
           "name": "keyword.macro.extendedfcn.stata"
         },
         {
-          "match": "\\b(env(ironment|ironmen|ironme|ironm|iron|iro|ir|i)?)\\b",
+          "match": "\\b(env(i(?:ronment|ronmen|ronme|ronm|ron|ro|r|))?)\\b",
           "name": "keyword.macro.extendedfcn.stata"
         },
         {
@@ -1906,7 +1881,7 @@
               "name": "entity.name.type.class.stata"
             }
           },
-          "match": "\\b(list)\\s+(uniq|dups|sort|clean|retok(enize|eniz|eni|en|e)?|sizeof)\\s+(\\w{1,32})"
+          "match": "\\b(list)\\s+(uniq|dups|sort|clean|retok(e(?:nize|niz|ni|n|))?|sizeof)\\s+(\\w{1,32})"
         },
         {
           "captures": {
@@ -1923,7 +1898,7 @@
               "name": "entity.name.type.class.stata"
             }
           },
-          "match": "\\b(list)\\s+(\\w{1,32})\\s+(\\||&|\\-|===|==|in)\\s+(\\w{1,32})"
+          "match": "\\b(list)\\s+(\\w{1,32})\\s+([|\\&-]|===|==|in)\\s+(\\w{1,32})"
         },
         {
           "captures": {
@@ -1949,7 +1924,7 @@
           "match": "\\b(list\\s+posof)\\s+(\")(\\w+)(\")\\s+(in)\\s+(\\w{1,32})"
         },
         {
-          "match": "\\b(rown(ames|ame|am|a)?|coln(ames|ame|am|a)?|rowf(ullnames|ullname|ullnam|ullna|ulln|ull|ul|u)?|colf(ullnames|ullname|ullnam|ullna|ulln|ull|ul|u)?|roweq?|coleq?|rownumb|colnumb|roweqnumb|coleqnumb|rownfreeparms|colnfreeparms|rownlfs|colnlfs|rowsof|colsof|rowvarlist|colvarlist|rowlfnames|collfnames)\\b",
+          "match": "\\b(rown(a(?:mes|me|m|))?|coln(a(?:mes|me|m|))?|rowf(u(?:llnames|llname|llnam|llna|lln|ll|l|))?|colf(u(?:llnames|llname|llnam|llna|lln|ll|l|))?|roweq?|coleq?|rownumb|colnumb|roweqnumb|coleqnumb|rownfreeparms|colnfreeparms|rownlfs|colnlfs|rowsof|colsof|rowvarlist|colvarlist|rowlfnames|collfnames)\\b",
           "name": "keyword.macro.extendedfcn.stata"
         },
         {
@@ -1972,7 +1947,7 @@
               ]
             }
           },
-          "match": "\\b((copy|(ud|u)?strlen)\\s+(loc(al|a)?|gl(obal|oba|ob|o)?))\\s+([^']+)"
+          "match": "\\b((copy|(u(?:d|))?strlen)\\s+(loc(a(?:l|))?|gl(o(?:bal|ba|b|))?))\\s+([^']+)"
         },
         {
           "captures": {
@@ -2004,7 +1979,7 @@
           "match": "(word|piece)\\s+([\\s`'\\w]+)\\s+(of)"
         },
         {
-          "begin": "\\b(subinstr\\s+(loc(al|a)?|gl(obal|oba|ob|o)?))\\s+(\\w{1,32})",
+          "begin": "\\b(subinstr\\s+(loc(a(?:l|))?|gl(o(?:bal|ba|b|))?))\\s+(\\w{1,32})",
           "beginCaptures": {
             "1": {
               "name": "keyword.macro.extendedfcn.stata"
@@ -2045,7 +2020,7 @@
                   "name": "punctuation.definition.parameters.end.stata"
                 }
               },
-              "match": "(count|coun|cou|co|c)(\\()(local|loca|loc|global|globa|glob|glo|gl)\\s+(\\w{1,32})(\\))"
+              "match": "(c(?:ount|oun|ou|o|))(\\()(local|loca|loc|global|globa|glob|glo|gl)\\s+(\\w{1,32})(\\))"
             }
           ]
         },
@@ -2072,7 +2047,7 @@
               "name": "punctuation.definition.string.begin.stata"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.stata"
@@ -2089,7 +2064,7 @@
               "include": "#comments-block"
             },
             {
-              "begin": "[^\\w]",
+              "begin": "\\W",
               "end": "\\n|(?=})",
               "name": "comment.line.stata"
             },
@@ -2136,7 +2111,7 @@
               "name": "punctuation.definition.string.begin.stata"
             }
           },
-          "end": "(\\\\\\})|(?=\\\"|\\s|\\n|/|,)",
+          "end": "(\\\\})|(?=[\"\\s\\n/,])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.stata"
@@ -2267,7 +2242,7 @@
           },
           "patterns": [
             {
-              "match": "\\+\\+|\\-\\-",
+              "match": "\\+\\+|--",
               "name": "keyword.operator.arithmetic.stata"
             },
             {
@@ -2280,7 +2255,7 @@
               "include": "#comments-block"
             },
             {
-              "begin": "[^\\w]",
+              "begin": "\\W",
               "end": "\\n|(?=')",
               "name": "comment.line.stata"
             },
@@ -2301,7 +2276,6 @@
               "name": "punctuation.definition.string.begin.stata"
             }
           },
-          "comment": "appropriately color macros that have embedded escaped `,', and $ characters for lazy evaluation",
           "end": "\\\\'|'",
           "endCaptures": {
             "0": {
@@ -2326,7 +2300,7 @@
     "macro-local-identifiers": {
       "patterns": [
         {
-          "match": "[^\\w'`\\$\\(\\)\\s]",
+          "match": "[^\\w'`$()\\s]",
           "name": "invalid.illegal.name.stata"
         },
         {
@@ -2342,18 +2316,15 @@
     "operators": {
       "patterns": [
         {
-          "comment": "++ and -- must come first to support ligatures",
-          "match": "\\+\\+|\\-\\-|\\+|\\-|\\*|\\^",
+          "match": "\\+\\+|--|[+\\-*^]",
           "name": "keyword.operator.arithmetic.stata"
         },
         {
-          "comment": "match division operator but not path separator",
-          "match": "(?<![\\w.&&[^0-9]])/(?![\\w.&&[^0-9]]|$)",
+          "match": "(?<![[\\w.]&&[^0-9]])/(?![[\\w.]&&[^0-9]]|$)",
           "name": "keyword.operator.arithmetic.stata"
         },
         {
-          "comment": "match division operator but not path separator",
-          "match": "(?<![\\w.&&[^0-9]])\\\\(?![\\w.&&[^0-9]]|$)",
+          "match": "(?<![[\\w.]&&[^0-9]])\\\\(?![[\\w.]&&[^0-9]]|$)",
           "name": "keyword.operator.matrix.addrow.stata"
         },
         {
@@ -2361,19 +2332,19 @@
           "name": "keyword.operator.graphcombine.stata"
         },
         {
-          "match": "\\&|\\|",
+          "match": "[\\&|]",
           "name": "keyword.operator.logical.stata"
         },
         {
-          "match": "(?:<=|>=|:=|==|!=|~=|<|>|=|!!|!)",
+          "match": "(?:<=|>=|:=|==|!=|~=|[<>=]|!!|!)",
           "name": "keyword.operator.comparison.stata"
         },
         {
-          "match": "\\(|\\)",
+          "match": "[()]",
           "name": "keyword.operator.parentheses.stata"
         },
         {
-          "match": "(##|#)",
+          "match": "(#(?:#|))",
           "name": "keyword.operator.factor-variables.stata"
         },
         {
@@ -2389,7 +2360,7 @@
           "name": "punctuation.definition.parameters.begin.stata"
         },
         {
-          "match": "\\]",
+          "match": "]",
           "name": "punctuation.definition.parameters.end.stata"
         },
         {
@@ -2409,11 +2380,11 @@
           "name": "invalid.illegal.name.stata"
         },
         {
-          "match": "[^\\w'`\\$\\(\\)\\s]",
+          "match": "[^\\w'`$()\\s]",
           "name": "invalid.illegal.name.stata"
         },
         {
-          "match": "[0-9][\\w]{31,}",
+          "match": "[0-9]\\w{31,}",
           "name": "invalid.illegal.name.stata"
         },
         {
@@ -2431,7 +2402,7 @@
               "name": "punctuation.definition.string.begin.stata"
             }
           },
-          "end": "\"'|(?=\n)",
+          "end": "\"'|(?=\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.stata"
@@ -2440,12 +2411,10 @@
           "name": "string.quoted.double.compound.stata",
           "patterns": [
             {
-              "comment": "This must come before #string-regular and #string-compound to accurately color `\"\"\"' in strings",
               "match": "\"",
               "name": "string.quoted.double.compound.stata"
             },
             {
-              "comment": "see https://github.com/kylebarron/language-stata/issues/53",
               "match": "```(?=[^']*\")",
               "name": "meta.markdown.code.block.stata"
             },
@@ -2480,7 +2449,7 @@
               "name": "punctuation.definition.string.begin.stata"
             }
           },
-          "end": "(\")(')?|(?=\n)",
+          "end": "(\")(')?|(?=\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.stata"
@@ -2492,7 +2461,6 @@
           "name": "string.quoted.double.stata",
           "patterns": [
             {
-              "comment": "see https://github.com/kylebarron/language-stata/issues/53",
               "match": "```(?=[^']*\")",
               "name": "meta.markdown.code.block.stata"
             },
@@ -2521,8 +2489,7 @@
               "name": "punctuation.definition.parameters.begin.stata"
             }
           },
-          "comment": "highlight expressions, like [_n], when using subscripts on a variable",
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.parameters.end.stata"
@@ -2572,7 +2539,7 @@
               "name": "keyword.operator.negation.stata"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.stata"
@@ -2592,7 +2559,7 @@
                   "name": "constant.character.escape.backslash.stata"
                 }
               },
-              "match": "((\\\\.)|.)\\-((\\\\.)|[^\\]])",
+              "match": "((\\\\.)|.)-((\\\\.)|[^\\]])",
               "name": "constant.other.character-class.range.stata"
             }
           ]
@@ -2669,7 +2636,6 @@
               ]
             }
           },
-          "comment": "color regexm with regular quotes i.e. \" ",
           "match": "\\b(ustrregexm)(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)([,0-9\\s]*)?\\s*(\\))"
         },
         {
@@ -2737,7 +2703,6 @@
               "name": "punctuation.definition.parameters.end.stata"
             }
           },
-          "comment": "color regexm with compound quotes",
           "match": "\\b(ustrregexm)(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')([,0-9\\s]*)?\\s*(\\))"
         },
         {
@@ -2830,8 +2795,7 @@
               ]
             }
           },
-          "comment": "color regexr with regular quotes i.e. \" ",
-          "match": "\\b(ustrregexrf|ustrregexra)(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)\\s*([^\\)]*)(\\))"
+          "match": "\\b(ustrregexr[fa])(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)\\s*([^)]*)(\\))"
         },
         {
           "captures": {
@@ -2920,8 +2884,7 @@
               "name": "punctuation.definition.parameters.end.stata"
             }
           },
-          "comment": "color regexr with compound quotes i.e. `\"text\"' ",
-          "match": "\\b(ustrregexrf|ustrregexra)(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')\\s*([^\\)]*)(\\))"
+          "match": "\\b(ustrregexr[fa])(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')\\s*([^)]*)(\\))"
         }
       ]
     },
@@ -2932,8 +2895,7 @@
           "name": "keyword.control.anchor.stata"
         },
         {
-          "comment": "matched when not a global",
-          "match": "\\$(?![[\\w&&[^0-9_]][\\w]{0,31}|_[\\w]{1,31}\\{])",
+          "match": "\\$(?![[\\w&&[^0-9_]]\\w{0,31}|_])",
           "name": "keyword.control.anchor.stata"
         },
         {
@@ -2941,7 +2903,7 @@
           "name": "keyword.other.back-reference.stata"
         },
         {
-          "match": "[?+*][?+]?|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*][?+]?|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.stata"
         },
         {
@@ -2949,7 +2911,7 @@
           "name": "keyword.operator.or.stata"
         },
         {
-          "begin": "\\((?!\\?\\#|\\?=|\\?!|\\?<=|\\?<!)",
+          "begin": "\\((?!\\?(?:[#=!]|<=|<!))",
           "end": "\\)",
           "name": "keyword.operator.group.stata",
           "patterns": [
@@ -2959,13 +2921,12 @@
           ]
         },
         {
-          "begin": "\\(\\?\\#",
+          "begin": "\\(\\?#",
           "end": "\\)",
           "name": "comment.block.stata"
         },
         {
-          "comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
-          "match": "(?<=^|\\s)#\\s[[a-zA-Z0-9,. \\t?!-:][^\\x{00}-\\x{7F}]]*$",
+          "match": "(?<=^|\\s)#\\s[a-zA-Z0-9,. \\t?!-:[^\\x00-\\x7F]]*$",
           "name": "comment.line.number-sign.stata"
         },
         {
@@ -3020,7 +2981,6 @@
               "name": "entity.name.section.back-reference.stata"
             }
           },
-          "comment": "we can make this more sophisticated to match the | character that separates yes-pattern from no-pattern, but it's not really necessary.",
           "end": "(\\))",
           "name": "meta.group.assertion.conditional.stata",
           "patterns": [
@@ -3039,7 +2999,6 @@
           "include": "#macro-global"
         },
         {
-          "comment": "NOTE: Error if I have .+ No idea why but it works fine it seems with just .",
           "match": ".",
           "name": "string.quoted.stata"
         }
diff --git a/resources/languages/stylus.json b/resources/languages/stylus.json
index 26c8cf9..150393a 100644
--- a/resources/languages/stylus.json
+++ b/resources/languages/stylus.json
@@ -41,11 +41,11 @@
           "name": "punctuation.section.property-list.end.css"
         }
       },
-      "match": "(\\{)(\\})",
+      "match": "(\\{)(})",
       "name": "meta.brace.curly.css"
     },
     {
-      "match": "\\{|\\}",
+      "match": "[{}]",
       "name": "meta.brace.curly.css"
     },
     {
@@ -85,7 +85,7 @@
           ]
         },
         {
-          "begin": "\\s*((@)(extend[s]?)\\b)\\s*",
+          "begin": "\\s*((@)(extends?)\\b)\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.at-rule.extend.stylus"
@@ -167,7 +167,7 @@
         },
         {
           "begin": "(?=(\\b(\\d+%|from\\b|to\\b)))",
-          "end": "(?=(\\{|\\n))",
+          "end": "(?=([{\\n]))",
           "name": "meta.at-rule.keyframes.stylus",
           "patterns": [
             {
@@ -189,15 +189,15 @@
           "name": "meta.at-rule.media.stylus"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(width|scan|resolution|orientation|monochrome|min-width|min-resolution|min-monochrome|min-height|min-device-width|min-device-height|min-device-aspect-ratio|min-color-index|min-color|min-aspect-ratio|max-width|max-resolution|max-monochrome|max-height|max-device-width|max-device-height|max-device-aspect-ratio|max-color-index|max-color|max-aspect-ratio|height|grid|device-width|device-height|device-aspect-ratio|color-index|color|aspect-ratio)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w-])(width|scan|resolution|orientation|monochrome|min-width|min-resolution|min-monochrome|min-height|min-device-width|min-device-height|min-device-aspect-ratio|min-color-index|min-color|min-aspect-ratio|max-width|max-resolution|max-monochrome|max-height|max-device-width|max-device-height|max-device-aspect-ratio|max-color-index|max-color|max-aspect-ratio|height|grid|device-width|device-height|device-aspect-ratio|color-index|color|aspect-ratio)(?<=\\w)(?![\\w-])",
           "name": "support.type.property-name.media-feature.media.css"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(tv|tty|screen|projection|print|handheld|embossed|braille|aural|all)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w-])(tv|tty|screen|projection|print|handheld|embossed|braille|aural|all)(?<=\\w)(?![\\w-])",
           "name": "support.constant.media-type.media.css"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(portrait|landscape)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w-])(portrait|landscape)(?<=\\w)(?![\\w-])",
           "name": "support.constant.property-value.media-property.media.css"
         }
       ]
@@ -244,16 +244,14 @@
               "name": "punctuation.definition.constant.css"
             }
           },
-          "match": "(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\\b",
+          "match": "(#)(\\h{3}|\\h{6})\\b",
           "name": "constant.other.color.rgb-value.css"
         },
         {
-          "comment": "http://www.w3.org/TR/CSS21/syndata.html#value-def-color",
           "match": "\\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\\b",
           "name": "support.constant.color.w3c-standard-color-name.css"
         },
         {
-          "comment": "http://www.w3.org/TR/css3-color/#svg-color",
           "match": "\\b(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato|turquoise|violet|wheat|whitesmoke|yellowgreen)\\b",
           "name": "support.constant.color.w3c-extended-color-name.css"
         }
@@ -307,7 +305,7 @@
     },
     "declaration": {
       "begin": "((?<=^)[^\\S\\n]+)|((?<=;)[^\\S\\n]*)|((?<=\\{)[^\\S\\n]*)",
-      "end": "(?=\\n)|(;)|(?=\\})|(\\n)",
+      "end": "(?=\\n)|(;)|(?=})|(\\n)",
       "endCaptures": {
         "2": {
           "name": "punctuation.terminator.rule.css"
@@ -316,7 +314,7 @@
       "name": "meta.property-list.css",
       "patterns": [
         {
-          "match": "(?<![\\w-])--(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+          "match": "(?<![\\w-])--[-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
           "name": "variable.css"
         },
         {
@@ -326,7 +324,7 @@
           "include": "#language_constants"
         },
         {
-          "match": "(?:(?<=^)[^\\S\\n]+(\\n))"
+          "match": "(?<=^)[^\\S\\n]+(\\n)"
         },
         {
           "captures": {
@@ -340,7 +338,7 @@
               "name": "variable.section.css"
             }
           },
-          "match": "\\G\\s*(counter-reset|counter-increment)(?:(:)|[^\\S\\n])[^\\S\\n]*([a-zA-Z_-][a-zA-Z0-9_-]*)",
+          "match": "\\G\\s*(counter-(?:reset|increment))(?:(:)|[^\\S\\n])[^\\S\\n]*([a-zA-Z_-][a-zA-Z0-9_-]*)",
           "name": "meta.property.counter.css"
         },
         {
@@ -353,7 +351,7 @@
               "name": "punctuation.separator.key-value.css"
             }
           },
-          "end": "(?=\\n|;|\\}|$)",
+          "end": "(?=[\\n;}]|$)",
           "name": "meta.property.filter.css",
           "patterns": [
             {
@@ -402,7 +400,7 @@
           "name": "meta.function.misc.css",
           "patterns": [
             {
-              "match": "(?<=\\()[^\\)\\s]*(?=\\))",
+              "match": "(?<=\\()[^)\\s]*(?=\\))",
               "name": "string.css"
             },
             {
@@ -709,7 +707,7 @@
           "name": "meta.function.stylus",
           "patterns": [
             {
-              "match": "--(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+              "match": "--[-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
               "name": "variable.argument.stylus"
             },
             {
@@ -731,13 +729,13 @@
       ]
     },
     "interpolation": {
-      "begin": "(?:(\\{)[^\\S\\n]*)(?=[^;=]*[^\\S\\n]*\\})",
+      "begin": "(\\{)[^\\S\\n]*(?=[^;=]*[^\\S\\n]*})",
       "beginCaptures": {
         "1": {
           "name": "meta.brace.curly"
         }
       },
-      "end": "(?:[^\\S\\n]*(\\}))|\\n|$",
+      "end": "[^\\S\\n]*(})|\\n|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.curly"
@@ -787,7 +785,7 @@
               "name": "keyword.other.unit.css"
             }
           },
-          "match": "(?<!\\w|-)(?:(?:-|\\+)?(?:[0-9]+(?:\\.[0-9]+)?)|(?:\\.[0-9]+))((?:px|pt|ch|cm|mm|in|r?em|ex|pc|deg|g?rad|dpi|dpcm|dppx|fr|ms|s|turn|vh|vmax|vmin|vw)\\b|%)?",
+          "match": "(?<![\\w-])(?:[-+]?[0-9]+(?:\\.[0-9]+)?|\\.[0-9]+)((?:px|pt|ch|cm|mm|in|r?em|ex|pc|deg|g?rad|dpi|dpcm|dppx|fr|ms|s|turn|vh|vmax|vmin|vw)\\b|%)?",
           "name": "constant.numeric.css"
         }
       ]
@@ -795,7 +793,7 @@
     "operator": {
       "patterns": [
         {
-          "match": "((?:\\?|:|!|~|\\+|(\\s-\\s)|(?:\\*)?\\*|\\/|%|(\\.)?\\.\\.|<|>|(?:=|:|\\?|\\+|-|\\*|\\/|%|<|>)?=|!=)|\\b(?:in|is(?:nt)?|(?<!:)not|or|and)\\b)",
+          "match": "((?:[?:!~+]|(\\s-\\s)|\\*?\\*|[/%]|(\\.)?\\.\\.|[<>]|[=:?+\\-*/%<>]?=|!=)|\\b(?:in|is(?:nt)?|(?<!:)not|or|and)\\b)",
           "name": "keyword.operator.stylus"
         },
         {
@@ -804,7 +802,7 @@
       ]
     },
     "property": {
-      "begin": "(?:\\G\\s*(?:(-webkit-[-A-Za-z]+|-moz-[-A-Za-z]+|-o-[-A-Za-z]+|-ms-[-A-Za-z]+|-khtml-[-A-Za-z]+|zoom|z-index|y|x|wrap|word-wrap|word-spacing|word-break|word|width|widows|white-space-collapse|white-space|white|weight|volume|voice-volume|voice-stress|voice-rate|voice-pitch-range|voice-pitch|voice-family|voice-duration|voice-balance|voice|visibility|vertical-align|variant|user-select|up|unicode-bidi|unicode-range|unicode|trim|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform|touch-action|top-width|top-style|top-right-radius|top-left-radius|top-color|top|timing-function|text-wrap|text-transform|text-shadow|text-replace|text-rendering|text-overflow|text-outline|text-justify|text-indent|text-height|text-emphasis|text-decoration|text-align-last|text-align|text|target-position|target-new|target-name|target|table-layout|tab-size|style-type|style-position|style-image|style|string-set|stretch|stress|stacking-strategy|stacking-shift|stacking-ruby|stacking|src|speed|speech-rate|speech|speak-punctuation|speak-numeral|speak-header|speak|span|spacing|space-collapse|space|sizing|size-adjust|size|shadow|respond-to|rule-width|rule-style|rule-color|rule|ruby-span|ruby-position|ruby-overhang|ruby-align|ruby|rows|rotation-point|rotation|role|right-width|right-style|right-color|right|richness|rest-before|rest-after|rest|resource|resize|reset|replace|repeat|rendering-intent|rate|radius|quotes|punctuation-trim|punctuation|property|profile|presentation-level|presentation|position|pointer-events|point|play-state|play-during|play-count|pitch-range|pitch|phonemes|pause-before|pause-after|pause|page-policy|page-break-inside|page-break-before|page-break-after|page|padding-top|padding-right|padding-left|padding-bottom|padding|pack|overhang|overflow-y|overflow-x|overflow-style|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|origin|orientation|orient|ordinal-group|order|opacity|offset|numeral|new|nav-up|nav-right|nav-left|nav-index|nav-down|nav|name|move-to|model|mix-blend-mode|min-width|min-height|min|max-width|max-height|max|marquee-style|marquee-speed|marquee-play-count|marquee-direction|marquee|marks|mark-before|mark-after|mark|margin-top|margin-right|margin-left|margin-bottom|margin|mask-image|list-style-type|list-style-position|list-style-image|list-style|list|lines|line-stacking-strategy|line-stacking-shift|line-stacking-ruby|line-stacking|line-height|line-break|level|letter-spacing|length|left-width|left-style|left-color|left|label|justify-content|justify|iteration-count|inline-box-align|initial-value|initial-size|initial-before-align|initial-before-adjust|initial-after-align|initial-after-adjust|index|indent|increment|image-resolution|image-orientation|image|icon|hyphens|hyphenate-resource|hyphenate-lines|hyphenate-character|hyphenate-before|hyphenate-after|hyphenate|height|header|hanging-punctuation|gap|grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-start|grid-row|grid-row-end|grid-row-start|grid-template|grid-template-areas|grid-template-columns|grid-template-rows|row-gap|gap|font-kerning|font-language-override|font-weight|font-variant-caps|font-variant|font-style|font-synthesis|font-stretch|font-size-adjust|font-size|font-family|font|float-offset|float|flex-wrap|flex-shrink|flex-grow|flex-group|flex-flow|flex-direction|flex-basis|flex|fit-position|fit|fill|filter|family|empty-cells|emphasis|elevation|duration|drop-initial-value|drop-initial-size|drop-initial-before-align|drop-initial-before-adjust|drop-initial-after-align|drop-initial-after-adjust|drop|down|dominant-baseline|display-role|display-model|display|direction|delay|decoration-break|decoration|cursor|cue-before|cue-after|cue|crop|counter-reset|counter-increment|counter|count|content|columns|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|column-break-before|column-break-after|column|color-profile|color|collapse|clip|clear|character|caption-side|break-inside|break-before|break-after|break|box-sizing|box-shadow|box-pack|box-orient|box-ordinal-group|box-lines|box-flex-group|box-flex|box-direction|box-decoration-break|box-align|box|bottom-width|bottom-style|bottom-right-radius|bottom-left-radius|bottom-color|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-length|border-left-width|border-left-style|border-left-color|border-left|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|bookmark-target|bookmark-level|bookmark-label|bookmark|binding|bidi|before|baseline-shift|baseline|balance|background-blend-mode|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-break|background-attachment|background|azimuth|attachment|appearance|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-duration|animation-direction|animation-delay|animation-fill-mode|animation|alignment-baseline|alignment-adjust|alignment|align-self|align-last|align-items|align-content|align|after|adjust|will-change)|(writing-mode|text-anchor|stroke-width|stroke-opacity|stroke-miterlimit|stroke-linejoin|stroke-linecap|stroke-dashoffset|stroke-dasharray|stroke|stop-opacity|stop-color|shape-rendering|marker-start|marker-mid|marker-end|lighting-color|kerning|image-rendering|glyph-orientation-vertical|glyph-orientation-horizontal|flood-opacity|flood-color|fill-rule|fill-opacity|fill|enable-background|color-rendering|color-interpolation-filters|color-interpolation|clip-rule|clip-path)|([a-zA-Z_-][a-zA-Z0-9_-]*))(?!([^\\S\\n]*&)|([^\\S\\n]*\\{))(?=:|([^\\S\\n]+[^\\s])))",
+      "begin": "\\G\\s*(?:(-webkit-[-A-Za-z]+|-moz-[-A-Za-z]+|-o-[-A-Za-z]+|-ms-[-A-Za-z]+|-khtml-[-A-Za-z]+|zoom|z-index|[yx]|wrap|word-wrap|word-spacing|word-break|word|width|widows|white-space-collapse|white-space|white|weight|volume|voice-volume|voice-stress|voice-rate|voice-pitch-range|voice-pitch|voice-family|voice-duration|voice-balance|voice|visibility|vertical-align|variant|user-select|up|unicode-bidi|unicode-range|unicode|trim|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform|touch-action|top-width|top-style|top-right-radius|top-left-radius|top-color|top|timing-function|text-wrap|text-transform|text-shadow|text-replace|text-rendering|text-overflow|text-outline|text-justify|text-indent|text-height|text-emphasis|text-decoration|text-align-last|text-align|text|target-position|target-new|target-name|target|table-layout|tab-size|style-type|style-position|style-image|style|string-set|stretch|stress|stacking-strategy|stacking-shift|stacking-ruby|stacking|src|speed|speech-rate|speech|speak-punctuation|speak-numeral|speak-header|speak|span|spacing|space-collapse|space|sizing|size-adjust|size|shadow|respond-to|rule-width|rule-style|rule-color|rule|ruby-span|ruby-position|ruby-overhang|ruby-align|ruby|rows|rotation-point|rotation|role|right-width|right-style|right-color|right|richness|rest-before|rest-after|rest|resource|resize|reset|replace|repeat|rendering-intent|rate|radius|quotes|punctuation-trim|punctuation|property|profile|presentation-level|presentation|position|pointer-events|point|play-state|play-during|play-count|pitch-range|pitch|phonemes|pause-before|pause-after|pause|page-policy|page-break-inside|page-break-before|page-break-after|page|padding-top|padding-right|padding-left|padding-bottom|padding|pack|overhang|overflow-y|overflow-x|overflow-style|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|origin|orientation|orient|ordinal-group|order|opacity|offset|numeral|new|nav-up|nav-right|nav-left|nav-index|nav-down|nav|name|move-to|model|mix-blend-mode|min-width|min-height|min|max-width|max-height|max|marquee-style|marquee-speed|marquee-play-count|marquee-direction|marquee|marks|mark-before|mark-after|mark|margin-top|margin-right|margin-left|margin-bottom|margin|mask-image|list-style-type|list-style-position|list-style-image|list-style|list|lines|line-stacking-strategy|line-stacking-shift|line-stacking-ruby|line-stacking|line-height|line-break|level|letter-spacing|length|left-width|left-style|left-color|left|label|justify-content|justify|iteration-count|inline-box-align|initial-value|initial-size|initial-before-align|initial-before-adjust|initial-after-align|initial-after-adjust|index|indent|increment|image-resolution|image-orientation|image|icon|hyphens|hyphenate-resource|hyphenate-lines|hyphenate-character|hyphenate-before|hyphenate-after|hyphenate|height|header|hanging-punctuation|gap|grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-start|grid-row|grid-row-end|grid-row-start|grid-template|grid-template-areas|grid-template-columns|grid-template-rows|row-gap|gap|font-kerning|font-language-override|font-weight|font-variant-caps|font-variant|font-style|font-synthesis|font-stretch|font-size-adjust|font-size|font-family|font|float-offset|float|flex-wrap|flex-shrink|flex-grow|flex-group|flex-flow|flex-direction|flex-basis|flex|fit-position|fit|fill|filter|family|empty-cells|emphasis|elevation|duration|drop-initial-value|drop-initial-size|drop-initial-before-align|drop-initial-before-adjust|drop-initial-after-align|drop-initial-after-adjust|drop|down|dominant-baseline|display-role|display-model|display|direction|delay|decoration-break|decoration|cursor|cue-before|cue-after|cue|crop|counter-reset|counter-increment|counter|count|content|columns|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|column-break-before|column-break-after|column|color-profile|color|collapse|clip|clear|character|caption-side|break-inside|break-before|break-after|break|box-sizing|box-shadow|box-pack|box-orient|box-ordinal-group|box-lines|box-flex-group|box-flex|box-direction|box-decoration-break|box-align|box|bottom-width|bottom-style|bottom-right-radius|bottom-left-radius|bottom-color|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-length|border-left-width|border-left-style|border-left-color|border-left|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|bookmark-target|bookmark-level|bookmark-label|bookmark|binding|bidi|before|baseline-shift|baseline|balance|background-blend-mode|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-break|background-attachment|background|azimuth|attachment|appearance|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-duration|animation-direction|animation-delay|animation-fill-mode|animation|alignment-baseline|alignment-adjust|alignment|align-self|align-last|align-items|align-content|align|after|adjust|will-change)|(writing-mode|text-anchor|stroke-width|stroke-opacity|stroke-miterlimit|stroke-linejoin|stroke-linecap|stroke-dashoffset|stroke-dasharray|stroke|stop-opacity|stop-color|shape-rendering|marker-start|marker-mid|marker-end|lighting-color|kerning|image-rendering|glyph-orientation-vertical|glyph-orientation-horizontal|flood-opacity|flood-color|fill-rule|fill-opacity|fill|enable-background|color-rendering|color-interpolation-filters|color-interpolation|clip-rule|clip-path)|([a-zA-Z_-][a-zA-Z0-9_-]*))(?!([^\\S\\n]*&)|([^\\S\\n]*\\{))(?=:|([^\\S\\n]+\\S))",
       "beginCaptures": {
         "1": {
           "name": "support.type.property-name.css"
@@ -816,7 +814,7 @@
           "name": "support.function.mixin.stylus"
         }
       },
-      "end": "(;)|(?=\\n|\\}|$)",
+      "end": "(;)|(?=[\\n}]|$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.rule.css"
@@ -838,7 +836,7 @@
           "name": "punctuation.separator.key-value.css"
         }
       },
-      "end": "(?=\\n|;|\\})",
+      "end": "(?=[\\n;}])",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.rule.css"
@@ -850,7 +848,7 @@
           "include": "#property_values"
         },
         {
-          "match": "[^\\n]+?"
+          "match": "\\N+?"
         }
       ]
     },
@@ -869,11 +867,11 @@
           "include": "#language_constants"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(wrap-reverse|wrap|whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|unicase|underline|ultra-expanded|ultra-condensed|transparent|transform|top|titling-caps|thin|thick|text-top|text-bottom|text|tb-rl|table-row-group|table-row|table-header-group|table-footer-group|table-column-group|table-column|table-cell|table|sw-resize|super|strict|stretch|step-start|step-end|static|square|space-between|space-around|space|solid|soft-light|small-caps|separate|semi-expanded|semi-condensed|se-resize|scroll|screen|saturation|s-resize|running|rtl|row-reverse|row-resize|row|round|right|ridge|reverse|repeat-y|repeat-x|repeat|relative|progressive|progress|pre-wrap|pre-line|pre|pointer|petite-caps|paused|pan-x|pan-left|pan-right|pan-y|pan-up|pan-down|padding-box|overline|overlay|outside|outset|optimizeSpeed|optimizeLegibility|opacity|oblique|nw-resize|nowrap|not-allowed|normal|none|no-repeat|no-drop|newspaper|ne-resize|n-resize|multiply|move|middle|medium|max-height|manipulation|main-size|luminosity|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|local|list-item|linear(?!-)|line-through|line-edge|line|lighter|lighten|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline-block|inline|inherit|infinite|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|hue|horizontal|hidden|help|hard-light|hand|groove|geometricPrecision|forwards|flex-start|flex-end|flex|fixed|extra-expanded|extra-condensed|expanded|exclusion|ellipsis|ease-out|ease-in-out|ease-in|ease|e-resize|double|dotted|distribute-space|distribute-letter|distribute-all-lines|distribute|disc|disabled|difference|default|decimal|dashed|darken|currentColor|crosshair|cover|content-box|contain|condensed|column-reverse|column|color-dodge|color-burn|color|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|border-box|bolder|bold|block|bidi-override|below|baseline|balance|backwards|auto|antialiased|always|alternate-reverse|alternate|all-small-caps|all-scroll|all-petite-caps|all|absolute)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w-])(wrap-reverse|wrap|whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|unicase|underline|ultra-expanded|ultra-condensed|transparent|transform|top|titling-caps|thin|thick|text-top|text-bottom|text|tb-rl|table-row-group|table-row|table-header-group|table-footer-group|table-column-group|table-column|table-cell|table|sw-resize|super|strict|stretch|step-start|step-end|static|square|space-between|space-around|space|solid|soft-light|small-caps|separate|semi-expanded|semi-condensed|se-resize|scroll|screen|saturation|s-resize|running|rtl|row-reverse|row-resize|row|round|right|ridge|reverse|repeat-y|repeat-x|repeat|relative|progressive|progress|pre-wrap|pre-line|pre|pointer|petite-caps|paused|pan-x|pan-left|pan-right|pan-y|pan-up|pan-down|padding-box|overline|overlay|outside|outset|optimizeSpeed|optimizeLegibility|opacity|oblique|nw-resize|nowrap|not-allowed|normal|none|no-repeat|no-drop|newspaper|ne-resize|n-resize|multiply|move|middle|medium|max-height|manipulation|main-size|luminosity|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|local|list-item|linear(?!-)|line-through|line-edge|line|lighter|lighten|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline-block|inline|inherit|infinite|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|hue|horizontal|hidden|help|hard-light|hand|groove|geometricPrecision|forwards|flex-start|flex-end|flex|fixed|extra-expanded|extra-condensed|expanded|exclusion|ellipsis|ease-out|ease-in-out|ease-in|ease|e-resize|double|dotted|distribute-space|distribute-letter|distribute-all-lines|distribute|disc|disabled|difference|default|decimal|dashed|darken|currentColor|crosshair|cover|content-box|contain|condensed|column-reverse|column|color-dodge|color-burn|color|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|border-box|bolder|bold|block|bidi-override|below|baseline|balance|backwards|auto|antialiased|always|alternate-reverse|alternate|all-small-caps|all-scroll|all-petite-caps|all|absolute)(?<=\\w)(?![\\w-])",
           "name": "support.constant.property-value.css"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(start|sRGB|square|round|optimizeSpeed|optimizeQuality|nonzero|miter|middle|linearRGB|geometricPrecision |evenodd |end |crispEdges|butt|bevel)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w-])(start|sRGB|square|round|optimizeSpeed|optimizeQuality|nonzero|miter|middle|linearRGB|geometricPrecision |evenodd |end |crispEdges|butt|bevel)(?<=\\w)(?![\\w-])",
           "name": "support.constant.property-value.svg.css"
         },
         {
@@ -889,7 +887,7 @@
           "include": "#string"
         },
         {
-          "match": "\\!\\s*important",
+          "match": "!\\s*important",
           "name": "keyword.other.important.css"
         },
         {
@@ -909,7 +907,7 @@
           "include": "#variable"
         },
         {
-          "match": "(?<!^)(\\@[a-zA-Z_-][a-zA-Z0-9_-]*)",
+          "match": "(?<!^)(@[a-zA-Z_-][a-zA-Z0-9_-]*)",
           "name": "variable.property.stylus"
         }
       ]
@@ -917,15 +915,15 @@
     "selector": {
       "patterns": [
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(a|abbr|acronym|address|area|article|aside|audio|b|base|bdi|bdo|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|data|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|main|map|mark|math|menu|menuitem|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|rb|rp|rt|rtc|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|svg|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video|wbr)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w-])(a|abbr|acronym|address|area|article|aside|audio|b|base|bdi|bdo|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|data|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|main|map|mark|math|menu|menuitem|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|rb|rp|rt|rtc|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|svg|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video|wbr)(?<=\\w)(?![\\w-])",
           "name": "entity.name.tag.css"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(vkern|view|use|tspan|tref|title|textPath|text|symbol|switch|svg|style|stop|set|script|rect|radialGradient|polyline|polygon|pattern|path|mpath|missing-glyph|metadata|mask|marker|linearGradient|line|image|hkern|glyphRef|glyph|g|foreignObject|font-face-uri|font-face-src|font-face-name|font-face-format|font-face|font|filter|feTurbulence|feTile|feSpotLight|feSpecularLighting|fePointLight|feOffset|feMorphology|feMergeNode|feMerge|feImage|feGaussianBlur|feFuncR|feFuncG|feFuncB|feFuncA|feFlood|feDistantLight|feDisplacementMap|feDiffuseLighting|feConvolveMatrix|feComposite|feComponentTransfer|feColorMatrix|feBlend|ellipse|desc|defs|cursor|color-profile|clipPath|circle|animateTransform|animateMotion|animateColor|animate|altGlyphItem|altGlyphDef|altGlyph|a)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w-])(vkern|view|use|tspan|tref|title|textPath|text|symbol|switch|svg|style|stop|set|script|rect|radialGradient|polyline|polygon|pattern|path|mpath|missing-glyph|metadata|mask|marker|linearGradient|line|image|hkern|glyphRef|glyph|g|foreignObject|font-face-uri|font-face-src|font-face-name|font-face-format|font-face|font|filter|feTurbulence|feTile|feSpotLight|feSpecularLighting|fePointLight|feOffset|feMorphology|feMergeNode|feMerge|feImage|feGaussianBlur|feFuncR|feFuncG|feFuncB|feFuncA|feFlood|feDistantLight|feDisplacementMap|feDiffuseLighting|feConvolveMatrix|feComposite|feComponentTransfer|feColorMatrix|feBlend|ellipse|desc|defs|cursor|color-profile|clipPath|circle|animateTransform|animateMotion|animateColor|animate|altGlyphItem|altGlyphDef|altGlyph|a)(?<=\\w)(?![\\w-])",
           "name": "entity.name.tag.svg.css"
         },
         {
-          "match": "\\s*(\\,)\\s*",
+          "match": "\\s*(,)\\s*",
           "name": "meta.selector.stylus"
         },
         {
@@ -938,11 +936,11 @@
               "name": "entity.other.attribute-name.parent-selector-suffix.stylus"
             }
           },
-          "match": "\\s*(\\&)([a-zA-Z0-9_-]+)\\s*",
+          "match": "\\s*(&)([a-zA-Z0-9_-]+)\\s*",
           "name": "meta.selector.stylus"
         },
         {
-          "match": "\\s*(\\&)\\s*",
+          "match": "\\s*(&)\\s*",
           "name": "meta.selector.stylus"
         },
         {
@@ -1033,7 +1031,7 @@
               "name": "punctuation.section.function.css"
             }
           },
-          "match": "((:)nth-(?:(?:last-)?child|(?:last-)?of-type))(\\()(\\-?(?:\\d+n?|n)(?:\\+\\d+)?|even|odd)(\\))"
+          "match": "((:)nth-(?:(?:last-)?child|(?:last-)?of-type))(\\()(-?(?:\\d+n?|n)(?:\\+\\d+)?|even|odd)(\\))"
         },
         {
           "captures": {
@@ -1120,7 +1118,7 @@
               "name": "punctuation.definition.entity.css"
             }
           },
-          "match": "(?i)(\\[)\\s*(-?[_a-z\\\\[[:^ascii:]]][_a-z0-9\\-\\\\[[:^ascii:]]]*)(?:\\s*([~|^$*]?=)\\s*(?:(-?[_a-z\\\\[[:^ascii:]]][_a-z0-9\\-\\\\[[:^ascii:]]]*)|((?>(['\"])(?:[^\\\\]|\\\\.)*?(\\6)))))?\\s*(\\])",
+          "match": "(?i)(\\[)\\s*(-?[_a-z\\\\[:^ascii:]][_a-z0-9\\-\\\\[:^ascii:]]*)(?:\\s*([~|^$*]?=)\\s*(?:(-?[_a-z\\\\[:^ascii:]][_a-z0-9\\-\\\\[:^ascii:]]*)|((?>(['\"])(?:[^\\\\]|\\\\.)*?(\\6)))))?\\s*(])",
           "name": "meta.attribute-selector.css"
         },
         {
@@ -1149,7 +1147,7 @@
           "name": "string.quoted.double.css",
           "patterns": [
             {
-              "match": "\\\\([a-fA-F0-9]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.css"
             }
           ]
@@ -1170,7 +1168,7 @@
           "name": "string.quoted.single.css",
           "patterns": [
             {
-              "match": "\\\\([a-fA-F0-9]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.css"
             }
           ]
@@ -1182,7 +1180,7 @@
       "name": "variable.stylus"
     },
     "variable_declaration": {
-      "begin": "^[^\\S\\n]*(\\$?[a-zA-Z_-][a-zA-Z0-9_-]*)[^\\S\\n]*(\\=|\\?\\=|\\:\\=)",
+      "begin": "^[^\\S\\n]*(\\$?[a-zA-Z_-][a-zA-Z0-9_-]*)[^\\S\\n]*(=|\\?=|:=)",
       "beginCaptures": {
         "1": {
           "name": "variable.stylus"
@@ -1191,7 +1189,7 @@
           "name": "keyword.operator.stylus"
         }
       },
-      "end": "(\\n)|(;)|(?=\\})",
+      "end": "(\\n)|(;)|(?=})",
       "endCaptures": {
         "2": {
           "name": "punctuation.terminator.rule.css"
diff --git a/resources/languages/svelte.json b/resources/languages/svelte.json
index efaf510..e85bdc8 100644
--- a/resources/languages/svelte.json
+++ b/resources/languages/svelte.json
@@ -379,14 +379,14 @@
       ]
     },
     "attributes-interpolated": {
-      "begin": "(?<!:|=)\\s*({)",
+      "begin": "(?<![:=])\\s*(\\{)",
       "captures": {
         "1": {
           "name": "entity.other.attribute-name.svelte"
         }
       },
       "contentName": "meta.embedded.expression.svelte source.ts",
-      "end": "(\\})",
+      "end": "(})",
       "patterns": [
         {
           "include": "source.ts"
@@ -448,7 +448,7 @@
               "name": "constant.numeric.decimal.svelte"
             }
           },
-          "match": "(?:(['\"])([0-9._]+[\\w%]{,4})(\\1))|(?:([0-9._]+[\\w%]{,4})(?=\\s|/?>))"
+          "match": "(['\"])([0-9._]+[\\w%]{0,4})(\\1)|([0-9._]+[\\w%]{0,4})(?=\\s|/?>)"
         },
         {
           "match": "([^\\s\"'=<>`/]|/(?!>))+",
@@ -530,7 +530,7 @@
     "destructuring": {
       "patterns": [
         {
-          "begin": "(?={)",
+          "begin": "(?=\\{)",
           "end": "(?<=})",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
@@ -541,7 +541,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?<=\\])",
+          "end": "(?<=])",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
             {
@@ -554,7 +554,7 @@
     "destructuring-const": {
       "patterns": [
         {
-          "begin": "(?={)",
+          "begin": "(?=\\{)",
           "end": "(?<=})",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
@@ -565,7 +565,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?<=\\])",
+          "end": "(?<=])",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
             {
@@ -585,7 +585,7 @@
             }
           },
           "contentName": "meta.embedded.expression.svelte source.ts",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.svelte"
@@ -593,7 +593,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G\\s*(?={)",
+              "begin": "\\G\\s*(?=\\{)",
               "end": "(?<=})",
               "patterns": [
                 {
@@ -623,8 +623,8 @@
           "include": "#interpolation"
         },
         {
-          "begin": "(?<=>|})",
-          "end": "(?=<|{)",
+          "begin": "(?<=[>}])",
+          "end": "(?=[<{])",
           "name": "text.svelte"
         }
       ]
@@ -643,7 +643,7 @@
       ]
     },
     "special-tags-block-begin": {
-      "begin": "({)\\s*(#([a-z]*))",
+      "begin": "(\\{)\\s*(#([a-z]*))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.svelte"
@@ -670,7 +670,7 @@
       ]
     },
     "special-tags-block-end": {
-      "begin": "({)\\s*(/([a-z]*))",
+      "begin": "(\\{)\\s*(/([a-z]*))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.svelte"
@@ -761,10 +761,20 @@
                   "name": "variable.other.constant.svelte"
                 }
               },
-              "end": "(?=\\=)"
+              "end": "(?=[:=])"
+            },
+            {
+              "begin": "(?=:)",
+              "end": "(?==)",
+              "name": "meta.type.annotation.svelte",
+              "patterns": [
+                {
+                  "include": "source.ts"
+                }
+              ]
             },
             {
-              "begin": "(?=\\=)",
+              "begin": "(?==)",
               "end": "(?=})",
               "name": "meta.embedded.expression.svelte source.ts",
               "patterns": [
@@ -782,7 +792,7 @@
             {
               "begin": "\\G\\s*?(?=\\S)",
               "contentName": "meta.embedded.expression.svelte source.ts",
-              "end": "(?=(?:(?:^\\s*|\\s+)(as))|\\s*(}|,))",
+              "end": "(?=(?:^\\s*|\\s+)(as)|\\s*([},]))",
               "patterns": [
                 {
                   "include": "source.ts"
@@ -790,7 +800,7 @@
               ]
             },
             {
-              "begin": "(as)|(?=}|,)",
+              "begin": "(as)|(?=[},])",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control.as.svelte"
@@ -894,7 +904,7 @@
       ]
     },
     "special-tags-void": {
-      "begin": "({)\\s*((?:[@:])(else\\s+if|[a-z]*))",
+      "begin": "(\\{)\\s*([@:](else\\s+if|[a-z]*))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.svelte"
@@ -907,7 +917,7 @@
           ]
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.end.svelte"
@@ -982,7 +992,7 @@
       "name": "meta.scope.tag.$2.svelte"
     },
     "tags-general-start": {
-      "begin": "(<)([^/\\s>/]*)",
+      "begin": "(<)([^/\\s>]*)",
       "beginCaptures": {
         "0": {
           "patterns": [
@@ -1099,7 +1109,7 @@
               "name": "support.class.component.svelte"
             }
           },
-          "match": "([\\w]+(?:\\.[\\w]+)+)|([A-Z][\\w]+)"
+          "match": "(\\w+(?:\\.\\w+)+)|([A-Z]\\w+)"
         },
         {
           "match": "[a-z][\\w0-9:]*-[\\w0-9:-]*",
@@ -1134,7 +1144,7 @@
           ]
         }
       },
-      "match": "(<)([^/\\s>/]*)",
+      "match": "(<)([^/\\s>]*)",
       "name": "meta.tag.start.svelte"
     },
     "tags-void": {
diff --git a/resources/languages/swift.json b/resources/languages/swift.json
index e7640e3..fe160a5 100644
--- a/resources/languages/swift.json
+++ b/resources/languages/swift.json
@@ -188,11 +188,11 @@
     "builtin-functions": {
       "patterns": [
         {
-          "match": "(?<=\\.)(?:s(?:ort(?:ed)?|plit)|contains|index|partition|f(?:i(?:lter|rst)|orEach|latMap)|with(?:MutableCharacters|CString|U(?:nsafe(?:Mutable(?:BufferPointer|Pointer(?:s|To(?:Header|Elements)))|BufferPointer)|TF8Buffer))|m(?:in|a(?:p|x)))(?=\\s*[({])\\b",
+          "match": "(?<=\\.)(?:s(?:ort(?:ed)?|plit)|contains|index|partition|f(?:i(?:lter|rst)|orEach|latMap)|with(?:MutableCharacters|CString|U(?:nsafe(?:Mutable(?:BufferPointer|Pointer(?:s|To(?:Header|Elements)))|BufferPointer)|TF8Buffer))|m(?:in|a[px]))(?=\\s*[({])\\b",
           "name": "support.function.swift"
         },
         {
-          "match": "(?<=\\.)(?:s(?:ymmetricDifference|t(?:oreBytes|arts|ride)|ortInPlace|u(?:ccessor|ffix|btract(?:ing|InPlace|WithOverflow)?)|quareRoot|amePosition)|h(?:oldsUnique(?:Reference|OrPinnedReference)|as(?:Suffix|Prefix))|ne(?:gate(?:d)?|xt)|c(?:o(?:untByEnumerating|py(?:Bytes)?)|lamp(?:ed)?|reate)|t(?:o(?:IntMax|Opaque|UIntMax)|ake(?:RetainedValue|UnretainedValue)|r(?:uncatingRemainder|a(?:nscodedLength|ilSurrogate)))|i(?:s(?:MutableAndUniquelyReferenced(?:OrPinned)?|S(?:trictSu(?:perset(?:Of)?|bset(?:Of)?)|u(?:perset(?:Of)?|bset(?:Of)?))|Continuation|T(?:otallyOrdered|railSurrogate)|Disjoint(?:With)?|Unique(?:Reference|lyReferenced(?:OrPinned)?)|Equal|Le(?:ss(?:ThanOrEqualTo)?|adSurrogate))|n(?:sert(?:ContentsOf)?|tersect(?:ion|InPlace)?|itialize(?:Memory|From)?|dex(?:Of|ForKey)))|o(?:verlaps|bjectAt)|d(?:i(?:stance(?:To)?|vide(?:d|WithOverflow)?)|e(?:s(?:cendant|troy)|code(?:CString)?|initialize|alloc(?:ate(?:Capacity)?)?)|rop(?:First|Last))|u(?:n(?:ion(?:InPlace)?|derestimateCount|wrappedOrError)|p(?:date(?:Value)?|percased))|join(?:ed|WithSeparator)|p(?:op(?:First|Last)|ass(?:Retained|Unretained)|re(?:decessor|fix))|e(?:scape(?:d)?|n(?:code|umerate(?:d)?)|lementsEqual|xclusiveOr(?:InPlace)?)|f(?:orm(?:Remainder|S(?:ymmetricDifference|quareRoot)|TruncatingRemainder|In(?:tersection|dex)|Union)|latten|rom(?:CString(?:RepairingIllFormedUTF8)?|Opaque))|w(?:i(?:thMemoryRebound|dth)|rite(?:To)?)|l(?:o(?:wercased|ad)|e(?:adSurrogate|xicographical(?:Compare|lyPrecedes)))|a(?:ss(?:ign(?:BackwardFrom|From)?|umingMemoryBound)|d(?:d(?:ing(?:Product)?|Product|WithOverflow)?|vanced(?:By)?)|utorelease|ppend(?:ContentsOf)?|lloc(?:ate)?|bs)|r(?:ound(?:ed)?|e(?:serveCapacity|tain|duce|place(?:Range|Subrange)?|verse(?:d)?|quest(?:NativeBuffer|UniqueMutableBackingBuffer)|lease|m(?:ove(?:Range|Subrange|Value(?:ForKey)?|First|Last|A(?:tIndex|ll))?|ainder(?:WithOverflow)?)))|ge(?:nerate|t(?:Objects|Element))|m(?:in(?:imum(?:Magnitude)?|Element)|ove(?:Initialize(?:Memory|BackwardFrom|From)?|Assign(?:From)?)?|ultipl(?:y(?:WithOverflow)?|ied)|easure|a(?:ke(?:Iterator|Description)|x(?:imum(?:Magnitude)?|Element)))|bindMemory)(?=\\s*\\()",
+          "match": "(?<=\\.)(?:s(?:ymmetricDifference|t(?:oreBytes|arts|ride)|ortInPlace|u(?:ccessor|ffix|btract(?:ing|InPlace|WithOverflow)?)|quareRoot|amePosition)|h(?:oldsUnique(?:Reference|OrPinnedReference)|as(?:Suffix|Prefix))|ne(?:gated?|xt)|c(?:o(?:untByEnumerating|py(?:Bytes)?)|lamp(?:ed)?|reate)|t(?:o(?:IntMax|Opaque|UIntMax)|ake(?:RetainedValue|UnretainedValue)|r(?:uncatingRemainder|a(?:nscodedLength|ilSurrogate)))|i(?:s(?:MutableAndUniquelyReferenced(?:OrPinned)?|S(?:trictSu(?:perset(?:Of)?|bset(?:Of)?)|u(?:perset(?:Of)?|bset(?:Of)?))|Continuation|T(?:otallyOrdered|railSurrogate)|Disjoint(?:With)?|Unique(?:Reference|lyReferenced(?:OrPinned)?)|Equal|Le(?:ss(?:ThanOrEqualTo)?|adSurrogate))|n(?:sert(?:ContentsOf)?|tersect(?:ion|InPlace)?|itialize(?:Memory|From)?|dex(?:Of|ForKey)))|o(?:verlaps|bjectAt)|d(?:i(?:stance(?:To)?|vide(?:d|WithOverflow)?)|e(?:s(?:cendant|troy)|code(?:CString)?|initialize|alloc(?:ate(?:Capacity)?)?)|rop(?:First|Last))|u(?:n(?:ion(?:InPlace)?|derestimateCount|wrappedOrError)|p(?:date(?:Value)?|percased))|join(?:ed|WithSeparator)|p(?:op(?:First|Last)|ass(?:Retained|Unretained)|re(?:decessor|fix))|e(?:scaped?|n(?:code|umerated?)|lementsEqual|xclusiveOr(?:InPlace)?)|f(?:orm(?:Remainder|S(?:ymmetricDifference|quareRoot)|TruncatingRemainder|In(?:tersection|dex)|Union)|latten|rom(?:CString(?:RepairingIllFormedUTF8)?|Opaque))|w(?:i(?:thMemoryRebound|dth)|rite(?:To)?)|l(?:o(?:wercased|ad)|e(?:adSurrogate|xicographical(?:Compare|lyPrecedes)))|a(?:ss(?:ign(?:BackwardFrom|From)?|umingMemoryBound)|d(?:d(?:ing(?:Product)?|Product|WithOverflow)?|vanced(?:By)?)|utorelease|ppend(?:ContentsOf)?|lloc(?:ate)?|bs)|r(?:ound(?:ed)?|e(?:serveCapacity|tain|duce|place(?:Range|Subrange)?|versed?|quest(?:NativeBuffer|UniqueMutableBackingBuffer)|lease|m(?:ove(?:Range|Subrange|Value(?:ForKey)?|First|Last|A(?:tIndex|ll))?|ainder(?:WithOverflow)?)))|ge(?:nerate|t(?:Objects|Element))|m(?:in(?:imum(?:Magnitude)?|Element)|ove(?:Initialize(?:Memory|BackwardFrom|From)?|Assign(?:From)?)?|ultipl(?:y(?:WithOverflow)?|ied)|easure|a(?:ke(?:Iterator|Description)|x(?:imum(?:Magnitude)?|Element)))|bindMemory)(?=\\s*\\()",
           "name": "support.function.swift"
         },
         {
@@ -232,7 +232,7 @@
           ]
         },
         {
-          "match": "\\b(?:anyGenerator|autoreleasepool)(?=\\s*[({])\\b",
+          "match": "\\ba(?:nyGenerator|utoreleasepool)(?=\\s*[({])\\b",
           "name": "support.function.swift"
         },
         {
@@ -248,11 +248,11 @@
     "builtin-properties": {
       "patterns": [
         {
-          "match": "(?<=^Process\\.|\\WProcess\\.|^CommandLine\\.|\\WCommandLine\\.)(arguments|argc|unsafeArgv)",
+          "match": "(?<=(?:^|\\W)(?:Process\\.|CommandLine\\.))(arguments|argc|unsafeArgv)",
           "name": "support.variable.swift"
         },
         {
-          "match": "(?<=\\.)(?:s(?:t(?:artIndex|ri(?:ngValue|de))|i(?:ze|gn(?:BitIndex|ificand(?:Bit(?:Count|Pattern)|Width)?|alingNaN)?)|u(?:perclassMirror|mmary|bscriptBaseAddress))|h(?:eader|as(?:hValue|PointerRepresentation))|n(?:ulTerminatedUTF8|ext(?:Down|Up)|a(?:n|tiveOwner))|c(?:haracters|ount(?:TrailingZeros)?|ustom(?:Mirror|PlaygroundQuickLook)|apacity)|i(?:s(?:S(?:ign(?:Minus|aling(?:NaN)?)|ubnormal)|N(?:ormal|aN)|Canonical|Infinite|Zero|Empty|Finite|ASCII)|n(?:dices|finity)|dentity)|owner|de(?:scription|bugDescription)|u(?:n(?:safelyUnwrapped|icodeScalar(?:s)?|derestimatedCount)|tf(?:16|8(?:Start|C(?:String|odeUnitCount))?)|intValue|ppercaseString|lp(?:OfOne)?)|p(?:i|ointee)|e(?:ndIndex|lements|xponent(?:Bit(?:Count|Pattern))?)|value(?:s)?|keys|quietNaN|f(?:irst(?:ElementAddress(?:IfContiguous)?)?|loatingPointClass)|l(?:ittleEndian|owercaseString|eastNo(?:nzeroMagnitude|rmalMagnitude)|a(?:st|zy))|a(?:l(?:ignment|l(?:ocatedElementCount|Zeros))|rray(?:PropertyIsNativeTypeChecked)?)|ra(?:dix|wValue)|greatestFiniteMagnitude|m(?:in|emory|ax)|b(?:yteS(?:ize|wapped)|i(?:nade|tPattern|gEndian)|uffer|ase(?:Address)?))\\b",
+          "match": "(?<=\\.)(?:s(?:t(?:artIndex|ri(?:ngValue|de))|i(?:ze|gn(?:BitIndex|ificand(?:Bit(?:Count|Pattern)|Width)?|alingNaN)?)|u(?:perclassMirror|mmary|bscriptBaseAddress))|h(?:eader|as(?:hValue|PointerRepresentation))|n(?:ulTerminatedUTF8|ext(?:Down|Up)|a(?:n|tiveOwner))|c(?:haracters|ount(?:TrailingZeros)?|ustom(?:Mirror|PlaygroundQuickLook)|apacity)|i(?:s(?:S(?:ign(?:Minus|aling(?:NaN)?)|ubnormal)|N(?:ormal|aN)|Canonical|Infinite|Zero|Empty|Finite|ASCII)|n(?:dices|finity)|dentity)|owner|de(?:scription|bugDescription)|u(?:n(?:safelyUnwrapped|icodeScalars?|derestimatedCount)|tf(?:16|8(?:Start|C(?:String|odeUnitCount))?)|intValue|ppercaseString|lp(?:OfOne)?)|p(?:i|ointee)|e(?:ndIndex|lements|xponent(?:Bit(?:Count|Pattern))?)|values?|keys|quietNaN|f(?:irst(?:ElementAddress(?:IfContiguous)?)?|loatingPointClass)|l(?:ittleEndian|owercaseString|eastNo(?:nzeroMagnitude|rmalMagnitude)|a(?:st|zy))|a(?:l(?:ignment|l(?:ocatedElementCount|Zeros))|rray(?:PropertyIsNativeTypeChecked)?)|ra(?:dix|wValue)|greatestFiniteMagnitude|m(?:in|emory|ax)|b(?:yteS(?:ize|wapped)|i(?:nade|tPattern|gEndian)|uffer|ase(?:Address)?))\\b",
           "name": "support.variable.swift"
         },
         {
@@ -339,7 +339,7 @@
     "builtin-types-builtin-typealias": {
       "patterns": [
         {
-          "match": "\\b(?:Raw(?:Significand|Exponent|Value)|B(?:ooleanLiteralType|uffer|ase)|S(?:t(?:orage|r(?:i(?:ngLiteralType|de)|eam(?:1|2)))|ubSequence)|NativeBuffer|C(?:hild(?:ren)?|Bool|S(?:hort|ignedChar)|odeUnit|Char(?:16|32)?|Int|Double|Unsigned(?:Short|Char|Int|Long(?:Long)?)|Float|WideChar|Long(?:Long)?)|I(?:n(?:t(?:Max|egerLiteralType)|d(?:ices|ex(?:Distance)?))|terator)|Distance|U(?:n(?:icodeScalar(?:Type|Index|View|LiteralType)|foldFirstSequence)|TF(?:16(?:Index|View)|8Index)|IntMax)|E(?:lement(?:s)?|x(?:tendedGraphemeCluster(?:Type|LiteralType)|ponent))|V(?:oid|alue)|Key|Float(?:32|LiteralType|64)|AnyClass)\\b",
+          "match": "\\b(?:Raw(?:Significand|Exponent|Value)|B(?:ooleanLiteralType|uffer|ase)|S(?:t(?:orage|r(?:i(?:ngLiteralType|de)|eam[12]))|ubSequence)|NativeBuffer|C(?:hild(?:ren)?|Bool|S(?:hort|ignedChar)|odeUnit|Char(?:16|32)?|Int|Double|Unsigned(?:Short|Char|Int|Long(?:Long)?)|Float|WideChar|Long(?:Long)?)|I(?:n(?:t(?:Max|egerLiteralType)|d(?:ices|ex(?:Distance)?))|terator)|Distance|U(?:n(?:icodeScalar(?:Type|Index|View|LiteralType)|foldFirstSequence)|TF(?:16(?:Index|View)|8Index)|IntMax)|E(?:lements?|x(?:tendedGraphemeCluster(?:Type|LiteralType)|ponent))|V(?:oid|alue)|Key|Float(?:32|LiteralType|64)|AnyClass)\\b",
           "name": "support.type.swift"
         },
         {
@@ -355,7 +355,7 @@
           "name": "punctuation.section.scope.begin.swift"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.swift"
@@ -513,7 +513,7 @@
             }
           },
           "contentName": "comment.block.preprocessor.swift",
-          "end": "(?=^\\s*(#(elseif|else|endif)\\b))"
+          "end": "(?=^\\s*(#(e(?:lseif|lse|ndif))\\b))"
         },
         {
           "begin": "^\\s*(#)(if|elseif)\\s+",
@@ -525,7 +525,7 @@
               "name": "keyword.control.import.preprocessor.conditional.swift"
             }
           },
-          "end": "(?=\\s*(?://|/\\*))|$",
+          "end": "(?=\\s*/[/*])|$",
           "name": "meta.preprocessor.conditional.swift",
           "patterns": [
             {
@@ -656,7 +656,7 @@
               ]
             }
           },
-          "match": "^\\s*(#)(else|endif)(.*?)(?=$|//|/\\*)",
+          "match": "^\\s*(#)(e(?:lse|ndif))(.*?)(?=$|//|/\\*)",
           "name": "meta.preprocessor.conditional.swift"
         },
         {
@@ -855,7 +855,7 @@
               "name": "keyword.operator.type.function.swift"
             }
           },
-          "match": "(?<![/=\\-+!*%<>&|\\^~.])(->)(?![/=\\-+!*%<>&|\\^~.])"
+          "match": "(?<![/=\\-+!*%<>\\&|^~.])(->)(?![/=\\-+!*%<>\\&|^~.])"
         },
         {
           "captures": {
@@ -863,7 +863,7 @@
               "name": "keyword.operator.type.composition.swift"
             }
           },
-          "match": "(?<![/=\\-+!*%<>&|\\^~.])(&)(?![/=\\-+!*%<>&|\\^~.])"
+          "match": "(?<![/=\\-+!*%<>\\&|^~.])(&)(?![/=\\-+!*%<>\\&|^~.])"
         },
         {
           "match": "[?!]",
@@ -899,7 +899,7 @@
           "name": "punctuation.section.collection-type.begin.swift"
         }
       },
-      "end": "\\]|(?=[>){}])",
+      "end": "]|(?=[>){}])",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.collection-type.end.swift"
@@ -916,7 +916,7 @@
               "name": "punctuation.separator.key-value.swift"
             }
           },
-          "end": "(?=\\]|[>){}])",
+          "end": "(?=[\\]>){}])",
           "patterns": [
             {
               "match": ":",
@@ -969,7 +969,7 @@
           "name": "punctuation.definition.identifier.swift"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.definition.type.$1.swift",
       "patterns": [
         {
@@ -988,7 +988,7 @@
               "name": "punctuation.definition.type.begin.swift"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.type.end.swift"
@@ -1004,7 +1004,7 @@
       ]
     },
     "declarations-function": {
-      "begin": "\\b(func)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>)|(?:((?<oph>[/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}])(\\g<oph>|(?<opc>[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))*)|(\\.(\\g<oph>|\\g<opc>|\\.)+)))\\s*(?=\\(|<)",
+      "begin": "\\b(func)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>)|(?:((?<oph>[/=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰])(\\g<oph>|(?<opc>[̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))*)|(\\.(\\g<oph>|\\g<opc>|\\.)+)))\\s*(?=[(<])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.swift"
@@ -1019,7 +1019,7 @@
           "name": "punctuation.definition.identifier.swift"
         }
       },
-      "end": "(?<=\\})|$",
+      "end": "(?<=})|$",
       "name": "meta.definition.function.swift",
       "patterns": [
         {
@@ -1047,7 +1047,7 @@
               "name": "punctuation.section.function.begin.swift"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.end.swift"
@@ -1063,7 +1063,7 @@
       ]
     },
     "declarations-function-initializer": {
-      "begin": "(?<!\\.)\\b(init[?!]*)\\s*(?=\\(|<)",
+      "begin": "(?<!\\.)\\b(init[?!]*)\\s*(?=[(<])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.swift",
@@ -1075,7 +1075,7 @@
           ]
         }
       },
-      "end": "(?<=\\})|$",
+      "end": "(?<=})|$",
       "name": "meta.definition.function.initializer.swift",
       "patterns": [
         {
@@ -1100,7 +1100,7 @@
               "name": "punctuation.section.function.begin.swift"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.end.swift"
@@ -1116,13 +1116,13 @@
       ]
     },
     "declarations-function-result": {
-      "begin": "(?<![/=\\-+!*%<>&|\\^~.])(->)(?![/=\\-+!*%<>&|\\^~.])\\s*",
+      "begin": "(?<![/=\\-+!*%<>\\&|^~.])(->)(?![/=\\-+!*%<>\\&|^~.])\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.function-result.swift"
         }
       },
-      "end": "(?!\\G)(?=\\{|\\bwhere\\b|;|=)|$",
+      "end": "(?!\\G)(?=\\{|\\bwhere\\b|[;=])|$",
       "name": "meta.function-result.swift",
       "patterns": [
         {
@@ -1131,13 +1131,13 @@
       ]
     },
     "declarations-function-subscript": {
-      "begin": "(?<!\\.)\\b(subscript)\\s*(?=\\(|<)",
+      "begin": "(?<!\\.)\\b(subscript)\\s*(?=[(<])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.swift"
         }
       },
-      "end": "(?<=\\})|$",
+      "end": "(?<=})|$",
       "name": "meta.definition.function.subscript.swift",
       "patterns": [
         {
@@ -1165,7 +1165,7 @@
               "name": "punctuation.section.function.begin.swift"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.end.swift"
@@ -1207,7 +1207,7 @@
           "name": "punctuation.separator.generic-parameter-clause.begin.swift"
         }
       },
-      "end": ">|(?=[^\\w\\d:<>\\s,=&`])",
+      "end": ">|(?=[^\\w\\d:<>\\s,=\\&`])",
       "endCaptures": {
         "0": {
           "name": "punctuation.separator.generic-parameter-clause.end.swift"
@@ -1296,7 +1296,7 @@
           "include": "#declarations-available-types"
         },
         {
-          "begin": "(?<![/=\\-+!*%<>&|\\^~.])(==)(?![/=\\-+!*%<>&|\\^~.])",
+          "begin": "(?<![/=\\-+!*%<>\\&|^~.])(==)(?![/=\\-+!*%<>\\&|^~.])",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.generic-constraint.same-type.swift"
@@ -1311,7 +1311,7 @@
           ]
         },
         {
-          "begin": "(?<![/=\\-+!*%<>&|\\^~.])(:)(?![/=\\-+!*%<>&|\\^~.])",
+          "begin": "(?<![/=\\-+!*%<>\\&|^~.])(:)(?![/=\\-+!*%<>\\&|^~.])",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.generic-constraint.conforms-to.swift"
@@ -1341,7 +1341,7 @@
           "name": "keyword.control.import.swift"
         }
       },
-      "end": "(;)|$\\n?|(?=//|/\\*)",
+      "end": "(;)|$\\n?|(?=/[/*])",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.swift"
@@ -1385,7 +1385,7 @@
                   ]
                 }
               },
-              "match": "(?<=\\G|\\.)(?:((?<oph>[/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}])(\\g<oph>|(?<opc>[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))*)|(\\.(\\g<oph>|\\g<opc>|\\.)+))(?=\\.|;|$|//|/\\*|\\s)",
+              "match": "(?<=\\G|\\.)(?:((?<oph>[/=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰])(\\g<oph>|(?<opc>[̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))*)|(\\.(\\g<oph>|\\g<opc>|\\.)+))(?=[.;]|$|//|/\\*|\\s)",
               "name": "entity.name.type.swift"
             },
             {
@@ -1463,7 +1463,7 @@
     },
     "declarations-inheritance-clause-more-types": {
       "begin": ",\\s*",
-      "end": "(?!\\G)(?!//|/\\*)|(?=[,={}]|(?!\\G)\\bwhere\\b)",
+      "end": "(?!\\G)(?!/[/*])|(?=[,={}]|(?!\\G)\\bwhere\\b)",
       "name": "meta.inheritance-list.more-types",
       "patterns": [
         {
@@ -1481,7 +1481,7 @@
       ]
     },
     "declarations-macro": {
-      "begin": "\\b(macro)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*(?=\\(|<|=)",
+      "begin": "\\b(macro)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*(?=[(<=])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.swift"
@@ -1496,7 +1496,7 @@
           "name": "punctuation.definition.identifier.swift"
         }
       },
-      "end": "$|(?=;|//|/\\*|\\}|=)",
+      "end": "$|(?=;|//|/\\*|[}=])",
       "name": "meta.definition.macro.swift",
       "patterns": [
         {
@@ -1520,7 +1520,7 @@
       ]
     },
     "declarations-operator": {
-      "begin": "(?:\\b(prefix|infix|postfix)\\s+)?\\b(operator)\\s+(((?<oph>[/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}])(\\g<oph>|\\.|(?<opc>[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))*+)|(\\.(\\g<oph>|\\g<opc>|\\.)++))\\s*",
+      "begin": "(?:\\b(prefix|infix|postfix)\\s+)?\\b(operator)\\s+(((?<oph>[/=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰])(\\g<oph>|\\.|(?<opc>[̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))*+)|(\\.(\\g<oph>|\\g<opc>|\\.)++))\\s*",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.swift"
@@ -1541,7 +1541,7 @@
           ]
         }
       },
-      "end": "(;)|$\\n?|(?=//|/\\*)",
+      "end": "(;)|$\\n?|(?=/[/*])",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.statement.swift"
@@ -1568,7 +1568,7 @@
           "name": "punctuation.definition.operator.begin.swift"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.operator.end.swift"
@@ -1749,7 +1749,7 @@
               "name": "punctuation.definition.precedencegroup.begin.swift"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.precedencegroup.end.swift"
@@ -1823,7 +1823,7 @@
           "name": "punctuation.definition.identifier.swift"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.definition.type.protocol.swift",
       "patterns": [
         {
@@ -1842,7 +1842,7 @@
               "name": "punctuation.definition.type.begin.swift"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.type.end.swift"
@@ -1897,7 +1897,7 @@
       ]
     },
     "declarations-protocol-protocol-initializer": {
-      "begin": "(?<!\\.)\\b(init[?!]*)\\s*(?=\\(|<)",
+      "begin": "(?<!\\.)\\b(init[?!]*)\\s*(?=[(<])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.swift",
@@ -1909,7 +1909,7 @@
           ]
         }
       },
-      "end": "$|(?=;|//|/\\*|\\})",
+      "end": "$|(?=;|//|/\\*|})",
       "name": "meta.definition.function.initializer.swift",
       "patterns": [
         {
@@ -1934,7 +1934,7 @@
               "name": "punctuation.section.function.begin.swift"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.function.end.swift"
@@ -1950,7 +1950,7 @@
       ]
     },
     "declarations-protocol-protocol-method": {
-      "begin": "\\b(func)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>)|(?:((?<oph>[/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}])(\\g<oph>|(?<opc>[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))*)|(\\.(\\g<oph>|\\g<opc>|\\.)+)))\\s*(?=\\(|<)",
+      "begin": "\\b(func)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>)|(?:((?<oph>[/=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰])(\\g<oph>|(?<opc>[̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))*)|(\\.(\\g<oph>|\\g<opc>|\\.)+)))\\s*(?=[(<])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.swift"
@@ -1965,7 +1965,7 @@
           "name": "punctuation.definition.identifier.swift"
         }
       },
-      "end": "$|(?=;|//|/\\*|\\})",
+      "end": "$|(?=;|//|/\\*|})",
       "name": "meta.definition.function.swift",
       "patterns": [
         {
@@ -1993,7 +1993,7 @@
               "name": "punctuation.section.function.begin.swift"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.function.end.swift"
@@ -2026,7 +2026,7 @@
               "name": "punctuation.definition.identifier.swift"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "name": "meta.definition.type.$1.swift",
           "patterns": [
             {
@@ -2048,7 +2048,7 @@
                   "name": "punctuation.definition.type.begin.swift"
                 }
               },
-              "end": "\\}",
+              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.type.end.swift"
@@ -2084,7 +2084,7 @@
           "name": "punctuation.definition.identifier.swift"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.definition.type.$1.swift",
       "patterns": [
         {
@@ -2106,7 +2106,7 @@
               "name": "punctuation.definition.type.begin.swift"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.type.end.swift"
@@ -2226,7 +2226,7 @@
           "name": "storage.type.enum.case.swift"
         }
       },
-      "end": "(?=[;}])|(?!\\G)(?!//|/\\*)(?=[^\\s,])",
+      "end": "(?=[;}])|(?!\\G)(?!/[/*])(?=[^\\s,])",
       "patterns": [
         {
           "include": "#comments"
@@ -2241,7 +2241,7 @@
     },
     "declarations-type-enum-more-cases": {
       "begin": ",\\s*",
-      "end": "(?!\\G)(?!//|/\\*)(?=[;}]|[^\\s,])",
+      "end": "(?!\\G)(?!/[/*])(?=[;}[^\\s,]])",
       "name": "meta.enum-case.more-cases",
       "patterns": [
         {
@@ -2311,7 +2311,7 @@
               "name": "keyword.operator.type.composition.swift"
             }
           },
-          "match": "(?<![/=\\-+!*%<>&|\\^~.])(&)(?![/=\\-+!*%<>&|\\^~.])"
+          "match": "(?<![/=\\-+!*%<>\\&|^~.])(&)(?![/=\\-+!*%<>\\&|^~.])"
         },
         {
           "captures": {
@@ -2319,7 +2319,7 @@
               "name": "keyword.operator.type.requirement-suppression.swift"
             }
           },
-          "match": "(?<![/=\\-+!*%<>&|\\^~.])(~)(?![/=\\-+!*%<>&|\\^~.])"
+          "match": "(?<![/=\\-+!*%<>\\&|^~.])(~)(?![/=\\-+!*%<>\\&|^~.])"
         }
       ]
     },
@@ -2542,7 +2542,7 @@
               "name": "constant.numeric.swift"
             }
           },
-          "match": "\\s*\\b((?:iOS|macOS|OSX|watchOS|tvOS|visionOS|UIKitForMac)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))"
+          "match": "\\s*\\b((?:iOS|macOS|OSX|watchOS|tvOS|visionOS|UIKitForMac)(?:ApplicationExtension)?)\\b\\s+([0-9]+(?:\\.[0-9]+)*\\b)"
         },
         {
           "captures": {
@@ -2728,7 +2728,7 @@
           "name": "punctuation.definition.arguments.begin.swift"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.arguments.end.swift"
@@ -2855,7 +2855,7 @@
           "name": "variable.language.swift"
         },
         {
-          "match": "\\B(?:#file|#filePath|#fileID|#line|#column|#function|#dsohandle)\\b|\\b(?:__FILE__|__LINE__|__COLUMN__|__FUNCTION__|__DSO_HANDLE__)\\b",
+          "match": "\\B#(?:file|filePath|fileID|line|column|function|dsohandle)\\b|\\b__(?:FILE__|LINE__|COLUMN__|FUNCTION__|DSO_HANDLE__)\\b",
           "name": "support.variable.swift"
         },
         {
@@ -2939,50 +2939,50 @@
     "literals-numeric": {
       "patterns": [
         {
-          "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9][0-9_]*(?=\\.[0-9]|[eE])(?:\\.[0-9][0-9_]*)?(?:[eE][-+]?[0-9][0-9_]*)?\\b(?!\\.[0-9])",
+          "match": "(\\B-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9][0-9_]*(?=\\.[0-9]|[eE])(?:\\.[0-9][0-9_]*)?(?:[eE][-+]?[0-9][0-9_]*)?\\b(?!\\.[0-9])",
           "name": "constant.numeric.float.decimal.swift"
         },
         {
-          "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x[0-9a-fA-F][0-9a-fA-F_]*)(?:\\.[0-9a-fA-F][0-9a-fA-F_]*)?[pP][-+]?[0-9][0-9_]*\\b(?!\\.[0-9])",
+          "match": "(\\B-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x\\h[_\\h]*)(?:\\.\\h[_\\h]*)?[pP][-+]?[0-9][0-9_]*\\b(?!\\.[0-9])",
           "name": "constant.numeric.float.hexadecimal.swift"
         },
         {
-          "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x[0-9a-fA-F][0-9a-fA-F_]*)(?:\\.[0-9a-fA-F][0-9a-fA-F_]*)?(?:[pP][-+]?\\w*)\\b(?!\\.[0-9])",
+          "match": "(\\B-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x\\h[_\\h]*)(?:\\.\\h[_\\h]*)?[pP][-+]?\\w*\\b(?!\\.[0-9])",
           "name": "invalid.illegal.numeric.float.invalid-exponent.swift"
         },
         {
-          "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x[0-9a-fA-F][0-9a-fA-F_]*)\\.[0-9][\\w.]*",
+          "match": "(\\B-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x\\h[_\\h]*)\\.[0-9][\\w.]*",
           "name": "invalid.illegal.numeric.float.missing-exponent.swift"
         },
         {
-          "match": "(?<=\\s|^)\\-?\\.[0-9][\\w.]*",
+          "match": "(?<=\\s|^)-?\\.[0-9][\\w.]*",
           "name": "invalid.illegal.numeric.float.missing-leading-zero.swift"
         },
         {
-          "match": "(\\B\\-|\\b)0[box]_[0-9a-fA-F_]*(?:[pPeE][+-]?\\w+)?[\\w.]+",
+          "match": "(\\B-|\\b)0[box]_[_\\h]*(?:[pPeE][+-]?\\w+)?[\\w.]+",
           "name": "invalid.illegal.numeric.leading-underscore.swift"
         },
         {
           "match": "(?<=[\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9]+\\b"
         },
         {
-          "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0b[01][01_]*\\b(?!\\.[0-9])",
+          "match": "(\\B-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0b[01][01_]*\\b(?!\\.[0-9])",
           "name": "constant.numeric.integer.binary.swift"
         },
         {
-          "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0o[0-7][0-7_]*\\b(?!\\.[0-9])",
+          "match": "(\\B-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0o[0-7][0-7_]*\\b(?!\\.[0-9])",
           "name": "constant.numeric.integer.octal.swift"
         },
         {
-          "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9][0-9_]*\\b(?!\\.[0-9])",
+          "match": "(\\B-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9][0-9_]*\\b(?!\\.[0-9])",
           "name": "constant.numeric.integer.decimal.swift"
         },
         {
-          "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0x[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\.[0-9])",
+          "match": "(\\B-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0x\\h[_\\h]*\\b(?!\\.[0-9])",
           "name": "constant.numeric.integer.hexadecimal.swift"
         },
         {
-          "match": "(\\B\\-|\\b)[0-9][\\w.]*",
+          "match": "(\\B-|\\b)[0-9][\\w.]*",
           "name": "invalid.illegal.numeric.other.swift"
         }
       ]
@@ -3021,7 +3021,7 @@
               "name": "invalid.illegal.returns-not-allowed.regexp"
             }
           },
-          "match": "(?!/\\s)(?!//)(((\\#+)?)/)(\\\\\\s)?(?<guts>(?>(?:\\\\Q(?:(?!\\\\E)(?!/\\2).)*+(?:\\\\E|(?(3)|(?<!\\s))(?=/\\2))|\\\\.|\\(\\?\\#[^)]*\\)|\\(\\?(?>(\\{(?:\\g<-1>|(?!{).*?)\\}))(?:\\[(?!\\d)\\w+\\])?[X<>]?\\)|(?<class>\\[(?:\\\\.|[^\\[\\]]|\\g<class>)+\\])|\\(\\g<guts>?+\\)|(?:(?!/\\2)[^()\\[\\\\])+)+))?+(?(3)|(?(5)(?<!\\s)))(/\\2)|\\#+/.+(\\n)",
+          "match": "(?x)\n(?!/\\s)         # non-extended regex literals may not start with a space or tab\n(?!//)          # disambiguation with line comments (redundant since comment rules occur earlier)\n(((\\#+)?)/)     # (1) for captures, (2) for matching end, (3) for conditionals\n(\\\\\\s)? # (4) may start with an escaped space or tab\n(?<guts>\n  (?>   # no backtracking, avoids issues with negative lookbehind at end\n    (?:\n      \\\\Q\n        (?:(?!\\\\E)(?!/\\2).)*+\n        (?:\\\\E\n          # A quoted sequence may not have a closing E, in which case it extends to the end of the regex\n          | (?(3)|(?<!\\s))(?=/\\2)\n        )\n      | \\\\.\n      | \\(\\?\\#[^)]*\\)\n      | \\(\\?\n          # InterpolatedCallout\n          (?>(\\{(?:\\g<-1>|(?!{).*?)\\}))\n          (?:\\[(?!\\d)\\w+\\])?\n          [X<>]?\n        \\)\n      | (?<class>\\[ (?:\\\\. | [^\\[\\]] | \\g<class>)+ \\])\n      | \\(\\g<guts>?+\\)\n      | (?:(?!/\\2)[^()\\[\\\\])+  # any character (until end)\n    )+\n  )\n)?+\n# may end with a space only if it is an extended literal or contains only a single escaped space\n(?(3)|(?(5)(?<!\\s)))\n(/\\2)     # (12)\n| \\#+/.+(\\n)",
           "name": "string.regexp.line.swift"
         }
       ]
@@ -3055,7 +3055,7 @@
               "name": "constant.character.escape.backslash.regexp"
             }
           },
-          "match": "(\\\\g\\{)(?:((?!\\d)\\w+)(?:([+-])(\\d+))?|([+-]?\\d+)(?:([+-])(\\d+))?)(\\})"
+          "match": "(\\\\g\\{)(?:((?!\\d)\\w+)(?:([+-])(\\d+))?|([+-]?\\d+)(?:([+-])(\\d+))?)(})"
         },
         {
           "captures": {
@@ -3150,7 +3150,7 @@
               "name": "constant.character.escape.backslash.regexp"
             }
           },
-          "match": "(\\\\k\\{)((?!\\d)\\w+)(?:([+-])(\\d+))?(\\})"
+          "match": "(\\\\k\\{)((?!\\d)\\w+)(?:([+-])(\\d+))?(})"
         },
         {
           "match": "\\\\[1-9][0-9]+",
@@ -3232,7 +3232,7 @@
           "name": "keyword.control.directive.regexp"
         }
       },
-      "match": "(\\(\\*)(?:(ACCEPT|FAIL|F|MARK(?=:)|(?=:)|COMMIT|PRUNE|SKIP|THEN)(?:(:)([^)]+))?|(?:(LIMIT_(?:DEPTH|HEAP|MATCH))(=)(\\d+))|(CRLF|CR|ANYCRLF|ANY|LF|NUL|BSR_ANYCRLF|BSR_UNICODE|NOTEMPTY_ATSTART|NOTEMPTY|NO_AUTO_POSSESS|NO_DOTSTAR_ANCHOR|NO_JIT|NO_START_OPT|UTF|UCP))(\\))"
+      "match": "(\\(\\*)(?:(ACCEPT|FAIL|F|MARK(?=:)|(?=:)|COMMIT|PRUNE|SKIP|THEN)(?:(:)([^)]+))?|(LIMIT_(?:DEPTH|HEAP|MATCH))(=)(\\d+)|(CRLF|CR|ANYCRLF|ANY|LF|NUL|BSR_ANYCRLF|BSR_UNICODE|NOTEMPTY_ATSTART|NOTEMPTY|NO_AUTO_POSSESS|NO_DOTSTAR_ANCHOR|NO_JIT|NO_START_OPT|UTF|UCP))(\\))"
     },
     "literals-regular-expression-literal-callout": {
       "captures": {
@@ -3303,7 +3303,7 @@
           "name": "entity.name.function.callout.regexp"
         }
       },
-      "match": "(\\()(?<keyw>\\?C)(?:(?<num>\\d+)|`(?<name>(?:[^`]|``)*)`|'(?<name>(?:[^']|'')*)'|\"(?<name>(?:[^\"]|\"\")*)\"|\\^(?<name>(?:[^\\^]|\\^\\^)*)\\^|%(?<name>(?:[^%]|%%)*)%|\\#(?<name>(?:[^#]|\\#\\#)*)\\#|\\$(?<name>(?:[^$]|\\$\\$)*)\\$|\\{(?<name>(?:[^}]|\\}\\})*)\\})?(\\))|(\\()(?<keyw>\\*)(?<name>(?!\\d)\\w+)(?:\\[(?<tag>(?!\\d)\\w+)\\])?(?:\\{[^,}]+(?:,[^,}]+)*\\})?(\\))|(\\()(?<keyw>\\?)(?>(\\{(?:\\g<-1>|(?!{).*?)\\}))(?:\\[(?<tag>(?!\\d)\\w+)\\])?(?<keyw>[X<>]?)(\\))",
+      "match": "(\\()(?<keyw>\\?C)(?:(?<num>\\d+)|`(?<name>(?:[^`]|``)*)`|'(?<name>(?:[^']|'')*)'|\"(?<name>(?:[^\"]|\"\")*)\"|\\^(?<name>(?:[^^]|\\^\\^)*)\\^|%(?<name>(?:[^%]|%%)*)%|#(?<name>(?:[^#]|##)*)#|\\$(?<name>(?:[^$]|\\$\\$)*)\\$|\\{(?<name>(?:[^}]|}})*)})?(\\))|(\\()(?<keyw>\\*)(?<name>(?!\\d)\\w+)(?:\\[(?<tag>(?!\\d)\\w+)])?(?:\\{[^,}]+(?:,[^,}]+)*})?(\\))|(\\()(?<keyw>\\?)(?>(\\{(?:\\g<20>|(?!\\{).*?)}))(?:\\[(?<tag>(?!\\d)\\w+)])?(?<keyw>[X<>]?)(\\))",
       "name": "meta.callout.regexp"
     },
     "literals-regular-expression-literal-character-properties": {
@@ -3321,7 +3321,7 @@
           "name": "punctuation.definition.character-class.regexp"
         }
       },
-      "match": "\\\\[pP]\\{([\\s\\w-]+(?:=[\\s\\w-]+)?)\\}|(\\[:)([\\s\\w-]+(?:=[\\s\\w-]+)?)(:\\])",
+      "match": "\\\\[pP]\\{([\\s\\w-]+(?:=[\\s\\w-]+)?)}|(\\[:)([\\s\\w-]+(?:=[\\s\\w-]+)?)(:])",
       "name": "constant.other.character-class.set.regexp"
     },
     "literals-regular-expression-literal-custom-char-class": {
@@ -3336,7 +3336,7 @@
               "name": "keyword.operator.negation.regexp"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.character-class.regexp"
@@ -3375,7 +3375,7 @@
       ]
     },
     "literals-regular-expression-literal-group-option-toggle": {
-      "match": "\\(\\?(?:\\^(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*|(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})+|(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*-(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*)\\)",
+      "match": "\\(\\?(?:\\^(?:[iJmnsUxwDPSW]|xx|y\\{[gw]})*|(?:[iJmnsUxwDPSW]|xx|y\\{[gw]})+|(?:[iJmnsUxwDPSW]|xx|y\\{[gw]})*-(?:[iJmnsUxwDPSW]|xx|y\\{[gw]})*)\\)",
       "name": "keyword.other.option-toggle.regexp"
     },
     "literals-regular-expression-literal-group-or-conditional": {
@@ -3484,7 +3484,7 @@
           ]
         },
         {
-          "begin": "(\\()((\\?)(?:([:|>=!*]|<[=!*])|P?<(?:((?!\\d)\\w+)(-))?((?!\\d)\\w+)>|'(?:((?!\\d)\\w+)(-))?((?!\\d)\\w+)'|(?:\\^(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*|(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})+|(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*-(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*):)|\\*(atomic|pla|positive_lookahead|nla|negative_lookahead|plb|positive_lookbehind|nlb|negative_lookbehind|napla|non_atomic_positive_lookahead|naplb|non_atomic_positive_lookbehind|sr|script_run|asr|atomic_script_run):)?+",
+          "begin": "(\\()((\\?)(?:([:|>=!*]|<[=!*])|P?<(?:((?!\\d)\\w+)(-))?((?!\\d)\\w+)>|'(?:((?!\\d)\\w+)(-))?((?!\\d)\\w+)'|(?:\\^(?:[iJmnsUxwDPSW]|xx|y\\{[gw]})*|(?:[iJmnsUxwDPSW]|xx|y\\{[gw]})+|(?:[iJmnsUxwDPSW]|xx|y\\{[gw]})*-(?:[iJmnsUxwDPSW]|xx|y\\{[gw]})*):)|\\*(atomic|pla|positive_lookahead|nla|negative_lookahead|plb|positive_lookbehind|nlb|negative_lookbehind|napla|non_atomic_positive_lookahead|naplb|non_atomic_positive_lookbehind|sr|script_run|asr|atomic_script_run):)?+",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.group.regexp"
@@ -3538,7 +3538,7 @@
           "name": "punctuation.definition.comment.regexp"
         }
       },
-      "match": "(\\#).*$",
+      "match": "(#).*$",
       "name": "comment.line.regexp"
     },
     "literals-regular-expression-literal-quote": {
@@ -3565,7 +3565,7 @@
           "include": "#literals-regular-expression-literal-quote"
         },
         {
-          "begin": "\\(\\?\\#",
+          "begin": "\\(\\?#",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.regexp"
@@ -3586,7 +3586,7 @@
               "name": "punctuation.section.embedded.begin.regexp"
             }
           },
-          "end": "\\}>",
+          "end": "}>",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.regexp"
@@ -3634,7 +3634,7 @@
           "name": "keyword.operator.quantifier.regexp"
         },
         {
-          "match": "\\{\\s*\\d+\\s*(?:,\\s*\\d*\\s*)?\\}|\\{\\s*,\\s*\\d+\\s*\\}",
+          "match": "\\{(?:\\s*\\d+\\s*(?:,\\s*\\d*\\s*)?}|\\s*,\\s*\\d+\\s*})",
           "name": "keyword.operator.quantifier.regexp"
         },
         {
@@ -3659,13 +3659,13 @@
           "name": "keyword.operator.subtraction.regexp.swift"
         },
         {
-          "match": "\\~\\~",
+          "match": "~~",
           "name": "keyword.operator.symmetric-difference.regexp.swift"
         }
       ]
     },
     "literals-regular-expression-literal-unicode-scalars": {
-      "match": "\\\\u\\{\\s*(?:[0-9a-fA-F]+\\s*)+\\}|\\\\u[0-9a-fA-F]{4}|\\\\x\\{[0-9a-fA-F]+\\}|\\\\x[0-9a-fA-F]{0,2}|\\\\U[0-9a-fA-F]{8}|\\\\o\\{[0-7]+\\}|\\\\0[0-7]{0,3}|\\\\N\\{(?:U\\+[0-9a-fA-F]{1,8}|[\\s\\w-]+)\\}",
+      "match": "\\\\(?:u\\{\\s*(?:\\h+\\s*)+}|u\\h{4}|x\\{\\h+}|x\\h{0,2}|U\\h{8}|o\\{[0-7]+}|0[0-7]{0,3}|N\\{(?:U\\+\\h{1,8}|[\\s\\w-]+)})",
       "name": "constant.character.numeric.regexp"
     },
     "literals-string": {
@@ -3689,7 +3689,7 @@
           "name": "string.quoted.double.block.swift",
           "patterns": [
             {
-              "match": "\\G.+(?=\"\"\")|\\G.+",
+              "match": "\\G(?:.+(?=\"\"\")|.+)",
               "name": "invalid.illegal.content-after-opening-delimiter.swift"
             },
             {
@@ -3724,7 +3724,7 @@
           "name": "string.quoted.double.block.raw.swift",
           "patterns": [
             {
-              "match": "\\G.+(?=\"\"\")|\\G.+",
+              "match": "\\G(?:.+(?=\"\"\")|.+)",
               "name": "invalid.illegal.content-after-opening-delimiter.swift"
             },
             {
@@ -3759,7 +3759,7 @@
           "name": "string.quoted.double.block.raw.swift",
           "patterns": [
             {
-              "match": "\\G.+(?=\"\"\")|\\G.+",
+              "match": "\\G(?:.+(?=\"\"\")|.+)",
               "name": "invalid.illegal.content-after-opening-delimiter.swift"
             }
           ]
@@ -3783,7 +3783,7 @@
           "name": "string.quoted.double.single-line.swift",
           "patterns": [
             {
-              "match": "\\r|\\n",
+              "match": "[\\r\\n]",
               "name": "invalid.illegal.returns-not-allowed.swift"
             },
             {
@@ -3810,7 +3810,7 @@
           "name": "string.quoted.double.single-line.raw.swift",
           "patterns": [
             {
-              "match": "\\r|\\n",
+              "match": "[\\r\\n]",
               "name": "invalid.illegal.returns-not-allowed.swift"
             }
           ]
@@ -3834,7 +3834,7 @@
           "name": "string.quoted.double.single-line.raw.swift",
           "patterns": [
             {
-              "match": "\\r|\\n",
+              "match": "[\\r\\n]",
               "name": "invalid.illegal.returns-not-allowed.swift"
             },
             {
@@ -3851,7 +3851,7 @@
           "name": "constant.character.escape.swift"
         },
         {
-          "match": "\\\\#u\\{[0-9a-fA-F]{1,8}\\}",
+          "match": "\\\\#u\\{\\h{1,8}}",
           "name": "constant.character.escape.unicode.swift"
         },
         {
@@ -3895,7 +3895,7 @@
           "name": "constant.character.escape.swift"
         },
         {
-          "match": "\\\\u\\{[0-9a-fA-F]{1,8}\\}",
+          "match": "\\\\u\\{\\h{1,8}}",
           "name": "constant.character.escape.unicode.swift"
         },
         {
@@ -3957,7 +3957,7 @@
           "name": "keyword.operator.type-casting.swift"
         },
         {
-          "begin": "(?=(?<oph>[/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}])|\\.(\\g<oph>|\\.|[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))",
+          "begin": "(?=(?<oph>[/=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰])|\\.(\\g<oph>|[.̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))",
           "end": "(?!\\G)",
           "patterns": [
             {
@@ -3965,11 +3965,11 @@
                 "0": {
                   "patterns": [
                     {
-                      "match": "\\G(\\+\\+|\\-\\-)$",
+                      "match": "\\G(\\+\\+|--)$",
                       "name": "keyword.operator.increment-or-decrement.swift"
                     },
                     {
-                      "match": "\\G(\\+|\\-)$",
+                      "match": "\\G([+-])$",
                       "name": "keyword.operator.arithmetic.unary.swift"
                     },
                     {
@@ -3987,14 +3987,14 @@
                   ]
                 }
               },
-              "match": "\\G(?<=^|[\\s(\\[{,;:])((?!(//|/\\*|\\*/))([/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}]|[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))++(?![\\s)\\]},;:]|\\z)"
+              "match": "\\G(?<=^|[\\s(\\[{,;:])((?!(//|/\\*|\\*/))([/=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))++(?![\\s)\\]},;:]|\\z)"
             },
             {
               "captures": {
                 "0": {
                   "patterns": [
                     {
-                      "match": "\\G(\\+\\+|\\-\\-)$",
+                      "match": "\\G(\\+\\+|--)$",
                       "name": "keyword.operator.increment-or-decrement.swift"
                     },
                     {
@@ -4008,7 +4008,7 @@
                   ]
                 }
               },
-              "match": "\\G(?<!^|[\\s(\\[{,;:])((?!(//|/\\*|\\*/))([/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}]|[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))++(?=[\\s)\\]},;:]|\\z)"
+              "match": "\\G(?<!^|[\\s(\\[{,;:])((?!(//|/\\*|\\*/))([/=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))++(?=[\\s)\\]},;:]|\\z)"
             },
             {
               "captures": {
@@ -4019,15 +4019,15 @@
                       "name": "keyword.operator.assignment.swift"
                     },
                     {
-                      "match": "\\G(\\+|\\-|\\*|/|%|<<|>>|&|\\^|\\||&&|\\|\\|)=$",
+                      "match": "\\G([+\\-*/%]|<<|>>|[\\&^|]|&&|\\|\\|)=$",
                       "name": "keyword.operator.assignment.compound.swift"
                     },
                     {
-                      "match": "\\G(\\+|\\-|\\*|/)$",
+                      "match": "\\G([+\\-*/])$",
                       "name": "keyword.operator.arithmetic.swift"
                     },
                     {
-                      "match": "\\G&(\\+|\\-|\\*)$",
+                      "match": "\\G&([+\\-*])$",
                       "name": "keyword.operator.arithmetic.overflow.swift"
                     },
                     {
@@ -4035,7 +4035,7 @@
                       "name": "keyword.operator.arithmetic.remainder.swift"
                     },
                     {
-                      "match": "\\G(==|!=|>|<|>=|<=|~=)$",
+                      "match": "\\G(==|!=|[><]|>=|<=|~=)$",
                       "name": "keyword.operator.comparison.swift"
                     },
                     {
@@ -4047,7 +4047,7 @@
                       "name": "keyword.operator.logical.swift"
                     },
                     {
-                      "match": "\\G(&|\\||\\^|<<|>>)$",
+                      "match": "\\G([\\&|^]|<<|>>)$",
                       "name": "keyword.operator.bitwise.swift"
                     },
                     {
@@ -4065,7 +4065,7 @@
                   ]
                 }
               },
-              "match": "\\G((?!(//|/\\*|\\*/))([/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}]|[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))++"
+              "match": "\\G((?!(//|/\\*|\\*/))([/=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))++"
             },
             {
               "captures": {
@@ -4078,7 +4078,7 @@
                   ]
                 }
               },
-              "match": "\\G(?<=^|[\\s(\\[{,;:])\\.((?!(//|/\\*|\\*/))(\\.|[/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}]|[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))++(?![\\s)\\]},;:]|\\z)"
+              "match": "\\G(?<=^|[\\s(\\[{,;:])\\.((?!(//|/\\*|\\*/))([./=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))++(?![\\s)\\]},;:]|\\z)"
             },
             {
               "captures": {
@@ -4091,7 +4091,7 @@
                   ]
                 }
               },
-              "match": "\\G(?<!^|[\\s(\\[{,;:])\\.((?!(//|/\\*|\\*/))(\\.|[/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}]|[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))++(?=[\\s)\\]},;:]|\\z)"
+              "match": "\\G(?<!^|[\\s(\\[{,;:])\\.((?!(//|/\\*|\\*/))([./=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))++(?=[\\s)\\]},;:]|\\z)"
             },
             {
               "captures": {
@@ -4108,7 +4108,7 @@
                   ]
                 }
               },
-              "match": "\\G\\.((?!(//|/\\*|\\*/))(\\.|[/=\\-+!*%<>&|^~?]|[\\x{00A1}-\\x{00A7}]|[\\x{00A9}\\x{00AB}]|[\\x{00AC}\\x{00AE}]|[\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]|[\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]|[\\x{2030}-\\x{203E}]|[\\x{2041}-\\x{2053}]|[\\x{2055}-\\x{205E}]|[\\x{2190}-\\x{23FF}]|[\\x{2500}-\\x{2775}]|[\\x{2794}-\\x{2BFF}]|[\\x{2E00}-\\x{2E7F}]|[\\x{3001}-\\x{3003}]|[\\x{3008}-\\x{3030}]|[\\x{0300}-\\x{036F}]|[\\x{1DC0}-\\x{1DFF}]|[\\x{20D0}-\\x{20FF}]|[\\x{FE00}-\\x{FE0F}]|[\\x{FE20}-\\x{FE2F}]|[\\x{E0100}-\\x{E01EF}]))++"
+              "match": "\\G\\.((?!(//|/\\*|\\*/))([./=\\-+!*%<>\\&|^~?¡-§©«¬®°-±¶»¿×÷‖-‗†-‧‰-‾⁁-⁓⁕-⁞←-⏿─-❵➔-⯿⸀-⹿、-〃〈-〰̀-ͯ᷀-᷿⃐-⃿︀-️︠-︯\\x{E0100}-\\x{E01EF}]))++"
             }
           ]
         },
diff --git a/resources/languages/system-verilog.json b/resources/languages/system-verilog.json
index 2483f83..d966f36 100644
--- a/resources/languages/system-verilog.json
+++ b/resources/languages/system-verilog.json
@@ -188,7 +188,7 @@
           "name": "entity.name.type.module.systemverilog"
         }
       },
-      "match": "[ \\t\\r\\n]*\\b(bind)[ \\t\\r\\n]+([a-zA-Z_][a-zA-Z0-9_$\\.]*)\\b",
+      "match": "[ \\t\\r\\n]*\\b(bind)[ \\t\\r\\n]+([a-zA-Z_][a-zA-Z0-9_$.]*)\\b",
       "name": "meta.definition.systemverilog"
     },
     "built-ins": {
@@ -427,7 +427,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "(\\b[1-9][0-9_]*)?'([sS]?[bB][ \\t\\r\\n]*[0-1xXzZ?][0-1_xXzZ?]*|[sS]?[oO][ \\t\\r\\n]*[0-7xXzZ?][0-7_xXzZ?]*|[sS]?[dD][ \\t\\r\\n]*[0-9xXzZ?][0-9_xXzZ?]*|[sS]?[hH][ \\t\\r\\n]*[0-9a-fA-FxXzZ?][0-9a-fA-F_xXzZ?]*)((e|E)(\\+|-)?[0-9]+)?(?!'|\\w)",
+          "match": "(\\b[1-9][0-9_]*)?'([sS]?[bB][ \\t\\r\\n]*[0-1xXzZ?][0-1_xXzZ?]*|[sS]?[oO][ \\t\\r\\n]*[0-7xXzZ?][0-7_xXzZ?]*|[sS]?[dD][ \\t\\r\\n]*[0-9xXzZ?][0-9_xXzZ?]*|[sS]?[hH][ \\t\\r\\n]*[xXzZ?\\h][_xXzZ?\\h]*)(([eE])([+-])?[0-9]+)?(?!['\\w])",
           "name": "constant.numeric.systemverilog"
         },
         {
@@ -435,15 +435,15 @@
           "name": "constant.numeric.bit.systemverilog"
         },
         {
-          "match": "\\b(?:\\d[\\d_\\.]*(?<!\\.)(?:e|E)(?:\\+|-)?[0-9]+)\\b",
+          "match": "\\b\\d[\\d_.]*(?<!\\.)[eE][+-]?[0-9]+\\b",
           "name": "constant.numeric.exp.systemverilog"
         },
         {
-          "match": "\\b(?:\\d[\\d_\\.]*(?!(?:[\\d\\.]|[ \\t\\r\\n]*(?:e|E|fs|ps|ns|us|ms|s))))\\b",
+          "match": "\\b\\d[\\d_.]*(?!(?:[\\d.]|[ \\t\\r\\n]*(?:[eE]|fs|ps|ns|us|ms|s)))\\b",
           "name": "constant.numeric.decimal.systemverilog"
         },
         {
-          "match": "\\b(?:\\d[\\d\\.]*[ \\t\\r\\n]*(?:fs|ps|ns|us|ms|s))\\b",
+          "match": "\\b\\d[\\d.]*[ \\t\\r\\n]*(?:fs|ps|ns|us|ms|s)\\b",
           "name": "constant.numeric.time.systemverilog"
         },
         {
@@ -468,7 +468,7 @@
       ]
     },
     "enum-struct-union": {
-      "begin": "[ \\t\\r\\n]*\\b(enum|struct|union(?:[ \\t\\r\\n]+tagged)?|class|interface[ \\t\\r\\n]+class)(?:[ \\t\\r\\n]+(?!packed|signed|unsigned)([a-zA-Z_][a-zA-Z0-9_$]*)?(?:[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$\\.\\-\\+\\*/%`' \\t\\r\\n\\[\\]\\(\\)]*\\])?))?(?:[ \\t\\r\\n]+(packed))?(?:[ \\t\\r\\n]+(signed|unsigned))?(?=[ \\t\\r\\n]*(?:{|$))",
+      "begin": "[ \\t\\r\\n]*\\b(enum|struct|union(?:[ \\t\\r\\n]+tagged)?|class|interface[ \\t\\r\\n]+class)(?:[ \\t\\r\\n]+(?!packed|signed|unsigned)([a-zA-Z_][a-zA-Z0-9_$]*)?[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$.\\-+*/%`' \\t\\r\\n\\[\\]()]*])?)?(?:[ \\t\\r\\n]+(packed))?(?:[ \\t\\r\\n]+(signed|unsigned))?(?=[ \\t\\r\\n]*(?:\\{|$))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.systemverilog"
@@ -494,7 +494,7 @@
           "name": "storage.modifier.systemverilog"
         }
       },
-      "end": "(?<=})[ \\t\\r\\n]*([a-zA-Z_][a-zA-Z0-9_$]*|(?<=^|[ \\t\\r\\n])\\\\[!-~]+(?=$|[ \\t\\r\\n]))(?:[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$\\.\\-\\+\\*/%`' \\t\\r\\n\\[\\]\\(\\)]*\\])?)[ \\t\\r\\n]*[,;]",
+      "end": "(?<=})[ \\t\\r\\n]*([a-zA-Z_][a-zA-Z0-9_$]*|(?<=^|[ \\t\\r\\n])\\\\[!-~]+(?=$|[ \\t\\r\\n]))[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$.\\-+*/%`' \\t\\r\\n\\[\\]()]*])?[ \\t\\r\\n]*[,;]",
       "endCaptures": {
         "1": {
           "patterns": [
@@ -537,7 +537,7 @@
       ]
     },
     "function-task": {
-      "begin": "[ \\t\\r\\n]*(?:\\b(virtual)[ \\t\\r\\n]+)?(?:\\b(function|task)\\b)(?:[ \\t\\r\\n]+\\b(static|automatic)\\b)?",
+      "begin": "[ \\t\\r\\n]*(?:\\b(virtual)[ \\t\\r\\n]+)?\\b(function|task)\\b(?:[ \\t\\r\\n]+\\b(static|automatic)\\b)?",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.systemverilog"
@@ -594,7 +594,7 @@
               "name": "entity.name.function.systemverilog"
             }
           },
-          "match": "[ \\t\\r\\n]*(?:\\b([a-zA-Z_][a-zA-Z0-9_$]*)(::))?([a-zA-Z_][a-zA-Z0-9_$]*\\b[ \\t\\r\\n]+)?(?:\\b(signed|unsigned)\\b[ \\t\\r\\n]*)?(?:(\\[[a-zA-Z0-9_:$\\.\\-\\+\\*/%`' \\t\\r\\n\\[\\]\\(\\)]*\\])[ \\t\\r\\n]*)?(?:\\b([a-zA-Z_][a-zA-Z0-9_$]*)\\b[ \\t\\r\\n]*)(?=\\(|;)"
+          "match": "[ \\t\\r\\n]*(?:\\b([a-zA-Z_][a-zA-Z0-9_$]*)(::))?([a-zA-Z_][a-zA-Z0-9_$]*\\b[ \\t\\r\\n]+)?(?:\\b(signed|unsigned)\\b[ \\t\\r\\n]*)?(?:(\\[[a-zA-Z0-9_:$.\\-+*/%`' \\t\\r\\n\\[\\]()]*])[ \\t\\r\\n]*)?\\b([a-zA-Z_][a-zA-Z0-9_$]*)\\b[ \\t\\r\\n]*(?=[(;])"
         },
         {
           "include": "#keywords"
@@ -648,7 +648,7 @@
           ]
         }
       },
-      "match": "[ \\t\\r\\n]*\\b(import|export)[ \\t\\r\\n]+([a-zA-Z_][a-zA-Z0-9_$]*|\\*)[ \\t\\r\\n]*(::)[ \\t\\r\\n]*([a-zA-Z_][a-zA-Z0-9_$]*|\\*)[ \\t\\r\\n]*(,|;)",
+      "match": "[ \\t\\r\\n]*\\b(import|export)[ \\t\\r\\n]+([a-zA-Z_][a-zA-Z0-9_$]*|\\*)[ \\t\\r\\n]*(::)[ \\t\\r\\n]*([a-zA-Z_][a-zA-Z0-9_$]*|\\*)[ \\t\\r\\n]*([,;])",
       "name": "meta.import.systemverilog"
     },
     "keywords": {
@@ -779,7 +779,7 @@
       ]
     },
     "module-no-parameters": {
-      "begin": "[ \\t\\r\\n]*\\b(?:(bind|pullup|pulldown)[ \\t\\r\\n]+(?:([a-zA-Z_][a-zA-Z0-9_$\\.]*)[ \\t\\r\\n]+)?)?((?:\\b(?:and|nand|or|nor|xor|xnor|buf|not|bufif[01]|notif[01]|r?[npc]mos|r?tran|r?tranif[01])\\b|[a-zA-Z_][a-zA-Z0-9_$]*))[ \\t\\r\\n]+(?!intersect|and|or|throughout|within)([a-zA-Z_][a-zA-Z0-9_$]*)(?:[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$\\.\\-\\+\\*/%`' \\t\\r\\n\\[\\]\\(\\)]*\\])?)[ \\t\\r\\n]*(?=\\(|$)(?!;)",
+      "begin": "[ \\t\\r\\n]*\\b(?:(bind|pullup|pulldown)[ \\t\\r\\n]+(?:([a-zA-Z_][a-zA-Z0-9_$.]*)[ \\t\\r\\n]+)?)?((?:\\b(?:and|nand|or|nor|xor|xnor|buf|not|bufif[01]|notif[01]|r?[npc]mos|r?tran|r?tranif[01])\\b|[a-zA-Z_][a-zA-Z0-9_$]*))[ \\t\\r\\n]+(?!intersect|and|or|throughout|within)([a-zA-Z_][a-zA-Z0-9_$]*)[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$.\\-+*/%`' \\t\\r\\n\\[\\]()]*])?[ \\t\\r\\n]*(?=\\(|$)(?!;)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.systemverilog"
@@ -837,7 +837,7 @@
       ]
     },
     "module-parameters": {
-      "begin": "[ \\t\\r\\n]*\\b(?:(bind)[ \\t\\r\\n]+([a-zA-Z_][a-zA-Z0-9_$\\.]*)[ \\t\\r\\n]+)?([a-zA-Z_][a-zA-Z0-9_$]*)[ \\t\\r\\n]+(?!intersect|and|or|throughout|within)(?=#[^#])",
+      "begin": "[ \\t\\r\\n]*\\b(?:(bind)[ \\t\\r\\n]+([a-zA-Z_][a-zA-Z0-9_$.]*)[ \\t\\r\\n]+)?([a-zA-Z_][a-zA-Z0-9_$]*)[ \\t\\r\\n]+(?!intersect|and|or|throughout|within)(?=#[^#])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.systemverilog"
@@ -914,7 +914,7 @@
           "name": "keyword.operator.decrement.systemverilog"
         },
         {
-          "match": "\\+|-|\\*\\*|\\*|/|%",
+          "match": "[+-]|\\*\\*|[*/%]",
           "name": "keyword.operator.arithmetic.systemverilog"
         },
         {
@@ -926,7 +926,7 @@
           "name": "keyword.operator.bitwise.shift.systemverilog"
         },
         {
-          "match": "~&|~\\||~|\\^~|~\\^|&|\\||\\^|{|'{|}|:|\\?",
+          "match": "~&|~\\||~|\\^~|~\\^|[\\&|^{]|'\\{|[}:?]",
           "name": "keyword.operator.bitwise.systemverilog"
         },
         {
@@ -945,7 +945,7 @@
           "name": "punctuation.section.parameters.begin"
         }
       },
-      "end": "(\\))[ \\t\\r\\n]*(?=;|\\(|[a-zA-Z_]|\\\\|$)",
+      "end": "(\\))[ \\t\\r\\n]*(?=[;(a-zA-Z_\\\\]|$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.parameters.end"
@@ -1042,7 +1042,7 @@
               ]
             }
           },
-          "match": ",?[ \\t\\r\\n]*(?:\\b(output|input|inout|ref)\\b[ \\t\\r\\n]*)?(?:\\b(localparam|parameter|var|supply[01]|tri|triand|trior|trireg|tri[01]|uwire|wire|wand|wor)\\b[ \\t\\r\\n]*)?(?:\\b([a-zA-Z_][a-zA-Z0-9_$]*)(::))?(?:([a-zA-Z_][a-zA-Z0-9_$]*)\\b[ \\t\\r\\n]*)?(?:\\b(signed|unsigned)\\b[ \\t\\r\\n]*)?(?:(\\[[a-zA-Z0-9_:$\\.\\-\\+\\*/%`' \\t\\r\\n\\[\\]\\(\\)]*\\])[ \\t\\r\\n]*)?(?<!(?<!#)[:&|=+\\-*/%?><^!~\\(][ \\t\\r\\n]*)\\b([a-zA-Z_][a-zA-Z0-9_$]*)\\b[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$\\.\\-\\+\\*/%`' \\t\\r\\n\\[\\]\\(\\)]*\\])?[ \\t\\r\\n]*(?=,|;|=|\\)|/|$)",
+          "match": ",?[ \\t\\r\\n]*(?:\\b(output|input|inout|ref)\\b[ \\t\\r\\n]*)?(?:\\b(localparam|parameter|var|supply[01]|tri|triand|trior|trireg|tri[01]|uwire|wire|wand|wor)\\b[ \\t\\r\\n]*)?(?:\\b([a-zA-Z_][a-zA-Z0-9_$]*)(::))?(?:([a-zA-Z_][a-zA-Z0-9_$]*)\\b[ \\t\\r\\n]*)?(?:\\b(signed|unsigned)\\b[ \\t\\r\\n]*)?(?:(\\[[a-zA-Z0-9_:$.\\-+*/%`' \\t\\r\\n\\[\\]()]*])[ \\t\\r\\n]*)?(?<!(?<!#)[:\\&|=+\\-*/%?><^!~(][ \\t\\r\\n]*)\\b([a-zA-Z_][a-zA-Z0-9_$]*)\\b[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$.\\-+*/%`' \\t\\r\\n\\[\\]()]*])?[ \\t\\r\\n]*(?=[,;=)/]|$)",
           "name": "meta.port-net-parameter.declaration.systemverilog"
         }
       ]
@@ -1054,7 +1054,7 @@
           "name": "punctuation.slice.brackets.begin"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.slice.brackets.end"
@@ -1129,11 +1129,11 @@
           "name": "string.quoted.double.systemverilog",
           "patterns": [
             {
-              "match": "\\\\(?:[nt\\\\\"vfa]|[0-7]{3}|x[0-9a-fA-F]{2})",
+              "match": "\\\\(?:[nt\\\\\"vfa]|[0-7]{3}|x\\h{2})",
               "name": "constant.character.escape.systemverilog"
             },
             {
-              "match": "%(\\d+\\$)?['\\-+0 #]*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|z|t|L)?[xXhHdDoObBcClLvVmMpPsStTuUzZeEfFgG%]",
+              "match": "%(\\d+\\$)?['\\-+0 #]*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljztL])?[xXhHdDoObBcClLvVmMpPsStTuUzZeEfFgG%]",
               "name": "constant.character.format.placeholder.systemverilog"
             },
             {
@@ -1212,7 +1212,7 @@
           "name": "keyword.control.systemverilog"
         }
       },
-      "match": "(([a-zA-Z_][a-zA-Z0-9_$]*)[ \\t\\r\\n]*(:))?[ \\t\\r\\n]*(coverpoint|cross)[ \\t\\r\\n]+([a-zA-Z_][a-zA-Z0-9_$]*)",
+      "match": "(([a-zA-Z_][a-zA-Z0-9_$]*)[ \\t\\r\\n]*(:))?[ \\t\\r\\n]*(c(?:overpoint|ross))[ \\t\\r\\n]+([a-zA-Z_][a-zA-Z0-9_$]*)",
       "name": "meta.definition.systemverilog"
     },
     "sv-definition": {
@@ -1244,7 +1244,7 @@
       "match": "[ \\t\\r\\n]*\\b(option)\\."
     },
     "sv-rand": {
-      "match": "[ \\t\\r\\n]*\\b(?:rand|randc)\\b",
+      "match": "[ \\t\\r\\n]*\\brand(?:|c)\\b",
       "name": "storage.type.rand.systemverilog"
     },
     "sv-std": {
@@ -1308,7 +1308,7 @@
       ]
     },
     "typedef": {
-      "begin": "[ \\t\\r\\n]*\\b(?:(typedef)[ \\t\\r\\n]+)(?:([a-zA-Z_][a-zA-Z0-9_$]*)(?:[ \\t\\r\\n]+\\b(signed|unsigned)\\b)?(?:[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$\\.\\-\\+\\*/%`' \\t\\r\\n\\[\\]\\(\\)]*\\])?))?(?=[ \\t\\r\\n]*[a-zA-Z_\\\\])",
+      "begin": "[ \\t\\r\\n]*\\b(typedef)[ \\t\\r\\n]+(?:([a-zA-Z_][a-zA-Z0-9_$]*)(?:[ \\t\\r\\n]+\\b(signed|unsigned)\\b)?[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$.\\-+*/%`' \\t\\r\\n\\[\\]()]*])?)?(?=[ \\t\\r\\n]*[a-zA-Z_\\\\])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.systemverilog"
@@ -1356,7 +1356,7 @@
       ]
     },
     "typedef-enum-struct-union": {
-      "begin": "[ \\t\\r\\n]*\\b(typedef)[ \\t\\r\\n]+(enum|struct|union(?:[ \\t\\r\\n]+tagged)?|class|interface[ \\t\\r\\n]+class)(?:[ \\t\\r\\n]+(?!packed|signed|unsigned)([a-zA-Z_][a-zA-Z0-9_$]*)?(?:[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$\\.\\-\\+\\*/%`' \\t\\r\\n\\[\\]\\(\\)]*\\])?))?(?:[ \\t\\r\\n]+(packed))?(?:[ \\t\\r\\n]+(signed|unsigned))?(?=[ \\t\\r\\n]*(?:{|$))",
+      "begin": "[ \\t\\r\\n]*\\b(typedef)[ \\t\\r\\n]+(enum|struct|union(?:[ \\t\\r\\n]+tagged)?|class|interface[ \\t\\r\\n]+class)(?:[ \\t\\r\\n]+(?!packed|signed|unsigned)([a-zA-Z_][a-zA-Z0-9_$]*)?[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$.\\-+*/%`' \\t\\r\\n\\[\\]()]*])?)?(?:[ \\t\\r\\n]+(packed))?(?:[ \\t\\r\\n]+(signed|unsigned))?(?=[ \\t\\r\\n]*(?:\\{|$))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.systemverilog"
@@ -1385,7 +1385,7 @@
           "name": "storage.modifier.systemverilog"
         }
       },
-      "end": "(?<=})[ \\t\\r\\n]*([a-zA-Z_][a-zA-Z0-9_$]*|(?<=^|[ \\t\\r\\n])\\\\[!-~]+(?=$|[ \\t\\r\\n]))(?:[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$\\.\\-\\+\\*/%`' \\t\\r\\n\\[\\]\\(\\)]*\\])?)[ \\t\\r\\n]*[,;]",
+      "end": "(?<=})[ \\t\\r\\n]*([a-zA-Z_][a-zA-Z0-9_$]*|(?<=^|[ \\t\\r\\n])\\\\[!-~]+(?=$|[ \\t\\r\\n]))[ \\t\\r\\n]*(\\[[a-zA-Z0-9_:$.\\-+*/%`' \\t\\r\\n\\[\\]()]*])?[ \\t\\r\\n]*[,;]",
       "endCaptures": {
         "1": {
           "name": "storage.type.systemverilog"
diff --git a/resources/languages/systemd.json b/resources/languages/systemd.json
index e56196b..2a94a12 100644
--- a/resources/languages/systemd.json
+++ b/resources/languages/systemd.json
@@ -65,7 +65,7 @@
               "name": "keyword.operator.assignment"
             }
           },
-          "match": "(?<=\\G|[\\s\"'])([A-Za-z0-9\\_]+)(=)(?=[^\\s\"'])"
+          "match": "(?<=\\G|[\\s\"'])([A-Za-z0-9_]+)(=)(?=[^\\s\"'])"
         },
         {
           "include": "#variables"
@@ -175,7 +175,7 @@
       ]
     },
     {
-      "begin": "^\\s*(Exec(?:Start(?:Pre|Post)?|Reload|Stop(?:Post)?))\\s*(=)[ \\t]*",
+      "begin": "^\\s*(Exec(?:Start(?:P(?:re|ost))?|Reload|Stop(?:Post)?))\\s*(=)[ \\t]*",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag"
@@ -208,7 +208,7 @@
       ]
     },
     {
-      "begin": "^\\s*([\\w\\-\\.]+)\\s*(=)[ \\t]*",
+      "begin": "^\\s*([\\w\\-.]+)\\s*(=)[ \\t]*",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag"
@@ -251,7 +251,7 @@
     "booleans": {
       "patterns": [
         {
-          "match": "\\b(?<![-\\/\\.])(true|false|on|off|yes|no)(?![-\\/\\.])\\b",
+          "match": "\\b(?<![-/.])(true|false|on|off|yes|no)(?![-/.])\\b",
           "name": "constant.language"
         }
       ]
@@ -267,7 +267,7 @@
     "capabilities": {
       "patterns": [
         {
-          "match": "\\b(?:CAP_(?:AUDIT_CONTROL|AUDIT_READ|AUDIT_WRITE|BLOCK_SUSPEND|BPF|CHECKPOINT_RESTORE|CHOWN|DAC_OVERRIDE|DAC_READ_SEARCH|FOWNER|FSETID|IPC_LOCK|IPC_OWNER|KILL|LEASE|LINUX_IMMUTABLE|MAC_ADMIN|MAC_OVERRIDE|MKNOD|NET_ADMIN|NET_BIND_SERVICE|NET_BROADCAST|NET_RAW|PERFMON|SETFCAP|SETGID|SETPCAP|SETUID|SYS_ADMIN|SYS_BOOT|SYS_CHROOT|SYS_MODULE|SYS_NICE|SYS_PACCT|SYS_PTRACE|SYS_RAWIO|SYS_RESOURCE|SYS_TIME|SYS_TTY_CONFIG|SYSLOG|WAKE_ALARM))\\b",
+          "match": "\\bCAP_(?:AUDIT_CONTROL|AUDIT_READ|AUDIT_WRITE|BLOCK_SUSPEND|BPF|CHECKPOINT_RESTORE|CHOWN|DAC_OVERRIDE|DAC_READ_SEARCH|FOWNER|FSETID|IPC_LOCK|IPC_OWNER|KILL|LEASE|LINUX_IMMUTABLE|MAC_ADMIN|MAC_OVERRIDE|MKNOD|NET_ADMIN|NET_BIND_SERVICE|NET_BROADCAST|NET_RAW|PERFMON|SETFCAP|SETGID|SETPCAP|SETUID|SYS_ADMIN|SYS_BOOT|SYS_CHROOT|SYS_MODULE|SYS_NICE|SYS_PACCT|SYS_PTRACE|SYS_RAWIO|SYS_RESOURCE|SYS_TIME|SYS_TTY_CONFIG|SYSLOG|WAKE_ALARM)\\b",
           "name": "constant.other.systemd"
         }
       ]
@@ -283,7 +283,7 @@
     "executablePrefixes": {
       "patterns": [
         {
-          "match": "\\G([@\\-\\:]+(?:\\+|\\!\\!?)?|(?:\\+|\\!\\!?)[@\\-\\:]*)",
+          "match": "\\G([@\\-:]+(?:\\+|!!?)?|(?:\\+|!!?)[@\\-:]*)",
           "name": "keyword.operator.prefix.systemd"
         }
       ]
@@ -291,7 +291,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "(?<=\\s|=)\\d+(?:\\.\\d+)?(?=[\\s:]|$)",
+          "match": "(?<=[\\s=])\\d+(?:\\.\\d+)?(?=[\\s:]|$)",
           "name": "constant.numeric"
         }
       ]
@@ -304,7 +304,7 @@
           "name": "string.quoted.single",
           "patterns": [
             {
-              "match": "\\\\(?:[abfnrtvs\\\\\"'\\n]|x[0-9A-Fa-f]{2}|[0-8]{3}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:[abfnrtvs\\\\\"'\\n]|x\\h{2}|[0-8]{3}|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             }
           ]
@@ -315,7 +315,7 @@
           "name": "string.quoted.double",
           "patterns": [
             {
-              "match": "\\\\(?:[abfnrtvs\\\\\"'\\n]|x[0-9A-Fa-f]{2}|[0-8]{3}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:[abfnrtvs\\\\\"'\\n]|x\\h{2}|[0-8]{3}|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             }
           ]
@@ -325,7 +325,7 @@
     "restartOptions": {
       "patterns": [
         {
-          "match": "\\b(no|always|on\\-(?:success|failure|abnormal|abort|watchdog))\\b",
+          "match": "\\b(no|always|on-(?:success|failure|abnormal|abort|watchdog))\\b",
           "name": "constant.language"
         }
       ]
@@ -333,11 +333,11 @@
     "sections": {
       "patterns": [
         {
-          "match": "^\\s*\\[(Address|Automount|BFIFO|BandMultiQueueing|BareUDP|BatmanAdvanced|Bond|Bridge|BridgeFDB|BridgeMDB|BridgeVLAN|CAKE|CAN|ClassfulMultiQueueing|Container|Content|ControlledDelay|Coredump|D-BUS Service|DHCP|DHCPPrefixDelegation|DHCPServer|DHCPServerStaticLease|DHCPv4|DHCPv6|DHCPv6PrefixDelegation|DeficitRoundRobinScheduler|DeficitRoundRobinSchedulerClass|Distribution|EnhancedTransmissionSelection|Exec|FairQueueing|FairQueueingControlledDelay|Feature|Files|FlowQueuePIE|FooOverUDP|GENEVE|GenericRandomEarlyDetection|HeavyHitterFilter|HierarchyTokenBucket|HierarchyTokenBucketClass|Home|IOCost|IPVLAN|IPVTAP|IPoIB|IPv6AcceptRA|IPv6AddressLabel|IPv6PREF64Prefix|IPv6Prefix|IPv6PrefixDelegation|IPv6RoutePrefix|IPv6SendRA|Image|Install|Journal|Kube|L2TP|L2TPSession|LLDP|Link|Login|MACVLAN|MACVTAP|MACsec|MACsecReceiveAssociation|MACsecReceiveChannel|MACsecTransmitAssociation|Manager|Match|Mount|Neighbor|NetDev|Network|NetworkEmulator|NextHop|OOM|Output|PFIFO|PFIFOFast|PFIFOHeadDrop|PIE|PStore|Packages|Partition|Path|Peer|Pod|QDisc|Quadlet|QuickFairQueueing|QuickFairQueueingClass|Remote|Resolve|Route|RoutingPolicyRule|SR-IOV|Scope|Service|Sleep|Socket|Source|StochasticFairBlue|StochasticFairnessQueueing|Swap|Tap|Target|Time|Timer|TokenBucketFilter|TrafficControlQueueingDiscipline|Transfer|TrivialLinkEqualizer|Tun|Tunnel|UKI|Unit|Upload|VLAN|VRF|VXCAN|VXLAN|Volume|WLAN|WireGuard|WireGuardPeer|Xfrm)\\]",
+          "match": "^\\s*\\[(Address|Automount|BFIFO|BandMultiQueueing|BareUDP|BatmanAdvanced|Bond|Bridge|BridgeFDB|BridgeMDB|BridgeVLAN|CAKE|CAN|ClassfulMultiQueueing|Container|Content|ControlledDelay|Coredump|D-BUS Service|DHCP|DHCPPrefixDelegation|DHCPServer|DHCPServerStaticLease|DHCPv4|DHCPv6|DHCPv6PrefixDelegation|DeficitRoundRobinScheduler|DeficitRoundRobinSchedulerClass|Distribution|EnhancedTransmissionSelection|Exec|FairQueueing|FairQueueingControlledDelay|Feature|Files|FlowQueuePIE|FooOverUDP|GENEVE|GenericRandomEarlyDetection|HeavyHitterFilter|HierarchyTokenBucket|HierarchyTokenBucketClass|Home|IOCost|IPVLAN|IPVTAP|IPoIB|IPv6AcceptRA|IPv6AddressLabel|IPv6PREF64Prefix|IPv6Prefix|IPv6PrefixDelegation|IPv6RoutePrefix|IPv6SendRA|Image|Install|Journal|Kube|L2TP|L2TPSession|LLDP|Link|Login|MACVLAN|MACVTAP|MACsec|MACsecReceiveAssociation|MACsecReceiveChannel|MACsecTransmitAssociation|Manager|Match|Mount|Neighbor|NetDev|Network|NetworkEmulator|NextHop|OOM|Output|PFIFO|PFIFOFast|PFIFOHeadDrop|PIE|PStore|Packages|Partition|Path|Peer|Pod|QDisc|Quadlet|QuickFairQueueing|QuickFairQueueingClass|Remote|Resolve|Route|RoutingPolicyRule|SR-IOV|Scope|Service|Sleep|Socket|Source|StochasticFairBlue|StochasticFairnessQueueing|Swap|Tap|Target|Time|Timer|TokenBucketFilter|TrafficControlQueueingDiscipline|Transfer|TrivialLinkEqualizer|Tun|Tunnel|UKI|Unit|Upload|VLAN|VRF|VXCAN|VXLAN|Volume|WLAN|WireGuard|WireGuardPeer|Xfrm)]",
           "name": "entity.name.section"
         },
         {
-          "match": "\\s*\\[[\\w-]+\\]",
+          "match": "\\s*\\[[\\w-]+]",
           "name": "entity.name.unknown-section"
         }
       ]
@@ -345,7 +345,7 @@
     "sizes": {
       "patterns": [
         {
-          "match": "(?<=\\s|=)\\d+(?:\\.\\d+)?[KMGT](?=[\\s:]|$)",
+          "match": "(?<=[\\s=])\\d+(?:\\.\\d+)?[KMGT](?=[\\s:]|$)",
           "name": "constant.numeric"
         },
         {
@@ -357,7 +357,7 @@
     "timeSpans": {
       "patterns": [
         {
-          "match": "\\b(?:\\d+(?:[uμ]s(?:ec)?|ms(?:ec)?|s(?:ec|econds?)?|m(?:in|inutes?)?|h(?:r|ours?)?|d(?:ays?)?|w(?:eeks)?|M|months?|y(?:ears?)?)){1,}\\b",
+          "match": "\\b(?:\\d+(?:[uμ]s(?:ec)?|ms(?:ec)?|s(?:ec(?:|onds?))?|m(?:in(?:|utes?))?|h(?:r|ours?)?|d(?:ays?)?|w(?:eeks)?|M|months?|y(?:ears?)?))+\\b",
           "name": "constant.numeric"
         }
       ]
@@ -381,7 +381,7 @@
               "name": "variable.other"
             }
           },
-          "match": "(\\$)([A-Za-z0-9\\_]+)\\b"
+          "match": "(\\$)([A-Za-z0-9_]+)\\b"
         },
         {
           "captures": {
@@ -395,7 +395,7 @@
               "name": "punctuation.definition.variable.systemd"
             }
           },
-          "match": "(\\$\\{)([A-Za-z0-9\\_]+)(\\})"
+          "match": "(\\$\\{)([A-Za-z0-9_]+)(})"
         },
         {
           "match": "%%",
diff --git a/resources/languages/talonscript.json b/resources/languages/talonscript.json
index 846ac53..0ab2aa5 100644
--- a/resources/languages/talonscript.json
+++ b/resources/languages/talonscript.json
@@ -117,26 +117,24 @@
       "name": "punctuation.separator.talon"
     },
     "assignment": {
-      "captures": {
+      "begin": "(\\S*)(\\s?=\\s?)",
+      "beginCaptures": {
         "1": {
           "name": "variable.other.talon"
         },
         "2": {
           "name": "keyword.operator.talon"
-        },
-        "3": {
-          "name": "variable.other.talon",
-          "patterns": [
-            {
-              "include": "#comment"
-            },
-            {
-              "include": "#expression"
-            }
-          ]
         }
       },
-      "match": "(\\S*)(\\s?=\\s?)(.*)"
+      "end": "\\n",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#expression"
+        }
+      ]
     },
     "body-header": {
       "begin": "^-$",
@@ -161,7 +159,7 @@
       ]
     },
     "capture": {
-      "match": "(\\<[a-zA-Z0-9._]+\\>)",
+      "match": "(<[a-zA-Z0-9._]+>)",
       "name": "variable.parameter.talon"
     },
     "comment": {
@@ -240,7 +238,7 @@
           ]
         }
       },
-      "match": "{(.+?)}",
+      "match": "\\{(.+?)}",
       "name": "constant.character.format.placeholder.talon"
     },
     "header": {
@@ -279,7 +277,7 @@
       "match": "(ctrl|shift|cmd|alt|win|super)(-)"
     },
     "keystring": {
-      "begin": "(\"|')",
+      "begin": "([\"'])",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.talon"
@@ -305,7 +303,7 @@
       ]
     },
     "list": {
-      "match": "({[a-zA-Z0-9._]+?})",
+      "match": "(\\{[a-zA-Z0-9._]+?})",
       "name": "string.interpolated.talon"
     },
     "number": {
@@ -313,11 +311,11 @@
       "name": "constant.numeric.talon"
     },
     "operator": {
-      "match": "\\s(\\+|-|\\*|/|or)\\s",
+      "match": "\\s([+\\-*/]|or)\\s",
       "name": "keyword.operator.talon"
     },
     "other-rule-definition": {
-      "begin": "^([a-z]+\\(.*[^\\-]\\)|[a-z]+\\(.*--\\)|[a-z]+\\(-\\)|[a-z]+\\(\\)):",
+      "begin": "^([a-z]+\\(.*[^-]\\)|[a-z]+\\(.*--\\)|[a-z]+\\(-\\)|[a-z]+\\(\\)):",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag.talon",
@@ -342,7 +340,7 @@
       ]
     },
     "qstring": {
-      "begin": "(\"|')",
+      "begin": "([\"'])",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.talon"
@@ -374,7 +372,7 @@
           "name": "punctuation.definition.string.end.talon"
         }
       },
-      "name": "string.quoted.double.talon",
+      "name": "string.quoted.triple.talon",
       "patterns": [
         {
           "include": "#string-body"
@@ -399,15 +397,15 @@
           "name": "support.other.match.begin.regexp"
         },
         {
-          "match": "\\\\\\.|\\\\\\*|\\\\\\^|\\\\\\$|\\\\\\+|\\\\\\?",
+          "match": "\\\\[.*^$+?]",
           "name": "constant.character.escape.talon"
         },
         {
-          "match": "\\[(\\\\\\]|[^\\]])*\\]",
+          "match": "\\[(\\\\]|[^\\]])*]",
           "name": "constant.other.set.regexp"
         },
         {
-          "match": "\\*|\\+|\\?",
+          "match": "[*+?]",
           "name": "keyword.operator.quantifier.regexp"
         }
       ]
@@ -493,11 +491,11 @@
     "string-body": {
       "patterns": [
         {
-          "match": "{{|}}",
+          "match": "\\{\\{|}}",
           "name": "string.quoted.double.talon"
         },
         {
-          "match": "\\\\\\\\|\\\\n|\\\\t|\\\\r|\\\\\"|\\\\'",
+          "match": "\\\\[\\\\ntr\"']",
           "name": "constant.character.escape.python"
         },
         {
diff --git a/resources/languages/tasl.json b/resources/languages/tasl.json
index df1e721..be8e803 100644
--- a/resources/languages/tasl.json
+++ b/resources/languages/tasl.json
@@ -23,7 +23,7 @@
   ],
   "repository": {
     "class": {
-      "begin": "(?:^\\s*)(class)\\b",
+      "begin": "^\\s*(class)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.tasl.class"
@@ -72,7 +72,7 @@
           "name": "punctuation.definition.block.tasl.coproduct"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tasl.coproduct"
@@ -91,11 +91,11 @@
       ]
     },
     "datatype": {
-      "match": "[a-zA-Z][a-zA-Z0-9]*:(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})+",
+      "match": "[a-zA-Z][a-zA-Z0-9]*:(?:[A-Za-z0-9\\-._~!$\\&'()*+,;=:@/?]|%\\h{2})+",
       "name": "string.regexp"
     },
     "edge": {
-      "begin": "(?:^\\s*)(edge)\\b",
+      "begin": "^\\s*(edge)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.tasl.edge"
@@ -164,7 +164,7 @@
       "match": "([a-zA-Z][a-zA-Z0-9]*)\\b"
     },
     "key": {
-      "match": "[a-zA-Z][a-zA-Z0-9]*:(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})+",
+      "match": "[a-zA-Z][a-zA-Z0-9]*:(?:[A-Za-z0-9\\-._~!$\\&'()*+,;=:@/?]|%\\h{2})+",
       "name": "markup.bold entity.name.class"
     },
     "literal": {
@@ -191,10 +191,10 @@
           ]
         }
       },
-      "match": "(?:^\\s*)(namespace)\\b(.*)"
+      "match": "^\\s*(namespace)\\b(.*)"
     },
     "namespaceURI": {
-      "match": "[a-z]+:[a-zA-Z0-9-._~:\\/?#\\[\\]@!$&'()*+,;%=]+",
+      "match": "[a-z]+:[a-zA-Z0-9\\-._~:/?#\\[\\]@!$\\&'()*+,;%=]+",
       "name": "markup.underline.link"
     },
     "option": {
@@ -226,7 +226,7 @@
       ]
     },
     "product": {
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.block.tasl.product"
@@ -266,11 +266,11 @@
       "match": "(\\*)\\s*(.*)"
     },
     "term": {
-      "match": "[a-zA-Z][a-zA-Z0-9]*:(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})+",
+      "match": "[a-zA-Z][a-zA-Z0-9]*:(?:[A-Za-z0-9\\-._~!$\\&'()*+,;=:@/?]|%\\h{2})+",
       "name": "entity.other.tasl.key"
     },
     "type": {
-      "begin": "(?:^\\s*)(type)\\b",
+      "begin": "^\\s*(type)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.tasl.type"
diff --git a/resources/languages/tcl.json b/resources/languages/tcl.json
index 21efc1f..2236351 100644
--- a/resources/languages/tcl.json
+++ b/resources/languages/tcl.json
@@ -4,7 +4,7 @@
     "tcl"
   ],
   "foldingStartMarker": "\\{\\s*$",
-  "foldingStopMarker": "^\\s*\\}",
+  "foldingStopMarker": "^\\s*}",
   "name": "tcl",
   "patterns": [
     {
@@ -21,7 +21,7 @@
       "end": "\\n",
       "patterns": [
         {
-          "match": "(\\\\\\\\|\\\\\\n)"
+          "match": "(\\\\[\\\\\\n])"
         }
       ]
     },
@@ -50,7 +50,7 @@
           "name": "entity.name.function.tcl"
         }
       },
-      "match": "(?<=^|{)\\s*(proc)\\s+([^\\s]+)"
+      "match": "(?<=^|\\{)\\s*(proc)\\s+(\\S+)"
     },
     {
       "captures": {
@@ -61,13 +61,12 @@
       "match": "(?<=^|[\\[{;])\\s*(after|append|array|auto_execok|auto_import|auto_load|auto_mkindex|auto_mkindex_old|auto_qualify|auto_reset|bgerror|binary|cd|clock|close|concat|dde|encoding|eof|error|eval|exec|expr|fblocked|fconfigure|fcopy|file|fileevent|filename|flush|format|gets|glob|global|history|http|incr|info|interp|join|lappend|library|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|memory|msgcat|namespace|open|package|parray|pid|pkg::create|pkg_mkIndex|proc|puts|pwd|re_syntax|read|registry|rename|resource|scan|seek|set|socket|SafeBase|source|split|string|subst|Tcl|tcl_endOfWord|tcl_findLibrary|tcl_startOfNextWord|tcl_startOfPreviousWord|tcl_wordBreakAfter|tcl_wordBreakBefore|tcltest|tclvars|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait)\\b"
     },
     {
-      "begin": "(?<=^|[\\[{;])\\s*(regexp|regsub)\\b\\s*",
+      "begin": "(?<=^|[\\[{;])\\s*(reg(?:exp|sub))\\b\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tcl"
         }
       },
-      "comment": "special-case regexp/regsub keyword in order to handle the expression",
       "end": "[\\n;\\]]",
       "patterns": [
         {
@@ -75,13 +74,11 @@
           "name": "constant.character.escape.tcl"
         },
         {
-          "comment": "switch for regexp",
           "match": "-\\w+\\s*"
         },
         {
           "applyEndPatternLast": 1,
           "begin": "--\\s*",
-          "comment": "end of switches",
           "end": "",
           "patterns": [
             {
@@ -136,7 +133,6 @@
   "repository": {
     "bare-string": {
       "begin": "(?:^|(?<=\\s))\"",
-      "comment": "matches a single quote-enclosed word without scoping",
       "end": "\"([^\\s\\]]*)",
       "endCaptures": {
         "1": {
@@ -154,8 +150,7 @@
     },
     "braces": {
       "begin": "(?:^|(?<=\\s))\\{",
-      "comment": "matches a single brace-enclosed word",
-      "end": "\\}([^\\s\\]]*)",
+      "end": "}([^\\s\\]]*)",
       "endCaptures": {
         "1": {
           "name": "invalid.illegal.tcl"
@@ -178,7 +173,7 @@
           "name": "punctuation.section.embedded.begin.tcl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.embedded.end.tcl"
@@ -192,13 +187,12 @@
       ]
     },
     "escape": {
-      "match": "\\\\(\\d{1,3}|x[a-fA-F0-9]+|u[a-fA-F0-9]{1,4}|.|\\n)",
+      "match": "\\\\(\\d{1,3}|x\\h+|u\\h{1,4}|.|\\n)",
       "name": "constant.character.escape.tcl"
     },
     "inner-braces": {
       "begin": "\\{",
-      "comment": "matches a nested brace in a brace-enclosed word",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "match": "\\\\[{}\\n]",
@@ -210,16 +204,15 @@
       ]
     },
     "numeric": {
-      "match": "(?<![a-zA-Z])([+-]?([0-9]*[.])?[0-9]+f?)(?![\\.a-zA-Z])",
+      "match": "(?<![a-zA-Z])([+-]?([0-9]*\\.)?[0-9]+f?)(?![.a-zA-Z])",
       "name": "constant.numeric.tcl"
     },
     "operator": {
-      "match": "(?<= |\\d)(-|\\+|~|&{1,2}|\\|{1,2}|<{1,2}|>{1,2}|\\*{1,2}|!|%|\\/|<=|>=|={1,2}|!=|\\^)(?= |\\d)",
+      "match": "(?<=[ \\d])([-+~]|&{1,2}|\\|{1,2}|<{1,2}|>{1,2}|\\*{1,2}|[!%/]|<=|>=|={1,2}|!=|\\^)(?=[ \\d])",
       "name": "keyword.operator.tcl"
     },
     "regexp": {
       "begin": "(?=\\S)(?![\\n;\\]])",
-      "comment": "matches a single word, named as a regexp, then swallows the rest of the command",
       "end": "(?=[\\n;\\]])",
       "patterns": [
         {
@@ -243,7 +236,6 @@
         },
         {
           "begin": "[ \\t]",
-          "comment": "swallow the rest of the command",
           "end": "(?=[\\n;\\]])",
           "patterns": [
             {
@@ -268,7 +260,6 @@
     "string": {
       "applyEndPatternLast": 1,
       "begin": "(?:^|(?<=\\s))(?=\")",
-      "comment": "matches a single quote-enclosed word with scoping",
       "end": "",
       "name": "string.quoted.double.tcl",
       "patterns": [
@@ -283,7 +274,7 @@
           "name": "punctuation.definition.variable.tcl"
         }
       },
-      "match": "(\\$)((?:[a-zA-Z0-9_]|::)+(\\([^\\)]+\\))?|\\{[^\\}]*\\})",
+      "match": "(\\$)((?:[a-zA-Z0-9_]|::)+(\\([^)]+\\))?|\\{[^}]*})",
       "name": "support.function.tcl"
     }
   },
diff --git a/resources/languages/templ.json b/resources/languages/templ.json
index d8a420f..796c8f1 100644
--- a/resources/languages/templ.json
+++ b/resources/languages/templ.json
@@ -17,7 +17,7 @@
   ],
   "repository": {
     "block-element": {
-      "begin": "(</?)((?i:address|blockquote|dd|div|section|article|aside|header|footer|nav|menu|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|pre)(?=\\s|\\\\|>))",
+      "begin": "(</?)((?i:address|blockquote|dd|div|section|article|aside|header|footer|nav|menu|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|pre)(?=[\\s\\\\>]))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -40,7 +40,7 @@
       ]
     },
     "call-expression": {
-      "begin": "({\\!)\\s+",
+      "begin": "(\\{!)\\s+",
       "beginCaptures": {
         "0": {
           "name": "start.call-expression.templ"
@@ -85,7 +85,7 @@
       ]
     },
     "close-element": {
-      "begin": "(</?)([a-zA-Z0-9:\\-]+)",
+      "begin": "(</?)([a-zA-Z0-9:-]+)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -140,7 +140,7 @@
           ]
         },
         {
-          "begin": "(?<=\\)) ({)$",
+          "begin": "(?<=\\)) (\\{)$",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.begin.bracket.curly.go"
@@ -155,7 +155,7 @@
           "name": "block.css-template.templ",
           "patterns": [
             {
-              "begin": "\\s*((?:-(?:webkit|moz|o|ms|khtml)-)?(?:zoom|z-index|y|x|writing-mode|wrap|wrap-through|wrap-inside|wrap-flow|wrap-before|wrap-after|word-wrap|word-spacing|word-break|word|will-change|width|widows|white-space-collapse|white-space|white|weight|volume|voice-volume|voice-stress|voice-rate|voice-pitch-range|voice-pitch|voice-family|voice-duration|voice-balance|voice|visibility|vertical-align|vector-effect|variant|user-zoom|user-select|up|unicode-(bidi|range)|trim|translate|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform-box|transform|touch-action|top-width|top-style|top-right-radius|top-left-radius|top-color|top|timing-function|text-wrap|text-underline-position|text-transform|text-spacing|text-space-trim|text-space-collapse|text-size-adjust|text-shadow|text-replace|text-rendering|text-overflow|text-outline|text-orientation|text-justify|text-indent|text-height|text-emphasis-style|text-emphasis-skip|text-emphasis-position|text-emphasis-color|text-emphasis|text-decoration-style|text-decoration-stroke|text-decoration-skip|text-decoration-line|text-decoration-fill|text-decoration-color|text-decoration|text-combine-upright|text-anchor|text-align-last|text-align-all|text-align|text|target-position|target-new|target-name|target|table-layout|tab-size|system|symbols|suffix|style-type|style-position|style-image|style|stroke-width|stroke-opacity|stroke-miterlimit|stroke-linejoin|stroke-linecap|stroke-dashoffset|stroke-dasharray|stroke|string-set|stretch|stress|stop-opacity|stop-color|stacking-strategy|stacking-shift|stacking-ruby|stacking|src|speed|speech-rate|speech|speak-punctuation|speak-numeral|speak-header|speak-as|speak|span|spacing|space-collapse|space|solid-opacity|solid-color|sizing|size-adjust|size|shape-rendering|shape-padding|shape-outside|shape-margin|shape-inside|shape-image-threshold|shadow|scroll-snap-type|scroll-snap-points-y|scroll-snap-points-x|scroll-snap-destination|scroll-snap-coordinate|scroll-behavior|scale|ry|rx|respond-to|rule-width|rule-style|rule-color|rule|ruby-span|ruby-position|ruby-overhang|ruby-merge|ruby-align|ruby|rows|rotation-point|rotation|rotate|role|right-width|right-style|right-color|right|richness|rest-before|rest-after|rest|resource|resolution|resize|reset|replace|repeat|rendering-intent|region-fragment|rate|range|radius|r|quotes|punctuation-trim|punctuation|property|profile|presentation-level|presentation|prefix|position|pointer-events|point|play-state|play-during|play-count|pitch-range|pitch|phonemes|perspective-origin|perspective|pause-before|pause-after|pause|page-policy|page-break-inside|page-break-before|page-break-after|page|padding-top|padding-right|padding-left|padding-inline-start|padding-inline-end|padding-bottom|padding-block-start|padding-block-end|padding|pad|pack|overhang|overflow-y|overflow-x|overflow-wrap|overflow-style|overflow-inline|overflow-block|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|origin|orientation|orient|ordinal-group|order|opacity|offset-start|offset-inline-start|offset-inline-end|offset-end|offset-block-start|offset-block-end|offset-before|offset-after|offset|object-position|object-fit|numeral|new|negative|nav-up|nav-right|nav-left|nav-index|nav-down|nav|name|move-to|motion-rotation|motion-path|motion-offset|motion|model|mix-blend-mode|min-zoom|min-width|min-inline-size|min-height|min-block-size|min|max-zoom|max-width|max-lines|max-inline-size|max-height|max-block-size|max|mask-type|mask-size|mask-repeat|mask-position|mask-origin|mask-mode|mask-image|mask-composite|mask-clip|mask-border-width|mask-border-source|mask-border-slice|mask-border-repeat|mask-border-outset|mask-border-mode|mask-border|mask|marquee-style|marquee-speed|marquee-play-count|marquee-loop|marquee-direction|marquee|marks|marker-start|marker-side|marker-mid|marker-end|marker|margin-top|margin-right|margin-left|margin-inline-start|margin-inline-end|margin-bottom|margin-block-start|margin-block-end|margin|list-style-type|list-style-position|list-style-image|list-style|list|lines|line-stacking-strategy|line-stacking-shift|line-stacking-ruby|line-stacking|line-snap|line-height|line-grid|line-break|line|lighting-color|level|letter-spacing|length|left-width|left-style|left-color|left|label|kerning|justify-self|justify-items|justify-content|justify|iteration-count|isolation|inline-size|inline-box-align|initial-value|initial-size|initial-letter-wrap|initial-letter-align|initial-letter|initial-before-align|initial-before-adjust|initial-after-align|initial-after-adjust|index|indent|increment|image-rendering|image-resolution|image-orientation|image|icon|hyphens|hyphenate-limit-zone|hyphenate-limit-lines|hyphenate-limit-last|hyphenate-limit-chars|hyphenate-character|hyphenate|height|header|hanging-punctuation|grid-template-rows|grid-template-columns|grid-template-areas|grid-template|grid-row-start|grid-row-gap|grid-row-end|grid-row|grid-rows|grid-gap|grid-column-start|grid-column-gap|grid-column-end|grid-column|grid-columns|grid-auto-rows|grid-auto-flow|grid-auto-columns|grid-area|grid|glyph-orientation-vertical|glyph-orientation-horizontal|gap|font-weight|font-variant-position|font-variant-numeric|font-variant-ligatures|font-variant-east-asian|font-variant-caps|font-variant-alternates|font-variant|font-synthesis|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|flow-into|flow-from|flow|flood-opacity|flood-color|float-offset|float|flex-wrap|flex-shrink|flex-grow|flex-group|flex-flow|flex-direction|flex-basis|flex|fit-position|fit|filter|fill-rule|fill-opacity|fill|family|fallback|enable-background|empty-cells|emphasis|elevation|duration|drop-initial-value|drop-initial-size|drop-initial-before-align|drop-initial-before-adjust|drop-initial-after-align|drop-initial-after-adjust|drop|down|dominant-baseline|display-role|display-model|display|direction|delay|decoration-break|decoration|cy|cx|cursor|cue-before|cue-after|cue|crop|counter-set|counter-reset|counter-increment|counter|count|corner-shape|corners|continue|content|contain|columns|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|column-break-before|column-break-after|column|color-rendering|color-profile|color-interpolation-filters|color-interpolation|color-adjust|color|collapse|clip-rule|clip-path|clip|clear|character|caret-shape|caret-color|caret|caption-side|buffered-rendering|break-inside|break-before|break-after|break|box-suppress|box-snap|box-sizing|box-shadow|box-pack|box-orient|box-ordinal-group|box-lines|box-flex-group|box-flex|box-direction|box-decoration-break|box-align|box|bottom-width|bottom-style|bottom-right-radius|bottom-left-radius|bottom-color|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-limit|border-length|border-left-width|border-left-style|border-left-color|border-left|border-inline-start-width|border-inline-start-style|border-inline-start-color|border-inline-start|border-inline-end-width|border-inline-end-style|border-inline-end-color|border-inline-end|border-image-width|border-image-transform|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-clip-top|border-clip-right|border-clip-left|border-clip-bottom|border-clip|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border-block-start-width|border-block-start-style|border-block-start-color|border-block-start|border-block-end-width|border-block-end-style|border-block-end-color|border-block-end|border|bookmark-target|bookmark-level|bookmark-label|bookmark|block-size|binding|bidi|before|baseline-shift|baseline|balance|background-size|background-repeat|background-position-y|background-position-x|background-position-inline|background-position-block|background-position|background-origin|background-image|background-color|background-clip|background-blend-mode|background-attachment|background|backface-visibility|backdrop-filter|azimuth|attachment|appearance|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|alt|all|alignment-baseline|alignment-adjust|alignment|align-last|align-self|align-items|align-content|align|after|adjust|additive-symbols)):\\s+",
+              "begin": "\\s*((?:-(?:webkit|moz|o|ms|khtml)-)?(?:zoom|z-index|[yx]|writing-mode|wrap|wrap-through|wrap-inside|wrap-flow|wrap-before|wrap-after|word-wrap|word-spacing|word-break|word|will-change|width|widows|white-space-collapse|white-space|white|weight|volume|voice-volume|voice-stress|voice-rate|voice-pitch-range|voice-pitch|voice-family|voice-duration|voice-balance|voice|visibility|vertical-align|vector-effect|variant|user-zoom|user-select|up|unicode-(bidi|range)|trim|translate|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform-box|transform|touch-action|top-width|top-style|top-right-radius|top-left-radius|top-color|top|timing-function|text-wrap|text-underline-position|text-transform|text-spacing|text-space-trim|text-space-collapse|text-size-adjust|text-shadow|text-replace|text-rendering|text-overflow|text-outline|text-orientation|text-justify|text-indent|text-height|text-emphasis-style|text-emphasis-skip|text-emphasis-position|text-emphasis-color|text-emphasis|text-decoration-style|text-decoration-stroke|text-decoration-skip|text-decoration-line|text-decoration-fill|text-decoration-color|text-decoration|text-combine-upright|text-anchor|text-align-last|text-align-all|text-align|text|target-position|target-new|target-name|target|table-layout|tab-size|system|symbols|suffix|style-type|style-position|style-image|style|stroke-width|stroke-opacity|stroke-miterlimit|stroke-linejoin|stroke-linecap|stroke-dashoffset|stroke-dasharray|stroke|string-set|stretch|stress|stop-opacity|stop-color|stacking-strategy|stacking-shift|stacking-ruby|stacking|src|speed|speech-rate|speech|speak-punctuation|speak-numeral|speak-header|speak-as|speak|span|spacing|space-collapse|space|solid-opacity|solid-color|sizing|size-adjust|size|shape-rendering|shape-padding|shape-outside|shape-margin|shape-inside|shape-image-threshold|shadow|scroll-snap-type|scroll-snap-points-y|scroll-snap-points-x|scroll-snap-destination|scroll-snap-coordinate|scroll-behavior|scale|ry|rx|respond-to|rule-width|rule-style|rule-color|rule|ruby-span|ruby-position|ruby-overhang|ruby-merge|ruby-align|ruby|rows|rotation-point|rotation|rotate|role|right-width|right-style|right-color|right|richness|rest-before|rest-after|rest|resource|resolution|resize|reset|replace|repeat|rendering-intent|region-fragment|rate|range|radius|r|quotes|punctuation-trim|punctuation|property|profile|presentation-level|presentation|prefix|position|pointer-events|point|play-state|play-during|play-count|pitch-range|pitch|phonemes|perspective-origin|perspective|pause-before|pause-after|pause|page-policy|page-break-inside|page-break-before|page-break-after|page|padding-top|padding-right|padding-left|padding-inline-start|padding-inline-end|padding-bottom|padding-block-start|padding-block-end|padding|pad|pack|overhang|overflow-y|overflow-x|overflow-wrap|overflow-style|overflow-inline|overflow-block|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|origin|orientation|orient|ordinal-group|order|opacity|offset-start|offset-inline-start|offset-inline-end|offset-end|offset-block-start|offset-block-end|offset-before|offset-after|offset|object-position|object-fit|numeral|new|negative|nav-up|nav-right|nav-left|nav-index|nav-down|nav|name|move-to|motion-rotation|motion-path|motion-offset|motion|model|mix-blend-mode|min-zoom|min-width|min-inline-size|min-height|min-block-size|min|max-zoom|max-width|max-lines|max-inline-size|max-height|max-block-size|max|mask-type|mask-size|mask-repeat|mask-position|mask-origin|mask-mode|mask-image|mask-composite|mask-clip|mask-border-width|mask-border-source|mask-border-slice|mask-border-repeat|mask-border-outset|mask-border-mode|mask-border|mask|marquee-style|marquee-speed|marquee-play-count|marquee-loop|marquee-direction|marquee|marks|marker-start|marker-side|marker-mid|marker-end|marker|margin-top|margin-right|margin-left|margin-inline-start|margin-inline-end|margin-bottom|margin-block-start|margin-block-end|margin|list-style-type|list-style-position|list-style-image|list-style|list|lines|line-stacking-strategy|line-stacking-shift|line-stacking-ruby|line-stacking|line-snap|line-height|line-grid|line-break|line|lighting-color|level|letter-spacing|length|left-width|left-style|left-color|left|label|kerning|justify-self|justify-items|justify-content|justify|iteration-count|isolation|inline-size|inline-box-align|initial-value|initial-size|initial-letter-wrap|initial-letter-align|initial-letter|initial-before-align|initial-before-adjust|initial-after-align|initial-after-adjust|index|indent|increment|image-rendering|image-resolution|image-orientation|image|icon|hyphens|hyphenate-limit-zone|hyphenate-limit-lines|hyphenate-limit-last|hyphenate-limit-chars|hyphenate-character|hyphenate|height|header|hanging-punctuation|grid-template-rows|grid-template-columns|grid-template-areas|grid-template|grid-row-start|grid-row-gap|grid-row-end|grid-row|grid-rows|grid-gap|grid-column-start|grid-column-gap|grid-column-end|grid-column|grid-columns|grid-auto-rows|grid-auto-flow|grid-auto-columns|grid-area|grid|glyph-orientation-vertical|glyph-orientation-horizontal|gap|font-weight|font-variant-position|font-variant-numeric|font-variant-ligatures|font-variant-east-asian|font-variant-caps|font-variant-alternates|font-variant|font-synthesis|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|flow-into|flow-from|flow|flood-opacity|flood-color|float-offset|float|flex-wrap|flex-shrink|flex-grow|flex-group|flex-flow|flex-direction|flex-basis|flex|fit-position|fit|filter|fill-rule|fill-opacity|fill|family|fallback|enable-background|empty-cells|emphasis|elevation|duration|drop-initial-value|drop-initial-size|drop-initial-before-align|drop-initial-before-adjust|drop-initial-after-align|drop-initial-after-adjust|drop|down|dominant-baseline|display-role|display-model|display|direction|delay|decoration-break|decoration|cy|cx|cursor|cue-before|cue-after|cue|crop|counter-set|counter-reset|counter-increment|counter|count|corner-shape|corners|continue|content|contain|columns|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|column-break-before|column-break-after|column|color-rendering|color-profile|color-interpolation-filters|color-interpolation|color-adjust|color|collapse|clip-rule|clip-path|clip|clear|character|caret-shape|caret-color|caret|caption-side|buffered-rendering|break-inside|break-before|break-after|break|box-suppress|box-snap|box-sizing|box-shadow|box-pack|box-orient|box-ordinal-group|box-lines|box-flex-group|box-flex|box-direction|box-decoration-break|box-align|box|bottom-width|bottom-style|bottom-right-radius|bottom-left-radius|bottom-color|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-limit|border-length|border-left-width|border-left-style|border-left-color|border-left|border-inline-start-width|border-inline-start-style|border-inline-start-color|border-inline-start|border-inline-end-width|border-inline-end-style|border-inline-end-color|border-inline-end|border-image-width|border-image-transform|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-clip-top|border-clip-right|border-clip-left|border-clip-bottom|border-clip|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border-block-start-width|border-block-start-style|border-block-start-color|border-block-start|border-block-end-width|border-block-end-style|border-block-end-color|border-block-end|border|bookmark-target|bookmark-level|bookmark-label|bookmark|block-size|binding|bidi|before|baseline-shift|baseline|balance|background-size|background-repeat|background-position-y|background-position-x|background-position-inline|background-position-block|background-position|background-origin|background-image|background-color|background-clip|background-blend-mode|background-attachment|background|backface-visibility|backdrop-filter|azimuth|attachment|appearance|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|alt|all|alignment-baseline|alignment-adjust|alignment|align-last|align-self|align-items|align-content|align|after|adjust|additive-symbols)):\\s+",
               "beginCaptures": {
                 "1": {
                   "name": "support.type.property-name.css"
@@ -165,7 +165,7 @@
               "name": "property.css-template.templ",
               "patterns": [
                 {
-                  "begin": "({)",
+                  "begin": "(\\{)",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.definition.begin.bracket.curly.go"
@@ -225,7 +225,7 @@
       ]
     },
     "element": {
-      "begin": "(<)([a-zA-Z0-9:\\-]++)(?=[^>]*></\\2>)",
+      "begin": "(<)([a-zA-Z0-9:-]++)(?=[^>]*></\\2>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.html"
@@ -257,7 +257,7 @@
       ]
     },
     "else-expression": {
-      "begin": "\\s+(else)\\s+({)\\s*$",
+      "begin": "\\s+(else)\\s+(\\{)\\s*$",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.go"
@@ -291,7 +291,7 @@
       "patterns": [
         {
           "begin": "(?<=if\\s)",
-          "end": "({)$",
+          "end": "(\\{)$",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.begin.bracket.curly.go"
@@ -305,7 +305,7 @@
           ]
         },
         {
-          "begin": "(?<={)$",
+          "begin": "(?<=\\{)$",
           "end": "^\\s*(})",
           "endCaptures": {
             "1": {
@@ -332,7 +332,7 @@
               "name": "punctuation.definition.entity.html"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#[xX][0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#[xX]\\h+)(;)",
           "name": "constant.character.entity.html"
         },
         {
@@ -342,7 +342,7 @@
       ]
     },
     "for-expression": {
-      "begin": "^\\s*for .+{",
+      "begin": "^\\s*for .+\\{",
       "captures": {
         "0": {
           "name": "meta.embedded.block.go",
@@ -353,7 +353,7 @@
           ]
         }
       },
-      "end": "\\s*}\\s*\n",
+      "end": "\\s*}\\s*\\n",
       "name": "for.html-template.templ",
       "patterns": [
         {
@@ -362,13 +362,13 @@
       ]
     },
     "go-comment-block": {
-      "begin": "(\\/\\*)",
+      "begin": "(/\\*)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.go"
         }
       },
-      "end": "(\\*\\/)",
+      "end": "(\\*/)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.comment.go"
@@ -377,7 +377,7 @@
       "name": "comment.block.go"
     },
     "go-comment-double-slash": {
-      "begin": "(\\/\\/)",
+      "begin": "(//)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.go"
@@ -402,7 +402,7 @@
       "name": "comment.block.html"
     },
     "html-template": {
-      "begin": "^(templ) ((?:\\([A-z_][A-z_0-9]* \\*?[A-z_][A-z_0-9]*\\) )?[A-z_][A-z_0-9]*(\\(|\\[))",
+      "begin": "^(templ) ((?:\\([A-z_][A-z_0-9]* \\*?[A-z_][A-z_0-9]*\\) )?[A-z_][A-z_0-9]*([(\\[]))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.go"
@@ -435,7 +435,7 @@
         },
         {
           "begin": "(?<=\\[)",
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.end.bracket.square.go"
@@ -449,7 +449,7 @@
           ]
         },
         {
-          "begin": "(?<=\\)) ({)$",
+          "begin": "(?<=\\)) (\\{)$",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.begin.bracket.curly.go"
@@ -482,7 +482,7 @@
       "patterns": [
         {
           "begin": "(?<=if\\s)",
-          "end": "({)$",
+          "end": "(\\{)$",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.begin.bracket.curly.go"
@@ -496,7 +496,7 @@
           ]
         },
         {
-          "begin": "(?<={)$",
+          "begin": "(?<=\\{)$",
           "end": "^\\s*(})",
           "endCaptures": {
             "1": {
@@ -515,7 +515,7 @@
     "import-expression": {
       "patterns": [
         {
-          "begin": "(@)((?:[A-z_][A-z_0-9]*\\.)?[A-z_][A-z_0-9]*(?:\\(|{|$))",
+          "begin": "(@)((?:[A-z_][A-z_0-9]*\\.)?[A-z_][A-z_0-9]*(?:[({]|$))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.go"
@@ -532,7 +532,7 @@
           "name": "import-expression.templ",
           "patterns": [
             {
-              "begin": "(?<=[A-z_0-9]{)",
+              "begin": "(?<=[A-z_0-9]\\{)",
               "end": "\\s*(})(\\.[A-z_][A-z_0-9]*\\()",
               "endCaptures": {
                 "1": {
@@ -569,7 +569,7 @@
               ]
             },
             {
-              "begin": "(?<=\\))\\s({)$",
+              "begin": "(?<=\\))\\s(\\{)$",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.brace.open"
@@ -593,7 +593,7 @@
       ]
     },
     "inline-element": {
-      "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)(?=\\s|\\\\|>))",
+      "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|[qs]|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)(?=[\\s\\\\>]))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -616,7 +616,7 @@
       ]
     },
     "raw-go": {
-      "begin": "{{",
+      "begin": "\\{\\{",
       "beginCaptures": {
         "0": {
           "name": "start.raw-go.templ"
@@ -711,7 +711,7 @@
           ]
         },
         {
-          "begin": "(?<=\\)) ({)$",
+          "begin": "(?<=\\)) (\\{)$",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.begin.bracket.curly.go"
@@ -790,7 +790,7 @@
       ]
     },
     "string-expression": {
-      "begin": "{\\s+",
+      "begin": "\\{\\s+",
       "beginCaptures": {
         "0": {
           "name": "start.string-expression.templ"
@@ -847,7 +847,7 @@
       ]
     },
     "switch-expression": {
-      "begin": "^\\s*switch .+?{$",
+      "begin": "^\\s*switch .+?\\{$",
       "captures": {
         "0": {
           "name": "meta.embedded.block.go",
@@ -873,7 +873,7 @@
       ]
     },
     "tag-else-attribute": {
-      "begin": "\\s(else)\\s({)$",
+      "begin": "\\s(else)\\s(\\{)$",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.go"
@@ -907,7 +907,7 @@
       "patterns": [
         {
           "begin": "(?<=if\\s)",
-          "end": "({)$",
+          "end": "(\\{)$",
           "endCaptures": {
             "1": {
               "name": "punctuation.brace.open"
@@ -921,7 +921,7 @@
           ]
         },
         {
-          "begin": "(?<={)$",
+          "begin": "(?<=\\{)$",
           "end": "^\\s*(})",
           "endCaptures": {
             "1": {
@@ -951,7 +951,7 @@
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?!\\G)(?<='|\"|[^\\s<>/])",
+      "end": "(?!\\G)(?<=['\"[^\\s<>/]])",
       "name": "meta.attribute-with-value.id.html",
       "patterns": [
         {
@@ -1019,7 +1019,7 @@
       "patterns": [
         {
           "begin": "(?<=if\\s)",
-          "end": "({)$",
+          "end": "(\\{)$",
           "endCaptures": {
             "1": {
               "name": "punctuation.brace.open"
@@ -1033,7 +1033,7 @@
           ]
         },
         {
-          "begin": "(?<={)$",
+          "begin": "(?<=\\{)$",
           "end": "^\\s*(})",
           "endCaptures": {
             "1": {
diff --git a/resources/languages/terraform.json b/resources/languages/terraform.json
index ae84430..1b02c87 100644
--- a/resources/languages/terraform.json
+++ b/resources/languages/terraform.json
@@ -27,18 +27,15 @@
           "name": "keyword.operator.accessor.hcl"
         }
       },
-      "comment": "Matches traversal attribute access such as .attr",
-      "end": "[[:alpha:]][\\w-]*|\\d*",
+      "end": "\\p{alpha}[\\w-]*|\\d*",
       "endCaptures": {
         "0": {
           "patterns": [
             {
-              "comment": "Attribute name",
-              "match": "(?!null|false|true)[[:alpha:]][\\w-]*",
+              "match": "(?!null|false|true)\\p{alpha}[\\w-]*",
               "name": "variable.other.member.hcl"
             },
             {
-              "comment": "Optional attribute index",
               "match": "\\d+",
               "name": "constant.numeric.integer.hcl"
             }
@@ -61,8 +58,7 @@
           "name": "keyword.operator.assignment.hcl"
         }
       },
-      "comment": "Identifier \"=\" with optional parens",
-      "match": "(\\()?(\\b(?!null\\b|false\\b|true\\b)[[:alpha:]][[:alnum:]_-]*)(\\))?\\s*(\\=(?!\\=|\\>))\\s*",
+      "match": "(\\()?(\\b(?!null\\b|false\\b|true\\b)\\p{alpha}[[:alnum:]_-]*)(\\))?\\s*(=(?![=>]))\\s*",
       "name": "variable.declaration.hcl"
     },
     "attribute_splat": {
@@ -72,7 +68,6 @@
           "name": "keyword.operator.accessor.hcl"
         }
       },
-      "comment": "Legacy attribute-only splat",
       "end": "\\*",
       "endCaptures": {
         "0": {
@@ -81,18 +76,16 @@
       }
     },
     "block": {
-      "begin": "([\\w][\\-\\w]*)([\\s\\\"\\-\\w]*)(\\{)",
+      "begin": "(\\w[-\\w]*)([\\s\"\\-\\w]*)(\\{)",
       "beginCaptures": {
         "1": {
           "patterns": [
             {
-              "comment": "Known block type",
               "match": "\\bdata|check|import|locals|module|output|provider|resource|terraform|variable\\b",
               "name": "entity.name.type.terraform"
             },
             {
-              "comment": "Unknown block type",
-              "match": "\\b(?!null|false|true)[[:alpha:]][[:alnum:]_-]*\\b",
+              "match": "\\b(?!null|false|true)\\p{alpha}[[:alnum:]_-]*\\b",
               "name": "entity.name.type.hcl"
             }
           ]
@@ -100,8 +93,7 @@
         "2": {
           "patterns": [
             {
-              "comment": "Block label",
-              "match": "[\\\"\\-\\w]+",
+              "match": "[\"\\-\\w]+",
               "name": "variable.other.enummember.hcl"
             }
           ]
@@ -113,8 +105,7 @@
           "name": "punctuation.section.block.begin.hcl"
         }
       },
-      "comment": "This will match Terraform blocks like `resource \"aws_instance\" \"web\" {` or `module {`",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.block.end.hcl"
@@ -143,7 +134,6 @@
           "name": "punctuation.definition.comment.hcl"
         }
       },
-      "comment": "Inline comments start with the /* sequence and end with the */ sequence, and may have any characters within except the ending sequence. An inline comment is considered equivalent to a whitespace sequence",
       "end": "\\*/",
       "name": "comment.block.hcl"
     },
@@ -154,7 +144,7 @@
           "name": "punctuation.section.brackets.begin.hcl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.hcl"
@@ -162,7 +152,6 @@
       },
       "patterns": [
         {
-          "comment": "Splat operator",
           "match": "\\*",
           "name": "keyword.operator.splat.hcl"
         },
@@ -187,13 +176,11 @@
       ]
     },
     "char_escapes": {
-      "comment": "Character Escapes",
-      "match": "\\\\[nrt\"\\\\]|\\\\u(\\h{8}|\\h{4})",
+      "match": "\\\\(?:[nrt\"\\\\]|u(\\h{8}|\\h{4}))",
       "name": "constant.character.escape.hcl"
     },
     "comma": {
-      "comment": "Commas - used in certain expressions",
-      "match": "\\,",
+      "match": ",",
       "name": "punctuation.separator.hcl"
     },
     "comments": {
@@ -216,7 +203,6 @@
           "name": "punctuation.definition.comment.hcl"
         }
       },
-      "comment": "Line comments start with // sequence and end with the next newline sequence. A line comment is considered equivalent to a newline sequence",
       "end": "$\\n?",
       "name": "comment.line.double-slash.hcl"
     },
@@ -257,17 +243,15 @@
     "for_expression_body": {
       "patterns": [
         {
-          "comment": "in keyword",
           "match": "\\bin\\b",
           "name": "keyword.operator.word.hcl"
         },
         {
-          "comment": "if keyword",
           "match": "\\bif\\b",
           "name": "keyword.control.conditional.hcl"
         },
         {
-          "match": "\\:",
+          "match": ":",
           "name": "keyword.operator.hcl"
         },
         {
@@ -294,7 +278,7 @@
               "name": "support.function.builtin.terraform"
             },
             {
-              "match": "\\bprovider::[[:alpha:]][\\w_-]*::[[:alpha:]][\\w_-]*\\b",
+              "match": "\\bprovider::\\p{alpha}[\\w_-]*::\\p{alpha}[\\w_-]*\\b",
               "name": "support.function.provider.terraform"
             }
           ]
@@ -303,7 +287,6 @@
           "name": "punctuation.section.parens.begin.hcl"
         }
       },
-      "comment": "Built-in function calls",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -330,17 +313,15 @@
           "name": "punctuation.definition.comment.hcl"
         }
       },
-      "comment": "Line comments start with # sequence and end with the next newline sequence. A line comment is considered equivalent to a newline sequence",
       "end": "$\\n?",
       "name": "comment.line.number-sign.hcl"
     },
     "hcl_type_keywords": {
-      "comment": "Type keywords known to HCL.",
       "match": "\\b(any|string|number|bool|list|set|map|tuple|object)\\b",
       "name": "storage.type.hcl"
     },
     "heredoc": {
-      "begin": "(\\<\\<\\-?)\\s*(\\w+)\\s*$",
+      "begin": "(<<-?)\\s*(\\w+)\\s*$",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.heredoc.hcl"
@@ -349,7 +330,6 @@
           "name": "keyword.control.heredoc.hcl"
         }
       },
-      "comment": "String Heredoc",
       "end": "^\\s*\\2\\s*$",
       "endCaptures": {
         "0": {
@@ -371,7 +351,7 @@
         "2": {
           "patterns": [
             {
-              "match": "\\=\\>",
+              "match": "=>",
               "name": "storage.type.function.hcl"
             },
             {
@@ -406,7 +386,6 @@
       ]
     },
     "language_constants": {
-      "comment": "Language Constants",
       "match": "\\b(true|false|null)\\b",
       "name": "constant.language.hcl"
     },
@@ -433,12 +412,10 @@
       ]
     },
     "local_identifiers": {
-      "comment": "Local Identifiers",
-      "match": "\\b(?!null|false|true)[[:alpha:]][[:alnum:]_-]*\\b",
+      "match": "\\b(?!null|false|true)\\p{alpha}[[:alnum:]_-]*\\b",
       "name": "variable.other.readwrite.hcl"
     },
     "named_value_references": {
-      "comment": "Constant values available only to Terraform.",
       "match": "\\b(var|local|module|data|path|terraform)\\b",
       "name": "variable.other.readwrite.terraform"
     },
@@ -450,7 +427,6 @@
               "name": "punctuation.separator.exponent.hcl"
             }
           },
-          "comment": "Integer, no fraction, optional exponent",
           "match": "\\b\\d+([Ee][+-]?)\\d+\\b",
           "name": "constant.numeric.float.hcl"
         },
@@ -463,12 +439,10 @@
               "name": "punctuation.separator.exponent.hcl"
             }
           },
-          "comment": "Integer, fraction, optional exponent",
           "match": "\\b\\d+(\\.)\\d+(?:([Ee][+-]?)\\d+)?\\b",
           "name": "constant.numeric.float.hcl"
         },
         {
-          "comment": "Integers",
           "match": "\\b\\d+\\b",
           "name": "constant.numeric.integer.hcl"
         }
@@ -484,7 +458,7 @@
           "name": "keyword.control.hcl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.braces.end.hcl"
@@ -492,7 +466,7 @@
       },
       "patterns": [
         {
-          "match": "\\=\\>",
+          "match": "=>",
           "name": "storage.type.function.hcl"
         },
         {
@@ -532,7 +506,7 @@
           "name": "punctuation.section.braces.begin.hcl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.braces.end.hcl"
@@ -561,14 +535,13 @@
               "name": "keyword.operator.assignment.hcl",
               "patterns": [
                 {
-                  "match": "\\=\\>",
+                  "match": "=>",
                   "name": "storage.type.function.hcl"
                 }
               ]
             }
           },
-          "comment": "Literal, named object key",
-          "match": "\\b((?!null|false|true)[[:alpha:]][[:alnum:]_-]*)\\s*(\\=\\>?)\\s*"
+          "match": "\\b((?!null|false|true)\\p{alpha}[[:alnum:]_-]*)\\s*(=>?)\\s*"
         },
         {
           "captures": {
@@ -592,8 +565,7 @@
               "name": "keyword.operator.hcl"
             }
           },
-          "comment": "String object key",
-          "match": "\\b((\").*(\"))\\s*(\\=)\\s*"
+          "match": "\\b((\").*(\"))\\s*(=)\\s*"
         },
         {
           "begin": "^\\s*\\(",
@@ -602,8 +574,7 @@
               "name": "punctuation.section.parens.begin.hcl"
             }
           },
-          "comment": "Computed object key (any expression between parens)",
-          "end": "(\\))\\s*(=|:)\\s*",
+          "end": "(\\))\\s*([=:])\\s*",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.parens.end.hcl"
@@ -630,19 +601,19 @@
     "operators": {
       "patterns": [
         {
-          "match": "\\>\\=",
+          "match": ">=",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\<\\=",
+          "match": "<=",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\=\\=",
+          "match": "==",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\!\\=",
+          "match": "!=",
           "name": "keyword.operator.hcl"
         },
         {
@@ -650,7 +621,7 @@
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\-",
+          "match": "-",
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
@@ -658,15 +629,15 @@
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\/",
+          "match": "/",
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\%",
+          "match": "%",
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\&\\&",
+          "match": "&&",
           "name": "keyword.operator.logical.hcl"
         },
         {
@@ -674,15 +645,15 @@
           "name": "keyword.operator.logical.hcl"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "keyword.operator.logical.hcl"
         },
         {
-          "match": "\\>",
+          "match": ">",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\<",
+          "match": "<",
           "name": "keyword.operator.hcl"
         },
         {
@@ -694,11 +665,11 @@
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\:",
+          "match": ":",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\=\\>",
+          "match": "=>",
           "name": "keyword.operator.hcl"
         }
       ]
@@ -710,7 +681,6 @@
           "name": "punctuation.section.parens.begin.hcl"
         }
       },
-      "comment": "Parens - matched *after* function syntax",
       "end": "\\)",
       "endCaptures": {
         "0": {
@@ -727,14 +697,13 @@
       ]
     },
     "string_interpolation": {
-      "begin": "(?<![%$])([%$]{)",
+      "begin": "(?<![%$])([%$]\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.interpolation.begin.hcl"
         }
       },
-      "comment": "String interpolation",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.other.interpolation.end.hcl"
@@ -743,17 +712,14 @@
       "name": "meta.interpolation.hcl",
       "patterns": [
         {
-          "comment": "Trim left whitespace",
-          "match": "\\~\\s",
+          "match": "~\\s",
           "name": "keyword.operator.template.left.trim.hcl"
         },
         {
-          "comment": "Trim right whitespace",
-          "match": "\\s\\~",
+          "match": "\\s~",
           "name": "keyword.operator.template.right.trim.hcl"
         },
         {
-          "comment": "if/else/endif and for/in/endfor directives",
           "match": "\\b(if|else|endif|for|in|endfor)\\b",
           "name": "keyword.control.hcl"
         },
@@ -772,7 +738,6 @@
           "name": "punctuation.definition.string.begin.hcl"
         }
       },
-      "comment": "Strings",
       "end": "\"",
       "endCaptures": {
         "0": {
@@ -799,7 +764,7 @@
           "name": "keyword.control.hcl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.hcl"
diff --git a/resources/languages/tex.json b/resources/languages/tex.json
index ea6c26f..5235d20 100644
--- a/resources/languages/tex.json
+++ b/resources/languages/tex.json
@@ -3,47 +3,54 @@
   "name": "tex",
   "patterns": [
     {
-      "begin": "(?<=^\\s{0,254})((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)",
+      "include": "#iffalse-block"
+    },
+    {
+      "include": "#macro-control"
+    },
+    {
+      "include": "#catcode"
+    },
+    {
+      "include": "#comment"
+    },
+    {
+      "match": "[\\[\\]]",
+      "name": "punctuation.definition.brackets.tex"
+    },
+    {
+      "include": "#dollar-math"
+    },
+    {
+      "match": "\\\\\\\\",
+      "name": "keyword.control.newline.tex"
+    },
+    {
+      "include": "#macro-general"
+    }
+  ],
+  "repository": {
+    "braces": {
+      "begin": "(?<!\\\\)\\{",
       "beginCaptures": {
-        "1": {
-          "name": "keyword.control.tex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.tex"
+        "0": {
+          "name": "punctuation.group.begin.tex"
         }
       },
-      "contentName": "comment.line.percentage.tex",
-      "end": "((\\\\)(?:else|fi))",
+      "end": "(?<!\\\\)}",
       "endCaptures": {
-        "1": {
-          "name": "keyword.control.tex"
-        },
-        "2": {
-          "name": "punctuation.definition.keyword.tex"
+        "0": {
+          "name": "punctuation.group.end.tex"
         }
       },
+      "name": "meta.group.braces.tex",
       "patterns": [
-        {
-          "include": "#comment"
-        },
         {
           "include": "#braces"
-        },
-        {
-          "include": "#conditionals"
         }
       ]
     },
-    {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.keyword.tex"
-        }
-      },
-      "match": "(\\\\)(backmatter|csname|else|endcsname|fi|frontmatter|mainmatter|unless|if(case|cat|csname|defined|dim|eof|false|fontchar|hbox|hmode|inner|mmode|num|odd|true|vbox|vmode|void|x)?)(?![a-zA-Z@])",
-      "name": "keyword.control.tex"
-    },
-    {
+    "catcode": {
       "captures": {
         "1": {
           "name": "keyword.control.catcode.tex"
@@ -58,18 +65,54 @@
           "name": "constant.numeric.category.tex"
         }
       },
-      "match": "((\\\\)catcode)`(?:\\\\)?.(=)(\\d+)",
+      "match": "((\\\\)catcode)`\\\\?.(=)(\\d+)",
       "name": "meta.catcode.tex"
     },
-    {
-      "include": "#comment"
+    "comment": {
+      "begin": "(^[ \\t]+)?(?=%)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.tex"
+        }
+      },
+      "end": "(?!\\G)",
+      "patterns": [
+        {
+          "begin": "%:?",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.tex"
+            }
+          },
+          "end": "$\\n?",
+          "name": "comment.line.percentage.tex"
+        },
+        {
+          "begin": "^(%!TEX) (\\S*) =",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.tex"
+            }
+          },
+          "end": "$\\n?",
+          "name": "comment.line.percentage.directive.tex"
+        }
+      ]
     },
-    {
-      "match": "[\\[\\]]",
-      "name": "punctuation.definition.brackets.tex"
+    "conditionals": {
+      "begin": "(?<=^\\s*)\\\\if[a-z]*",
+      "end": "(?<=^\\s*)\\\\fi",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#conditionals"
+        }
+      ]
     },
-    {
-      "begin": "(\\$\\$|\\$)",
+    "dollar-math": {
+      "begin": "(\\$(?:\\$|))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.tex"
@@ -88,119 +131,95 @@
           "name": "constant.character.escape.tex"
         },
         {
-          "include": "#math"
+          "include": "#math-content"
         },
         {
           "include": "$self"
         }
       ]
     },
-    {
-      "match": "\\\\\\\\",
-      "name": "keyword.control.newline.tex"
-    },
-    {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.function.tex"
-        }
-      },
-      "match": "(\\\\)_*[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*",
-      "name": "support.class.general.latex3.tex"
-    },
-    {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.function.tex"
-        }
-      },
-      "match": "(\\.)[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*",
-      "name": "support.class.general.latex3.tex"
-    },
-    {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.function.tex"
-        }
-      },
-      "match": "(\\\\)(?:[,;]|(?:[\\p{Alphabetic}@]+))",
-      "name": "support.function.general.tex"
-    },
-    {
-      "captures": {
+    "iffalse-block": {
+      "begin": "(?<=^\\s{0,254})((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)",
+      "beginCaptures": {
         "1": {
+          "name": "keyword.control.tex"
+        },
+        "2": {
           "name": "punctuation.definition.keyword.tex"
         }
       },
-      "match": "(\\\\)[^a-zA-Z@]",
-      "name": "constant.character.escape.tex"
-    }
-  ],
-  "repository": {
-    "braces": {
-      "begin": "(?<!\\\\)\\{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.group.begin.tex"
-        }
-      },
-      "end": "(?<!\\\\)\\}",
+      "contentName": "comment.line.percentage.tex",
+      "end": "((\\\\)(?:else|fi))",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.group.end.tex"
+        "1": {
+          "name": "keyword.control.tex"
+        },
+        "2": {
+          "name": "punctuation.definition.keyword.tex"
         }
       },
-      "name": "meta.group.braces.tex",
       "patterns": [
+        {
+          "include": "#comment"
+        },
         {
           "include": "#braces"
+        },
+        {
+          "include": "#conditionals"
         }
       ]
     },
-    "comment": {
-      "begin": "(^[ \\t]+)?(?=%)",
-      "beginCaptures": {
+    "macro-control": {
+      "captures": {
         "1": {
-          "name": "punctuation.whitespace.comment.leading.tex"
+          "name": "punctuation.definition.keyword.tex"
         }
       },
-      "end": "(?!\\G)",
+      "match": "(\\\\)(backmatter|csname|else|endcsname|fi|frontmatter|mainmatter|unless|if(case|cat|csname|defined|dim|eof|false|fontchar|hbox|hmode|inner|mmode|num|odd|true|vbox|vmode|void|x)?)(?![a-zA-Z@])",
+      "name": "keyword.control.tex"
+    },
+    "macro-general": {
       "patterns": [
         {
-          "begin": "%:?",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.tex"
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.function.tex"
             }
           },
-          "end": "$\\n?",
-          "name": "comment.line.percentage.tex"
+          "match": "(\\\\)_*[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*",
+          "name": "support.class.general.latex3.tex"
         },
         {
-          "begin": "^(%!TEX) (\\S*) =",
-          "beginCaptures": {
+          "captures": {
             "1": {
-              "name": "punctuation.definition.comment.tex"
+              "name": "punctuation.definition.function.tex"
             }
           },
-          "end": "$\\n?",
-          "name": "comment.line.percentage.directive.tex"
-        }
-      ]
-    },
-    "conditionals": {
-      "begin": "(?<=^\\s*)\\\\if[a-z]*",
-      "end": "(?<=^\\s*)\\\\fi",
-      "patterns": [
+          "match": "(\\.)[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*",
+          "name": "support.class.general.latex3.tex"
+        },
         {
-          "include": "#comment"
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.function.tex"
+            }
+          },
+          "match": "(\\\\)(?:[,;]|[\\p{Alphabetic}@]+)",
+          "name": "support.function.general.tex"
         },
         {
-          "include": "#conditionals"
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.keyword.tex"
+            }
+          },
+          "match": "(\\\\)[^a-zA-Z@]",
+          "name": "constant.character.escape.tex"
         }
       ]
     },
-    "math": {
+    "math-content": {
       "patterns": [
         {
           "begin": "((\\\\)(?:text|mbox))(\\{)",
@@ -216,7 +235,7 @@
             }
           },
           "contentName": "meta.text.normal.tex",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.tex meta.text.normal.tex"
@@ -224,7 +243,7 @@
           },
           "patterns": [
             {
-              "include": "#math"
+              "include": "#math-content"
             },
             {
               "include": "$self"
@@ -232,11 +251,11 @@
           ]
         },
         {
-          "match": "\\\\{|\\\\}",
+          "match": "\\\\[{}]",
           "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"
         },
         {
@@ -245,7 +264,7 @@
               "name": "punctuation.definition.constant.math.tex"
             }
           },
-          "match": "(\\\\)(s(s(earrow|warrow|lash)|h(ort(downarrow|uparrow|parallel|leftarrow|rightarrow|mid)|arp)|tar|i(gma|m(eq)?)|u(cc(sim|n(sim|approx)|curlyeq|eq|approx)?|pset(neq(q)?|plus(eq)?|eq(q)?)?|rd|m|bset(neq(q)?|plus(eq)?|eq(q)?)?)|p(hericalangle|adesuit)|e(tminus|arrow)|q(su(pset(eq)?|bset(eq)?)|c(up|ap)|uare)|warrow|m(ile|all(s(etminus|mile)|frown)))|h(slash|ook(leftarrow|rightarrow)|eartsuit|bar)|R(sh|ightarrow|e|bag)|Gam(e|ma)|n(s(hort(parallel|mid)|im|u(cc(eq)?|pseteq(q)?|bseteq))|Rightarrow|n(earrow|warrow)|cong|triangle(left(eq(slant)?)?|right(eq(slant)?)?)|i(plus)?|u|p(lus|arallel|rec(eq)?)|e(q|arrow|g|xists)|v(dash|Dash)|warrow|le(ss|q(slant|q)?|ft(arrow|rightarrow))|a(tural|bla)|VDash|rightarrow|g(tr|eq(slant|q)?)|mid|Left(arrow|rightarrow))|c(hi|irc(eq|le(d(circ|S|dash|ast)|arrow(left|right)))?|o(ng|prod|lon|mplement)|dot(s|p)?|u(p|r(vearrow(left|right)|ly(eq(succ|prec)|vee(downarrow|uparrow)?|wedge(downarrow|uparrow)?)))|enterdot|lubsuit|ap)|Xi|Maps(to(char)?|from(char)?)|B(ox|umpeq|bbk)|t(h(ick(sim|approx)|e(ta|refore))|imes|op|wohead(leftarrow|rightarrow)|a(u|lloblong)|riangle(down|q|left(eq(slant)?)?|right(eq(slant)?)?)?)|i(n(t(er(cal|leave))?|plus|fty)?|ota|math)|S(igma|u(pset|bset))|zeta|o(slash|times|int|dot|plus|vee|wedge|lessthan|greaterthan|m(inus|ega)|b(slash|long|ar))|d(i(v(ideontimes)?|a(g(down|up)|mond(suit)?)|gamma)|o(t(plus|eq(dot)?)|ublebarwedge|wn(harpoon(left|right)|downarrows|arrow))|d(ots|agger)|elta|a(sh(v|leftarrow|rightarrow)|leth|gger))|Y(down|up|left|right)|C(up|ap)|u(n(lhd|rhd)|p(silon|harpoon(left|right)|downarrow|uparrows|lus|arrow)|lcorner|rcorner)|jmath|Theta|Im|p(si|hi|i(tchfork)?|erp|ar(tial|allel)|r(ime|o(d|pto)|ec(sim|n(sim|approx)|curlyeq|eq|approx)?)|m)|e(t(h|a)|psilon|q(slant(less|gtr)|circ|uiv)|ll|xists|mptyset)|Omega|D(iamond|ownarrow|elta)|v(d(ots|ash)|ee(bar)?|Dash|ar(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|curly(vee|wedge)|t(heta|imes|riangle(left|right)?)|o(slash|circle|times|dot|plus|vee|wedge|lessthan|ast|greaterthan|minus|b(slash|ar))|p(hi|i|ropto)|epsilon|kappa|rho|bigcirc))|kappa|Up(silon|downarrow|arrow)|Join|f(orall|lat|a(t(s(emi|lash)|bslash)|llingdotseq)|rown)|P(si|hi|i)|w(p|edge|r)|l(hd|n(sim|eq(q)?|approx)|ceil|times|ightning|o(ng(left(arrow|rightarrow)|rightarrow|maps(to|from))|zenge|oparrow(left|right))|dot(s|p)|e(ss(sim|dot|eq(qgtr|gtr)|approx|gtr)|q(slant|q)?|ft(slice|harpoon(down|up)|threetimes|leftarrows|arrow(t(ail|riangle))?|right(squigarrow|harpoons|arrow(s|triangle|eq)?))|adsto)|vertneqq|floor|l(c(orner|eil)|floor|l|bracket)?|a(ngle|mbda)|rcorner|bag)|a(s(ymp|t)|ngle|pprox(eq)?|l(pha|eph)|rrownot|malg)|V(dash|vdash)|r(h(o|d)|ceil|times|i(singdotseq|ght(s(quigarrow|lice)|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(t(ail|riangle))?|rightarrows))|floor|angle|r(ceil|parenthesis|floor|bracket)|bag)|g(n(sim|eq(q)?|approx)|tr(sim|dot|eq(qless|less)|less|approx)|imel|eq(slant|q)?|vertneqq|amma|g(g)?)|Finv|xi|m(ho|i(nuso|d)|o(o|dels)|u(ltimap)?|p|e(asuredangle|rge)|aps(to|from(char)?))|b(i(n(dnasrepma|ampersand)|g(s(tar|qc(up|ap))|nplus|c(irc|u(p|rly(vee|wedge))|ap)|triangle(down|up)|interleave|o(times|dot|plus)|uplus|parallel|vee|wedge|box))|o(t|wtie|x(slash|circle|times|dot|plus|empty|ast|minus|b(slash|ox|ar)))|u(llet|mpeq)|e(cause|t(h|ween|a))|lack(square|triangle(down|left|right)?|lozenge)|a(ck(s(im(eq)?|lash)|prime|epsilon)|r(o|wedge))|bslash)|L(sh|ong(left(arrow|rightarrow)|rightarrow|maps(to|from))|eft(arrow|rightarrow)|leftarrow|ambda|bag)|Arrownot)(?![a-zA-Z@])",
+          "match": "(\\\\)(s(s(earrow|warrow|lash)|h(ort(downarrow|uparrow|parallel|leftarrow|rightarrow|mid)|arp)|tar|i(gma|m(eq)?)|u(cc(sim|n(sim|approx)|curlyeq|eq|approx)?|pset(neq(q)?|plus(eq)?|eq(q)?)?|rd|m|bset(neq(q)?|plus(eq)?|eq(q)?)?)|p(hericalangle|adesuit)|e(tminus|arrow)|q(su(pset(eq)?|bset(eq)?)|c(up|ap)|uare)|warrow|m(ile|all(s(etminus|mile)|frown)))|h(slash|ook(leftarrow|rightarrow)|eartsuit|bar)|R(sh|ightarrow|e|bag)|Gam(e|ma)|n(s(hort(parallel|mid)|im|u(cc(eq)?|pseteq(q)?|bseteq))|Rightarrow|n(earrow|warrow)|cong|triangle(left(eq(slant)?)?|right(eq(slant)?)?)|i(plus)?|u|p(lus|arallel|rec(eq)?)|e(q|arrow|g|xists)|v(dash|Dash)|warrow|le(ss|q(slant|q)?|ft(arrow|rightarrow))|a(tural|bla)|VDash|rightarrow|g(tr|eq(slant|q)?)|mid|Left(arrow|rightarrow))|c(hi|irc(eq|le(d(circ|S|dash|ast)|arrow(left|right)))?|o(ng|prod|lon|mplement)|dot([sp])?|u(p|r(vearrow(left|right)|ly(eq(succ|prec)|vee(downarrow|uparrow)?|wedge(downarrow|uparrow)?)))|enterdot|lubsuit|ap)|Xi|Maps(to(char)?|from(char)?)|B(ox|umpeq|bbk)|t(h(ick(sim|approx)|e(ta|refore))|imes|op|wohead(leftarrow|rightarrow)|a(u|lloblong)|riangle(down|q|left(eq(slant)?)?|right(eq(slant)?)?)?)|i(n(t(er(cal|leave))?|plus|fty)?|ota|math)|S(igma|u(pset|bset))|zeta|o(slash|times|int|dot|plus|vee|wedge|lessthan|greaterthan|m(inus|ega)|b(slash|long|ar))|d(i(v(ideontimes)?|a(g(down|up)|mond(suit)?)|gamma)|o(t(plus|eq(dot)?)|ublebarwedge|wn(harpoon(left|right)|downarrows|arrow))|d(ots|agger)|elta|a(sh(v|leftarrow|rightarrow)|leth|gger))|Y(down|up|left|right)|C(up|ap)|u(n(lhd|rhd)|p(silon|harpoon(left|right)|downarrow|uparrows|lus|arrow)|lcorner|rcorner)|jmath|Theta|Im|p(si|hi|i(tchfork)?|erp|ar(tial|allel)|r(ime|o(d|pto)|ec(sim|n(sim|approx)|curlyeq|eq|approx)?)|m)|e(t([ha])|psilon|q(slant(less|gtr)|circ|uiv)|ll|xists|mptyset)|Omega|D(iamond|ownarrow|elta)|v(d(ots|ash)|ee(bar)?|Dash|ar(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|curly(vee|wedge)|t(heta|imes|riangle(left|right)?)|o(slash|circle|times|dot|plus|vee|wedge|lessthan|ast|greaterthan|minus|b(slash|ar))|p(hi|i|ropto)|epsilon|kappa|rho|bigcirc))|kappa|Up(silon|downarrow|arrow)|Join|f(orall|lat|a(t(s(emi|lash)|bslash)|llingdotseq)|rown)|P(si|hi|i)|w(p|edge|r)|l(hd|n(sim|eq(q)?|approx)|ceil|times|ightning|o(ng(left(arrow|rightarrow)|rightarrow|maps(to|from))|zenge|oparrow(left|right))|dot([sp])|e(ss(sim|dot|eq(qgtr|gtr)|approx|gtr)|q(slant|q)?|ft(slice|harpoon(down|up)|threetimes|leftarrows|arrow(t(ail|riangle))?|right(squigarrow|harpoons|arrow(s|triangle|eq)?))|adsto)|vertneqq|floor|l(c(orner|eil)|floor|l|bracket)?|a(ngle|mbda)|rcorner|bag)|a(s(ymp|t)|ngle|pprox(eq)?|l(pha|eph)|rrownot|malg)|V(dash|vdash)|r(h([od])|ceil|times|i(singdotseq|ght(s(quigarrow|lice)|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(t(ail|riangle))?|rightarrows))|floor|angle|r(ceil|parenthesis|floor|bracket)|bag)|g(n(sim|eq(q)?|approx)|tr(sim|dot|eq(qless|less)|less|approx)|imel|eq(slant|q)?|vertneqq|amma|g(g)?)|Finv|xi|m(ho|i(nuso|d)|o(o|dels)|u(ltimap)?|p|e(asuredangle|rge)|aps(to|from(char)?))|b(i(n(dnasrepma|ampersand)|g(s(tar|qc(up|ap))|nplus|c(irc|u(p|rly(vee|wedge))|ap)|triangle(down|up)|interleave|o(times|dot|plus)|uplus|parallel|vee|wedge|box))|o(t|wtie|x(slash|circle|times|dot|plus|empty|ast|minus|b(slash|ox|ar)))|u(llet|mpeq)|e(cause|t(h|ween|a))|lack(square|triangle(down|left|right)?|lozenge)|a(ck(s(im(eq)?|lash)|prime|epsilon)|r(o|wedge))|bslash)|L(sh|ong(left(arrow|rightarrow)|rightarrow|maps(to|from))|eft(arrow|rightarrow)|leftarrow|ambda|bag)|Arrownot)(?![a-zA-Z@])",
           "name": "constant.character.math.tex"
         },
         {
@@ -280,7 +299,7 @@
             }
           },
           "contentName": "support.function.sexpr.math.tex",
-          "end": "(((\\})))",
+          "end": "(((})))",
           "endCaptures": {
             "1": {
               "name": "support.function.sexpr.math.tex"
@@ -295,8 +314,8 @@
           "name": "meta.embedded.line.r",
           "patterns": [
             {
-              "begin": "\\G(?!\\})",
-              "end": "(?=\\})",
+              "begin": "\\G(?!})",
+              "end": "(?=})",
               "name": "source.r",
               "patterns": [
                 {
@@ -320,7 +339,7 @@
           "name": "punctuation.math.begin.bracket.curly.tex"
         },
         {
-          "match": "(?<!\\\\)\\}",
+          "match": "(?<!\\\\)}",
           "name": "punctuation.math.end.bracket.curly.tex"
         },
         {
@@ -332,11 +351,11 @@
           "name": "punctuation.math.end.bracket.round.tex"
         },
         {
-          "match": "(([0-9]*[\\.][0-9]+)|[0-9]+)",
+          "match": "(([0-9]*\\.[0-9]+)|[0-9]+)",
           "name": "constant.numeric.math.tex"
         },
         {
-          "match": "[\\+\\*/_\\^-]",
+          "match": "[+*/-]|(?<!\\^)\\^(?!\\^)|(?<!_)_(?!_)",
           "name": "punctuation.math.operator.tex"
         }
       ]
diff --git a/resources/languages/toml.json b/resources/languages/toml.json
index abe0115..05bbca9 100644
--- a/resources/languages/toml.json
+++ b/resources/languages/toml.json
@@ -59,7 +59,7 @@
               "name": "punctuation.definition.section.begin.toml"
             }
           },
-          "match": "^\\s*(\\[)([^\\[\\]]*)(\\])",
+          "match": "^\\s*(\\[)([^\\[\\]]*)(])",
           "name": "meta.group.toml"
         },
         {
@@ -79,7 +79,7 @@
               "name": "punctuation.definition.section.begin.toml"
             }
           },
-          "match": "^\\s*(\\[\\[)([^\\[\\]]*)(\\]\\])",
+          "match": "^\\s*(\\[\\[)([^\\[\\]]*)(]])",
           "name": "meta.group.double.toml"
         }
       ]
@@ -119,7 +119,7 @@
             "3": {
               "patterns": [
                 {
-                  "match": "\\\\([btnfr\"\\\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+                  "match": "\\\\([btnfr\"\\\\]|u\\h{4}|U\\h{8})",
                   "name": "constant.character.escape.toml"
                 },
                 {
@@ -187,7 +187,7 @@
                     "2": {
                       "patterns": [
                         {
-                          "match": "\\\\([btnfr\"\\\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+                          "match": "\\\\([btnfr\"\\\\]|u\\h{4}|U\\h{8})",
                           "name": "constant.character.escape.toml"
                         },
                         {
@@ -219,7 +219,6 @@
               "name": "punctuation.separator.key-value.toml"
             }
           },
-          "comment": "Dotted key",
           "end": "(?<=\\S)(?<!=)|$",
           "patterns": [
             {
@@ -247,7 +246,7 @@
           "name": "string.quoted.triple.double.toml",
           "patterns": [
             {
-              "match": "\\\\([btnfr\"\\\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\([btnfr\"\\\\]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape.toml"
             },
             {
@@ -272,7 +271,7 @@
           "name": "string.quoted.double.toml",
           "patterns": [
             {
-              "match": "\\\\([btnfr\"\\\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\([btnfr\"\\\\]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape.toml"
             },
             {
@@ -354,7 +353,7 @@
               "name": "punctuation.definition.array.begin.toml"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.array.end.toml"
@@ -363,7 +362,7 @@
           "name": "meta.array.toml",
           "patterns": [
             {
-              "begin": "(?=[\"'']|[+-]?[0-9]|[+-]?(inf|nan)|true|false|\\[|\\{)",
+              "begin": "(?=[\"']|[+-]?[0-9]|[+-]?(inf|nan)|true|false|[\\[{])",
               "end": ",|(?=])",
               "endCaptures": {
                 "0": {
@@ -397,7 +396,7 @@
               "name": "punctuation.definition.inline-table.begin.toml"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.inline-table.end.toml"
diff --git a/resources/languages/tsx.json b/resources/languages/tsx.json
index cfb9624..cbe2e9c 100644
--- a/resources/languages/tsx.json
+++ b/resources/languages/tsx.json
@@ -18,13 +18,13 @@
       "name": "storage.modifier.tsx"
     },
     "after-operator-block-as-object-literal": {
-      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^yield|[^._$[:alnum:]]yield|^throw|[^._$[:alnum:]]throw|^in|[^._$[:alnum:]]in|^of|[^._$[:alnum:]]of|^typeof|[^._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -47,7 +47,7 @@
           "name": "punctuation.definition.binding-pattern.array.tsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.tsx"
@@ -72,7 +72,7 @@
           "name": "punctuation.definition.binding-pattern.array.tsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.tsx"
@@ -94,7 +94,7 @@
           "name": "meta.brace.square.tsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.tsx"
@@ -125,13 +125,13 @@
           "name": "meta.arrow.tsx"
         },
         {
-          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))",
+          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.tsx"
             }
           },
-          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
           "name": "meta.arrow.tsx",
           "patterns": [
             {
@@ -158,7 +158,7 @@
               "name": "storage.type.function.arrow.tsx"
             }
           },
-          "end": "((?<=\\}|\\S)(?<!=>)|((?!\\{)(?=\\S)))(?!\\/[\\/\\*])",
+          "end": "((?<=[}\\S])(?<!=>)|((?!\\{)(?=\\S)))(?!/[/*])",
           "name": "meta.arrow.tsx",
           "patterns": [
             {
@@ -181,7 +181,7 @@
           "name": "keyword.operator.type.annotation.tsx"
         }
       },
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "name": "meta.return.type.arrow.tsx",
       "patterns": [
         {
@@ -192,8 +192,8 @@
     "arrow-return-type-body": {
       "patterns": [
         {
-          "begin": "(?<=[:])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=:)(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -283,7 +283,7 @@
     "brackets": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}|(?=\\*/)",
           "patterns": [
             {
@@ -293,7 +293,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]|(?=\\*/)",
+          "end": "]|(?=\\*/)",
           "patterns": [
             {
               "include": "#brackets"
@@ -325,7 +325,7 @@
           "name": "storage.type.class.tsx"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.tsx",
       "patterns": [
         {
@@ -358,7 +358,7 @@
       ]
     },
     "class-expression": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|\\/[\\/*])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|/[/*])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.tsx"
@@ -367,7 +367,7 @@
           "name": "storage.type.class.tsx"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.tsx",
       "patterns": [
         {
@@ -382,7 +382,7 @@
           "name": "punctuation.definition.block.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -397,7 +397,7 @@
         },
         {
           "begin": "(?<=:)\\s*",
-          "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[\\s;),}\\]:\\-+]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -449,7 +449,7 @@
       ]
     },
     "class-or-interface-heritage": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(extends|implements)\\b)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\b(extends|implements)\\b(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.tsx"
@@ -481,7 +481,7 @@
               "name": "punctuation.accessor.optional.tsx"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
         },
         {
           "captures": {
@@ -597,7 +597,7 @@
               "name": "keyword.control.flow.tsx"
             }
           },
-          "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[;}]|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -636,7 +636,7 @@
           "name": "punctuation.definition.block.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -691,7 +691,7 @@
       ]
     },
     "decorator": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\@",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))@",
       "beginCaptures": {
         "0": {
           "name": "punctuation.decorator.tsx"
@@ -708,7 +708,7 @@
     "destructuring-const": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.tsx",
           "patterns": [
@@ -724,7 +724,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.tsx",
           "patterns": [
@@ -744,7 +744,7 @@
     "destructuring-parameter": {
       "patterns": [
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.tsx"
@@ -753,7 +753,7 @@
               "name": "punctuation.definition.binding-pattern.object.tsx"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.object.tsx"
@@ -767,7 +767,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.tsx"
@@ -776,7 +776,7 @@
               "name": "punctuation.definition.binding-pattern.array.tsx"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.array.tsx"
@@ -808,7 +808,7 @@
     "destructuring-variable": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.tsx",
           "patterns": [
@@ -824,7 +824,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.tsx",
           "patterns": [
@@ -864,7 +864,7 @@
       "match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)"
     },
     "directives": {
-      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)",
+      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))+\\s*/>\\s*$)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.tsx"
@@ -920,7 +920,7 @@
               "name": "constant.language.access-type.jsdoc"
             }
           },
-          "match": "((@)(?:access|api))\\s+(private|protected|public)\\b"
+          "match": "((@)a(?:ccess|pi))\\s+(p(?:rivate|rotected|ublic))\\b"
         },
         {
           "captures": {
@@ -1047,7 +1047,7 @@
               "name": "entity.name.type.instance.jsdoc"
             }
           },
-          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*\\])?{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
+          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*])?\\{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
         },
         {
           "captures": {
@@ -1064,7 +1064,7 @@
           "match": "((@)template)\\s+([A-Za-z_$][\\w$.\\[\\]]*(?:\\s*,\\s*[A-Za-z_$][\\w$.\\[\\]]*)*)"
         },
         {
-          "begin": "((@)template)\\s+(?={)",
+          "begin": "((@)template)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1099,7 +1099,7 @@
           "match": "((@)(?:arg|argument|const|constant|member|namespace|param|var))\\s+([A-Za-z_$][\\w$.\\[\\]]*)"
         },
         {
-          "begin": "((@)typedef)\\s+(?={)",
+          "begin": "((@)typedef)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1120,7 +1120,7 @@
           ]
         },
         {
-          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?={)",
+          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1156,13 +1156,13 @@
                   "name": "invalid.illegal.syntax.jsdoc"
                 }
               },
-              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[\\])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:(?:\\*(?!/))|(?:\\\\(?!\"))|[^*\\\\])*?\"|'(?:(?:\\*(?!/))|(?:\\\\(?!'))|[^*\\\\])*?'|\\[(?:(?:\\*(?!/))|[^*])*?\\]|(?:(?:\\*(?!/))|\\s(?!\\s*\\])|\\[.*?(?:\\]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(\\])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
+              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:\\*(?!/)|\\\\(?!\")|[^*\\\\])*?\"|'(?:\\*(?!/)|\\\\(?!')|[^*\\\\])*?'|\\[(?:\\*(?!/)|[^*])*?]|(?:\\*(?!/)|\\s(?!\\s*])|\\[.*?(?:]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
               "name": "variable.other.jsdoc"
             }
           ]
         },
         {
-          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?={)",
+          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1193,7 +1193,7 @@
           "match": "((@)(?:alias|augments|callback|constructs|emits|event|fires|exports?|extends|external|function|func|host|lends|listens|interface|memberof!?|method|module|mixes|mixin|name|requires|see|this|typedef|uses))\\s+((?:[^{}@\\s*]|\\*[^/])+)"
         },
         {
-          "begin": "((@)(?:default(?:value)?|license|version))\\s+(([''\"]))",
+          "begin": "((@)(?:default(?:value)?|license|version))\\s+((['\"]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1254,7 +1254,7 @@
               "name": "punctuation.definition.block.tag.jsdoc"
             }
           },
-          "match": "((@)(?:[_$[:alpha:]][_$[:alnum:]]*))(?=\\s+)"
+          "match": "((@)[_$[:alpha:]][_$[:alnum:]]*)(?=\\s+)"
         }
       ]
     },
@@ -1277,7 +1277,7 @@
           "name": "entity.name.type.enum.tsx"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.enum.declaration.tsx",
       "patterns": [
         {
@@ -1290,7 +1290,7 @@
               "name": "punctuation.definition.block.tsx"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.tsx"
@@ -1307,7 +1307,7 @@
                   "name": "variable.other.enummember.tsx"
                 }
               },
-              "end": "(?=,|\\}|$)",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#comment"
@@ -1318,8 +1318,8 @@
               ]
             },
             {
-              "begin": "(?=((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\])))",
-              "end": "(?=,|\\}|$)",
+              "begin": "(?=(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+])))",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#string"
@@ -1362,7 +1362,7 @@
           "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)\\s+(as)\\s+(namespace)\\s+([_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:(?:\\s*(=))|(?:\\s+(default)(?=\\s+)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:\\s*(=)|\\s+(default)(?=\\s+))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.tsx"
@@ -1377,7 +1377,7 @@
               "name": "keyword.control.default.tsx"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.default.tsx",
           "patterns": [
             {
@@ -1389,7 +1389,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*([\\s,]))(?!\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.tsx"
@@ -1398,7 +1398,7 @@
               "name": "keyword.control.type.tsx"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.tsx",
           "patterns": [
             {
@@ -1464,7 +1464,7 @@
               "name": "keyword.operator.optional.tsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -1484,7 +1484,7 @@
               "name": "keyword.operator.optional.tsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
         },
         {
           "include": "#type-annotation"
@@ -1511,7 +1511,7 @@
           "name": "keyword.control.flow.tsx"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*\\*)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*\\*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.flow.tsx"
@@ -1588,7 +1588,7 @@
               "name": "keyword.control.satisfies.tsx"
             }
           },
-          "end": "(?=^|[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+\\<))",
+          "end": "(?=^|[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+<))",
           "patterns": [
             {
               "include": "#type"
@@ -1600,11 +1600,11 @@
           "name": "keyword.operator.spread.tsx"
         },
         {
-          "match": "\\*=|(?<!\\()/=|%=|\\+=|\\-=",
+          "match": "\\*=|(?<!\\()/=|%=|\\+=|-=",
           "name": "keyword.operator.assignment.compound.tsx"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>=|>>>=|\\|=",
+          "match": "&=|\\^=|<<=|>>=|>>>=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.tsx"
         },
         {
@@ -1612,11 +1612,11 @@
           "name": "keyword.operator.bitwise.shift.tsx"
         },
         {
-          "match": "===|!==|==|!=",
+          "match": "(?:==|!=)(?:=|)",
           "name": "keyword.operator.comparison.tsx"
         },
         {
-          "match": "<=|>=|<>|<|>",
+          "match": "<=|>=|<>|[<>]",
           "name": "keyword.operator.relational.tsx"
         },
         {
@@ -1631,18 +1631,18 @@
               "name": "keyword.operator.arithmetic.tsx"
             }
           },
-          "match": "(?<=[_$[:alnum:]])(\\!)\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:]])(!)\\s*(?:(/=)|(/)(?![/*]))"
         },
         {
-          "match": "\\!|&&|\\|\\||\\?\\?",
+          "match": "!|&&|\\|\\||\\?\\?",
           "name": "keyword.operator.logical.tsx"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.tsx"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.tsx"
         },
         {
@@ -1654,12 +1654,12 @@
           "name": "keyword.operator.increment.tsx"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.tsx"
         },
         {
-          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(?:(/=)|(?:(/)(?![/*]))))",
-          "end": "(?:(/=)|(?:(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)))",
+          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)+(?:(/=)|(/)(?![/*])))",
+          "end": "(?:(/=)|(/)(?!\\*([^*]|(\\*[^/]))*\\*/))",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.assignment.compound.tsx"
@@ -1683,7 +1683,7 @@
               "name": "keyword.operator.arithmetic.tsx"
             }
           },
-          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(/)(?![/*]))"
         }
       ]
     },
@@ -1756,13 +1756,13 @@
       ]
     },
     "field-declaration": {
-      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|\\}|$))",
+      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,}]|$))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.tsx"
         }
       },
-      "end": "(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|$))))|(?<=\\})",
+      "end": "(?=[};,]|$|(^(?!\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,]|$))))|(?<=})",
       "name": "meta.field.declaration.tsx",
       "patterns": [
         {
@@ -1795,10 +1795,10 @@
               "name": "keyword.operator.definiteassignment.tsx"
             }
           },
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
-          "match": "\\#?[_$[:alpha:]][_$[:alnum:]]*",
+          "match": "#?[_$[:alpha:]][_$[:alnum:]]*",
           "name": "meta.definition.property.tsx variable.object.property.tsx"
         },
         {
@@ -1806,13 +1806,13 @@
           "name": "keyword.operator.optional.tsx"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "keyword.operator.definiteassignment.tsx"
         }
       ]
     },
     "for-loop": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*))await)?\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)?(\\())",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*))await)?\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)?(\\())",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.loop.tsx"
@@ -1883,12 +1883,12 @@
     "function-call": {
       "patterns": [
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
-          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
+          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
               "name": "meta.function-call.tsx",
               "patterns": [
                 {
@@ -1911,12 +1911,12 @@
           ]
         },
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
-          "end": "(?<=\\>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
+          "end": "(?<=>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*[\\{\\[\\(]\\s*$))",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=(<\\s*[{\\[(]\\s*$))",
               "name": "meta.function-call.tsx",
               "patterns": [
                 {
@@ -1944,7 +1944,7 @@
           "name": "meta.function-call.tsx punctuation.accessor.optional.tsx"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "meta.function-call.tsx keyword.operator.definiteassignment.tsx"
         }
       ]
@@ -1955,7 +1955,7 @@
           "include": "#support-function-call-identifiers"
         },
         {
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)",
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)",
           "name": "entity.name.function.tsx"
         }
       ]
@@ -1982,7 +1982,7 @@
           "name": "meta.definition.function.tsx entity.name.function.tsx"
         }
       },
-      "end": "(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|(?<=\\})",
+      "end": "(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|(?<=})",
       "name": "meta.function.tsx",
       "patterns": [
         {
@@ -2009,7 +2009,7 @@
           "name": "meta.definition.function.tsx entity.name.function.tsx"
         }
       },
-      "end": "(?=;)|(?<=\\})",
+      "end": "(?=;)|(?<=})",
       "name": "meta.function.expression.tsx",
       "patterns": [
         {
@@ -2093,7 +2093,7 @@
               "name": "entity.name.function.tsx"
             }
           },
-          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))"
+          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))"
         },
         {
           "captures": {
@@ -2107,7 +2107,7 @@
               "name": "variable.other.constant.property.tsx"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])"
         },
         {
           "captures": {
@@ -2121,10 +2121,10 @@
               "name": "variable.other.property.tsx"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+          "match": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])",
           "name": "variable.other.constant.tsx"
         },
         {
@@ -2136,8 +2136,8 @@
     "if-statement": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
-          "end": "(?=;|$|\\})",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))\\s*(?!\\{))",
+          "end": "(?=;|$|})",
           "patterns": [
             {
               "include": "#comment"
@@ -2165,7 +2165,7 @@
               ]
             },
             {
-              "begin": "(?<=\\))\\s*\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+              "begin": "(?<=\\))\\s*/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.tsx"
@@ -2195,7 +2195,7 @@
       ]
     },
     "import-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.tsx"
@@ -2210,7 +2210,7 @@
           "name": "keyword.control.type.tsx"
         }
       },
-      "end": "(?<!^import|[^\\._$[:alnum:]]import)(?=;|$|^)",
+      "end": "(?<!^import|[^._$[:alnum:]]import)(?=;|$|^)",
       "name": "meta.import.tsx",
       "patterns": [
         {
@@ -2223,7 +2223,7 @@
           "include": "#string"
         },
         {
-          "begin": "(?<=^import|[^\\._$[:alnum:]]import)(?!\\s*[\"'])",
+          "begin": "(?<=^import|[^._$[:alnum:]]import)(?!\\s*[\"'])",
           "end": "\\bfrom\\b",
           "endCaptures": {
             "0": {
@@ -2330,7 +2330,7 @@
                   "name": "punctuation.accessor.optional.tsx"
                 }
               },
-              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
             },
             {
               "match": "([_$[:alpha:]][_$[:alnum:]]*)",
@@ -2353,7 +2353,7 @@
           "name": "punctuation.definition.block.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -2367,7 +2367,7 @@
           "include": "#string"
         },
         {
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object-literal.key.tsx"
         },
         {
@@ -2383,7 +2383,7 @@
           "name": "punctuation.definition.block.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -2431,7 +2431,7 @@
               "name": "string.quoted.alias.tsx"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         },
         {
           "include": "#punctuation-comma"
@@ -2456,7 +2456,7 @@
               "name": "string.quoted.alias.tsx"
             }
           },
-          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         }
       ]
     },
@@ -2496,7 +2496,7 @@
           "name": "variable.parameter.tsx"
         }
       },
-      "end": "(\\])\\s*(\\?\\s*)?|$",
+      "end": "(])\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.tsx"
@@ -2531,7 +2531,7 @@
           "name": "keyword.operator.expression.in.tsx"
         }
       },
-      "end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
+      "end": "(])([+-])?\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.tsx"
@@ -2569,11 +2569,11 @@
               "name": "punctuation.definition.bracket.square.end.jsdoc"
             }
           },
-          "match": "(\\[)[^\\]]+(\\])(?={@(?:link|linkcode|linkplain|tutorial))",
+          "match": "(\\[)[^\\]]+(])(?=\\{@(?:link|linkcode|linkplain|tutorial))",
           "name": "constant.other.description.jsdoc"
         },
         {
-          "begin": "({)((@)(?:link(?:code|plain)?|tutorial))\\s*",
+          "begin": "(\\{)((@)(?:link(?:code|plain)?|tutorial))\\s*",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.bracket.curly.begin.jsdoc"
@@ -2602,7 +2602,7 @@
                   "name": "punctuation.separator.pipe.jsdoc"
                 }
               },
-              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*[/])+)(\\|)?"
+              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*/)+)(\\|)?"
             },
             {
               "captures": {
@@ -2626,7 +2626,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"
@@ -2649,7 +2649,7 @@
           "name": "storage.type.interface.tsx"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.interface.tsx",
       "patterns": [
         {
@@ -2677,7 +2677,7 @@
     "jsdoctype": {
       "patterns": [
         {
-          "begin": "\\G({)",
+          "begin": "\\G(\\{)",
           "beginCaptures": {
             "0": {
               "name": "entity.name.type.instance.jsdoc"
@@ -2741,7 +2741,7 @@
               "name": "punctuation.definition.entity.tsx"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.tsx"
         }
       ]
@@ -2754,7 +2754,7 @@
         }
       },
       "contentName": "meta.embedded.expression.tsx",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.embedded.end.tsx"
@@ -2807,8 +2807,8 @@
       ]
     },
     "jsx-tag": {
-      "begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
-      "end": "(/>)|(?:(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+      "begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
+      "end": "(/>)|(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.tsx"
@@ -2835,7 +2835,7 @@
       "name": "meta.tag.tsx",
       "patterns": [
         {
-          "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
+          "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.tsx"
@@ -2853,7 +2853,7 @@
               "name": "support.class.component.tsx"
             }
           },
-          "end": "(?=[/]?>)",
+          "end": "(?=/?>)",
           "patterns": [
             {
               "include": "#comment"
@@ -2884,7 +2884,7 @@
       ]
     },
     "jsx-tag-attribute-assignment": {
-      "match": "=(?=\\s*(?:'|\"|{|/\\*|//|\\n))",
+      "match": "=(?=\\s*(?:['\"{]|/\\*|//|\\n))",
       "name": "keyword.operator.assignment.tsx"
     },
     "jsx-tag-attribute-name": {
@@ -2899,11 +2899,11 @@
           "name": "entity.other.attribute-name.tsx"
         }
       },
-      "match": "\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?([_$[:alpha:]][-_$[:alnum:]]*)(?=\\s|=|/?>|/\\*|//)"
+      "match": "\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?([_$[:alpha:]][-_$[:alnum:]]*)(?=[\\s=]|/?>|/\\*|//)"
     },
     "jsx-tag-attributes": {
       "begin": "\\s+",
-      "end": "(?=[/]?>)",
+      "end": "(?=/?>)",
       "name": "meta.tag.attributes.tsx",
       "patterns": [
         {
@@ -2934,8 +2934,8 @@
       "name": "invalid.illegal.attribute.tsx"
     },
     "jsx-tag-in-expression": {
-      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,))(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
-      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,))(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
+      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
       "patterns": [
         {
           "include": "#jsx-tag"
@@ -2943,7 +2943,7 @@
       ]
     },
     "jsx-tag-without-attributes": {
-      "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+      "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.tsx"
@@ -2965,7 +2965,7 @@
         }
       },
       "contentName": "meta.jsx.children.tsx",
-      "end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>)",
+      "end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.tsx"
@@ -2994,8 +2994,8 @@
       ]
     },
     "jsx-tag-without-attributes-in-expression": {
-      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
-      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>))",
+      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>))",
       "patterns": [
         {
           "include": "#jsx-tag-without-attributes"
@@ -3014,7 +3014,7 @@
               "name": "punctuation.separator.label.tsx"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#decl-block"
@@ -3065,7 +3065,7 @@
     "method-declaration": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.tsx"
@@ -3083,7 +3083,7 @@
               "name": "storage.type.tsx"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.tsx",
           "patterns": [
             {
@@ -3095,7 +3095,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.tsx"
@@ -3116,7 +3116,7 @@
               "name": "keyword.generator.asterisk.tsx"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.tsx",
           "patterns": [
             {
@@ -3128,7 +3128,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.tsx"
@@ -3149,7 +3149,7 @@
               "name": "keyword.generator.asterisk.tsx"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.tsx",
           "patterns": [
             {
@@ -3163,8 +3163,8 @@
       ]
     },
     "method-declaration-name": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??)\\s*[\\(\\<])",
-      "end": "(?=\\(|\\<)",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??)\\s*[(<])",
+      "end": "(?=[(<])",
       "patterns": [
         {
           "include": "#string"
@@ -3186,7 +3186,7 @@
       ]
     },
     "namespace-declaration": {
-      "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.tsx"
@@ -3198,7 +3198,7 @@
           "name": "storage.type.namespace.tsx"
         }
       },
-      "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?<=})|(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.namespace.declaration.tsx",
       "patterns": [
         {
@@ -3226,7 +3226,7 @@
           "name": "keyword.operator.new.tsx"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*\\())))",
       "name": "new.expr.tsx",
       "patterns": [
         {
@@ -3246,7 +3246,7 @@
               "name": "storage.type.numeric.bigint.tsx"
             }
           },
-          "match": "\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.hex.tsx"
         },
         {
@@ -3255,7 +3255,7 @@
               "name": "storage.type.numeric.bigint.tsx"
             }
           },
-          "match": "\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.binary.tsx"
         },
         {
@@ -3264,7 +3264,7 @@
               "name": "storage.type.numeric.bigint.tsx"
             }
           },
-          "match": "\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.octal.tsx"
         },
         {
@@ -3315,7 +3315,7 @@
               "name": "storage.type.numeric.bigint.tsx"
             }
           },
-          "match": "(?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)"
+          "match": "(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)"
         }
       ]
     },
@@ -3337,8 +3337,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3368,8 +3368,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3394,7 +3394,7 @@
       ]
     },
     "object-binding-element-propertyName": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
       "end": "(:)",
       "endCaptures": {
         "0": {
@@ -3427,7 +3427,7 @@
           "name": "punctuation.definition.binding-pattern.object.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.tsx"
@@ -3449,7 +3449,7 @@
           "name": "punctuation.definition.binding-pattern.object.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.tsx"
@@ -3482,7 +3482,7 @@
               "name": "variable.other.object.property.tsx"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(\\#?[[:upper:]][_$[:digit:][:upper:]]*)|(\\#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(#?\\p{upper}[_$\\d[:upper:]]*)|(#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
           "captures": {
@@ -3493,7 +3493,7 @@
               "name": "variable.other.object.tsx"
             }
           },
-          "match": "(?:([[:upper:]][_$[:digit:][:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\p{upper}[_$\\d[:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         }
       ]
     },
@@ -3504,7 +3504,7 @@
           "name": "punctuation.definition.block.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -3518,7 +3518,7 @@
       ]
     },
     "object-literal-method-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.async.tsx"
@@ -3530,7 +3530,7 @@
           "name": "keyword.generator.asterisk.tsx"
         }
       },
-      "end": "(?=\\}|;|,)|(?<=\\})",
+      "end": "(?=[};,])|(?<=})",
       "name": "meta.method.declaration.tsx",
       "patterns": [
         {
@@ -3540,7 +3540,7 @@
           "include": "#function-body"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.tsx"
@@ -3552,7 +3552,7 @@
               "name": "keyword.generator.asterisk.tsx"
             }
           },
-          "end": "(?=\\(|\\<)",
+          "end": "(?=[(<])",
           "patterns": [
             {
               "include": "#method-declaration-name"
@@ -3571,7 +3571,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?=:)|((?<=[\\]])(?=\\s*[\\(\\<]))",
+          "end": "(?=:)|((?<=])(?=\\s*[(<]))",
           "name": "meta.object.member.tsx meta.object-literal.key.tsx",
           "patterns": [
             {
@@ -3583,8 +3583,8 @@
           ]
         },
         {
-          "begin": "(?=[\\'\\\"\\`])",
-          "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as|satisifies)\\s+))))",
+          "begin": "(?=['\"`])",
+          "end": "(?=:)|((?<=['\"`])(?=((\\s*[(<,}])|(\\s+(as|satisifies)\\s+))))",
           "name": "meta.object.member.tsx meta.object-literal.key.tsx",
           "patterns": [
             {
@@ -3596,8 +3596,8 @@
           ]
         },
         {
-          "begin": "(?=(\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)))",
-          "end": "(?=:)|(?=\\s*([\\(\\<,}])|(\\s+as|satisifies\\s+))",
+          "begin": "(?=(\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)))",
+          "end": "(?=:)|(?=\\s*([(<,}])|(\\s+as|satisifies\\s+))",
           "name": "meta.object.member.tsx meta.object-literal.key.tsx",
           "patterns": [
             {
@@ -3609,8 +3609,8 @@
           ]
         },
         {
-          "begin": "(?<=[\\]\\'\\\"\\`])(?=\\s*[\\(\\<])",
-          "end": "(?=\\}|;|,)|(?<=\\})",
+          "begin": "(?<=[\\]'\"`])(?=\\s*[(<])",
+          "end": "(?=[};,])|(?<=})",
           "name": "meta.method.declaration.tsx",
           "patterns": [
             {
@@ -3627,7 +3627,7 @@
               "name": "constant.numeric.decimal.tsx"
             }
           },
-          "match": "(?![_$[:alpha:]])([[:digit:]]+)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "(?![_$[:alpha:]])(\\d+)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.tsx"
         },
         {
@@ -3639,7 +3639,7 @@
               "name": "entity.name.function.tsx"
             }
           },
-          "match": "(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:(\\s*/\\*([^*]|(\\*[^/]))*\\*/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))",
           "name": "meta.object.member.tsx"
         },
         {
@@ -3648,7 +3648,7 @@
               "name": "meta.object-literal.key.tsx"
             }
           },
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.tsx"
         },
         {
@@ -3658,7 +3658,7 @@
               "name": "keyword.operator.spread.tsx"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.tsx",
           "patterns": [
             {
@@ -3672,7 +3672,7 @@
               "name": "variable.other.readwrite.tsx"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.tsx"
         },
         {
@@ -3697,7 +3697,7 @@
               "name": "keyword.control.satisfies.tsx"
             }
           },
-          "end": "(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
+          "end": "(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
           "name": "meta.object.member.tsx",
           "patterns": [
             {
@@ -3707,7 +3707,7 @@
         },
         {
           "begin": "(?=[_$[:alpha:]][_$[:alnum:]]*\\s*=)",
-          "end": "(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "end": "(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.tsx",
           "patterns": [
             {
@@ -3722,11 +3722,11 @@
               "name": "meta.object-literal.key.tsx punctuation.separator.key-value.tsx"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.tsx",
           "patterns": [
             {
-              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.tsx"
@@ -3759,7 +3759,7 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.tsx"
@@ -3781,13 +3781,13 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(?=\\<\\s*$)",
+              "begin": "(?<=:)\\s*(async)?\\s*(?=<\\s*$)",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.tsx"
                 }
               },
-              "end": "(?<=\\>)",
+              "end": "(?<=>)",
               "patterns": [
                 {
                   "include": "#type-parameters"
@@ -3795,7 +3795,7 @@
               ]
             },
             {
-              "begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=>)\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "meta.brace.round.tsx"
@@ -3839,7 +3839,7 @@
           "name": "punctuation.definition.binding-pattern.array.tsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.tsx"
@@ -3910,7 +3910,7 @@
               "name": "keyword.operator.optional.tsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -3930,7 +3930,7 @@
               "name": "keyword.operator.optional.tsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
         }
       ]
     },
@@ -3940,8 +3940,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3978,7 +3978,7 @@
           "name": "punctuation.definition.binding-pattern.object.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.tsx"
@@ -4031,7 +4031,7 @@
     "paren-expression-possibly-arrow": {
       "patterns": [
         {
-          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.tsx"
@@ -4045,7 +4045,7 @@
           ]
         },
         {
-          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
+          "begin": "(?<=[(=,]|=>|^return|[^._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)))\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.tsx"
@@ -4090,14 +4090,14 @@
       ]
     },
     "possibly-arrow-return-type": {
-      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*=>)",
       "beginCaptures": {
         "1": {
           "name": "meta.arrow.tsx meta.return.type.arrow.tsx keyword.operator.type.annotation.tsx"
         }
       },
       "contentName": "meta.arrow.tsx meta.return.type.arrow.tsx",
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "patterns": [
         {
           "include": "#arrow-return-type-body"
@@ -4117,7 +4117,7 @@
           "name": "punctuation.accessor.optional.tsx"
         }
       },
-      "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+      "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
     },
     "punctuation-comma": {
       "match": ",",
@@ -4134,7 +4134,7 @@
           "name": "punctuation.definition.string.begin.tsx"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.tsx"
@@ -4157,7 +4157,7 @@
           "name": "punctuation.definition.string.begin.tsx"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.tsx"
@@ -4176,7 +4176,7 @@
     "regex": {
       "patterns": [
         {
-          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[\\()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\]|\\(([^\\)\\\\]|\\\\.)+\\))+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case|=>|&&|\\|\\||\\*/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+]|\\(([^)\\\\]|\\\\.)+\\))+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.tsx"
@@ -4199,7 +4199,7 @@
           ]
         },
         {
-          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*\\/)|((?<=^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case))\\s*)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*/)|((?<=^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case))\\s*)/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.tsx"
@@ -4230,7 +4230,7 @@
           "name": "constant.other.character-class.regexp"
         },
         {
-          "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})",
+          "match": "\\\\([0-7]{3}|x\\h{2}|u\\h{4})",
           "name": "constant.character.numeric.regexp"
         },
         {
@@ -4246,7 +4246,7 @@
     "regexp": {
       "patterns": [
         {
-          "match": "\\\\[bB]|\\^|\\$",
+          "match": "\\\\[bB]|[\\^$]",
           "name": "keyword.control.anchor.regexp"
         },
         {
@@ -4258,10 +4258,10 @@
               "name": "variable.other.regexp"
             }
           },
-          "match": "\\\\[1-9]\\d*|\\\\k<([a-zA-Z_$][\\w$]*)>"
+          "match": "\\\\(?:[1-9]\\d*|k<([a-zA-Z_$][\\w$]*)>)"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.regexp"
         },
         {
@@ -4304,7 +4304,7 @@
           ]
         },
         {
-          "begin": "\\((?:(\\?:)|(?:\\?<([a-zA-Z_$][\\w$]*)>))?",
+          "begin": "\\((?:(\\?:)|\\?<([a-zA-Z_$][\\w$]*)>)?",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.regexp"
@@ -4339,7 +4339,7 @@
               "name": "keyword.operator.negation.regexp"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.regexp"
@@ -4368,7 +4368,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))",
               "name": "constant.other.character-class.range.regexp"
             },
             {
@@ -4390,7 +4390,7 @@
               "name": "keyword.operator.type.annotation.tsx"
             }
           },
-          "end": "(?<![:|&])(?=$|^|[{};,]|//)",
+          "end": "(?<![:|\\&])(?=$|^|[{};,]|//)",
           "name": "meta.return.type.tsx",
           "patterns": [
             {
@@ -4405,7 +4405,7 @@
               "name": "keyword.operator.type.annotation.tsx"
             }
           },
-          "end": "(?<![:|&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<![:|\\&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.return.type.tsx",
           "patterns": [
             {
@@ -4421,8 +4421,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?<=[:|&])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=[:|\\&])(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -4513,7 +4513,7 @@
       ]
     },
     "string-character-escape": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
+      "match": "\\\\(x\\h{2}|u\\h{4}|u\\{\\h+}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
       "name": "constant.character.escape.tsx"
     },
     "super-literal": {
@@ -4535,7 +4535,7 @@
           "include": "#punctuation-accessor"
         },
         {
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*[\\(]\\s*[\\\"\\'\\`]))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*\\(\\s*[\"'`])",
           "name": "keyword.operator.expression.import.tsx"
         }
       ]
@@ -4565,7 +4565,7 @@
               "name": "support.variable.property.importmeta.tsx"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(meta)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(meta)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4582,7 +4582,7 @@
               "name": "support.variable.property.target.tsx"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(target)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(target)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4599,7 +4599,7 @@
               "name": "support.constant.tsx"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())|(?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\()|(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$))"
         },
         {
           "captures": {
@@ -4619,13 +4619,13 @@
               "name": "support.type.object.module.tsx"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
         }
       ]
     },
     "switch-statement": {
       "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bswitch\\s*\\()",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -4666,7 +4666,7 @@
               "name": "punctuation.definition.block.tsx"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "name": "switch-block.expr.tsx",
           "patterns": [
             {
@@ -4695,7 +4695,7 @@
                 }
               },
               "contentName": "meta.block.tsx",
-              "end": "\\}",
+              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "meta.block.tsx punctuation.definition.block.tsx"
@@ -4758,12 +4758,12 @@
     "template-call": {
       "patterns": [
         {
-          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
           "end": "(?=`)",
           "patterns": [
             {
               "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
               "patterns": [
                 {
                   "include": "#support-function-call-identifiers"
@@ -4780,7 +4780,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.tsx"
@@ -4803,7 +4803,7 @@
         }
       },
       "contentName": "meta.embedded.line.tsx",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.tsx"
@@ -4857,7 +4857,7 @@
         }
       },
       "contentName": "meta.embedded.line.tsx",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.tsx"
@@ -4871,7 +4871,7 @@
       ]
     },
     "ternary-expression": {
-      "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
+      "begin": "(?!\\?\\.\\s*\\D)(\\?)(?!\\?)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.ternary.tsx"
@@ -4963,7 +4963,7 @@
           "name": "entity.name.type.alias.tsx"
         }
       },
-      "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.type.declaration.tsx",
       "patterns": [
         {
@@ -4982,7 +4982,7 @@
               "name": "keyword.control.intrinsic.tsx"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -4996,7 +4996,7 @@
               "name": "keyword.operator.assignment.tsx"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -5014,7 +5014,7 @@
               "name": "keyword.operator.type.annotation.tsx"
             }
           },
-          "end": "(?<![:|&])(?!\\s*[|&]\\s+)((?=^|[,);\\}\\]]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])(?!\\s*[|\\&]\\s+)((?=^|[,);}\\]]|//)|(?==[^>])|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.tsx",
           "patterns": [
             {
@@ -5029,7 +5029,7 @@
               "name": "keyword.operator.type.annotation.tsx"
             }
           },
-          "end": "(?<![:|&])((?=[,);\\}\\]]|\\/\\/)|(?==[^>])|(?=^\\s*$)|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])((?=[,);}\\]]|//)|(?==[^>])|(?=^\\s*$)|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.tsx",
           "patterns": [
             {
@@ -5040,13 +5040,13 @@
       ]
     },
     "type-arguments": {
-      "begin": "\\<",
+      "begin": "<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.begin.tsx"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.end.tsx"
@@ -5121,7 +5121,7 @@
     "type-fn-type-parameters": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*\\<)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*<)",
           "beginCaptures": {
             "1": {
               "name": "meta.type.constructor.tsx storage.modifier.tsx"
@@ -5159,7 +5159,7 @@
           ]
         },
         {
-          "begin": "((?=[(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>))))))",
+          "begin": "((?=\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>))))))",
           "end": "(?<=\\))",
           "name": "meta.type.function.tsx",
           "patterns": [
@@ -5179,7 +5179,7 @@
               "name": "storage.type.function.arrow.tsx"
             }
           },
-          "end": "(?<!=>)(?<![|&])(?=[,\\]\\)\\{\\}=;>:\\?]|//|$)",
+          "end": "(?<!=>)(?<![|\\&])(?=[,\\]){}=;>:?]|//|$)",
           "name": "meta.type.function.return.tsx",
           "patterns": [
             {
@@ -5194,7 +5194,7 @@
               "name": "storage.type.function.arrow.tsx"
             }
           },
-          "end": "(?<!=>)(?<![|&])((?=[,\\]\\)\\{\\}=;:\\?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<!=>)(?<![|\\&])((?=[,\\]){}=;:?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.type.function.return.tsx",
           "patterns": [
             {
@@ -5211,7 +5211,7 @@
         },
         {
           "begin": "(?<==>)(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -5248,7 +5248,7 @@
     "type-name": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(<)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(<)",
           "captures": {
             "1": {
               "name": "entity.name.type.module.tsx"
@@ -5311,7 +5311,7 @@
               "name": "punctuation.accessor.optional.tsx"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
         },
         {
           "match": "[_$[:alpha:]][_$[:alnum:]]*",
@@ -5326,7 +5326,7 @@
           "name": "punctuation.definition.block.tsx"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -5359,7 +5359,7 @@
               "name": "keyword.operator.spread.tsx"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "patterns": [
             {
               "include": "#type"
@@ -5386,13 +5386,13 @@
           "include": "#type-infer"
         },
         {
-          "begin": "([&|])(?=\\s*\\{)",
+          "begin": "([\\&|])(?=\\s*\\{)",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.tsx"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -5400,7 +5400,7 @@
           ]
         },
         {
-          "begin": "[&|]",
+          "begin": "[\\&|]",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.tsx"
@@ -5413,7 +5413,7 @@
           "name": "keyword.operator.expression.keyof.tsx"
         },
         {
-          "match": "(\\?|\\:)",
+          "match": "([?:])",
           "name": "keyword.operator.ternary.tsx"
         },
         {
@@ -5489,7 +5489,7 @@
               "name": "keyword.operator.optional.tsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))))"
         },
         {
           "captures": {
@@ -5509,7 +5509,7 @@
               "name": "keyword.operator.optional.tsx"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
         },
         {
           "include": "#type-annotation"
@@ -5590,7 +5590,7 @@
           "name": "meta.brace.square.tsx"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.tsx"
@@ -5631,7 +5631,7 @@
           "name": "keyword.operator.expression.typeof.tsx"
         }
       },
-      "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[,);}\\]=>:\\&|{?]|(extends\\s+)|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "patterns": [
         {
           "include": "#type-arguments"
@@ -5649,7 +5649,7 @@
       "patterns": [
         {
           "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^let|[^._$[:alnum:]]let|^var|[^._$[:alnum:]]var)(?=\\s*$)))",
           "name": "meta.var.expr.tsx",
           "patterns": [
             {
@@ -5680,13 +5680,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.tsx"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5723,7 +5723,7 @@
               "name": "storage.type.tsx"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^const|[^._$[:alnum:]]const)(?=\\s*$)))",
           "name": "meta.var.expr.tsx",
           "patterns": [
             {
@@ -5754,13 +5754,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.tsx"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5785,7 +5785,7 @@
           ]
         },
         {
-          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.tsx"
@@ -5797,11 +5797,11 @@
               "name": "storage.type.tsx"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^using|[^\\._$[:alnum:]]using|^await\\s+using|[^\\._$[:alnum:]]await\\s+using)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^using|[^._$[:alnum:]]using|^await\\s+using|[^._$[:alnum:]]await\\s+using)(?=\\s*$)))",
           "name": "meta.var.expr.tsx",
           "patterns": [
             {
-              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control.export.tsx"
@@ -5825,13 +5825,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+              "begin": "(,)\\s*((?!\\S)|(?=//))",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.tsx"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5857,13 +5857,13 @@
     "var-single-const": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.tsx variable.other.constant.tsx entity.name.function.tsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.tsx",
           "patterns": [
             {
@@ -5878,7 +5878,7 @@
               "name": "meta.definition.variable.tsx variable.other.constant.tsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.tsx",
           "patterns": [
             {
@@ -5891,7 +5891,7 @@
     "var-single-variable": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|([<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|(\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|(<\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>])|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.tsx entity.name.function.tsx"
@@ -5900,7 +5900,7 @@
               "name": "keyword.operator.definiteassignment.tsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.tsx",
           "patterns": [
             {
@@ -5909,7 +5909,7 @@
           ]
         },
         {
-          "begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])(\\!)?",
+          "begin": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.tsx variable.other.constant.tsx"
@@ -5918,7 +5918,7 @@
               "name": "keyword.operator.definiteassignment.tsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.tsx",
           "patterns": [
             {
@@ -5927,7 +5927,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.tsx variable.other.readwrite.tsx"
@@ -5936,7 +5936,7 @@
               "name": "keyword.operator.definiteassignment.tsx"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.tsx",
           "patterns": [
             {
@@ -5962,7 +5962,7 @@
     "variable-initializer": {
       "patterns": [
         {
-          "begin": "(?<!=|!)(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
+          "begin": "(?<![=!])(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.tsx"
@@ -5976,13 +5976,13 @@
           ]
         },
         {
-          "begin": "(?<!=|!)(=)(?!=)",
+          "begin": "(?<![=!])(=)(?!=)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.tsx"
             }
           },
-          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![\\|\\&\\+\\-\\*\\/])(?<=\\S)(?<!=)(?=\\s*$)",
+          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![|\\&+\\-*/])(?<=\\S)(?<!=)(?=\\s*$)",
           "patterns": [
             {
               "include": "#expression"
diff --git a/resources/languages/turtle.json b/resources/languages/turtle.json
index bc9bcc9..8e0b077 100644
--- a/resources/languages/turtle.json
+++ b/resources/languages/turtle.json
@@ -46,7 +46,7 @@
       "name": "constant.numeric.turtle"
     },
     "iriref": {
-      "match": "<[^\\x20-\\x20<>\"{}|^`\\\\]*>",
+      "match": "<[^ - <>\"{}|^`\\\\]*>",
       "name": "entity.name.type.iriref.turtle"
     },
     "language-tag": {
diff --git a/resources/languages/twig.json b/resources/languages/twig.json
index 4559393..327028f 100644
--- a/resources/languages/twig.json
+++ b/resources/languages/twig.json
@@ -5,8 +5,8 @@
     "html.twig"
   ],
   "firstLineMatch": "<!(?i:DOCTYPE)|<(?i:html)|<\\?(?i:php)|\\{\\{|\\{%|\\{#",
-  "foldingStartMarker": "(<(?i:body|div|dl|fieldset|form|head|li|ol|script|select|style|table|tbody|tfoot|thead|tr|ul)\\b.*?>|<!--(?!.*--\\s*>)|^<!--\\ \\#tminclude\\ (?>.*?-->)$|\\{%\\s+(autoescape|block|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim))",
-  "foldingStopMarker": "(</(?i:body|div|dl|fieldset|form|head|li|ol|script|select|style|table|tbody|tfoot|thead|tr|ul)>|^(?!.*?<!--).*?--\\s*>|^<!--\\ end\\ tminclude\\ -->$|\\{%\\s+end(autoescape|block|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim))",
+  "foldingStartMarker": "(<(?i:body|div|dl|fieldset|form|head|li|ol|script|select|style|table|tbody|tfoot|thead|tr|ul)\\b.*?>|<!--(?!.*--\\s*>)|^<!-- #tminclude (?>.*?-->)$|\\{%\\s+(autoescape|block|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim))",
+  "foldingStopMarker": "(</(?i:body|div|dl|fieldset|form|head|li|ol|script|select|style|table|tbody|tfoot|thead|tr|ul)>|^(?!.*?<!--).*?--\\s*>|^<!-- end tminclude -->$|\\{%\\s+end(autoescape|block|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim))",
   "name": "twig",
   "patterns": [
     {
@@ -234,9 +234,8 @@
       ]
     },
     {
-      "begin": "(?ix)   # Enable free spacing mode, case insensitive\n                        # Make sure our opening js tag has word boundaries\n                        (?<=\\{\\%\\sjs\\s\\%\\}|\\{\\%\\sincludejs\\s\\%\\})\n                    ",
-      "comment": "Add JS support to set tags that use the pattern \"css\" in their name",
-      "end": "(?ix)(?=\\{\\%\\sendjs\\s\\%\\}|\\{\\%\\sendincludejs\\s\\%\\})",
+      "begin": "(?i)(?<=\\{%\\s(?:js\\s%}|includejs\\s%}))",
+      "end": "(?i)(?=\\{%\\send(?:js\\s%}|includejs\\s%}))",
       "name": "source.js.embedded.twig",
       "patterns": [
         {
@@ -245,9 +244,8 @@
       ]
     },
     {
-      "begin": "(?ix)   # Enable free spacing mode, case insensitive\n                        (?<=\\{\\%\\scss\\s\\%\\}|\\{\\%\\sincludecss\\s\\%\\}|\\{\\%\\sincludehirescss\\s\\%\\})\n                        ",
-      "comment": "Add CSS support to set tags that use the pattern \"css\" in their name",
-      "end": "(?ix)(?=\\{\\%\\sendcss\\s\\%\\}|\\{\\%\\sendincludecss\\s\\%\\}|\\{\\%\\sendincludehirescss\\s\\%\\})",
+      "begin": "(?i)(?<=\\{%\\s(?:css\\s%}|includecss\\s%}|includehirescss\\s%}))",
+      "end": "(?i)(?=\\{%\\send(?:css\\s%}|includecss\\s%}|includehirescss\\s%}))",
       "name": "source.css.embedded.twig",
       "patterns": [
         {
@@ -256,9 +254,8 @@
       ]
     },
     {
-      "begin": "(?ix)   # Enable free spacing mode, case insensitive\n                        (?<=\\{\\%\\sscss\\s\\%\\}|\\{\\%\\sincludescss\\s\\%\\}|\\{\\%\\sincludehiresscss\\s\\%\\})\n                        ",
-      "comment": "Add SCSS support to set tags that use the pattern \"scss\" in their name",
-      "end": "(?ix)(?=\\{\\%\\sendscss\\s\\%\\}|\\{\\%\\sendincludescss\\s\\%\\}|\\{\\%\\sendincludehiresscss\\s\\%\\})",
+      "begin": "(?i)(?<=\\{%\\s(?:scss\\s%}|includescss\\s%}|includehiresscss\\s%}))",
+      "end": "(?i)(?=\\{%\\send(?:scss\\s%}|includescss\\s%}|includehiresscss\\s%}))",
       "name": "source.css.scss.embedded.twig",
       "patterns": [
         {
@@ -308,7 +305,7 @@
       ]
     },
     {
-      "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)",
+      "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|[qs]|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -408,7 +405,7 @@
               "name": "punctuation.definition.entity.html"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html"
         },
         {
@@ -427,7 +424,7 @@
       ]
     },
     "python": {
-      "begin": "(?:^\\s*)<\\?python(?!.*\\?>)",
+      "begin": "^\\s*<\\?python(?!.*\\?>)",
       "end": "\\?>(?:\\s*$\\n)?",
       "name": "source.python.embedded.html",
       "patterns": [
@@ -558,7 +555,7 @@
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?<='|\")",
+      "end": "(?<=['\"])",
       "name": "meta.attribute-with-value.id.html",
       "patterns": [
         {
@@ -631,13 +628,13 @@
       ]
     },
     "twig-arrays": {
-      "begin": "(?<=[\\s\\(\\{\\[:,])\\[",
+      "begin": "(?<=[\\s({\\[:,])\\[",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.twig"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.twig"
@@ -700,7 +697,7 @@
           "name": "punctuation.definition.comment.begin.twig"
         }
       },
-      "end": "-?#\\}",
+      "end": "-?#}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.twig"
@@ -711,11 +708,11 @@
     "twig-constants": {
       "patterns": [
         {
-          "match": "(?i)(?<=[\\s\\[\\(\\{:,])(?:true|false|null|none)(?=[\\s\\)\\]\\}\\,])",
+          "match": "(?i)(?<=[\\s\\[({:,])(?:true|false|null|none)(?=[\\s)\\]},])",
           "name": "constant.language.twig"
         },
         {
-          "match": "(?<=[\\s\\[\\(\\{:,]|\\.\\.|\\*\\*)[0-9]+(?:\\.[0-9]+)?(?=[\\s\\)\\]\\}\\,]|\\.\\.|\\*\\*)",
+          "match": "(?<=[\\s\\[({:,]|\\.\\.|\\*\\*)[0-9]+(?:\\.[0-9]+)?(?=[\\s)\\]},]|\\.\\.|\\*\\*)",
           "name": "constant.numeric.twig"
         }
       ]
@@ -726,7 +723,7 @@
           "name": "support.function.twig"
         }
       },
-      "match": "(?<=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)(abs|capitalize|e(?:scape)?|first|join|(?:json|url)_encode|keys|last|length|lower|nl2br|number_format|raw|reverse|round|sort|striptags|title|trim|upper)(?=[\\s\\|\\]\\}\\):,]|\\.\\.|\\*\\*)"
+      "match": "(?<=[a-zA-Z0-9_\\x7F-ÿ\\])'\"]\\||\\{%\\sfilter\\s)(abs|capitalize|e(?:scape)?|first|join|(?:json|url)_encode|keys|last|length|lower|nl2br|number_format|raw|reverse|round|sort|striptags|title|trim|upper)(?=[\\s|\\]}):,]|\\.\\.|\\*\\*)"
     },
     "twig-filters-ud": {
       "captures": {
@@ -734,10 +731,10 @@
           "name": "meta.function-call.other.twig"
         }
       },
-      "match": "(?<=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)"
+      "match": "(?<=[a-zA-Z0-9_\\x7F-ÿ\\])'\"]\\||\\{%\\sfilter\\s)([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)"
     },
     "twig-filters-warg": {
-      "begin": "(?<=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)(batch|convert_encoding|date|date_modify|default|e(?:scape)?|format|join|merge|number_format|replace|round|slice|split|trim)(\\()",
+      "begin": "(?<=[a-zA-Z0-9_\\x7F-ÿ\\])'\"]\\||\\{%\\sfilter\\s)(batch|convert_encoding|date|date_modify|default|e(?:scape)?|format|join|merge|number_format|replace|round|slice|split|trim)(\\()",
       "beginCaptures": {
         "1": {
           "name": "support.function.twig"
@@ -799,7 +796,7 @@
       ]
     },
     "twig-filters-warg-ud": {
-      "begin": "(?<=(?:[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)\\'\\\"]\\|)|\\{%\\sfilter\\s)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\()",
+      "begin": "(?<=[a-zA-Z0-9_\\x7F-ÿ\\])'\"]\\||\\{%\\sfilter\\s)([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)(\\()",
       "beginCaptures": {
         "1": {
           "name": "meta.function-call.other.twig"
@@ -866,7 +863,7 @@
       "match": "(?<=is\\s)(defined|empty|even|iterable|odd)"
     },
     "twig-functions-warg": {
-      "begin": "(?<=[\\s\\(\\[\\{:,])(attribute|block|constant|cycle|date|divisible by|dump|include|max|min|parent|random|range|same as|source|template_from_string)(\\()",
+      "begin": "(?<=[\\s(\\[{:,])(attribute|block|constant|cycle|date|divisible by|dump|include|max|min|parent|random|range|same as|source|template_from_string)(\\()",
       "beginCaptures": {
         "1": {
           "name": "support.function.twig"
@@ -922,13 +919,13 @@
       ]
     },
     "twig-hashes": {
-      "begin": "(?<=[\\s\\(\\{\\[:,])\\{",
+      "begin": "(?<=[\\s({\\[:,])\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.hash.begin.twig"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.hash.end.twig"
@@ -993,7 +990,7 @@
       "name": "keyword.control.twig"
     },
     "twig-macros": {
-      "begin": "(?<=[\\s\\(\\[\\{:,])([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(?:(\\.)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))?(\\()",
+      "begin": "(?<=[\\s(\\[{:,])([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)(?:(\\.)([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*))?(\\()",
       "beginCaptures": {
         "1": {
           "name": "meta.function-call.twig"
@@ -1066,7 +1063,7 @@
           "name": "variable.other.twig"
         }
       },
-      "match": "(?<=[\\s\\{\\[\\(:,])([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(?=[\\s\\}\\[\\]\\(\\)\\.\\|,:])"
+      "match": "(?<=[\\s{\\[(:,])([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)(?=[\\s}\\[\\]().|,:])"
     },
     "twig-operators": {
       "patterns": [
@@ -1076,7 +1073,7 @@
               "name": "keyword.operator.arithmetic.twig"
             }
           },
-          "match": "(?<=\\s)(\\+|-|//?|%|\\*\\*?)(?=\\s)"
+          "match": "(?<=\\s)([+-]|//?|%|\\*\\*?)(?=\\s)"
         },
         {
           "captures": {
@@ -1084,7 +1081,7 @@
               "name": "keyword.operator.assignment.twig"
             }
           },
-          "match": "(?<=\\s)(=|~)(?=\\s)"
+          "match": "(?<=\\s)([=~])(?=\\s)"
         },
         {
           "captures": {
@@ -1100,7 +1097,7 @@
               "name": "keyword.operator.comparison.twig"
             }
           },
-          "match": "(?<=\\s)((?:!|=)=|<=?|>=?|(?:not )?in|is(?: not)?|(?:ends|starts) with|matches)(?=\\s)"
+          "match": "(?<=\\s)([!=]=|<=?|>=?|(?:not )?in|is(?: not)?|(?:ends|starts) with|matches)(?=\\s)"
         },
         {
           "captures": {
@@ -1108,7 +1105,7 @@
               "name": "keyword.operator.logical.twig"
             }
           },
-          "match": "(?<=\\s)(\\?|:|\\?:|\\?\\?|and|not|or)(?=\\s)"
+          "match": "(?<=\\s)([?:]|\\?:|\\?\\?|and|not|or)(?=\\s)"
         },
         {
           "captures": {
@@ -1116,7 +1113,7 @@
               "name": "keyword.operator.other.twig"
             }
           },
-          "match": "(?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\)'\"])\\.\\.(?=[a-zA-Z0-9_\\x{7f}-\\x{ff}'\"])"
+          "match": "(?<=[a-zA-Z0-9_\\x7F-ÿ\\])'\"])\\.\\.(?=[a-zA-Z0-9_\\x7F-ÿ'\"])"
         },
         {
           "captures": {
@@ -1124,7 +1121,7 @@
               "name": "keyword.operator.other.twig"
             }
           },
-          "match": "(?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]\\}\\)'\"])\\|(?=[a-zA-Z_\\x{7f}-\\x{ff}])"
+          "match": "(?<=[a-zA-Z0-9_\\x7F-ÿ\\]})'\"])\\|(?=[a-zA-Z_\\x7F-ÿ])"
         }
       ]
     },
@@ -1135,7 +1132,7 @@
           "name": "punctuation.section.tag.twig"
         }
       },
-      "end": "-?\\}\\}",
+      "end": "-?}}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.tag.twig"
@@ -1198,10 +1195,10 @@
               "name": "variable.other.property.twig"
             }
           },
-          "match": "(?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}])(\\.)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(?=[\\.\\s\\|\\[\\)\\]\\}:,])"
+          "match": "(?<=[a-zA-Z0-9_\\x7F-ÿ])(\\.)([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)(?=[.\\s|\\[)\\]}:,])"
         },
         {
-          "begin": "(?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}])(\\.)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\()",
+          "begin": "(?<=[a-zA-Z0-9_\\x7F-ÿ])(\\.)([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.property.twig"
@@ -1289,7 +1286,7 @@
               "name": "punctuation.section.array.end.twig"
             }
           },
-          "match": "(?<=[a-zA-Z0-9_\\x{7f}-\\x{ff}\\]])(?:(\\[)('[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*')(\\])|(\\[)(\"[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*\")(\\])|(\\[)([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\]))"
+          "match": "(?<=[a-zA-Z0-9_\\x7F-ÿ\\]])(?:(\\[)('[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*')(])|(\\[)(\"[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*\")(])|(\\[)([a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*)(]))"
         }
       ]
     },
@@ -1300,7 +1297,7 @@
           "name": "punctuation.section.tag.twig"
         }
       },
-      "end": "-?%\\}",
+      "end": "-?%}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.tag.twig"
diff --git a/resources/languages/typescript.json b/resources/languages/typescript.json
index 512979e..747bfbd 100644
--- a/resources/languages/typescript.json
+++ b/resources/languages/typescript.json
@@ -18,13 +18,13 @@
       "name": "storage.modifier.ts"
     },
     "after-operator-block-as-object-literal": {
-      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+      "begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!>]|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^yield|[^._$[:alnum:]]yield|^throw|[^._$[:alnum:]]throw|^in|[^._$[:alnum:]]in|^of|[^._$[:alnum:]]of|^typeof|[^._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -47,7 +47,7 @@
           "name": "punctuation.definition.binding-pattern.array.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.ts"
@@ -72,7 +72,7 @@
           "name": "punctuation.definition.binding-pattern.array.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.ts"
@@ -94,7 +94,7 @@
           "name": "meta.brace.square.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.ts"
@@ -125,13 +125,13 @@
           "name": "meta.arrow.ts"
         },
         {
-          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))",
+          "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?((?<![})!\\]])\\s*(?=((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.ts"
             }
           },
-          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+          "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
           "name": "meta.arrow.ts",
           "patterns": [
             {
@@ -158,7 +158,7 @@
               "name": "storage.type.function.arrow.ts"
             }
           },
-          "end": "((?<=\\}|\\S)(?<!=>)|((?!\\{)(?=\\S)))(?!\\/[\\/\\*])",
+          "end": "((?<=[}\\S])(?<!=>)|((?!\\{)(?=\\S)))(?!/[/*])",
           "name": "meta.arrow.ts",
           "patterns": [
             {
@@ -181,7 +181,7 @@
           "name": "keyword.operator.type.annotation.ts"
         }
       },
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "name": "meta.return.type.arrow.ts",
       "patterns": [
         {
@@ -192,8 +192,8 @@
     "arrow-return-type-body": {
       "patterns": [
         {
-          "begin": "(?<=[:])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=:)(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -283,7 +283,7 @@
     "brackets": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}|(?=\\*/)",
           "patterns": [
             {
@@ -293,7 +293,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]|(?=\\*/)",
+          "end": "]|(?=\\*/)",
           "patterns": [
             {
               "include": "#brackets"
@@ -320,13 +320,13 @@
           "name": "cast.expr.ts"
         },
         {
-          "begin": "(?:(?<!\\+\\+|--)(?<=^return|[^\\._$[:alnum:]]return|^throw|[^\\._$[:alnum:]]throw|^yield|[^\\._$[:alnum:]]yield|^await|[^\\._$[:alnum:]]await|^default|[^\\._$[:alnum:]]default|[=(,:>*?\\&\\|\\^]|[^_$[:alnum:]](?:\\+\\+|\\-\\-)|[^\\+]\\+|[^\\-]\\-))\\s*(<)(?!<?\\=)(?!\\s*$)",
+          "begin": "(?<!\\+\\+|--)(?<=^return|[^._$[:alnum:]]return|^throw|[^._$[:alnum:]]throw|^yield|[^._$[:alnum:]]yield|^await|[^._$[:alnum:]]await|^default|[^._$[:alnum:]]default|[=(,:>*?\\&|^]|[^_$[:alnum:]](?:\\+\\+|--)|[^+]\\+|[^-]-)\\s*(<)(?!<?=)(?!\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "meta.brace.angle.ts"
             }
           },
-          "end": "(\\>)",
+          "end": "(>)",
           "endCaptures": {
             "1": {
               "name": "meta.brace.angle.ts"
@@ -340,13 +340,13 @@
           ]
         },
         {
-          "begin": "(?:(?<=^))\\s*(<)(?=[_$[:alpha:]][_$[:alnum:]]*\\s*>)",
+          "begin": "(?<=^)\\s*(<)(?=[_$[:alpha:]][_$[:alnum:]]*\\s*>)",
           "beginCaptures": {
             "1": {
               "name": "meta.brace.angle.ts"
             }
           },
-          "end": "(\\>)",
+          "end": "(>)",
           "endCaptures": {
             "1": {
               "name": "meta.brace.angle.ts"
@@ -377,7 +377,7 @@
           "name": "storage.type.class.ts"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.ts",
       "patterns": [
         {
@@ -410,7 +410,7 @@
       ]
     },
     "class-expression": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|\\/[\\/*])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(class)\\b(?=\\s+|[<{]|/[/*])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ts"
@@ -419,7 +419,7 @@
           "name": "storage.type.class.ts"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.class.ts",
       "patterns": [
         {
@@ -434,7 +434,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -449,7 +449,7 @@
         },
         {
           "begin": "(?<=:)\\s*",
-          "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[\\s;),}\\]:\\-+]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -501,7 +501,7 @@
       ]
     },
     "class-or-interface-heritage": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(extends|implements)\\b)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\b(extends|implements)\\b(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ts"
@@ -533,7 +533,7 @@
               "name": "punctuation.accessor.optional.ts"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\??\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)"
         },
         {
           "captures": {
@@ -649,7 +649,7 @@
               "name": "keyword.control.flow.ts"
             }
           },
-          "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[;}]|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#expression"
@@ -688,7 +688,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -743,7 +743,7 @@
       ]
     },
     "decorator": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\@",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))@",
       "beginCaptures": {
         "0": {
           "name": "punctuation.decorator.ts"
@@ -760,7 +760,7 @@
     "destructuring-const": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.ts",
           "patterns": [
@@ -776,7 +776,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.ts",
           "patterns": [
@@ -796,7 +796,7 @@
     "destructuring-parameter": {
       "patterns": [
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.ts"
@@ -805,7 +805,7 @@
               "name": "punctuation.definition.binding-pattern.object.ts"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.object.ts"
@@ -819,7 +819,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:)\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
+          "begin": "(?<![=:])\\s*(?:(\\.\\.\\.)\\s*)?(\\[)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.rest.ts"
@@ -828,7 +828,7 @@
               "name": "punctuation.definition.binding-pattern.array.ts"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.binding-pattern.array.ts"
@@ -860,7 +860,7 @@
     "destructuring-variable": {
       "patterns": [
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\{)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\{)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.object-binding-pattern-variable.ts",
           "patterns": [
@@ -876,7 +876,7 @@
           ]
         },
         {
-          "begin": "(?<!=|:|^of|[^\\._$[:alnum:]]of|^in|[^\\._$[:alnum:]]in)\\s*(?=\\[)",
+          "begin": "(?<![=:]|^of|[^._$[:alnum:]]of|^in|[^._$[:alnum:]]in)\\s*(?=\\[)",
           "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))",
           "name": "meta.array-binding-pattern-variable.ts",
           "patterns": [
@@ -916,7 +916,7 @@
       "match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)"
     },
     "directives": {
-      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)",
+      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))+\\s*/>\\s*$)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.ts"
@@ -972,7 +972,7 @@
               "name": "constant.language.access-type.jsdoc"
             }
           },
-          "match": "((@)(?:access|api))\\s+(private|protected|public)\\b"
+          "match": "((@)a(?:ccess|pi))\\s+(p(?:rivate|rotected|ublic))\\b"
         },
         {
           "captures": {
@@ -1099,7 +1099,7 @@
               "name": "entity.name.type.instance.jsdoc"
             }
           },
-          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*\\])?{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
+          "match": "((@)see)\\s+(?:((?=https?://)(?:[^\\s*]|\\*[^/])+)|((?!https?://|(?:\\[[^\\[\\]]*])?\\{@(?:link|linkcode|linkplain|tutorial)\\b)(?:[^@\\s*/]|\\*[^/])+))"
         },
         {
           "captures": {
@@ -1116,7 +1116,7 @@
           "match": "((@)template)\\s+([A-Za-z_$][\\w$.\\[\\]]*(?:\\s*,\\s*[A-Za-z_$][\\w$.\\[\\]]*)*)"
         },
         {
-          "begin": "((@)template)\\s+(?={)",
+          "begin": "((@)template)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1151,7 +1151,7 @@
           "match": "((@)(?:arg|argument|const|constant|member|namespace|param|var))\\s+([A-Za-z_$][\\w$.\\[\\]]*)"
         },
         {
-          "begin": "((@)typedef)\\s+(?={)",
+          "begin": "((@)typedef)\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1172,7 +1172,7 @@
           ]
         },
         {
-          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?={)",
+          "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1208,13 +1208,13 @@
                   "name": "invalid.illegal.syntax.jsdoc"
                 }
               },
-              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[\\])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:(?:\\*(?!/))|(?:\\\\(?!\"))|[^*\\\\])*?\"|'(?:(?:\\*(?!/))|(?:\\\\(?!'))|[^*\\\\])*?'|\\[(?:(?:\\*(?!/))|[^*])*?\\]|(?:(?:\\*(?!/))|\\s(?!\\s*\\])|\\[.*?(?:\\]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(\\])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
+              "match": "(\\[)\\s*[\\w$]+(?:(?:\\[])?\\.[\\w$]+)*(?:\\s*(=)\\s*((?>\"(?:\\*(?!/)|\\\\(?!\")|[^*\\\\])*?\"|'(?:\\*(?!/)|\\\\(?!')|[^*\\\\])*?'|\\[(?:\\*(?!/)|[^*])*?]|(?:\\*(?!/)|\\s(?!\\s*])|\\[.*?(?:]|(?=\\*/))|[^*\\s\\[\\]])*)*))?\\s*(?:(])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
               "name": "variable.other.jsdoc"
             }
           ]
         },
         {
-          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?={)",
+          "begin": "((@)(?:define|enum|exception|export|extends|lends|implements|modifies|namespace|private|protected|returns?|satisfies|suppress|this|throws|type|yields?))\\s+(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1245,7 +1245,7 @@
           "match": "((@)(?:alias|augments|callback|constructs|emits|event|fires|exports?|extends|external|function|func|host|lends|listens|interface|memberof!?|method|module|mixes|mixin|name|requires|see|this|typedef|uses))\\s+((?:[^{}@\\s*]|\\*[^/])+)"
         },
         {
-          "begin": "((@)(?:default(?:value)?|license|version))\\s+(([''\"]))",
+          "begin": "((@)(?:default(?:value)?|license|version))\\s+((['\"]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.jsdoc"
@@ -1306,7 +1306,7 @@
               "name": "punctuation.definition.block.tag.jsdoc"
             }
           },
-          "match": "((@)(?:[_$[:alpha:]][_$[:alnum:]]*))(?=\\s+)"
+          "match": "((@)[_$[:alpha:]][_$[:alnum:]]*)(?=\\s+)"
         }
       ]
     },
@@ -1329,7 +1329,7 @@
           "name": "entity.name.type.enum.ts"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.enum.declaration.ts",
       "patterns": [
         {
@@ -1342,7 +1342,7 @@
               "name": "punctuation.definition.block.ts"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.block.ts"
@@ -1359,7 +1359,7 @@
                   "name": "variable.other.enummember.ts"
                 }
               },
-              "end": "(?=,|\\}|$)",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#comment"
@@ -1370,8 +1370,8 @@
               ]
             },
             {
-              "begin": "(?=((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\])))",
-              "end": "(?=,|\\}|$)",
+              "begin": "(?=(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+])))",
+              "end": "(?=[,}]|$)",
               "patterns": [
                 {
                   "include": "#string"
@@ -1414,7 +1414,7 @@
           "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)\\s+(as)\\s+(namespace)\\s+([_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:(?:\\s*(=))|(?:\\s+(default)(?=\\s+)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?(?:\\s*(=)|\\s+(default)(?=\\s+))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.ts"
@@ -1429,7 +1429,7 @@
               "name": "keyword.control.default.ts"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.default.ts",
           "patterns": [
             {
@@ -1441,7 +1441,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*([\\s,]))(?!\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.ts"
@@ -1450,7 +1450,7 @@
               "name": "keyword.control.type.ts"
             }
           },
-          "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "name": "meta.export.ts",
           "patterns": [
             {
@@ -1516,7 +1516,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -1536,7 +1536,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*[:,]|$)"
         },
         {
           "include": "#type-annotation"
@@ -1563,7 +1563,7 @@
           "name": "keyword.control.flow.ts"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*\\*)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(yield)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))(?=\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*\\*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.flow.ts"
@@ -1640,7 +1640,7 @@
               "name": "keyword.control.satisfies.ts"
             }
           },
-          "end": "(?=^|[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+\\<))",
+          "end": "(?=^|[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+<))",
           "patterns": [
             {
               "include": "#type"
@@ -1652,11 +1652,11 @@
           "name": "keyword.operator.spread.ts"
         },
         {
-          "match": "\\*=|(?<!\\()/=|%=|\\+=|\\-=",
+          "match": "\\*=|(?<!\\()/=|%=|\\+=|-=",
           "name": "keyword.operator.assignment.compound.ts"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>=|>>>=|\\|=",
+          "match": "&=|\\^=|<<=|>>=|>>>=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.ts"
         },
         {
@@ -1664,11 +1664,11 @@
           "name": "keyword.operator.bitwise.shift.ts"
         },
         {
-          "match": "===|!==|==|!=",
+          "match": "(?:==|!=)(?:=|)",
           "name": "keyword.operator.comparison.ts"
         },
         {
-          "match": "<=|>=|<>|<|>",
+          "match": "<=|>=|<>|[<>]",
           "name": "keyword.operator.relational.ts"
         },
         {
@@ -1683,18 +1683,18 @@
               "name": "keyword.operator.arithmetic.ts"
             }
           },
-          "match": "(?<=[_$[:alnum:]])(\\!)\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:]])(!)\\s*(?:(/=)|(/)(?![/*]))"
         },
         {
-          "match": "\\!|&&|\\|\\||\\?\\?",
+          "match": "!|&&|\\|\\||\\?\\?",
           "name": "keyword.operator.logical.ts"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.ts"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.ts"
         },
         {
@@ -1706,12 +1706,12 @@
           "name": "keyword.operator.increment.ts"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.ts"
         },
         {
-          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(?:(/=)|(?:(/)(?![/*]))))",
-          "end": "(?:(/=)|(?:(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)))",
+          "begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)+(?:(/=)|(/)(?![/*])))",
+          "end": "(?:(/=)|(/)(?!\\*([^*]|(\\*[^/]))*\\*/))",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.assignment.compound.ts"
@@ -1735,7 +1735,7 @@
               "name": "keyword.operator.arithmetic.ts"
             }
           },
-          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:])\\]])\\s*(?:(/=)|(/)(?![/*]))"
         }
       ]
     },
@@ -1805,13 +1805,13 @@
       ]
     },
     "field-declaration": {
-      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|\\}|$))",
+      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,}]|$))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ts"
         }
       },
-      "end": "(?=\\}|;|,|$|(^(?!\\s*((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|(\\#?[_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(?:(?:(\\?)|(\\!))\\s*)?(=|:|;|,|$))))|(?<=\\})",
+      "end": "(?=[};,]|$|(^(?!\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,]|$))))|(?<=})",
       "name": "meta.field.declaration.ts",
       "patterns": [
         {
@@ -1844,10 +1844,10 @@
               "name": "keyword.operator.definiteassignment.ts"
             }
           },
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(!))?(?=\\s*\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
-          "match": "\\#?[_$[:alpha:]][_$[:alnum:]]*",
+          "match": "#?[_$[:alpha:]][_$[:alnum:]]*",
           "name": "meta.definition.property.ts variable.object.property.ts"
         },
         {
@@ -1855,13 +1855,13 @@
           "name": "keyword.operator.optional.ts"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "keyword.operator.definiteassignment.ts"
         }
       ]
     },
     "for-loop": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*))await)?\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)?(\\())",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))for(?=((\\s+|(\\s*/\\*([^*]|(\\*[^/]))*\\*/\\s*))await)?\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)?(\\())",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.loop.ts"
@@ -1932,12 +1932,12 @@
     "function-call": {
       "patterns": [
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
-          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
+          "end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=\\s*(?:(\\?\\.\\s*)|(!))?((<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?\\())",
               "name": "meta.function-call.ts",
               "patterns": [
                 {
@@ -1960,12 +1960,12 @@
           ]
         },
         {
-          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
-          "end": "(?<=\\>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))(<\\s*[\\{\\[\\(]\\s*$))",
+          "begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
+          "end": "(?<=>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=\\)))(<\\s*[{\\[(]\\s*$))",
           "patterns": [
             {
-              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*[\\{\\[\\(]\\s*$))",
+              "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*))",
+              "end": "(?=(<\\s*[{\\[(]\\s*$))",
               "name": "meta.function-call.ts",
               "patterns": [
                 {
@@ -1993,7 +1993,7 @@
           "name": "meta.function-call.ts punctuation.accessor.optional.ts"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "meta.function-call.ts keyword.operator.definiteassignment.ts"
         }
       ]
@@ -2004,7 +2004,7 @@
           "include": "#support-function-call-identifiers"
         },
         {
-          "match": "(\\#?[_$[:alpha:]][_$[:alnum:]]*)",
+          "match": "(#?[_$[:alpha:]][_$[:alnum:]]*)",
           "name": "entity.name.function.ts"
         }
       ]
@@ -2031,7 +2031,7 @@
           "name": "meta.definition.function.ts entity.name.function.ts"
         }
       },
-      "end": "(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|(?<=\\})",
+      "end": "(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|(?<=})",
       "name": "meta.function.ts",
       "patterns": [
         {
@@ -2058,7 +2058,7 @@
           "name": "meta.definition.function.ts entity.name.function.ts"
         }
       },
-      "end": "(?=;)|(?<=\\})",
+      "end": "(?=;)|(?<=})",
       "name": "meta.function.expression.ts",
       "patterns": [
         {
@@ -2142,7 +2142,7 @@
               "name": "entity.name.function.ts"
             }
           },
-          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))"
+          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))"
         },
         {
           "captures": {
@@ -2156,7 +2156,7 @@
               "name": "variable.other.constant.property.ts"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])"
         },
         {
           "captures": {
@@ -2170,10 +2170,10 @@
               "name": "variable.other.property.ts"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+          "match": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])",
           "name": "variable.other.constant.ts"
         },
         {
@@ -2185,8 +2185,8 @@
     "if-statement": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
-          "end": "(?=;|$|\\})",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))\\s*(?!\\{))",
+          "end": "(?=;|$|})",
           "patterns": [
             {
               "include": "#comment"
@@ -2214,7 +2214,7 @@
               ]
             },
             {
-              "begin": "(?<=\\))\\s*\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+              "begin": "(?<=\\))\\s*/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.ts"
@@ -2244,7 +2244,7 @@
       ]
     },
     "import-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:\\(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(import)(?:\\s+(type)(?!\\s+from))?(?!\\s*[:(])(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.ts"
@@ -2259,7 +2259,7 @@
           "name": "keyword.control.type.ts"
         }
       },
-      "end": "(?<!^import|[^\\._$[:alnum:]]import)(?=;|$|^)",
+      "end": "(?<!^import|[^._$[:alnum:]]import)(?=;|$|^)",
       "name": "meta.import.ts",
       "patterns": [
         {
@@ -2272,7 +2272,7 @@
           "include": "#string"
         },
         {
-          "begin": "(?<=^import|[^\\._$[:alnum:]]import)(?!\\s*[\"'])",
+          "begin": "(?<=^import|[^._$[:alnum:]]import)(?!\\s*[\"'])",
           "end": "\\bfrom\\b",
           "endCaptures": {
             "0": {
@@ -2379,7 +2379,7 @@
                   "name": "punctuation.accessor.optional.ts"
                 }
               },
-              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
             },
             {
               "match": "([_$[:alpha:]][_$[:alnum:]]*)",
@@ -2402,7 +2402,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -2416,7 +2416,7 @@
           "include": "#string"
         },
         {
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object-literal.key.ts"
         },
         {
@@ -2432,7 +2432,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -2480,7 +2480,7 @@
               "name": "string.quoted.alias.ts"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         },
         {
           "include": "#punctuation-comma"
@@ -2505,7 +2505,7 @@
               "name": "string.quoted.alias.ts"
             }
           },
-          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))"
+          "match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|(('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)))"
         }
       ]
     },
@@ -2545,7 +2545,7 @@
           "name": "variable.parameter.ts"
         }
       },
-      "end": "(\\])\\s*(\\?\\s*)?|$",
+      "end": "(])\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.ts"
@@ -2580,7 +2580,7 @@
           "name": "keyword.operator.expression.in.ts"
         }
       },
-      "end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
+      "end": "(])([+-])?\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.ts"
@@ -2618,11 +2618,11 @@
               "name": "punctuation.definition.bracket.square.end.jsdoc"
             }
           },
-          "match": "(\\[)[^\\]]+(\\])(?={@(?:link|linkcode|linkplain|tutorial))",
+          "match": "(\\[)[^\\]]+(])(?=\\{@(?:link|linkcode|linkplain|tutorial))",
           "name": "constant.other.description.jsdoc"
         },
         {
-          "begin": "({)((@)(?:link(?:code|plain)?|tutorial))\\s*",
+          "begin": "(\\{)((@)(?:link(?:code|plain)?|tutorial))\\s*",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.bracket.curly.begin.jsdoc"
@@ -2651,7 +2651,7 @@
                   "name": "punctuation.separator.pipe.jsdoc"
                 }
               },
-              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*[/])+)(\\|)?"
+              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*/)+)(\\|)?"
             },
             {
               "captures": {
@@ -2675,7 +2675,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"
@@ -2698,7 +2698,7 @@
           "name": "storage.type.interface.ts"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.interface.ts",
       "patterns": [
         {
@@ -2726,7 +2726,7 @@
     "jsdoctype": {
       "patterns": [
         {
-          "begin": "\\G({)",
+          "begin": "\\G(\\{)",
           "beginCaptures": {
             "0": {
               "name": "entity.name.type.instance.jsdoc"
@@ -2765,7 +2765,7 @@
               "name": "punctuation.separator.label.ts"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#decl-block"
@@ -2816,7 +2816,7 @@
     "method-declaration": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?\\s*\\b(constructor)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.ts"
@@ -2834,7 +2834,7 @@
               "name": "storage.type.ts"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.ts",
           "patterns": [
             {
@@ -2846,7 +2846,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.ts"
@@ -2867,7 +2867,7 @@
               "name": "keyword.generator.asterisk.ts"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.ts",
           "patterns": [
             {
@@ -2879,7 +2879,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.ts"
@@ -2900,7 +2900,7 @@
               "name": "keyword.generator.asterisk.ts"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "name": "meta.method.declaration.ts",
           "patterns": [
             {
@@ -2914,8 +2914,8 @@
       ]
     },
     "method-declaration-name": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??)\\s*[\\(\\<])",
-      "end": "(?=\\(|\\<)",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??)\\s*[(<])",
+      "end": "(?=[(<])",
       "patterns": [
         {
           "include": "#string"
@@ -2937,7 +2937,7 @@
       ]
     },
     "namespace-declaration": {
-      "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`]))",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.ts"
@@ -2949,7 +2949,7 @@
           "name": "storage.type.namespace.ts"
         }
       },
-      "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?<=})|(?=;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.namespace.declaration.ts",
       "patterns": [
         {
@@ -2977,7 +2977,7 @@
           "name": "keyword.operator.new.ts"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*\\())))",
       "name": "new.expr.ts",
       "patterns": [
         {
@@ -2997,7 +2997,7 @@
               "name": "storage.type.numeric.bigint.ts"
             }
           },
-          "match": "\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.hex.ts"
         },
         {
@@ -3006,7 +3006,7 @@
               "name": "storage.type.numeric.bigint.ts"
             }
           },
-          "match": "\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.binary.ts"
         },
         {
@@ -3015,7 +3015,7 @@
               "name": "storage.type.numeric.bigint.ts"
             }
           },
-          "match": "\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$)",
           "name": "constant.numeric.octal.ts"
         },
         {
@@ -3066,7 +3066,7 @@
               "name": "storage.type.numeric.bigint.ts"
             }
           },
-          "match": "(?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)"
+          "match": "(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)"
         }
       ]
     },
@@ -3088,8 +3088,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3119,8 +3119,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3145,7 +3145,7 @@
       ]
     },
     "object-binding-element-propertyName": {
-      "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
       "end": "(:)",
       "endCaptures": {
         "0": {
@@ -3178,7 +3178,7 @@
           "name": "punctuation.definition.binding-pattern.object.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.ts"
@@ -3200,7 +3200,7 @@
           "name": "punctuation.definition.binding-pattern.object.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.ts"
@@ -3233,7 +3233,7 @@
               "name": "variable.other.object.property.ts"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(\\#?[[:upper:]][_$[:digit:][:upper:]]*)|(\\#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(#?\\p{upper}[_$\\d[:upper:]]*)|(#?[_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
           "captures": {
@@ -3244,7 +3244,7 @@
               "name": "variable.other.object.ts"
             }
           },
-          "match": "(?:([[:upper:]][_$[:digit:][:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*)"
+          "match": "(?:(\\p{upper}[_$\\d[:upper:]]*)|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s*\\??\\.\\s*#?[_$[:alpha:]][_$[:alnum:]]*)"
         }
       ]
     },
@@ -3255,7 +3255,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -3269,7 +3269,7 @@
       ]
     },
     "object-literal-method-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.async.ts"
@@ -3281,7 +3281,7 @@
           "name": "keyword.generator.asterisk.ts"
         }
       },
-      "end": "(?=\\}|;|,)|(?<=\\})",
+      "end": "(?=[};,])|(?<=})",
       "name": "meta.method.declaration.ts",
       "patterns": [
         {
@@ -3291,7 +3291,7 @@
           "include": "#function-body"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.ts"
@@ -3303,7 +3303,7 @@
               "name": "keyword.generator.asterisk.ts"
             }
           },
-          "end": "(?=\\(|\\<)",
+          "end": "(?=[(<])",
           "patterns": [
             {
               "include": "#method-declaration-name"
@@ -3322,7 +3322,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?=:)|((?<=[\\]])(?=\\s*[\\(\\<]))",
+          "end": "(?=:)|((?<=])(?=\\s*[(<]))",
           "name": "meta.object.member.ts meta.object-literal.key.ts",
           "patterns": [
             {
@@ -3334,8 +3334,8 @@
           ]
         },
         {
-          "begin": "(?=[\\'\\\"\\`])",
-          "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\s+(as|satisifies)\\s+))))",
+          "begin": "(?=['\"`])",
+          "end": "(?=:)|((?<=['\"`])(?=((\\s*[(<,}])|(\\s+(as|satisifies)\\s+))))",
           "name": "meta.object.member.ts meta.object-literal.key.ts",
           "patterns": [
             {
@@ -3347,8 +3347,8 @@
           ]
         },
         {
-          "begin": "(?=(\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)))",
-          "end": "(?=:)|(?=\\s*([\\(\\<,}])|(\\s+as|satisifies\\s+))",
+          "begin": "(?=(\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)))",
+          "end": "(?=:)|(?=\\s*([(<,}])|(\\s+as|satisifies\\s+))",
           "name": "meta.object.member.ts meta.object-literal.key.ts",
           "patterns": [
             {
@@ -3360,8 +3360,8 @@
           ]
         },
         {
-          "begin": "(?<=[\\]\\'\\\"\\`])(?=\\s*[\\(\\<])",
-          "end": "(?=\\}|;|,)|(?<=\\})",
+          "begin": "(?<=[\\]'\"`])(?=\\s*[(<])",
+          "end": "(?=[};,])|(?<=})",
           "name": "meta.method.declaration.ts",
           "patterns": [
             {
@@ -3378,7 +3378,7 @@
               "name": "constant.numeric.decimal.ts"
             }
           },
-          "match": "(?![_$[:alpha:]])([[:digit:]]+)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "(?![_$[:alpha:]])(\\d+)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.ts"
         },
         {
@@ -3390,7 +3390,7 @@
               "name": "entity.name.function.ts"
             }
           },
-          "match": "(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:(\\s*/\\*([^*]|(\\*[^/]))*\\*/)*\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))",
           "name": "meta.object.member.ts"
         },
         {
@@ -3399,7 +3399,7 @@
               "name": "meta.object-literal.key.ts"
             }
           },
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*\\s*(?=(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*:)",
           "name": "meta.object.member.ts"
         },
         {
@@ -3409,7 +3409,7 @@
               "name": "keyword.operator.spread.ts"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.ts",
           "patterns": [
             {
@@ -3423,7 +3423,7 @@
               "name": "variable.other.readwrite.ts"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.ts"
         },
         {
@@ -3448,7 +3448,7 @@
               "name": "keyword.control.satisfies.ts"
             }
           },
-          "end": "(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
+          "end": "(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+))",
           "name": "meta.object.member.ts",
           "patterns": [
             {
@@ -3458,7 +3458,7 @@
         },
         {
           "begin": "(?=[_$[:alpha:]][_$[:alnum:]]*\\s*=)",
-          "end": "(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "end": "(?=[,}]|$|//|/\\*)",
           "name": "meta.object.member.ts",
           "patterns": [
             {
@@ -3473,11 +3473,11 @@
               "name": "meta.object-literal.key.ts punctuation.separator.key-value.ts"
             }
           },
-          "end": "(?=,|\\})",
+          "end": "(?=[,}])",
           "name": "meta.object.member.ts",
           "patterns": [
             {
-              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.ts"
@@ -3510,7 +3510,7 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.ts"
@@ -3532,13 +3532,13 @@
               ]
             },
             {
-              "begin": "(?<=:)\\s*(async)?\\s*(?=\\<\\s*$)",
+              "begin": "(?<=:)\\s*(async)?\\s*(?=<\\s*$)",
               "beginCaptures": {
                 "1": {
                   "name": "storage.modifier.async.ts"
                 }
               },
-              "end": "(?<=\\>)",
+              "end": "(?<=>)",
               "patterns": [
                 {
                   "include": "#type-parameters"
@@ -3546,7 +3546,7 @@
               ]
             },
             {
-              "begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+              "begin": "(?<=>)\\s*(\\()(?=\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
               "beginCaptures": {
                 "1": {
                   "name": "meta.brace.round.ts"
@@ -3590,7 +3590,7 @@
           "name": "punctuation.definition.binding-pattern.array.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.array.ts"
@@ -3661,7 +3661,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))"
         },
         {
           "captures": {
@@ -3681,7 +3681,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(override|public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
         }
       ]
     },
@@ -3691,8 +3691,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
-          "end": "(?=,|\\})",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#object-binding-element-propertyName"
@@ -3729,7 +3729,7 @@
           "name": "punctuation.definition.binding-pattern.object.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.binding-pattern.object.ts"
@@ -3782,7 +3782,7 @@
     "paren-expression-possibly-arrow": {
       "patterns": [
         {
-          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+          "begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.ts"
@@ -3796,7 +3796,7 @@
           ]
         },
         {
-          "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)",
+          "begin": "(?<=[(=,]|=>|^return|[^._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()|(<)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)))\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.ts"
@@ -3841,14 +3841,14 @@
       ]
     },
     "possibly-arrow-return-type": {
-      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+      "begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*=>)",
       "beginCaptures": {
         "1": {
           "name": "meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts"
         }
       },
       "contentName": "meta.arrow.ts meta.return.type.arrow.ts",
-      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+      "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
       "patterns": [
         {
           "include": "#arrow-return-type-body"
@@ -3868,7 +3868,7 @@
           "name": "punctuation.accessor.optional.ts"
         }
       },
-      "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+      "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
     },
     "punctuation-comma": {
       "match": ",",
@@ -3885,7 +3885,7 @@
           "name": "punctuation.definition.string.begin.ts"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.ts"
@@ -3908,7 +3908,7 @@
           "name": "punctuation.definition.string.begin.ts"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.ts"
@@ -3927,7 +3927,7 @@
     "regex": {
       "patterns": [
         {
-          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[\\()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\]|\\(([^\\)\\\\]|\\\\.)+\\))+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case|=>|&&|\\|\\||\\*/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+]|\\(([^)\\\\]|\\\\.)+\\))+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.ts"
@@ -3950,7 +3950,7 @@
           ]
         },
         {
-          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*\\/)|((?<=^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case))\\s*)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*/)|((?<=^return|[^._$[:alnum:]]return|^case|[^._$[:alnum:]]case))\\s*)/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*])+/([dgimsuvy]+|(?![/*])|(?=/\\*))(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ts"
@@ -3981,7 +3981,7 @@
           "name": "constant.other.character-class.regexp"
         },
         {
-          "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})",
+          "match": "\\\\([0-7]{3}|x\\h{2}|u\\h{4})",
           "name": "constant.character.numeric.regexp"
         },
         {
@@ -3997,7 +3997,7 @@
     "regexp": {
       "patterns": [
         {
-          "match": "\\\\[bB]|\\^|\\$",
+          "match": "\\\\[bB]|[\\^$]",
           "name": "keyword.control.anchor.regexp"
         },
         {
@@ -4009,10 +4009,10 @@
               "name": "variable.other.regexp"
             }
           },
-          "match": "\\\\[1-9]\\d*|\\\\k<([a-zA-Z_$][\\w$]*)>"
+          "match": "\\\\(?:[1-9]\\d*|k<([a-zA-Z_$][\\w$]*)>)"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)}\\??",
           "name": "keyword.operator.quantifier.regexp"
         },
         {
@@ -4055,7 +4055,7 @@
           ]
         },
         {
-          "begin": "\\((?:(\\?:)|(?:\\?<([a-zA-Z_$][\\w$]*)>))?",
+          "begin": "\\((?:(\\?:)|\\?<([a-zA-Z_$][\\w$]*)>)?",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.regexp"
@@ -4090,7 +4090,7 @@
               "name": "keyword.operator.negation.regexp"
             }
           },
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.character-class.regexp"
@@ -4119,7 +4119,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h{2}|u\\h{4}))|(\\\\c[A-Z])|(\\\\.))",
               "name": "constant.other.character-class.range.regexp"
             },
             {
@@ -4141,7 +4141,7 @@
               "name": "keyword.operator.type.annotation.ts"
             }
           },
-          "end": "(?<![:|&])(?=$|^|[{};,]|//)",
+          "end": "(?<![:|\\&])(?=$|^|[{};,]|//)",
           "name": "meta.return.type.ts",
           "patterns": [
             {
@@ -4156,7 +4156,7 @@
               "name": "keyword.operator.type.annotation.ts"
             }
           },
-          "end": "(?<![:|&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<![:|\\&])((?=[{};,]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.return.type.ts",
           "patterns": [
             {
@@ -4172,8 +4172,8 @@
           "include": "#comment"
         },
         {
-          "begin": "(?<=[:|&])(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "begin": "(?<=[:|\\&])(?=\\s*\\{)",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -4264,7 +4264,7 @@
       ]
     },
     "string-character-escape": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\\{[0-9A-Fa-f]+\\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
+      "match": "\\\\(x\\h{2}|u\\h{4}|u\\{\\h+}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
       "name": "constant.character.escape.ts"
     },
     "super-literal": {
@@ -4286,7 +4286,7 @@
           "include": "#punctuation-accessor"
         },
         {
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*[\\(]\\s*[\\\"\\'\\`]))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))import(?=\\s*\\(\\s*[\"'`])",
           "name": "keyword.operator.expression.import.ts"
         }
       ]
@@ -4316,7 +4316,7 @@
               "name": "support.variable.property.importmeta.ts"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(meta)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(import)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(meta)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4333,7 +4333,7 @@
               "name": "support.variable.property.target.ts"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(target)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(new)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(target)\\b(?!\\$)"
         },
         {
           "captures": {
@@ -4350,7 +4350,7 @@
               "name": "support.constant.ts"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(?:(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())|(?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\()|(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$))"
         },
         {
           "captures": {
@@ -4370,13 +4370,13 @@
               "name": "support.type.object.module.ts"
             }
           },
-          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(exports)|(module)(?:(?:(\\.)|(\\?\\.(?!\\s*\\d)))(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)"
         }
       ]
     },
     "switch-statement": {
       "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bswitch\\s*\\()",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -4417,7 +4417,7 @@
               "name": "punctuation.definition.block.ts"
             }
           },
-          "end": "(?=\\})",
+          "end": "(?=})",
           "name": "switch-block.expr.ts",
           "patterns": [
             {
@@ -4446,7 +4446,7 @@
                 }
               },
               "contentName": "meta.block.ts",
-              "end": "\\}",
+              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "meta.block.ts punctuation.definition.block.ts"
@@ -4509,12 +4509,12 @@
     "template-call": {
       "patterns": [
         {
-          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
           "end": "(?=`)",
           "patterns": [
             {
               "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+              "end": "(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)?`)",
               "patterns": [
                 {
                   "include": "#support-function-call-identifiers"
@@ -4531,7 +4531,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>|<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))(?=\\s*([<>,.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>(]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(?<==)>)*(?<!=)>))*(?<!=)>)*(?<!=)>\\s*)`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.ts"
@@ -4554,7 +4554,7 @@
         }
       },
       "contentName": "meta.embedded.line.ts",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.ts"
@@ -4608,7 +4608,7 @@
         }
       },
       "contentName": "meta.embedded.line.ts",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.ts"
@@ -4622,7 +4622,7 @@
       ]
     },
     "ternary-expression": {
-      "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
+      "begin": "(?!\\?\\.\\s*\\D)(\\?)(?!\\?)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.ternary.ts"
@@ -4714,7 +4714,7 @@
           "name": "entity.name.type.alias.ts"
         }
       },
-      "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "name": "meta.type.declaration.ts",
       "patterns": [
         {
@@ -4733,7 +4733,7 @@
               "name": "keyword.control.intrinsic.ts"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -4747,7 +4747,7 @@
               "name": "keyword.operator.assignment.ts"
             }
           },
-          "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+          "end": "(?=[};]|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
           "patterns": [
             {
               "include": "#type"
@@ -4765,7 +4765,7 @@
               "name": "keyword.operator.type.annotation.ts"
             }
           },
-          "end": "(?<![:|&])(?!\\s*[|&]\\s+)((?=^|[,);\\}\\]]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])(?!\\s*[|\\&]\\s+)((?=^|[,);}\\]]|//)|(?==[^>])|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.ts",
           "patterns": [
             {
@@ -4780,7 +4780,7 @@
               "name": "keyword.operator.type.annotation.ts"
             }
           },
-          "end": "(?<![:|&])((?=[,);\\}\\]]|\\/\\/)|(?==[^>])|(?=^\\s*$)|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))",
+          "end": "(?<![:|\\&])((?=[,);}\\]]|//)|(?==[^>])|(?=^\\s*$)|((?<=[}>\\])_$[:alpha:]])\\s*(?=\\{)))",
           "name": "meta.type.annotation.ts",
           "patterns": [
             {
@@ -4791,13 +4791,13 @@
       ]
     },
     "type-arguments": {
-      "begin": "\\<",
+      "begin": "<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.begin.ts"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.end.ts"
@@ -4872,7 +4872,7 @@
     "type-fn-type-parameters": {
       "patterns": [
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*\\<)",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(abstract)\\s+)?(new)\\b(?=\\s*<)",
           "beginCaptures": {
             "1": {
               "name": "meta.type.constructor.ts storage.modifier.ts"
@@ -4910,7 +4910,7 @@
           ]
         },
         {
-          "begin": "((?=[(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>))))))",
+          "begin": "((?=\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>))))))",
           "end": "(?<=\\))",
           "name": "meta.type.function.ts",
           "patterns": [
@@ -4930,7 +4930,7 @@
               "name": "storage.type.function.arrow.ts"
             }
           },
-          "end": "(?<!=>)(?<![|&])(?=[,\\]\\)\\{\\}=;>:\\?]|//|$)",
+          "end": "(?<!=>)(?<![|\\&])(?=[,\\]){}=;>:?]|//|$)",
           "name": "meta.type.function.return.ts",
           "patterns": [
             {
@@ -4945,7 +4945,7 @@
               "name": "storage.type.function.arrow.ts"
             }
           },
-          "end": "(?<!=>)(?<![|&])((?=[,\\]\\)\\{\\}=;:\\?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
+          "end": "(?<!=>)(?<![|\\&])((?=[,\\]){}=;:?>]|//|^\\s*$)|((?<=\\S)(?=\\s*$)))",
           "name": "meta.type.function.return.ts",
           "patterns": [
             {
@@ -4962,7 +4962,7 @@
         },
         {
           "begin": "(?<==>)(?=\\s*\\{)",
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -4999,7 +4999,7 @@
     "type-name": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(<)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))\\s*(<)",
           "captures": {
             "1": {
               "name": "entity.name.type.module.ts"
@@ -5062,7 +5062,7 @@
               "name": "punctuation.accessor.optional.ts"
             }
           },
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?:(\\.)|(\\?\\.(?!\\s*\\d)))"
         },
         {
           "match": "[_$[:alpha:]][_$[:alnum:]]*",
@@ -5077,7 +5077,7 @@
           "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.ts"
@@ -5110,7 +5110,7 @@
               "name": "keyword.operator.spread.ts"
             }
           },
-          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "end": "(?=[};,]|$)|(?<=})",
           "patterns": [
             {
               "include": "#type"
@@ -5137,13 +5137,13 @@
           "include": "#type-infer"
         },
         {
-          "begin": "([&|])(?=\\s*\\{)",
+          "begin": "([\\&|])(?=\\s*\\{)",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.ts"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#type-object"
@@ -5151,7 +5151,7 @@
           ]
         },
         {
-          "begin": "[&|]",
+          "begin": "[\\&|]",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.type.ts"
@@ -5164,7 +5164,7 @@
           "name": "keyword.operator.expression.keyof.ts"
         },
         {
-          "match": "(\\?|\\:)",
+          "match": "([?:])",
           "name": "keyword.operator.ternary.ts"
         },
         {
@@ -5240,7 +5240,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))))"
         },
         {
           "captures": {
@@ -5260,7 +5260,7 @@
               "name": "keyword.operator.optional.ts"
             }
           },
-          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<![=:])(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=:)"
         },
         {
           "include": "#type-annotation"
@@ -5341,7 +5341,7 @@
           "name": "meta.brace.square.ts"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.ts"
@@ -5382,7 +5382,7 @@
           "name": "keyword.operator.expression.typeof.ts"
         }
       },
-      "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))",
+      "end": "(?=[,);}\\]=>:\\&|{?]|(extends\\s+)|$|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)",
       "patterns": [
         {
           "include": "#type-arguments"
@@ -5400,7 +5400,7 @@
       "patterns": [
         {
           "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^let|[^._$[:alnum:]]let|^var|[^._$[:alnum:]]var)(?=\\s*$)))",
           "name": "meta.var.expr.ts",
           "patterns": [
             {
@@ -5431,13 +5431,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.ts"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5474,7 +5474,7 @@
               "name": "storage.type.ts"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=^|[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^const|[^._$[:alnum:]]const)(?=\\s*$)))",
           "name": "meta.var.expr.ts",
           "patterns": [
             {
@@ -5505,13 +5505,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*(?=$|\\/\\/)",
+              "begin": "(,)\\s*(?=$|//)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.ts"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5536,7 +5536,7 @@
           ]
         },
         {
-          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
+          "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.export.ts"
@@ -5548,11 +5548,11 @@
               "name": "storage.type.ts"
             }
           },
-          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))|((?<!^using|[^\\._$[:alnum:]]using|^await\\s+using|[^\\._$[:alnum:]]await\\s+using)(?=\\s*$)))",
+          "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=[;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b)|((?<!^using|[^._$[:alnum:]]using|^await\\s+using|[^._$[:alnum:]]await\\s+using)(?=\\s*$)))",
           "name": "meta.var.expr.ts",
           "patterns": [
             {
-              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b((?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
+              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(\\b(?:using(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|await\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control.export.ts"
@@ -5576,13 +5576,13 @@
               "include": "#comment"
             },
             {
-              "begin": "(,)\\s*((?!\\S)|(?=\\/\\/))",
+              "begin": "(,)\\s*((?!\\S)|(?=//))",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.separator.comma.ts"
                 }
               },
-              "end": "(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
+              "end": "(?<!,)(((?=[=;}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|^\\s*$))|((?<=\\S)(?=\\s*$)))",
               "patterns": [
                 {
                   "include": "#single-line-comment-consuming-line-ending"
@@ -5608,13 +5608,13 @@
     "var-single-const": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ts variable.other.constant.ts entity.name.function.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5629,7 +5629,7 @@
               "name": "meta.definition.variable.ts variable.other.constant.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5642,7 +5642,7 @@
     "var-single-variable": {
       "patterns": [
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))|(:\\s*((<)|([(]\\s*(([)])|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|([)]\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?(?=\\s*(=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>)))))|(:\\s*((<)|(\\(\\s*((\\))|(\\.\\.\\.)|([_$[:alnum:]]+\\s*(([:,?=])|(\\)\\s*=>)))))))|(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(:\\s*((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))))))|(:\\s*(=>|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(((async\\s+)?((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((async\\s*)?(((<\\s*$)|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+\\s*)?=\\s*))))))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*((\\)\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(/\\*([^*]|(\\*[^/]))*\\*/\\s*)*(([_$[:alpha:]]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()'\"`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+})+)?\\s*=>))))))",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ts entity.name.function.ts"
@@ -5651,7 +5651,7 @@
               "name": "keyword.operator.definiteassignment.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5660,7 +5660,7 @@
           ]
         },
         {
-          "begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])(\\!)?",
+          "begin": "(\\p{upper}[_$\\d[:upper:]]*)(?![_$[:alnum:]])(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ts variable.other.constant.ts"
@@ -5669,7 +5669,7 @@
               "name": "keyword.operator.definiteassignment.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5678,7 +5678,7 @@
           ]
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(\\!)?",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)(!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ts variable.other.readwrite.ts"
@@ -5687,7 +5687,7 @@
               "name": "keyword.operator.definiteassignment.ts"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b)))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|(;|^\\s*$|^\\s*(?:abstract|async|\\bawait\\s+\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b\\b|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b|var|while)\\b))",
           "name": "meta.var-single-variable.expr.ts",
           "patterns": [
             {
@@ -5713,7 +5713,7 @@
     "variable-initializer": {
       "patterns": [
         {
-          "begin": "(?<!=|!)(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
+          "begin": "(?<![=!])(=)(?!=)(?=\\s*\\S)(?!\\s*.*=>\\s*$)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.ts"
@@ -5727,13 +5727,13 @@
           ]
         },
         {
-          "begin": "(?<!=|!)(=)(?!=)",
+          "begin": "(?<![=!])(=)(?!=)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.assignment.ts"
             }
           },
-          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![\\|\\&\\+\\-\\*\\/])(?<=\\S)(?<!=)(?=\\s*$)",
+          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![|\\&+\\-*/])(?<=\\S)(?<!=)(?=\\s*$)",
           "patterns": [
             {
               "include": "#expression"
diff --git a/resources/languages/typespec.json b/resources/languages/typespec.json
index 5cbc51a..b43549a 100644
--- a/resources/languages/typespec.json
+++ b/resources/languages/typespec.json
@@ -17,7 +17,7 @@
           "name": "keyword.operator.assignment.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.alias-id.typespec",
       "patterns": [
         {
@@ -35,7 +35,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.alias-statement.typespec",
       "patterns": [
         {
@@ -56,7 +56,7 @@
           "name": "entity.name.tag.tsp"
         }
       },
-      "end": "(?=[_$[:alpha:]])|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=([_$[:alpha:]`]))|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.augment-decorator-statement.typespec",
       "patterns": [
         {
@@ -115,7 +115,7 @@
           "name": "variable.name.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.const-statement.typespec",
       "patterns": [
         {
@@ -139,7 +139,7 @@
           "name": "entity.name.tag.tsp"
         }
       },
-      "end": "(?=[_$[:alpha:]])|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=([_$[:alpha:]`]))|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.decorator.typespec",
       "patterns": [
         {
@@ -163,7 +163,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.decorator-declaration-statement.typespec",
       "patterns": [
         {
@@ -181,7 +181,7 @@
           "name": "keyword.directive.name.tsp"
         }
       },
-      "end": "$|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "$|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.directive.typespec",
       "patterns": [
         {
@@ -249,7 +249,7 @@
           "name": "keyword.tag.tspdoc"
         }
       },
-      "match": "((@)(?:returns))\\b",
+      "match": "((@)returns)\\b",
       "name": "comment.block.tsp"
     },
     "doc-comment-unknown-tag": {
@@ -264,45 +264,6 @@
       "match": "((@)(?:\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`))\\b",
       "name": "comment.block.tsp"
     },
-    "else-expression": {
-      "begin": "\\b(else)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.tsp"
-        }
-      },
-      "end": "((?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
-      "name": "meta.else-expression.typespec",
-      "patterns": [
-        {
-          "include": "#projection-expression"
-        },
-        {
-          "include": "#projection-body"
-        }
-      ]
-    },
-    "else-if-expression": {
-      "begin": "\\b(else)\\s+(if)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.tsp"
-        },
-        "2": {
-          "name": "keyword.other.tsp"
-        }
-      },
-      "end": "((?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
-      "name": "meta.else-if-expression.typespec",
-      "patterns": [
-        {
-          "include": "#projection-expression"
-        },
-        {
-          "include": "#projection-body"
-        }
-      ]
-    },
     "enum-body": {
       "begin": "\\{",
       "beginCaptures": {
@@ -310,7 +271,7 @@
           "name": "punctuation.curlybrace.open.tsp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.tsp"
@@ -336,7 +297,7 @@
       ]
     },
     "enum-member": {
-      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:?))",
+      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:?)",
       "beginCaptures": {
         "1": {
           "name": "variable.name.tsp"
@@ -345,7 +306,7 @@
           "name": "keyword.operator.type.annotation.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.enum-member.typespec",
       "patterns": [
         {
@@ -366,7 +327,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.enum-statement.typespec",
       "patterns": [
         {
@@ -421,29 +382,6 @@
         }
       ]
     },
-    "function-call": {
-      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.name.function.tsp"
-        },
-        "2": {
-          "name": "punctuation.parenthesis.open.tsp"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.parenthesis.close.tsp"
-        }
-      },
-      "name": "meta.function-call.typespec",
-      "patterns": [
-        {
-          "include": "#expression"
-        }
-      ]
-    },
     "function-declaration-statement": {
       "begin": "(?:(extern)\\s+)?\\b(fn)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
@@ -457,7 +395,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.function-declaration-statement.typespec",
       "patterns": [
         {
@@ -475,24 +413,6 @@
       "match": "\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`",
       "name": "entity.name.type.tsp"
     },
-    "if-expression": {
-      "begin": "\\b(if)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.tsp"
-        }
-      },
-      "end": "((?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
-      "name": "meta.if-expression.typespec",
-      "patterns": [
-        {
-          "include": "#projection-expression"
-        },
-        {
-          "include": "#projection-body"
-        }
-      ]
-    },
     "import-statement": {
       "begin": "\\b(import)\\b",
       "beginCaptures": {
@@ -500,7 +420,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.import-statement.typespec",
       "patterns": [
         {
@@ -515,7 +435,7 @@
           "name": "punctuation.curlybrace.open.tsp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.tsp"
@@ -547,7 +467,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "((?=\\{)|(?=;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
+      "end": "((?=\\{)|(?=[;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
       "name": "meta.interface-heritage.typespec",
       "patterns": [
         {
@@ -568,7 +488,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.interface-member.typespec",
       "patterns": [
         {
@@ -586,7 +506,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.interface-statement.typespec",
       "patterns": [
         {
@@ -617,7 +537,7 @@
           "name": "punctuation.curlybrace.open.tsp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.tsp"
@@ -652,7 +572,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "((?=\\{)|(?=;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
+      "end": "((?=\\{)|(?=[;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
       "name": "meta.model-heritage.typespec",
       "patterns": [
         {
@@ -664,7 +584,7 @@
       ]
     },
     "model-property": {
-      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)|(\\\"(?:[^\\\"\\\\]|\\\\.)*\\\"))",
+      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)|(\"(?:[^\"\\\\]|\\\\.)*\"))",
       "beginCaptures": {
         "1": {
           "name": "variable.name.tsp"
@@ -673,7 +593,7 @@
           "name": "string.quoted.double.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.model-property.typespec",
       "patterns": [
         {
@@ -697,7 +617,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.model-statement.typespec",
       "patterns": [
         {
@@ -721,7 +641,7 @@
           "name": "punctuation.curlybrace.open.tsp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.tsp"
@@ -735,8 +655,8 @@
       ]
     },
     "namespace-name": {
-      "begin": "(?=[_$[:alpha:]])",
-      "end": "((?=\\{)|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
+      "begin": "(?=([_$[:alpha:]`]))",
+      "end": "((?=\\{)|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
       "name": "meta.namespace-name.typespec",
       "patterns": [
         {
@@ -754,7 +674,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "((?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
+      "end": "((?<=})|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
       "name": "meta.namespace-statement.typespec",
       "patterns": [
         {
@@ -769,7 +689,7 @@
       ]
     },
     "numeric-literal": {
-      "match": "(?:\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)|\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)|(?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))",
+      "match": "(?:\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$)|\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$)|(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))",
       "name": "constant.numeric.tsp"
     },
     "object-literal": {
@@ -779,7 +699,7 @@
           "name": "punctuation.hashcurlybrace.open.tsp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.tsp"
@@ -805,7 +725,7 @@
       ]
     },
     "object-literal-property": {
-      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:))",
+      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:)",
       "beginCaptures": {
         "1": {
           "name": "variable.name.tsp"
@@ -814,7 +734,7 @@
           "name": "keyword.operator.type.annotation.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.object-literal-property.typespec",
       "patterns": [
         {
@@ -832,7 +752,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.operation-heritage.typespec",
       "patterns": [
         {
@@ -898,7 +818,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.operation-statement.typespec",
       "patterns": [
         {
@@ -936,142 +856,6 @@
         }
       ]
     },
-    "projection": {
-      "begin": "(from|to)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.tsp"
-        }
-      },
-      "end": "((?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
-      "name": "meta.projection.typespec",
-      "patterns": [
-        {
-          "include": "#projection-parameters"
-        },
-        {
-          "include": "#projection-body"
-        }
-      ]
-    },
-    "projection-body": {
-      "begin": "\\{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.curlybrace.open.tsp"
-        }
-      },
-      "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.curlybrace.close.tsp"
-        }
-      },
-      "name": "meta.projection-body.typespec",
-      "patterns": [
-        {
-          "include": "#projection-expression"
-        },
-        {
-          "include": "#punctuation-semicolon"
-        }
-      ]
-    },
-    "projection-expression": {
-      "patterns": [
-        {
-          "include": "#else-if-expression"
-        },
-        {
-          "include": "#if-expression"
-        },
-        {
-          "include": "#else-expression"
-        },
-        {
-          "include": "#function-call"
-        }
-      ]
-    },
-    "projection-parameter": {
-      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.name.tsp"
-        }
-      },
-      "end": "(?=\\))|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
-      "name": "meta.projection-parameter.typespec",
-      "patterns": [
-      ]
-    },
-    "projection-parameters": {
-      "begin": "\\(",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.parenthesis.open.tsp"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.parenthesis.close.tsp"
-        }
-      },
-      "name": "meta.projection-parameters.typespec",
-      "patterns": [
-        {
-          "include": "#token"
-        },
-        {
-          "include": "#projection-parameter"
-        }
-      ]
-    },
-    "projection-statement": {
-      "begin": "\\b(projection)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)(#)(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.tsp"
-        },
-        "2": {
-          "name": "keyword.other.tsp"
-        },
-        "3": {
-          "name": "keyword.operator.selector.tsp"
-        },
-        "4": {
-          "name": "variable.name.tsp"
-        }
-      },
-      "end": "((?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
-      "name": "meta.projection-statement.typespec",
-      "patterns": [
-        {
-          "include": "#projection-statement-body"
-        }
-      ]
-    },
-    "projection-statement-body": {
-      "begin": "\\{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.curlybrace.open.tsp"
-        }
-      },
-      "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.curlybrace.close.tsp"
-        }
-      },
-      "name": "meta.projection-statement-body.typespec",
-      "patterns": [
-        {
-          "include": "#projection"
-        }
-      ]
-    },
     "punctuation-accessor": {
       "match": "\\.",
       "name": "punctuation.accessor.tsp"
@@ -1091,7 +875,7 @@
           "name": "punctuation.curlybrace.open.tsp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.tsp"
@@ -1123,7 +907,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.scalar-constructor.typespec",
       "patterns": [
         {
@@ -1141,7 +925,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.scalar-extends.typespec",
       "patterns": [
         {
@@ -1162,7 +946,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.scalar-statement.typespec",
       "patterns": [
         {
@@ -1186,7 +970,7 @@
           "name": "keyword.operator.spread.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.spread-operator.typespec",
       "patterns": [
         {
@@ -1247,9 +1031,6 @@
         {
           "include": "#function-declaration-statement"
         },
-        {
-          "include": "#projection-statement"
-        },
         {
           "include": "#punctuation-semicolon"
         }
@@ -1275,7 +1056,7 @@
           "name": "punctuation.definition.template-expression.begin.tsp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.template-expression.end.tsp"
@@ -1333,7 +1114,7 @@
           "name": "punctuation.squarebracket.open.tsp"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.tsp"
@@ -1353,7 +1134,7 @@
           "name": "punctuation.hashsquarebracket.open.tsp"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.tsp"
@@ -1379,7 +1160,7 @@
           "name": "keyword.operator.type.annotation.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|=|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}=]|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.type-annotation.typespec",
       "patterns": [
         {
@@ -1388,7 +1169,7 @@
       ]
     },
     "type-argument": {
-      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(=))",
+      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(=)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.type.tsp"
@@ -1397,7 +1178,7 @@
           "name": "keyword.operator.assignment.tsp"
         }
       },
-      "end": "(?=>)|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "endCaptures": {
         "0": {
           "name": "keyword.operator.assignment.tsp"
@@ -1449,7 +1230,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?=>)|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.type-parameter.typespec",
       "patterns": [
         {
@@ -1470,7 +1251,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=>)|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.type-parameter-constraint.typespec",
       "patterns": [
         {
@@ -1485,7 +1266,7 @@
           "name": "keyword.operator.assignment.tsp"
         }
       },
-      "end": "(?=>)|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.type-parameter-default.typespec",
       "patterns": [
         {
@@ -1523,7 +1304,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=>)|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.typeof.typespec",
       "patterns": [
         {
@@ -1538,7 +1319,7 @@
           "name": "punctuation.curlybrace.open.tsp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.tsp"
@@ -1576,7 +1357,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?<=\\})|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.union-statement.typespec",
       "patterns": [
         {
@@ -1588,7 +1369,7 @@
       ]
     },
     "union-variant": {
-      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:))",
+      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:)",
       "beginCaptures": {
         "1": {
           "name": "variable.name.tsp"
@@ -1597,7 +1378,7 @@
           "name": "keyword.operator.type.annotation.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.union-variant.typespec",
       "patterns": [
         {
@@ -1615,7 +1396,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.using-statement.typespec",
       "patterns": [
         {
@@ -1636,7 +1417,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=>)|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.valueof.typespec",
       "patterns": [
         {
diff --git a/resources/languages/typst.json b/resources/languages/typst.json
index 727632d..4bb502f 100644
--- a/resources/languages/typst.json
+++ b/resources/languages/typst.json
@@ -24,7 +24,7 @@
           "include": "#common"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "captures": {
             "0": {
               "name": "punctuation.definition.block.code.typst"
@@ -45,7 +45,7 @@
               "name": "punctuation.definition.block.content.typst"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "meta.block.content.typst",
           "patterns": [
             {
@@ -60,7 +60,7 @@
               "name": "punctuation.definition.comment.typst"
             }
           },
-          "end": "\n",
+          "end": "\\n",
           "name": "comment.line.double-slash.typst"
         },
         {
@@ -84,7 +84,7 @@
           "name": "keyword.operator.assignment.typst"
         },
         {
-          "match": "\\+|\\*|/|(?<![[:alpha:]_][[:alnum:]_-]{0,254})-(?![[:alnum:]_-]{0,254}[[:alpha:]_])",
+          "match": "[+*/]|(?<![[:alpha:]_][[:alnum:]_-]*)-(?![:alnum]_-]*[[:alpha:]_])",
           "name": "keyword.operator.arithmetic.typst"
         },
         {
@@ -115,12 +115,10 @@
           "include": "#constants"
         },
         {
-          "comment": "Function name",
-          "match": "\\b[[:alpha:]_][[:alnum:]_-]*!?(?=\\[|\\()",
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*!?(?=[\\[(])",
           "name": "entity.name.function.typst"
         },
         {
-          "comment": "Function name",
           "match": "(?<=\\bshow\\s{0,251})\\b[[:alpha:]_][[:alnum:]_-]*(?=\\s*[:.])",
           "name": "entity.name.function.typst"
         },
@@ -131,7 +129,6 @@
               "name": "punctuation.definition.group.typst"
             }
           },
-          "comment": "Function arguments",
           "end": "\\)",
           "patterns": [
             {
@@ -184,7 +181,7 @@
               "name": "punctuation.definition.comment.typst"
             }
           },
-          "end": "\n",
+          "end": "\\n",
           "name": "comment.line.double-slash.typst",
           "patterns": [
             {
@@ -250,7 +247,7 @@
           "name": "string.quoted.double.typst",
           "patterns": [
             {
-              "match": "\\\\([\\\\\"nrt]|u\\{?[0-9a-zA-Z]*\\}?)",
+              "match": "\\\\([\\\\\"nrt]|u\\{?[0-9a-zA-Z]*}?)",
               "name": "constant.character.escape.string.typst"
             }
           ]
@@ -273,7 +270,7 @@
           "include": "#common"
         },
         {
-          "match": "\\\\([\\\\\\/\\[\\]{}#*_=~`$-.]|u\\{[0-9a-zA-Z]*\\}?)",
+          "match": "\\\\([\\\\/\\[\\]{}#*_=~`$-.]|u\\{[0-9a-zA-Z]*}?)",
           "name": "constant.character.escape.content.typst"
         },
         {
@@ -305,13 +302,13 @@
           "name": "constant.symbol.typst"
         },
         {
-          "begin": "(^\\*|\\*$|((?<=\\W|_)\\*)|(\\*(?=\\W|_)))",
+          "begin": "(^\\*|\\*$|((?<=[\\W_])\\*)|(\\*(?=[\\W_])))",
           "captures": {
             "0": {
               "name": "punctuation.definition.bold.typst"
             }
           },
-          "end": "(^\\*|\\*$|((?<=\\W|_)\\*)|(\\*(?=\\W|_)))|\n|(?=\\])",
+          "end": "(^\\*|\\*$|((?<=[\\W_])\\*)|(\\*(?=[\\W_])))|\\n|(?=])",
           "name": "markup.bold.typst",
           "patterns": [
             {
@@ -320,13 +317,13 @@
           ]
         },
         {
-          "begin": "(^_|_$|((?<=\\W|_)_)|(_(?=\\W|_)))",
+          "begin": "(^_|_$|((?<=[\\W_])_)|(_(?=[\\W_])))",
           "captures": {
             "0": {
               "name": "punctuation.definition.italic.typst"
             }
           },
-          "end": "(^_|_$|((?<=\\W|_)_)|(_(?=\\W|_)))|\n|(?=\\])",
+          "end": "(^_|_$|((?<=[\\W_])_)|(_(?=[\\W_])))|\\n|(?=])",
           "name": "markup.italic.typst",
           "patterns": [
             {
@@ -335,7 +332,7 @@
           ]
         },
         {
-          "match": "https?://[0-9a-zA-Z~/%#&=',;\\.\\+\\?]*",
+          "match": "https?://[0-9a-zA-Z~/%#\\&=',;.+?]*",
           "name": "markup.underline.link.typst"
         },
         {
@@ -345,7 +342,7 @@
               "name": "punctuation.definition.raw.typst"
             }
           },
-          "end": "\\0",
+          "end": "\\x00",
           "name": "markup.raw.block.typst"
         },
         {
@@ -376,7 +373,7 @@
             }
           },
           "contentName": "entity.name.section.typst",
-          "end": "\n|(?=<)",
+          "end": "\\n|(?=<)",
           "name": "markup.heading.typst",
           "patterns": [
             {
@@ -431,7 +428,7 @@
               "name": "punctuation.definition.keyword.typst"
             }
           },
-          "end": "\n|(;)|(?=])",
+          "end": "\\n|(;)|(?=])",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.statement.typst"
@@ -453,7 +450,7 @@
           "name": "keyword.other.typst"
         },
         {
-          "begin": "((#)if|(?<=(}|])\\s{0,254})else)\\b",
+          "begin": "((#)if|(?<=([}\\]])\\s*)else)\\b",
           "beginCaptures": {
             "0": {
               "name": "keyword.control.conditional.typst"
@@ -462,7 +459,7 @@
               "name": "punctuation.definition.keyword.typst"
             }
           },
-          "end": "\n|(?=])|(?<=}|])",
+          "end": "\\n|(?=])|(?<=[}\\]])",
           "patterns": [
             {
               "include": "#code"
@@ -479,7 +476,7 @@
               "name": "punctuation.definition.keyword.typst"
             }
           },
-          "end": "\n|(?=])|(?<=}|])",
+          "end": "\\n|(?=])|(?<=[}\\]])",
           "patterns": [
             {
               "include": "#code"
@@ -505,7 +502,7 @@
               "name": "punctuation.definition.keyword.typst"
             }
           },
-          "end": "\n|(;)|(?=])",
+          "end": "\\n|(;)|(?=])",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.statement.typst"
@@ -532,8 +529,7 @@
               "name": "punctuation.definition.function.typst"
             }
           },
-          "comment": "Function name",
-          "match": "((#)[[:alpha:]_][[:alnum:]_-]*!?)(?=\\[|\\()",
+          "match": "((#)[[:alpha:]_][[:alnum:]_-]*!?)(?=[\\[(])",
           "name": "entity.name.function.typst"
         },
         {
@@ -543,7 +539,6 @@
               "name": "punctuation.definition.group.typst"
             }
           },
-          "comment": "Function arguments",
           "end": "\\)",
           "patterns": [
             {
diff --git a/resources/languages/v.json b/resources/languages/v.json
index 933178b..cdfce6e 100644
--- a/resources/languages/v.json
+++ b/resources/languages/v.json
@@ -122,7 +122,7 @@
           ]
         }
       },
-      "match": "\\s+((?:\\:|\\+|\\-|\\*|/|\\%|\\&|\\||\\^)?=)\\s+",
+      "match": "\\s+([:+\\-*/%\\&|^]?=)\\s+",
       "name": "meta.definition.variable.v"
     },
     "attributes": {
@@ -140,13 +140,13 @@
           "name": "punctuation.definition.end.bracket.square.v"
         }
       },
-      "match": "^\\s*((\\[)(deprecated|unsafe|console|heap|manualfree|typedef|live|inline|flag|ref_only|direct_array_access|callconv)(\\]))",
+      "match": "^\\s*((\\[)(deprecated|unsafe|console|heap|manualfree|typedef|live|inline|flag|ref_only|direct_array_access|callconv)(]))",
       "name": "meta.definition.attribute.v"
     },
     "brackets": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.bracket.curly.begin.v"
@@ -190,7 +190,7 @@
               "name": "punctuation.definition.bracket.square.begin.v"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.bracket.square.end.v"
@@ -221,7 +221,7 @@
         {
           "patterns": [
             {
-              "match": "(\\$if|\\$else)(?=\\s*\\()",
+              "match": "(\\$(?:if|else))(?=\\s*\\()",
               "name": "keyword.control.v"
             },
             {
@@ -326,7 +326,7 @@
           ]
         }
       },
-      "match": "^(\\bpub\\b\\s+)?(\\bfn\\b)\\s+(?:\\([^\\)]+\\)\\s+)?(?:(?:C\\.)?)(\\w+)\\s*((?<=[\\w\\s+])(\\<)(\\w+)(\\>))?",
+      "match": "^(\\bpub\\b\\s+)?(\\bfn\\b)\\s+(?:\\([^)]+\\)\\s+)?(?:C\\.)?(\\w+)\\s*((?<=[\\w\\s+])(<)(\\w+)(>))?",
       "name": "meta.definition.function.v"
     },
     "function-exist": {
@@ -353,7 +353,7 @@
           ]
         }
       },
-      "match": "(\\w+)((?<=[\\w\\s+])(\\<)(\\w+)(\\>))?(?=\\s*\\()",
+      "match": "(\\w+)((?<=[\\w\\s+])(<)(\\w+)(>))?(?=\\s*\\()",
       "name": "meta.support.function.v"
     },
     "function-extend-decl": {
@@ -408,7 +408,7 @@
           ]
         }
       },
-      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^\\)]*)(\\))\\s*(?:(?:C\\.)?)(\\w+)\\s*((?<=[\\w\\s+])(\\<)(\\w+)(\\>))?",
+      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^)]*)(\\))\\s*(?:C\\.)?(\\w+)\\s*((?<=[\\w\\s+])(<)(\\w+)(>))?",
       "name": "meta.definition.function.v"
     },
     "function-limited-overload-decl": {
@@ -488,7 +488,7 @@
           "name": "punctuation.definition.bracket.round.end.v"
         }
       },
-      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^\\)]*)(\\))\\s*([\\+\\-\\*\\/])?\\s*(\\()([^\\)]*)(\\))\\s*(?:(?:C\\.)?)(\\w+)",
+      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^)]*)(\\))\\s*([+\\-*/])?\\s*(\\()([^)]*)(\\))\\s*(?:C\\.)?(\\w+)",
       "name": "meta.definition.function.v"
     },
     "generic": {
@@ -513,7 +513,7 @@
               "name": "punctuation.definition.bracket.angle.end.v"
             }
           },
-          "match": "(?<=[\\w\\s+])(\\<)(\\w+)(\\>)",
+          "match": "(?<=[\\w\\s+])(<)(\\w+)(>)",
           "name": "meta.definition.generic.v"
         }
       ]
@@ -568,7 +568,7 @@
     "keywords": {
       "patterns": [
         {
-          "match": "(\\$if|\\$else)",
+          "match": "(\\$(?:if|else))",
           "name": "keyword.control.v"
         },
         {
@@ -607,19 +607,19 @@
           "name": "constant.numeric.float.v"
         },
         {
-          "match": "(?:0b)(?:(?:[0-1]+)(?:_?))+",
+          "match": "0b(?:[0-1]+_?)+",
           "name": "constant.numeric.binary.v"
         },
         {
-          "match": "(?:0o)(?:(?:[0-7]+)(?:_?))+",
+          "match": "0o(?:[0-7]+_?)+",
           "name": "constant.numeric.octal.v"
         },
         {
-          "match": "(?:0x)(?:(?:[0-9a-fA-F]+)(?:_?))+",
+          "match": "0x(?:\\h+_?)+",
           "name": "constant.numeric.hex.v"
         },
         {
-          "match": "(?:(?:[0-9]+)(?:[_]?))+",
+          "match": "(?:[0-9]+_?)+",
           "name": "constant.numeric.integer.v"
         }
       ]
@@ -627,23 +627,23 @@
     "operators": {
       "patterns": [
         {
-          "match": "(\\+|\\-|\\*|\\/|\\%|\\+\\+|\\-\\-|\\>\\>|\\<\\<)",
+          "match": "([+\\-*/%]|\\+\\+|--|>>|<<)",
           "name": "keyword.operator.arithmetic.v"
         },
         {
-          "match": "(\\=\\=|\\!\\=|\\>|\\<|\\>\\=|\\<\\=)",
+          "match": "(==|!=|[><]|>=|<=)",
           "name": "keyword.operator.relation.v"
         },
         {
-          "match": "(\\:\\=|\\=|\\+\\=|\\-\\=|\\*\\=|\\/\\=|\\%\\=|\\&\\=|\\|\\=|\\^\\=|\\~\\=|\\&\\&\\=|\\|\\|\\=|\\>\\>\\=|\\<\\<\\=)",
+          "match": "(:=|=|\\+=|-=|\\*=|/=|%=|&=|\\|=|\\^=|~=|&&=|\\|\\|=|>>=|<<=)",
           "name": "keyword.operator.assignment.v"
         },
         {
-          "match": "(\\&|\\||\\^|\\~|<(?!<)|>(?!>))",
+          "match": "([\\&|^~]|<(?!<)|>(?!>))",
           "name": "keyword.operator.bitwise.v"
         },
         {
-          "match": "(\\&\\&|\\|\\||\\!)",
+          "match": "(&&|\\|\\||!)",
           "name": "keyword.operator.logical.v"
         },
         {
@@ -683,11 +683,11 @@
     "punctuations": {
       "patterns": [
         {
-          "match": "(?:\\.)",
+          "match": "\\.",
           "name": "punctuation.accessor.v"
         },
         {
-          "match": "(?:,)",
+          "match": ",",
           "name": "punctuation.separator.comma.v"
         }
       ]
@@ -699,11 +699,11 @@
     "string-escaped-char": {
       "patterns": [
         {
-          "match": "\\\\([0-7]{3}|[\\$abfnrtv\\\\'\"]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})",
+          "match": "\\\\([0-7]{3}|[$abfnrtv\\\\'\"]|x\\h{2}|u\\h{4}|U\\h{8})",
           "name": "constant.character.escape.v"
         },
         {
-          "match": "\\\\[^0-7\\$xuUabfnrtv\\'\"]",
+          "match": "\\\\[^0-7$xuUabfnrtv'\"]",
           "name": "invalid.illegal.unknown-escape.v"
         }
       ]
@@ -713,21 +713,21 @@
         "1": {
           "patterns": [
             {
-              "match": "\\$\\d[\\.\\w]+",
+              "match": "\\$\\d[.\\w]+",
               "name": "invalid.illegal.v"
             },
             {
-              "match": "\\$([\\.\\w]+|\\{.*?\\})",
+              "match": "\\$([.\\w]+|\\{.*?})",
               "name": "variable.other.interpolated.v"
             }
           ]
         }
       },
-      "match": "(\\$([\\w.]+|\\{.*?\\}))",
+      "match": "(\\$([\\w.]+|\\{.*?}))",
       "name": "meta.string.interpolation.v"
     },
     "string-placeholder": {
-      "match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGsp]",
+      "match": "%(\\[\\d+])?([+#\\-0 ]{0,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+])\\*?)?(\\[\\d+])?)?))?[vT%tbcdoqxXUeEfFgGsp]",
       "name": "constant.other.placeholder.v"
     },
     "strings": {
@@ -831,7 +831,7 @@
     "struct": {
       "patterns": [
         {
-          "begin": "^\\s*(?:(mut|pub(?:\\s+mut)?|__global)\\s+)?(struct|union)\\s+([\\w.]+)\\s*|({)",
+          "begin": "^\\s*(?:(mut|pub(?:\\s+mut)?|__global)\\s+)?(struct|union)\\s+([\\w.]+)\\s*|(\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.$1.v"
@@ -890,7 +890,7 @@
                   ]
                 }
               },
-              "match": "\\b(\\w+)\\s+([\\w\\[\\]\\*&.]+)(?:\\s*(=)\\s*((?:.(?=$|//|/\\*))*+))?"
+              "match": "\\b(\\w+)\\s+([\\w\\[\\]*\\&.]+)(?:\\s*(=)\\s*((?:.(?=$|//|/\\*))*+))?"
             },
             {
               "include": "#types"
@@ -912,7 +912,7 @@
               "name": "entity.name.struct.v"
             }
           },
-          "match": "^\\s*(?:(mut|pub(?:\\s+mut)?|__global))\\s+?(struct)\\s+(?:\\s+([\\w.]+))?",
+          "match": "^\\s*(mut|pub(?:\\s+mut)?|__global)\\s+?(struct)\\s+(?:\\s+([\\w.]+))?",
           "name": "meta.definition.struct.v"
         }
       ]
diff --git a/resources/languages/vala.json b/resources/languages/vala.json
index a457ca5..d75b5b6 100644
--- a/resources/languages/vala.json
+++ b/resources/languages/vala.json
@@ -84,7 +84,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
+          "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
           "name": "constant.numeric.vala"
         },
         {
@@ -104,15 +104,15 @@
     "keywords": {
       "patterns": [
         {
-          "match": "(?<=^|[^@\\w\\.])(as|do|if|in|is|not|or|and|for|get|new|out|ref|set|try|var|base|case|else|enum|lock|null|this|true|void|weak|async|break|catch|class|const|false|owned|throw|using|while|with|yield|delete|extern|inline|params|public|return|sealed|signal|sizeof|static|struct|switch|throws|typeof|unlock|default|dynamic|ensures|finally|foreach|private|unowned|virtual|abstract|continue|delegate|internal|override|requires|volatile|construct|interface|namespace|protected|errordomain)\\b",
+          "match": "(?<=^|[^@\\w.])(as|do|if|in|is|not|or|and|for|get|new|out|ref|set|try|var|base|case|else|enum|lock|null|this|true|void|weak|async|break|catch|class|const|false|owned|throw|using|while|with|yield|delete|extern|inline|params|public|return|sealed|signal|sizeof|static|struct|switch|throws|typeof|unlock|default|dynamic|ensures|finally|foreach|private|unowned|virtual|abstract|continue|delegate|internal|override|requires|volatile|construct|interface|namespace|protected|errordomain)\\b",
           "name": "keyword.vala"
         },
         {
-          "match": "(?<=^|[^@\\w\\.])(bool|double|float|unichar|unichar2|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|string16|string32|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64|va_list|time_t)\\b",
+          "match": "(?<=^|[^@\\w.])(bool|double|float|unichar|unichar2|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|string16|string32|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64|va_list|time_t)\\b",
           "name": "keyword.vala"
         },
         {
-          "match": "(#if|#elif|#else|#endif)",
+          "match": "(#(?:if|elif|else|endif))",
           "name": "keyword.vala"
         }
       ]
@@ -166,7 +166,7 @@
           ]
         },
         {
-          "match": "\\/((\\\\\\/)|([^\\/]))*/(?=\\s*[,;)\\.\\n])",
+          "match": "/((\\\\/)|([^/]))*/(?=\\s*[,;).\\n])",
           "name": "string.regexp.vala"
         }
       ]
@@ -174,7 +174,7 @@
     "types": {
       "patterns": [
         {
-          "match": "(?<=^|[^@\\w\\.])(bool|double|float|unichar|unichar2|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|string16|string32|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64|va_list|time_t)\\b",
+          "match": "(?<=^|[^@\\w.])(bool|double|float|unichar|unichar2|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|string16|string32|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64|va_list|time_t)\\b",
           "name": "storage.type.primitive.vala"
         },
         {
diff --git a/resources/languages/vb.json b/resources/languages/vb.json
index f190be8..8fa0e12 100644
--- a/resources/languages/vb.json
+++ b/resources/languages/vb.json
@@ -107,7 +107,7 @@
           "name": "meta.separator.comma.asp"
         }
       },
-      "match": "(?i:(dim)\\s*(?:(\\b[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\\b)\\s*(,?)))",
+      "match": "(?i:(dim)\\s*(\\b[a-zA-Z_x7f-xf][a-zA-Z0-9_x7f-xf]*?\\b)\\s*(,?))",
       "name": "variable.other.dim.asp"
     },
     {
@@ -149,7 +149,7 @@
           "name": "punctuation.definition.variable.asp"
         }
       },
-      "match": "(\\$)[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\\b\\s*",
+      "match": "(\\$)[a-zA-Z_x7f-xf][a-zA-Z0-9_x7f-xf]*?\\b\\s*",
       "name": "variable.other.asp"
     },
     {
@@ -173,7 +173,7 @@
       "name": "support.function.event.asp"
     },
     {
-      "match": "(?i:(?<=as )(\\b[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\\b))",
+      "match": "(?i:(?<=as )(\\b[a-zA-Z_x7f-xf][a-zA-Z0-9_x7f-xf]*?\\b))",
       "name": "support.type.vb.asp"
     },
     {
@@ -181,7 +181,7 @@
       "name": "support.function.vb.asp"
     },
     {
-      "match": "-?\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?\\b",
+      "match": "-?\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([Ll]|UL|ul|[uUFf])?\\b",
       "name": "constant.numeric.asp"
     },
     {
@@ -194,15 +194,15 @@
           "name": "entity.name.function.asp"
         }
       },
-      "match": "(?i:(\\b[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\\b)(?=\\(\\)?))",
+      "match": "(?i:(\\b[a-zA-Z_x7f-xf][a-zA-Z0-9_x7f-xf]*?\\b)(?=\\(\\)?))",
       "name": "support.function.asp"
     },
     {
-      "match": "(?i:((?<=(\\+|=|-|\\&|\\\\|/|<|>|\\(|,))\\s*\\b([a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?)\\b(?!(\\(|\\.))|\\b([a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?)\\b(?=\\s*(\\+|=|-|\\&|\\\\|/|<|>|\\(|\\)))))",
+      "match": "(?i:((?<=([+=\\-\\&\\\\/<>(,]))\\s*\\b([a-zA-Z_x7f-xf][a-zA-Z0-9_x7f-xf]*?)\\b(?!([(.]))|\\b([a-zA-Z_x7f-xf][a-zA-Z0-9_x7f-xf]*?)\\b(?=\\s*([+=\\-\\&\\\\/<>()]))))",
       "name": "variable.other.asp"
     },
     {
-      "match": "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|/=|%=|\\+=|\\-=|&=|\\^=|\\b(in|instanceof|new|delete|typeof|void)\\b",
+      "match": "[!$%\\&*]|--|-|\\+\\+|[+~]|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|[<>!]|&&|\\|\\||\\?:|\\*=|/=|%=|\\+=|-=|&=|\\^=|\\b(in|instanceof|new|delete|typeof|void)\\b",
       "name": "keyword.operator.js"
     }
   ],
diff --git a/resources/languages/verilog.json b/resources/languages/verilog.json
index 0c16cd4..e33553b 100644
--- a/resources/languages/verilog.json
+++ b/resources/languages/verilog.json
@@ -63,7 +63,7 @@
           "name": "variable.other.constant.verilog"
         },
         {
-          "match": "[0-9]*'[bBoOdDhH][a-fA-F0-9_xXzZ]+\\b",
+          "match": "[0-9]*'[bBoOdDhH][_xXzZ\\h]+\\b",
           "name": "constant.numeric.sized_integer.verilog"
         },
         {
@@ -170,7 +170,7 @@
           "name": "keyword.other.compiler.directive.verilog"
         },
         {
-          "match": "\\$(f(open|close)|readmem(b|h)|timeformat|printtimescale|stop|finish|(s|real)?time|realtobits|bitstoreal|rtoi|itor|(f)?(display|write(h|b)))\\b",
+          "match": "\\$(f(open|close)|readmem([bh])|timeformat|printtimescale|stop|finish|(s|real)?time|realtobits|bitstoreal|rtoi|itor|(f)?(display|write([hb])))\\b",
           "name": "support.function.system.console.tasks.verilog"
         },
         {
@@ -194,7 +194,7 @@
           "name": "support.function.system.vcd.tasks.verilog"
         },
         {
-          "match": "\\$(countdrivers|list|input|scope|showscopes|(no)?(key|log)|reset(_count|_value)?|(inc)?save|restart|showvars|getpattern|sreadmem(b|h)|scale)",
+          "match": "\\$(countdrivers|list|input|scope|showscopes|(no)?(key|log)|reset(_(?:count|value))?|(inc)?save|restart|showvars|getpattern|sreadmem([bh])|scale)",
           "name": "support.function.non-standard.tasks.verilog"
         }
       ]
@@ -244,7 +244,7 @@
     "operators": {
       "patterns": [
         {
-          "match": "\\+|-|\\*|/|%|(<|>)=?|(!|=)?==?|!|&&?|\\|\\|?|\\^?~|~\\^?",
+          "match": "[+\\-*/%]|([<>])=?|([!=])?==?|!|&&?|\\|\\|?|\\^?~|~\\^?",
           "name": "keyword.operator.verilog"
         }
       ]
diff --git a/resources/languages/vhdl.json b/resources/languages/vhdl.json
index 585d2a5..34aa641 100644
--- a/resources/languages/vhdl.json
+++ b/resources/languages/vhdl.json
@@ -100,7 +100,7 @@
     "attribute_list": {
       "patterns": [
         {
-          "begin": "\\'\\(",
+          "begin": "'\\(",
           "beginCaptures": {
             "0": {
               "name": "punctuation.vhdl"
@@ -334,7 +334,7 @@
     "constants_numeric": {
       "patterns": [
         {
-          "match": "\\b([+\\-]?[\\d_]+\\.[\\d_]+([eE][+\\-]?[\\d_]+)?)\\b",
+          "match": "\\b([+-]?[\\d_]+\\.[\\d_]+([eE][+-]?[\\d_]+)?)\\b",
           "name": "constant.numeric.floating_point.vhdl"
         },
         {
@@ -346,15 +346,15 @@
           "name": "constant.numeric.integer.vhdl"
         },
         {
-          "match": "[xX]\"[0-9a-fA-F_uUxXzZwWlLhH\\-]+\"",
+          "match": "[xX]\"[_uUxXzZwWlLhH\\-\\h]+\"",
           "name": "constant.numeric.quoted.double.string.hex.vhdl"
         },
         {
-          "match": "[oO]\"[0-7_uUxXzZwWlLhH\\-]+\"",
+          "match": "[oO]\"[0-7_uUxXzZwWlLhH-]+\"",
           "name": "constant.numeric.quoted.double.string.octal.vhdl"
         },
         {
-          "match": "[bB]?\"[01_uUxXzZwWlLhH\\-]+\"",
+          "match": "[bB]?\"[01_uUxXzZwWlLhH-]+\"",
           "name": "constant.numeric.quoted.double.string.binary.vhdl"
         },
         {
@@ -367,7 +367,7 @@
           "name": "constant.numeric.quoted.double.string.illegal.vhdl"
         },
         {
-          "match": "'[01uUxXzZwWlLhH\\-]'",
+          "match": "'[01uUxXzZwWlLhH-]'",
           "name": "constant.numeric.quoted.single.std_logic"
         }
       ]
@@ -385,6 +385,9 @@
         },
         {
           "include": "#while_pattern"
+        },
+        {
+          "include": "#loop_pattern"
         }
       ]
     },
@@ -639,7 +642,7 @@
                   "name": "keyword.language.vhdl"
                 }
               },
-              "end": "\\;",
+              "end": ";",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.terminator.function_prototype.vhdl"
@@ -758,11 +761,55 @@
           "name": "standard.library.language.vhdl"
         },
         {
-          "match": "(\\+|\\-|<=|=|=>|:=|>=|>|<|/|\\||&|(\\*{1,2}))",
+          "match": "([+-]|<=|=|=>|:=|>=|[></|\\&]|(\\*{1,2}))",
           "name": "keyword.operator.vhdl"
         }
       ]
     },
+    "loop_pattern": {
+      "patterns": [
+        {
+          "begin": "^\\s*(([a-zA-Z][a-zA-Z0-9_]*)\\s*(:)\\s*)?\\b((?i:loop))\\b",
+          "beginCaptures": {
+            "2": {
+              "name": "entity.name.tag.loop.begin.vhdl"
+            },
+            "3": {
+              "name": "punctuation.vhdl"
+            },
+            "4": {
+              "name": "keyword.language.vhdl"
+            }
+          },
+          "end": "\\b((?i:end))\\s+(((?i:loop))|(\\S+))\\b(\\s+((\\2)|(.+?)))?(?=\\s*;)",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.language.vhdl"
+            },
+            "3": {
+              "name": "keyword.language.vhdl"
+            },
+            "4": {
+              "name": "invalid.illegal.loop.keyword.required.vhdl"
+            },
+            "7": {
+              "name": "entity.name.tag.loop.end.vhdl"
+            },
+            "8": {
+              "name": "invalid.illegal.mismatched.identifier.vhdl"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#control_patterns"
+            },
+            {
+              "include": "#cleanup"
+            }
+          ]
+        }
+      ]
+    },
     "package_body_pattern": {
       "patterns": [
         {
@@ -903,7 +950,7 @@
           "patterns": [
             {
               "begin": "(?=['\"a-zA-Z0-9])",
-              "end": "(;|\\)|,)",
+              "end": "([;),])",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.vhdl"
@@ -1038,7 +1085,7 @@
     "procedure_prototype_pattern": {
       "patterns": [
         {
-          "begin": "\\b((?i:procedure))\\s+(([a-zA-Z][a-zA-Z0-9_]*)|(.+?))(?=\\s*(\\(|;))",
+          "begin": "\\b((?i:procedure))\\s+(([a-zA-Z][a-zA-Z0-9_]*)|(.+?))(?=\\s*([(;]))",
           "beginCaptures": {
             "1": {
               "name": "keyword.language.vhdl"
@@ -1217,7 +1264,7 @@
     "punctuation": {
       "patterns": [
         {
-          "match": "(\\.|,|:|;|\\(|\\))",
+          "match": "([.,:;()])",
           "name": "punctuation.vhdl"
         }
       ]
@@ -1316,7 +1363,7 @@
     "support_constants": {
       "patterns": [
         {
-          "match": "\\b(?i:math_1_over_e|math_1_over_pi|math_1_over_sqrt_2|math_2_pi|math_3_pi_over_2|math_deg_to_rad|math_e|math_log10_of_e|math_log2_of_e|math_log_of_10|math_log_of_2|math_pi|math_pi_over_2|math_pi_over_3|math_pi_over_4|math_rad_to_deg|math_sqrt_2|math_sqrt_pi)\\b",
+          "match": "\\b(?i:math_(?:1_over_e|1_over_pi|1_over_sqrt_2|2_pi|3_pi_over_2|deg_to_rad|e|log10_of_e|log2_of_e|log_of_10|log_of_2|pi|pi_over_2|pi_over_3|pi_over_4|rad_to_deg|sqrt_2|sqrt_pi))\\b",
           "name": "support.constant.ieee.math_real.vhdl"
         },
         {
@@ -1368,7 +1415,7 @@
           "name": "support.type.std.textio.vhdl"
         },
         {
-          "match": "\\b(?i:std_logic|std_ulogic|std_logic_vector|std_ulogic_vector)\\b",
+          "match": "\\b(?i:std_(?:logic|ulogic)(?:|_vector))\\b",
           "name": "support.type.ieee.std_logic_1164.vhdl"
         },
         {
@@ -1376,7 +1423,7 @@
           "name": "support.type.ieee.numeric_std.vhdl"
         },
         {
-          "match": "\\b(?i:complex|complex_polar)\\b",
+          "match": "\\b(?i:complex(?:|_polar))\\b",
           "name": "support.type.ieee.math_complex.vhdl"
         }
       ]
diff --git a/resources/languages/viml.json b/resources/languages/viml.json
index 65daea0..b1f2075 100644
--- a/resources/languages/viml.json
+++ b/resources/languages/viml.json
@@ -46,11 +46,11 @@
     "commands": {
       "patterns": [
         {
-          "match": "\\bcom(\\s|\\!)",
+          "match": "\\bcom([\\s!])",
           "name": "storage.other.command.viml"
         },
         {
-          "match": "\\bau(\\s|\\!)",
+          "match": "\\bau([\\s!])",
           "name": "storage.other.command.viml"
         },
         {
@@ -93,7 +93,7 @@
               "name": "comment.line.foldmarker.viml"
             },
             {
-              "match": "\\}\\}\\}\\d?",
+              "match": "}}}\\d?",
               "name": "comment.line.foldmarker.viml"
             }
           ]
@@ -108,7 +108,7 @@
               "name": "comment.line.foldmarker.viml"
             },
             {
-              "match": "\\}\\}\\}\\d?",
+              "match": "}}}\\d?",
               "name": "comment.line.foldmarker.viml"
             }
           ]
@@ -130,7 +130,7 @@
     "entity": {
       "patterns": [
         {
-          "match": "(([absg]\\:)?[a-zA-Z0-9_#.]{2,})\\b(?=\\()",
+          "match": "(([absg]:)?[a-zA-Z0-9_#.]{2,})\\b(?=\\()",
           "name": "entity.name.function.viml"
         }
       ]
@@ -138,11 +138,11 @@
     "keyword": {
       "patterns": [
         {
-          "match": "\\b(if|while|for|return|au(g|group)|else(if|)?|do|in)\\b",
+          "match": "\\b(if|while|for|return|au(g(?:|roup))|else(if|)?|do|in)\\b",
           "name": "keyword.control.viml"
         },
         {
-          "match": "\\b(end|endif|endfor|endwhile)\\s|$",
+          "match": "\\b(end(?:|if|for|while))\\s|$",
           "name": "keyword.control.viml"
         },
         {
@@ -165,13 +165,13 @@
     "map": {
       "patterns": [
         {
-          "begin": "(\\<)",
+          "begin": "(<)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.map.viml"
             }
           },
-          "end": "(\\>|\\s)",
+          "end": "([>\\s])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.map.viml"
@@ -213,11 +213,11 @@
           "name": "keyword.operator.viml"
         },
         {
-          "match": " ([:\\-.]|[&|]{2})( |$)",
+          "match": " ([:\\-.]|[\\&|]{2})( |$)",
           "name": "keyword.operator.viml"
         },
         {
-          "match": "([.]{3})",
+          "match": "(\\.{3})",
           "name": "keyword.operator.viml"
         },
         {
@@ -245,7 +245,7 @@
           "name": "support.type.option.shortname.viml"
         },
         {
-          "match": "\\b(noanti|noantialias|noarab|noarabic|noarshape|noarabicshape|noari|noallowrevins|noakm|noaltkeymap|noacd|noautochdir|noai|noautoindent|noar|noautoread|noaw|noautowrite|noawa|noautowriteall|nobk|nobackup|nobeval|noballooneval|nobevalterm|noballoonevalterm|nobin|nobinary|nobomb|nobri|nobreakindent|nobl|nobuflisted|nocin|nocindent|nocp|nocompatible|nocf|noconfirm|noci|nocopyindent|nocsre|nocscoperelative|nocst|nocscopetag|nocsverb|nocscopeverbose|nocrb|nocursorbind|nocuc|nocursorcolumn|nocul|nocursorline|nodeco|nodelcombine|nodiff|nodg|nodigraph|noed|noedcompatible|noemo|noemoji|noeol|noendofline|noea|noequalalways|noeb|noerrorbells|noek|noesckeys|noet|noexpandtab|noex|noexrc|nofic|nofileignorecase|nofixeol|nofixendofline|nofk|nofkmap|nofen|nofoldenable|nofs|nofsync|nogd|nogdefault|noguipty|nohid|nohidden|nohk|nohkmap|nohkp|nohkmapp|nohls|nohlsearch|noicon|noic|noignorecase|noimc|noimcmdline|noimd|noimdisable|nois|noincsearch|noinf|noinfercase|noim|noinsertmode|nojs|nojoinspaces|nolnr|nolangnoremap|nolrm|nolangremap|nolz|nolazyredraw|nolbr|nolinebreak|nolisp|nolist|nolpl|noloadplugins|nomacatsui|nomagic|noml|nomodeline|noma|nomodifiable|nomod|nomodified|nomore|nomousef|nomousefocus|nomh|nomousehide|nonu|nonumber|noodev|noopendevice|nopaste|nopi|nopreserveindent|nopvw|nopreviewwindow|noprompt|noro|noreadonly|nornu|norelativenumber|nors|norestorescreen|nori|norevins|norl|norightleft|noru|noruler|noscb|noscrollbind|nosecure|nossl|noshellslash|nostmp|noshelltemp|nosr|noshiftround|nosn|noshortname|nosc|noshowcmd|nosft|noshowfulltag|nosm|noshowmatch|nosmd|noshowmode|noscs|nosmartcase|nosi|nosmartindent|nosta|nosmarttab|nospell|nosb|nosplitbelow|nospr|nosplitright|nosol|nostartofline|noswf|noswapfile|notbs|notagbsearch|notr|notagrelative|notgst|notagstack|notbidi|notermbidi|notgc|notermguicolors|noterse|nota|notextauto|notx|notextmode|notop|notildeop|noto|notimeout|notitle|nottimeout|notbi|nottybuiltin|notf|nottyfast|noudf|noundofile|novb|novisualbell|nowarn|nowiv|noweirdinvert|nowic|nowildignorecase|nowmnu|nowildmenu|nowfh|nowinfixheight|nowfw|nowinfixwidth|nowrapscan|nowrap|nows|nowrite|nowa|nowriteany|nowb|nowritebackup)\\b",
+          "match": "\\b(no(?:anti|antialias|arab|arabic|arshape|arabicshape|ari|allowrevins|akm|altkeymap|acd|autochdir|ai|autoindent|ar|autoread|aw|autowrite|awa|autowriteall|bk|backup|beval|ballooneval|bevalterm|balloonevalterm|bin|binary|bomb|bri|breakindent|bl|buflisted|cin|cindent|cp|compatible|cf|confirm|ci|copyindent|csre|cscoperelative|cst|cscopetag|csverb|cscopeverbose|crb|cursorbind|cuc|cursorcolumn|cul|cursorline|deco|delcombine|diff|dg|digraph|ed|edcompatible|emo|emoji|eol|endofline|ea|equalalways|eb|errorbells|ek|esckeys|et|expandtab|ex|exrc|fic|fileignorecase|fixeol|fixendofline|fk|fkmap|fen|foldenable|fs|fsync|gd|gdefault|guipty|hid|hidden|hk|hkmap|hkp|hkmapp|hls|hlsearch|icon|ic|ignorecase|imc|imcmdline|imd|imdisable|is|incsearch|inf|infercase|im|insertmode|js|joinspaces|lnr|langnoremap|lrm|langremap|lz|lazyredraw|lbr|linebreak|lisp|list|lpl|loadplugins|macatsui|magic|ml|modeline|ma|modifiable|mod|modified|more|mousef|mousefocus|mh|mousehide|nu|number|odev|opendevice|paste|pi|preserveindent|pvw|previewwindow|prompt|ro|readonly|rnu|relativenumber|rs|restorescreen|ri|revins|rl|rightleft|ru|ruler|scb|scrollbind|secure|ssl|shellslash|stmp|shelltemp|sr|shiftround|sn|shortname|sc|showcmd|sft|showfulltag|sm|showmatch|smd|showmode|scs|smartcase|si|smartindent|sta|smarttab|spell|sb|splitbelow|spr|splitright|sol|startofline|swf|swapfile|tbs|tagbsearch|tr|tagrelative|tgst|tagstack|tbidi|termbidi|tgc|termguicolors|terse|ta|textauto|tx|textmode|top|tildeop|to|timeout|title|ttimeout|tbi|ttybuiltin|tf|ttyfast|udf|undofile|vb|visualbell|warn|wiv|weirdinvert|wic|wildignorecase|wmnu|wildmenu|wfh|winfixheight|wfw|winfixwidth|wrapscan|wrap|ws|write|wa|writeany|wb|writebackup))\\b",
           "name": "support.type.option.off.viml"
         }
       ]
@@ -257,7 +257,7 @@
           "name": "punctuation.parens.viml"
         },
         {
-          "match": "([,])",
+          "match": "(,)",
           "name": "punctuation.comma.viml"
         }
       ]
@@ -269,11 +269,11 @@
           "name": "storage.viml"
         },
         {
-          "match": "\\b(abort|autocmd)\\b",
+          "match": "\\b(a(?:bort|utocmd))\\b",
           "name": "storage.viml"
         },
         {
-          "match": "\\b(set(l|local)?)\\b",
+          "match": "\\b(set(l(?:|ocal))?)\\b",
           "name": "storage.viml"
         },
         {
@@ -285,7 +285,7 @@
           "name": "storage.viml"
         },
         {
-          "match": "\\b(Plug|Plugin)\\b",
+          "match": "\\b(Plug(?:|in))\\b",
           "name": "storage.plugin.viml"
         }
       ]
@@ -323,7 +323,7 @@
           "name": "support.function.viml"
         },
         {
-          "match": "(v\\:(beval_col|beval_bufnr|beval_lnum|beval_text|beval_winnr|char|charconvert_from|charconvert_to|cmdarg|cmdbang|count|count1|ctype|dying|errmsg|exception|fcs_reason|fcs_choice|fname_in|fname_out|fname_new|fname_diff|folddashes|foldlevel|foldend|foldstart|insertmode|key|lang|lc_time|lnum|mouse_win|mouse_lnum|mouse_col|oldfiles|operator|prevcount|profiling|progname|register|scrollstart|servername|searchforward|shell_error|statusmsg|swapname|swapchoice|swapcommand|termresponse|this_session|throwpoint|val|version|warningmsg|windowid))",
+          "match": "(v:(beval_col|beval_bufnr|beval_lnum|beval_text|beval_winnr|char|charconvert_from|charconvert_to|cmdarg|cmdbang|count|count1|ctype|dying|errmsg|exception|fcs_reason|fcs_choice|fname_in|fname_out|fname_new|fname_diff|folddashes|foldlevel|foldend|foldstart|insertmode|key|lang|lc_time|lnum|mouse_win|mouse_lnum|mouse_col|oldfiles|operator|prevcount|profiling|progname|register|scrollstart|servername|searchforward|shell_error|statusmsg|swapname|swapchoice|swapcommand|termresponse|this_session|throwpoint|val|version|warningmsg|windowid))",
           "name": "support.type.builtin.vim-variable.viml"
         },
         {
@@ -335,7 +335,7 @@
           "name": "support.type.builtin.viml"
         },
         {
-          "match": "\\<args\\>",
+          "match": "<args>",
           "name": "support.variable.args.viml"
         },
         {
@@ -367,7 +367,7 @@
           "name": "keyword.other.syntax.viml"
         },
         {
-          "match": "\\b(add|containedin|contains|matchgroup|nextgroup)\\=",
+          "match": "\\b(add|containedin|contains|matchgroup|nextgroup)=",
           "name": "keyword.other.syntax.viml"
         },
         {
@@ -379,7 +379,7 @@
               "name": "string.regexp.viml"
             }
           },
-          "match": "((start|skip|end)\\=)(\\+\\S+\\+\\s)?"
+          "match": "((start|skip|end)=)(\\+\\S+\\+\\s)?"
         },
         {
           "captures": {
@@ -396,7 +396,7 @@
               "name": "storage.modifier.syntax.viml"
             }
           },
-          "match": "(syn|syntax)\\s+(cluster|keyword|match|region)(\\s+\\w+\\s+)(contained)?",
+          "match": "(syn(?:|tax))\\s+(cluster|keyword|match|region)(\\s+\\w+\\s+)(contained)?",
           "patterns": [
           ]
         },
@@ -418,7 +418,7 @@
               "name": "variable.other.viml"
             }
           },
-          "match": "(hi|highlight)(?:\\s+)(def|default)(?:\\s+)(link)(?:\\s+)(\\w+)(?:\\s+)(\\w+)",
+          "match": "(hi(?:|ghlight))\\s+(def(?:|ault))\\s+(link)\\s+(\\w+)\\s+(\\w+)",
           "patterns": [
           ]
         }
diff --git a/resources/languages/vue-html.json b/resources/languages/vue-html.json
index c95f6fb..6436afc 100644
--- a/resources/languages/vue-html.json
+++ b/resources/languages/vue-html.json
@@ -241,7 +241,7 @@
       ]
     },
     {
-      "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)(?!-)\\b)",
+      "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|[qs]|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)(?!-)\\b)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -310,7 +310,7 @@
               "name": "punctuation.definition.entity.html"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html"
         },
         {
@@ -379,7 +379,7 @@
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?!\\G)(?<='|\"|[^\\s<>/])",
+      "end": "(?!\\G)(?<=['\"[^\\s<>/]])",
       "name": "meta.attribute-with-value.id.html",
       "patterns": [
         {
@@ -468,7 +468,7 @@
       "name": "string.unquoted.html"
     },
     "vue-directives": {
-      "begin": "(?:\\b(v-)|(:|@|#))([a-zA-Z0-9\\-_]+)(?:\\:([a-zA-Z\\-_]+))?(?:\\.([a-zA-Z\\-_]+))*\\s*(=)",
+      "begin": "(?:\\b(v-)|([:@#]))([a-zA-Z0-9\\-_]+)(?::([a-zA-Z\\-_]+))?(?:\\.([a-zA-Z\\-_]+))*\\s*(=)",
       "captures": {
         "1": {
           "name": "entity.other.attribute-name.html"
@@ -489,7 +489,7 @@
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?<='|\")|(?=[\\s<>`])",
+      "end": "(?<=['\"])|(?=[\\s<>`])",
       "name": "meta.directive.vue",
       "patterns": [
         {
diff --git a/resources/languages/vue.json b/resources/languages/vue.json
index 538b611..043d113 100644
--- a/resources/languages/vue.json
+++ b/resources/languages/vue.json
@@ -47,7 +47,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "text.html.markdown",
               "patterns": [
                 {
@@ -79,7 +79,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "text.html.derivative",
               "patterns": [
                 {
@@ -111,7 +111,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "text.pug",
               "patterns": [
                 {
@@ -143,7 +143,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.stylus",
               "patterns": [
                 {
@@ -175,7 +175,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.postcss",
               "patterns": [
                 {
@@ -207,7 +207,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.sass",
               "patterns": [
                 {
@@ -239,7 +239,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.css",
               "patterns": [
                 {
@@ -271,7 +271,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.css.scss",
               "patterns": [
                 {
@@ -303,7 +303,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.css.less",
               "patterns": [
                 {
@@ -335,7 +335,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.js",
               "patterns": [
                 {
@@ -367,7 +367,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.ts",
               "patterns": [
                 {
@@ -399,7 +399,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.js.jsx",
               "patterns": [
                 {
@@ -431,7 +431,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.tsx",
               "patterns": [
                 {
@@ -463,7 +463,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.coffee",
               "patterns": [
                 {
@@ -495,7 +495,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.json",
               "patterns": [
                 {
@@ -527,7 +527,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.json.comments",
               "patterns": [
                 {
@@ -559,7 +559,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.json5",
               "patterns": [
                 {
@@ -591,7 +591,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.yaml",
               "patterns": [
                 {
@@ -623,7 +623,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.toml",
               "patterns": [
                 {
@@ -634,7 +634,7 @@
           ]
         },
         {
-          "begin": "([a-zA-Z0-9:-]+)\\b(?=[^>]*\\blang\\s*=\\s*(['\"]?)(gql|graphql)\\b\\2)",
+          "begin": "([a-zA-Z0-9:-]+)\\b(?=[^>]*\\blang\\s*=\\s*(['\"]?)(g(?:ql|raphql))\\b\\2)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.$1.html.vue"
@@ -655,7 +655,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.graphql",
               "patterns": [
                 {
@@ -687,7 +687,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "source.vue",
               "patterns": [
                 {
@@ -719,7 +719,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/template\\b)",
+              "end": "(?=</template\\b)",
               "name": "text.html.derivative",
               "patterns": [
                 {
@@ -751,7 +751,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/script\\b)",
+              "end": "(?=</script\\b)",
               "name": "source.js",
               "patterns": [
                 {
@@ -783,7 +783,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/style\\b)",
+              "end": "(?=</style\\b)",
               "name": "source.css",
               "patterns": [
                 {
@@ -815,7 +815,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=<\\/)",
+              "end": "(?=</)",
               "name": "text"
             }
           ]
@@ -1020,7 +1020,7 @@
       ]
     },
     "vue-directives-control": {
-      "begin": "(v-for)|(v-if|v-else-if|v-else)",
+      "begin": "(v-for)|(v-(?:if|else-if|else))",
       "captures": {
         "1": {
           "name": "keyword.control.loop.vue"
@@ -1040,7 +1040,7 @@
     "vue-directives-expression": {
       "patterns": [
         {
-          "begin": "(=)\\s*('|\"|`)",
+          "begin": "(=)\\s*(['\"`])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.key-value.html.vue"
@@ -1057,7 +1057,7 @@
           },
           "patterns": [
             {
-              "begin": "(?<=('|\"|`))",
+              "begin": "(?<=(['\"`]))",
               "end": "(?=\\1)",
               "name": "source.ts.embedded.html.vue",
               "patterns": [
@@ -1075,11 +1075,11 @@
               "name": "punctuation.separator.key-value.html.vue"
             }
           },
-          "end": "(?=(\\s|>|\\/>))",
+          "end": "(?=([\\s>]|/>))",
           "patterns": [
             {
               "begin": "(?=[^'\"`])",
-              "end": "(?=(\\s|>|\\/>))",
+              "end": "(?=([\\s>]|/>))",
               "name": "source.ts.embedded.html.vue",
               "patterns": [
                 {
@@ -1101,17 +1101,16 @@
           "name": "punctuation.separator.key-value.html.vue"
         }
       },
-      "end": "(?<='|\")",
+      "end": "(?<=['\"])",
       "name": "meta.attribute.generic.vue",
       "patterns": [
         {
-          "begin": "('|\")",
+          "begin": "(['\"])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.html.vue"
             }
           },
-          "comment": "https://github.com/microsoft/vscode/blob/fd4346210f59135fad81a8b8c4cea7bf5a9ca6b4/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json#L4002-L4020",
           "end": "(\\1)",
           "endCaptures": {
             "1": {
@@ -1142,7 +1141,7 @@
       ]
     },
     "vue-directives-original": {
-      "begin": "(?:(?:(v-[\\w-]+)(:)?)|([:\\.])|(@)|(#))(?:(?:(\\[)([^\\]]*)(\\]))|([\\w-]+))?",
+      "begin": "(?:(v-[\\w-]+)(:)?|([:.])|(@)|(#))(?:(\\[)([^\\]]*)(])|([\\w-]+))?",
       "beginCaptures": {
         "1": {
           "name": "entity.other.attribute-name.html.vue"
@@ -1209,17 +1208,16 @@
           "name": "punctuation.separator.key-value.html.vue"
         }
       },
-      "end": "(?<='|\")",
+      "end": "(?<=['\"])",
       "name": "meta.attribute.style.vue",
       "patterns": [
         {
-          "begin": "('|\")",
+          "begin": "(['\"])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.html.vue"
             }
           },
-          "comment": "Copy from source.css#rule-list-innards",
           "end": "(\\1)",
           "endCaptures": {
             "1": {
@@ -1238,7 +1236,7 @@
               "include": "source.css#font-features"
             },
             {
-              "match": "(?<![\\w-])--(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+              "match": "(?<![\\w-])--[-a-zA-Z_[^\\x00-\\x7F]](?:[-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
               "name": "variable.css"
             },
             {
@@ -1258,9 +1256,8 @@
                   "name": "punctuation.separator.key-value.css"
                 }
               },
-              "comment": "Modify end to fix #199. TODO: handle ' character.",
               "contentName": "meta.property-value.css",
-              "end": "\\s*(;)|\\s*(?='|\")",
+              "end": "\\s*(;)|\\s*(?=['\"])",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.terminator.rule.css"
@@ -1292,7 +1289,7 @@
               "name": "punctuation.definition.interpolation.begin.html.vue"
             }
           },
-          "end": "(\\}\\})",
+          "end": "(}})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.interpolation.end.html.vue"
@@ -1302,7 +1299,7 @@
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(?=\\}\\})",
+              "end": "(?=}})",
               "name": "source.ts.embedded.html.vue",
               "patterns": [
                 {
diff --git a/resources/languages/vyper.json b/resources/languages/vyper.json
index ea79cf0..77d0115 100644
--- a/resources/languages/vyper.json
+++ b/resources/languages/vyper.json
@@ -44,8 +44,8 @@
       "name": "keyword.operator.assignment.python"
     },
     "backticks": {
-      "begin": "\\`",
-      "end": "(?:\\`|(?<!\\\\)(\\n))",
+      "begin": "`",
+      "end": "(?:`|(?<!\\\\)(\\n))",
       "name": "invalid.deprecated.backtick.python",
       "patterns": [
         {
@@ -144,7 +144,6 @@
     },
     "call-wrapper-inheritance": {
       "begin": "\\b(?=([[:alpha:]_]\\w*)\\s*(\\())",
-      "comment": "same as a function call, but in inheritance context",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -164,7 +163,7 @@
     "class-declaration": {
       "patterns": [
         {
-          "begin": "\\s*(class)\\s+(?=[[:alpha:]_]\\w*\\s*(:|\\())",
+          "begin": "\\s*(class)\\s+(?=[[:alpha:]_]\\w*\\s*([:(]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.python"
@@ -204,7 +203,7 @@
       "name": "meta.class.inheritance.python",
       "patterns": [
         {
-          "match": "(\\*\\*|\\*)",
+          "match": "(\\*(?:\\*|))",
           "name": "keyword.operator.unpacking.arguments.python"
         },
         {
@@ -270,12 +269,12 @@
           "name": "keyword.codetag.notation.python"
         }
       },
-      "match": "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)"
+      "match": "\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b"
     },
     "comments": {
       "patterns": [
         {
-          "begin": "(?:\\#\\s*(type:)\\s*+(?!$|\\#))",
+          "begin": "#\\s*(type:)\\s*+(?!$|#)",
           "beginCaptures": {
             "0": {
               "name": "meta.typehint.comment.python"
@@ -285,11 +284,11 @@
             }
           },
           "contentName": "meta.typehint.comment.python",
-          "end": "(?:$|(?=\\#))",
+          "end": "(?:$|(?=#))",
           "name": "comment.line.number-sign.python",
           "patterns": [
             {
-              "match": "\\Gignore(?=\\s*(?:$|\\#))",
+              "match": "\\Gignore(?=\\s*(?:$|#))",
               "name": "comment.typehint.ignore.notation.python"
             },
             {
@@ -297,7 +296,7 @@
               "name": "comment.typehint.type.notation.python"
             },
             {
-              "match": "([\\[\\]\\(\\),\\.\\=\\*]|(->))",
+              "match": "([\\[\\](),.=*]|(->))",
               "name": "comment.typehint.punctuation.notation.python"
             },
             {
@@ -312,7 +311,7 @@
       ]
     },
     "comments-base": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -327,7 +326,7 @@
       ]
     },
     "comments-string-double-three": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -342,7 +341,7 @@
       ]
     },
     "comments-string-single-three": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -363,7 +362,7 @@
           "name": "punctuation.definition.dict.begin.python"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dict.end.python"
@@ -389,7 +388,7 @@
           "name": "punctuation.definition.decorator.python"
         }
       },
-      "end": "(\\))(?:(.*?)(?=\\s*(?:\\#|$)))|(?=\\n|\\#)",
+      "end": "(\\))(.*?)(?=\\s*(?:#|$))|(?=[\\n#])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.arguments.end.python"
@@ -434,7 +433,7 @@
               "name": "invalid.illegal.decorator.python"
             }
           },
-          "match": "\\s*([^([:alpha:]\\s_\\.#\\\\].*?)(?=\\#|$)",
+          "match": "\\s*([^([:alpha:]\\s_.#\\\\].*?)(?=#|$)",
           "name": "invalid.illegal.decorator.python"
         }
       ]
@@ -442,7 +441,7 @@
     "docstring": {
       "patterns": [
         {
-          "begin": "(\\'\\'\\'|\\\"\\\"\\\")",
+          "begin": "('''|\"\"\")",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.python"
@@ -468,7 +467,7 @@
           ]
         },
         {
-          "begin": "([rR])(\\'\\'\\'|\\\"\\\"\\\")",
+          "begin": "([rR])('''|\"\"\")",
           "beginCaptures": {
             "1": {
               "name": "storage.type.string.python"
@@ -497,7 +496,7 @@
           ]
         },
         {
-          "begin": "(\\'|\\\")",
+          "begin": "(['\"])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.python"
@@ -523,7 +522,7 @@
           ]
         },
         {
-          "begin": "([rR])(\\'|\\\")",
+          "begin": "([rR])(['\"])",
           "beginCaptures": {
             "1": {
               "name": "storage.type.string.python"
@@ -572,12 +571,11 @@
           "name": "keyword.control.flow.python"
         }
       },
-      "match": "(?:(?:^|\\G)\\s*((?:>>>|\\.\\.\\.)\\s)(?=\\s*\\S))"
+      "match": "(?:^|\\G)\\s*((?:>>>|\\.\\.\\.)\\s)(?=\\s*\\S)"
     },
     "docstring-statement": {
-      "begin": "^(?=\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
-      "comment": "the string either terminates correctly or by the beginning of a new line (this is for single line docstrings that aren't terminated) AND it's not followed by another docstring",
-      "end": "((?<=\\1)|^)(?!\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
+      "begin": "^(?=\\s*[rR]?('''|\"\"\"|['\"]))",
+      "end": "((?<=\\1)|^)(?!\\s*[rR]?('''|\"\"\"|['\"]))",
       "patterns": [
         {
           "include": "#docstring"
@@ -587,10 +585,10 @@
     "double-one-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -602,7 +600,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\"))|((?=(?<!\\\\)\\n))",
+          "end": "(]|(?=\"))|((?=(?<!\\\\)\\n))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -617,7 +615,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -648,7 +646,7 @@
       ]
     },
     "double-one-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -816,7 +814,7 @@
       ]
     },
     "double-one-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -888,10 +886,10 @@
     "double-three-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -903,7 +901,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\"\"\"))",
+          "end": "(]|(?=\"\"\"))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -918,7 +916,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -949,7 +947,7 @@
       ]
     },
     "double-three-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -1135,7 +1133,7 @@
       ]
     },
     "double-three-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -1218,19 +1216,18 @@
       "name": "constant.other.ellipsis.python"
     },
     "escape-sequence": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|[0-7]{1,3}|[\\\\\"'abfnrtv])",
+      "match": "\\\\(x\\h{2}|[0-7]{1,3}|[\\\\\"'abfnrtv])",
       "name": "constant.character.escape.python"
     },
     "escape-sequence-unicode": {
       "patterns": [
         {
-          "match": "\\\\(u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8}|N\\{[\\w\\s]+?\\})",
+          "match": "\\\\(u\\h{4}|U\\h{8}|N\\{[\\w\\s]+?})",
           "name": "constant.character.escape.python"
         }
       ]
     },
     "expression": {
-      "comment": "All valid Python expressions",
       "patterns": [
         {
           "include": "#expression-base"
@@ -1239,13 +1236,11 @@
           "include": "#member-access"
         },
         {
-          "comment": "Tokenize identifiers to help linters",
           "match": "\\b([[:alpha:]_]\\w*)\\b"
         }
       ]
     },
     "expression-bare": {
-      "comment": "valid Python expressions w/o comments and line continuation",
       "patterns": [
         {
           "include": "#backticks"
@@ -1328,7 +1323,6 @@
       ]
     },
     "expression-base": {
-      "comment": "valid Python expressions with comments and line continuation",
       "patterns": [
         {
           "include": "#comments"
@@ -1342,7 +1336,6 @@
       ]
     },
     "f-expression": {
-      "comment": "All valid Python expressions, except comments and line continuation",
       "patterns": [
         {
           "include": "#expression-bare"
@@ -1351,7 +1344,6 @@
           "include": "#member-access"
         },
         {
-          "comment": "Tokenize identifiers to help linters",
           "match": "\\b([[:alpha:]_]\\w*)\\b"
         }
       ]
@@ -1365,7 +1357,7 @@
           "include": "#fstring-formatting-braces"
         },
         {
-          "match": "\\{.*?\\}"
+          "match": "\\{.*?}"
         },
         {
           "include": "#regexp-base-common"
@@ -1373,7 +1365,7 @@
       ]
     },
     "fregexp-quantifier": {
-      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}\\}",
+      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)}}",
       "name": "keyword.operator.quantifier.regexp"
     },
     "fstring-fnorm-quoted-multi-line": {
@@ -1476,11 +1468,10 @@
               "name": "constant.character.format.placeholder.other.python"
             }
           },
-          "comment": "empty braces are illegal",
-          "match": "({)(\\s*?)(})"
+          "match": "(\\{)(\\s*?)(})"
         },
         {
-          "match": "({{|}})",
+          "match": "(\\{\\{|}})",
           "name": "constant.character.escape.python"
         }
       ]
@@ -1519,8 +1510,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "comment": "it is illegal to have a multiline brace inside a single-line string",
-      "end": "(\\})|(?=\\n)",
+      "end": "(})|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1542,8 +1532,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "comment": "value interpolation using { ... }",
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1559,7 +1548,7 @@
       ]
     },
     "fstring-multi-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|'''|\"\"\"))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|'''|\"\"\"))|\\n",
       "name": "string.interpolated.python string.quoted.multi.python"
     },
     "fstring-normf-quoted-multi-line": {
@@ -1649,7 +1638,7 @@
       ]
     },
     "fstring-raw-multi-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|'''|\"\"\"))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|'''|\"\"\"))|\\n",
       "name": "string.interpolated.python string.quoted.raw.multi.python"
     },
     "fstring-raw-quoted-multi-line": {
@@ -1723,7 +1712,7 @@
       ]
     },
     "fstring-raw-single-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n)))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|(['\"])|((?<!\\\\)\\n)))|\\n",
       "name": "string.interpolated.python string.quoted.raw.single.python"
     },
     "fstring-single-brace": {
@@ -1733,8 +1722,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "comment": "value interpolation using { ... }",
-      "end": "(\\})|(?=\\n)",
+      "end": "(})|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1750,7 +1738,7 @@
       ]
     },
     "fstring-single-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n)))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|(['\"])|((?<!\\\\)\\n)))|\\n",
       "name": "string.interpolated.python string.quoted.single.python"
     },
     "fstring-terminator-multi": {
@@ -1772,7 +1760,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "((?:=?)(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
+          "match": "(=?(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
         },
         {
           "include": "#fstring-terminator-multi-tail"
@@ -1780,7 +1768,7 @@
       ]
     },
     "fstring-terminator-multi-tail": {
-      "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
+      "begin": "(=?(?:![rsa])?)(:)(?=.*?\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.format.python"
@@ -1814,7 +1802,7 @@
           "name": "storage.type.format.python"
         },
         {
-          "match": "(\\#)",
+          "match": "(#)",
           "name": "storage.type.format.python"
         },
         {
@@ -1850,7 +1838,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "((?:=?)(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
+          "match": "(=?(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
         },
         {
           "include": "#fstring-terminator-single-tail"
@@ -1858,7 +1846,7 @@
       ]
     },
     "fstring-terminator-single-tail": {
-      "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
+      "begin": "(=?(?:![rsa])?)(:)(?=.*?\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.format.python"
@@ -1892,7 +1880,7 @@
           "name": "storage.type.format.python"
         },
         {
-          "match": "(\\#)",
+          "match": "(#)",
           "name": "storage.type.format.python"
         },
         {
@@ -1970,7 +1958,6 @@
     },
     "function-call": {
       "begin": "\\b(?=([[:alpha:]_]\\w*)\\s*(\\())",
-      "comment": "Regular function call of the type \"name(args)\"",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -1991,7 +1978,7 @@
       ]
     },
     "function-declaration": {
-      "begin": "\\s*(?:\\b(async)\\s+)?\\b(def)\\s+(?=[[:alpha:]_][[:word:]]*\\s*\\()",
+      "begin": "\\s*(?:\\b(async)\\s+)?\\b(def)\\s+(?=[[:alpha:]_]\\p{word}*\\s*\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.async.python"
@@ -2050,7 +2037,6 @@
           "include": "#builtin-possible-callables"
         },
         {
-          "comment": "Some color schemas support meta.function-call.generic scope",
           "match": "\\b([[:alpha:]_]\\w*)\\b",
           "name": "meta.function-call.generic.python"
         }
@@ -2063,7 +2049,6 @@
           "name": "keyword.control.flow.python"
         }
       },
-      "comment": "Match \"for ... in\" construct used in generators and for loops to\ncorrectly identify the \"in\" as a control flow keyword.\n",
       "end": "\\bin\\b",
       "endCaptures": {
         "0": {
@@ -2089,10 +2074,9 @@
           "name": "keyword.control.import.python"
         }
       },
-      "match": "\\b(?:(and|assert|async|await|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|in|is|(?<=\\.)lambda|lambda(?=\\s*[\\.=])|nonlocal|not|or|pass|raise|return|try|while|with|yield)|(as|import))\\b"
+      "match": "\\b(?:(and|assert|async|await|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|in|is|(?<=\\.)lambda|lambda(?=\\s*[.=])|nonlocal|not|or|pass|raise|return|try|while|with|yield)|(as|import))\\b"
     },
     "illegal-object-name": {
-      "comment": "It's illegal to name class or function \"True\"",
       "match": "\\b(True|False|None)\\b",
       "name": "keyword.illegal.name.python"
     },
@@ -2107,14 +2091,12 @@
           "name": "invalid.illegal.operator.python"
         },
         {
-          "comment": "We don't want `!` to flash when we're typing `!=`",
           "match": "!\\b",
           "name": "invalid.illegal.operator.python"
         }
       ]
     },
     "import": {
-      "comment": "Import statements used to correctly mark `from`, `import`, and `as`\n",
       "patterns": [
         {
           "begin": "\\b(?<!\\.)(from)\\b(?=.+import)",
@@ -2155,7 +2137,6 @@
       ]
     },
     "impossible": {
-      "comment": "This is a special rule that should be used where no match is desired. It is not a good idea to match something like '1{0}' because in some cases that can result in infinite loops in token generation. So the rule instead matches and impossible expression to allow a match to fail and move to the next token.",
       "match": "$.^"
     },
     "inheritance-identifier": {
@@ -2183,7 +2164,7 @@
       "patterns": [
         {
           "begin": "\\b(?=[[:alpha:]_]\\w*\\s*\\[)",
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.python"
@@ -2212,7 +2193,7 @@
         }
       },
       "contentName": "meta.item-access.arguments.python",
-      "end": "(?=\\])",
+      "end": "(?=])",
       "patterns": [
         {
           "match": ":",
@@ -2251,7 +2232,7 @@
               "name": "keyword.control.flow.python"
             }
           },
-          "match": "((?<=\\.)lambda|lambda(?=\\s*[\\.=]))"
+          "match": "((?<=\\.)lambda|lambda(?=\\s*[.=]))"
         },
         {
           "captures": {
@@ -2282,7 +2263,7 @@
               "name": "keyword.operator.positional.parameter.python"
             },
             {
-              "match": "(\\*\\*|\\*)",
+              "match": "(\\*(?:\\*|))",
               "name": "keyword.operator.unpacking.parameter.python"
             },
             {
@@ -2374,7 +2355,7 @@
               "name": "punctuation.separator.continuation.line.python"
             }
           },
-          "end": "(?=^\\s*$)|(?!(\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))|(\\G$))",
+          "end": "(?=^\\s*$)|(?!(\\s*[rR]?('''|\"\"\"|['\"]))|(\\G$))",
           "patterns": [
             {
               "include": "#regexp"
@@ -2393,7 +2374,7 @@
           "name": "punctuation.definition.list.begin.python"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.list.end.python"
@@ -2441,7 +2422,6 @@
           "name": "support.function.magic.python"
         }
       },
-      "comment": "these methods have magic interpretation by python and are generally called\nindirectly through syntactic constructs\n",
       "match": "\\b(__(?:abs|add|aenter|aexit|aiter|and|anext|await|bool|call|ceil|class_getitem|cmp|coerce|complex|contains|copy|deepcopy|del|delattr|delete|delitem|delslice|dir|div|divmod|enter|eq|exit|float|floor|floordiv|format|ge|get|getattr|getattribute|getinitargs|getitem|getnewargs|getslice|getstate|gt|hash|hex|iadd|iand|idiv|ifloordiv||ilshift|imod|imul|index|init|instancecheck|int|invert|ior|ipow|irshift|isub|iter|itruediv|ixor|le|len|long|lshift|lt|missing|mod|mul|ne|neg|new|next|nonzero|oct|or|pos|pow|radd|rand|rdiv|rdivmod|reduce|reduce_ex|repr|reversed|rfloordiv||rlshift|rmod|rmul|ror|round|rpow|rrshift|rshift|rsub|rtruediv|rxor|set|setattr|setitem|set_name|setslice|setstate|sizeof|str|sub|subclasscheck|truediv|trunc|unicode|xor|matmul|rmatmul|imatmul|init_subclass|set_name|fspath|bytes|prepare|length_hint)__)\\b"
     },
     "magic-names": {
@@ -2460,7 +2440,6 @@
           "name": "support.variable.magic.python"
         }
       },
-      "comment": "magic variables which a class/module may have.",
       "match": "\\b(__(?:all|annotations|bases|builtins|class|closure|code|debug|defaults|dict|doc|file|func|globals|kwdefaults|match_args|members|metaclass|methods|module|mro|mro_entries|name|qualname|post_init|self|signature|slots|subclasses|version|weakref|wrapped|classcell|spec|path|package|future|traceback)__)\\b"
     },
     "member-access": {
@@ -2485,7 +2464,6 @@
       ]
     },
     "member-access-attribute": {
-      "comment": "Highlight attribute access in otherwise non-specialized cases.",
       "match": "\\b([[:alpha:]_]\\w*)\\b",
       "name": "meta.attribute.python"
     },
@@ -2568,7 +2546,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[bB])(_?[01])+\\b",
+      "match": "(?<![\\w.])(0[bB])(_?[01])+\\b",
       "name": "constant.numeric.bin.python"
     },
     "number-dec": {
@@ -2580,7 +2558,7 @@
           "name": "invalid.illegal.dec.python"
         }
       },
-      "match": "(?<![\\w\\.])(?:[1-9](?:_?[0-9])*|0+|[0-9](?:_?[0-9])*([jJ])|0([0-9]+)(?![eE\\.]))\\b",
+      "match": "(?<![\\w.])(?:[1-9](?:_?[0-9])*|0+|[0-9](?:_?[0-9])*([jJ])|0([0-9]+)(?![eE.]))\\b",
       "name": "constant.numeric.dec.python"
     },
     "number-float": {
@@ -2589,7 +2567,7 @@
           "name": "storage.type.imaginary.number.python"
         }
       },
-      "match": "(?<!\\w)(?:(?:\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.)(?:[eE][+-]?[0-9](?:_?[0-9])*)?|[0-9](?:_?[0-9])*(?:[eE][+-]?[0-9](?:_?[0-9])*))([jJ])?\\b",
+      "match": "(?<!\\w)(?:(?:\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.)(?:[eE][+-]?[0-9](?:_?[0-9])*)?|[0-9](?:_?[0-9])*[eE][+-]?[0-9](?:_?[0-9])*)([jJ])?\\b",
       "name": "constant.numeric.float.python"
     },
     "number-hex": {
@@ -2598,7 +2576,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[xX])(_?[0-9a-fA-F])+\\b",
+      "match": "(?<![\\w.])(0[xX])(_?\\h)+\\b",
       "name": "constant.numeric.hex.python"
     },
     "number-long": {
@@ -2607,8 +2585,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "comment": "this is to support python2 syntax for long ints",
-      "match": "(?<![\\w\\.])([1-9][0-9]*|0)([lL])\\b",
+      "match": "(?<![\\w.])([1-9][0-9]*|0)([lL])\\b",
       "name": "constant.numeric.bin.python"
     },
     "number-oct": {
@@ -2617,12 +2594,11 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[oO])(_?[0-7])+\\b",
+      "match": "(?<![\\w.])(0[oO])(_?[0-7])+\\b",
       "name": "constant.numeric.oct.python"
     },
     "odd-function-call": {
-      "begin": "(?<=\\]|\\))\\s*(?=\\()",
-      "comment": "A bit obscured function call where there may have been an\narbitrary number of other operations to get the function.\nE.g. \"arr[idx](args)\"\n",
+      "begin": "(?<=[\\])])\\s*(?=\\()",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -2656,7 +2632,7 @@
           "name": "keyword.operator.assignment.python"
         }
       },
-      "match": "\\b(?<!\\.)(?:(and|or|not|in|is)|(for|if|else|await|(?:yield(?:\\s+from)?)))(?!\\s*:)\\b|(<<|>>|&|\\||\\^|~)|(\\*\\*|\\*|\\+|-|%|//|/|@)|(!=|==|>=|<=|<|>)|(:=)"
+      "match": "\\b(?<!\\.)(?:(and|or|not|in|is)|(for|if|else|await|yield(?:\\s+from)?))(?!\\s*:)\\b|(<<|>>|[\\&|^~])|(\\*\\*|[*+\\-%]|//|[/@])|(!=|==|>=|<=|[<>])|(:=)"
     },
     "parameter-special": {
       "captures": {
@@ -2695,7 +2671,7 @@
           "name": "keyword.operator.positional.parameter.python"
         },
         {
-          "match": "(\\*\\*|\\*)",
+          "match": "(\\*(?:\\*|))",
           "name": "keyword.operator.unpacking.parameter.python"
         },
         {
@@ -2772,7 +2748,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp"
         }
       },
-      "match": "(\\()(\\?P=\\w+(?:\\s+[[:alnum:]]+)?)(\\))",
+      "match": "(\\()(\\?P=\\w+(?:\\s+\\p{alnum}+)?)(\\))",
       "name": "meta.backreference.named.regexp"
     },
     "regexp-backreference-number": {
@@ -2914,7 +2890,7 @@
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-character": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|0[0-7]{1,2}|[0-7]{3})",
+      "match": "\\\\(x\\h{2}|0[0-7]{1,2}|[0-7]{3})",
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-sequence": {
@@ -2941,7 +2917,7 @@
       "name": "support.other.escape.special.regexp"
     },
     "regexp-escape-unicode": {
-      "match": "\\\\(u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+      "match": "\\\\(u\\h{4}|U\\h{8})",
       "name": "constant.character.unicode.regexp"
     },
     "regexp-flags": {
@@ -2949,11 +2925,11 @@
       "name": "storage.modifier.flag.regexp"
     },
     "regexp-quantifier": {
-      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}",
+      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)}",
       "name": "keyword.operator.quantifier.regexp"
     },
     "regexp-single-one-line": {
-      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\')",
+      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(')",
       "beginCaptures": {
         "2": {
           "name": "invalid.deprecated.prefix.python"
@@ -2968,7 +2944,7 @@
           "name": "punctuation.definition.string.begin.python"
         }
       },
-      "end": "(\\')|(?<!\\\\)(\\n)",
+      "end": "(')|(?<!\\\\)(\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.python"
@@ -2985,7 +2961,7 @@
       ]
     },
     "regexp-single-three-line": {
-      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\'\\'\\')",
+      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(''')",
       "beginCaptures": {
         "2": {
           "name": "invalid.deprecated.prefix.python"
@@ -3000,7 +2976,7 @@
           "name": "punctuation.definition.string.begin.python"
         }
       },
-      "end": "(\\'\\'\\')",
+      "end": "(''')",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.python"
@@ -3056,7 +3032,7 @@
     "semicolon": {
       "patterns": [
         {
-          "match": "\\;$",
+          "match": ";$",
           "name": "invalid.deprecated.semicolon.python"
         }
       ]
@@ -3064,10 +3040,10 @@
     "single-one-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -3079,7 +3055,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\\'))|((?=(?<!\\\\)\\n))",
+          "end": "(]|(?='))|((?=(?<!\\\\)\\n))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -3094,7 +3070,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -3108,7 +3084,7 @@
           "name": "punctuation.comment.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "punctuation.comment.end.regexp"
@@ -3125,7 +3101,7 @@
       ]
     },
     "single-one-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -3134,7 +3110,7 @@
           "name": "punctuation.parenthesis.conditional.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
@@ -3202,7 +3178,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3227,7 +3203,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3252,7 +3228,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3277,7 +3253,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3293,7 +3269,7 @@
       ]
     },
     "single-one-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -3302,7 +3278,7 @@
           "name": "entity.name.tag.named.group.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
@@ -3325,7 +3301,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
@@ -3347,7 +3323,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
@@ -3365,10 +3341,10 @@
     "single-three-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -3380,7 +3356,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\\'\\'\\'))",
+          "end": "(]|(?='''))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -3395,7 +3371,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -3409,7 +3385,7 @@
           "name": "punctuation.comment.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "punctuation.comment.end.regexp"
@@ -3426,7 +3402,7 @@
       ]
     },
     "single-three-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -3435,7 +3411,7 @@
           "name": "punctuation.parenthesis.conditional.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
@@ -3509,7 +3485,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3537,7 +3513,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3565,7 +3541,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3593,7 +3569,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3612,7 +3588,7 @@
       ]
     },
     "single-three-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -3621,7 +3597,7 @@
           "name": "entity.name.tag.named.group.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
@@ -3647,7 +3623,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
@@ -3672,7 +3648,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
@@ -3691,7 +3667,7 @@
       ]
     },
     "special-names": {
-      "match": "\\b(_*[[:upper:]][_\\d]*[[:upper:]])[[:upper:]\\d]*(_\\w*)?\\b",
+      "match": "\\b(_*\\p{upper}[_\\d]*\\p{upper})[[:upper:]\\d]*(_\\w*)?\\b",
       "name": "constant.other.caps.python"
     },
     "special-variables": {
@@ -3779,12 +3755,10 @@
           "name": "storage.type.function.python"
         },
         {
-          "comment": "if `as` is eventually followed by `:` or line continuation\nit's probably control flow like:\n    with foo as bar, \\\n         Foo as Bar:\n      try:\n        do_stuff()\n      except Exception as e:\n        pass\n",
           "match": "\\b(?<!\\.)as\\b(?=.*[:\\\\])",
           "name": "keyword.control.flow.python"
         },
         {
-          "comment": "other legal use of `as` is in an import",
           "match": "\\b(?<!\\.)as\\b",
           "name": "keyword.control.import.python"
         },
@@ -3922,7 +3896,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "({{|}}|(?:{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?}))",
+          "match": "(\\{\\{|}}|\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:\\w?[<>=^]?[-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?})",
           "name": "meta.format.brace.python"
         },
         {
@@ -3937,7 +3911,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "({\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?\\}[^'\"{}\\n]*)*})",
+          "match": "(\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?}[^'\"{}\\n]*)*})",
           "name": "meta.format.brace.python"
         }
       ]
@@ -3972,8 +3946,7 @@
       "name": "constant.language.python"
     },
     "string-multi-bad-brace1-formatting-raw": {
-      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3982,8 +3955,7 @@
       ]
     },
     "string-multi-bad-brace1-formatting-unicode": {
-      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3998,8 +3970,7 @@
       ]
     },
     "string-multi-bad-brace2-formatting-raw": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:\\.\\[}\\w]).*?(?!'''|\"\"\")\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:.\\[}\\w]).*?(?!'''|\"\"\")})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -4011,8 +3982,7 @@
       ]
     },
     "string-multi-bad-brace2-formatting-unicode": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:\\.\\[}\\w]).*?(?!'''|\"\"\")\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:.\\[}\\w]).*?(?!'''|\"\"\")})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -4239,8 +4209,7 @@
       ]
     },
     "string-single-bad-brace1-formatting-raw": {
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4249,8 +4218,7 @@
       ]
     },
     "string-single-bad-brace1-formatting-unicode": {
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
-      "comment": "template using {% ... %}",
+      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4265,8 +4233,7 @@
       ]
     },
     "string-single-bad-brace2-formatting-raw": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4278,8 +4245,7 @@
       ]
     },
     "string-single-bad-brace2-formatting-unicode": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
-      "comment": "odd format or format-like syntax",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
diff --git a/resources/languages/wasm.json b/resources/languages/wasm.json
index c1bb9cb..97dbb73 100644
--- a/resources/languages/wasm.json
+++ b/resources/languages/wasm.json
@@ -33,7 +33,6 @@
               "name": "punctuation.definition.comment.wat"
             }
           },
-          "comment": "Line comment",
           "match": "(;;).*$",
           "name": "comment.line.wat"
         },
@@ -44,7 +43,6 @@
               "name": "punctuation.definition.comment.wat"
             }
           },
-          "comment": "Block comment",
           "end": ";\\)",
           "endCaptures": {
             "0": {
@@ -58,7 +56,6 @@
     "constants": {
       "patterns": [
         {
-          "comment": "Fixed-width SIMD",
           "patterns": [
             {
               "captures": {
@@ -66,8 +63,7 @@
                   "name": "support.type.wat"
                 }
               },
-              "comment": "Vector literal (i8x16) [simd]",
-              "match": "\\b(i8x16)(?:\\s+0x[0-9a-fA-F]{1,2}){16}\\b",
+              "match": "\\b(i8x16)(?:\\s+0x\\h{1,2}){16}\\b",
               "name": "constant.numeric.vector.wat"
             },
             {
@@ -76,8 +72,7 @@
                   "name": "support.type.wat"
                 }
               },
-              "comment": "Vector literal (i16x8) [simd]",
-              "match": "\\b(i16x8)(?:\\s+0x[0-9a-fA-F]{1,4}){8}\\b",
+              "match": "\\b(i16x8)(?:\\s+0x\\h{1,4}){8}\\b",
               "name": "constant.numeric.vector.wat"
             },
             {
@@ -86,8 +81,7 @@
                   "name": "support.type.wat"
                 }
               },
-              "comment": "Vector literal (i32x4) [simd]",
-              "match": "\\b(i32x4)(?:\\s+0x[0-9a-fA-F]{1,8}){4}\\b",
+              "match": "\\b(i32x4)(?:\\s+0x\\h{1,8}){4}\\b",
               "name": "constant.numeric.vector.wat"
             },
             {
@@ -96,38 +90,31 @@
                   "name": "support.type.wat"
                 }
               },
-              "comment": "Vector literal (i64x2) [simd]",
-              "match": "\\b(i64x2)(?:\\s+0x[0-9a-fA-F]{1,16}){2}\\b",
+              "match": "\\b(i64x2)(?:\\s+0x\\h{1,16}){2}\\b",
               "name": "constant.numeric.vector.wat"
             }
           ]
         },
         {
-          "comment": "MVP",
           "patterns": [
             {
-              "comment": "Floating point literal",
               "match": "[+-]?\\b[0-9][0-9]*(?:\\.[0-9][0-9]*)?(?:[eE][+-]?[0-9]+)?\\b",
               "name": "constant.numeric.float.wat"
             },
             {
-              "comment": "Floating point hexadecimal literal",
-              "match": "[+-]?\\b0x([0-9a-fA-F]*\\.[0-9a-fA-F]+|[0-9a-fA-F]+\\.?)[Pp][+-]?[0-9]+\\b",
+              "match": "[+-]?\\b0x(\\h*\\.\\h+|\\h+\\.?)[Pp][+-]?[0-9]+\\b",
               "name": "constant.numeric.float.wat"
             },
             {
-              "comment": "Floating point infinity",
               "match": "[+-]?\\binf\\b",
               "name": "constant.numeric.float.wat"
             },
             {
-              "comment": "Floating point literal (NaN)",
-              "match": "[+-]?\\bnan:0x[0-9a-fA-F][0-9a-fA-F]*\\b",
+              "match": "[+-]?\\bnan:0x\\h\\h*\\b",
               "name": "constant.numeric.float.wat"
             },
             {
-              "comment": "Integer literal",
-              "match": "[+-]?\\b(?:0x[0-9a-fA-F][0-9a-fA-F]*|\\d[\\d]*)\\b",
+              "match": "[+-]?\\b(?:0x\\h\\h*|\\d\\d*)\\b",
               "name": "constant.numeric.integer.wat"
             }
           ]
@@ -137,7 +124,6 @@
     "instructions": {
       "patterns": [
         {
-          "comment": "Non-trapping float-to-int conversions",
           "patterns": [
             {
               "captures": {
@@ -145,14 +131,12 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Conversion instruction [nontrapping-float-to-int-conversions]",
-              "match": "\\b(i32|i64)\\.trunc_sat_f(?:32|64)_[su]\\b",
+              "match": "\\b(i(?:32|64))\\.trunc_sat_f(?:32|64)_[su]\\b",
               "name": "keyword.operator.word.wat"
             }
           ]
         },
         {
-          "comment": "Sign-extension operators",
           "patterns": [
             {
               "captures": {
@@ -160,8 +144,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Numeric instruction (i32) [sign-extension-ops]",
-              "match": "\\b(i32)\\.(?:extend(?:8|16)_s)\\b",
+              "match": "\\b(i32)\\.extend(?:8|16)_s\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -170,14 +153,12 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Numeric instruction (i64) [sign-extension-ops]",
-              "match": "\\b(i64)\\.(?:extend(?:8|16|32)_s)\\b",
+              "match": "\\b(i64)\\.extend(?:8|16|32)_s\\b",
               "name": "keyword.operator.word.wat"
             }
           ]
         },
         {
-          "comment": "Bulk memory operations",
           "patterns": [
             {
               "captures": {
@@ -185,14 +166,12 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Memory instruction [bulk-memory-operations]",
               "match": "\\b(memory)\\.(?:copy|fill|init|drop)\\b",
               "name": "keyword.operator.word.wat"
             }
           ]
         },
         {
-          "comment": "Fixed-width SIMD",
           "patterns": [
             {
               "captures": {
@@ -200,7 +179,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (v128) [simd]",
               "match": "\\b(v128)\\.(?:const|and|or|xor|not|andnot|bitselect|load|store)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -210,7 +188,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (i8x16) [simd]",
               "match": "\\b(i8x16)\\.(?:shuffle|swizzle|splat|replace_lane|add|sub|mul|neg|shl|shr_[su]|eq|ne|lt_[su]|le_[su]|gt_[su]|ge_[su]|min_[su]|max_[su]|any_true|all_true|extract_lane_[su]|add_saturate_[su]|sub_saturate_[su]|avgr_u|narrow_i16x8_[su])\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -220,7 +197,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (i16x8) [simd]",
               "match": "\\b(i16x8)\\.(?:splat|replace_lane|add|sub|mul|neg|shl|shr_[su]|eq|ne|lt_[su]|le_[su]|gt_[su]|ge_[su]|min_[su]|max_[su]|any_true|all_true|extract_lane_[su]|add_saturate_[su]|sub_saturate_[su]|avgr_u|load8x8_[su]|narrow_i32x4_[su]|widen_(low|high)_i8x16_[su])\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -230,7 +206,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (i32x4) [simd]",
               "match": "\\b(i32x4)\\.(?:splat|replace_lane|add|sub|mul|neg|shl|shr_[su]|eq|ne|lt_[su]|le_[su]|gt_[su]|ge_[su]|min_[su]|max_[su]|any_true|all_true|extract_lane|load16x4_[su]|trunc_sat_f32x4_[su]|widen_(low|high)_i16x8_[su])\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -240,7 +215,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (i64x2) [simd]",
               "match": "\\b(i64x2)\\.(?:splat|replace_lane|add|sub|mul|neg|shl|shr_[su]|extract_lane|load32x2_[su])\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -250,7 +224,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (f32x4) [simd]",
               "match": "\\b(f32x4)\\.(?:splat|replace_lane|add|sub|mul|neg|extract_lane|eq|ne|lt|le|gt|ge|abs|min|max|div|sqrt|convert_i32x4_[su])\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -260,7 +233,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (f64x2) [simd]",
               "match": "\\b(f64x2)\\.(?:splat|replace_lane|add|sub|mul|neg|extract_lane|eq|ne|lt|le|gt|ge|abs|min|max|div|sqrt)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -270,7 +242,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (v8x16) [simd]",
               "match": "\\b(v8x16)\\.(?:load_splat|shuffle|swizzle)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -280,7 +251,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (v16x8) [simd]",
               "match": "\\b(v16x8)\\.load_splat\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -290,7 +260,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (v32x4) [simd]",
               "match": "\\b(v32x4)\\.load_splat\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -300,14 +269,12 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Vector instruction (v64x2) [simd]",
               "match": "\\b(v64x2)\\.load_splat\\b",
               "name": "keyword.operator.word.wat"
             }
           ]
         },
         {
-          "comment": "Threads",
           "patterns": [
             {
               "captures": {
@@ -324,8 +291,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Atomic instruction (i32) [threads]",
-              "match": "\\b(i32)\\.(atomic)\\.(?:load(?:8_u|16_u)?|store(?:8|16)?|wait|(rmw)\\.(?:add|sub|and|or|xor|xchg|cmpxchg)|(rmw8|rmw16)\\.(?:add_u|sub_u|and_u|or_u|xor_u|xchg_u|cmpxchg_u))\\b",
+              "match": "\\b(i32)\\.(atomic)\\.(?:load(?:8_u|16_u)?|store(?:8|16)?|wait|(rmw)\\.(?:add|sub|and|or|xor|xchg|cmpxchg)|(rmw(?:8|16))\\.(?:add_u|sub_u|and_u|or_u|xor_u|xchg_u|cmpxchg_u))\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -343,8 +309,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Atomic instruction (i64) [threads]",
-              "match": "\\b(i64)\\.(atomic)\\.(?:load(?:8_u|16_u|32_u)?|store(?:8|16|32)?|wait|(rmw)\\.(?:add|sub|and|or|xor|xchg|cmpxchg)|(rmw8|rmw16|rmw32)\\.(?:add_u|sub_u|and_u|or_u|xor_u|xchg_u|cmpxchg_u))\\b",
+              "match": "\\b(i64)\\.(atomic)\\.(?:load(?:8_u|16_u|32_u)?|store(?:8|16|32)?|wait|(rmw)\\.(?:add|sub|and|or|xor|xchg|cmpxchg)|(rmw(?:8|16|32))\\.(?:add_u|sub_u|and_u|or_u|xor_u|xchg_u|cmpxchg_u))\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -353,19 +318,16 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Atomic instruction [threads]",
               "match": "\\b(atomic)\\.(?:notify|fence)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
-              "comment": "Shared modifier [threads]",
               "match": "\\bshared\\b",
               "name": "storage.modifier.wat"
             }
           ]
         },
         {
-          "comment": "Reference types",
           "patterns": [
             {
               "captures": {
@@ -373,7 +335,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Reference instruction [reference-types]",
               "match": "\\b(ref)\\.(?:null|is_null|func|extern)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -383,44 +344,36 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Table instruction [reference-types]",
               "match": "\\b(table)\\.(?:get|size|grow|fill|init|copy)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
-              "comment": "Type name [reference-types]",
               "match": "\\b(?:externref|funcref|nullref)\\b",
               "name": "entity.name.type.wat"
             }
           ]
         },
         {
-          "comment": "Tail Call",
           "patterns": [
             {
-              "comment": "Control instruction [tail-call]",
               "match": "\\breturn_call(?:_indirect)?\\b",
               "name": "keyword.control.wat"
             }
           ]
         },
         {
-          "comment": "Exception handling",
           "patterns": [
             {
-              "comment": "Control instruction [exception-handling]",
               "match": "\\b(?:try|catch|throw|rethrow|br_on_exn)\\b",
               "name": "keyword.control.wat"
             },
             {
-              "comment": "Module element [exception-handling]",
               "match": "(?<=\\()event\\b",
               "name": "storage.type.wat"
             }
           ]
         },
         {
-          "comment": "Binaryen extensions",
           "patterns": [
             {
               "captures": {
@@ -428,14 +381,12 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Pseudo stack instruction [binaryen]",
-              "match": "\\b(i32|i64|f32|f64|externref|funcref|nullref|exnref)\\.(?:push|pop)\\b",
+              "match": "\\b(i32|i64|f32|f64|externref|funcref|nullref|exnref)\\.p(?:ush|op)\\b",
               "name": "keyword.operator.word.wat"
             }
           ]
         },
         {
-          "comment": "MVP",
           "patterns": [
             {
               "captures": {
@@ -443,7 +394,6 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "comment": "Memory instruction (i32) [mvp]",
               "match": "\\b(i32)\\.(?:load|load(?:8|16)(?:_[su])?|store(?:8|16)?)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -453,7 +403,6 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "comment": "Memory instruction (i64) [mvp]",
               "match": "\\b(i64)\\.(?:load|load(?:8|16|32)(?:_[su])?|store(?:8|16|32)?)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -463,8 +412,7 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "comment": "Memory instruction (f32/f64) [mvp]",
-              "match": "\\b(f32|f64)\\.(?:load|store)\\b",
+              "match": "\\b(f(?:32|64))\\.(?:load|store)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -473,7 +421,6 @@
                   "name": "support.class.memory.wat"
                 }
               },
-              "comment": "Memory instruction [mvp]",
               "match": "\\b(memory)\\.(?:size|grow)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -483,7 +430,6 @@
                   "name": "entity.other.attribute-name.wat"
                 }
               },
-              "comment": "Memory instruction attribute [mvp]",
               "match": "\\b(offset|align)=\\b"
             },
             {
@@ -492,7 +438,6 @@
                   "name": "support.class.local.wat"
                 }
               },
-              "comment": "Variable instruction (local) [mvp]",
               "match": "\\b(local)\\.(?:get|set|tee)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -502,7 +447,6 @@
                   "name": "support.class.global.wat"
                 }
               },
-              "comment": "Variable instruction (global) [mvp]",
               "match": "\\b(global)\\.(?:get|set)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -512,8 +456,7 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "comment": "Numeric instruction (i32/i64) [mvp]",
-              "match": "\\b(i32|i64)\\.(const|eqz|eq|ne|lt_[su]|gt_[su]|le_[su]|ge_[su]|clz|ctz|popcnt|add|sub|mul|div_[su]|rem_[su]|and|or|xor|shl|shr_[su]|rotl|rotr)\\b",
+              "match": "\\b(i(?:32|64))\\.(const|eqz|eq|ne|lt_[su]|gt_[su]|le_[su]|ge_[su]|clz|ctz|popcnt|add|sub|mul|div_[su]|rem_[su]|and|or|xor|shl|shr_[su]|rotl|rotr)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -522,8 +465,7 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "comment": "Numeric instruction (f32/f64) [mvp]",
-              "match": "\\b(f32|f64)\\.(const|eq|ne|lt|gt|le|ge|abs|neg|ceil|floor|trunc|nearest|sqrt|add|sub|mul|div|min|max|copysign)\\b",
+              "match": "\\b(f(?:32|64))\\.(const|eq|ne|lt|gt|le|ge|abs|neg|ceil|floor|trunc|nearest|sqrt|add|sub|mul|div|min|max|copysign)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -532,8 +474,7 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "comment": "Conversion instruction (i32) [mvp]",
-              "match": "\\b(i32)\\.(wrap_i64|trunc_(f32|f64)_[su]|reinterpret_f32)\\b",
+              "match": "\\b(i32)\\.(wrap_i64|trunc_(f(?:32|64))_[su]|reinterpret_f32)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -542,7 +483,6 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "comment": "Conversion instruction (i64) [mvp]",
               "match": "\\b(i64)\\.(extend_i32_[su]|trunc_f(32|64)_[su]|reinterpret_f64)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -552,7 +492,6 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "comment": "Conversion instruction (f32) [mvp]",
               "match": "\\b(f32)\\.(convert_i(32|64)_[su]|demote_f64|reinterpret_i32)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -562,24 +501,20 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "comment": "Conversion instruction (f64) [mvp]",
               "match": "\\b(f64)\\.(convert_i(32|64)_[su]|promote_f32|reinterpret_i64)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
-              "comment": "Control instruction [mvp]",
               "match": "\\b(?:unreachable|nop|block|loop|if|then|else|end|br|br_if|br_table|return|call|call_indirect)\\b",
               "name": "keyword.control.wat"
             },
             {
-              "comment": "Parametric instruction [mvp]",
               "match": "\\b(?:drop|select)\\b",
               "name": "keyword.operator.word.wat"
             }
           ]
         },
         {
-          "comment": "GC Instructions",
           "patterns": [
             {
               "captures": {
@@ -587,7 +522,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Reference Instructions [GC]",
               "match": "\\b(ref)\\.(?:eq|test|cast)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -597,7 +531,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Struct Instructions [GC]",
               "match": "\\b(struct)\\.(?:new_canon|new_canon_default|get|get_s|get_u|set)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -607,7 +540,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Array Instructions [GC]",
               "match": "\\b(array)\\.(?:new_canon|new_canon_default|get|get_s|get_u|set|len|new_canon_fixed|new_canon_data|new_canon_elem)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -617,7 +549,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "i31 Instructions [GC]",
               "match": "\\b(i31)\\.(?:new|get_s|get_u)\\b",
               "name": "keyword.operator.word.wat"
             },
@@ -627,8 +558,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Branch Instructions [GC]",
-              "match": "\\b(?:br_on_non_null|br_on_cast|br_on_cast_fail)\\b",
+              "match": "\\bbr_on_(?:non_null|cast|cast_fail)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -637,7 +567,6 @@
                   "name": "support.class.wat"
                 }
               },
-              "comment": "Reference Instructions [GC]",
               "match": "\\b(extern)\\.(?:internalize|externalize)\\b",
               "name": "keyword.operator.word.wat"
             }
@@ -656,7 +585,6 @@
     "modules": {
       "patterns": [
         {
-          "comment": "Bulk memory operations",
           "patterns": [
             {
               "captures": {
@@ -664,16 +592,13 @@
                   "name": "storage.modifier.wat"
                 }
               },
-              "comment": "Passive modifier [bulk-memory-operations]",
               "match": "(?<=\\(data)\\s+(passive)\\b"
             }
           ]
         },
         {
-          "comment": "MVP",
           "patterns": [
             {
-              "comment": "Module element [mvp]",
               "match": "(?<=\\()(?:module|import|export|memory|data|table|elem|start|func|type|param|result|global|local)\\b",
               "name": "storage.type.wat"
             },
@@ -683,7 +608,6 @@
                   "name": "storage.modifier.wat"
                 }
               },
-              "comment": "Mutable global modifier [mvp]",
               "match": "(?<=\\()\\s*(mut)\\b",
               "name": "storage.modifier.wat"
             },
@@ -693,21 +617,19 @@
                   "name": "entity.name.function.wat"
                 }
               },
-              "comment": "Function name [mvp]",
-              "match": "(?<=\\(func|\\(start|call|return_call|ref\\.func)\\s+(\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*)"
+              "match": "(?<=\\(func|\\(start|call|return_call|ref\\.func)\\s+(\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\^_`|~]*)"
             },
             {
-              "begin": "\\)\\s+(\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*)",
+              "begin": "\\)\\s+(\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\^_`|~]*)",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.wat"
                 }
               },
-              "comment": "Function name(s) (elem) [mvp]",
               "end": "\\)",
               "patterns": [
                 {
-                  "match": "(?<=\\s)\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*",
+                  "match": "(?<=\\s)\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\^_`|~]*",
                   "name": "entity.name.function.wat"
                 }
               ]
@@ -718,12 +640,10 @@
                   "name": "support.type.function.wat"
                 }
               },
-              "comment": "Function type [mvp]",
-              "match": "(?<=\\(type)\\s+(\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*)"
+              "match": "(?<=\\(type)\\s+(\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\^_`|~]*)"
             },
             {
-              "comment": "Variable name or branch label [mvp]",
-              "match": "\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*\\b",
+              "match": "\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\^_`|~]*\\b",
               "name": "variable.other.wat"
             }
           ]
@@ -737,7 +657,6 @@
           "name": "punctuation.definition.string.begin"
         }
       },
-      "comment": "String literal",
       "end": "\"",
       "endCaptures": {
         "0": {
@@ -747,7 +666,7 @@
       "name": "string.quoted.double.wat",
       "patterns": [
         {
-          "match": "\\\\(n|t|\\\\|'|\"|[0-9a-fA-F]{2})",
+          "match": "\\\\([nt\\\\'\"]|\\h{2})",
           "name": "constant.character.escape.wat"
         }
       ]
@@ -755,70 +674,56 @@
     "types": {
       "patterns": [
         {
-          "comment": "Fixed-width SIMD",
           "patterns": [
             {
-              "comment": "Type name [simd]",
               "match": "\\bv128\\b(?!\\.)",
               "name": "entity.name.type.wat"
             }
           ]
         },
         {
-          "comment": "Reference types",
           "patterns": [
             {
-              "comment": "Type name [reference-types]",
               "match": "\\b(?:externref|funcref|nullref)\\b(?!\\.)",
               "name": "entity.name.type.wat"
             }
           ]
         },
         {
-          "comment": "Exception handling",
           "patterns": [
             {
-              "comment": "Type name [exception-handling]",
               "match": "\\bexnref\\b(?!\\.)",
               "name": "entity.name.type.wat"
             }
           ]
         },
         {
-          "comment": "MVP",
           "patterns": [
             {
-              "comment": "Type name [mvp]",
               "match": "\\b(?:i32|i64|f32|f64)\\b(?!\\.)",
               "name": "entity.name.type.wat"
             }
           ]
         },
         {
-          "comment": "GC Types",
           "patterns": [
             {
-              "comment": "Type name [GC]",
               "match": "\\b(?:i8|i16|ref|funcref|externref|anyref|eqref|i31ref|nullfuncref|nullexternref|structref|arrayref|nullref)\\b(?!\\.)",
               "name": "entity.name.type.wat"
             }
           ]
         },
         {
-          "comment": "GC Heap Types",
           "patterns": [
             {
-              "comment": "Type name [GC]",
               "match": "\\b(?:type|func|extern|any|eq|nofunc|noextern|struct|array|none)\\b(?!\\.)",
               "name": "entity.name.type.wat"
             }
           ]
         },
         {
-          "comment": "GC Structured and sub Types",
           "patterns": [
             {
-              "comment": "Type name [GC]",
               "match": "\\b(?:struct|array|sub|final|rec|field|mut)\\b(?!\\.)",
               "name": "entity.name.type.wat"
             }
diff --git a/resources/languages/wenyan.json b/resources/languages/wenyan.json
index 25e30d2..df363d1 100644
--- a/resources/languages/wenyan.json
+++ b/resources/languages/wenyan.json
@@ -50,11 +50,11 @@
     "constants": {
       "patterns": [
         {
-          "match": "負|·|又|零|〇|一|二|三|四|五|六|七|八|九|十|百|千|萬|億|兆|京|垓|秭|穰|溝|澗|正|載|極|分|釐|毫|絲|忽|微|纖|沙|塵|埃|渺|漠",
+          "match": "[負·又零〇一二三四五六七八九十百千萬億兆京垓秭穰溝澗正載極分釐毫絲忽微纖沙塵埃渺漠]",
           "name": "constant.numeric"
         },
         {
-          "match": "其|陰|陽",
+          "match": "[其陰陽]",
           "name": "constant.language"
         },
         {
@@ -80,7 +80,7 @@
     "keywords": {
       "patterns": [
         {
-          "match": "數|列|言|術|爻|物|元",
+          "match": "[數列言術爻物元]",
           "name": "storage.type"
         },
         {
@@ -92,15 +92,15 @@
           "name": "keyword.control"
         },
         {
-          "match": "中有陽乎|中無陰乎|所餘幾何|不等於|不大於|不小於|等於|大於|小於|加|減|乘|除|變|以|於",
+          "match": "中有陽乎|中無陰乎|所餘幾何|不等於|不大於|不小於|等於|大於|小於|[加減乘除變以於]",
           "name": "keyword.operator"
         },
         {
-          "match": "不知何禍歟|不復存矣|姑妄行此|如事不諧|名之曰|吾嘗觀|之禍歟|乃作罷|吾有|今有|物之|書之|以施|昔之|是矣|之書|方悟|之義|嗚呼|之禍|有|施|曰|噫|取|今|夫|中|豈",
+          "match": "不知何禍歟|不復存矣|姑妄行此|如事不諧|名之曰|吾嘗觀|之禍歟|乃作罷|吾有|今有|物之|書之|以施|昔之|是矣|之書|方悟|之義|嗚呼|之禍|[有施曰噫取今夫中豈]",
           "name": "keyword.other"
         },
         {
-          "match": "也|凡|遍|若|者|之|充|銜",
+          "match": "[也凡遍若者之充銜]",
           "name": "keyword.control"
         }
       ]
@@ -108,7 +108,7 @@
     "symbols": {
       "patterns": [
         {
-          "match": "。|、",
+          "match": "[。、]",
           "name": "punctuation.separator"
         }
       ]
diff --git a/resources/languages/wgsl.json b/resources/languages/wgsl.json
index 3c4a37d..e35c7bb 100644
--- a/resources/languages/wgsl.json
+++ b/resources/languages/wgsl.json
@@ -45,7 +45,6 @@
               "name": "entity.name.attribute.wgsl"
             }
           },
-          "comment": "attribute declaration",
           "match": "(@)([A-Za-z_]+)",
           "name": "meta.attribute.wgsl"
         }
@@ -54,13 +53,11 @@
     "block_comments": {
       "patterns": [
         {
-          "comment": "empty block comments",
           "match": "/\\*\\*/",
           "name": "comment.block.wgsl"
         },
         {
           "begin": "/\\*\\*",
-          "comment": "block documentation comments",
           "end": "\\*/",
           "name": "comment.block.documentation.wgsl",
           "patterns": [
@@ -71,7 +68,6 @@
         },
         {
           "begin": "/\\*(?!\\*)",
-          "comment": "block comments",
           "end": "\\*/",
           "name": "comment.block.wgsl",
           "patterns": [
@@ -85,22 +81,18 @@
     "constants": {
       "patterns": [
         {
-          "comment": "decimal float literal",
           "match": "(-?\\b[0-9][0-9]*\\.[0-9][0-9]*)([eE][+-]?[0-9]+)?\\b",
           "name": "constant.numeric.float.wgsl"
         },
         {
-          "comment": "int literal",
-          "match": "-?\\b0x[0-9a-fA-F]+\\b|\\b0\\b|-?\\b[1-9][0-9]*\\b",
+          "match": "-?\\b0x\\h+\\b|\\b0\\b|-?\\b[1-9][0-9]*\\b",
           "name": "constant.numeric.decimal.wgsl"
         },
         {
-          "comment": "uint literal",
-          "match": "\\b0x[0-9a-fA-F]+u\\b|\\b0u\\b|\\b[1-9][0-9]*u\\b",
+          "match": "\\b(?:0x\\h+u\\b|0u\\b|[1-9][0-9]*u\\b)",
           "name": "constant.numeric.decimal.wgsl"
         },
         {
-          "comment": "boolean constant",
           "match": "\\b(true|false)\\b",
           "name": "constant.language.boolean.wgsl"
         }
@@ -118,7 +110,6 @@
               "name": "punctuation.brackets.round.wgsl"
             }
           },
-          "comment": "function/method calls",
           "end": "\\)",
           "endCaptures": {
             "0": {
@@ -173,7 +164,6 @@
               "name": "punctuation.brackets.round.wgsl"
             }
           },
-          "comment": "function definition",
           "end": "\\{",
           "endCaptures": {
             "0": {
@@ -216,162 +206,131 @@
     "keywords": {
       "patterns": [
         {
-          "comment": "other keywords",
           "match": "\\b(bitcast|block|break|case|continue|continuing|default|discard|else|elseif|enable|fallthrough|for|function|if|loop|private|read|read_write|return|storage|switch|uniform|while|workgroup|write)\\b",
           "name": "keyword.control.wgsl"
         },
         {
-          "comment": "reserved keywords",
           "match": "\\b(asm|const|do|enum|handle|mat|premerge|regardless|typedef|unless|using|vec|void)\\b",
           "name": "keyword.control.wgsl"
         },
         {
-          "comment": "storage keywords",
           "match": "\\b(let|var)\\b",
           "name": "keyword.other.wgsl storage.type.wgsl"
         },
         {
-          "comment": "type keyword",
           "match": "\\b(type)\\b",
           "name": "keyword.declaration.type.wgsl storage.type.wgsl"
         },
         {
-          "comment": "enum keyword",
           "match": "\\b(enum)\\b",
           "name": "keyword.declaration.enum.wgsl storage.type.wgsl"
         },
         {
-          "comment": "struct keyword",
           "match": "\\b(struct)\\b",
           "name": "keyword.declaration.struct.wgsl storage.type.wgsl"
         },
         {
-          "comment": "fn",
           "match": "\\bfn\\b",
           "name": "keyword.other.fn.wgsl"
         },
         {
-          "comment": "logical operators",
-          "match": "(\\^|\\||\\|\\||&&|<<|>>|!)(?!=)",
+          "match": "([\\^|]|\\|\\||&&|<<|>>|!)(?!=)",
           "name": "keyword.operator.logical.wgsl"
         },
         {
-          "comment": "logical AND, borrow references",
-          "match": "&(?![&=])",
+          "match": "&(?![\\&=])",
           "name": "keyword.operator.borrow.and.wgsl"
         },
         {
-          "comment": "assignment operators",
           "match": "(\\+=|-=|\\*=|/=|%=|\\^=|&=|\\|=|<<=|>>=)",
           "name": "keyword.operator.assignment.wgsl"
         },
         {
-          "comment": "single equal",
-          "match": "(?<![<>])=(?!=|>)",
+          "match": "(?<![<>])=(?![=>])",
           "name": "keyword.operator.assignment.equal.wgsl"
         },
         {
-          "comment": "comparison operators",
           "match": "(=(=)?(?!>)|!=|<=|(?<!=)>=)",
           "name": "keyword.operator.comparison.wgsl"
         },
         {
-          "comment": "math operators",
           "match": "(([+%]|(\\*(?!\\w)))(?!=))|(-(?!>))|(/(?!/))",
           "name": "keyword.operator.math.wgsl"
         },
         {
-          "comment": "dot access",
           "match": "\\.(?!\\.)",
           "name": "keyword.operator.access.dot.wgsl"
         },
         {
-          "comment": "dashrocket, skinny arrow",
           "match": "->",
           "name": "keyword.operator.arrow.skinny.wgsl"
         }
       ]
     },
     "line_comments": {
-      "comment": "single line comment",
       "match": "\\s*//.*",
       "name": "comment.line.double-slash.wgsl"
     },
     "punctuation": {
       "patterns": [
         {
-          "comment": "comma",
           "match": ",",
           "name": "punctuation.comma.wgsl"
         },
         {
-          "comment": "curly braces",
           "match": "[{}]",
           "name": "punctuation.brackets.curly.wgsl"
         },
         {
-          "comment": "parentheses, round brackets",
           "match": "[()]",
           "name": "punctuation.brackets.round.wgsl"
         },
         {
-          "comment": "semicolon",
           "match": ";",
           "name": "punctuation.semi.wgsl"
         },
         {
-          "comment": "square brackets",
           "match": "[\\[\\]]",
           "name": "punctuation.brackets.square.wgsl"
         },
         {
-          "comment": "angle brackets",
           "match": "(?<![=-])[<>]",
           "name": "punctuation.brackets.angle.wgsl"
         }
       ]
     },
     "types": {
-      "comment": "types",
       "name": "storage.type.wgsl",
       "patterns": [
         {
-          "comment": "scalar Types",
           "match": "\\b(bool|i32|u32|f32)\\b",
           "name": "storage.type.wgsl"
         },
         {
-          "comment": "reserved scalar Types",
           "match": "\\b(i64|u64|f64)\\b",
           "name": "storage.type.wgsl"
         },
         {
-          "comment": "vector type aliasses",
-          "match": "\\b(vec2i|vec3i|vec4i|vec2u|vec3u|vec4u|vec2f|vec3f|vec4f|vec2h|vec3h|vec4h)\\b",
+          "match": "\\b(vec(?:2i|3i|4i|2u|3u|4u|2f|3f|4f|2h|3h|4h))\\b",
           "name": "storage.type.wgsl"
         },
         {
-          "comment": "matrix type aliasses",
-          "match": "\\b(mat2x2f|mat2x3f|mat2x4f|mat3x2f|mat3x3f|mat3x4f|mat4x2f|mat4x3f|mat4x4f|mat2x2h|mat2x3h|mat2x4h|mat3x2h|mat3x3h|mat3x4h|mat4x2h|mat4x3h|mat4x4h)\\b",
+          "match": "\\b(mat(?:2x2f|2x3f|2x4f|3x2f|3x3f|3x4f|4x2f|4x3f|4x4f|2x2h|2x3h|2x4h|3x2h|3x3h|3x4h|4x2h|4x3h|4x4h))\\b",
           "name": "storage.type.wgsl"
         },
         {
-          "comment": "vector/matrix types",
           "match": "\\b(vec[2-4]|mat[2-4]x[2-4])\\b",
           "name": "storage.type.wgsl"
         },
         {
-          "comment": "atomic types",
           "match": "\\b(atomic)\\b",
           "name": "storage.type.wgsl"
         },
         {
-          "comment": "array types",
           "match": "\\b(array)\\b",
           "name": "storage.type.wgsl"
         },
         {
-          "comment": "Custom type",
           "match": "\\b([A-Z][A-Za-z0-9]*)\\b",
           "name": "entity.name.type.wgsl"
         }
@@ -380,7 +339,6 @@
     "variables": {
       "patterns": [
         {
-          "comment": "variables",
           "match": "\\b(?<!(?<!\\.)\\.)(?:r#(?!(crate|[Ss]elf|super)))?[a-z0-9_]+\\b",
           "name": "variable.other.wgsl"
         }
diff --git a/resources/languages/wikitext.json b/resources/languages/wikitext.json
index b3f9112..8568404 100644
--- a/resources/languages/wikitext.json
+++ b/resources/languages/wikitext.json
@@ -60,7 +60,7 @@
       ],
       "repository": {
         "argument": {
-          "begin": "({{{)",
+          "begin": "(\\{\\{\\{)",
           "end": "(}}})",
           "name": "variable.parameter.wikitext",
           "patterns": [
@@ -73,7 +73,7 @@
                   "name": "keyword.operator.wikitext"
                 }
               },
-              "match": "(?:^|\\G)([^#:\\|\\[\\]\\{\\}\\|]*)(\\|)"
+              "match": "(?:^|\\G)([^#:|\\[\\]{}]*)(\\|)"
             },
             {
               "include": "$self"
@@ -97,7 +97,7 @@
               "name": "keyword.operator.wikitext"
             }
           },
-          "end": "(\\}-)",
+          "end": "(}-)",
           "patterns": [
             {
               "include": "$self"
@@ -122,12 +122,12 @@
                   "name": "punctuation.terminator.rule.wikitext"
                 }
               },
-              "match": "(?:([a-zA-Z\\-]*)(:))?(.*?)(?:(;)|(?=\\}-))"
+              "match": "(?:([a-zA-Z-]*)(:))?(.*?)(?:(;)|(?=}-))"
             }
           ]
         },
         "extension-comments": {
-          "begin": "(<%--)\\s*(\\[)([A-Z_]*)(\\])",
+          "begin": "(<%--)\\s*(\\[)([A-Z_]*)(])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.extension.wikitext"
@@ -142,7 +142,7 @@
               "name": "punctuation.definition.tag.extension.wikitext"
             }
           },
-          "end": "(\\[)([A-Z_]*)(\\])\\s*(--%>)",
+          "end": "(\\[)([A-Z_]*)(])\\s*(--%>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.tag.extension.wikitext"
@@ -206,7 +206,7 @@
                   "name": "punctuation.definition.tag.link.external.wikitext"
                 }
               },
-              "match": "(\\[)((?:(?:(?:http(?:s)?)|(?:ftp(?:s)?)):\\/\\/)[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\.~:\\/?#%@!\\$&'\\(\\)\\*\\+,;=.]+)\\s*?([^\\]]*)(\\])",
+              "match": "(\\[)((?:https?|ftps?)://[\\w.-]+(?:\\.[\\w.-]+)+[\\w\\-.~:/?#%@!$\\&'()*+,;=]+)\\s*?([^\\]]*)(])",
               "name": "meta.link.external.wikitext"
             },
             {
@@ -229,7 +229,7 @@
                   "name": "punctuation.definition.tag.link.external.wikitext"
                 }
               },
-              "match": "(\\[)([\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\.~:\\/?#%@!\\$&'\\(\\)\\*\\+,;=.]+)\\s*?([^\\]]*)(\\])",
+              "match": "(\\[)([\\w.-]+(?:\\.[\\w.-]+)+[\\w\\-.~:/?#%@!$\\&'()*+,;=]+)\\s*?([^\\]]*)(])",
               "name": "invalid.illegal.bad-link.wikitext"
             }
           ]
@@ -288,7 +288,7 @@
         },
         "internal-link": {
           "TODO": "SINGLE LINE",
-          "begin": "(\\[\\[)(([^#:\\|\\[\\]\\{\\}]*:)*)?([^\\|\\[\\]]*)?",
+          "begin": "(\\[\\[)(([^#:|\\[\\]{}]*:)*)?([^|\\[\\]]*)?",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.link.internal.wikitext"
@@ -300,7 +300,7 @@
               "name": "entity.other.attribute-name.wikitext"
             }
           },
-          "end": "(\\]\\])",
+          "end": "(]])",
           "name": "string.quoted.internal-link.wikitext",
           "patterns": [
             {
@@ -315,7 +315,7 @@
                   "name": "entity.other.attribute-name.localname.wikitext"
                 }
               },
-              "match": "(\\|)|(?:\\s*)(?:([-\\w.]+)((:)))?([-\\w.:]+)\\s*(=)"
+              "match": "(\\|)|\\s*(?:([-\\w.]+)((:)))?([-\\w.:]+)\\s*(=)"
             }
           ]
         },
@@ -356,15 +356,15 @@
             "variables": {
               "patterns": [
                 {
-                  "match": "(?i)(\\{\\{)(CURRENTYEAR|CURRENTMONTH|CURRENTMONTH1|CURRENTMONTHNAME|CURRENTMONTHNAMEGEN|CURRENTMONTHABBREV|CURRENTDAY|CURRENTDAY2|CURRENTDOW|CURRENTDAYNAME|CURRENTTIME|CURRENTHOUR|CURRENTWEEK|CURRENTTIMESTAMP|LOCALYEAR|LOCALMONTH|LOCALMONTH1|LOCALMONTHNAME|LOCALMONTHNAMEGEN|LOCALMONTHABBREV|LOCALDAY|LOCALDAY2|LOCALDOW|LOCALDAYNAME|LOCALTIME|LOCALHOUR|LOCALWEEK|LOCALTIMESTAMP)(\\}\\})",
+                  "match": "(?i)(\\{\\{)(CURRENTYEAR|CURRENTMONTH|CURRENTMONTH1|CURRENTMONTHNAME|CURRENTMONTHNAMEGEN|CURRENTMONTHABBREV|CURRENTDAY|CURRENTDAY2|CURRENTDOW|CURRENTDAYNAME|CURRENTTIME|CURRENTHOUR|CURRENTWEEK|CURRENTTIMESTAMP|LOCALYEAR|LOCALMONTH|LOCALMONTH1|LOCALMONTHNAME|LOCALMONTHNAMEGEN|LOCALMONTHABBREV|LOCALDAY|LOCALDAY2|LOCALDOW|LOCALDAYNAME|LOCALTIME|LOCALHOUR|LOCALWEEK|LOCALTIMESTAMP)(}})",
                   "name": "constant.language.variables.time.wikitext"
                 },
                 {
-                  "match": "(?i)(\\{\\{)(SITENAME|SERVER|SERVERNAME|DIRMARK|DIRECTIONMARK|SCRIPTPATH|STYLEPATH|CURRENTVERSION|CONTENTLANGUAGE|CONTENTLANG|PAGEID|PAGELANGUAGE|CASCADINGSOURCES|REVISIONID|REVISIONDAY|REVISIONDAY2|REVISIONMONTH|REVISIONMONTH1|REVISIONYEAR|REVISIONTIMESTAMP|REVISIONUSER|REVISIONSIZE)(\\}\\})",
+                  "match": "(?i)(\\{\\{)(SITENAME|SERVER|SERVERNAME|DIRMARK|DIRECTIONMARK|SCRIPTPATH|STYLEPATH|CURRENTVERSION|CONTENTLANGUAGE|CONTENTLANG|PAGEID|PAGELANGUAGE|CASCADINGSOURCES|REVISIONID|REVISIONDAY|REVISIONDAY2|REVISIONMONTH|REVISIONMONTH1|REVISIONYEAR|REVISIONTIMESTAMP|REVISIONUSER|REVISIONSIZE)(}})",
                   "name": "constant.language.variables.metadata.wikitext"
                 },
                 {
-                  "match": "ISBN\\s+((9[\\-\\s]?7[\\-\\s]?[89][\\-\\s]?)?([0-9][\\-\\s]?){10})",
+                  "match": "ISBN\\s+((9[-\\s]?7[-\\s]?[89][-\\s]?)?([0-9][-\\s]?){10})",
                   "name": "constant.language.variables.isbn.wikitext"
                 },
                 {
@@ -403,7 +403,7 @@
                   "name": "punctuation.definition.tag.link.internal.end.wikitext"
                 }
               },
-              "match": "(?i)(^\\s*?#REDIRECT)\\s*(\\[\\[)(([^#:\\|\\[\\]\\{\\}]*?:)*)?([^\\|\\[\\]]*)?(\\|[^\\[\\]]*?)?(\\]\\])"
+              "match": "(?i)(^\\s*?#REDIRECT)\\s*(\\[\\[)(([^#:|\\[\\]{}]*?:)*)?([^|\\[\\]]*)?(\\|[^\\[\\]]*?)?(]])"
             }
           ]
         },
@@ -431,7 +431,7 @@
                   ]
                 }
               },
-              "end": "^\\s*(\\|\\})",
+              "end": "^\\s*(\\|})",
               "name": "meta.tag.block.table.wikitext",
               "patterns": [
                 {
@@ -571,7 +571,7 @@
           ]
         },
         "template": {
-          "begin": "(\\{\\{)\\s*(([^#:\\|\\[\\]\\{\\}]*(:))*)\\s*((#[^#:\\|\\[\\]\\{\\}]+(:))*)([^#:\\|\\[\\]\\{\\}]*)",
+          "begin": "(\\{\\{)\\s*(([^#:|\\[\\]{}]*(:))*)\\s*((#[^#:|\\[\\]{}]+(:))*)([^#:|\\[\\]{}]*)",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.template.wikitext"
@@ -592,7 +592,7 @@
               "name": "entity.name.tag.local-name.wikitext"
             }
           },
-          "end": "(\\}\\})",
+          "end": "(}})",
           "patterns": [
             {
               "include": "$self"
@@ -616,7 +616,7 @@
                   "name": "keyword.operator.equal.wikitext"
                 }
               },
-              "match": "(?<=\\|)\\s*(?:([-\\w.]+)(:))?([-\\w\\s\\.:]+)\\s*(=)"
+              "match": "(?<=\\|)\\s*(?:([-\\w.]+)(:))?([-\\w\\s.:]+)\\s*(=)"
             }
           ]
         },
@@ -1006,7 +1006,7 @@
               ],
               "repository": {
                 "hl-bat": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(['\"]?)(?:batch|bat|dosbatch|winbatch)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(['\"]?)(?:batch|bat|dosbatch|winbatch)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1060,7 +1060,7 @@
                   ]
                 },
                 "hl-bibtex": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:bibtex|bib)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)bib(?:tex|)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1114,7 +1114,7 @@
                   ]
                 },
                 "hl-c": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)c\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)c\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1168,7 +1168,7 @@
                   ]
                 },
                 "hl-clojure": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:clojure|clj)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)cl(?:ojure|j)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1222,7 +1222,7 @@
                   ]
                 },
                 "hl-coffee": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:coffeescript|coffee-script|coffee)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)coffee(?:script|-script|)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1276,7 +1276,7 @@
                   ]
                 },
                 "hl-cpp": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:cpp|c\\+\\+)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)c(?:pp|\\+\\+)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1330,7 +1330,7 @@
                   ]
                 },
                 "hl-csharp": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:csharp|c#|cs)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)c(?:sharp|[#s])\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1384,7 +1384,7 @@
                   ]
                 },
                 "hl-css": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)css\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)css\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1438,7 +1438,7 @@
                   ]
                 },
                 "hl-dart": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)dart\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)dart\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1492,7 +1492,7 @@
                   ]
                 },
                 "hl-diff": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:diff|udiff)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:diff|udiff)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1546,7 +1546,7 @@
                   ]
                 },
                 "hl-dockerfile": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:docker|dockerfile)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)docker(?:|file)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1600,7 +1600,7 @@
                   ]
                 },
                 "hl-elixir": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:elixir|ex|exs)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)e(?:lixir|x|xs)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1654,7 +1654,7 @@
                   ]
                 },
                 "hl-erlang": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)erlang\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)erlang\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1708,7 +1708,7 @@
                   ]
                 },
                 "hl-fsharp": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:fsharp|f#)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)f(?:sharp|#)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1762,7 +1762,7 @@
                   ]
                 },
                 "hl-go": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:go|golang)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)go(?:|lang)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1816,7 +1816,7 @@
                   ]
                 },
                 "hl-groovy": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)groovy\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)groovy\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1870,7 +1870,7 @@
                   ]
                 },
                 "hl-handlebars": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)handlebars\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)handlebars\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1924,7 +1924,7 @@
                   ]
                 },
                 "hl-html": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)html\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)html\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1978,7 +1978,7 @@
                   ]
                 },
                 "hl-ini": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:ini|cfg|dosini)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:ini|cfg|dosini)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2032,7 +2032,7 @@
                   ]
                 },
                 "hl-java": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)java\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)java\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2086,7 +2086,7 @@
                   ]
                 },
                 "hl-js": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:javascript|js)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)j(?:avascript|s)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2140,7 +2140,7 @@
                   ]
                 },
                 "hl-json": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"json\"|'json'|\"json-object\"|'json-object'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"json\"|'json'|\"json-object\"|'json-object')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2194,7 +2194,7 @@
                   ]
                 },
                 "hl-julia": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"julia\"|'julia'|\"jl\"|'jl'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"julia\"|'julia'|\"jl\"|'jl')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2248,7 +2248,7 @@
                   ]
                 },
                 "hl-latex": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:tex|latex)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:tex|latex)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2302,7 +2302,7 @@
                   ]
                 },
                 "hl-less": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"less\"|'less'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"less\"|'less')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2356,7 +2356,7 @@
                   ]
                 },
                 "hl-lua": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)lua\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)lua\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2410,7 +2410,7 @@
                   ]
                 },
                 "hl-makefile": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:make|makefile|mf|bsdmake)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:make|makefile|mf|bsdmake)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2464,7 +2464,7 @@
                   ]
                 },
                 "hl-markdown": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:markdown|md)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)m(?:arkdown|d)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2518,7 +2518,7 @@
                   ]
                 },
                 "hl-objc": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"objective-c\"|'objective-c'|\"objectivec\"|'objectivec'|\"obj-c\"|'obj-c'|\"objc\"|'objc'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"objective-c\"|'objective-c'|\"objectivec\"|'objectivec'|\"obj-c\"|'obj-c'|\"objc\"|'objc')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2572,7 +2572,7 @@
                   ]
                 },
                 "hl-perl": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:perl|ple)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)p(?:erl|le)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2626,7 +2626,7 @@
                   ]
                 },
                 "hl-perl6": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"perl6\"|'perl6'|\"pl6\"|'pl6'|\"raku\"|'raku'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"perl6\"|'perl6'|\"pl6\"|'pl6'|\"raku\"|'raku')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2680,7 +2680,7 @@
                   ]
                 },
                 "hl-php": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:php|php3|php4|php5)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)php(?:|[345])\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2734,7 +2734,7 @@
                   ]
                 },
                 "hl-powershell": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"powershell\"|'powershell'|\"pwsh\"|'pwsh'|\"posh\"|'posh'|\"ps1\"|'ps1'|\"psm1\"|'psm1'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"powershell\"|'powershell'|\"pwsh\"|'pwsh'|\"posh\"|'posh'|\"ps1\"|'ps1'|\"psm1\"|'psm1')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2788,7 +2788,7 @@
                   ]
                 },
                 "hl-pug": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:pug|jade)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:pug|jade)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2842,7 +2842,7 @@
                   ]
                 },
                 "hl-python": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"python\"|'python'|\"py\"|'py'|\"sage\"|'sage'|\"python3\"|'python3'|\"py3\"|'py3'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"python\"|'python'|\"py\"|'py'|\"sage\"|'sage'|\"python3\"|'python3'|\"py3\"|'py3')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2896,7 +2896,7 @@
                   ]
                 },
                 "hl-r": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:splus|s|r)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:splus|[sr])\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2950,7 +2950,7 @@
                   ]
                 },
                 "hl-ruby": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:ruby|rb|duby)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:ruby|rb|duby)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3004,7 +3004,7 @@
                   ]
                 },
                 "hl-rust": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"rust\"|'rust'|\"rs\"|'rs'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"rust\"|'rust'|\"rs\"|'rs')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3058,7 +3058,7 @@
                   ]
                 },
                 "hl-scala": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"scala\"|'scala'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"scala\"|'scala')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3112,7 +3112,7 @@
                   ]
                 },
                 "hl-scss": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"scss\"|'scss'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"scss\"|'scss')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3166,7 +3166,7 @@
                   ]
                 },
                 "hl-shell": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"bash\"|'bash'|\"sh\"|'sh'|\"ksh\"|'ksh'|\"zsh\"|'zsh'|\"shell\"|'shell'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"bash\"|'bash'|\"sh\"|'sh'|\"ksh\"|'ksh'|\"zsh\"|'zsh'|\"shell\"|'shell')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3220,7 +3220,7 @@
                   ]
                 },
                 "hl-sql": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)sql\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)sql\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3274,7 +3274,7 @@
                   ]
                 },
                 "hl-swift": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"swift\"|'swift'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"swift\"|'swift')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3328,7 +3328,7 @@
                   ]
                 },
                 "hl-ts": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"typescript\"|'typescript'|\"ts\"|'ts'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"typescript\"|'typescript'|\"ts\"|'ts')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3382,7 +3382,7 @@
                   ]
                 },
                 "hl-vb-net": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:vb\\.net|vbnet|lobas|oobas|sobas)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:vb\\.net|vbnet|lobas|oobas|sobas)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3436,7 +3436,7 @@
                   ]
                 },
                 "hl-xml": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)xml\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)xml\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3490,7 +3490,7 @@
                   ]
                 },
                 "hl-xslt": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)xslt\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)xslt\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3544,7 +3544,7 @@
                   ]
                 },
                 "hl-yaml": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)yaml\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)yaml\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
diff --git a/resources/languages/wit.json b/resources/languages/wit.json
new file mode 100644
index 0000000..1398403
--- /dev/null
+++ b/resources/languages/wit.json
@@ -0,0 +1,1409 @@
+{
+  "displayName": "WebAssembly Interface Types",
+  "foldingStartMarker": "([{\\[])\\s*",
+  "foldingStopMarker": "\\s*([}\\]])",
+  "name": "wit",
+  "patterns": [
+    {
+      "include": "#comment"
+    },
+    {
+      "include": "#package"
+    },
+    {
+      "include": "#toplevel-use"
+    },
+    {
+      "include": "#world"
+    },
+    {
+      "include": "#interface"
+    },
+    {
+      "include": "#whitespace"
+    }
+  ],
+  "repository": {
+    "block-comments": {
+      "patterns": [
+        {
+          "match": "/\\*\\*/",
+          "name": "comment.block.empty.wit"
+        },
+        {
+          "applyEndPatternLast": 1,
+          "begin": "/\\*\\*",
+          "end": "\\*/",
+          "name": "comment.block.documentation.wit",
+          "patterns": [
+            {
+              "include": "#block-comments"
+            },
+            {
+              "include": "#markdown"
+            },
+            {
+              "include": "#whitespace"
+            }
+          ]
+        },
+        {
+          "applyEndPatternLast": 1,
+          "begin": "/\\*(?!\\*)",
+          "end": "\\*/",
+          "name": "comment.block.wit",
+          "patterns": [
+            {
+              "include": "#block-comments"
+            },
+            {
+              "include": "#whitespace"
+            }
+          ]
+        }
+      ]
+    },
+    "boolean": {
+      "match": "\\b(bool)\\b",
+      "name": "entity.name.type.boolean.wit"
+    },
+    "comment": {
+      "patterns": [
+        {
+          "include": "#block-comments"
+        },
+        {
+          "include": "#doc-comment"
+        },
+        {
+          "include": "#line-comment"
+        }
+      ]
+    },
+    "container": {
+      "name": "meta.container.ty.wit",
+      "patterns": [
+        {
+          "include": "#tuple"
+        },
+        {
+          "include": "#list"
+        },
+        {
+          "include": "#option"
+        },
+        {
+          "include": "#result"
+        },
+        {
+          "include": "#handle"
+        }
+      ]
+    },
+    "doc-comment": {
+      "begin": "^\\s*///",
+      "end": "$",
+      "name": "comment.line.documentation.wit",
+      "patterns": [
+        {
+          "include": "#markdown"
+        }
+      ]
+    },
+    "enum": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(enum)\\b\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.enum.enum-items.wit"
+        },
+        "2": {
+          "name": "entity.name.type.id.enum-items.wit"
+        },
+        "7": {
+          "name": "punctuation.brackets.curly.begin.wit"
+        }
+      },
+      "end": "(})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.curly.end.wit"
+        }
+      },
+      "name": "meta.enum-items.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#enum-cases"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "enum-cases": {
+      "name": "meta.enum-cases.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+          "name": "variable.other.enummember.id.enum-cases.wit"
+        },
+        {
+          "match": "(,)",
+          "name": "punctuation.comma.wit"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "extern": {
+      "name": "meta.extern-type.wit",
+      "patterns": [
+        {
+          "name": "meta.interface-type.wit",
+          "patterns": [
+            {
+              "applyEndPatternLast": 1,
+              "begin": "\\b(interface)\\b\\s*(\\{)",
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.other.interface.interface-type.wit"
+                },
+                "2": {
+                  "name": "ppunctuation.brackets.curly.begin.wit"
+                }
+              },
+              "end": "(})",
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.brackets.curly.end.wit"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#comment"
+                },
+                {
+                  "include": "#interface-items"
+                },
+                {
+                  "include": "#whitespace"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "include": "#function-definition"
+        },
+        {
+          "include": "#use-path"
+        }
+      ]
+    },
+    "flags": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(flags)\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.flags.flags-items.wit"
+        },
+        "2": {
+          "name": "entity.name.type.id.flags-items.wit"
+        },
+        "7": {
+          "name": "punctuation.brackets.curly.begin.wit"
+        }
+      },
+      "end": "(})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.curly.end.wit"
+        }
+      },
+      "name": "meta.flags-items.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#flags-fields"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "flags-fields": {
+      "name": "meta.flags-fields.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+          "name": "variable.other.enummember.id.flags-fields.wit"
+        },
+        {
+          "match": "(,)",
+          "name": "punctuation.comma.wit"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "function": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(:)",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.id.func-item.wit"
+        },
+        "2": {
+          "name": "meta.word.wit"
+        },
+        "4": {
+          "name": "meta.word-separator.wit"
+        },
+        "5": {
+          "name": "meta.word.wit"
+        },
+        "6": {
+          "name": "keyword.operator.key-value.wit"
+        }
+      },
+      "end": "((?<=\\n)|(?=}))",
+      "name": "meta.func-item.wit",
+      "patterns": [
+        {
+          "include": "#function-definition"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "function-definition": {
+      "name": "meta.func-type.wit",
+      "patterns": [
+        {
+          "applyEndPatternLast": 1,
+          "begin": "\\b(static\\s+)?(func)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.modifier.static.func-item.wit"
+            },
+            "2": {
+              "name": "keyword.other.func.func-type.wit"
+            }
+          },
+          "end": "((?<=\\n)|(?=}))",
+          "name": "meta.function.wit",
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#parameter-list"
+            },
+            {
+              "include": "#result-list"
+            },
+            {
+              "include": "#whitespace"
+            }
+          ]
+        }
+      ]
+    },
+    "handle": {
+      "captures": {
+        "1": {
+          "name": "entity.name.type.borrow.handle.wit"
+        },
+        "2": {
+          "name": "punctuation.brackets.angle.begin.wit"
+        },
+        "3": {
+          "name": "entity.name.type.id.handle.wit"
+        },
+        "8": {
+          "name": "punctuation.brackets.angle.end.wit"
+        }
+      },
+      "match": "\\b(borrow)\\b(<)\\s*%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(>)",
+      "name": "meta.handle.ty.wit"
+    },
+    "identifier": {
+      "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+      "name": "entity.name.type.id.wit"
+    },
+    "interface": {
+      "applyEndPatternLast": 1,
+      "begin": "^\\b(default\\s+)?(interface)\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.default.interface-item.wit"
+        },
+        "2": {
+          "name": "keyword.declaration.interface.interface-item.wit storage.type.wit"
+        },
+        "3": {
+          "name": "entity.name.type.id.interface-item.wit"
+        },
+        "8": {
+          "name": "punctuation.brackets.curly.begin.wit"
+        }
+      },
+      "end": "(})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.curly.end.wit"
+        }
+      },
+      "name": "meta.interface-item.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#interface-items"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "interface-items": {
+      "name": "meta.interface-items.wit",
+      "patterns": [
+        {
+          "include": "#typedef-item"
+        },
+        {
+          "include": "#use"
+        },
+        {
+          "include": "#function"
+        }
+      ]
+    },
+    "line-comment": {
+      "match": "\\s*//.*",
+      "name": "comment.line.double-slash.wit"
+    },
+    "list": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(list)\\b(<)",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.type.list.wit"
+        },
+        "2": {
+          "name": "punctuation.brackets.angle.begin.wit"
+        }
+      },
+      "end": "(>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.angle.end.wit"
+        }
+      },
+      "name": "meta.list.ty.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#types",
+          "name": "meta.types.list.wit"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "markdown": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "markup.heading.markdown"
+            }
+          },
+          "match": "\\G\\s*(#+.*)$"
+        },
+        {
+          "captures": {
+            "2": {
+              "name": "punctuation.definition.quote.begin.markdown"
+            }
+          },
+          "match": "\\G\\s*((>)\\s+)+"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.list.begin.markdown"
+            }
+          },
+          "match": "\\G\\s*(-)\\s+"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "markup.list.numbered.markdown"
+            },
+            "2": {
+              "name": "punctuation.definition.list.begin.markdown"
+            }
+          },
+          "match": "\\G\\s*(([0-9]+\\.)\\s+)"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "markup.italic.markdown"
+            }
+          },
+          "match": "(`.*?`)"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "markup.bold.markdown"
+            }
+          },
+          "match": "\\b(__.*?__)"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "markup.italic.markdown"
+            }
+          },
+          "match": "\\b(_.*?_)"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "markup.bold.markdown"
+            }
+          },
+          "match": "(\\*\\*.*?\\*\\*)"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "markup.italic.markdown"
+            }
+          },
+          "match": "(\\*.*?\\*)"
+        }
+      ]
+    },
+    "named-type-list": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b\\s*(:)",
+      "beginCaptures": {
+        "1": {
+          "name": "variable.parameter.id.named-type.wit"
+        },
+        "6": {
+          "name": "keyword.operator.key-value.wit"
+        }
+      },
+      "end": "((,)|(?=\\))|(?=\\n))",
+      "endCaptures": {
+        "2": {
+          "name": "punctuation.comma.wit"
+        }
+      },
+      "name": "meta.named-type-list.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#types"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "numeric": {
+      "match": "\\b(u8|u16|u32|u64|s8|s16|s32|s64|float32|float64)\\b",
+      "name": "entity.name.type.numeric.wit"
+    },
+    "operator": {
+      "patterns": [
+        {
+          "match": "=",
+          "name": "punctuation.equal.wit"
+        },
+        {
+          "match": ",",
+          "name": "punctuation.comma.wit"
+        },
+        {
+          "match": ":",
+          "name": "keyword.operator.key-value.wit"
+        },
+        {
+          "match": ";",
+          "name": "punctuation.semicolon.wit"
+        },
+        {
+          "match": "\\(",
+          "name": "punctuation.brackets.round.begin.wit"
+        },
+        {
+          "match": "\\)",
+          "name": "punctuation.brackets.round.end.wit"
+        },
+        {
+          "match": "\\{",
+          "name": "punctuation.brackets.curly.begin.wit"
+        },
+        {
+          "match": "}",
+          "name": "punctuation.brackets.curly.end.wit"
+        },
+        {
+          "match": "<",
+          "name": "punctuation.brackets.angle.begin.wit"
+        },
+        {
+          "match": ">",
+          "name": "punctuation.brackets.angle.end.wit"
+        },
+        {
+          "match": "\\*",
+          "name": "keyword.operator.star.wit"
+        },
+        {
+          "match": "->",
+          "name": "keyword.operator.arrow.skinny.wit"
+        }
+      ]
+    },
+    "option": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(option)\\b(<)",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.type.option.wit"
+        },
+        "2": {
+          "name": "punctuation.brackets.angle.begin.wit"
+        }
+      },
+      "end": "(>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.angle.end.wit"
+        }
+      },
+      "name": "meta.option.ty.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#types",
+          "name": "meta.types.option.wit"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "package": {
+      "captures": {
+        "1": {
+          "name": "storage.modifier.package-decl.wit"
+        },
+        "2": {
+          "name": "meta.id.package-decl.wit",
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.name.namespace.package-identifier.wit",
+                  "patterns": [
+                    {
+                      "include": "#identifier"
+                    }
+                  ]
+                },
+                "2": {
+                  "name": "keyword.operator.namespace.package-identifier.wit"
+                },
+                "3": {
+                  "name": "entity.name.type.package-identifier.wit",
+                  "patterns": [
+                    {
+                      "include": "#identifier"
+                    }
+                  ]
+                },
+                "5": {
+                  "name": "keyword.operator.versioning.package-identifier.wit"
+                },
+                "6": {
+                  "name": "constant.numeric.versioning.package-identifier.wit"
+                }
+              },
+              "match": "([^:]+)(:)([^@]+)((@)(\\S+))?",
+              "name": "meta.package-identifier.wit"
+            }
+          ]
+        }
+      },
+      "match": "^(package)\\s+(\\S+)\\s*",
+      "name": "meta.package-decl.wit"
+    },
+    "parameter-list": {
+      "applyEndPatternLast": 1,
+      "begin": "(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.brackets.round.begin.wit"
+        }
+      },
+      "end": "(\\))",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.round.end.wit"
+        }
+      },
+      "name": "meta.param-list.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#named-type-list"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "primitive": {
+      "name": "meta.primitive.ty.wit",
+      "patterns": [
+        {
+          "include": "#numeric"
+        },
+        {
+          "include": "#boolean"
+        },
+        {
+          "include": "#string"
+        }
+      ]
+    },
+    "record": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(record)\\b\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.declaration.record.record-item.wit"
+        },
+        "2": {
+          "name": "entity.name.type.id.record-item.wit"
+        },
+        "7": {
+          "name": "punctuation.brackets.curly.begin.wit"
+        }
+      },
+      "end": "(})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.curly.end.wit"
+        }
+      },
+      "name": "meta.record-item.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#record-fields"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "record-fields": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b\\s*(:)",
+      "beginCaptures": {
+        "1": {
+          "name": "variable.declaration.id.record-fields.wit"
+        },
+        "6": {
+          "name": "keyword.operator.key-value.wit"
+        }
+      },
+      "end": "((,)|(?=})|(?=\\n))",
+      "endCaptures": {
+        "2": {
+          "name": "punctuation.comma.wit"
+        }
+      },
+      "name": "meta.record-fields.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#types",
+          "name": "meta.types.record-fields.wit"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "resource": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(resource)\\b\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.resource.wit"
+        },
+        "2": {
+          "name": "entity.name.type.id.resource.wit"
+        }
+      },
+      "end": "((?<=\\n)|(?=}))",
+      "name": "meta.resource-item.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#resource-methods"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "resource-methods": {
+      "applyEndPatternLast": 1,
+      "begin": "(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.brackets.curly.begin.wit"
+        }
+      },
+      "end": "(})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.curly.end.wit"
+        }
+      },
+      "name": "meta.resource-methods.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "applyEndPatternLast": 1,
+          "begin": "\\b(constructor)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.constructor.constructor-type.wit"
+            },
+            "2": {
+              "name": "punctuation.brackets.round.begin.wit"
+            }
+          },
+          "end": "((?<=\\n)|(?=}))",
+          "name": "meta.constructor-type.wit",
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#parameter-list"
+            },
+            {
+              "include": "#whitespace"
+            }
+          ]
+        },
+        {
+          "include": "#function"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "result": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(result)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.type.result.wit"
+        },
+        "2": {
+          "name": "punctuation.brackets.angle.begin.wit"
+        }
+      },
+      "end": "((?<=\\n)|(?=,)|(?=}))",
+      "name": "meta.result.ty.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "applyEndPatternLast": 1,
+          "begin": "(<)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.brackets.angle.begin.wit"
+            }
+          },
+          "end": "(>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.brackets.angle.end.wit"
+            }
+          },
+          "name": "meta.inner.result.wit",
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "match": "(?<!\\w)(_)(?!\\w)",
+              "name": "variable.other.inferred-type.result.wit"
+            },
+            {
+              "include": "#types",
+              "name": "meta.types.result.wit"
+            },
+            {
+              "match": "(?<!result)\\s*(,)",
+              "name": "punctuation.comma.wit"
+            },
+            {
+              "include": "#whitespace"
+            }
+          ]
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "result-list": {
+      "applyEndPatternLast": 1,
+      "begin": "(->)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.arrow.skinny.wit"
+        }
+      },
+      "end": "((?<=\\n)|(?=}))",
+      "name": "meta.result-list.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#types"
+        },
+        {
+          "include": "#parameter-list"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "string": {
+      "match": "\\b(string|char)\\b",
+      "name": "entity.name.type.string.wit"
+    },
+    "toplevel-use": {
+      "captures": {
+        "1": {
+          "name": "keyword.other.use.toplevel-use-item.wit"
+        },
+        "2": {
+          "name": "meta.interface.toplevel-use-item.wit",
+          "patterns": [
+            {
+              "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+              "name": "entity.name.type.declaration.interface.toplevel-use-item.wit"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "keyword.operator.versioning.interface.toplevel-use-item.wit"
+                },
+                "2": {
+                  "name": "constant.numeric.versioning.interface.toplevel-use-item.wit"
+                }
+              },
+              "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)",
+              "name": "meta.versioning.interface.toplevel-use-item.wit"
+            }
+          ]
+        },
+        "4": {
+          "name": "keyword.control.as.toplevel-use-item.wit"
+        },
+        "5": {
+          "name": "entity.name.type.toplevel-use-item.wit"
+        }
+      },
+      "match": "^(use)\\s+(\\S+)(\\s+(as)\\s+(\\S+))?\\s*",
+      "name": "meta.toplevel-use-item.wit"
+    },
+    "tuple": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(tuple)\\b(<)",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.type.tuple.wit"
+        },
+        "2": {
+          "name": "punctuation.brackets.angle.begin.wit"
+        }
+      },
+      "end": "(>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.angle.end.wit"
+        }
+      },
+      "name": "meta.tuple.ty.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#types",
+          "name": "meta.types.tuple.wit"
+        },
+        {
+          "match": "(,)",
+          "name": "punctuation.comma.wit"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "type-definition": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(type)\\b\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(=)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.declaration.type.type-item.wit storage.type.wit"
+        },
+        "2": {
+          "name": "entity.name.type.id.type-item.wit"
+        },
+        "7": {
+          "name": "punctuation.equal.wit"
+        }
+      },
+      "end": "(?<=\\n)",
+      "name": "meta.type-item.wit",
+      "patterns": [
+        {
+          "include": "#types",
+          "name": "meta.types.type-item.wit"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "typedef-item": {
+      "name": "meta.typedef-item.wit",
+      "patterns": [
+        {
+          "include": "#resource"
+        },
+        {
+          "include": "#variant"
+        },
+        {
+          "include": "#record"
+        },
+        {
+          "include": "#flags"
+        },
+        {
+          "include": "#enum"
+        },
+        {
+          "include": "#type-definition"
+        }
+      ]
+    },
+    "types": {
+      "name": "meta.ty.wit",
+      "patterns": [
+        {
+          "include": "#primitive"
+        },
+        {
+          "include": "#container"
+        },
+        {
+          "include": "#identifier"
+        }
+      ]
+    },
+    "use": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(use)\\b\\s+(\\S+)(\\.)(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.use.use-item.wit"
+        },
+        "2": {
+          "patterns": [
+            {
+              "include": "#use-path"
+            },
+            {
+              "include": "#whitespace"
+            }
+          ]
+        },
+        "3": {
+          "name": "keyword.operator.namespace-separator.use-item.wit"
+        },
+        "4": {
+          "name": "punctuation.brackets.curly.begin.wit"
+        }
+      },
+      "end": "(})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.curly.end.wit"
+        }
+      },
+      "name": "meta.use-item.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+          "name": "entity.name.type.declaration.use-names-item.use-item.wit"
+        },
+        {
+          "match": "(,)",
+          "name": "punctuation.comma.wit"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "use-path": {
+      "name": "meta.use-path.wit",
+      "patterns": [
+        {
+          "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+          "name": "entity.name.namespace.id.use-path.wit"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "keyword.operator.versioning.id.use-path.wit"
+            },
+            "2": {
+              "name": "constant.numeric.versioning.id.use-path.wit"
+            }
+          },
+          "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)",
+          "name": "meta.versioning.id.use-path.wit"
+        },
+        {
+          "match": "\\.",
+          "name": "keyword.operator.namespace-separator.use-path.wit"
+        }
+      ]
+    },
+    "variant": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b(variant)\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.variant.wit"
+        },
+        "2": {
+          "name": "entity.name.type.id.variant.wit"
+        },
+        "7": {
+          "name": "punctuation.brackets.curly.begin.wit"
+        }
+      },
+      "end": "(})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.curly.end.wit"
+        }
+      },
+      "name": "meta.variant.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#variant-cases"
+        },
+        {
+          "include": "#enum-cases"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "variant-cases": {
+      "applyEndPatternLast": 1,
+      "begin": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b\\s*(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.enummember.id.variant-cases.wit"
+        },
+        "6": {
+          "name": "punctuation.brackets.round.begin.wit"
+        }
+      },
+      "end": "(\\))\\s*(,)?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.round.end.wit"
+        },
+        "2": {
+          "name": "punctuation.comma.wit"
+        }
+      },
+      "name": "meta.variant-cases.wit",
+      "patterns": [
+        {
+          "include": "#types",
+          "name": "meta.types.variant-cases.wit"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    },
+    "whitespace": {
+      "match": "\\s+",
+      "name": "meta.whitespace.wit"
+    },
+    "world": {
+      "applyEndPatternLast": 1,
+      "begin": "^\\b(default\\s+)?(world)\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.default.world-item.wit"
+        },
+        "2": {
+          "name": "keyword.declaration.world.world-item.wit storage.type.wit"
+        },
+        "3": {
+          "name": "entity.name.type.id.world-item.wit"
+        },
+        "8": {
+          "name": "punctuation.brackets.curly.begin.wit"
+        }
+      },
+      "end": "(})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.brackets.curly.end.wit"
+        }
+      },
+      "name": "meta.world-item.wit",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "applyEndPatternLast": 1,
+          "begin": "\\b(export)\\b\\s+(\\S+)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.export.export-item.wit"
+            },
+            "2": {
+              "name": "meta.id.export-item.wit",
+              "patterns": [
+                {
+                  "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+                  "name": "variable.other.constant.id.export-item.wit"
+                },
+                {
+                  "captures": {
+                    "1": {
+                      "name": "keyword.operator.versioning.id.export-item.wit"
+                    },
+                    "2": {
+                      "name": "constant.numeric.versioning.id.export-item.wit"
+                    }
+                  },
+                  "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)",
+                  "name": "meta.versioning.id.export-item.wit"
+                }
+              ]
+            }
+          },
+          "end": "((?<=\\n)|(?=}))",
+          "name": "meta.export-item.wit",
+          "patterns": [
+            {
+              "include": "#extern"
+            },
+            {
+              "include": "#whitespace"
+            }
+          ]
+        },
+        {
+          "applyEndPatternLast": 1,
+          "begin": "\\b(import)\\b\\s+(\\S+)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.import.import-item.wit"
+            },
+            "2": {
+              "name": "meta.id.import-item.wit",
+              "patterns": [
+                {
+                  "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+                  "name": "variable.other.constant.id.import-item.wit"
+                },
+                {
+                  "captures": {
+                    "1": {
+                      "name": "keyword.operator.versioning.id.import-item.wit"
+                    },
+                    "2": {
+                      "name": "constant.numeric.versioning.id.import-item.wit"
+                    }
+                  },
+                  "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)",
+                  "name": "meta.versioning.id.import-item.wit"
+                }
+              ]
+            }
+          },
+          "end": "((?<=\\n)|(?=}))",
+          "name": "meta.import-item.wit",
+          "patterns": [
+            {
+              "include": "#extern"
+            },
+            {
+              "include": "#whitespace"
+            }
+          ]
+        },
+        {
+          "applyEndPatternLast": 1,
+          "begin": "\\b(include)\\s+(\\S+)\\s*",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.include.include-item.wit"
+            },
+            "2": {
+              "name": "meta.use-path.include-item.wit",
+              "patterns": [
+                {
+                  "include": "#use-path"
+                }
+              ]
+            }
+          },
+          "end": "(?<=\\n)",
+          "name": "meta.include-item.wit",
+          "patterns": [
+            {
+              "applyEndPatternLast": 1,
+              "begin": "\\b(with)\\b\\s+(\\{)",
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.control.with.include-item.wit"
+                },
+                "2": {
+                  "name": "punctuation.brackets.curly.begin.wit"
+                }
+              },
+              "end": "(})",
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.brackets.curly.end.wit"
+                }
+              },
+              "name": "meta.with.include-item.wit",
+              "patterns": [
+                {
+                  "include": "#comment"
+                },
+                {
+                  "captures": {
+                    "1": {
+                      "name": "variable.other.id.include-names-item.wit"
+                    },
+                    "2": {
+                      "name": "keyword.control.as.include-names-item.wit"
+                    },
+                    "3": {
+                      "name": "entity.name.type.include-names-item.wit"
+                    }
+                  },
+                  "match": "(\\S+)\\s+(as)\\s+([^\\s,]+)",
+                  "name": "meta.include-names-item.wit"
+                },
+                {
+                  "match": "(,)",
+                  "name": "punctuation.comma.wit"
+                },
+                {
+                  "include": "#whitespace"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "include": "#use"
+        },
+        {
+          "include": "#typedef-item"
+        },
+        {
+          "include": "#whitespace"
+        }
+      ]
+    }
+  },
+  "scopeName": "source.wit"
+}
diff --git a/resources/languages/wolfram.json b/resources/languages/wolfram.json
index ca1fd63..773532e 100644
--- a/resources/languages/wolfram.json
+++ b/resources/languages/wolfram.json
@@ -41,7 +41,7 @@
           "name": "punctuation.section.braces.begin.wolfram"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.braces.end.wolfram"
@@ -61,7 +61,7 @@
           "name": "punctuation.section.brackets.begin.wolfram"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.wolfram"
@@ -105,35 +105,35 @@
     "escaped_character_symbols": {
       "patterns": [
         {
-          "match": "System`\\\\\\[(?:F(?:ormalA|ormalAlpha|ormalB|ormalBeta|ormalC|ormalCapitalA|ormalCapitalAlpha|ormalCapitalB|ormalCapitalBeta|ormalCapitalC|ormalCapitalChi|ormalCapitalD|ormalCapitalDelta|ormalCapitalDigamma|ormalCapitalE|ormalCapitalEpsilon|ormalCapitalEta|ormalCapitalF|ormalCapitalG|ormalCapitalGamma|ormalCapitalH|ormalCapitalI|ormalCapitalIota|ormalCapitalJ|ormalCapitalK|ormalCapitalKappa|ormalCapitalKoppa|ormalCapitalL|ormalCapitalLambda|ormalCapitalM|ormalCapitalMu|ormalCapitalN|ormalCapitalNu|ormalCapitalO|ormalCapitalOmega|ormalCapitalOmicron|ormalCapitalP|ormalCapitalPhi|ormalCapitalPi|ormalCapitalPsi|ormalCapitalQ|ormalCapitalR|ormalCapitalRho|ormalCapitalS|ormalCapitalSampi|ormalCapitalSigma|ormalCapitalStigma|ormalCapitalT|ormalCapitalTau|ormalCapitalTheta|ormalCapitalU|ormalCapitalUpsilon|ormalCapitalV|ormalCapitalW|ormalCapitalX|ormalCapitalXi|ormalCapitalY|ormalCapitalZ|ormalCapitalZeta|ormalChi|ormalCurlyCapitalUpsilon|ormalCurlyEpsilon|ormalCurlyKappa|ormalCurlyPhi|ormalCurlyPi|ormalCurlyRho|ormalCurlyTheta|ormalD|ormalDelta|ormalDigamma|ormalE|ormalEpsilon|ormalEta|ormalF|ormalFinalSigma|ormalG|ormalGamma|ormalH|ormalI|ormalIota|ormalJ|ormalK|ormalKappa|ormalKoppa|ormalL|ormalLambda|ormalM|ormalMu|ormalN|ormalNu|ormalO|ormalOmega|ormalOmicron|ormalP|ormalPhi|ormalPi|ormalPsi|ormalQ|ormalR|ormalRho|ormalS|ormalSampi|ormalScriptA|ormalScriptB|ormalScriptC|ormalScriptCapitalA|ormalScriptCapitalB|ormalScriptCapitalC|ormalScriptCapitalD|ormalScriptCapitalE|ormalScriptCapitalF|ormalScriptCapitalG|ormalScriptCapitalH|ormalScriptCapitalI|ormalScriptCapitalJ|ormalScriptCapitalK|ormalScriptCapitalL|ormalScriptCapitalM|ormalScriptCapitalN|ormalScriptCapitalO|ormalScriptCapitalP|ormalScriptCapitalQ|ormalScriptCapitalR|ormalScriptCapitalS|ormalScriptCapitalT|ormalScriptCapitalU|ormalScriptCapitalV|ormalScriptCapitalW|ormalScriptCapitalX|ormalScriptCapitalY|ormalScriptCapitalZ|ormalScriptD|ormalScriptE|ormalScriptF|ormalScriptG|ormalScriptH|ormalScriptI|ormalScriptJ|ormalScriptK|ormalScriptL|ormalScriptM|ormalScriptN|ormalScriptO|ormalScriptP|ormalScriptQ|ormalScriptR|ormalScriptS|ormalScriptT|ormalScriptU|ormalScriptV|ormalScriptW|ormalScriptX|ormalScriptY|ormalScriptZ|ormalSigma|ormalStigma|ormalT|ormalTau|ormalTheta|ormalU|ormalUpsilon|ormalV|ormalW|ormalX|ormalXi|ormalY|ormalZ|ormalZeta))\\](?![`$[:alnum:]])",
+          "match": "System`\\\\\\[Formal(?:A|Alpha|B|Beta|C|CapitalA|CapitalAlpha|CapitalB|CapitalBeta|CapitalC|CapitalChi|CapitalD|CapitalDelta|CapitalDigamma|CapitalE|CapitalEpsilon|CapitalEta|CapitalF|CapitalG|CapitalGamma|CapitalH|CapitalI|CapitalIota|CapitalJ|CapitalK|CapitalKappa|CapitalKoppa|CapitalL|CapitalLambda|CapitalM|CapitalMu|CapitalN|CapitalNu|CapitalO|CapitalOmega|CapitalOmicron|CapitalP|CapitalPhi|CapitalPi|CapitalPsi|CapitalQ|CapitalR|CapitalRho|CapitalS|CapitalSampi|CapitalSigma|CapitalStigma|CapitalT|CapitalTau|CapitalTheta|CapitalU|CapitalUpsilon|CapitalV|CapitalW|CapitalX|CapitalXi|CapitalY|CapitalZ|CapitalZeta|Chi|CurlyCapitalUpsilon|CurlyEpsilon|CurlyKappa|CurlyPhi|CurlyPi|CurlyRho|CurlyTheta|D|Delta|Digamma|E|Epsilon|Eta|F|FinalSigma|G|Gamma|[HI]|Iota|[JK]|Kappa|Koppa|L|Lambda|M|Mu|N|Nu|O|Omega|Omicron|P|Phi|Pi|Psi|[QR]|Rho|S|Sampi|ScriptA|ScriptB|ScriptC|ScriptCapitalA|ScriptCapitalB|ScriptCapitalC|ScriptCapitalD|ScriptCapitalE|ScriptCapitalF|ScriptCapitalG|ScriptCapitalH|ScriptCapitalI|ScriptCapitalJ|ScriptCapitalK|ScriptCapitalL|ScriptCapitalM|ScriptCapitalN|ScriptCapitalO|ScriptCapitalP|ScriptCapitalQ|ScriptCapitalR|ScriptCapitalS|ScriptCapitalT|ScriptCapitalU|ScriptCapitalV|ScriptCapitalW|ScriptCapitalX|ScriptCapitalY|ScriptCapitalZ|ScriptD|ScriptE|ScriptF|ScriptG|ScriptH|ScriptI|ScriptJ|ScriptK|ScriptL|ScriptM|ScriptN|ScriptO|ScriptP|ScriptQ|ScriptR|ScriptS|ScriptT|ScriptU|ScriptV|ScriptW|ScriptX|ScriptY|ScriptZ|Sigma|Stigma|T|Tau|Theta|U|Upsilon|[VWX]|Xi|[YZ]|Zeta)](?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`\\\\\\[(?:S(?:ystemsModelDelay))\\](?![`$[:alnum:]])",
+          "match": "System`\\\\\\[SystemsModelDelay](?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "\\\\\\[(?:F(?:ormalA|ormalAlpha|ormalB|ormalBeta|ormalC|ormalCapitalA|ormalCapitalAlpha|ormalCapitalB|ormalCapitalBeta|ormalCapitalC|ormalCapitalChi|ormalCapitalD|ormalCapitalDelta|ormalCapitalDigamma|ormalCapitalE|ormalCapitalEpsilon|ormalCapitalEta|ormalCapitalF|ormalCapitalG|ormalCapitalGamma|ormalCapitalH|ormalCapitalI|ormalCapitalIota|ormalCapitalJ|ormalCapitalK|ormalCapitalKappa|ormalCapitalKoppa|ormalCapitalL|ormalCapitalLambda|ormalCapitalM|ormalCapitalMu|ormalCapitalN|ormalCapitalNu|ormalCapitalO|ormalCapitalOmega|ormalCapitalOmicron|ormalCapitalP|ormalCapitalPhi|ormalCapitalPi|ormalCapitalPsi|ormalCapitalQ|ormalCapitalR|ormalCapitalRho|ormalCapitalS|ormalCapitalSampi|ormalCapitalSigma|ormalCapitalStigma|ormalCapitalT|ormalCapitalTau|ormalCapitalTheta|ormalCapitalU|ormalCapitalUpsilon|ormalCapitalV|ormalCapitalW|ormalCapitalX|ormalCapitalXi|ormalCapitalY|ormalCapitalZ|ormalCapitalZeta|ormalChi|ormalCurlyCapitalUpsilon|ormalCurlyEpsilon|ormalCurlyKappa|ormalCurlyPhi|ormalCurlyPi|ormalCurlyRho|ormalCurlyTheta|ormalD|ormalDelta|ormalDigamma|ormalE|ormalEpsilon|ormalEta|ormalF|ormalFinalSigma|ormalG|ormalGamma|ormalH|ormalI|ormalIota|ormalJ|ormalK|ormalKappa|ormalKoppa|ormalL|ormalLambda|ormalM|ormalMu|ormalN|ormalNu|ormalO|ormalOmega|ormalOmicron|ormalP|ormalPhi|ormalPi|ormalPsi|ormalQ|ormalR|ormalRho|ormalS|ormalSampi|ormalScriptA|ormalScriptB|ormalScriptC|ormalScriptCapitalA|ormalScriptCapitalB|ormalScriptCapitalC|ormalScriptCapitalD|ormalScriptCapitalE|ormalScriptCapitalF|ormalScriptCapitalG|ormalScriptCapitalH|ormalScriptCapitalI|ormalScriptCapitalJ|ormalScriptCapitalK|ormalScriptCapitalL|ormalScriptCapitalM|ormalScriptCapitalN|ormalScriptCapitalO|ormalScriptCapitalP|ormalScriptCapitalQ|ormalScriptCapitalR|ormalScriptCapitalS|ormalScriptCapitalT|ormalScriptCapitalU|ormalScriptCapitalV|ormalScriptCapitalW|ormalScriptCapitalX|ormalScriptCapitalY|ormalScriptCapitalZ|ormalScriptD|ormalScriptE|ormalScriptF|ormalScriptG|ormalScriptH|ormalScriptI|ormalScriptJ|ormalScriptK|ormalScriptL|ormalScriptM|ormalScriptN|ormalScriptO|ormalScriptP|ormalScriptQ|ormalScriptR|ormalScriptS|ormalScriptT|ormalScriptU|ormalScriptV|ormalScriptW|ormalScriptX|ormalScriptY|ormalScriptZ|ormalSigma|ormalStigma|ormalT|ormalTau|ormalTheta|ormalU|ormalUpsilon|ormalV|ormalW|ormalX|ormalXi|ormalY|ormalZ|ormalZeta))\\](?![`$[:alnum:]])",
+          "match": "\\\\\\[Formal(?:A|Alpha|B|Beta|C|CapitalA|CapitalAlpha|CapitalB|CapitalBeta|CapitalC|CapitalChi|CapitalD|CapitalDelta|CapitalDigamma|CapitalE|CapitalEpsilon|CapitalEta|CapitalF|CapitalG|CapitalGamma|CapitalH|CapitalI|CapitalIota|CapitalJ|CapitalK|CapitalKappa|CapitalKoppa|CapitalL|CapitalLambda|CapitalM|CapitalMu|CapitalN|CapitalNu|CapitalO|CapitalOmega|CapitalOmicron|CapitalP|CapitalPhi|CapitalPi|CapitalPsi|CapitalQ|CapitalR|CapitalRho|CapitalS|CapitalSampi|CapitalSigma|CapitalStigma|CapitalT|CapitalTau|CapitalTheta|CapitalU|CapitalUpsilon|CapitalV|CapitalW|CapitalX|CapitalXi|CapitalY|CapitalZ|CapitalZeta|Chi|CurlyCapitalUpsilon|CurlyEpsilon|CurlyKappa|CurlyPhi|CurlyPi|CurlyRho|CurlyTheta|D|Delta|Digamma|E|Epsilon|Eta|F|FinalSigma|G|Gamma|[HI]|Iota|[JK]|Kappa|Koppa|L|Lambda|M|Mu|N|Nu|O|Omega|Omicron|P|Phi|Pi|Psi|[QR]|Rho|S|Sampi|ScriptA|ScriptB|ScriptC|ScriptCapitalA|ScriptCapitalB|ScriptCapitalC|ScriptCapitalD|ScriptCapitalE|ScriptCapitalF|ScriptCapitalG|ScriptCapitalH|ScriptCapitalI|ScriptCapitalJ|ScriptCapitalK|ScriptCapitalL|ScriptCapitalM|ScriptCapitalN|ScriptCapitalO|ScriptCapitalP|ScriptCapitalQ|ScriptCapitalR|ScriptCapitalS|ScriptCapitalT|ScriptCapitalU|ScriptCapitalV|ScriptCapitalW|ScriptCapitalX|ScriptCapitalY|ScriptCapitalZ|ScriptD|ScriptE|ScriptF|ScriptG|ScriptH|ScriptI|ScriptJ|ScriptK|ScriptL|ScriptM|ScriptN|ScriptO|ScriptP|ScriptQ|ScriptR|ScriptS|ScriptT|ScriptU|ScriptV|ScriptW|ScriptX|ScriptY|ScriptZ|Sigma|Stigma|T|Tau|Theta|U|Upsilon|[VWX]|Xi|[YZ]|Zeta)](?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "\\\\\\[(?:S(?:ystemsModelDelay))\\](?![`$[:alnum:]])",
+          "match": "\\\\\\[SystemsModelDelay](?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "\\\\\\[(?:D(?:egree))\\](?![`$[:alnum:]])",
+          "match": "\\\\\\[Degree](?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "\\\\\\[(?:E(?:xponentialE))\\](?![`$[:alnum:]])",
+          "match": "\\\\\\[ExponentialE](?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "\\\\\\[(?:I(?:maginaryI|maginaryJ|nfinity))\\](?![`$[:alnum:]])",
+          "match": "\\\\\\[I(?:maginaryI|maginaryJ|nfinity)](?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "\\\\\\[(?:P(?:i))\\](?![`$[:alnum:]])",
+          "match": "\\\\\\[Pi](?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         }
       ]
@@ -141,183 +141,183 @@
     "escaped_characters": {
       "patterns": [
         {
-          "match": "\\\\[!%&()*+/@^_` ]",
+          "match": "\\\\[!%\\&()*+/@^_` ]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:A(?:kuz|ndy))\\]",
+          "match": "\\\\\\[A(?:kuz|ndy)]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:C(?:ontinuedFractionK|url))\\]",
+          "match": "\\\\\\[C(?:ontinuedFractionK|url)]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:D(?:ivergence|ivisionSlash))\\]",
+          "match": "\\\\\\[Div(?:ergence|isionSlash)]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:E(?:xpectationE))\\]",
+          "match": "\\\\\\[ExpectationE]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:F(?:reeformPrompt))\\]",
+          "match": "\\\\\\[FreeformPrompt]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:G(?:radient))\\]",
+          "match": "\\\\\\[Gradient]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:L(?:aplacian))\\]",
+          "match": "\\\\\\[Laplacian]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:M(?:inus|oon))\\]",
+          "match": "\\\\\\[M(?:inus|oon)]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:N(?:umberComma))\\]",
+          "match": "\\\\\\[NumberComma]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:P(?:ageBreakAbove|ageBreakBelow|robabilityPr))\\]",
+          "match": "\\\\\\[P(?:ageBreakAbove|ageBreakBelow|robabilityPr)]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:S(?:pooky|tepperDown|tepperLeft|tepperRight|tepperUp|un))\\]",
+          "match": "\\\\\\[S(?:pooky|tepperDown|tepperLeft|tepperRight|tepperUp|un)]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:U(?:nknownGlyph))\\]",
+          "match": "\\\\\\[UnknownGlyph]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:V(?:illa))\\]",
+          "match": "\\\\\\[Villa]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:W(?:olframAlphaPrompt))\\]",
+          "match": "\\\\\\[WolframAlphaPrompt]",
           "name": "donothighlight.constant.character.escape.undocumented"
         },
         {
-          "match": "\\\\\\[(?:C(?:OMPATIBILITYKanjiSpace|OMPATIBILITYNoBreak))\\]",
+          "match": "\\\\\\[COMPATIBILITY(?:KanjiSpace|NoBreak)]",
           "name": "invalid.illegal.unsupported"
         },
         {
-          "match": "\\\\\\[(?:I(?:nlinePart))\\]",
+          "match": "\\\\\\[InlinePart]",
           "name": "invalid.illegal.unsupported"
         },
         {
-          "match": "\\\\\\[(?:A(?:Acute|Bar|Cup|DoubleDot|E|Grave|Hat|Ring|Tilde|leph|liasDelimiter|liasIndicator|lignmentMarker|lpha|ltKey|nd|ngle|ngstrom|pplication|quariusSign|riesSign|scendingEllipsis|utoLeftMatch|utoOperand|utoPlaceholder|utoRightMatch|utoSpace))\\]",
+          "match": "\\\\\\[A(?:Acute|Bar|Cup|DoubleDot|E|Grave|Hat|Ring|Tilde|leph|liasDelimiter|liasIndicator|lignmentMarker|lpha|ltKey|nd|ngle|ngstrom|pplication|quariusSign|riesSign|scendingEllipsis|utoLeftMatch|utoOperand|utoPlaceholder|utoRightMatch|utoSpace)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:B(?:ackslash|eamedEighthNote|eamedSixteenthNote|ecause|et|eta|lackBishop|lackKing|lackKnight|lackPawn|lackQueen|lackRook|reve|ullet))\\]",
+          "match": "\\\\\\[B(?:ackslash|eamedEighthNote|eamedSixteenthNote|ecause|et|eta|lackBishop|lackKing|lackKnight|lackPawn|lackQueen|lackRook|reve|ullet)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:C(?:Acute|Cedilla|Hacek|ancerSign|ap|apitalAAcute|apitalABar|apitalACup|apitalADoubleDot|apitalAE|apitalAGrave|apitalAHat|apitalARing|apitalATilde|apitalAlpha|apitalBeta|apitalCAcute|apitalCCedilla|apitalCHacek|apitalChi|apitalDHacek|apitalDelta|apitalDifferentialD|apitalDigamma|apitalEAcute|apitalEBar|apitalECup|apitalEDoubleDot|apitalEGrave|apitalEHacek|apitalEHat|apitalEpsilon|apitalEta|apitalEth|apitalGamma|apitalIAcute|apitalICup|apitalIDoubleDot|apitalIGrave|apitalIHat|apitalIota|apitalKappa|apitalKoppa|apitalLSlash|apitalLambda|apitalMu|apitalNHacek|apitalNTilde|apitalNu|apitalOAcute|apitalODoubleAcute|apitalODoubleDot|apitalOE|apitalOGrave|apitalOHat|apitalOSlash|apitalOTilde|apitalOmega|apitalOmicron|apitalPhi|apitalPi|apitalPsi|apitalRHacek|apitalRho|apitalSHacek|apitalSampi|apitalSigma|apitalStigma|apitalTHacek|apitalTau|apitalTheta|apitalThorn|apitalUAcute|apitalUDoubleAcute|apitalUDoubleDot|apitalUGrave|apitalUHat|apitalURing|apitalUpsilon|apitalXi|apitalYAcute|apitalZHacek|apitalZeta|apricornSign|edilla|ent|enterDot|enterEllipsis|heckedBox|heckmark|heckmarkedBox|hi|ircleDot|ircleMinus|irclePlus|ircleTimes|lockwiseContourIntegral|loseCurlyDoubleQuote|loseCurlyQuote|loverLeaf|lubSuit|olon|ommandKey|onditioned|ongruent|onjugate|onjugateTranspose|onstantC|ontinuation|ontourIntegral|ontrolKey|oproduct|opyright|ounterClockwiseContourIntegral|ross|ubeRoot|up|upCap|urlyCapitalUpsilon|urlyEpsilon|urlyKappa|urlyPhi|urlyPi|urlyRho|urlyTheta|urrency))\\]",
+          "match": "\\\\\\[C(?:Acute|Cedilla|Hacek|ancerSign|ap|apitalAAcute|apitalABar|apitalACup|apitalADoubleDot|apitalAE|apitalAGrave|apitalAHat|apitalARing|apitalATilde|apitalAlpha|apitalBeta|apitalCAcute|apitalCCedilla|apitalCHacek|apitalChi|apitalDHacek|apitalDelta|apitalDifferentialD|apitalDigamma|apitalEAcute|apitalEBar|apitalECup|apitalEDoubleDot|apitalEGrave|apitalEHacek|apitalEHat|apitalEpsilon|apitalEta|apitalEth|apitalGamma|apitalIAcute|apitalICup|apitalIDoubleDot|apitalIGrave|apitalIHat|apitalIota|apitalKappa|apitalKoppa|apitalLSlash|apitalLambda|apitalMu|apitalNHacek|apitalNTilde|apitalNu|apitalOAcute|apitalODoubleAcute|apitalODoubleDot|apitalOE|apitalOGrave|apitalOHat|apitalOSlash|apitalOTilde|apitalOmega|apitalOmicron|apitalPhi|apitalPi|apitalPsi|apitalRHacek|apitalRho|apitalSHacek|apitalSampi|apitalSigma|apitalStigma|apitalTHacek|apitalTau|apitalTheta|apitalThorn|apitalUAcute|apitalUDoubleAcute|apitalUDoubleDot|apitalUGrave|apitalUHat|apitalURing|apitalUpsilon|apitalXi|apitalYAcute|apitalZHacek|apitalZeta|apricornSign|edilla|ent|enterDot|enterEllipsis|heckedBox|heckmark|heckmarkedBox|hi|ircleDot|ircleMinus|irclePlus|ircleTimes|lockwiseContourIntegral|loseCurlyDoubleQuote|loseCurlyQuote|loverLeaf|lubSuit|olon|ommandKey|onditioned|ongruent|onjugate|onjugateTranspose|onstantC|ontinuation|ontourIntegral|ontrolKey|oproduct|opyright|ounterClockwiseContourIntegral|ross|ubeRoot|up|upCap|urlyCapitalUpsilon|urlyEpsilon|urlyKappa|urlyPhi|urlyPi|urlyRho|urlyTheta|urrency)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:D(?:Hacek|agger|alet|ash|egree|el|eleteKey|elta|escendingEllipsis|iameter|iamond|iamondSuit|ifferenceDelta|ifferentialD|igamma|irectedEdge|iscreteRatio|iscreteShift|iscretionaryHyphen|iscretionaryLineSeparator|iscretionaryPageBreakAbove|iscretionaryPageBreakBelow|iscretionaryParagraphSeparator|istributed|ivide|ivides|otEqual|otlessI|otlessJ|ottedSquare|oubleContourIntegral|oubleDagger|oubleDot|oubleDownArrow|oubleLeftArrow|oubleLeftRightArrow|oubleLeftTee|oubleLongLeftArrow|oubleLongLeftRightArrow|oubleLongRightArrow|oublePrime|oubleRightArrow|oubleRightTee|oubleStruckA|oubleStruckB|oubleStruckC|oubleStruckCapitalA|oubleStruckCapitalB|oubleStruckCapitalC|oubleStruckCapitalD|oubleStruckCapitalE|oubleStruckCapitalF|oubleStruckCapitalG|oubleStruckCapitalH|oubleStruckCapitalI|oubleStruckCapitalJ|oubleStruckCapitalK|oubleStruckCapitalL|oubleStruckCapitalM|oubleStruckCapitalN|oubleStruckCapitalO|oubleStruckCapitalP|oubleStruckCapitalQ|oubleStruckCapitalR|oubleStruckCapitalS|oubleStruckCapitalT|oubleStruckCapitalU|oubleStruckCapitalV|oubleStruckCapitalW|oubleStruckCapitalX|oubleStruckCapitalY|oubleStruckCapitalZ|oubleStruckD|oubleStruckE|oubleStruckEight|oubleStruckF|oubleStruckFive|oubleStruckFour|oubleStruckG|oubleStruckH|oubleStruckI|oubleStruckJ|oubleStruckK|oubleStruckL|oubleStruckM|oubleStruckN|oubleStruckNine|oubleStruckO|oubleStruckOne|oubleStruckP|oubleStruckQ|oubleStruckR|oubleStruckS|oubleStruckSeven|oubleStruckSix|oubleStruckT|oubleStruckThree|oubleStruckTwo|oubleStruckU|oubleStruckV|oubleStruckW|oubleStruckX|oubleStruckY|oubleStruckZ|oubleStruckZero|oubleUpArrow|oubleUpDownArrow|oubleVerticalBar|oubledGamma|oubledPi|ownArrow|ownArrowBar|ownArrowUpArrow|ownBreve|ownExclamation|ownLeftRightVector|ownLeftTeeVector|ownLeftVector|ownLeftVectorBar|ownPointer|ownQuestion|ownRightTeeVector|ownRightVector|ownRightVectorBar|ownTee|ownTeeArrow))\\]",
+          "match": "\\\\\\[D(?:Hacek|agger|alet|ash|egree|el|eleteKey|elta|escendingEllipsis|iameter|iamond|iamondSuit|ifferenceDelta|ifferentialD|igamma|irectedEdge|iscreteRatio|iscreteShift|iscretionaryHyphen|iscretionaryLineSeparator|iscretionaryPageBreakAbove|iscretionaryPageBreakBelow|iscretionaryParagraphSeparator|istributed|ivide|ivides|otEqual|otlessI|otlessJ|ottedSquare|oubleContourIntegral|oubleDagger|oubleDot|oubleDownArrow|oubleLeftArrow|oubleLeftRightArrow|oubleLeftTee|oubleLongLeftArrow|oubleLongLeftRightArrow|oubleLongRightArrow|oublePrime|oubleRightArrow|oubleRightTee|oubleStruckA|oubleStruckB|oubleStruckC|oubleStruckCapitalA|oubleStruckCapitalB|oubleStruckCapitalC|oubleStruckCapitalD|oubleStruckCapitalE|oubleStruckCapitalF|oubleStruckCapitalG|oubleStruckCapitalH|oubleStruckCapitalI|oubleStruckCapitalJ|oubleStruckCapitalK|oubleStruckCapitalL|oubleStruckCapitalM|oubleStruckCapitalN|oubleStruckCapitalO|oubleStruckCapitalP|oubleStruckCapitalQ|oubleStruckCapitalR|oubleStruckCapitalS|oubleStruckCapitalT|oubleStruckCapitalU|oubleStruckCapitalV|oubleStruckCapitalW|oubleStruckCapitalX|oubleStruckCapitalY|oubleStruckCapitalZ|oubleStruckD|oubleStruckE|oubleStruckEight|oubleStruckF|oubleStruckFive|oubleStruckFour|oubleStruckG|oubleStruckH|oubleStruckI|oubleStruckJ|oubleStruckK|oubleStruckL|oubleStruckM|oubleStruckN|oubleStruckNine|oubleStruckO|oubleStruckOne|oubleStruckP|oubleStruckQ|oubleStruckR|oubleStruckS|oubleStruckSeven|oubleStruckSix|oubleStruckT|oubleStruckThree|oubleStruckTwo|oubleStruckU|oubleStruckV|oubleStruckW|oubleStruckX|oubleStruckY|oubleStruckZ|oubleStruckZero|oubleUpArrow|oubleUpDownArrow|oubleVerticalBar|oubledGamma|oubledPi|ownArrow|ownArrowBar|ownArrowUpArrow|ownBreve|ownExclamation|ownLeftRightVector|ownLeftTeeVector|ownLeftVector|ownLeftVectorBar|ownPointer|ownQuestion|ownRightTeeVector|ownRightVector|ownRightVectorBar|ownTee|ownTeeArrow)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:E(?:Acute|Bar|Cup|DoubleDot|Grave|Hacek|Hat|arth|ighthNote|lement|llipsis|mptyCircle|mptyDiamond|mptyDownTriangle|mptyRectangle|mptySet|mptySmallCircle|mptySmallSquare|mptySquare|mptyUpTriangle|mptyVerySmallSquare|nterKey|ntityEnd|ntityStart|psilon|qual|qualTilde|quilibrium|quivalent|rrorIndicator|scapeKey|ta|th|uro|xists|xponentialE))\\]",
+          "match": "\\\\\\[E(?:Acute|Bar|Cup|DoubleDot|Grave|Hacek|Hat|arth|ighthNote|lement|llipsis|mptyCircle|mptyDiamond|mptyDownTriangle|mptyRectangle|mptySet|mptySmallCircle|mptySmallSquare|mptySquare|mptyUpTriangle|mptyVerySmallSquare|nterKey|ntityEnd|ntityStart|psilon|qual|qualTilde|quilibrium|quivalent|rrorIndicator|scapeKey|ta|th|uro|xists|xponentialE)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:F(?:iLigature|illedCircle|illedDiamond|illedDownTriangle|illedLeftTriangle|illedRectangle|illedRightTriangle|illedSmallCircle|illedSmallSquare|illedSquare|illedUpTriangle|illedVerySmallSquare|inalSigma|irstPage|ivePointedStar|lLigature|lat|lorin|orAll|ormalA|ormalAlpha|ormalB|ormalBeta|ormalC|ormalCapitalA|ormalCapitalAlpha|ormalCapitalB|ormalCapitalBeta|ormalCapitalC|ormalCapitalChi|ormalCapitalD|ormalCapitalDelta|ormalCapitalDigamma|ormalCapitalE|ormalCapitalEpsilon|ormalCapitalEta|ormalCapitalF|ormalCapitalG|ormalCapitalGamma|ormalCapitalH|ormalCapitalI|ormalCapitalIota|ormalCapitalJ|ormalCapitalK|ormalCapitalKappa|ormalCapitalKoppa|ormalCapitalL|ormalCapitalLambda|ormalCapitalM|ormalCapitalMu|ormalCapitalN|ormalCapitalNu|ormalCapitalO|ormalCapitalOmega|ormalCapitalOmicron|ormalCapitalP|ormalCapitalPhi|ormalCapitalPi|ormalCapitalPsi|ormalCapitalQ|ormalCapitalR|ormalCapitalRho|ormalCapitalS|ormalCapitalSampi|ormalCapitalSigma|ormalCapitalStigma|ormalCapitalT|ormalCapitalTau|ormalCapitalTheta|ormalCapitalU|ormalCapitalUpsilon|ormalCapitalV|ormalCapitalW|ormalCapitalX|ormalCapitalXi|ormalCapitalY|ormalCapitalZ|ormalCapitalZeta|ormalChi|ormalCurlyCapitalUpsilon|ormalCurlyEpsilon|ormalCurlyKappa|ormalCurlyPhi|ormalCurlyPi|ormalCurlyRho|ormalCurlyTheta|ormalD|ormalDelta|ormalDigamma|ormalE|ormalEpsilon|ormalEta|ormalF|ormalFinalSigma|ormalG|ormalGamma|ormalH|ormalI|ormalIota|ormalJ|ormalK|ormalKappa|ormalKoppa|ormalL|ormalLambda|ormalM|ormalMu|ormalN|ormalNu|ormalO|ormalOmega|ormalOmicron|ormalP|ormalPhi|ormalPi|ormalPsi|ormalQ|ormalR|ormalRho|ormalS|ormalSampi|ormalScriptA|ormalScriptB|ormalScriptC|ormalScriptCapitalA|ormalScriptCapitalB|ormalScriptCapitalC|ormalScriptCapitalD|ormalScriptCapitalE|ormalScriptCapitalF|ormalScriptCapitalG|ormalScriptCapitalH|ormalScriptCapitalI|ormalScriptCapitalJ|ormalScriptCapitalK|ormalScriptCapitalL|ormalScriptCapitalM|ormalScriptCapitalN|ormalScriptCapitalO|ormalScriptCapitalP|ormalScriptCapitalQ|ormalScriptCapitalR|ormalScriptCapitalS|ormalScriptCapitalT|ormalScriptCapitalU|ormalScriptCapitalV|ormalScriptCapitalW|ormalScriptCapitalX|ormalScriptCapitalY|ormalScriptCapitalZ|ormalScriptD|ormalScriptE|ormalScriptF|ormalScriptG|ormalScriptH|ormalScriptI|ormalScriptJ|ormalScriptK|ormalScriptL|ormalScriptM|ormalScriptN|ormalScriptO|ormalScriptP|ormalScriptQ|ormalScriptR|ormalScriptS|ormalScriptT|ormalScriptU|ormalScriptV|ormalScriptW|ormalScriptX|ormalScriptY|ormalScriptZ|ormalSigma|ormalStigma|ormalT|ormalTau|ormalTheta|ormalU|ormalUpsilon|ormalV|ormalW|ormalX|ormalXi|ormalY|ormalZ|ormalZeta|reakedSmiley|unction))\\]",
+          "match": "\\\\\\[F(?:iLigature|illedCircle|illedDiamond|illedDownTriangle|illedLeftTriangle|illedRectangle|illedRightTriangle|illedSmallCircle|illedSmallSquare|illedSquare|illedUpTriangle|illedVerySmallSquare|inalSigma|irstPage|ivePointedStar|lLigature|lat|lorin|orAll|ormalA|ormalAlpha|ormalB|ormalBeta|ormalC|ormalCapitalA|ormalCapitalAlpha|ormalCapitalB|ormalCapitalBeta|ormalCapitalC|ormalCapitalChi|ormalCapitalD|ormalCapitalDelta|ormalCapitalDigamma|ormalCapitalE|ormalCapitalEpsilon|ormalCapitalEta|ormalCapitalF|ormalCapitalG|ormalCapitalGamma|ormalCapitalH|ormalCapitalI|ormalCapitalIota|ormalCapitalJ|ormalCapitalK|ormalCapitalKappa|ormalCapitalKoppa|ormalCapitalL|ormalCapitalLambda|ormalCapitalM|ormalCapitalMu|ormalCapitalN|ormalCapitalNu|ormalCapitalO|ormalCapitalOmega|ormalCapitalOmicron|ormalCapitalP|ormalCapitalPhi|ormalCapitalPi|ormalCapitalPsi|ormalCapitalQ|ormalCapitalR|ormalCapitalRho|ormalCapitalS|ormalCapitalSampi|ormalCapitalSigma|ormalCapitalStigma|ormalCapitalT|ormalCapitalTau|ormalCapitalTheta|ormalCapitalU|ormalCapitalUpsilon|ormalCapitalV|ormalCapitalW|ormalCapitalX|ormalCapitalXi|ormalCapitalY|ormalCapitalZ|ormalCapitalZeta|ormalChi|ormalCurlyCapitalUpsilon|ormalCurlyEpsilon|ormalCurlyKappa|ormalCurlyPhi|ormalCurlyPi|ormalCurlyRho|ormalCurlyTheta|ormalD|ormalDelta|ormalDigamma|ormalE|ormalEpsilon|ormalEta|ormalF|ormalFinalSigma|ormalG|ormalGamma|ormalH|ormalI|ormalIota|ormalJ|ormalK|ormalKappa|ormalKoppa|ormalL|ormalLambda|ormalM|ormalMu|ormalN|ormalNu|ormalO|ormalOmega|ormalOmicron|ormalP|ormalPhi|ormalPi|ormalPsi|ormalQ|ormalR|ormalRho|ormalS|ormalSampi|ormalScriptA|ormalScriptB|ormalScriptC|ormalScriptCapitalA|ormalScriptCapitalB|ormalScriptCapitalC|ormalScriptCapitalD|ormalScriptCapitalE|ormalScriptCapitalF|ormalScriptCapitalG|ormalScriptCapitalH|ormalScriptCapitalI|ormalScriptCapitalJ|ormalScriptCapitalK|ormalScriptCapitalL|ormalScriptCapitalM|ormalScriptCapitalN|ormalScriptCapitalO|ormalScriptCapitalP|ormalScriptCapitalQ|ormalScriptCapitalR|ormalScriptCapitalS|ormalScriptCapitalT|ormalScriptCapitalU|ormalScriptCapitalV|ormalScriptCapitalW|ormalScriptCapitalX|ormalScriptCapitalY|ormalScriptCapitalZ|ormalScriptD|ormalScriptE|ormalScriptF|ormalScriptG|ormalScriptH|ormalScriptI|ormalScriptJ|ormalScriptK|ormalScriptL|ormalScriptM|ormalScriptN|ormalScriptO|ormalScriptP|ormalScriptQ|ormalScriptR|ormalScriptS|ormalScriptT|ormalScriptU|ormalScriptV|ormalScriptW|ormalScriptX|ormalScriptY|ormalScriptZ|ormalSigma|ormalStigma|ormalT|ormalTau|ormalTheta|ormalU|ormalUpsilon|ormalV|ormalW|ormalX|ormalXi|ormalY|ormalZ|ormalZeta|reakedSmiley|unction)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:G(?:amma|eminiSign|imel|othicA|othicB|othicC|othicCapitalA|othicCapitalB|othicCapitalC|othicCapitalD|othicCapitalE|othicCapitalF|othicCapitalG|othicCapitalH|othicCapitalI|othicCapitalJ|othicCapitalK|othicCapitalL|othicCapitalM|othicCapitalN|othicCapitalO|othicCapitalP|othicCapitalQ|othicCapitalR|othicCapitalS|othicCapitalT|othicCapitalU|othicCapitalV|othicCapitalW|othicCapitalX|othicCapitalY|othicCapitalZ|othicD|othicE|othicEight|othicF|othicFive|othicFour|othicG|othicH|othicI|othicJ|othicK|othicL|othicM|othicN|othicNine|othicO|othicOne|othicP|othicQ|othicR|othicS|othicSeven|othicSix|othicT|othicThree|othicTwo|othicU|othicV|othicW|othicX|othicY|othicZ|othicZero|rayCircle|raySquare|reaterEqual|reaterEqualLess|reaterFullEqual|reaterGreater|reaterLess|reaterSlantEqual|reaterTilde))\\]",
+          "match": "\\\\\\[G(?:amma|eminiSign|imel|othicA|othicB|othicC|othicCapitalA|othicCapitalB|othicCapitalC|othicCapitalD|othicCapitalE|othicCapitalF|othicCapitalG|othicCapitalH|othicCapitalI|othicCapitalJ|othicCapitalK|othicCapitalL|othicCapitalM|othicCapitalN|othicCapitalO|othicCapitalP|othicCapitalQ|othicCapitalR|othicCapitalS|othicCapitalT|othicCapitalU|othicCapitalV|othicCapitalW|othicCapitalX|othicCapitalY|othicCapitalZ|othicD|othicE|othicEight|othicF|othicFive|othicFour|othicG|othicH|othicI|othicJ|othicK|othicL|othicM|othicN|othicNine|othicO|othicOne|othicP|othicQ|othicR|othicS|othicSeven|othicSix|othicT|othicThree|othicTwo|othicU|othicV|othicW|othicX|othicY|othicZ|othicZero|rayCircle|raySquare|reaterEqual|reaterEqualLess|reaterFullEqual|reaterGreater|reaterLess|reaterSlantEqual|reaterTilde)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:H(?:Bar|acek|appySmiley|eartSuit|ermitianConjugate|orizontalLine|umpDownHump|umpEqual|yphen))\\]",
+          "match": "\\\\\\[H(?:Bar|acek|appySmiley|eartSuit|ermitianConjugate|orizontalLine|umpDownHump|umpEqual|yphen)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:I(?:Acute|Cup|DoubleDot|Grave|Hat|maginaryI|maginaryJ|mplicitPlus|mplies|ndentingNewLine|nfinity|ntegral|ntersection|nvisibleApplication|nvisibleComma|nvisiblePostfixScriptBase|nvisiblePrefixScriptBase|nvisibleSpace|nvisibleTimes|ota))\\]",
+          "match": "\\\\\\[I(?:Acute|Cup|DoubleDot|Grave|Hat|maginaryI|maginaryJ|mplicitPlus|mplies|ndentingNewLine|nfinity|ntegral|ntersection|nvisibleApplication|nvisibleComma|nvisiblePostfixScriptBase|nvisiblePrefixScriptBase|nvisibleSpace|nvisibleTimes|ota)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:J(?:upiter))\\]",
+          "match": "\\\\\\[Jupiter]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:K(?:appa|ernelIcon|eyBar|oppa))\\]",
+          "match": "\\\\\\[K(?:appa|ernelIcon|eyBar|oppa)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:L(?:Slash|ambda|astPage|eftAngleBracket|eftArrow|eftArrowBar|eftArrowRightArrow|eftAssociation|eftBracketingBar|eftCeiling|eftDoubleBracket|eftDoubleBracketingBar|eftDownTeeVector|eftDownVector|eftDownVectorBar|eftFloor|eftGuillemet|eftModified|eftPointer|eftRightArrow|eftRightVector|eftSkeleton|eftTee|eftTeeArrow|eftTeeVector|eftTriangle|eftTriangleBar|eftTriangleEqual|eftUpDownVector|eftUpTeeVector|eftUpVector|eftUpVectorBar|eftVector|eftVectorBar|eoSign|essEqual|essEqualGreater|essFullEqual|essGreater|essLess|essSlantEqual|essTilde|etterSpace|ibraSign|ightBulb|imit|ineSeparator|ongDash|ongEqual|ongLeftArrow|ongLeftRightArrow|ongRightArrow|owerLeftArrow|owerRightArrow))\\]",
+          "match": "\\\\\\[L(?:Slash|ambda|astPage|eftAngleBracket|eftArrow|eftArrowBar|eftArrowRightArrow|eftAssociation|eftBracketingBar|eftCeiling|eftDoubleBracket|eftDoubleBracketingBar|eftDownTeeVector|eftDownVector|eftDownVectorBar|eftFloor|eftGuillemet|eftModified|eftPointer|eftRightArrow|eftRightVector|eftSkeleton|eftTee|eftTeeArrow|eftTeeVector|eftTriangle|eftTriangleBar|eftTriangleEqual|eftUpDownVector|eftUpTeeVector|eftUpVector|eftUpVectorBar|eftVector|eftVectorBar|eoSign|essEqual|essEqualGreater|essFullEqual|essGreater|essLess|essSlantEqual|essTilde|etterSpace|ibraSign|ightBulb|imit|ineSeparator|ongDash|ongEqual|ongLeftArrow|ongLeftRightArrow|ongRightArrow|owerLeftArrow|owerRightArrow)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:M(?:ars|athematicaIcon|axLimit|easuredAngle|ediumSpace|ercury|ho|icro|inLimit|inusPlus|od1Key|od2Key|u))\\]",
+          "match": "\\\\\\[M(?:ars|athematicaIcon|axLimit|easuredAngle|ediumSpace|ercury|ho|icro|inLimit|inusPlus|od1Key|od2Key|u)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:N(?:Hacek|Tilde|and|atural|egativeMediumSpace|egativeThickSpace|egativeThinSpace|egativeVeryThinSpace|eptune|estedGreaterGreater|estedLessLess|eutralSmiley|ewLine|oBreak|onBreakingSpace|or|ot|otCongruent|otCupCap|otDoubleVerticalBar|otElement|otEqual|otEqualTilde|otExists|otGreater|otGreaterEqual|otGreaterFullEqual|otGreaterGreater|otGreaterLess|otGreaterSlantEqual|otGreaterTilde|otHumpDownHump|otHumpEqual|otLeftTriangle|otLeftTriangleBar|otLeftTriangleEqual|otLess|otLessEqual|otLessFullEqual|otLessGreater|otLessLess|otLessSlantEqual|otLessTilde|otNestedGreaterGreater|otNestedLessLess|otPrecedes|otPrecedesEqual|otPrecedesSlantEqual|otPrecedesTilde|otReverseElement|otRightTriangle|otRightTriangleBar|otRightTriangleEqual|otSquareSubset|otSquareSubsetEqual|otSquareSuperset|otSquareSupersetEqual|otSubset|otSubsetEqual|otSucceeds|otSucceedsEqual|otSucceedsSlantEqual|otSucceedsTilde|otSuperset|otSupersetEqual|otTilde|otTildeEqual|otTildeFullEqual|otTildeTilde|otVerticalBar|u|ull|umberSign))\\]",
+          "match": "\\\\\\[N(?:Hacek|Tilde|and|atural|egativeMediumSpace|egativeThickSpace|egativeThinSpace|egativeVeryThinSpace|eptune|estedGreaterGreater|estedLessLess|eutralSmiley|ewLine|oBreak|onBreakingSpace|or|ot|otCongruent|otCupCap|otDoubleVerticalBar|otElement|otEqual|otEqualTilde|otExists|otGreater|otGreaterEqual|otGreaterFullEqual|otGreaterGreater|otGreaterLess|otGreaterSlantEqual|otGreaterTilde|otHumpDownHump|otHumpEqual|otLeftTriangle|otLeftTriangleBar|otLeftTriangleEqual|otLess|otLessEqual|otLessFullEqual|otLessGreater|otLessLess|otLessSlantEqual|otLessTilde|otNestedGreaterGreater|otNestedLessLess|otPrecedes|otPrecedesEqual|otPrecedesSlantEqual|otPrecedesTilde|otReverseElement|otRightTriangle|otRightTriangleBar|otRightTriangleEqual|otSquareSubset|otSquareSubsetEqual|otSquareSuperset|otSquareSupersetEqual|otSubset|otSubsetEqual|otSucceeds|otSucceedsEqual|otSucceedsSlantEqual|otSucceedsTilde|otSuperset|otSupersetEqual|otTilde|otTildeEqual|otTildeFullEqual|otTildeTilde|otVerticalBar|u|ull|umberSign)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:O(?:Acute|DoubleAcute|DoubleDot|E|Grave|Hat|Slash|Tilde|mega|micron|penCurlyDoubleQuote|penCurlyQuote|ptionKey|r|verBrace|verBracket|verParenthesis))\\]",
+          "match": "\\\\\\[O(?:Acute|DoubleAcute|DoubleDot|E|Grave|Hat|Slash|Tilde|mega|micron|penCurlyDoubleQuote|penCurlyQuote|ptionKey|r|verBrace|verBracket|verParenthesis)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:P(?:aragraph|aragraphSeparator|artialD|ermutationProduct|erpendicular|hi|i|iecewise|iscesSign|laceholder|lusMinus|luto|recedes|recedesEqual|recedesSlantEqual|recedesTilde|rime|roduct|roportion|roportional|si))\\]",
+          "match": "\\\\\\[P(?:aragraph|aragraphSeparator|artialD|ermutationProduct|erpendicular|hi|i|iecewise|iscesSign|laceholder|lusMinus|luto|recedes|recedesEqual|recedesSlantEqual|recedesTilde|rime|roduct|roportion|roportional|si)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:Q(?:uarterNote))\\]",
+          "match": "\\\\\\[QuarterNote]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:R(?:Hacek|awAmpersand|awAt|awBackquote|awBackslash|awColon|awComma|awDash|awDollar|awDot|awDoubleQuote|awEqual|awEscape|awExclamation|awGreater|awLeftBrace|awLeftBracket|awLeftParenthesis|awLess|awNumberSign|awPercent|awPlus|awQuestion|awQuote|awReturn|awRightBrace|awRightBracket|awRightParenthesis|awSemicolon|awSlash|awSpace|awStar|awTab|awTilde|awUnderscore|awVerticalBar|awWedge|egisteredTrademark|eturnIndicator|eturnKey|everseDoublePrime|everseElement|everseEquilibrium|eversePrime|everseUpEquilibrium|ho|ightAngle|ightAngleBracket|ightArrow|ightArrowBar|ightArrowLeftArrow|ightAssociation|ightBracketingBar|ightCeiling|ightDoubleBracket|ightDoubleBracketingBar|ightDownTeeVector|ightDownVector|ightDownVectorBar|ightFloor|ightGuillemet|ightModified|ightPointer|ightSkeleton|ightTee|ightTeeArrow|ightTeeVector|ightTriangle|ightTriangleBar|ightTriangleEqual|ightUpDownVector|ightUpTeeVector|ightUpVector|ightUpVectorBar|ightVector|ightVectorBar|oundImplies|oundSpaceIndicator|ule|uleDelayed|upee))\\]",
+          "match": "\\\\\\[R(?:Hacek|awAmpersand|awAt|awBackquote|awBackslash|awColon|awComma|awDash|awDollar|awDot|awDoubleQuote|awEqual|awEscape|awExclamation|awGreater|awLeftBrace|awLeftBracket|awLeftParenthesis|awLess|awNumberSign|awPercent|awPlus|awQuestion|awQuote|awReturn|awRightBrace|awRightBracket|awRightParenthesis|awSemicolon|awSlash|awSpace|awStar|awTab|awTilde|awUnderscore|awVerticalBar|awWedge|egisteredTrademark|eturnIndicator|eturnKey|everseDoublePrime|everseElement|everseEquilibrium|eversePrime|everseUpEquilibrium|ho|ightAngle|ightAngleBracket|ightArrow|ightArrowBar|ightArrowLeftArrow|ightAssociation|ightBracketingBar|ightCeiling|ightDoubleBracket|ightDoubleBracketingBar|ightDownTeeVector|ightDownVector|ightDownVectorBar|ightFloor|ightGuillemet|ightModified|ightPointer|ightSkeleton|ightTee|ightTeeArrow|ightTeeVector|ightTriangle|ightTriangleBar|ightTriangleEqual|ightUpDownVector|ightUpTeeVector|ightUpVector|ightUpVectorBar|ightVector|ightVectorBar|oundImplies|oundSpaceIndicator|ule|uleDelayed|upee)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:S(?:Hacek|Z|adSmiley|agittariusSign|ampi|aturn|corpioSign|criptA|criptB|criptC|criptCapitalA|criptCapitalB|criptCapitalC|criptCapitalD|criptCapitalE|criptCapitalF|criptCapitalG|criptCapitalH|criptCapitalI|criptCapitalJ|criptCapitalK|criptCapitalL|criptCapitalM|criptCapitalN|criptCapitalO|criptCapitalP|criptCapitalQ|criptCapitalR|criptCapitalS|criptCapitalT|criptCapitalU|criptCapitalV|criptCapitalW|criptCapitalX|criptCapitalY|criptCapitalZ|criptD|criptDotlessI|criptDotlessJ|criptE|criptEight|criptF|criptFive|criptFour|criptG|criptH|criptI|criptJ|criptK|criptL|criptM|criptN|criptNine|criptO|criptOne|criptP|criptQ|criptR|criptS|criptSeven|criptSix|criptT|criptThree|criptTwo|criptU|criptV|criptW|criptX|criptY|criptZ|criptZero|ection|electionPlaceholder|hah|harp|hiftKey|hortDownArrow|hortLeftArrow|hortRightArrow|hortUpArrow|igma|ixPointedStar|keletonIndicator|mallCircle|paceIndicator|paceKey|padeSuit|panFromAbove|panFromBoth|panFromLeft|phericalAngle|qrt|quare|quareIntersection|quareSubset|quareSubsetEqual|quareSuperset|quareSupersetEqual|quareUnion|tar|terling|tigma|ubset|ubsetEqual|ucceeds|ucceedsEqual|ucceedsSlantEqual|ucceedsTilde|uchThat|um|uperset|upersetEqual|ystemEnterKey|ystemsModelDelay))\\]",
+          "match": "\\\\\\[S(?:Hacek|Z|adSmiley|agittariusSign|ampi|aturn|corpioSign|criptA|criptB|criptC|criptCapitalA|criptCapitalB|criptCapitalC|criptCapitalD|criptCapitalE|criptCapitalF|criptCapitalG|criptCapitalH|criptCapitalI|criptCapitalJ|criptCapitalK|criptCapitalL|criptCapitalM|criptCapitalN|criptCapitalO|criptCapitalP|criptCapitalQ|criptCapitalR|criptCapitalS|criptCapitalT|criptCapitalU|criptCapitalV|criptCapitalW|criptCapitalX|criptCapitalY|criptCapitalZ|criptD|criptDotlessI|criptDotlessJ|criptE|criptEight|criptF|criptFive|criptFour|criptG|criptH|criptI|criptJ|criptK|criptL|criptM|criptN|criptNine|criptO|criptOne|criptP|criptQ|criptR|criptS|criptSeven|criptSix|criptT|criptThree|criptTwo|criptU|criptV|criptW|criptX|criptY|criptZ|criptZero|ection|electionPlaceholder|hah|harp|hiftKey|hortDownArrow|hortLeftArrow|hortRightArrow|hortUpArrow|igma|ixPointedStar|keletonIndicator|mallCircle|paceIndicator|paceKey|padeSuit|panFromAbove|panFromBoth|panFromLeft|phericalAngle|qrt|quare|quareIntersection|quareSubset|quareSubsetEqual|quareSuperset|quareSupersetEqual|quareUnion|tar|terling|tigma|ubset|ubsetEqual|ucceeds|ucceedsEqual|ucceedsSlantEqual|ucceedsTilde|uchThat|um|uperset|upersetEqual|ystemEnterKey|ystemsModelDelay)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:T(?:Hacek|abKey|au|aurusSign|ensorProduct|ensorWedge|herefore|heta|hickSpace|hinSpace|horn|ilde|ildeEqual|ildeFullEqual|ildeTilde|imes|rademark|ranspose|ripleDot|woWayRule))\\]",
+          "match": "\\\\\\[T(?:Hacek|abKey|au|aurusSign|ensorProduct|ensorWedge|herefore|heta|hickSpace|hinSpace|horn|ilde|ildeEqual|ildeFullEqual|ildeTilde|imes|rademark|ranspose|ripleDot|woWayRule)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:U(?:Acute|DoubleAcute|DoubleDot|Grave|Hat|Ring|nderBrace|nderBracket|nderParenthesis|ndirectedEdge|nion|nionPlus|pArrow|pArrowBar|pArrowDownArrow|pDownArrow|pEquilibrium|pPointer|pTee|pTeeArrow|pperLeftArrow|pperRightArrow|psilon|ranus))\\]",
+          "match": "\\\\\\[U(?:Acute|DoubleAcute|DoubleDot|Grave|Hat|Ring|nderBrace|nderBracket|nderParenthesis|ndirectedEdge|nion|nionPlus|pArrow|pArrowBar|pArrowDownArrow|pDownArrow|pEquilibrium|pPointer|pTee|pTeeArrow|pperLeftArrow|pperRightArrow|psilon|ranus)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:V(?:ectorGreater|ectorGreaterEqual|ectorLess|ectorLessEqual|ee|enus|erticalBar|erticalEllipsis|erticalLine|erticalSeparator|erticalTilde|eryThinSpace|irgoSign))\\]",
+          "match": "\\\\\\[V(?:ectorGreater|ectorGreaterEqual|ectorLess|ectorLessEqual|ee|enus|erticalBar|erticalEllipsis|erticalLine|erticalSeparator|erticalTilde|eryThinSpace|irgoSign)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:W(?:arningSign|atchIcon|edge|eierstrassP|hiteBishop|hiteKing|hiteKnight|hitePawn|hiteQueen|hiteRook|olf|olframLanguageLogo|olframLanguageLogoCircle))\\]",
+          "match": "\\\\\\[W(?:arningSign|atchIcon|edge|eierstrassP|hiteBishop|hiteKing|hiteKnight|hitePawn|hiteQueen|hiteRook|olf|olframLanguageLogo|olframLanguageLogoCircle)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:X(?:i|nor|or))\\]",
+          "match": "\\\\\\[X(?:i|nor|or)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:Y(?:Acute|DoubleDot|en))\\]",
+          "match": "\\\\\\[Y(?:Acute|DoubleDot|en)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:Z(?:Hacek|eta))\\]",
+          "match": "\\\\\\[Z(?:Hacek|eta)]",
           "name": "donothighlight.constant.character.escape"
         },
         {
-          "match": "\\\\\\[(?:[$[:alpha:]][$[:alnum:]]*)?\\]?",
+          "match": "\\\\\\[(?:[$[:alpha:]][$[:alnum:]]*)?]?",
           "name": "invalid.illegal.BadLongName"
         },
         {
-          "match": "\\\\(?:[$[:alpha:]][$[:alnum:]]*)\\]",
+          "match": "\\\\[$[:alpha:]][$[:alnum:]]*]",
           "name": "invalid.illegal.BadLongName"
         },
         {
@@ -402,7 +402,7 @@
           "include": "#symbols"
         },
         {
-          "match": "(?:!|&|'|\\*|\\+|,|-|\\.|/|:|;|<|=|>|\\?|@|\\\\|\\^|\\||~)",
+          "match": "[!\\&'*+,\\-./:;<=>?@\\\\^|~]",
           "name": "invalid.illegal"
         }
       ]
@@ -422,19 +422,19 @@
           "name": "invalid.whitespace.Part.wolfram"
         },
         {
-          "match": "\\]\\s+\\]",
+          "match": "]\\s+]",
           "name": "invalid.whitespace.Part.wolfram"
         },
         {
-          "match": "\\]\\]",
+          "match": "]]",
           "name": "invalid.illegal.stray-parts-end.wolfram"
         },
         {
-          "match": "\\]",
+          "match": "]",
           "name": "invalid.illegal.stray-brackets-end.wolfram"
         },
         {
-          "match": "\\}",
+          "match": "}",
           "name": "invalid.illegal.stray-braces-end.wolfram"
         },
         {
@@ -507,43 +507,43 @@
     "numbers": {
       "patterns": [
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))\\*\\^",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)``",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``",
           "name": "invalid.illegal"
         },
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)\\*\\^",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)\\*\\^",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "2\\^\\^(?:(?:0|1)+(?:\\.(?!\\.)(?:0|1)*)?+|\\.(?!\\.)(?:0|1)+)",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -551,43 +551,43 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))\\*\\^",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)``",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``",
           "name": "invalid.illegal"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)\\*\\^",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)\\*\\^",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "8\\^\\^(?:(?:0|1|2|3|4|5|6|7)+(?:\\.(?!\\.)(?:0|1|2|3|4|5|6|7)*)?+|\\.(?!\\.)(?:0|1|2|3|4|5|6|7)+)",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -595,15 +595,15 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))\\*\\^",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -611,19 +611,19 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)\\*\\^",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -639,15 +639,15 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))\\*\\^",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)(?:``(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)))",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -655,19 +655,19 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)\\*\\^",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)(?:`(?:(?:-|\\+)?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+)",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)(?:\\*\\^(?:-|\\+)?+\\d+)",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -683,15 +683,15 @@
     "operators": {
       "patterns": [
         {
-          "match": "(?:\\^:=)",
+          "match": "\\^:=",
           "name": "keyword.operator.assignment.UpSetDelayed.wolfram"
         },
         {
-          "match": "(?:\\^:)",
+          "match": "\\^:",
           "name": "invalid.illegal"
         },
         {
-          "match": "(?:===)",
+          "match": "===",
           "name": "keyword.operator.SameQ.wolfram"
         },
         {
@@ -699,11 +699,11 @@
           "name": "keyword.operator.wolfram"
         },
         {
-          "match": "(?:\\|->)",
+          "match": "\\|->",
           "name": "keyword.operator.Function.wolfram"
         },
         {
-          "match": "(?://=)",
+          "match": "//=",
           "name": "keyword.operator.assignment.ApplyTo.wolfram"
         },
         {
@@ -715,63 +715,63 @@
           "name": "keyword.operator.logical.wolfram"
         },
         {
-          "match": "(?::=)",
+          "match": ":=",
           "name": "keyword.operator.assignment.SetDelayed.wolfram"
         },
         {
-          "match": "(?:\\^=)",
+          "match": "\\^=",
           "name": "keyword.operator.assignment.UpSet.wolfram"
         },
         {
-          "match": "(?:/=)",
+          "match": "/=",
           "name": "keyword.operator.assignment.DivideBy.wolfram"
         },
         {
-          "match": "(?:\\+=)",
+          "match": "\\+=",
           "name": "keyword.operator.assignment.AddTo.wolfram"
         },
         {
-          "match": "(?:=\\s+\\.(?![0-9]))",
+          "match": "=\\s+\\.(?![0-9])",
           "name": "invalid.whitespace.Unset.wolfram"
         },
         {
-          "match": "(?:=\\.(?![0-9]))",
+          "match": "=\\.(?![0-9])",
           "name": "keyword.operator.assignment.Unset.wolfram"
         },
         {
-          "match": "(?:\\*=)",
+          "match": "\\*=",
           "name": "keyword.operator.assignment.TimesBy.wolfram"
         },
         {
-          "match": "(?:-=)",
+          "match": "-=",
           "name": "keyword.operator.assignment.SubtractFrom.wolfram"
         },
         {
-          "match": "(?:/:)",
+          "match": "/:",
           "name": "keyword.operator.assignment.Tag.wolfram"
         },
         {
-          "match": "(?:;;)$",
+          "match": ";;$",
           "name": "invalid.endofline.Span.wolfram"
         },
         {
-          "match": "(?:;;)",
+          "match": ";;",
           "name": "keyword.operator.Span.wolfram"
         },
         {
-          "match": "(?:!=)",
+          "match": "!=",
           "name": "keyword.operator.Unequal.wolfram"
         },
         {
-          "match": "(?:==)",
+          "match": "==",
           "name": "keyword.operator.Equal.wolfram"
         },
         {
-          "match": "(?:!!)",
+          "match": "!!",
           "name": "keyword.operator.BangBang.wolfram"
         },
         {
-          "match": "(?:\\?\\?)",
+          "match": "\\?\\?",
           "name": "invalid.illegal.Information.wolfram"
         },
         {
@@ -779,51 +779,51 @@
           "name": "keyword.operator.wolfram"
         },
         {
-          "match": "(?:-|\\+|/|\\*)",
+          "match": "[-+/*]",
           "name": "keyword.operator.arithmetic.wolfram"
         },
         {
-          "match": "(?:=)",
+          "match": "=",
           "name": "keyword.operator.assignment.Set.wolfram"
         },
         {
-          "match": "(?:<)",
+          "match": "<",
           "name": "keyword.operator.Less.wolfram"
         },
         {
-          "match": "(?:\\|)",
+          "match": "\\|",
           "name": "keyword.operator.Alternatives.wolfram"
         },
         {
-          "match": "(?:!)",
+          "match": "!",
           "name": "keyword.operator.Bang.wolfram"
         },
         {
-          "match": "(?:;)",
+          "match": ";",
           "name": "keyword.operator.CompoundExpression.wolfram punctuation.terminator"
         },
         {
-          "match": "(?:,)",
+          "match": ",",
           "name": "keyword.operator.Comma.wolfram punctuation.separator"
         },
         {
-          "match": "^(?:\\?)",
+          "match": "^\\?",
           "name": "invalid.startofline.Information.wolfram"
         },
         {
-          "match": "(?:\\?)",
+          "match": "\\?",
           "name": "keyword.operator.PatternTest.wolfram"
         },
         {
-          "match": "(?:')",
+          "match": "'",
           "name": "keyword.operator.Derivative.wolfram"
         },
         {
-          "match": "(?:&)",
+          "match": "&",
           "name": "keyword.operator.Function.wolfram"
         },
         {
-          "match": "(?:>|\\^|\\.|:|@|~)",
+          "match": "[>^.:@~]",
           "name": "keyword.operator.wolfram"
         }
       ]
@@ -867,7 +867,7 @@
           "name": "punctuation.section.parts.begin.wolfram"
         }
       },
-      "end": "\\]\\]",
+      "end": "]]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.parts.end.wolfram"
@@ -932,7 +932,7 @@
               "name": "keyword.operator.assignment.wolfram"
             }
           },
-          "match": "^\\s*(Attributes|Format|Options)\\s*(\\[)(`?(?:(?:[$[:alpha:]][$[:alnum:]]*)`)*)((?:[$[:alpha:]][$[:alnum:]]*))(\\])\\s*(:=|=(?!!|=|\\.))"
+          "match": "^\\s*(Attributes|Format|Options)\\s*(\\[)(`?(?:[$[:alpha:]][$[:alnum:]]*`)*)([$[:alpha:]][$[:alnum:]]*)(])\\s*(:=|=(?![!=.]))"
         },
         {
           "captures": {
@@ -943,7 +943,7 @@
               "name": "meta.function.wolfram entity.name.function.wolfram"
             }
           },
-          "match": "^\\s*(`?(?:(?:[$[:alpha:]][$[:alnum:]]*)`)*)((?:[$[:alpha:]][$[:alnum:]]*))(?=\\s*(\\[(?>[^\\[\\]]+|\\g<-1>)*\\])\\s*(?:/;.*)?(?::=|=(?!!|=|\\.)))"
+          "match": "^\\s*(`?(?:[$[:alpha:]][$[:alnum:]]*`)*)([$[:alpha:]][$[:alnum:]]*)(?=\\s*(\\[(?>[^\\[\\]]+|\\g<3>)*])\\s*(?:/;.*)?(?::=|=(?![!=.])))"
         },
         {
           "captures": {
@@ -954,14 +954,14 @@
               "name": "meta.function.wolfram entity.name.constant.wolfram"
             }
           },
-          "match": "^\\s*(`?(?:(?:[$[:alpha:]][$[:alnum:]]*)`)*)((?:[$[:alpha:]][$[:alnum:]]*))(?=\\s*(?:/;.*)?(?::=|=(?!!|=|\\.)))"
+          "match": "^\\s*(`?(?:[$[:alpha:]][$[:alnum:]]*`)*)([$[:alpha:]][$[:alnum:]]*)(?=\\s*(?:/;.*)?(?::=|=(?![!=.])))"
         }
       ]
     },
     "slot": {
       "patterns": [
         {
-          "match": "#[[:alpha:]][[:alnum:]]*",
+          "match": "#\\p{alpha}\\p{alnum}*",
           "name": "keyword.other.Slot.wolfram"
         },
         {
@@ -977,7 +977,7 @@
     "string_escaped_characters": {
       "patterns": [
         {
-          "match": "\\\\[bfnrt\\\"\\\\<>]",
+          "match": "\\\\[bfnrt\"\\\\<>]",
           "name": "donothighlight.constant.character.escape"
         },
         {
@@ -1027,7 +1027,7 @@
               "name": "string.unquoted.wolfram"
             }
           },
-          "match": "(::)([[:alpha:]][[:alnum:]]*)"
+          "match": "(::)(\\p{alpha}\\p{alnum}*)"
         },
         {
           "match": "::",
@@ -1108,611 +1108,611 @@
     "symbols": {
       "patterns": [
         {
-          "match": "System`(?:A(?:ASTriangle|PIFunction|RCHProcess|RIMAProcess|RMAProcess|RProcess|SATriangle|belianGroup|bort|bortKernels|bortProtect|bs|bsArg|bsArgPlot|bsoluteCorrelation|bsoluteCorrelationFunction|bsoluteCurrentValue|bsoluteDashing|bsoluteFileName|bsoluteOptions|bsolutePointSize|bsoluteThickness|bsoluteTime|bsoluteTiming|ccountingForm|ccumulate|ccuracy|cousticAbsorbingValue|cousticImpedanceValue|cousticNormalVelocityValue|cousticPDEComponent|cousticPressureCondition|cousticRadiationValue|cousticSoundHardValue|cousticSoundSoftCondition|ctionMenu|ctivate|cyclicGraphQ|ddSides|ddTo|ddUsers|djacencyGraph|djacencyList|djacencyMatrix|djacentMeshCells|djugate|djustTimeSeriesForecast|djustmentBox|dministrativeDivisionData|ffineHalfSpace|ffineSpace|ffineStateSpaceModel|ffineTransform|irPressureData|irSoundAttenuation|irTemperatureData|ircraftData|irportData|iryAi|iryAiPrime|iryAiZero|iryBi|iryBiPrime|iryBiZero|lgebraicIntegerQ|lgebraicNumber|lgebraicNumberDenominator|lgebraicNumberNorm|lgebraicNumberPolynomial|lgebraicNumberTrace|lgebraicUnitQ|llTrue|lphaChannel|lphabet|lphabeticOrder|lphabeticSort|lternatingFactorial|lternatingGroup|lternatives|mbientLight|mbiguityList|natomyData|natomyPlot3D|natomyStyling|nd|ndersonDarlingTest|ngerJ|ngleBracket|nglePath|nglePath3D|ngleVector|ngularGauge|nimate|nimator|nnotate|nnotation|nnotationDelete|nnotationKeys|nnotationValue|nnuity|nnuityDue|nnulus|nomalyDetection|nomalyDetectorFunction|ntihermitian|ntihermitianMatrixQ|ntisymmetric|ntisymmetricMatrixQ|ntonyms|nyOrder|nySubset|nyTrue|part|partSquareFree|ppellF1|ppend|ppendTo|pply|pplySides|pplyTo|rcCos|rcCosh|rcCot|rcCoth|rcCsc|rcCsch|rcCurvature|rcLength|rcSec|rcSech|rcSin|rcSinDistribution|rcSinh|rcTan|rcTanh|rea|rg|rgMax|rgMin|rgumentsOptions|rithmeticGeometricMean|rray|rrayComponents|rrayDepth|rrayFilter|rrayFlatten|rrayMesh|rrayPad|rrayPlot|rrayPlot3D|rrayQ|rrayResample|rrayReshape|rrayRules|rrays|rrow|rrowheads|ssert|ssociateTo|ssociation|ssociationMap|ssociationQ|ssociationThread|ssuming|symptotic|symptoticDSolveValue|symptoticEqual|symptoticEquivalent|symptoticExpectation|symptoticGreater|symptoticGreaterEqual|symptoticIntegrate|symptoticLess|symptoticLessEqual|symptoticOutputTracker|symptoticProbability|symptoticProduct|symptoticRSolveValue|symptoticSolve|symptoticSum|tomQ|ttributes|udio|udioAmplify|udioBlockMap|udioCapture|udioChannelCombine|udioChannelMix|udioChannelSeparate|udioChannels|udioData|udioDelay|udioDelete|udioDistance|udioFade|udioFrequencyShift|udioGenerator|udioInsert|udioIntervals|udioJoin|udioLength|udioLocalMeasurements|udioLoudness|udioMeasurements|udioNormalize|udioOverlay|udioPad|udioPan|udioPartition|udioPitchShift|udioPlot|udioQ|udioReplace|udioResample|udioReverb|udioReverse|udioSampleRate|udioSpectralMap|udioSpectralTransformation|udioSplit|udioTimeStretch|udioTrim|udioType|ugmentedPolyhedron|ugmentedSymmetricPolynomial|uthenticationDialog|utoRefreshed|utoSubmitting|utocorrelationTest))(?![`$[:alnum:]])",
+          "match": "System`A(?:ASTriangle|PIFunction|RCHProcess|RIMAProcess|RMAProcess|RProcess|SATriangle|belianGroup|bort|bortKernels|bortProtect|bs|bsArg|bsArgPlot|bsoluteCorrelation|bsoluteCorrelationFunction|bsoluteCurrentValue|bsoluteDashing|bsoluteFileName|bsoluteOptions|bsolutePointSize|bsoluteThickness|bsoluteTime|bsoluteTiming|ccountingForm|ccumulate|ccuracy|cousticAbsorbingValue|cousticImpedanceValue|cousticNormalVelocityValue|cousticPDEComponent|cousticPressureCondition|cousticRadiationValue|cousticSoundHardValue|cousticSoundSoftCondition|ctionMenu|ctivate|cyclicGraphQ|ddSides|ddTo|ddUsers|djacencyGraph|djacencyList|djacencyMatrix|djacentMeshCells|djugate|djustTimeSeriesForecast|djustmentBox|dministrativeDivisionData|ffineHalfSpace|ffineSpace|ffineStateSpaceModel|ffineTransform|irPressureData|irSoundAttenuation|irTemperatureData|ircraftData|irportData|iryAi|iryAiPrime|iryAiZero|iryBi|iryBiPrime|iryBiZero|lgebraicIntegerQ|lgebraicNumber|lgebraicNumberDenominator|lgebraicNumberNorm|lgebraicNumberPolynomial|lgebraicNumberTrace|lgebraicUnitQ|llTrue|lphaChannel|lphabet|lphabeticOrder|lphabeticSort|lternatingFactorial|lternatingGroup|lternatives|mbientLight|mbiguityList|natomyData|natomyPlot3D|natomyStyling|nd|ndersonDarlingTest|ngerJ|ngleBracket|nglePath|nglePath3D|ngleVector|ngularGauge|nimate|nimator|nnotate|nnotation|nnotationDelete|nnotationKeys|nnotationValue|nnuity|nnuityDue|nnulus|nomalyDetection|nomalyDetectorFunction|ntihermitian|ntihermitianMatrixQ|ntisymmetric|ntisymmetricMatrixQ|ntonyms|nyOrder|nySubset|nyTrue|part|partSquareFree|ppellF1|ppend|ppendTo|pply|pplySides|pplyTo|rcCos|rcCosh|rcCot|rcCoth|rcCsc|rcCsch|rcCurvature|rcLength|rcSec|rcSech|rcSin|rcSinDistribution|rcSinh|rcTan|rcTanh|rea|rg|rgMax|rgMin|rgumentsOptions|rithmeticGeometricMean|rray|rrayComponents|rrayDepth|rrayFilter|rrayFlatten|rrayMesh|rrayPad|rrayPlot|rrayPlot3D|rrayQ|rrayResample|rrayReshape|rrayRules|rrays|rrow|rrowheads|ssert|ssociateTo|ssociation|ssociationMap|ssociationQ|ssociationThread|ssuming|symptotic|symptoticDSolveValue|symptoticEqual|symptoticEquivalent|symptoticExpectation|symptoticGreater|symptoticGreaterEqual|symptoticIntegrate|symptoticLess|symptoticLessEqual|symptoticOutputTracker|symptoticProbability|symptoticProduct|symptoticRSolveValue|symptoticSolve|symptoticSum|tomQ|ttributes|udio|udioAmplify|udioBlockMap|udioCapture|udioChannelCombine|udioChannelMix|udioChannelSeparate|udioChannels|udioData|udioDelay|udioDelete|udioDistance|udioFade|udioFrequencyShift|udioGenerator|udioInsert|udioIntervals|udioJoin|udioLength|udioLocalMeasurements|udioLoudness|udioMeasurements|udioNormalize|udioOverlay|udioPad|udioPan|udioPartition|udioPitchShift|udioPlot|udioQ|udioReplace|udioResample|udioReverb|udioReverse|udioSampleRate|udioSpectralMap|udioSpectralTransformation|udioSplit|udioTimeStretch|udioTrim|udioType|ugmentedPolyhedron|ugmentedSymmetricPolynomial|uthenticationDialog|utoRefreshed|utoSubmitting|utocorrelationTest)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:B(?:SplineBasis|SplineCurve|SplineFunction|SplineSurface|abyMonsterGroupB|ackslash|all|and|andpassFilter|andstopFilter|arChart|arChart3D|arLegend|arabasiAlbertGraphDistribution|arcodeImage|arcodeRecognize|aringhausHenzeTest|arlowProschanImportance|arnesG|artlettHannWindow|artlettWindow|aseDecode|aseEncode|aseForm|atesDistribution|attleLemarieWavelet|ecause|eckmannDistribution|eep|egin|eginDialogPacket|eginPackage|ellB|ellY|enfordDistribution|eniniDistribution|enktanderGibratDistribution|enktanderWeibullDistribution|ernoulliB|ernoulliDistribution|ernoulliGraphDistribution|ernoulliProcess|ernsteinBasis|esselFilterModel|esselI|esselJ|esselJZero|esselK|esselY|esselYZero|eta|etaBinomialDistribution|etaDistribution|etaNegativeBinomialDistribution|etaPrimeDistribution|etaRegularized|etween|etweennessCentrality|eveledPolyhedron|ezierCurve|ezierFunction|ilateralFilter|ilateralLaplaceTransform|ilateralZTransform|inCounts|inLists|inarize|inaryDeserialize|inaryDistance|inaryImageQ|inaryRead|inaryReadList|inarySerialize|inaryWrite|inomial|inomialDistribution|inomialProcess|inormalDistribution|iorthogonalSplineWavelet|ipartiteGraphQ|iquadraticFilterModel|irnbaumImportance|irnbaumSaundersDistribution|itAnd|itClear|itGet|itLength|itNot|itOr|itSet|itShiftLeft|itShiftRight|itXor|iweightLocation|iweightMidvariance|lackmanHarrisWindow|lackmanNuttallWindow|lackmanWindow|lank|lankNullSequence|lankSequence|lend|lock|lockMap|lockRandom|lomqvistBeta|lomqvistBetaTest|lur|lurring|odePlot|ohmanWindow|oole|ooleanConsecutiveFunction|ooleanConvert|ooleanCountingFunction|ooleanFunction|ooleanGraph|ooleanMaxterms|ooleanMinimize|ooleanMinterms|ooleanQ|ooleanRegion|ooleanTable|ooleanVariables|orderDimensions|orelTannerDistribution|ottomHatTransform|oundaryDiscretizeGraphics|oundaryDiscretizeRegion|oundaryMesh|oundaryMeshRegion|oundaryMeshRegionQ|oundedRegionQ|oundingRegion|oxData|oxMatrix|oxObject|oxWhiskerChart|racketingBar|rayCurtisDistance|readthFirstScan|reak|ridgeData|rightnessEqualize|roadcastStationData|rownForsytheTest|rownianBridgeProcess|ubbleChart|ubbleChart3D|uckyballGraph|uildingData|ulletGauge|usinessDayQ|utterflyGraph|utterworthFilterModel|utton|uttonBar|uttonBox|uttonNotebook|yteArray|yteArrayFormat|yteArrayFormatQ|yteArrayQ|yteArrayToString|yteCount))(?![`$[:alnum:]])",
+          "match": "System`B(?:SplineBasis|SplineCurve|SplineFunction|SplineSurface|abyMonsterGroupB|ackslash|all|and|andpassFilter|andstopFilter|arChart|arChart3D|arLegend|arabasiAlbertGraphDistribution|arcodeImage|arcodeRecognize|aringhausHenzeTest|arlowProschanImportance|arnesG|artlettHannWindow|artlettWindow|aseDecode|aseEncode|aseForm|atesDistribution|attleLemarieWavelet|ecause|eckmannDistribution|eep|egin|eginDialogPacket|eginPackage|ellB|ellY|enfordDistribution|eniniDistribution|enktanderGibratDistribution|enktanderWeibullDistribution|ernoulliB|ernoulliDistribution|ernoulliGraphDistribution|ernoulliProcess|ernsteinBasis|esselFilterModel|esselI|esselJ|esselJZero|esselK|esselY|esselYZero|eta|etaBinomialDistribution|etaDistribution|etaNegativeBinomialDistribution|etaPrimeDistribution|etaRegularized|etween|etweennessCentrality|eveledPolyhedron|ezierCurve|ezierFunction|ilateralFilter|ilateralLaplaceTransform|ilateralZTransform|inCounts|inLists|inarize|inaryDeserialize|inaryDistance|inaryImageQ|inaryRead|inaryReadList|inarySerialize|inaryWrite|inomial|inomialDistribution|inomialProcess|inormalDistribution|iorthogonalSplineWavelet|ipartiteGraphQ|iquadraticFilterModel|irnbaumImportance|irnbaumSaundersDistribution|itAnd|itClear|itGet|itLength|itNot|itOr|itSet|itShiftLeft|itShiftRight|itXor|iweightLocation|iweightMidvariance|lackmanHarrisWindow|lackmanNuttallWindow|lackmanWindow|lank|lankNullSequence|lankSequence|lend|lock|lockMap|lockRandom|lomqvistBeta|lomqvistBetaTest|lur|lurring|odePlot|ohmanWindow|oole|ooleanConsecutiveFunction|ooleanConvert|ooleanCountingFunction|ooleanFunction|ooleanGraph|ooleanMaxterms|ooleanMinimize|ooleanMinterms|ooleanQ|ooleanRegion|ooleanTable|ooleanVariables|orderDimensions|orelTannerDistribution|ottomHatTransform|oundaryDiscretizeGraphics|oundaryDiscretizeRegion|oundaryMesh|oundaryMeshRegion|oundaryMeshRegionQ|oundedRegionQ|oundingRegion|oxData|oxMatrix|oxObject|oxWhiskerChart|racketingBar|rayCurtisDistance|readthFirstScan|reak|ridgeData|rightnessEqualize|roadcastStationData|rownForsytheTest|rownianBridgeProcess|ubbleChart|ubbleChart3D|uckyballGraph|uildingData|ulletGauge|usinessDayQ|utterflyGraph|utterworthFilterModel|utton|uttonBar|uttonBox|uttonNotebook|yteArray|yteArrayFormat|yteArrayFormatQ|yteArrayQ|yteArrayToString|yteCount)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:C(?:|DF|DFDeploy|DFWavelet|Form|MYKColor|SGRegion|SGRegionQ|SGRegionTree|alendarConvert|alendarData|allPacket|allout|anberraDistance|ancel|ancelButton|andlestickChart|anonicalGraph|anonicalName|anonicalWarpingCorrespondence|anonicalWarpingDistance|anonicalizePolygon|anonicalizePolyhedron|anonicalizeRegion|antorMesh|antorStaircase|ap|apForm|apitalDifferentialD|apitalize|apsuleShape|aputoD|arlemanLinearize|arlsonRC|arlsonRD|arlsonRE|arlsonRF|arlsonRG|arlsonRJ|arlsonRK|arlsonRM|armichaelLambda|aseSensitive|ases|ashflow|asoratian|atalanNumber|atch|atenate|auchyDistribution|auchyMatrix|auchyWindow|ayleyGraph|eiling|ell|ellGroup|ellGroupData|ellObject|ellPrint|ells|ellularAutomaton|ensoredDistribution|ensoring|enterArray|enterDot|enteredInterval|entralFeature|entralMoment|entralMomentGeneratingFunction|epstrogram|epstrogramArray|epstrumArray|hampernowneNumber|hanVeseBinarize|haracterCounts|haracterName|haracterRange|haracteristicFunction|haracteristicPolynomial|haracters|hebyshev1FilterModel|hebyshev2FilterModel|hebyshevT|hebyshevU|heck|heckAbort|heckArguments|heckbox|heckboxBar|hemicalData|hessboardDistance|hiDistribution|hiSquareDistribution|hineseRemainder|hoiceButtons|hoiceDialog|holeskyDecomposition|hop|hromaticPolynomial|hromaticityPlot|hromaticityPlot3D|ircle|ircleDot|ircleMinus|irclePlus|irclePoints|ircleThrough|ircleTimes|irculantGraph|ircularArcThrough|ircularOrthogonalMatrixDistribution|ircularQuaternionMatrixDistribution|ircularRealMatrixDistribution|ircularSymplecticMatrixDistribution|ircularUnitaryMatrixDistribution|ircumsphere|ityData|lassifierFunction|lassifierMeasurements|lassifierMeasurementsObject|lassify|lear|learAll|learAttributes|learCookies|learPermissions|learSystemCache|lebschGordan|lickPane|lickToCopy|lip|lock|lockGauge|lose|loseKernels|losenessCentrality|losing|loudAccountData|loudConnect|loudDeploy|loudDirectory|loudDisconnect|loudEvaluate|loudExport|loudFunction|loudGet|loudImport|loudLoggingData|loudObject|loudObjects|loudPublish|loudPut|loudSave|loudShare|loudSubmit|loudSymbol|loudUnshare|lusterClassify|lusteringComponents|lusteringMeasurements|lusteringTree|oefficient|oefficientArrays|oefficientList|oefficientRules|oifletWavelet|ollect|ollinearPoints|olon|olorBalance|olorCombine|olorConvert|olorData|olorDataFunction|olorDetect|olorDistance|olorNegate|olorProfileData|olorQ|olorQuantize|olorReplace|olorSeparate|olorSetter|olorSlider|olorToneMapping|olorize|olorsNear|olumn|ometData|ommonName|ommonUnits|ommonest|ommonestFilter|ommunityGraphPlot|ompanyData|ompatibleUnitQ|ompile|ompiledFunction|omplement|ompleteGraph|ompleteGraphQ|ompleteIntegral|ompleteKaryTree|omplex|omplexArrayPlot|omplexContourPlot|omplexExpand|omplexListPlot|omplexPlot|omplexPlot3D|omplexRegionPlot|omplexStreamPlot|omplexVectorPlot|omponentMeasurements|omposeList|omposeSeries|ompositeQ|omposition|ompoundElement|ompoundExpression|ompoundPoissonDistribution|ompoundPoissonProcess|ompoundRenewalProcess|ompress|oncaveHullMesh|ondition|onditionalExpression|onditioned|one|onfirm|onfirmAssert|onfirmBy|onfirmMatch|onformAudio|onformImages|ongruent|onicGradientFilling|onicHullRegion|onicOptimization|onjugate|onjugateTranspose|onjunction|onnectLibraryCallbackFunction|onnectedComponents|onnectedGraphComponents|onnectedGraphQ|onnectedMeshComponents|onnesWindow|onoverTest|onservativeConvectionPDETerm|onstantArray|onstantImage|onstantRegionQ|onstellationData|onstruct|ontainsAll|ontainsAny|ontainsExactly|ontainsNone|ontainsOnly|ontext|ontextToFileName|ontexts|ontinue|ontinuedFraction|ontinuedFractionK|ontinuousMarkovProcess|ontinuousTask|ontinuousTimeModelQ|ontinuousWaveletData|ontinuousWaveletTransform|ontourDetect|ontourPlot|ontourPlot3D|ontraharmonicMean|ontrol|ontrolActive|ontrollabilityGramian|ontrollabilityMatrix|ontrollableDecomposition|ontrollableModelQ|ontrollerInformation|ontrollerManipulate|ontrollerState|onvectionPDETerm|onvergents|onvexHullMesh|onvexHullRegion|onvexOptimization|onvexPolygonQ|onvexPolyhedronQ|onvexRegionQ|onvolve|onwayGroupCo1|onwayGroupCo2|onwayGroupCo3|oordinateBoundingBox|oordinateBoundingBoxArray|oordinateBounds|oordinateBoundsArray|oordinateChartData|oordinateTransform|oordinateTransformData|oplanarPoints|oprimeQ|oproduct|opulaDistribution|opyDatabin|opyDirectory|opyFile|opyToClipboard|oreNilpotentDecomposition|ornerFilter|orrelation|orrelationDistance|orrelationFunction|orrelationTest|os|osIntegral|osh|oshIntegral|osineDistance|osineWindow|ot|oth|oulombF|oulombG|oulombH1|oulombH2|ount|ountDistinct|ountDistinctBy|ountRoots|ountryData|ounts|ountsBy|ovariance|ovarianceFunction|oxIngersollRossProcess|oxModel|oxModelFit|oxianDistribution|ramerVonMisesTest|reateArchive|reateDatabin|reateDialog|reateDirectory|reateDocument|reateFile|reateManagedLibraryExpression|reateNotebook|reatePacletArchive|reatePalette|reatePermissionsGroup|reateUUID|reateWindow|riticalSection|riticalityFailureImportance|riticalitySuccessImportance|ross|rossMatrix|rossingCount|rossingDetect|rossingPolygon|sc|sch|ube|ubeRoot|uboid|umulant|umulantGeneratingFunction|umulativeFeatureImpactPlot|up|upCap|url|urrencyConvert|urrentDate|urrentImage|urrentValue|urvatureFlowFilter|ycleGraph|ycleIndexPolynomial|ycles|yclicGroup|yclotomic|ylinder|ylindricalDecomposition|ylindricalDecompositionFunction))(?![`$[:alnum:]])",
+          "match": "System`C(?:|DF|DFDeploy|DFWavelet|Form|MYKColor|SGRegion|SGRegionQ|SGRegionTree|alendarConvert|alendarData|allPacket|allout|anberraDistance|ancel|ancelButton|andlestickChart|anonicalGraph|anonicalName|anonicalWarpingCorrespondence|anonicalWarpingDistance|anonicalizePolygon|anonicalizePolyhedron|anonicalizeRegion|antorMesh|antorStaircase|ap|apForm|apitalDifferentialD|apitalize|apsuleShape|aputoD|arlemanLinearize|arlsonRC|arlsonRD|arlsonRE|arlsonRF|arlsonRG|arlsonRJ|arlsonRK|arlsonRM|armichaelLambda|aseSensitive|ases|ashflow|asoratian|atalanNumber|atch|atenate|auchyDistribution|auchyMatrix|auchyWindow|ayleyGraph|eiling|ell|ellGroup|ellGroupData|ellObject|ellPrint|ells|ellularAutomaton|ensoredDistribution|ensoring|enterArray|enterDot|enteredInterval|entralFeature|entralMoment|entralMomentGeneratingFunction|epstrogram|epstrogramArray|epstrumArray|hampernowneNumber|hanVeseBinarize|haracterCounts|haracterName|haracterRange|haracteristicFunction|haracteristicPolynomial|haracters|hebyshev1FilterModel|hebyshev2FilterModel|hebyshevT|hebyshevU|heck|heckAbort|heckArguments|heckbox|heckboxBar|hemicalData|hessboardDistance|hiDistribution|hiSquareDistribution|hineseRemainder|hoiceButtons|hoiceDialog|holeskyDecomposition|hop|hromaticPolynomial|hromaticityPlot|hromaticityPlot3D|ircle|ircleDot|ircleMinus|irclePlus|irclePoints|ircleThrough|ircleTimes|irculantGraph|ircularArcThrough|ircularOrthogonalMatrixDistribution|ircularQuaternionMatrixDistribution|ircularRealMatrixDistribution|ircularSymplecticMatrixDistribution|ircularUnitaryMatrixDistribution|ircumsphere|ityData|lassifierFunction|lassifierMeasurements|lassifierMeasurementsObject|lassify|lear|learAll|learAttributes|learCookies|learPermissions|learSystemCache|lebschGordan|lickPane|lickToCopy|lip|lock|lockGauge|lose|loseKernels|losenessCentrality|losing|loudAccountData|loudConnect|loudDeploy|loudDirectory|loudDisconnect|loudEvaluate|loudExport|loudFunction|loudGet|loudImport|loudLoggingData|loudObject|loudObjects|loudPublish|loudPut|loudSave|loudShare|loudSubmit|loudSymbol|loudUnshare|lusterClassify|lusteringComponents|lusteringMeasurements|lusteringTree|oefficient|oefficientArrays|oefficientList|oefficientRules|oifletWavelet|ollect|ollinearPoints|olon|olorBalance|olorCombine|olorConvert|olorData|olorDataFunction|olorDetect|olorDistance|olorNegate|olorProfileData|olorQ|olorQuantize|olorReplace|olorSeparate|olorSetter|olorSlider|olorToneMapping|olorize|olorsNear|olumn|ometData|ommonName|ommonUnits|ommonest|ommonestFilter|ommunityGraphPlot|ompanyData|ompatibleUnitQ|ompile|ompiledFunction|omplement|ompleteGraph|ompleteGraphQ|ompleteIntegral|ompleteKaryTree|omplex|omplexArrayPlot|omplexContourPlot|omplexExpand|omplexListPlot|omplexPlot|omplexPlot3D|omplexRegionPlot|omplexStreamPlot|omplexVectorPlot|omponentMeasurements|omposeList|omposeSeries|ompositeQ|omposition|ompoundElement|ompoundExpression|ompoundPoissonDistribution|ompoundPoissonProcess|ompoundRenewalProcess|ompress|oncaveHullMesh|ondition|onditionalExpression|onditioned|one|onfirm|onfirmAssert|onfirmBy|onfirmMatch|onformAudio|onformImages|ongruent|onicGradientFilling|onicHullRegion|onicOptimization|onjugate|onjugateTranspose|onjunction|onnectLibraryCallbackFunction|onnectedComponents|onnectedGraphComponents|onnectedGraphQ|onnectedMeshComponents|onnesWindow|onoverTest|onservativeConvectionPDETerm|onstantArray|onstantImage|onstantRegionQ|onstellationData|onstruct|ontainsAll|ontainsAny|ontainsExactly|ontainsNone|ontainsOnly|ontext|ontextToFileName|ontexts|ontinue|ontinuedFraction|ontinuedFractionK|ontinuousMarkovProcess|ontinuousTask|ontinuousTimeModelQ|ontinuousWaveletData|ontinuousWaveletTransform|ontourDetect|ontourPlot|ontourPlot3D|ontraharmonicMean|ontrol|ontrolActive|ontrollabilityGramian|ontrollabilityMatrix|ontrollableDecomposition|ontrollableModelQ|ontrollerInformation|ontrollerManipulate|ontrollerState|onvectionPDETerm|onvergents|onvexHullMesh|onvexHullRegion|onvexOptimization|onvexPolygonQ|onvexPolyhedronQ|onvexRegionQ|onvolve|onwayGroupCo1|onwayGroupCo2|onwayGroupCo3|oordinateBoundingBox|oordinateBoundingBoxArray|oordinateBounds|oordinateBoundsArray|oordinateChartData|oordinateTransform|oordinateTransformData|oplanarPoints|oprimeQ|oproduct|opulaDistribution|opyDatabin|opyDirectory|opyFile|opyToClipboard|oreNilpotentDecomposition|ornerFilter|orrelation|orrelationDistance|orrelationFunction|orrelationTest|os|osIntegral|osh|oshIntegral|osineDistance|osineWindow|ot|oth|oulombF|oulombG|oulombH1|oulombH2|ount|ountDistinct|ountDistinctBy|ountRoots|ountryData|ounts|ountsBy|ovariance|ovarianceFunction|oxIngersollRossProcess|oxModel|oxModelFit|oxianDistribution|ramerVonMisesTest|reateArchive|reateDatabin|reateDialog|reateDirectory|reateDocument|reateFile|reateManagedLibraryExpression|reateNotebook|reatePacletArchive|reatePalette|reatePermissionsGroup|reateUUID|reateWindow|riticalSection|riticalityFailureImportance|riticalitySuccessImportance|ross|rossMatrix|rossingCount|rossingDetect|rossingPolygon|sc|sch|ube|ubeRoot|uboid|umulant|umulantGeneratingFunction|umulativeFeatureImpactPlot|up|upCap|url|urrencyConvert|urrentDate|urrentImage|urrentValue|urvatureFlowFilter|ycleGraph|ycleIndexPolynomial|ycles|yclicGroup|yclotomic|ylinder|ylindricalDecomposition|ylindricalDecompositionFunction)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:D(?:|Eigensystem|Eigenvalues|GaussianWavelet|MSList|MSString|Solve|SolveValue|agumDistribution|amData|amerauLevenshteinDistance|arker|ashing|ataDistribution|atabin|atabinAdd|atabinUpload|atabins|ataset|ateBounds|ateDifference|ateHistogram|ateList|ateListLogPlot|ateListPlot|ateListStepPlot|ateObject|ateObjectQ|ateOverlapsQ|atePattern|atePlus|ateRange|ateScale|ateSelect|ateString|ateValue|ateWithinQ|ated|atedUnit|aubechiesWavelet|avisDistribution|awsonF|ayCount|ayHemisphere|ayMatchQ|ayName|ayNightTerminator|ayPlus|ayRange|ayRound|aylightQ|eBruijnGraph|eBruijnSequence|ecapitalize|ecimalForm|eclarePackage|ecompose|ecrement|ecrypt|edekindEta|eepSpaceProbeData|efault|efaultButton|efaultValues|efer|efineInputStreamMethod|efineOutputStreamMethod|efineResourceFunction|efinition|egreeCentrality|egreeGraphDistribution|el|elaunayMesh|elayed|elete|eleteAdjacentDuplicates|eleteAnomalies|eleteBorderComponents|eleteCases|eleteDirectory|eleteDuplicates|eleteDuplicatesBy|eleteFile|eleteMissing|eleteObject|eletePermissionsKey|eleteSmallComponents|eleteStopwords|elimitedSequence|endrogram|enominator|ensityHistogram|ensityPlot|ensityPlot3D|eploy|epth|epthFirstScan|erivative|erivativeFilter|erivativePDETerm|esignMatrix|et|eviceClose|eviceConfigure|eviceExecute|eviceExecuteAsynchronous|eviceObject|eviceOpen|eviceRead|eviceReadBuffer|eviceReadLatest|eviceReadList|eviceReadTimeSeries|eviceStreams|eviceWrite|eviceWriteBuffer|evices|iagonal|iagonalMatrix|iagonalMatrixQ|iagonalizableMatrixQ|ialog|ialogInput|ialogNotebook|ialogReturn|iamond|iamondMatrix|iceDissimilarity|ictionaryLookup|ictionaryWordQ|ifferenceDelta|ifferenceQuotient|ifferenceRoot|ifferenceRootReduce|ifferences|ifferentialD|ifferentialRoot|ifferentialRootReduce|ifferentiatorFilter|iffusionPDETerm|igitCount|igitQ|ihedralAngle|ihedralGroup|ilation|imensionReduce|imensionReducerFunction|imensionReduction|imensionalCombinations|imensionalMeshComponents|imensions|iracComb|iracDelta|irectedEdge|irectedGraph|irectedGraphQ|irectedInfinity|irectionalLight|irective|irectory|irectoryName|irectoryQ|irectoryStack|irichletBeta|irichletCharacter|irichletCondition|irichletConvolve|irichletDistribution|irichletEta|irichletL|irichletLambda|irichletTransform|irichletWindow|iscreteAsymptotic|iscreteChirpZTransform|iscreteConvolve|iscreteDelta|iscreteHadamardTransform|iscreteIndicator|iscreteInputOutputModel|iscreteLQEstimatorGains|iscreteLQRegulatorGains|iscreteLimit|iscreteLyapunovSolve|iscreteMarkovProcess|iscreteMaxLimit|iscreteMinLimit|iscretePlot|iscretePlot3D|iscreteRatio|iscreteRiccatiSolve|iscreteShift|iscreteTimeModelQ|iscreteUniformDistribution|iscreteWaveletData|iscreteWaveletPacketTransform|iscreteWaveletTransform|iscretizeGraphics|iscretizeRegion|iscriminant|isjointQ|isjunction|isk|iskMatrix|iskSegment|ispatch|isplayEndPacket|isplayForm|isplayPacket|istanceMatrix|istanceTransform|istribute|istributeDefinitions|istributed|istributionChart|istributionFitTest|istributionParameterAssumptions|istributionParameterQ|iv|ivide|ivideBy|ivideSides|ivisible|ivisorSigma|ivisorSum|ivisors|o|ocumentGenerator|ocumentGeneratorInformation|ocumentGenerators|ocumentNotebook|odecahedron|ominantColors|ominatorTreeGraph|ominatorVertexList|ot|otEqual|oubleBracketingBar|oubleDownArrow|oubleLeftArrow|oubleLeftRightArrow|oubleLeftTee|oubleLongLeftArrow|oubleLongLeftRightArrow|oubleLongRightArrow|oubleRightArrow|oubleRightTee|oubleUpArrow|oubleUpDownArrow|oubleVerticalBar|ownArrow|ownArrowBar|ownArrowUpArrow|ownLeftRightVector|ownLeftTeeVector|ownLeftVector|ownLeftVectorBar|ownRightTeeVector|ownRightVector|ownRightVectorBar|ownTee|ownTeeArrow|ownValues|ownsample|razinInverse|rop|ropShadowing|t|ualPlanarGraph|ualPolyhedron|ualSystemsModel|umpSave|uplicateFreeQ|uration|ynamic|ynamicGeoGraphics|ynamicModule|ynamicSetting|ynamicWrapper))(?![`$[:alnum:]])",
+          "match": "System`D(?:|Eigensystem|Eigenvalues|GaussianWavelet|MSList|MSString|Solve|SolveValue|agumDistribution|amData|amerauLevenshteinDistance|arker|ashing|ataDistribution|atabin|atabinAdd|atabinUpload|atabins|ataset|ateBounds|ateDifference|ateHistogram|ateList|ateListLogPlot|ateListPlot|ateListStepPlot|ateObject|ateObjectQ|ateOverlapsQ|atePattern|atePlus|ateRange|ateScale|ateSelect|ateString|ateValue|ateWithinQ|ated|atedUnit|aubechiesWavelet|avisDistribution|awsonF|ayCount|ayHemisphere|ayMatchQ|ayName|ayNightTerminator|ayPlus|ayRange|ayRound|aylightQ|eBruijnGraph|eBruijnSequence|ecapitalize|ecimalForm|eclarePackage|ecompose|ecrement|ecrypt|edekindEta|eepSpaceProbeData|efault|efaultButton|efaultValues|efer|efineInputStreamMethod|efineOutputStreamMethod|efineResourceFunction|efinition|egreeCentrality|egreeGraphDistribution|el|elaunayMesh|elayed|elete|eleteAdjacentDuplicates|eleteAnomalies|eleteBorderComponents|eleteCases|eleteDirectory|eleteDuplicates|eleteDuplicatesBy|eleteFile|eleteMissing|eleteObject|eletePermissionsKey|eleteSmallComponents|eleteStopwords|elimitedSequence|endrogram|enominator|ensityHistogram|ensityPlot|ensityPlot3D|eploy|epth|epthFirstScan|erivative|erivativeFilter|erivativePDETerm|esignMatrix|et|eviceClose|eviceConfigure|eviceExecute|eviceExecuteAsynchronous|eviceObject|eviceOpen|eviceRead|eviceReadBuffer|eviceReadLatest|eviceReadList|eviceReadTimeSeries|eviceStreams|eviceWrite|eviceWriteBuffer|evices|iagonal|iagonalMatrix|iagonalMatrixQ|iagonalizableMatrixQ|ialog|ialogInput|ialogNotebook|ialogReturn|iamond|iamondMatrix|iceDissimilarity|ictionaryLookup|ictionaryWordQ|ifferenceDelta|ifferenceQuotient|ifferenceRoot|ifferenceRootReduce|ifferences|ifferentialD|ifferentialRoot|ifferentialRootReduce|ifferentiatorFilter|iffusionPDETerm|igitCount|igitQ|ihedralAngle|ihedralGroup|ilation|imensionReduce|imensionReducerFunction|imensionReduction|imensionalCombinations|imensionalMeshComponents|imensions|iracComb|iracDelta|irectedEdge|irectedGraph|irectedGraphQ|irectedInfinity|irectionalLight|irective|irectory|irectoryName|irectoryQ|irectoryStack|irichletBeta|irichletCharacter|irichletCondition|irichletConvolve|irichletDistribution|irichletEta|irichletL|irichletLambda|irichletTransform|irichletWindow|iscreteAsymptotic|iscreteChirpZTransform|iscreteConvolve|iscreteDelta|iscreteHadamardTransform|iscreteIndicator|iscreteInputOutputModel|iscreteLQEstimatorGains|iscreteLQRegulatorGains|iscreteLimit|iscreteLyapunovSolve|iscreteMarkovProcess|iscreteMaxLimit|iscreteMinLimit|iscretePlot|iscretePlot3D|iscreteRatio|iscreteRiccatiSolve|iscreteShift|iscreteTimeModelQ|iscreteUniformDistribution|iscreteWaveletData|iscreteWaveletPacketTransform|iscreteWaveletTransform|iscretizeGraphics|iscretizeRegion|iscriminant|isjointQ|isjunction|isk|iskMatrix|iskSegment|ispatch|isplayEndPacket|isplayForm|isplayPacket|istanceMatrix|istanceTransform|istribute|istributeDefinitions|istributed|istributionChart|istributionFitTest|istributionParameterAssumptions|istributionParameterQ|iv|ivide|ivideBy|ivideSides|ivisible|ivisorSigma|ivisorSum|ivisors|o|ocumentGenerator|ocumentGeneratorInformation|ocumentGenerators|ocumentNotebook|odecahedron|ominantColors|ominatorTreeGraph|ominatorVertexList|ot|otEqual|oubleBracketingBar|oubleDownArrow|oubleLeftArrow|oubleLeftRightArrow|oubleLeftTee|oubleLongLeftArrow|oubleLongLeftRightArrow|oubleLongRightArrow|oubleRightArrow|oubleRightTee|oubleUpArrow|oubleUpDownArrow|oubleVerticalBar|ownArrow|ownArrowBar|ownArrowUpArrow|ownLeftRightVector|ownLeftTeeVector|ownLeftVector|ownLeftVectorBar|ownRightTeeVector|ownRightVector|ownRightVectorBar|ownTee|ownTeeArrow|ownValues|ownsample|razinInverse|rop|ropShadowing|t|ualPlanarGraph|ualPolyhedron|ualSystemsModel|umpSave|uplicateFreeQ|uration|ynamic|ynamicGeoGraphics|ynamicModule|ynamicSetting|ynamicWrapper)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:E(?:arthImpactData|arthquakeData|ccentricityCentrality|choEvaluation|choFunction|choLabel|dgeAdd|dgeBetweennessCentrality|dgeChromaticNumber|dgeConnectivity|dgeContract|dgeCount|dgeCoverQ|dgeCycleMatrix|dgeDelete|dgeDetect|dgeForm|dgeIndex|dgeList|dgeQ|dgeRules|dgeTaggedGraph|dgeTaggedGraphQ|dgeTags|dgeTransitiveGraphQ|dgeWeightedGraphQ|ditDistance|ffectiveInterest|igensystem|igenvalues|igenvectorCentrality|igenvectors|lement|lementData|liminate|llipsoid|llipticE|llipticExp|llipticExpPrime|llipticF|llipticFilterModel|llipticK|llipticLog|llipticNomeQ|llipticPi|llipticTheta|llipticThetaPrime|mbedCode|mbeddedHTML|mbeddedService|mitSound|mpiricalDistribution|mptyGraphQ|mptyRegion|nclose|ncode|ncrypt|ncryptedObject|nd|ndDialogPacket|ndPackage|ngineeringForm|nterExpressionPacket|nterTextPacket|ntity|ntityClass|ntityClassList|ntityCopies|ntityGroup|ntityInstance|ntityList|ntityPrefetch|ntityProperties|ntityProperty|ntityPropertyClass|ntityRegister|ntityStores|ntityTypeName|ntityUnregister|ntityValue|ntropy|ntropyFilter|nvironment|qual|qualTilde|qualTo|quilibrium|quirippleFilterKernel|quivalent|rf|rfc|rfi|rlangB|rlangC|rlangDistribution|rosion|rrorBox|stimatedBackground|stimatedDistribution|stimatedPointNormals|stimatedProcess|stimatorGains|stimatorRegulator|uclideanDistance|ulerAngles|ulerCharacteristic|ulerE|ulerMatrix|ulerPhi|ulerianGraphQ|valuate|valuatePacket|valuationBox|valuationCell|valuationData|valuationNotebook|valuationObject|venQ|ventData|ventHandler|ventSeries|xactBlackmanWindow|xactNumberQ|xampleData|xcept|xists|xoplanetData|xp|xpGammaDistribution|xpIntegralE|xpIntegralEi|xpToTrig|xpand|xpandAll|xpandDenominator|xpandFileName|xpandNumerator|xpectation|xponent|xponentialDistribution|xponentialGeneratingFunction|xponentialMovingAverage|xponentialPowerDistribution|xport|xportByteArray|xportForm|xportString|xpressionCell|xpressionGraph|xtendedGCD|xternalBundle|xtract|xtractArchive|xtractPacletArchive|xtremeValueDistribution))(?![`$[:alnum:]])",
+          "match": "System`E(?:arthImpactData|arthquakeData|ccentricityCentrality|choEvaluation|choFunction|choLabel|dgeAdd|dgeBetweennessCentrality|dgeChromaticNumber|dgeConnectivity|dgeContract|dgeCount|dgeCoverQ|dgeCycleMatrix|dgeDelete|dgeDetect|dgeForm|dgeIndex|dgeList|dgeQ|dgeRules|dgeTaggedGraph|dgeTaggedGraphQ|dgeTags|dgeTransitiveGraphQ|dgeWeightedGraphQ|ditDistance|ffectiveInterest|igensystem|igenvalues|igenvectorCentrality|igenvectors|lement|lementData|liminate|llipsoid|llipticE|llipticExp|llipticExpPrime|llipticF|llipticFilterModel|llipticK|llipticLog|llipticNomeQ|llipticPi|llipticTheta|llipticThetaPrime|mbedCode|mbeddedHTML|mbeddedService|mitSound|mpiricalDistribution|mptyGraphQ|mptyRegion|nclose|ncode|ncrypt|ncryptedObject|nd|ndDialogPacket|ndPackage|ngineeringForm|nterExpressionPacket|nterTextPacket|ntity|ntityClass|ntityClassList|ntityCopies|ntityGroup|ntityInstance|ntityList|ntityPrefetch|ntityProperties|ntityProperty|ntityPropertyClass|ntityRegister|ntityStores|ntityTypeName|ntityUnregister|ntityValue|ntropy|ntropyFilter|nvironment|qual|qualTilde|qualTo|quilibrium|quirippleFilterKernel|quivalent|rf|rfc|rfi|rlangB|rlangC|rlangDistribution|rosion|rrorBox|stimatedBackground|stimatedDistribution|stimatedPointNormals|stimatedProcess|stimatorGains|stimatorRegulator|uclideanDistance|ulerAngles|ulerCharacteristic|ulerE|ulerMatrix|ulerPhi|ulerianGraphQ|valuate|valuatePacket|valuationBox|valuationCell|valuationData|valuationNotebook|valuationObject|venQ|ventData|ventHandler|ventSeries|xactBlackmanWindow|xactNumberQ|xampleData|xcept|xists|xoplanetData|xp|xpGammaDistribution|xpIntegralE|xpIntegralEi|xpToTrig|xpand|xpandAll|xpandDenominator|xpandFileName|xpandNumerator|xpectation|xponent|xponentialDistribution|xponentialGeneratingFunction|xponentialMovingAverage|xponentialPowerDistribution|xport|xportByteArray|xportForm|xportString|xpressionCell|xpressionGraph|xtendedGCD|xternalBundle|xtract|xtractArchive|xtractPacletArchive|xtremeValueDistribution)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:F(?:ARIMAProcess|RatioDistribution|aceAlign|aceForm|acialFeatures|actor|actorInteger|actorList|actorSquareFree|actorSquareFreeList|actorTerms|actorTermsList|actorial|actorial2|actorialMoment|actorialMomentGeneratingFunction|actorialPower|ailure|ailureDistribution|ailureQ|areySequence|eatureImpactPlot|eatureNearest|eatureSpacePlot|eatureSpacePlot3D|eatureValueDependencyPlot|eatureValueImpactPlot|eedbackLinearize|etalGrowthData|ibonacci|ibonorial|ile|ileBaseName|ileByteCount|ileDate|ileExistsQ|ileExtension|ileFormat|ileFormatQ|ileHash|ileNameDepth|ileNameDrop|ileNameJoin|ileNameSetter|ileNameSplit|ileNameTake|ileNames|ilePrint|ileSize|ileSystemMap|ileSystemScan|ileTemplate|ileTemplateApply|ileType|illedCurve|illedTorus|illingTransform|ilterRules|inancialBond|inancialData|inancialDerivative|inancialIndicator|ind|indAnomalies|indArgMax|indArgMin|indClique|indClusters|indCookies|indCurvePath|indCycle|indDevices|indDistribution|indDistributionParameters|indDivisions|indEdgeColoring|indEdgeCover|indEdgeCut|indEdgeIndependentPaths|indEulerianCycle|indFaces|indFile|indFit|indFormula|indFundamentalCycles|indGeneratingFunction|indGeoLocation|indGeometricTransform|indGraphCommunities|indGraphIsomorphism|indGraphPartition|indHamiltonianCycle|indHamiltonianPath|indHiddenMarkovStates|indIndependentEdgeSet|indIndependentVertexSet|indInstance|indIntegerNullVector|indIsomorphicSubgraph|indKClan|indKClique|indKClub|indKPlex|indLibrary|indLinearRecurrence|indList|indMatchingColor|indMaxValue|indMaximum|indMaximumCut|indMaximumFlow|indMeshDefects|indMinValue|indMinimum|indMinimumCostFlow|indMinimumCut|indPath|indPeaks|indPermutation|indPlanarColoring|indPostmanTour|indProcessParameters|indRegionTransform|indRepeat|indRoot|indSequenceFunction|indShortestPath|indShortestTour|indSpanningTree|indSubgraphIsomorphism|indThreshold|indTransientRepeat|indVertexColoring|indVertexCover|indVertexCut|indVertexIndependentPaths|inishDynamic|initeAbelianGroupCount|initeGroupCount|initeGroupData|irst|irstCase|irstPassageTimeDistribution|irstPosition|ischerGroupFi22|ischerGroupFi23|ischerGroupFi24Prime|isherHypergeometricDistribution|isherRatioTest|isherZDistribution|it|ittedModel|ixedOrder|ixedPoint|ixedPointList|latShading|latTopWindow|latten|lattenAt|lightData|lipView|loor|lowPolynomial|old|oldList|oldPair|oldPairList|oldWhile|oldWhileList|or|orAll|ormBox|ormFunction|ormObject|ormPage|ormat|ormulaData|ormulaLookup|ortranForm|ourier|ourierCoefficient|ourierCosCoefficient|ourierCosSeries|ourierCosTransform|ourierDCT|ourierDCTFilter|ourierDCTMatrix|ourierDST|ourierDSTMatrix|ourierMatrix|ourierSequenceTransform|ourierSeries|ourierSinCoefficient|ourierSinSeries|ourierSinTransform|ourierTransform|ourierTrigSeries|oxH|ractionBox|ractionalBrownianMotionProcess|ractionalD|ractionalGaussianNoiseProcess|ractionalPart|rameBox|ramed|rechetDistribution|reeQ|renetSerretSystem|requencySamplingFilterKernel|resnelC|resnelF|resnelG|resnelS|robeniusNumber|robeniusSolve|romAbsoluteTime|romCharacterCode|romCoefficientRules|romContinuedFraction|romDMS|romDateString|romDigits|romEntity|romJulianDate|romLetterNumber|romPolarCoordinates|romRomanNumeral|romSphericalCoordinates|romUnixTime|rontEndExecute|rontEndToken|rontEndTokenExecute|ullDefinition|ullForm|ullGraphics|ullInformationOutputRegulator|ullRegion|ullSimplify|unction|unctionAnalytic|unctionBijective|unctionContinuous|unctionConvexity|unctionDiscontinuities|unctionDomain|unctionExpand|unctionInjective|unctionInterpolation|unctionMeromorphic|unctionMonotonicity|unctionPeriod|unctionRange|unctionSign|unctionSingularities|unctionSurjective|ussellVeselyImportance))(?![`$[:alnum:]])",
+          "match": "System`F(?:ARIMAProcess|RatioDistribution|aceAlign|aceForm|acialFeatures|actor|actorInteger|actorList|actorSquareFree|actorSquareFreeList|actorTerms|actorTermsList|actorial|actorial2|actorialMoment|actorialMomentGeneratingFunction|actorialPower|ailure|ailureDistribution|ailureQ|areySequence|eatureImpactPlot|eatureNearest|eatureSpacePlot|eatureSpacePlot3D|eatureValueDependencyPlot|eatureValueImpactPlot|eedbackLinearize|etalGrowthData|ibonacci|ibonorial|ile|ileBaseName|ileByteCount|ileDate|ileExistsQ|ileExtension|ileFormat|ileFormatQ|ileHash|ileNameDepth|ileNameDrop|ileNameJoin|ileNameSetter|ileNameSplit|ileNameTake|ileNames|ilePrint|ileSize|ileSystemMap|ileSystemScan|ileTemplate|ileTemplateApply|ileType|illedCurve|illedTorus|illingTransform|ilterRules|inancialBond|inancialData|inancialDerivative|inancialIndicator|ind|indAnomalies|indArgMax|indArgMin|indClique|indClusters|indCookies|indCurvePath|indCycle|indDevices|indDistribution|indDistributionParameters|indDivisions|indEdgeColoring|indEdgeCover|indEdgeCut|indEdgeIndependentPaths|indEulerianCycle|indFaces|indFile|indFit|indFormula|indFundamentalCycles|indGeneratingFunction|indGeoLocation|indGeometricTransform|indGraphCommunities|indGraphIsomorphism|indGraphPartition|indHamiltonianCycle|indHamiltonianPath|indHiddenMarkovStates|indIndependentEdgeSet|indIndependentVertexSet|indInstance|indIntegerNullVector|indIsomorphicSubgraph|indKClan|indKClique|indKClub|indKPlex|indLibrary|indLinearRecurrence|indList|indMatchingColor|indMaxValue|indMaximum|indMaximumCut|indMaximumFlow|indMeshDefects|indMinValue|indMinimum|indMinimumCostFlow|indMinimumCut|indPath|indPeaks|indPermutation|indPlanarColoring|indPostmanTour|indProcessParameters|indRegionTransform|indRepeat|indRoot|indSequenceFunction|indShortestPath|indShortestTour|indSpanningTree|indSubgraphIsomorphism|indThreshold|indTransientRepeat|indVertexColoring|indVertexCover|indVertexCut|indVertexIndependentPaths|inishDynamic|initeAbelianGroupCount|initeGroupCount|initeGroupData|irst|irstCase|irstPassageTimeDistribution|irstPosition|ischerGroupFi22|ischerGroupFi23|ischerGroupFi24Prime|isherHypergeometricDistribution|isherRatioTest|isherZDistribution|it|ittedModel|ixedOrder|ixedPoint|ixedPointList|latShading|latTopWindow|latten|lattenAt|lightData|lipView|loor|lowPolynomial|old|oldList|oldPair|oldPairList|oldWhile|oldWhileList|or|orAll|ormBox|ormFunction|ormObject|ormPage|ormat|ormulaData|ormulaLookup|ortranForm|ourier|ourierCoefficient|ourierCosCoefficient|ourierCosSeries|ourierCosTransform|ourierDCT|ourierDCTFilter|ourierDCTMatrix|ourierDST|ourierDSTMatrix|ourierMatrix|ourierSequenceTransform|ourierSeries|ourierSinCoefficient|ourierSinSeries|ourierSinTransform|ourierTransform|ourierTrigSeries|oxH|ractionBox|ractionalBrownianMotionProcess|ractionalD|ractionalGaussianNoiseProcess|ractionalPart|rameBox|ramed|rechetDistribution|reeQ|renetSerretSystem|requencySamplingFilterKernel|resnelC|resnelF|resnelG|resnelS|robeniusNumber|robeniusSolve|romAbsoluteTime|romCharacterCode|romCoefficientRules|romContinuedFraction|romDMS|romDateString|romDigits|romEntity|romJulianDate|romLetterNumber|romPolarCoordinates|romRomanNumeral|romSphericalCoordinates|romUnixTime|rontEndExecute|rontEndToken|rontEndTokenExecute|ullDefinition|ullForm|ullGraphics|ullInformationOutputRegulator|ullRegion|ullSimplify|unction|unctionAnalytic|unctionBijective|unctionContinuous|unctionConvexity|unctionDiscontinuities|unctionDomain|unctionExpand|unctionInjective|unctionInterpolation|unctionMeromorphic|unctionMonotonicity|unctionPeriod|unctionRange|unctionSign|unctionSingularities|unctionSurjective|ussellVeselyImportance)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:G(?:ARCHProcess|CD|aborFilter|aborMatrix|aborWavelet|ainMargins|ainPhaseMargins|alaxyData|amma|ammaDistribution|ammaRegularized|ather|atherBy|aussianFilter|aussianMatrix|aussianOrthogonalMatrixDistribution|aussianSymplecticMatrixDistribution|aussianUnitaryMatrixDistribution|aussianWindow|egenbauerC|eneralizedLinearModelFit|enerateAsymmetricKeyPair|enerateDocument|enerateHTTPResponse|enerateSymmetricKey|eneratingFunction|enericCylindricalDecomposition|enomeData|enomeLookup|eoAntipode|eoArea|eoBoundary|eoBoundingBox|eoBounds|eoBoundsRegion|eoBoundsRegionBoundary|eoBubbleChart|eoCircle|eoContourPlot|eoDensityPlot|eoDestination|eoDirection|eoDisk|eoDisplacement|eoDistance|eoDistanceList|eoElevationData|eoEntities|eoGraphPlot|eoGraphics|eoGridDirectionDifference|eoGridPosition|eoGridUnitArea|eoGridUnitDistance|eoGridVector|eoGroup|eoHemisphere|eoHemisphereBoundary|eoHistogram|eoIdentify|eoImage|eoLength|eoListPlot|eoMarker|eoNearest|eoPath|eoPolygon|eoPosition|eoPositionENU|eoPositionXYZ|eoProjectionData|eoRegionValuePlot|eoSmoothHistogram|eoStreamPlot|eoStyling|eoVariant|eoVector|eoVectorENU|eoVectorPlot|eoVectorXYZ|eoVisibleRegion|eoVisibleRegionBoundary|eoWithinQ|eodesicClosing|eodesicDilation|eodesicErosion|eodesicOpening|eodesicPolyhedron|eodesyData|eogravityModelData|eologicalPeriodData|eomagneticModelData|eometricBrownianMotionProcess|eometricDistribution|eometricMean|eometricMeanFilter|eometricOptimization|eometricTransformation|estureHandler|et|etEnvironment|lobalClusteringCoefficient|low|ompertzMakehamDistribution|oochShading|oodmanKruskalGamma|oodmanKruskalGammaTest|oto|ouraudShading|rad|radientFilter|radientFittedMesh|radientOrientationFilter|rammarApply|rammarRules|rammarToken|raph|raph3D|raphAssortativity|raphAutomorphismGroup|raphCenter|raphComplement|raphData|raphDensity|raphDiameter|raphDifference|raphDisjointUnion|raphDistance|raphDistanceMatrix|raphEmbedding|raphHub|raphIntersection|raphJoin|raphLinkEfficiency|raphPeriphery|raphPlot|raphPlot3D|raphPower|raphProduct|raphPropertyDistribution|raphQ|raphRadius|raphReciprocity|raphSum|raphUnion|raphics|raphics3D|raphicsColumn|raphicsComplex|raphicsGrid|raphicsGroup|raphicsRow|rayLevel|reater|reaterEqual|reaterEqualLess|reaterEqualThan|reaterFullEqual|reaterGreater|reaterLess|reaterSlantEqual|reaterThan|reaterTilde|reenFunction|rid|ridBox|ridGraph|roebnerBasis|roupBy|roupCentralizer|roupElementFromWord|roupElementPosition|roupElementQ|roupElementToWord|roupElements|roupGenerators|roupMultiplicationTable|roupOrbits|roupOrder|roupSetwiseStabilizer|roupStabilizer|roupStabilizerChain|roupings|rowCutComponents|udermannian|uidedFilter|umbelDistribution))(?![`$[:alnum:]])",
+          "match": "System`G(?:ARCHProcess|CD|aborFilter|aborMatrix|aborWavelet|ainMargins|ainPhaseMargins|alaxyData|amma|ammaDistribution|ammaRegularized|ather|atherBy|aussianFilter|aussianMatrix|aussianOrthogonalMatrixDistribution|aussianSymplecticMatrixDistribution|aussianUnitaryMatrixDistribution|aussianWindow|egenbauerC|eneralizedLinearModelFit|enerateAsymmetricKeyPair|enerateDocument|enerateHTTPResponse|enerateSymmetricKey|eneratingFunction|enericCylindricalDecomposition|enomeData|enomeLookup|eoAntipode|eoArea|eoBoundary|eoBoundingBox|eoBounds|eoBoundsRegion|eoBoundsRegionBoundary|eoBubbleChart|eoCircle|eoContourPlot|eoDensityPlot|eoDestination|eoDirection|eoDisk|eoDisplacement|eoDistance|eoDistanceList|eoElevationData|eoEntities|eoGraphPlot|eoGraphics|eoGridDirectionDifference|eoGridPosition|eoGridUnitArea|eoGridUnitDistance|eoGridVector|eoGroup|eoHemisphere|eoHemisphereBoundary|eoHistogram|eoIdentify|eoImage|eoLength|eoListPlot|eoMarker|eoNearest|eoPath|eoPolygon|eoPosition|eoPositionENU|eoPositionXYZ|eoProjectionData|eoRegionValuePlot|eoSmoothHistogram|eoStreamPlot|eoStyling|eoVariant|eoVector|eoVectorENU|eoVectorPlot|eoVectorXYZ|eoVisibleRegion|eoVisibleRegionBoundary|eoWithinQ|eodesicClosing|eodesicDilation|eodesicErosion|eodesicOpening|eodesicPolyhedron|eodesyData|eogravityModelData|eologicalPeriodData|eomagneticModelData|eometricBrownianMotionProcess|eometricDistribution|eometricMean|eometricMeanFilter|eometricOptimization|eometricTransformation|estureHandler|et|etEnvironment|lobalClusteringCoefficient|low|ompertzMakehamDistribution|oochShading|oodmanKruskalGamma|oodmanKruskalGammaTest|oto|ouraudShading|rad|radientFilter|radientFittedMesh|radientOrientationFilter|rammarApply|rammarRules|rammarToken|raph|raph3D|raphAssortativity|raphAutomorphismGroup|raphCenter|raphComplement|raphData|raphDensity|raphDiameter|raphDifference|raphDisjointUnion|raphDistance|raphDistanceMatrix|raphEmbedding|raphHub|raphIntersection|raphJoin|raphLinkEfficiency|raphPeriphery|raphPlot|raphPlot3D|raphPower|raphProduct|raphPropertyDistribution|raphQ|raphRadius|raphReciprocity|raphSum|raphUnion|raphics|raphics3D|raphicsColumn|raphicsComplex|raphicsGrid|raphicsGroup|raphicsRow|rayLevel|reater|reaterEqual|reaterEqualLess|reaterEqualThan|reaterFullEqual|reaterGreater|reaterLess|reaterSlantEqual|reaterThan|reaterTilde|reenFunction|rid|ridBox|ridGraph|roebnerBasis|roupBy|roupCentralizer|roupElementFromWord|roupElementPosition|roupElementQ|roupElementToWord|roupElements|roupGenerators|roupMultiplicationTable|roupOrbits|roupOrder|roupSetwiseStabilizer|roupStabilizer|roupStabilizerChain|roupings|rowCutComponents|udermannian|uidedFilter|umbelDistribution)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:H(?:ITSCentrality|TTPErrorResponse|TTPRedirect|TTPRequest|TTPRequestData|TTPResponse|aarWavelet|adamardMatrix|alfLine|alfNormalDistribution|alfPlane|alfSpace|alftoneShading|amiltonianGraphQ|ammingDistance|ammingWindow|ankelH1|ankelH2|ankelMatrix|ankelTransform|annPoissonWindow|annWindow|aradaNortonGroupHN|araryGraph|armonicMean|armonicMeanFilter|armonicNumber|ash|atchFilling|atchShading|aversine|azardFunction|ead|eatFluxValue|eatInsulationValue|eatOutflowValue|eatRadiationValue|eatSymmetryValue|eatTemperatureCondition|eatTransferPDEComponent|eatTransferValue|eavisideLambda|eavisidePi|eavisideTheta|eldGroupHe|elmholtzPDEComponent|ermiteDecomposition|ermiteH|ermitian|ermitianMatrixQ|essenbergDecomposition|eunB|eunBPrime|eunC|eunCPrime|eunD|eunDPrime|eunG|eunGPrime|eunT|eunTPrime|exahedron|iddenMarkovProcess|ighlightGraph|ighlightImage|ighlightMesh|ighlighted|ighpassFilter|igmanSimsGroupHS|ilbertCurve|ilbertFilter|ilbertMatrix|istogram|istogram3D|istogramDistribution|istogramList|istogramTransform|istogramTransformInterpolation|istoricalPeriodData|itMissTransform|jorthDistribution|odgeDual|oeffdingD|oeffdingDTest|old|oldComplete|oldForm|oldPattern|orizontalGauge|ornerForm|ostLookup|otellingTSquareDistribution|oytDistribution|ue|umanGrowthData|umpDownHump|umpEqual|urwitzLerchPhi|urwitzZeta|yperbolicDistribution|ypercubeGraph|yperexponentialDistribution|yperfactorial|ypergeometric0F1|ypergeometric0F1Regularized|ypergeometric1F1|ypergeometric1F1Regularized|ypergeometric2F1|ypergeometric2F1Regularized|ypergeometricDistribution|ypergeometricPFQ|ypergeometricPFQRegularized|ypergeometricU|yperlink|yperplane|ypoexponentialDistribution|ypothesisTestData))(?![`$[:alnum:]])",
+          "match": "System`H(?:ITSCentrality|TTPErrorResponse|TTPRedirect|TTPRequest|TTPRequestData|TTPResponse|aarWavelet|adamardMatrix|alfLine|alfNormalDistribution|alfPlane|alfSpace|alftoneShading|amiltonianGraphQ|ammingDistance|ammingWindow|ankelH1|ankelH2|ankelMatrix|ankelTransform|annPoissonWindow|annWindow|aradaNortonGroupHN|araryGraph|armonicMean|armonicMeanFilter|armonicNumber|ash|atchFilling|atchShading|aversine|azardFunction|ead|eatFluxValue|eatInsulationValue|eatOutflowValue|eatRadiationValue|eatSymmetryValue|eatTemperatureCondition|eatTransferPDEComponent|eatTransferValue|eavisideLambda|eavisidePi|eavisideTheta|eldGroupHe|elmholtzPDEComponent|ermiteDecomposition|ermiteH|ermitian|ermitianMatrixQ|essenbergDecomposition|eunB|eunBPrime|eunC|eunCPrime|eunD|eunDPrime|eunG|eunGPrime|eunT|eunTPrime|exahedron|iddenMarkovProcess|ighlightGraph|ighlightImage|ighlightMesh|ighlighted|ighpassFilter|igmanSimsGroupHS|ilbertCurve|ilbertFilter|ilbertMatrix|istogram|istogram3D|istogramDistribution|istogramList|istogramTransform|istogramTransformInterpolation|istoricalPeriodData|itMissTransform|jorthDistribution|odgeDual|oeffdingD|oeffdingDTest|old|oldComplete|oldForm|oldPattern|orizontalGauge|ornerForm|ostLookup|otellingTSquareDistribution|oytDistribution|ue|umanGrowthData|umpDownHump|umpEqual|urwitzLerchPhi|urwitzZeta|yperbolicDistribution|ypercubeGraph|yperexponentialDistribution|yperfactorial|ypergeometric0F1|ypergeometric0F1Regularized|ypergeometric1F1|ypergeometric1F1Regularized|ypergeometric2F1|ypergeometric2F1Regularized|ypergeometricDistribution|ypergeometricPFQ|ypergeometricPFQRegularized|ypergeometricU|yperlink|yperplane|ypoexponentialDistribution|ypothesisTestData)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:I(?:PAddress|conData|conize|cosahedron|dentity|dentityMatrix|f|fCompiled|gnoringInactive|m|mage|mage3D|mage3DProjection|mage3DSlices|mageAccumulate|mageAdd|mageAdjust|mageAlign|mageApply|mageApplyIndexed|mageAspectRatio|mageAssemble|mageCapture|mageChannels|mageClip|mageCollage|mageColorSpace|mageCompose|mageConvolve|mageCooccurrence|mageCorners|mageCorrelate|mageCorrespondingPoints|mageCrop|mageData|mageDeconvolve|mageDemosaic|mageDifference|mageDimensions|mageDisplacements|mageDistance|mageEffect|mageExposureCombine|mageFeatureTrack|mageFileApply|mageFileFilter|mageFileScan|mageFilter|mageFocusCombine|mageForestingComponents|mageForwardTransformation|mageHistogram|mageIdentify|mageInstanceQ|mageKeypoints|mageLevels|mageLines|mageMarker|mageMeasurements|mageMesh|mageMultiply|magePad|magePartition|magePeriodogram|magePerspectiveTransformation|mageQ|mageRecolor|mageReflect|mageResize|mageRestyle|mageRotate|mageSaliencyFilter|mageScaled|mageScan|mageSubtract|mageTake|mageTransformation|mageTrim|mageType|mageValue|mageValuePositions|mageVectorscopePlot|mageWaveformPlot|mplicitD|mplicitRegion|mplies|mport|mportByteArray|mportString|mprovementImportance|nactivate|nactive|ncidenceGraph|ncidenceList|ncidenceMatrix|ncrement|ndefiniteMatrixQ|ndependenceTest|ndependentEdgeSetQ|ndependentPhysicalQuantity|ndependentUnit|ndependentUnitDimension|ndependentVertexSetQ|ndexEdgeTaggedGraph|ndexGraph|ndexed|nexactNumberQ|nfiniteLine|nfiniteLineThrough|nfinitePlane|nfix|nflationAdjust|nformation|nhomogeneousPoissonProcess|nner|nnerPolygon|nnerPolyhedron|npaint|nput|nputField|nputForm|nputNamePacket|nputNotebook|nputPacket|nputStream|nputString|nputStringPacket|nsert|nsertLinebreaks|nset|nsphere|nstall|nstallService|ntegerDigits|ntegerExponent|ntegerLength|ntegerName|ntegerPart|ntegerPartitions|ntegerQ|ntegerReverse|ntegerString|ntegrate|nteractiveTradingChart|nternallyBalancedDecomposition|nterpolatingFunction|nterpolatingPolynomial|nterpolation|nterpretation|nterpretationBox|nterpreter|nterquartileRange|nterrupt|ntersectingQ|ntersection|nterval|ntervalIntersection|ntervalMemberQ|ntervalSlider|ntervalUnion|nverse|nverseBetaRegularized|nverseBilateralLaplaceTransform|nverseBilateralZTransform|nverseCDF|nverseChiSquareDistribution|nverseContinuousWaveletTransform|nverseDistanceTransform|nverseEllipticNomeQ|nverseErf|nverseErfc|nverseFourier|nverseFourierCosTransform|nverseFourierSequenceTransform|nverseFourierSinTransform|nverseFourierTransform|nverseFunction|nverseGammaDistribution|nverseGammaRegularized|nverseGaussianDistribution|nverseGudermannian|nverseHankelTransform|nverseHaversine|nverseJacobiCD|nverseJacobiCN|nverseJacobiCS|nverseJacobiDC|nverseJacobiDN|nverseJacobiDS|nverseJacobiNC|nverseJacobiND|nverseJacobiNS|nverseJacobiSC|nverseJacobiSD|nverseJacobiSN|nverseLaplaceTransform|nverseMellinTransform|nversePermutation|nverseRadon|nverseRadonTransform|nverseSeries|nverseShortTimeFourier|nverseSpectrogram|nverseSurvivalFunction|nverseTransformedRegion|nverseWaveletTransform|nverseWeierstrassP|nverseWishartMatrixDistribution|nverseZTransform|nvisible|rreduciblePolynomialQ|slandData|solatingInterval|somorphicGraphQ|somorphicSubgraphQ|sotopeData|tem|toProcess))(?![`$[:alnum:]])",
+          "match": "System`I(?:PAddress|conData|conize|cosahedron|dentity|dentityMatrix|f|fCompiled|gnoringInactive|m|mage|mage3D|mage3DProjection|mage3DSlices|mageAccumulate|mageAdd|mageAdjust|mageAlign|mageApply|mageApplyIndexed|mageAspectRatio|mageAssemble|mageCapture|mageChannels|mageClip|mageCollage|mageColorSpace|mageCompose|mageConvolve|mageCooccurrence|mageCorners|mageCorrelate|mageCorrespondingPoints|mageCrop|mageData|mageDeconvolve|mageDemosaic|mageDifference|mageDimensions|mageDisplacements|mageDistance|mageEffect|mageExposureCombine|mageFeatureTrack|mageFileApply|mageFileFilter|mageFileScan|mageFilter|mageFocusCombine|mageForestingComponents|mageForwardTransformation|mageHistogram|mageIdentify|mageInstanceQ|mageKeypoints|mageLevels|mageLines|mageMarker|mageMeasurements|mageMesh|mageMultiply|magePad|magePartition|magePeriodogram|magePerspectiveTransformation|mageQ|mageRecolor|mageReflect|mageResize|mageRestyle|mageRotate|mageSaliencyFilter|mageScaled|mageScan|mageSubtract|mageTake|mageTransformation|mageTrim|mageType|mageValue|mageValuePositions|mageVectorscopePlot|mageWaveformPlot|mplicitD|mplicitRegion|mplies|mport|mportByteArray|mportString|mprovementImportance|nactivate|nactive|ncidenceGraph|ncidenceList|ncidenceMatrix|ncrement|ndefiniteMatrixQ|ndependenceTest|ndependentEdgeSetQ|ndependentPhysicalQuantity|ndependentUnit|ndependentUnitDimension|ndependentVertexSetQ|ndexEdgeTaggedGraph|ndexGraph|ndexed|nexactNumberQ|nfiniteLine|nfiniteLineThrough|nfinitePlane|nfix|nflationAdjust|nformation|nhomogeneousPoissonProcess|nner|nnerPolygon|nnerPolyhedron|npaint|nput|nputField|nputForm|nputNamePacket|nputNotebook|nputPacket|nputStream|nputString|nputStringPacket|nsert|nsertLinebreaks|nset|nsphere|nstall|nstallService|ntegerDigits|ntegerExponent|ntegerLength|ntegerName|ntegerPart|ntegerPartitions|ntegerQ|ntegerReverse|ntegerString|ntegrate|nteractiveTradingChart|nternallyBalancedDecomposition|nterpolatingFunction|nterpolatingPolynomial|nterpolation|nterpretation|nterpretationBox|nterpreter|nterquartileRange|nterrupt|ntersectingQ|ntersection|nterval|ntervalIntersection|ntervalMemberQ|ntervalSlider|ntervalUnion|nverse|nverseBetaRegularized|nverseBilateralLaplaceTransform|nverseBilateralZTransform|nverseCDF|nverseChiSquareDistribution|nverseContinuousWaveletTransform|nverseDistanceTransform|nverseEllipticNomeQ|nverseErf|nverseErfc|nverseFourier|nverseFourierCosTransform|nverseFourierSequenceTransform|nverseFourierSinTransform|nverseFourierTransform|nverseFunction|nverseGammaDistribution|nverseGammaRegularized|nverseGaussianDistribution|nverseGudermannian|nverseHankelTransform|nverseHaversine|nverseJacobiCD|nverseJacobiCN|nverseJacobiCS|nverseJacobiDC|nverseJacobiDN|nverseJacobiDS|nverseJacobiNC|nverseJacobiND|nverseJacobiNS|nverseJacobiSC|nverseJacobiSD|nverseJacobiSN|nverseLaplaceTransform|nverseMellinTransform|nversePermutation|nverseRadon|nverseRadonTransform|nverseSeries|nverseShortTimeFourier|nverseSpectrogram|nverseSurvivalFunction|nverseTransformedRegion|nverseWaveletTransform|nverseWeierstrassP|nverseWishartMatrixDistribution|nverseZTransform|nvisible|rreduciblePolynomialQ|slandData|solatingInterval|somorphicGraphQ|somorphicSubgraphQ|sotopeData|tem|toProcess)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:J(?:accardDissimilarity|acobiAmplitude|acobiCD|acobiCN|acobiCS|acobiDC|acobiDN|acobiDS|acobiEpsilon|acobiNC|acobiND|acobiNS|acobiP|acobiSC|acobiSD|acobiSN|acobiSymbol|acobiZN|acobiZeta|ankoGroupJ1|ankoGroupJ2|ankoGroupJ3|ankoGroupJ4|arqueBeraALMTest|ohnsonDistribution|oin|oinAcross|oinForm|oinedCurve|ordanDecomposition|ordanModelDecomposition|uliaSetBoettcher|uliaSetIterationCount|uliaSetPlot|uliaSetPoints|ulianDate))(?![`$[:alnum:]])",
+          "match": "System`J(?:accardDissimilarity|acobiAmplitude|acobiCD|acobiCN|acobiCS|acobiDC|acobiDN|acobiDS|acobiEpsilon|acobiNC|acobiND|acobiNS|acobiP|acobiSC|acobiSD|acobiSN|acobiSymbol|acobiZN|acobiZeta|ankoGroupJ1|ankoGroupJ2|ankoGroupJ3|ankoGroupJ4|arqueBeraALMTest|ohnsonDistribution|oin|oinAcross|oinForm|oinedCurve|ordanDecomposition|ordanModelDecomposition|uliaSetBoettcher|uliaSetIterationCount|uliaSetPlot|uliaSetPoints|ulianDate)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:K(?:CoreComponents|Distribution|EdgeConnectedComponents|EdgeConnectedGraphQ|VertexConnectedComponents|VertexConnectedGraphQ|agiChart|aiserBesselWindow|aiserWindow|almanEstimator|almanFilter|arhunenLoeveDecomposition|aryTree|atzCentrality|elvinBei|elvinBer|elvinKei|elvinKer|endallTau|endallTauTest|ernelMixtureDistribution|ernelObject|ernels|ey|eyComplement|eyDrop|eyDropFrom|eyExistsQ|eyFreeQ|eyIntersection|eyMap|eyMemberQ|eySelect|eySort|eySortBy|eyTake|eyUnion|eyValueMap|eyValuePattern|eys|illProcess|irchhoffGraph|irchhoffMatrix|leinInvariantJ|napsackSolve|nightTourGraph|notData|nownUnitQ|ochCurve|olmogorovSmirnovTest|roneckerDelta|roneckerModelDecomposition|roneckerProduct|roneckerSymbol|uiperTest|umaraswamyDistribution|urtosis|uwaharaFilter))(?![`$[:alnum:]])",
+          "match": "System`K(?:CoreComponents|Distribution|EdgeConnectedComponents|EdgeConnectedGraphQ|VertexConnectedComponents|VertexConnectedGraphQ|agiChart|aiserBesselWindow|aiserWindow|almanEstimator|almanFilter|arhunenLoeveDecomposition|aryTree|atzCentrality|elvinBei|elvinBer|elvinKei|elvinKer|endallTau|endallTauTest|ernelMixtureDistribution|ernelObject|ernels|ey|eyComplement|eyDrop|eyDropFrom|eyExistsQ|eyFreeQ|eyIntersection|eyMap|eyMemberQ|eySelect|eySort|eySortBy|eyTake|eyUnion|eyValueMap|eyValuePattern|eys|illProcess|irchhoffGraph|irchhoffMatrix|leinInvariantJ|napsackSolve|nightTourGraph|notData|nownUnitQ|ochCurve|olmogorovSmirnovTest|roneckerDelta|roneckerModelDecomposition|roneckerProduct|roneckerSymbol|uiperTest|umaraswamyDistribution|urtosis|uwaharaFilter)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:L(?:ABColor|CHColor|CM|QEstimatorGains|QGRegulator|QOutputRegulatorGains|QRegulatorGains|UDecomposition|UVColor|abel|abeled|aguerreL|akeData|ambdaComponents|ameC|ameCPrime|ameEigenvalueA|ameEigenvalueB|ameS|ameSPrime|aminaData|anczosWindow|andauDistribution|anguageData|anguageIdentify|aplaceDistribution|aplaceTransform|aplacian|aplacianFilter|aplacianGaussianFilter|aplacianPDETerm|ast|atitude|atitudeLongitude|atticeData|atticeReduce|aunchKernels|ayeredGraphPlot|ayeredGraphPlot3D|eafCount|eapVariant|eapYearQ|earnDistribution|earnedDistribution|eastSquares|eastSquaresFilterKernel|eftArrow|eftArrowBar|eftArrowRightArrow|eftDownTeeVector|eftDownVector|eftDownVectorBar|eftRightArrow|eftRightVector|eftTee|eftTeeArrow|eftTeeVector|eftTriangle|eftTriangleBar|eftTriangleEqual|eftUpDownVector|eftUpTeeVector|eftUpVector|eftUpVectorBar|eftVector|eftVectorBar|egended|egendreP|egendreQ|ength|engthWhile|erchPhi|ess|essEqual|essEqualGreater|essEqualThan|essFullEqual|essGreater|essLess|essSlantEqual|essThan|essTilde|etterCounts|etterNumber|etterQ|evel|eveneTest|eviCivitaTensor|evyDistribution|exicographicOrder|exicographicSort|ibraryDataType|ibraryFunction|ibraryFunctionError|ibraryFunctionInformation|ibraryFunctionLoad|ibraryFunctionUnload|ibraryLoad|ibraryUnload|iftingFilterData|iftingWaveletTransform|ighter|ikelihood|imit|indleyDistribution|ine|ineBreakChart|ineGraph|ineIntegralConvolutionPlot|ineLegend|inearFractionalOptimization|inearFractionalTransform|inearGradientFilling|inearGradientImage|inearModelFit|inearOptimization|inearRecurrence|inearSolve|inearSolveFunction|inearizingTransformationData|inkActivate|inkClose|inkConnect|inkCreate|inkInterrupt|inkLaunch|inkObject|inkPatterns|inkRankCentrality|inkRead|inkReadyQ|inkWrite|inks|iouvilleLambda|ist|istAnimate|istContourPlot|istContourPlot3D|istConvolve|istCorrelate|istCurvePathPlot|istDeconvolve|istDensityPlot|istDensityPlot3D|istFourierSequenceTransform|istInterpolation|istLineIntegralConvolutionPlot|istLinePlot|istLinePlot3D|istLogLinearPlot|istLogLogPlot|istLogPlot|istPicker|istPickerBox|istPlay|istPlot|istPlot3D|istPointPlot3D|istPolarPlot|istQ|istSliceContourPlot3D|istSliceDensityPlot3D|istSliceVectorPlot3D|istStepPlot|istStreamDensityPlot|istStreamPlot|istStreamPlot3D|istSurfacePlot3D|istVectorDensityPlot|istVectorDisplacementPlot|istVectorDisplacementPlot3D|istVectorPlot|istVectorPlot3D|istZTransform|ocalAdaptiveBinarize|ocalCache|ocalClusteringCoefficient|ocalEvaluate|ocalObject|ocalObjects|ocalSubmit|ocalSymbol|ocalTime|ocalTimeZone|ocationEquivalenceTest|ocationTest|ocator|ocatorPane|og|og10|og2|ogBarnesG|ogGamma|ogGammaDistribution|ogIntegral|ogLikelihood|ogLinearPlot|ogLogPlot|ogLogisticDistribution|ogMultinormalDistribution|ogNormalDistribution|ogPlot|ogRankTest|ogSeriesDistribution|ogicalExpand|ogisticDistribution|ogisticSigmoid|ogitModelFit|ongLeftArrow|ongLeftRightArrow|ongRightArrow|ongest|ongestCommonSequence|ongestCommonSequencePositions|ongestCommonSubsequence|ongestCommonSubsequencePositions|ongestOrderedSequence|ongitude|ookup|oopFreeGraphQ|owerCaseQ|owerLeftArrow|owerRightArrow|owerTriangularMatrix|owerTriangularMatrixQ|owerTriangularize|owpassFilter|ucasL|uccioSamiComponents|unarEclipse|yapunovSolve|yonsGroupLy))(?![`$[:alnum:]])",
+          "match": "System`L(?:ABColor|CHColor|CM|QEstimatorGains|QGRegulator|QOutputRegulatorGains|QRegulatorGains|UDecomposition|UVColor|abel|abeled|aguerreL|akeData|ambdaComponents|ameC|ameCPrime|ameEigenvalueA|ameEigenvalueB|ameS|ameSPrime|aminaData|anczosWindow|andauDistribution|anguageData|anguageIdentify|aplaceDistribution|aplaceTransform|aplacian|aplacianFilter|aplacianGaussianFilter|aplacianPDETerm|ast|atitude|atitudeLongitude|atticeData|atticeReduce|aunchKernels|ayeredGraphPlot|ayeredGraphPlot3D|eafCount|eapVariant|eapYearQ|earnDistribution|earnedDistribution|eastSquares|eastSquaresFilterKernel|eftArrow|eftArrowBar|eftArrowRightArrow|eftDownTeeVector|eftDownVector|eftDownVectorBar|eftRightArrow|eftRightVector|eftTee|eftTeeArrow|eftTeeVector|eftTriangle|eftTriangleBar|eftTriangleEqual|eftUpDownVector|eftUpTeeVector|eftUpVector|eftUpVectorBar|eftVector|eftVectorBar|egended|egendreP|egendreQ|ength|engthWhile|erchPhi|ess|essEqual|essEqualGreater|essEqualThan|essFullEqual|essGreater|essLess|essSlantEqual|essThan|essTilde|etterCounts|etterNumber|etterQ|evel|eveneTest|eviCivitaTensor|evyDistribution|exicographicOrder|exicographicSort|ibraryDataType|ibraryFunction|ibraryFunctionError|ibraryFunctionInformation|ibraryFunctionLoad|ibraryFunctionUnload|ibraryLoad|ibraryUnload|iftingFilterData|iftingWaveletTransform|ighter|ikelihood|imit|indleyDistribution|ine|ineBreakChart|ineGraph|ineIntegralConvolutionPlot|ineLegend|inearFractionalOptimization|inearFractionalTransform|inearGradientFilling|inearGradientImage|inearModelFit|inearOptimization|inearRecurrence|inearSolve|inearSolveFunction|inearizingTransformationData|inkActivate|inkClose|inkConnect|inkCreate|inkInterrupt|inkLaunch|inkObject|inkPatterns|inkRankCentrality|inkRead|inkReadyQ|inkWrite|inks|iouvilleLambda|ist|istAnimate|istContourPlot|istContourPlot3D|istConvolve|istCorrelate|istCurvePathPlot|istDeconvolve|istDensityPlot|istDensityPlot3D|istFourierSequenceTransform|istInterpolation|istLineIntegralConvolutionPlot|istLinePlot|istLinePlot3D|istLogLinearPlot|istLogLogPlot|istLogPlot|istPicker|istPickerBox|istPlay|istPlot|istPlot3D|istPointPlot3D|istPolarPlot|istQ|istSliceContourPlot3D|istSliceDensityPlot3D|istSliceVectorPlot3D|istStepPlot|istStreamDensityPlot|istStreamPlot|istStreamPlot3D|istSurfacePlot3D|istVectorDensityPlot|istVectorDisplacementPlot|istVectorDisplacementPlot3D|istVectorPlot|istVectorPlot3D|istZTransform|ocalAdaptiveBinarize|ocalCache|ocalClusteringCoefficient|ocalEvaluate|ocalObject|ocalObjects|ocalSubmit|ocalSymbol|ocalTime|ocalTimeZone|ocationEquivalenceTest|ocationTest|ocator|ocatorPane|og|og10|og2|ogBarnesG|ogGamma|ogGammaDistribution|ogIntegral|ogLikelihood|ogLinearPlot|ogLogPlot|ogLogisticDistribution|ogMultinormalDistribution|ogNormalDistribution|ogPlot|ogRankTest|ogSeriesDistribution|ogicalExpand|ogisticDistribution|ogisticSigmoid|ogitModelFit|ongLeftArrow|ongLeftRightArrow|ongRightArrow|ongest|ongestCommonSequence|ongestCommonSequencePositions|ongestCommonSubsequence|ongestCommonSubsequencePositions|ongestOrderedSequence|ongitude|ookup|oopFreeGraphQ|owerCaseQ|owerLeftArrow|owerRightArrow|owerTriangularMatrix|owerTriangularMatrixQ|owerTriangularize|owpassFilter|ucasL|uccioSamiComponents|unarEclipse|yapunovSolve|yonsGroupLy)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:M(?:AProcess|achineNumberQ|agnify|ailReceiverFunction|ajority|akeBoxes|akeExpression|anagedLibraryExpressionID|anagedLibraryExpressionQ|andelbrotSetBoettcher|andelbrotSetDistance|andelbrotSetIterationCount|andelbrotSetMemberQ|andelbrotSetPlot|angoldtLambda|anhattanDistance|anipulate|anipulator|annWhitneyTest|annedSpaceMissionData|antissaExponent|ap|apAll|apApply|apAt|apIndexed|apThread|archenkoPasturDistribution|arcumQ|ardiaCombinedTest|ardiaKurtosisTest|ardiaSkewnessTest|arginalDistribution|arkovProcessProperties|assConcentrationCondition|assFluxValue|assImpermeableBoundaryValue|assOutflowValue|assSymmetryValue|assTransferValue|assTransportPDEComponent|atchQ|atchingDissimilarity|aterialShading|athMLForm|athematicalFunctionData|athieuC|athieuCPrime|athieuCharacteristicA|athieuCharacteristicB|athieuCharacteristicExponent|athieuGroupM11|athieuGroupM12|athieuGroupM22|athieuGroupM23|athieuGroupM24|athieuS|athieuSPrime|atrices|atrixExp|atrixForm|atrixFunction|atrixLog|atrixNormalDistribution|atrixPlot|atrixPower|atrixPropertyDistribution|atrixQ|atrixRank|atrixTDistribution|ax|axDate|axDetect|axFilter|axLimit|axMemoryUsed|axStableDistribution|axValue|aximalBy|aximize|axwellDistribution|cLaughlinGroupMcL|ean|eanClusteringCoefficient|eanDegreeConnectivity|eanDeviation|eanFilter|eanGraphDistance|eanNeighborDegree|eanShift|eanShiftFilter|edian|edianDeviation|edianFilter|edicalTestData|eijerG|eijerGReduce|eixnerDistribution|ellinConvolve|ellinTransform|emberQ|emoryAvailable|emoryConstrained|emoryInUse|engerMesh|enuPacket|enuView|erge|ersennePrimeExponent|ersennePrimeExponentQ|eshCellCount|eshCellIndex|eshCells|eshConnectivityGraph|eshCoordinates|eshPrimitives|eshRegion|eshRegionQ|essage|essageDialog|essageList|essageName|essagePacket|essages|eteorShowerData|exicanHatWavelet|eyerWavelet|in|inDate|inDetect|inFilter|inLimit|inMax|inStableDistribution|inValue|ineralData|inimalBy|inimalPolynomial|inimalStateSpaceModel|inimize|inimumTimeIncrement|inkowskiQuestionMark|inorPlanetData|inors|inus|inusPlus|issing|issingQ|ittagLefflerE|ixedFractionParts|ixedGraphQ|ixedMagnitude|ixedRadix|ixedRadixQuantity|ixedUnit|ixtureDistribution|od|odelPredictiveController|odularInverse|odularLambda|odule|oebiusMu|oment|omentConvert|omentEvaluate|omentGeneratingFunction|omentOfInertia|onitor|onomialList|onsterGroupM|oonPhase|oonPosition|orletWavelet|orphologicalBinarize|orphologicalBranchPoints|orphologicalComponents|orphologicalEulerNumber|orphologicalGraph|orphologicalPerimeter|orphologicalTransform|ortalityData|ost|ountainData|ouseAnnotation|ouseAppearance|ousePosition|ouseover|ovieData|ovingAverage|ovingMap|ovingMedian|oyalDistribution|ulticolumn|ultigraphQ|ultinomial|ultinomialDistribution|ultinormalDistribution|ultiplicativeOrder|ultiplySides|ultivariateHypergeometricDistribution|ultivariatePoissonDistribution|ultivariateTDistribution))(?![`$[:alnum:]])",
+          "match": "System`M(?:AProcess|achineNumberQ|agnify|ailReceiverFunction|ajority|akeBoxes|akeExpression|anagedLibraryExpressionID|anagedLibraryExpressionQ|andelbrotSetBoettcher|andelbrotSetDistance|andelbrotSetIterationCount|andelbrotSetMemberQ|andelbrotSetPlot|angoldtLambda|anhattanDistance|anipulate|anipulator|annWhitneyTest|annedSpaceMissionData|antissaExponent|ap|apAll|apApply|apAt|apIndexed|apThread|archenkoPasturDistribution|arcumQ|ardiaCombinedTest|ardiaKurtosisTest|ardiaSkewnessTest|arginalDistribution|arkovProcessProperties|assConcentrationCondition|assFluxValue|assImpermeableBoundaryValue|assOutflowValue|assSymmetryValue|assTransferValue|assTransportPDEComponent|atchQ|atchingDissimilarity|aterialShading|athMLForm|athematicalFunctionData|athieuC|athieuCPrime|athieuCharacteristicA|athieuCharacteristicB|athieuCharacteristicExponent|athieuGroupM11|athieuGroupM12|athieuGroupM22|athieuGroupM23|athieuGroupM24|athieuS|athieuSPrime|atrices|atrixExp|atrixForm|atrixFunction|atrixLog|atrixNormalDistribution|atrixPlot|atrixPower|atrixPropertyDistribution|atrixQ|atrixRank|atrixTDistribution|ax|axDate|axDetect|axFilter|axLimit|axMemoryUsed|axStableDistribution|axValue|aximalBy|aximize|axwellDistribution|cLaughlinGroupMcL|ean|eanClusteringCoefficient|eanDegreeConnectivity|eanDeviation|eanFilter|eanGraphDistance|eanNeighborDegree|eanShift|eanShiftFilter|edian|edianDeviation|edianFilter|edicalTestData|eijerG|eijerGReduce|eixnerDistribution|ellinConvolve|ellinTransform|emberQ|emoryAvailable|emoryConstrained|emoryInUse|engerMesh|enuPacket|enuView|erge|ersennePrimeExponent|ersennePrimeExponentQ|eshCellCount|eshCellIndex|eshCells|eshConnectivityGraph|eshCoordinates|eshPrimitives|eshRegion|eshRegionQ|essage|essageDialog|essageList|essageName|essagePacket|essages|eteorShowerData|exicanHatWavelet|eyerWavelet|in|inDate|inDetect|inFilter|inLimit|inMax|inStableDistribution|inValue|ineralData|inimalBy|inimalPolynomial|inimalStateSpaceModel|inimize|inimumTimeIncrement|inkowskiQuestionMark|inorPlanetData|inors|inus|inusPlus|issing|issingQ|ittagLefflerE|ixedFractionParts|ixedGraphQ|ixedMagnitude|ixedRadix|ixedRadixQuantity|ixedUnit|ixtureDistribution|od|odelPredictiveController|odularInverse|odularLambda|odule|oebiusMu|oment|omentConvert|omentEvaluate|omentGeneratingFunction|omentOfInertia|onitor|onomialList|onsterGroupM|oonPhase|oonPosition|orletWavelet|orphologicalBinarize|orphologicalBranchPoints|orphologicalComponents|orphologicalEulerNumber|orphologicalGraph|orphologicalPerimeter|orphologicalTransform|ortalityData|ost|ountainData|ouseAnnotation|ouseAppearance|ousePosition|ouseover|ovieData|ovingAverage|ovingMap|ovingMedian|oyalDistribution|ulticolumn|ultigraphQ|ultinomial|ultinomialDistribution|ultinormalDistribution|ultiplicativeOrder|ultiplySides|ultivariateHypergeometricDistribution|ultivariatePoissonDistribution|ultivariateTDistribution)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:N(?:|ArgMax|ArgMin|Cache|CaputoD|DEigensystem|DEigenvalues|DSolve|DSolveValue|Expectation|FractionalD|Integrate|MaxValue|Maximize|MinValue|Minimize|Probability|Product|Roots|Solve|SolveValues|Sum|akagamiDistribution|ameQ|ames|and|earest|earestFunction|earestMeshCells|earestNeighborGraph|earestTo|ebulaData|eedlemanWunschSimilarity|eeds|egative|egativeBinomialDistribution|egativeDefiniteMatrixQ|egativeMultinomialDistribution|egativeSemidefiniteMatrixQ|egativelyOrientedPoints|eighborhoodData|eighborhoodGraph|est|estGraph|estList|estWhile|estWhileList|estedGreaterGreater|estedLessLess|eumannValue|evilleThetaC|evilleThetaD|evilleThetaN|evilleThetaS|extCell|extDate|extPrime|icholsPlot|ightHemisphere|onCommutativeMultiply|onNegative|onPositive|oncentralBetaDistribution|oncentralChiSquareDistribution|oncentralFRatioDistribution|oncentralStudentTDistribution|ondimensionalizationTransform|oneTrue|onlinearModelFit|onlinearStateSpaceModel|onlocalMeansFilter|or|orlundB|orm|ormal|ormalDistribution|ormalMatrixQ|ormalize|ormalizedSquaredEuclideanDistance|ot|otCongruent|otCupCap|otDoubleVerticalBar|otElement|otEqualTilde|otExists|otGreater|otGreaterEqual|otGreaterFullEqual|otGreaterGreater|otGreaterLess|otGreaterSlantEqual|otGreaterTilde|otHumpDownHump|otHumpEqual|otLeftTriangle|otLeftTriangleBar|otLeftTriangleEqual|otLess|otLessEqual|otLessFullEqual|otLessGreater|otLessLess|otLessSlantEqual|otLessTilde|otNestedGreaterGreater|otNestedLessLess|otPrecedes|otPrecedesEqual|otPrecedesSlantEqual|otPrecedesTilde|otReverseElement|otRightTriangle|otRightTriangleBar|otRightTriangleEqual|otSquareSubset|otSquareSubsetEqual|otSquareSuperset|otSquareSupersetEqual|otSubset|otSubsetEqual|otSucceeds|otSucceedsEqual|otSucceedsSlantEqual|otSucceedsTilde|otSuperset|otSupersetEqual|otTilde|otTildeEqual|otTildeFullEqual|otTildeTilde|otVerticalBar|otebook|otebookApply|otebookClose|otebookDelete|otebookDirectory|otebookEvaluate|otebookFileName|otebookFind|otebookGet|otebookImport|otebookInformation|otebookLocate|otebookObject|otebookOpen|otebookPrint|otebookPut|otebookRead|otebookSave|otebookSelection|otebookTemplate|otebookWrite|otebooks|othing|uclearExplosionData|uclearReactorData|ullSpace|umberCompose|umberDecompose|umberDigit|umberExpand|umberFieldClassNumber|umberFieldDiscriminant|umberFieldFundamentalUnits|umberFieldIntegralBasis|umberFieldNormRepresentatives|umberFieldRegulator|umberFieldRootsOfUnity|umberFieldSignature|umberForm|umberLinePlot|umberQ|umerator|umeratorDenominator|umericQ|umericalOrder|umericalSort|uttallWindow|yquistPlot))(?![`$[:alnum:]])",
+          "match": "System`N(?:|ArgMax|ArgMin|Cache|CaputoD|DEigensystem|DEigenvalues|DSolve|DSolveValue|Expectation|FractionalD|Integrate|MaxValue|Maximize|MinValue|Minimize|Probability|Product|Roots|Solve|SolveValues|Sum|akagamiDistribution|ameQ|ames|and|earest|earestFunction|earestMeshCells|earestNeighborGraph|earestTo|ebulaData|eedlemanWunschSimilarity|eeds|egative|egativeBinomialDistribution|egativeDefiniteMatrixQ|egativeMultinomialDistribution|egativeSemidefiniteMatrixQ|egativelyOrientedPoints|eighborhoodData|eighborhoodGraph|est|estGraph|estList|estWhile|estWhileList|estedGreaterGreater|estedLessLess|eumannValue|evilleThetaC|evilleThetaD|evilleThetaN|evilleThetaS|extCell|extDate|extPrime|icholsPlot|ightHemisphere|onCommutativeMultiply|onNegative|onPositive|oncentralBetaDistribution|oncentralChiSquareDistribution|oncentralFRatioDistribution|oncentralStudentTDistribution|ondimensionalizationTransform|oneTrue|onlinearModelFit|onlinearStateSpaceModel|onlocalMeansFilter|or|orlundB|orm|ormal|ormalDistribution|ormalMatrixQ|ormalize|ormalizedSquaredEuclideanDistance|ot|otCongruent|otCupCap|otDoubleVerticalBar|otElement|otEqualTilde|otExists|otGreater|otGreaterEqual|otGreaterFullEqual|otGreaterGreater|otGreaterLess|otGreaterSlantEqual|otGreaterTilde|otHumpDownHump|otHumpEqual|otLeftTriangle|otLeftTriangleBar|otLeftTriangleEqual|otLess|otLessEqual|otLessFullEqual|otLessGreater|otLessLess|otLessSlantEqual|otLessTilde|otNestedGreaterGreater|otNestedLessLess|otPrecedes|otPrecedesEqual|otPrecedesSlantEqual|otPrecedesTilde|otReverseElement|otRightTriangle|otRightTriangleBar|otRightTriangleEqual|otSquareSubset|otSquareSubsetEqual|otSquareSuperset|otSquareSupersetEqual|otSubset|otSubsetEqual|otSucceeds|otSucceedsEqual|otSucceedsSlantEqual|otSucceedsTilde|otSuperset|otSupersetEqual|otTilde|otTildeEqual|otTildeFullEqual|otTildeTilde|otVerticalBar|otebook|otebookApply|otebookClose|otebookDelete|otebookDirectory|otebookEvaluate|otebookFileName|otebookFind|otebookGet|otebookImport|otebookInformation|otebookLocate|otebookObject|otebookOpen|otebookPrint|otebookPut|otebookRead|otebookSave|otebookSelection|otebookTemplate|otebookWrite|otebooks|othing|uclearExplosionData|uclearReactorData|ullSpace|umberCompose|umberDecompose|umberDigit|umberExpand|umberFieldClassNumber|umberFieldDiscriminant|umberFieldFundamentalUnits|umberFieldIntegralBasis|umberFieldNormRepresentatives|umberFieldRegulator|umberFieldRootsOfUnity|umberFieldSignature|umberForm|umberLinePlot|umberQ|umerator|umeratorDenominator|umericQ|umericalOrder|umericalSort|uttallWindow|yquistPlot)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:O(?:|NanGroupON|bservabilityGramian|bservabilityMatrix|bservableDecomposition|bservableModelQ|ceanData|ctahedron|ddQ|ff|ffset|n|nce|pacity|penAppend|penRead|penWrite|pener|penerView|pening|perate|ptimumFlowData|ptionValue|ptional|ptionalElement|ptions|ptionsPattern|r|rder|rderDistribution|rderedQ|rdering|rderingBy|rderlessPatternSequence|rnsteinUhlenbeckProcess|rthogonalMatrixQ|rthogonalize|uter|uterPolygon|uterPolyhedron|utputControllabilityMatrix|utputControllableModelQ|utputForm|utputNamePacket|utputResponse|utputStream|verBar|verDot|verHat|verTilde|verVector|verflow|verlay|verscript|verscriptBox|wenT|wnValues))(?![`$[:alnum:]])",
+          "match": "System`O(?:|NanGroupON|bservabilityGramian|bservabilityMatrix|bservableDecomposition|bservableModelQ|ceanData|ctahedron|ddQ|ff|ffset|n|nce|pacity|penAppend|penRead|penWrite|pener|penerView|pening|perate|ptimumFlowData|ptionValue|ptional|ptionalElement|ptions|ptionsPattern|r|rder|rderDistribution|rderedQ|rdering|rderingBy|rderlessPatternSequence|rnsteinUhlenbeckProcess|rthogonalMatrixQ|rthogonalize|uter|uterPolygon|uterPolyhedron|utputControllabilityMatrix|utputControllableModelQ|utputForm|utputNamePacket|utputResponse|utputStream|verBar|verDot|verHat|verTilde|verVector|verflow|verlay|verscript|verscriptBox|wenT|wnValues)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:P(?:DF|ERTDistribution|IDTune|acletDataRebuild|acletDirectoryLoad|acletDirectoryUnload|acletDisable|acletEnable|acletFind|acletFindRemote|acletInstall|acletInstallSubmit|acletNewerQ|acletObject|acletSiteObject|acletSiteRegister|acletSiteUnregister|acletSiteUpdate|acletSites|acletUninstall|adLeft|adRight|addedForm|adeApproximant|ageRankCentrality|airedBarChart|airedHistogram|airedSmoothHistogram|airedTTest|airedZTest|aletteNotebook|alindromeQ|ane|aneSelector|anel|arabolicCylinderD|arallelArray|arallelAxisPlot|arallelCombine|arallelDo|arallelEvaluate|arallelKernels|arallelMap|arallelNeeds|arallelProduct|arallelSubmit|arallelSum|arallelTable|arallelTry|arallelepiped|arallelize|arallelogram|arameterMixtureDistribution|arametricConvexOptimization|arametricFunction|arametricNDSolve|arametricNDSolveValue|arametricPlot|arametricPlot3D|arametricRegion|arentBox|arentCell|arentDirectory|arentNotebook|aretoDistribution|aretoPickandsDistribution|arkData|art|artOfSpeech|artialCorrelationFunction|articleAcceleratorData|articleData|artition|artitionsP|artitionsQ|arzenWindow|ascalDistribution|aste|asteButton|athGraph|athGraphQ|attern|atternSequence|atternTest|aulWavelet|auliMatrix|ause|eakDetect|eanoCurve|earsonChiSquareTest|earsonCorrelationTest|earsonDistribution|ercentForm|erfectNumber|erfectNumberQ|erimeter|eriodicBoundaryCondition|eriodogram|eriodogramArray|ermanent|ermissionsGroup|ermissionsGroupMemberQ|ermissionsGroups|ermissionsKey|ermissionsKeys|ermutationCycles|ermutationCyclesQ|ermutationGroup|ermutationLength|ermutationList|ermutationListQ|ermutationMatrix|ermutationMax|ermutationMin|ermutationOrder|ermutationPower|ermutationProduct|ermutationReplace|ermutationSupport|ermutations|ermute|eronaMalikFilter|ersonData|etersenGraph|haseMargins|hongShading|hysicalSystemData|ick|ieChart|ieChart3D|iecewise|iecewiseExpand|illaiTrace|illaiTraceTest|ingTime|ixelValue|ixelValuePositions|laced|laceholder|lanarAngle|lanarFaceList|lanarGraph|lanarGraphQ|lanckRadiationLaw|laneCurveData|lanetData|lanetaryMoonData|lantData|lay|lot|lot3D|luralize|lus|lusMinus|ochhammer|oint|ointFigureChart|ointLegend|ointLight|ointSize|oissonConsulDistribution|oissonDistribution|oissonPDEComponent|oissonProcess|oissonWindow|olarPlot|olyGamma|olyLog|olyaAeppliDistribution|olygon|olygonAngle|olygonCoordinates|olygonDecomposition|olygonalNumber|olyhedron|olyhedronAngle|olyhedronCoordinates|olyhedronData|olyhedronDecomposition|olyhedronGenus|olynomialExpressionQ|olynomialExtendedGCD|olynomialGCD|olynomialLCM|olynomialMod|olynomialQ|olynomialQuotient|olynomialQuotientRemainder|olynomialReduce|olynomialRemainder|olynomialSumOfSquaresList|opupMenu|opupView|opupWindow|osition|ositionIndex|ositionLargest|ositionSmallest|ositive|ositiveDefiniteMatrixQ|ositiveSemidefiniteMatrixQ|ositivelyOrientedPoints|ossibleZeroQ|ostfix|ower|owerDistribution|owerExpand|owerMod|owerModList|owerRange|owerSpectralDensity|owerSymmetricPolynomial|owersRepresentations|reDecrement|reIncrement|recedenceForm|recedes|recedesEqual|recedesSlantEqual|recedesTilde|recision|redict|redictorFunction|redictorMeasurements|redictorMeasurementsObject|reemptProtect|refix|repend|rependTo|reviousCell|reviousDate|riceGraphDistribution|rime|rimeNu|rimeOmega|rimePi|rimePowerQ|rimeQ|rimeZetaP|rimitivePolynomialQ|rimitiveRoot|rimitiveRootList|rincipalComponents|rintTemporary|rintableASCIIQ|rintout3D|rism|rivateKey|robability|robabilityDistribution|robabilityPlot|robabilityScalePlot|robitModelFit|rocessConnection|rocessInformation|rocessObject|rocessParameterAssumptions|rocessParameterQ|rocessStatus|rocesses|roduct|roductDistribution|roductLog|rogressIndicator|rojection|roportion|roportional|rotect|roteinData|runing|seudoInverse|sychrometricPropertyData|ublicKey|ulsarData|ut|utAppend|yramid))(?![`$[:alnum:]])",
+          "match": "System`P(?:DF|ERTDistribution|IDTune|acletDataRebuild|acletDirectoryLoad|acletDirectoryUnload|acletDisable|acletEnable|acletFind|acletFindRemote|acletInstall|acletInstallSubmit|acletNewerQ|acletObject|acletSiteObject|acletSiteRegister|acletSiteUnregister|acletSiteUpdate|acletSites|acletUninstall|adLeft|adRight|addedForm|adeApproximant|ageRankCentrality|airedBarChart|airedHistogram|airedSmoothHistogram|airedTTest|airedZTest|aletteNotebook|alindromeQ|ane|aneSelector|anel|arabolicCylinderD|arallelArray|arallelAxisPlot|arallelCombine|arallelDo|arallelEvaluate|arallelKernels|arallelMap|arallelNeeds|arallelProduct|arallelSubmit|arallelSum|arallelTable|arallelTry|arallelepiped|arallelize|arallelogram|arameterMixtureDistribution|arametricConvexOptimization|arametricFunction|arametricNDSolve|arametricNDSolveValue|arametricPlot|arametricPlot3D|arametricRegion|arentBox|arentCell|arentDirectory|arentNotebook|aretoDistribution|aretoPickandsDistribution|arkData|art|artOfSpeech|artialCorrelationFunction|articleAcceleratorData|articleData|artition|artitionsP|artitionsQ|arzenWindow|ascalDistribution|aste|asteButton|athGraph|athGraphQ|attern|atternSequence|atternTest|aulWavelet|auliMatrix|ause|eakDetect|eanoCurve|earsonChiSquareTest|earsonCorrelationTest|earsonDistribution|ercentForm|erfectNumber|erfectNumberQ|erimeter|eriodicBoundaryCondition|eriodogram|eriodogramArray|ermanent|ermissionsGroup|ermissionsGroupMemberQ|ermissionsGroups|ermissionsKey|ermissionsKeys|ermutationCycles|ermutationCyclesQ|ermutationGroup|ermutationLength|ermutationList|ermutationListQ|ermutationMatrix|ermutationMax|ermutationMin|ermutationOrder|ermutationPower|ermutationProduct|ermutationReplace|ermutationSupport|ermutations|ermute|eronaMalikFilter|ersonData|etersenGraph|haseMargins|hongShading|hysicalSystemData|ick|ieChart|ieChart3D|iecewise|iecewiseExpand|illaiTrace|illaiTraceTest|ingTime|ixelValue|ixelValuePositions|laced|laceholder|lanarAngle|lanarFaceList|lanarGraph|lanarGraphQ|lanckRadiationLaw|laneCurveData|lanetData|lanetaryMoonData|lantData|lay|lot|lot3D|luralize|lus|lusMinus|ochhammer|oint|ointFigureChart|ointLegend|ointLight|ointSize|oissonConsulDistribution|oissonDistribution|oissonPDEComponent|oissonProcess|oissonWindow|olarPlot|olyGamma|olyLog|olyaAeppliDistribution|olygon|olygonAngle|olygonCoordinates|olygonDecomposition|olygonalNumber|olyhedron|olyhedronAngle|olyhedronCoordinates|olyhedronData|olyhedronDecomposition|olyhedronGenus|olynomialExpressionQ|olynomialExtendedGCD|olynomialGCD|olynomialLCM|olynomialMod|olynomialQ|olynomialQuotient|olynomialQuotientRemainder|olynomialReduce|olynomialRemainder|olynomialSumOfSquaresList|opupMenu|opupView|opupWindow|osition|ositionIndex|ositionLargest|ositionSmallest|ositive|ositiveDefiniteMatrixQ|ositiveSemidefiniteMatrixQ|ositivelyOrientedPoints|ossibleZeroQ|ostfix|ower|owerDistribution|owerExpand|owerMod|owerModList|owerRange|owerSpectralDensity|owerSymmetricPolynomial|owersRepresentations|reDecrement|reIncrement|recedenceForm|recedes|recedesEqual|recedesSlantEqual|recedesTilde|recision|redict|redictorFunction|redictorMeasurements|redictorMeasurementsObject|reemptProtect|refix|repend|rependTo|reviousCell|reviousDate|riceGraphDistribution|rime|rimeNu|rimeOmega|rimePi|rimePowerQ|rimeQ|rimeZetaP|rimitivePolynomialQ|rimitiveRoot|rimitiveRootList|rincipalComponents|rintTemporary|rintableASCIIQ|rintout3D|rism|rivateKey|robability|robabilityDistribution|robabilityPlot|robabilityScalePlot|robitModelFit|rocessConnection|rocessInformation|rocessObject|rocessParameterAssumptions|rocessParameterQ|rocessStatus|rocesses|roduct|roductDistribution|roductLog|rogressIndicator|rojection|roportion|roportional|rotect|roteinData|runing|seudoInverse|sychrometricPropertyData|ublicKey|ulsarData|ut|utAppend|yramid)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:Q(?:Binomial|Factorial|Gamma|HypergeometricPFQ|Pochhammer|PolyGamma|RDecomposition|nDispersion|uadraticIrrationalQ|uadraticOptimization|uantile|uantilePlot|uantity|uantityArray|uantityDistribution|uantityForm|uantityMagnitude|uantityQ|uantityUnit|uantityVariable|uantityVariableCanonicalUnit|uantityVariableDimensions|uantityVariableIdentifier|uantityVariablePhysicalQuantity|uartileDeviation|uartileSkewness|uartiles|uery|ueueProperties|ueueingNetworkProcess|ueueingProcess|uiet|uietEcho|uotient|uotientRemainder))(?![`$[:alnum:]])",
+          "match": "System`Q(?:Binomial|Factorial|Gamma|HypergeometricPFQ|Pochhammer|PolyGamma|RDecomposition|nDispersion|uadraticIrrationalQ|uadraticOptimization|uantile|uantilePlot|uantity|uantityArray|uantityDistribution|uantityForm|uantityMagnitude|uantityQ|uantityUnit|uantityVariable|uantityVariableCanonicalUnit|uantityVariableDimensions|uantityVariableIdentifier|uantityVariablePhysicalQuantity|uartileDeviation|uartileSkewness|uartiles|uery|ueueProperties|ueueingNetworkProcess|ueueingProcess|uiet|uietEcho|uotient|uotientRemainder)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:R(?:GBColor|Solve|SolveValue|adialAxisPlot|adialGradientFilling|adialGradientImage|adialityCentrality|adicalBox|adioButton|adioButtonBar|adon|adonTransform|amanujanTau|amanujanTauL|amanujanTauTheta|amanujanTauZ|amp|andomChoice|andomColor|andomComplex|andomDate|andomEntity|andomFunction|andomGeneratorState|andomGeoPosition|andomGraph|andomImage|andomInteger|andomPermutation|andomPoint|andomPolygon|andomPolyhedron|andomPrime|andomReal|andomSample|andomTime|andomVariate|andomWalkProcess|andomWord|ange|angeFilter|ankedMax|ankedMin|arerProbability|aster|aster3D|asterize|ational|ationalExpressionQ|ationalize|atios|awBoxes|awData|ayleighDistribution|e|eIm|eImPlot|eactionPDETerm|ead|eadByteArray|eadLine|eadList|eadString|ealAbs|ealDigits|ealExponent|ealSign|eap|econstructionMesh|ectangle|ectangleChart|ectangleChart3D|ectangularRepeatingElement|ecurrenceFilter|ecurrenceTable|educe|efine|eflectionMatrix|eflectionTransform|efresh|egion|egionBinarize|egionBoundary|egionBounds|egionCentroid|egionCongruent|egionConvert|egionDifference|egionDilation|egionDimension|egionDisjoint|egionDistance|egionDistanceFunction|egionEmbeddingDimension|egionEqual|egionErosion|egionFit|egionImage|egionIntersection|egionMeasure|egionMember|egionMemberFunction|egionMoment|egionNearest|egionNearestFunction|egionPlot|egionPlot3D|egionProduct|egionQ|egionResize|egionSimilar|egionSymmetricDifference|egionUnion|egionWithin|egularExpression|egularPolygon|egularlySampledQ|elationGraph|eleaseHold|eliabilityDistribution|eliefImage|eliefPlot|emove|emoveAlphaChannel|emoveBackground|emoveDiacritics|emoveInputStreamMethod|emoveOutputStreamMethod|emoveUsers|enameDirectory|enameFile|enewalProcess|enkoChart|epairMesh|epeated|epeatedNull|epeatedTiming|epeatingElement|eplace|eplaceAll|eplaceAt|eplaceImageValue|eplaceList|eplacePart|eplacePixelValue|eplaceRepeated|esamplingAlgorithmData|escale|escalingTransform|esetDirectory|esidue|esidueSum|esolve|esourceData|esourceObject|esourceSearch|esponseForm|est|estricted|esultant|eturn|eturnExpressionPacket|eturnPacket|eturnTextPacket|everse|everseBiorthogonalSplineWavelet|everseElement|everseEquilibrium|everseGraph|everseSort|everseSortBy|everseUpEquilibrium|evolutionPlot3D|iccatiSolve|iceDistribution|idgeFilter|iemannR|iemannSiegelTheta|iemannSiegelZ|iemannXi|iffle|ightArrow|ightArrowBar|ightArrowLeftArrow|ightComposition|ightCosetRepresentative|ightDownTeeVector|ightDownVector|ightDownVectorBar|ightTee|ightTeeArrow|ightTeeVector|ightTriangle|ightTriangleBar|ightTriangleEqual|ightUpDownVector|ightUpTeeVector|ightUpVector|ightUpVectorBar|ightVector|ightVectorBar|iskAchievementImportance|iskReductionImportance|obustConvexOptimization|ogersTanimotoDissimilarity|ollPitchYawAngles|ollPitchYawMatrix|omanNumeral|oot|ootApproximant|ootIntervals|ootLocusPlot|ootMeanSquare|ootOfUnityQ|ootReduce|ootSum|oots|otate|otateLeft|otateRight|otationMatrix|otationTransform|ound|ow|owBox|owReduce|udinShapiro|udvalisGroupRu|ule|uleDelayed|ulePlot|un|unProcess|unThrough|ussellRaoDissimilarity))(?![`$[:alnum:]])",
+          "match": "System`R(?:GBColor|Solve|SolveValue|adialAxisPlot|adialGradientFilling|adialGradientImage|adialityCentrality|adicalBox|adioButton|adioButtonBar|adon|adonTransform|amanujanTau|amanujanTauL|amanujanTauTheta|amanujanTauZ|amp|andomChoice|andomColor|andomComplex|andomDate|andomEntity|andomFunction|andomGeneratorState|andomGeoPosition|andomGraph|andomImage|andomInteger|andomPermutation|andomPoint|andomPolygon|andomPolyhedron|andomPrime|andomReal|andomSample|andomTime|andomVariate|andomWalkProcess|andomWord|ange|angeFilter|ankedMax|ankedMin|arerProbability|aster|aster3D|asterize|ational|ationalExpressionQ|ationalize|atios|awBoxes|awData|ayleighDistribution|e|eIm|eImPlot|eactionPDETerm|ead|eadByteArray|eadLine|eadList|eadString|ealAbs|ealDigits|ealExponent|ealSign|eap|econstructionMesh|ectangle|ectangleChart|ectangleChart3D|ectangularRepeatingElement|ecurrenceFilter|ecurrenceTable|educe|efine|eflectionMatrix|eflectionTransform|efresh|egion|egionBinarize|egionBoundary|egionBounds|egionCentroid|egionCongruent|egionConvert|egionDifference|egionDilation|egionDimension|egionDisjoint|egionDistance|egionDistanceFunction|egionEmbeddingDimension|egionEqual|egionErosion|egionFit|egionImage|egionIntersection|egionMeasure|egionMember|egionMemberFunction|egionMoment|egionNearest|egionNearestFunction|egionPlot|egionPlot3D|egionProduct|egionQ|egionResize|egionSimilar|egionSymmetricDifference|egionUnion|egionWithin|egularExpression|egularPolygon|egularlySampledQ|elationGraph|eleaseHold|eliabilityDistribution|eliefImage|eliefPlot|emove|emoveAlphaChannel|emoveBackground|emoveDiacritics|emoveInputStreamMethod|emoveOutputStreamMethod|emoveUsers|enameDirectory|enameFile|enewalProcess|enkoChart|epairMesh|epeated|epeatedNull|epeatedTiming|epeatingElement|eplace|eplaceAll|eplaceAt|eplaceImageValue|eplaceList|eplacePart|eplacePixelValue|eplaceRepeated|esamplingAlgorithmData|escale|escalingTransform|esetDirectory|esidue|esidueSum|esolve|esourceData|esourceObject|esourceSearch|esponseForm|est|estricted|esultant|eturn|eturnExpressionPacket|eturnPacket|eturnTextPacket|everse|everseBiorthogonalSplineWavelet|everseElement|everseEquilibrium|everseGraph|everseSort|everseSortBy|everseUpEquilibrium|evolutionPlot3D|iccatiSolve|iceDistribution|idgeFilter|iemannR|iemannSiegelTheta|iemannSiegelZ|iemannXi|iffle|ightArrow|ightArrowBar|ightArrowLeftArrow|ightComposition|ightCosetRepresentative|ightDownTeeVector|ightDownVector|ightDownVectorBar|ightTee|ightTeeArrow|ightTeeVector|ightTriangle|ightTriangleBar|ightTriangleEqual|ightUpDownVector|ightUpTeeVector|ightUpVector|ightUpVectorBar|ightVector|ightVectorBar|iskAchievementImportance|iskReductionImportance|obustConvexOptimization|ogersTanimotoDissimilarity|ollPitchYawAngles|ollPitchYawMatrix|omanNumeral|oot|ootApproximant|ootIntervals|ootLocusPlot|ootMeanSquare|ootOfUnityQ|ootReduce|ootSum|oots|otate|otateLeft|otateRight|otationMatrix|otationTransform|ound|ow|owBox|owReduce|udinShapiro|udvalisGroupRu|ule|uleDelayed|ulePlot|un|unProcess|unThrough|ussellRaoDissimilarity)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:S(?:ARIMAProcess|ARMAProcess|ASTriangle|SSTriangle|ameAs|ameQ|ampledSoundFunction|ampledSoundList|atelliteData|atisfiabilityCount|atisfiabilityInstances|atisfiableQ|ave|avitzkyGolayMatrix|awtoothWave|cale|caled|calingMatrix|calingTransform|can|cheduledTask|churDecomposition|cientificForm|corerGi|corerGiPrime|corerHi|corerHiPrime|ec|ech|echDistribution|econdOrderConeOptimization|ectorChart|ectorChart3D|eedRandom|elect|electComponents|electFirst|electedCells|electedNotebook|electionCreateCell|electionEvaluate|electionEvaluateCreateCell|electionMove|emanticImport|emanticImportString|emanticInterpretation|emialgebraicComponentInstances|emidefiniteOptimization|endMail|endMessage|equence|equenceAlignment|equenceCases|equenceCount|equenceFold|equenceFoldList|equencePosition|equenceReplace|equenceSplit|eries|eriesCoefficient|eriesData|erviceConnect|erviceDisconnect|erviceExecute|erviceObject|essionSubmit|essionTime|et|etAccuracy|etAlphaChannel|etAttributes|etCloudDirectory|etCookies|etDelayed|etDirectory|etEnvironment|etFileDate|etOptions|etPermissions|etPrecision|etSelectedNotebook|etSharedFunction|etSharedVariable|etStreamPosition|etSystemOptions|etUsers|etter|etterBar|etting|hallow|hannonWavelet|hapiroWilkTest|hare|harpen|hearingMatrix|hearingTransform|hellRegion|henCastanMatrix|hiftRegisterSequence|hiftedGompertzDistribution|hort|hortDownArrow|hortLeftArrow|hortRightArrow|hortTimeFourier|hortTimeFourierData|hortUpArrow|hortest|hortestPathFunction|how|iderealTime|iegelTheta|iegelTukeyTest|ierpinskiCurve|ierpinskiMesh|ign|ignTest|ignature|ignedRankTest|ignedRegionDistance|impleGraph|impleGraphQ|implePolygonQ|implePolyhedronQ|implex|implify|in|inIntegral|inc|inghMaddalaDistribution|ingularValueDecomposition|ingularValueList|ingularValuePlot|inh|inhIntegral|ixJSymbol|keleton|keletonTransform|kellamDistribution|kewNormalDistribution|kewness|kip|liceContourPlot3D|liceDensityPlot3D|liceDistribution|liceVectorPlot3D|lideView|lider|lider2D|liderBox|lot|lotSequence|mallCircle|mithDecomposition|mithDelayCompensator|mithWatermanSimilarity|moothDensityHistogram|moothHistogram|moothHistogram3D|moothKernelDistribution|nDispersion|ocketConnect|ocketListen|ocketListener|ocketObject|ocketOpen|ocketReadMessage|ocketReadyQ|ocketWaitAll|ocketWaitNext|ockets|okalSneathDissimilarity|olarEclipse|olarSystemFeatureData|olarTime|olidAngle|olidData|olidRegionQ|olve|olveAlways|olveValues|ort|ortBy|ound|oundNote|ourcePDETerm|ow|paceCurveData|pacer|pan|parseArray|parseArrayQ|patialGraphDistribution|patialMedian|peak|pearmanRankTest|pearmanRho|peciesData|pectralLineData|pectrogram|pectrogramArray|pecularity|peechSynthesize|pellingCorrectionList|phere|pherePoints|phericalBesselJ|phericalBesselY|phericalHankelH1|phericalHankelH2|phericalHarmonicY|phericalPlot3D|phericalShell|pheroidalEigenvalue|pheroidalJoiningFactor|pheroidalPS|pheroidalPSPrime|pheroidalQS|pheroidalQSPrime|pheroidalRadialFactor|pheroidalS1|pheroidalS1Prime|pheroidalS2|pheroidalS2Prime|plicedDistribution|plit|plitBy|pokenString|potLight|qrt|qrtBox|quare|quareFreeQ|quareIntersection|quareMatrixQ|quareRepeatingElement|quareSubset|quareSubsetEqual|quareSuperset|quareSupersetEqual|quareUnion|quareWave|quaredEuclideanDistance|quaresR|tableDistribution|tack|tackBegin|tackComplete|tackInhibit|tackedDateListPlot|tackedListPlot|tadiumShape|tandardAtmosphereData|tandardDeviation|tandardDeviationFilter|tandardForm|tandardOceanData|tandardize|tandbyDistribution|tar|tarClusterData|tarData|tarGraph|tartProcess|tateFeedbackGains|tateOutputEstimator|tateResponse|tateSpaceModel|tateSpaceTransform|tateTransformationLinearize|tationaryDistribution|tationaryWaveletPacketTransform|tationaryWaveletTransform|tatusArea|tatusCentrality|tieltjesGamma|tippleShading|tirlingS1|tirlingS2|toppingPowerData|tratonovichProcess|treamDensityPlot|treamPlot|treamPlot3D|treamPosition|treams|tringCases|tringContainsQ|tringCount|tringDelete|tringDrop|tringEndsQ|tringExpression|tringExtract|tringForm|tringFormat|tringFormatQ|tringFreeQ|tringInsert|tringJoin|tringLength|tringMatchQ|tringPadLeft|tringPadRight|tringPart|tringPartition|tringPosition|tringQ|tringRepeat|tringReplace|tringReplaceList|tringReplacePart|tringReverse|tringRiffle|tringRotateLeft|tringRotateRight|tringSkeleton|tringSplit|tringStartsQ|tringTake|tringTakeDrop|tringTemplate|tringToByteArray|tringToStream|tringTrim|tripBoxes|tructuralImportance|truveH|truveL|tudentTDistribution|tyle|tyleBox|tyleData|ubMinus|ubPlus|ubStar|ubValues|ubdivide|ubfactorial|ubgraph|ubresultantPolynomialRemainders|ubresultantPolynomials|ubresultants|ubscript|ubscriptBox|ubsequences|ubset|ubsetEqual|ubsetMap|ubsetQ|ubsets|ubstitutionSystem|ubsuperscript|ubsuperscriptBox|ubtract|ubtractFrom|ubtractSides|ucceeds|ucceedsEqual|ucceedsSlantEqual|ucceedsTilde|uccess|uchThat|um|umConvergence|unPosition|unrise|unset|uperDagger|uperMinus|uperPlus|uperStar|upernovaData|uperscript|uperscriptBox|uperset|upersetEqual|urd|urfaceArea|urfaceData|urvivalDistribution|urvivalFunction|urvivalModel|urvivalModelFit|uzukiDistribution|uzukiGroupSuz|watchLegend|witch|ymbol|ymbolName|ymletWavelet|ymmetric|ymmetricGroup|ymmetricKey|ymmetricMatrixQ|ymmetricPolynomial|ymmetricReduction|ymmetrize|ymmetrizedArray|ymmetrizedArrayRules|ymmetrizedDependentComponents|ymmetrizedIndependentComponents|ymmetrizedReplacePart|ynonyms|yntaxInformation|yntaxLength|yntaxPacket|yntaxQ|ystemDialogInput|ystemInformation|ystemOpen|ystemOptions|ystemProcessData|ystemProcesses|ystemsConnectionsModel|ystemsModelControllerData|ystemsModelDelay|ystemsModelDelayApproximate|ystemsModelDelete|ystemsModelDimensions|ystemsModelExtract|ystemsModelFeedbackConnect|ystemsModelLinearity|ystemsModelMerge|ystemsModelOrder|ystemsModelParallelConnect|ystemsModelSeriesConnect|ystemsModelStateFeedbackConnect|ystemsModelVectorRelativeOrders))(?![`$[:alnum:]])",
+          "match": "System`S(?:ARIMAProcess|ARMAProcess|ASTriangle|SSTriangle|ameAs|ameQ|ampledSoundFunction|ampledSoundList|atelliteData|atisfiabilityCount|atisfiabilityInstances|atisfiableQ|ave|avitzkyGolayMatrix|awtoothWave|cale|caled|calingMatrix|calingTransform|can|cheduledTask|churDecomposition|cientificForm|corerGi|corerGiPrime|corerHi|corerHiPrime|ec|ech|echDistribution|econdOrderConeOptimization|ectorChart|ectorChart3D|eedRandom|elect|electComponents|electFirst|electedCells|electedNotebook|electionCreateCell|electionEvaluate|electionEvaluateCreateCell|electionMove|emanticImport|emanticImportString|emanticInterpretation|emialgebraicComponentInstances|emidefiniteOptimization|endMail|endMessage|equence|equenceAlignment|equenceCases|equenceCount|equenceFold|equenceFoldList|equencePosition|equenceReplace|equenceSplit|eries|eriesCoefficient|eriesData|erviceConnect|erviceDisconnect|erviceExecute|erviceObject|essionSubmit|essionTime|et|etAccuracy|etAlphaChannel|etAttributes|etCloudDirectory|etCookies|etDelayed|etDirectory|etEnvironment|etFileDate|etOptions|etPermissions|etPrecision|etSelectedNotebook|etSharedFunction|etSharedVariable|etStreamPosition|etSystemOptions|etUsers|etter|etterBar|etting|hallow|hannonWavelet|hapiroWilkTest|hare|harpen|hearingMatrix|hearingTransform|hellRegion|henCastanMatrix|hiftRegisterSequence|hiftedGompertzDistribution|hort|hortDownArrow|hortLeftArrow|hortRightArrow|hortTimeFourier|hortTimeFourierData|hortUpArrow|hortest|hortestPathFunction|how|iderealTime|iegelTheta|iegelTukeyTest|ierpinskiCurve|ierpinskiMesh|ign|ignTest|ignature|ignedRankTest|ignedRegionDistance|impleGraph|impleGraphQ|implePolygonQ|implePolyhedronQ|implex|implify|in|inIntegral|inc|inghMaddalaDistribution|ingularValueDecomposition|ingularValueList|ingularValuePlot|inh|inhIntegral|ixJSymbol|keleton|keletonTransform|kellamDistribution|kewNormalDistribution|kewness|kip|liceContourPlot3D|liceDensityPlot3D|liceDistribution|liceVectorPlot3D|lideView|lider|lider2D|liderBox|lot|lotSequence|mallCircle|mithDecomposition|mithDelayCompensator|mithWatermanSimilarity|moothDensityHistogram|moothHistogram|moothHistogram3D|moothKernelDistribution|nDispersion|ocketConnect|ocketListen|ocketListener|ocketObject|ocketOpen|ocketReadMessage|ocketReadyQ|ocketWaitAll|ocketWaitNext|ockets|okalSneathDissimilarity|olarEclipse|olarSystemFeatureData|olarTime|olidAngle|olidData|olidRegionQ|olve|olveAlways|olveValues|ort|ortBy|ound|oundNote|ourcePDETerm|ow|paceCurveData|pacer|pan|parseArray|parseArrayQ|patialGraphDistribution|patialMedian|peak|pearmanRankTest|pearmanRho|peciesData|pectralLineData|pectrogram|pectrogramArray|pecularity|peechSynthesize|pellingCorrectionList|phere|pherePoints|phericalBesselJ|phericalBesselY|phericalHankelH1|phericalHankelH2|phericalHarmonicY|phericalPlot3D|phericalShell|pheroidalEigenvalue|pheroidalJoiningFactor|pheroidalPS|pheroidalPSPrime|pheroidalQS|pheroidalQSPrime|pheroidalRadialFactor|pheroidalS1|pheroidalS1Prime|pheroidalS2|pheroidalS2Prime|plicedDistribution|plit|plitBy|pokenString|potLight|qrt|qrtBox|quare|quareFreeQ|quareIntersection|quareMatrixQ|quareRepeatingElement|quareSubset|quareSubsetEqual|quareSuperset|quareSupersetEqual|quareUnion|quareWave|quaredEuclideanDistance|quaresR|tableDistribution|tack|tackBegin|tackComplete|tackInhibit|tackedDateListPlot|tackedListPlot|tadiumShape|tandardAtmosphereData|tandardDeviation|tandardDeviationFilter|tandardForm|tandardOceanData|tandardize|tandbyDistribution|tar|tarClusterData|tarData|tarGraph|tartProcess|tateFeedbackGains|tateOutputEstimator|tateResponse|tateSpaceModel|tateSpaceTransform|tateTransformationLinearize|tationaryDistribution|tationaryWaveletPacketTransform|tationaryWaveletTransform|tatusArea|tatusCentrality|tieltjesGamma|tippleShading|tirlingS1|tirlingS2|toppingPowerData|tratonovichProcess|treamDensityPlot|treamPlot|treamPlot3D|treamPosition|treams|tringCases|tringContainsQ|tringCount|tringDelete|tringDrop|tringEndsQ|tringExpression|tringExtract|tringForm|tringFormat|tringFormatQ|tringFreeQ|tringInsert|tringJoin|tringLength|tringMatchQ|tringPadLeft|tringPadRight|tringPart|tringPartition|tringPosition|tringQ|tringRepeat|tringReplace|tringReplaceList|tringReplacePart|tringReverse|tringRiffle|tringRotateLeft|tringRotateRight|tringSkeleton|tringSplit|tringStartsQ|tringTake|tringTakeDrop|tringTemplate|tringToByteArray|tringToStream|tringTrim|tripBoxes|tructuralImportance|truveH|truveL|tudentTDistribution|tyle|tyleBox|tyleData|ubMinus|ubPlus|ubStar|ubValues|ubdivide|ubfactorial|ubgraph|ubresultantPolynomialRemainders|ubresultantPolynomials|ubresultants|ubscript|ubscriptBox|ubsequences|ubset|ubsetEqual|ubsetMap|ubsetQ|ubsets|ubstitutionSystem|ubsuperscript|ubsuperscriptBox|ubtract|ubtractFrom|ubtractSides|ucceeds|ucceedsEqual|ucceedsSlantEqual|ucceedsTilde|uccess|uchThat|um|umConvergence|unPosition|unrise|unset|uperDagger|uperMinus|uperPlus|uperStar|upernovaData|uperscript|uperscriptBox|uperset|upersetEqual|urd|urfaceArea|urfaceData|urvivalDistribution|urvivalFunction|urvivalModel|urvivalModelFit|uzukiDistribution|uzukiGroupSuz|watchLegend|witch|ymbol|ymbolName|ymletWavelet|ymmetric|ymmetricGroup|ymmetricKey|ymmetricMatrixQ|ymmetricPolynomial|ymmetricReduction|ymmetrize|ymmetrizedArray|ymmetrizedArrayRules|ymmetrizedDependentComponents|ymmetrizedIndependentComponents|ymmetrizedReplacePart|ynonyms|yntaxInformation|yntaxLength|yntaxPacket|yntaxQ|ystemDialogInput|ystemInformation|ystemOpen|ystemOptions|ystemProcessData|ystemProcesses|ystemsConnectionsModel|ystemsModelControllerData|ystemsModelDelay|ystemsModelDelayApproximate|ystemsModelDelete|ystemsModelDimensions|ystemsModelExtract|ystemsModelFeedbackConnect|ystemsModelLinearity|ystemsModelMerge|ystemsModelOrder|ystemsModelParallelConnect|ystemsModelSeriesConnect|ystemsModelStateFeedbackConnect|ystemsModelVectorRelativeOrders)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:T(?:Test|abView|able|ableForm|agBox|agSet|agSetDelayed|agUnset|ake|akeDrop|akeLargest|akeLargestBy|akeList|akeSmallest|akeSmallestBy|akeWhile|ally|an|anh|askAbort|askExecute|askObject|askRemove|askResume|askSuspend|askWait|asks|autologyQ|eXForm|elegraphProcess|emplateApply|emplateBox|emplateExpression|emplateIf|emplateObject|emplateSequence|emplateSlot|emplateWith|emporalData|ensorContract|ensorDimensions|ensorExpand|ensorProduct|ensorRank|ensorReduce|ensorSymmetry|ensorTranspose|ensorWedge|erminatedEvaluation|estReport|estReportObject|estResultObject|etrahedron|ext|extCell|extData|extGrid|extPacket|extRecognize|extSentences|extString|extTranslation|extWords|exture|herefore|hermodynamicData|hermometerGauge|hickness|hinning|hompsonGroupTh|hread|hreeJSymbol|hreshold|hrough|hrow|hueMorse|humbnail|ideData|ilde|ildeEqual|ildeFullEqual|ildeTilde|imeConstrained|imeObject|imeObjectQ|imeRemaining|imeSeries|imeSeriesAggregate|imeSeriesForecast|imeSeriesInsert|imeSeriesInvertibility|imeSeriesMap|imeSeriesMapThread|imeSeriesModel|imeSeriesModelFit|imeSeriesResample|imeSeriesRescale|imeSeriesShift|imeSeriesThread|imeSeriesWindow|imeSystemConvert|imeUsed|imeValue|imeZoneConvert|imeZoneOffset|imelinePlot|imes|imesBy|iming|itsGroupT|oBoxes|oCharacterCode|oContinuousTimeModel|oDiscreteTimeModel|oEntity|oExpression|oInvertibleTimeSeries|oLowerCase|oNumberField|oPolarCoordinates|oRadicals|oRules|oSphericalCoordinates|oString|oUpperCase|oeplitzMatrix|ogether|oggler|ogglerBar|ooltip|oonShading|opHatTransform|opologicalSort|orus|orusGraph|otal|otalVariationFilter|ouchPosition|r|race|raceDialog|racePrint|raceScan|racyWidomDistribution|radingChart|raditionalForm|ransferFunctionCancel|ransferFunctionExpand|ransferFunctionFactor|ransferFunctionModel|ransferFunctionPoles|ransferFunctionTransform|ransferFunctionZeros|ransformationFunction|ransformationMatrix|ransformedDistribution|ransformedField|ransformedProcess|ransformedRegion|ransitiveClosureGraph|ransitiveReductionGraph|ranslate|ranslationTransform|ransliterate|ranspose|ravelDirections|ravelDirectionsData|ravelDistance|ravelDistanceList|ravelTime|reeForm|reeGraph|reeGraphQ|reePlot|riangle|riangleWave|riangularDistribution|riangulateMesh|rigExpand|rigFactor|rigFactorList|rigReduce|rigToExp|rigger|rimmedMean|rimmedVariance|ropicalStormData|rueQ|runcatedDistribution|runcatedPolyhedron|sallisQExponentialDistribution|sallisQGaussianDistribution|ube|ukeyLambdaDistribution|ukeyWindow|unnelData|uples|uranGraph|uringMachine|uttePolynomial|woWayRule|ypeHint))(?![`$[:alnum:]])",
+          "match": "System`T(?:Test|abView|able|ableForm|agBox|agSet|agSetDelayed|agUnset|ake|akeDrop|akeLargest|akeLargestBy|akeList|akeSmallest|akeSmallestBy|akeWhile|ally|an|anh|askAbort|askExecute|askObject|askRemove|askResume|askSuspend|askWait|asks|autologyQ|eXForm|elegraphProcess|emplateApply|emplateBox|emplateExpression|emplateIf|emplateObject|emplateSequence|emplateSlot|emplateWith|emporalData|ensorContract|ensorDimensions|ensorExpand|ensorProduct|ensorRank|ensorReduce|ensorSymmetry|ensorTranspose|ensorWedge|erminatedEvaluation|estReport|estReportObject|estResultObject|etrahedron|ext|extCell|extData|extGrid|extPacket|extRecognize|extSentences|extString|extTranslation|extWords|exture|herefore|hermodynamicData|hermometerGauge|hickness|hinning|hompsonGroupTh|hread|hreeJSymbol|hreshold|hrough|hrow|hueMorse|humbnail|ideData|ilde|ildeEqual|ildeFullEqual|ildeTilde|imeConstrained|imeObject|imeObjectQ|imeRemaining|imeSeries|imeSeriesAggregate|imeSeriesForecast|imeSeriesInsert|imeSeriesInvertibility|imeSeriesMap|imeSeriesMapThread|imeSeriesModel|imeSeriesModelFit|imeSeriesResample|imeSeriesRescale|imeSeriesShift|imeSeriesThread|imeSeriesWindow|imeSystemConvert|imeUsed|imeValue|imeZoneConvert|imeZoneOffset|imelinePlot|imes|imesBy|iming|itsGroupT|oBoxes|oCharacterCode|oContinuousTimeModel|oDiscreteTimeModel|oEntity|oExpression|oInvertibleTimeSeries|oLowerCase|oNumberField|oPolarCoordinates|oRadicals|oRules|oSphericalCoordinates|oString|oUpperCase|oeplitzMatrix|ogether|oggler|ogglerBar|ooltip|oonShading|opHatTransform|opologicalSort|orus|orusGraph|otal|otalVariationFilter|ouchPosition|r|race|raceDialog|racePrint|raceScan|racyWidomDistribution|radingChart|raditionalForm|ransferFunctionCancel|ransferFunctionExpand|ransferFunctionFactor|ransferFunctionModel|ransferFunctionPoles|ransferFunctionTransform|ransferFunctionZeros|ransformationFunction|ransformationMatrix|ransformedDistribution|ransformedField|ransformedProcess|ransformedRegion|ransitiveClosureGraph|ransitiveReductionGraph|ranslate|ranslationTransform|ransliterate|ranspose|ravelDirections|ravelDirectionsData|ravelDistance|ravelDistanceList|ravelTime|reeForm|reeGraph|reeGraphQ|reePlot|riangle|riangleWave|riangularDistribution|riangulateMesh|rigExpand|rigFactor|rigFactorList|rigReduce|rigToExp|rigger|rimmedMean|rimmedVariance|ropicalStormData|rueQ|runcatedDistribution|runcatedPolyhedron|sallisQExponentialDistribution|sallisQGaussianDistribution|ube|ukeyLambdaDistribution|ukeyWindow|unnelData|uples|uranGraph|uringMachine|uttePolynomial|woWayRule|ypeHint)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:U(?:RL|RLBuild|RLDecode|RLDispatcher|RLDownload|RLEncode|RLExecute|RLExpand|RLParse|RLQueryDecode|RLQueryEncode|RLRead|RLResponseTime|RLShorten|RLSubmit|nateQ|ncompress|nderBar|nderflow|nderoverscript|nderoverscriptBox|nderscript|nderscriptBox|nderseaFeatureData|ndirectedEdge|ndirectedGraph|ndirectedGraphQ|nequal|nequalTo|nevaluated|niformDistribution|niformGraphDistribution|niformPolyhedron|niformSumDistribution|ninstall|nion|nionPlus|nique|nitBox|nitConvert|nitDimensions|nitRootTest|nitSimplify|nitStep|nitTriangle|nitVector|nitaryMatrixQ|nitize|niverseModelData|niversityData|nixTime|nprotect|nsameQ|nset|nsetShared|ntil|pArrow|pArrowBar|pArrowDownArrow|pDownArrow|pEquilibrium|pSet|pSetDelayed|pTee|pTeeArrow|pTo|pValues|pdate|pperCaseQ|pperLeftArrow|pperRightArrow|pperTriangularMatrix|pperTriangularMatrixQ|pperTriangularize|psample|singFrontEnd))(?![`$[:alnum:]])",
+          "match": "System`U(?:RL|RLBuild|RLDecode|RLDispatcher|RLDownload|RLEncode|RLExecute|RLExpand|RLParse|RLQueryDecode|RLQueryEncode|RLRead|RLResponseTime|RLShorten|RLSubmit|nateQ|ncompress|nderBar|nderflow|nderoverscript|nderoverscriptBox|nderscript|nderscriptBox|nderseaFeatureData|ndirectedEdge|ndirectedGraph|ndirectedGraphQ|nequal|nequalTo|nevaluated|niformDistribution|niformGraphDistribution|niformPolyhedron|niformSumDistribution|ninstall|nion|nionPlus|nique|nitBox|nitConvert|nitDimensions|nitRootTest|nitSimplify|nitStep|nitTriangle|nitVector|nitaryMatrixQ|nitize|niverseModelData|niversityData|nixTime|nprotect|nsameQ|nset|nsetShared|ntil|pArrow|pArrowBar|pArrowDownArrow|pDownArrow|pEquilibrium|pSet|pSetDelayed|pTee|pTeeArrow|pTo|pValues|pdate|pperCaseQ|pperLeftArrow|pperRightArrow|pperTriangularMatrix|pperTriangularMatrixQ|pperTriangularize|psample|singFrontEnd)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:V(?:alueQ|alues|ariables|ariance|arianceEquivalenceTest|arianceGammaDistribution|arianceTest|ectorAngle|ectorDensityPlot|ectorDisplacementPlot|ectorDisplacementPlot3D|ectorGreater|ectorGreaterEqual|ectorLess|ectorLessEqual|ectorPlot|ectorPlot3D|ectorQ|ectors|ee|erbatim|erificationTest|ertexAdd|ertexChromaticNumber|ertexComponent|ertexConnectivity|ertexContract|ertexCorrelationSimilarity|ertexCosineSimilarity|ertexCount|ertexCoverQ|ertexDegree|ertexDelete|ertexDiceSimilarity|ertexEccentricity|ertexInComponent|ertexInComponentGraph|ertexInDegree|ertexIndex|ertexJaccardSimilarity|ertexList|ertexOutComponent|ertexOutComponentGraph|ertexOutDegree|ertexQ|ertexReplace|ertexTransitiveGraphQ|ertexWeightedGraphQ|erticalBar|erticalGauge|erticalSeparator|erticalSlider|erticalTilde|oiceStyleData|oigtDistribution|olcanoData|olume|onMisesDistribution|oronoiMesh))(?![`$[:alnum:]])",
+          "match": "System`V(?:alueQ|alues|ariables|ariance|arianceEquivalenceTest|arianceGammaDistribution|arianceTest|ectorAngle|ectorDensityPlot|ectorDisplacementPlot|ectorDisplacementPlot3D|ectorGreater|ectorGreaterEqual|ectorLess|ectorLessEqual|ectorPlot|ectorPlot3D|ectorQ|ectors|ee|erbatim|erificationTest|ertexAdd|ertexChromaticNumber|ertexComponent|ertexConnectivity|ertexContract|ertexCorrelationSimilarity|ertexCosineSimilarity|ertexCount|ertexCoverQ|ertexDegree|ertexDelete|ertexDiceSimilarity|ertexEccentricity|ertexInComponent|ertexInComponentGraph|ertexInDegree|ertexIndex|ertexJaccardSimilarity|ertexList|ertexOutComponent|ertexOutComponentGraph|ertexOutDegree|ertexQ|ertexReplace|ertexTransitiveGraphQ|ertexWeightedGraphQ|erticalBar|erticalGauge|erticalSeparator|erticalSlider|erticalTilde|oiceStyleData|oigtDistribution|olcanoData|olume|onMisesDistribution|oronoiMesh)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:W(?:aitAll|aitNext|akebyDistribution|alleniusHypergeometricDistribution|aringYuleDistribution|arpingCorrespondence|arpingDistance|atershedComponents|atsonUSquareTest|attsStrogatzGraphDistribution|avePDEComponent|aveletBestBasis|aveletFilterCoefficients|aveletImagePlot|aveletListPlot|aveletMapIndexed|aveletMatrixPlot|aveletPhi|aveletPsi|aveletScalogram|aveletThreshold|eakStationarity|eaklyConnectedComponents|eaklyConnectedGraphComponents|eaklyConnectedGraphQ|eatherData|eatherForecastData|eberE|edge|eibullDistribution|eierstrassE1|eierstrassE2|eierstrassE3|eierstrassEta1|eierstrassEta2|eierstrassEta3|eierstrassHalfPeriodW1|eierstrassHalfPeriodW2|eierstrassHalfPeriodW3|eierstrassHalfPeriods|eierstrassInvariantG2|eierstrassInvariantG3|eierstrassInvariants|eierstrassP|eierstrassPPrime|eierstrassSigma|eierstrassZeta|eightedAdjacencyGraph|eightedAdjacencyMatrix|eightedData|eightedGraphQ|elchWindow|heelGraph|henEvent|hich|hile|hiteNoiseProcess|hittakerM|hittakerW|ienerFilter|ienerProcess|ignerD|ignerSemicircleDistribution|ikipediaData|ilksW|ilksWTest|indDirectionData|indSpeedData|indVectorData|indingCount|indingPolygon|insorizedMean|insorizedVariance|ishartMatrixDistribution|ith|olframAlpha|olframLanguageData|ordCloud|ordCount|ordCounts|ordData|ordDefinition|ordFrequency|ordFrequencyData|ordList|ordStem|ordTranslation|rite|riteLine|riteString|ronskian))(?![`$[:alnum:]])",
+          "match": "System`W(?:aitAll|aitNext|akebyDistribution|alleniusHypergeometricDistribution|aringYuleDistribution|arpingCorrespondence|arpingDistance|atershedComponents|atsonUSquareTest|attsStrogatzGraphDistribution|avePDEComponent|aveletBestBasis|aveletFilterCoefficients|aveletImagePlot|aveletListPlot|aveletMapIndexed|aveletMatrixPlot|aveletPhi|aveletPsi|aveletScalogram|aveletThreshold|eakStationarity|eaklyConnectedComponents|eaklyConnectedGraphComponents|eaklyConnectedGraphQ|eatherData|eatherForecastData|eberE|edge|eibullDistribution|eierstrassE1|eierstrassE2|eierstrassE3|eierstrassEta1|eierstrassEta2|eierstrassEta3|eierstrassHalfPeriodW1|eierstrassHalfPeriodW2|eierstrassHalfPeriodW3|eierstrassHalfPeriods|eierstrassInvariantG2|eierstrassInvariantG3|eierstrassInvariants|eierstrassP|eierstrassPPrime|eierstrassSigma|eierstrassZeta|eightedAdjacencyGraph|eightedAdjacencyMatrix|eightedData|eightedGraphQ|elchWindow|heelGraph|henEvent|hich|hile|hiteNoiseProcess|hittakerM|hittakerW|ienerFilter|ienerProcess|ignerD|ignerSemicircleDistribution|ikipediaData|ilksW|ilksWTest|indDirectionData|indSpeedData|indVectorData|indingCount|indingPolygon|insorizedMean|insorizedVariance|ishartMatrixDistribution|ith|olframAlpha|olframLanguageData|ordCloud|ordCount|ordCounts|ordData|ordDefinition|ordFrequency|ordFrequencyData|ordList|ordStem|ordTranslation|rite|riteLine|riteString|ronskian)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:X(?:MLElement|MLObject|MLTemplate|YZColor|nor|or))(?![`$[:alnum:]])",
+          "match": "System`X(?:MLElement|MLObject|MLTemplate|YZColor|nor|or)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:Y(?:uleDissimilarity))(?![`$[:alnum:]])",
+          "match": "System`YuleDissimilarity(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:Z(?:IPCodeData|Test|Transform|ernikeR|eroSymmetric|eta|etaZero|ipfDistribution))(?![`$[:alnum:]])",
+          "match": "System`Z(?:IPCodeData|Test|Transform|ernikeR|eroSymmetric|eta|etaZero|ipfDistribution)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "System`(?:A(?:cceptanceThreshold|ccuracyGoal|ctiveStyle|ddOnHelpPath|djustmentBoxOptions|lignment|lignmentPoint|llowGroupClose|llowInlineCells|llowLooseGrammar|llowReverseGroupClose|llowScriptLevelChange|llowVersionUpdate|llowedCloudExtraParameters|llowedCloudParameterExtensions|llowedDimensions|llowedFrequencyRange|llowedHeads|lternativeHypothesis|ltitudeMethod|mbiguityFunction|natomySkinStyle|nchoredSearch|nimationDirection|nimationRate|nimationRepetitions|nimationRunTime|nimationRunning|nimationTimeIndex|nnotationRules|ntialiasing|ppearance|ppearanceElements|ppearanceRules|spectRatio|ssociationFormat|ssumptions|synchronous|ttachedCell|udioChannelAssignment|udioEncoding|udioInputDevice|udioLabel|udioOutputDevice|uthentication|utoAction|utoCopy|utoDelete|utoGeneratedPackage|utoIndent|utoItalicWords|utoMultiplicationSymbol|utoOpenNotebooks|utoOpenPalettes|utoOperatorRenderings|utoRemove|utoScroll|utoSpacing|utoloadPath|utorunSequencing|xes|xesEdge|xesLabel|xesOrigin|xesStyle))(?![`$[:alnum:]])",
+          "match": "System`A(?:cceptanceThreshold|ccuracyGoal|ctiveStyle|ddOnHelpPath|djustmentBoxOptions|lignment|lignmentPoint|llowGroupClose|llowInlineCells|llowLooseGrammar|llowReverseGroupClose|llowScriptLevelChange|llowVersionUpdate|llowedCloudExtraParameters|llowedCloudParameterExtensions|llowedDimensions|llowedFrequencyRange|llowedHeads|lternativeHypothesis|ltitudeMethod|mbiguityFunction|natomySkinStyle|nchoredSearch|nimationDirection|nimationRate|nimationRepetitions|nimationRunTime|nimationRunning|nimationTimeIndex|nnotationRules|ntialiasing|ppearance|ppearanceElements|ppearanceRules|spectRatio|ssociationFormat|ssumptions|synchronous|ttachedCell|udioChannelAssignment|udioEncoding|udioInputDevice|udioLabel|udioOutputDevice|uthentication|utoAction|utoCopy|utoDelete|utoGeneratedPackage|utoIndent|utoItalicWords|utoMultiplicationSymbol|utoOpenNotebooks|utoOpenPalettes|utoOperatorRenderings|utoRemove|utoScroll|utoSpacing|utoloadPath|utorunSequencing|xes|xesEdge|xesLabel|xesOrigin|xesStyle)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:B(?:ackground|arOrigin|arSpacing|aseStyle|aselinePosition|inaryFormat|ookmarks|ooleanStrings|oundaryStyle|oxBaselineShift|oxFormFormatTypes|oxFrame|oxMargins|oxRatios|oxStyle|oxed|ubbleScale|ubbleSizes|uttonBoxOptions|uttonData|uttonFunction|uttonMinHeight|uttonSource|yteOrdering))(?![`$[:alnum:]])",
+          "match": "System`B(?:ackground|arOrigin|arSpacing|aseStyle|aselinePosition|inaryFormat|ookmarks|ooleanStrings|oundaryStyle|oxBaselineShift|oxFormFormatTypes|oxFrame|oxMargins|oxRatios|oxStyle|oxed|ubbleScale|ubbleSizes|uttonBoxOptions|uttonData|uttonFunction|uttonMinHeight|uttonSource|yteOrdering)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:C(?:alendarType|alloutMarker|alloutStyle|aptureRunning|aseOrdering|elestialSystem|ellAutoOverwrite|ellBaseline|ellBracketOptions|ellChangeTimes|ellContext|ellDingbat|ellDingbatMargin|ellDynamicExpression|ellEditDuplicate|ellEpilog|ellEvaluationDuplicate|ellEvaluationFunction|ellEventActions|ellFrame|ellFrameColor|ellFrameLabelMargins|ellFrameLabels|ellFrameMargins|ellGrouping|ellGroupingRules|ellHorizontalScrolling|ellID|ellLabel|ellLabelAutoDelete|ellLabelMargins|ellLabelPositioning|ellLabelStyle|ellLabelTemplate|ellMargins|ellOpen|ellProlog|ellSize|ellTags|haracterEncoding|haracterEncodingsPath|hartBaseStyle|hartElementFunction|hartElements|hartLabels|hartLayout|hartLegends|hartStyle|lassPriors|lickToCopyEnabled|lipPlanes|lipPlanesStyle|lipRange|lippingStyle|losingAutoSave|loudBase|loudObjectNameFormat|loudObjectURLType|lusterDissimilarityFunction|odeAssistOptions|olorCoverage|olorFunction|olorFunctionBinning|olorFunctionScaling|olorRules|olorSelectorSettings|olorSpace|olumnAlignments|olumnLines|olumnSpacings|olumnWidths|olumnsEqual|ombinerFunction|ommonDefaultFormatTypes|ommunityBoundaryStyle|ommunityLabels|ommunityRegionStyle|ompilationOptions|ompilationTarget|ompiled|omplexityFunction|ompressionLevel|onfidenceLevel|onfidenceRange|onfidenceTransform|onfigurationPath|onstants|ontentPadding|ontentSelectable|ontentSize|ontinuousAction|ontourLabels|ontourShading|ontourStyle|ontours|ontrolPlacement|ontrolType|ontrollerLinking|ontrollerMethod|ontrollerPath|ontrolsRendering|onversionRules|ookieFunction|oordinatesToolOptions|opyFunction|opyable|ornerNeighbors|ounterAssignments|ounterFunction|ounterIncrements|ounterStyleMenuListing|ovarianceEstimatorFunction|reateCellID|reateIntermediateDirectories|riterionFunction|ubics|urveClosed))(?![`$[:alnum:]])",
+          "match": "System`C(?:alendarType|alloutMarker|alloutStyle|aptureRunning|aseOrdering|elestialSystem|ellAutoOverwrite|ellBaseline|ellBracketOptions|ellChangeTimes|ellContext|ellDingbat|ellDingbatMargin|ellDynamicExpression|ellEditDuplicate|ellEpilog|ellEvaluationDuplicate|ellEvaluationFunction|ellEventActions|ellFrame|ellFrameColor|ellFrameLabelMargins|ellFrameLabels|ellFrameMargins|ellGrouping|ellGroupingRules|ellHorizontalScrolling|ellID|ellLabel|ellLabelAutoDelete|ellLabelMargins|ellLabelPositioning|ellLabelStyle|ellLabelTemplate|ellMargins|ellOpen|ellProlog|ellSize|ellTags|haracterEncoding|haracterEncodingsPath|hartBaseStyle|hartElementFunction|hartElements|hartLabels|hartLayout|hartLegends|hartStyle|lassPriors|lickToCopyEnabled|lipPlanes|lipPlanesStyle|lipRange|lippingStyle|losingAutoSave|loudBase|loudObjectNameFormat|loudObjectURLType|lusterDissimilarityFunction|odeAssistOptions|olorCoverage|olorFunction|olorFunctionBinning|olorFunctionScaling|olorRules|olorSelectorSettings|olorSpace|olumnAlignments|olumnLines|olumnSpacings|olumnWidths|olumnsEqual|ombinerFunction|ommonDefaultFormatTypes|ommunityBoundaryStyle|ommunityLabels|ommunityRegionStyle|ompilationOptions|ompilationTarget|ompiled|omplexityFunction|ompressionLevel|onfidenceLevel|onfidenceRange|onfidenceTransform|onfigurationPath|onstants|ontentPadding|ontentSelectable|ontentSize|ontinuousAction|ontourLabels|ontourShading|ontourStyle|ontours|ontrolPlacement|ontrolType|ontrollerLinking|ontrollerMethod|ontrollerPath|ontrolsRendering|onversionRules|ookieFunction|oordinatesToolOptions|opyFunction|opyable|ornerNeighbors|ounterAssignments|ounterFunction|ounterIncrements|ounterStyleMenuListing|ovarianceEstimatorFunction|reateCellID|reateIntermediateDirectories|riterionFunction|ubics|urveClosed)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:D(?:ataRange|ataReversed|atasetTheme|ateFormat|ateFunction|ateGranularity|ateReduction|ateTicksFormat|ayCountConvention|efaultDuplicateCellStyle|efaultDuration|efaultElement|efaultFontProperties|efaultFormatType|efaultInlineFormatType|efaultNaturalLanguage|efaultNewCellStyle|efaultNewInlineCellStyle|efaultNotebook|efaultOptions|efaultPrintPrecision|efaultStyleDefinitions|einitialization|eletable|eleteContents|eletionWarning|elimiterAutoMatching|elimiterFlashTime|elimiterMatching|elimiters|eliveryFunction|ependentVariables|eployed|escriptorStateSpace|iacriticalPositioning|ialogProlog|ialogSymbols|igitBlock|irectedEdges|irection|iscreteVariables|ispersionEstimatorFunction|isplayAllSteps|isplayFunction|istanceFunction|istributedContexts|ithering|ividers|ockedCell|ockedCells|ynamicEvaluationTimeout|ynamicModuleValues|ynamicUpdating))(?![`$[:alnum:]])",
+          "match": "System`D(?:ataRange|ataReversed|atasetTheme|ateFormat|ateFunction|ateGranularity|ateReduction|ateTicksFormat|ayCountConvention|efaultDuplicateCellStyle|efaultDuration|efaultElement|efaultFontProperties|efaultFormatType|efaultInlineFormatType|efaultNaturalLanguage|efaultNewCellStyle|efaultNewInlineCellStyle|efaultNotebook|efaultOptions|efaultPrintPrecision|efaultStyleDefinitions|einitialization|eletable|eleteContents|eletionWarning|elimiterAutoMatching|elimiterFlashTime|elimiterMatching|elimiters|eliveryFunction|ependentVariables|eployed|escriptorStateSpace|iacriticalPositioning|ialogProlog|ialogSymbols|igitBlock|irectedEdges|irection|iscreteVariables|ispersionEstimatorFunction|isplayAllSteps|isplayFunction|istanceFunction|istributedContexts|ithering|ividers|ockedCell|ockedCells|ynamicEvaluationTimeout|ynamicModuleValues|ynamicUpdating)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:E(?:clipseType|dgeCapacity|dgeCost|dgeLabelStyle|dgeLabels|dgeShapeFunction|dgeStyle|dgeValueRange|dgeValueSizes|dgeWeight|ditCellTagsSettings|ditable|lidedForms|nabled|pilog|pilogFunction|scapeRadius|valuatable|valuationCompletionAction|valuationElements|valuationMonitor|valuator|valuatorNames|ventLabels|xcludePods|xcludedContexts|xcludedForms|xcludedLines|xcludedPhysicalQuantities|xclusions|xclusionsStyle|xponentFunction|xponentPosition|xponentStep|xponentialFamily|xportAutoReplacements|xpressionUUID|xtension|xtentElementFunction|xtentMarkers|xtentSize|xternalDataCharacterEncoding|xternalOptions|xternalTypeSignature))(?![`$[:alnum:]])",
+          "match": "System`E(?:clipseType|dgeCapacity|dgeCost|dgeLabelStyle|dgeLabels|dgeShapeFunction|dgeStyle|dgeValueRange|dgeValueSizes|dgeWeight|ditCellTagsSettings|ditable|lidedForms|nabled|pilog|pilogFunction|scapeRadius|valuatable|valuationCompletionAction|valuationElements|valuationMonitor|valuator|valuatorNames|ventLabels|xcludePods|xcludedContexts|xcludedForms|xcludedLines|xcludedPhysicalQuantities|xclusions|xclusionsStyle|xponentFunction|xponentPosition|xponentStep|xponentialFamily|xportAutoReplacements|xpressionUUID|xtension|xtentElementFunction|xtentMarkers|xtentSize|xternalDataCharacterEncoding|xternalOptions|xternalTypeSignature)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:F(?:aceGrids|aceGridsStyle|ailureAction|eatureNames|eatureTypes|eedbackSector|eedbackSectorStyle|eedbackType|ieldCompletionFunction|ieldHint|ieldHintStyle|ieldMasked|ieldSize|ileNameDialogSettings|ileNameForms|illing|illingStyle|indSettings|itRegularization|ollowRedirects|ontColor|ontFamily|ontSize|ontSlant|ontSubstitutions|ontTracking|ontVariations|ontWeight|orceVersionInstall|ormBoxOptions|ormLayoutFunction|ormProtectionMethod|ormatType|ormatTypeAutoConvert|ourierParameters|ractionBoxOptions|ractionLine|rame|rameBoxOptions|rameLabel|rameMargins|rameRate|rameStyle|rameTicks|rameTicksStyle|rontEndEventActions|unctionSpace))(?![`$[:alnum:]])",
+          "match": "System`F(?:aceGrids|aceGridsStyle|ailureAction|eatureNames|eatureTypes|eedbackSector|eedbackSectorStyle|eedbackType|ieldCompletionFunction|ieldHint|ieldHintStyle|ieldMasked|ieldSize|ileNameDialogSettings|ileNameForms|illing|illingStyle|indSettings|itRegularization|ollowRedirects|ontColor|ontFamily|ontSize|ontSlant|ontSubstitutions|ontTracking|ontVariations|ontWeight|orceVersionInstall|ormBoxOptions|ormLayoutFunction|ormProtectionMethod|ormatType|ormatTypeAutoConvert|ourierParameters|ractionBoxOptions|ractionLine|rame|rameBoxOptions|rameLabel|rameMargins|rameRate|rameStyle|rameTicks|rameTicksStyle|rontEndEventActions|unctionSpace)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:G(?:apPenalty|augeFaceElementFunction|augeFaceStyle|augeFrameElementFunction|augeFrameSize|augeFrameStyle|augeLabels|augeMarkers|augeStyle|aussianIntegers|enerateConditions|eneratedCell|eneratedDocumentBinding|eneratedParameters|eneratedQuantityMagnitudes|eneratorDescription|eneratorHistoryLength|eneratorOutputType|eoArraySize|eoBackground|eoCenter|eoGridLines|eoGridLinesStyle|eoGridRange|eoGridRangePadding|eoLabels|eoLocation|eoModel|eoProjection|eoRange|eoRangePadding|eoResolution|eoScaleBar|eoServer|eoStylingImageFunction|eoZoomLevel|radient|raphHighlight|raphHighlightStyle|raphLayerStyle|raphLayers|raphLayout|ridCreationSettings|ridDefaultElement|ridFrame|ridFrameMargins|ridLines|ridLinesStyle|roupActionBase|roupPageBreakWithin))(?![`$[:alnum:]])",
+          "match": "System`G(?:apPenalty|augeFaceElementFunction|augeFaceStyle|augeFrameElementFunction|augeFrameSize|augeFrameStyle|augeLabels|augeMarkers|augeStyle|aussianIntegers|enerateConditions|eneratedCell|eneratedDocumentBinding|eneratedParameters|eneratedQuantityMagnitudes|eneratorDescription|eneratorHistoryLength|eneratorOutputType|eoArraySize|eoBackground|eoCenter|eoGridLines|eoGridLinesStyle|eoGridRange|eoGridRangePadding|eoLabels|eoLocation|eoModel|eoProjection|eoRange|eoRangePadding|eoResolution|eoScaleBar|eoServer|eoStylingImageFunction|eoZoomLevel|radient|raphHighlight|raphHighlightStyle|raphLayerStyle|raphLayers|raphLayout|ridCreationSettings|ridDefaultElement|ridFrame|ridFrameMargins|ridLines|ridLinesStyle|roupActionBase|roupPageBreakWithin)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:H(?:eaderAlignment|eaderBackground|eaderDisplayFunction|eaderLines|eaderSize|eaderStyle|eads|elpBrowserSettings|iddenItems|olidayCalendar|yperlinkAction|yphenation))(?![`$[:alnum:]])",
+          "match": "System`H(?:eaderAlignment|eaderBackground|eaderDisplayFunction|eaderLines|eaderSize|eaderStyle|eads|elpBrowserSettings|iddenItems|olidayCalendar|yperlinkAction|yphenation)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:I(?:conRules|gnoreCase|gnoreDiacritics|gnorePunctuation|mageCaptureFunction|mageFormattingWidth|mageLabels|mageLegends|mageMargins|magePadding|magePreviewFunction|mageRegion|mageResolution|mageSize|mageSizeAction|mageSizeMultipliers|magingDevice|mportAutoReplacements|mportOptions|ncludeConstantBasis|ncludeDefinitions|ncludeDirectories|ncludeFileExtension|ncludeGeneratorTasks|ncludeInflections|ncludeMetaInformation|ncludePods|ncludeQuantities|ncludeSingularSolutions|ncludeWindowTimes|ncludedContexts|ndeterminateThreshold|nflationMethod|nheritScope|nitialSeeding|nitialization|nitializationCell|nitializationCellEvaluation|nitializationCellWarning|nputAliases|nputAssumptions|nputAutoReplacements|nsertResults|nsertionFunction|nteractive|nterleaving|nterpolationOrder|nterpolationPoints|nterpretationBoxOptions|nterpretationFunction|ntervalMarkers|ntervalMarkersStyle|nverseFunctions|temAspectRatio|temDisplayFunction|temSize|temStyle))(?![`$[:alnum:]])",
+          "match": "System`I(?:conRules|gnoreCase|gnoreDiacritics|gnorePunctuation|mageCaptureFunction|mageFormattingWidth|mageLabels|mageLegends|mageMargins|magePadding|magePreviewFunction|mageRegion|mageResolution|mageSize|mageSizeAction|mageSizeMultipliers|magingDevice|mportAutoReplacements|mportOptions|ncludeConstantBasis|ncludeDefinitions|ncludeDirectories|ncludeFileExtension|ncludeGeneratorTasks|ncludeInflections|ncludeMetaInformation|ncludePods|ncludeQuantities|ncludeSingularSolutions|ncludeWindowTimes|ncludedContexts|ndeterminateThreshold|nflationMethod|nheritScope|nitialSeeding|nitialization|nitializationCell|nitializationCellEvaluation|nitializationCellWarning|nputAliases|nputAssumptions|nputAutoReplacements|nsertResults|nsertionFunction|nteractive|nterleaving|nterpolationOrder|nterpolationPoints|nterpretationBoxOptions|nterpretationFunction|ntervalMarkers|ntervalMarkersStyle|nverseFunctions|temAspectRatio|temDisplayFunction|temSize|temStyle)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:J(?:oined))(?![`$[:alnum:]])",
+          "match": "System`Joined(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:K(?:eepExistingVersion|eyCollisionFunction|eypointStrength))(?![`$[:alnum:]])",
+          "match": "System`Ke(?:epExistingVersion|yCollisionFunction|ypointStrength)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:L(?:abelStyle|abelVisibility|abelingFunction|abelingSize|anguage|anguageCategory|ayerSizeFunction|eaderSize|earningRate|egendAppearance|egendFunction|egendLabel|egendLayout|egendMargins|egendMarkerSize|egendMarkers|ighting|ightingAngle|imitsPositioning|imitsPositioningTokens|ineBreakWithin|ineIndent|ineIndentMaxFraction|ineIntegralConvolutionScale|ineSpacing|inearOffsetFunction|inebreakAdjustments|inkFunction|inkProtocol|istFormat|istPickerBoxOptions|ocalizeVariables|ocatorAutoCreate|ocatorRegion|ooping))(?![`$[:alnum:]])",
+          "match": "System`L(?:abelStyle|abelVisibility|abelingFunction|abelingSize|anguage|anguageCategory|ayerSizeFunction|eaderSize|earningRate|egendAppearance|egendFunction|egendLabel|egendLayout|egendMargins|egendMarkerSize|egendMarkers|ighting|ightingAngle|imitsPositioning|imitsPositioningTokens|ineBreakWithin|ineIndent|ineIndentMaxFraction|ineIntegralConvolutionScale|ineSpacing|inearOffsetFunction|inebreakAdjustments|inkFunction|inkProtocol|istFormat|istPickerBoxOptions|ocalizeVariables|ocatorAutoCreate|ocatorRegion|ooping)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:M(?:agnification|ailAddressValidation|ailResponseFunction|ailSettings|asking|atchLocalNames|axCellMeasure|axColorDistance|axDuration|axExtraBandwidths|axExtraConditions|axFeatureDisplacement|axFeatures|axItems|axIterations|axMixtureKernels|axOverlapFraction|axPlotPoints|axRecursion|axStepFraction|axStepSize|axSteps|emoryConstraint|enuCommandKey|enuSortingValue|enuStyle|esh|eshCellHighlight|eshCellLabel|eshCellMarker|eshCellShapeFunction|eshCellStyle|eshFunctions|eshQualityGoal|eshRefinementFunction|eshShading|eshStyle|etaInformation|ethod|inColorDistance|inIntervalSize|inPointSeparation|issingBehavior|issingDataMethod|issingDataRules|issingString|issingStyle|odal|odulus|ultiaxisArrangement|ultiedgeStyle|ultilaunchWarning|ultilineFunction|ultiselection))(?![`$[:alnum:]])",
+          "match": "System`M(?:agnification|ailAddressValidation|ailResponseFunction|ailSettings|asking|atchLocalNames|axCellMeasure|axColorDistance|axDuration|axExtraBandwidths|axExtraConditions|axFeatureDisplacement|axFeatures|axItems|axIterations|axMixtureKernels|axOverlapFraction|axPlotPoints|axRecursion|axStepFraction|axStepSize|axSteps|emoryConstraint|enuCommandKey|enuSortingValue|enuStyle|esh|eshCellHighlight|eshCellLabel|eshCellMarker|eshCellShapeFunction|eshCellStyle|eshFunctions|eshQualityGoal|eshRefinementFunction|eshShading|eshStyle|etaInformation|ethod|inColorDistance|inIntervalSize|inPointSeparation|issingBehavior|issingDataMethod|issingDataRules|issingString|issingStyle|odal|odulus|ultiaxisArrangement|ultiedgeStyle|ultilaunchWarning|ultilineFunction|ultiselection)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:N(?:icholsGridLines|ominalVariables|onConstants|ormFunction|ormalized|ormalsFunction|otebookAutoSave|otebookBrowseDirectory|otebookConvertSettings|otebookDynamicExpression|otebookEventActions|otebookPath|otebooksMenu|otificationFunction|ullRecords|ullWords|umberFormat|umberMarks|umberMultiplier|umberPadding|umberPoint|umberSeparator|umberSigns|yquistGridLines))(?![`$[:alnum:]])",
+          "match": "System`N(?:icholsGridLines|ominalVariables|onConstants|ormFunction|ormalized|ormalsFunction|otebookAutoSave|otebookBrowseDirectory|otebookConvertSettings|otebookDynamicExpression|otebookEventActions|otebookPath|otebooksMenu|otificationFunction|ullRecords|ullWords|umberFormat|umberMarks|umberMultiplier|umberPadding|umberPoint|umberSeparator|umberSigns|yquistGridLines)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:O(?:pacityFunction|pacityFunctionScaling|peratingSystem|ptionInspectorSettings|utputAutoOverwrite|utputSizeLimit|verlaps|verscriptBoxOptions|verwriteTarget))(?![`$[:alnum:]])",
+          "match": "System`O(?:pacityFunction|pacityFunctionScaling|peratingSystem|ptionInspectorSettings|utputAutoOverwrite|utputSizeLimit|verlaps|verscriptBoxOptions|verwriteTarget)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:P(?:IDDerivativeFilter|IDFeedforward|acletSite|adding|addingSize|ageBreakAbove|ageBreakBelow|ageBreakWithin|ageFooterLines|ageFooters|ageHeaderLines|ageHeaders|ageTheme|ageWidth|alettePath|aneled|aragraphIndent|aragraphSpacing|arallelization|arameterEstimator|artBehavior|artitionGranularity|assEventsDown|assEventsUp|asteBoxFormInlineCells|ath|erformanceGoal|ermissions|haseRange|laceholderReplace|layRange|lotLabel|lotLabels|lotLayout|lotLegends|lotMarkers|lotPoints|lotRange|lotRangeClipping|lotRangePadding|lotRegion|lotStyle|lotTheme|odStates|odWidth|olarAxes|olarAxesOrigin|olarGridLines|olarTicks|oleZeroMarkers|recisionGoal|referencesPath|reprocessingRules|reserveColor|reserveImageOptions|rincipalValue|rintAction|rintPrecision|rintingCopies|rintingOptions|rintingPageRange|rintingStartingPageNumber|rintingStyleEnvironment|rintout3DPreviewer|rivateCellOptions|rivateEvaluationOptions|rivateFontOptions|rivateNotebookOptions|rivatePaths|rocessDirectory|rocessEnvironment|rocessEstimator|rogressReporting|rolog|ropagateAborts))(?![`$[:alnum:]])",
+          "match": "System`P(?:IDDerivativeFilter|IDFeedforward|acletSite|adding|addingSize|ageBreakAbove|ageBreakBelow|ageBreakWithin|ageFooterLines|ageFooters|ageHeaderLines|ageHeaders|ageTheme|ageWidth|alettePath|aneled|aragraphIndent|aragraphSpacing|arallelization|arameterEstimator|artBehavior|artitionGranularity|assEventsDown|assEventsUp|asteBoxFormInlineCells|ath|erformanceGoal|ermissions|haseRange|laceholderReplace|layRange|lotLabel|lotLabels|lotLayout|lotLegends|lotMarkers|lotPoints|lotRange|lotRangeClipping|lotRangePadding|lotRegion|lotStyle|lotTheme|odStates|odWidth|olarAxes|olarAxesOrigin|olarGridLines|olarTicks|oleZeroMarkers|recisionGoal|referencesPath|reprocessingRules|reserveColor|reserveImageOptions|rincipalValue|rintAction|rintPrecision|rintingCopies|rintingOptions|rintingPageRange|rintingStartingPageNumber|rintingStyleEnvironment|rintout3DPreviewer|rivateCellOptions|rivateEvaluationOptions|rivateFontOptions|rivateNotebookOptions|rivatePaths|rocessDirectory|rocessEnvironment|rocessEstimator|rogressReporting|rolog|ropagateAborts)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:Q(?:uartics))(?![`$[:alnum:]])",
+          "match": "System`Quartics(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:R(?:adicalBoxOptions|andomSeeding|asterSize|eImLabels|eImStyle|ealBlockDiagonalForm|ecognitionPrior|ecordLists|ecordSeparators|eferenceLineStyle|efreshRate|egionBoundaryStyle|egionFillingStyle|egionFunction|egionSize|egularization|enderingOptions|equiredPhysicalQuantities|esampling|esamplingMethod|esolveContextAliases|estartInterval|eturnReceiptFunction|evolutionAxis|otateLabel|otationAction|oundingRadius|owAlignments|owLines|owMinHeight|owSpacings|owsEqual|ulerUnits|untimeAttributes|untimeOptions))(?![`$[:alnum:]])",
+          "match": "System`R(?:adicalBoxOptions|andomSeeding|asterSize|eImLabels|eImStyle|ealBlockDiagonalForm|ecognitionPrior|ecordLists|ecordSeparators|eferenceLineStyle|efreshRate|egionBoundaryStyle|egionFillingStyle|egionFunction|egionSize|egularization|enderingOptions|equiredPhysicalQuantities|esampling|esamplingMethod|esolveContextAliases|estartInterval|eturnReceiptFunction|evolutionAxis|otateLabel|otationAction|oundingRadius|owAlignments|owLines|owMinHeight|owSpacings|owsEqual|ulerUnits|untimeAttributes|untimeOptions)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:S(?:ameTest|ampleDepth|ampleRate|amplingPeriod|aveConnection|aveDefinitions|aveable|caleDivisions|caleOrigin|calePadding|caleRangeStyle|caleRanges|calingFunctions|cientificNotationThreshold|creenStyleEnvironment|criptBaselineShifts|criptLevel|criptMinSize|criptSizeMultipliers|crollPosition|crollbars|crollingOptions|ectorOrigin|ectorSpacing|electable|elfLoopStyle|eriesTermGoal|haringList|howAutoSpellCheck|howAutoStyles|howCellBracket|howCellLabel|howCellTags|howClosedCellArea|howContents|howCursorTracker|howGroupOpener|howPageBreaks|howSelection|howShortBoxForm|howSpecialCharacters|howStringCharacters|hrinkingDelay|ignPadding|ignificanceLevel|imilarityRules|ingleLetterItalics|liderBoxOptions|ortedBy|oundVolume|pacings|panAdjustments|panCharacterRounding|panLineThickness|panMaxSize|panMinSize|panSymmetric|pecificityGoal|pellingCorrection|pellingDictionaries|pellingDictionariesPath|pellingOptions|phericalRegion|plineClosed|plineDegree|plineKnots|plineWeights|qrtBoxOptions|tabilityMargins|tabilityMarginsStyle|tandardized|tartingStepSize|tateSpaceRealization|tepMonitor|trataVariables|treamColorFunction|treamColorFunctionScaling|treamMarkers|treamPoints|treamScale|treamStyle|trictInequalities|tripOnInput|tripWrapperBoxes|tructuredSelection|tyleBoxAutoDelete|tyleDefinitions|tyleHints|tyleMenuListing|tyleNameDialogSettings|tyleSheetPath|ubscriptBoxOptions|ubsuperscriptBoxOptions|ubtitleEncoding|uperscriptBoxOptions|urdForm|ynchronousInitialization|ynchronousUpdating|yntaxForm|ystemHelpPath|ystemsModelLabels))(?![`$[:alnum:]])",
+          "match": "System`S(?:ameTest|ampleDepth|ampleRate|amplingPeriod|aveConnection|aveDefinitions|aveable|caleDivisions|caleOrigin|calePadding|caleRangeStyle|caleRanges|calingFunctions|cientificNotationThreshold|creenStyleEnvironment|criptBaselineShifts|criptLevel|criptMinSize|criptSizeMultipliers|crollPosition|crollbars|crollingOptions|ectorOrigin|ectorSpacing|electable|elfLoopStyle|eriesTermGoal|haringList|howAutoSpellCheck|howAutoStyles|howCellBracket|howCellLabel|howCellTags|howClosedCellArea|howContents|howCursorTracker|howGroupOpener|howPageBreaks|howSelection|howShortBoxForm|howSpecialCharacters|howStringCharacters|hrinkingDelay|ignPadding|ignificanceLevel|imilarityRules|ingleLetterItalics|liderBoxOptions|ortedBy|oundVolume|pacings|panAdjustments|panCharacterRounding|panLineThickness|panMaxSize|panMinSize|panSymmetric|pecificityGoal|pellingCorrection|pellingDictionaries|pellingDictionariesPath|pellingOptions|phericalRegion|plineClosed|plineDegree|plineKnots|plineWeights|qrtBoxOptions|tabilityMargins|tabilityMarginsStyle|tandardized|tartingStepSize|tateSpaceRealization|tepMonitor|trataVariables|treamColorFunction|treamColorFunctionScaling|treamMarkers|treamPoints|treamScale|treamStyle|trictInequalities|tripOnInput|tripWrapperBoxes|tructuredSelection|tyleBoxAutoDelete|tyleDefinitions|tyleHints|tyleMenuListing|tyleNameDialogSettings|tyleSheetPath|ubscriptBoxOptions|ubsuperscriptBoxOptions|ubtitleEncoding|uperscriptBoxOptions|urdForm|ynchronousInitialization|ynchronousUpdating|yntaxForm|ystemHelpPath|ystemsModelLabels)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:T(?:abFilling|abSpacings|ableAlignments|ableDepth|ableDirections|ableHeadings|ableSpacing|agBoxOptions|aggingRules|argetFunctions|argetUnits|emplateBoxOptions|emporalRegularity|estID|extAlignment|extClipboardType|extJustification|extureCoordinateFunction|extureCoordinateScaling|icks|icksStyle|imeConstraint|imeDirection|imeFormat|imeGoal|imeSystem|imeZone|okenWords|olerance|ooltipDelay|ooltipStyle|otalWidth|ouchscreenAutoZoom|ouchscreenControlPlacement|raceAbove|raceBackward|raceDepth|raceForward|raceOff|raceOn|raceOriginal|rackedSymbols|rackingFunction|raditionalFunctionNotation|ransformationClass|ransformationFunctions|ransitionDirection|ransitionDuration|ransitionEffect|ranslationOptions|ravelMethod|rendStyle|rig))(?![`$[:alnum:]])",
+          "match": "System`T(?:abFilling|abSpacings|ableAlignments|ableDepth|ableDirections|ableHeadings|ableSpacing|agBoxOptions|aggingRules|argetFunctions|argetUnits|emplateBoxOptions|emporalRegularity|estID|extAlignment|extClipboardType|extJustification|extureCoordinateFunction|extureCoordinateScaling|icks|icksStyle|imeConstraint|imeDirection|imeFormat|imeGoal|imeSystem|imeZone|okenWords|olerance|ooltipDelay|ooltipStyle|otalWidth|ouchscreenAutoZoom|ouchscreenControlPlacement|raceAbove|raceBackward|raceDepth|raceForward|raceOff|raceOn|raceOriginal|rackedSymbols|rackingFunction|raditionalFunctionNotation|ransformationClass|ransformationFunctions|ransitionDirection|ransitionDuration|ransitionEffect|ranslationOptions|ravelMethod|rendStyle|rig)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:U(?:nderoverscriptBoxOptions|nderscriptBoxOptions|ndoOptions|ndoTrackedVariables|nitSystem|nityDimensions|nsavedVariables|pdateInterval|pdatePacletSites|tilityFunction))(?![`$[:alnum:]])",
+          "match": "System`U(?:nderoverscriptBoxOptions|nderscriptBoxOptions|ndoOptions|ndoTrackedVariables|nitSystem|nityDimensions|nsavedVariables|pdateInterval|pdatePacletSites|tilityFunction)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:V(?:alidationLength|alidationSet|alueDimensions|arianceEstimatorFunction|ectorAspectRatio|ectorColorFunction|ectorColorFunctionScaling|ectorMarkers|ectorPoints|ectorRange|ectorScaling|ectorSizes|ectorStyle|erifyConvergence|erifySecurityCertificates|erifySolutions|erifyTestAssumptions|ersionedPreferences|ertexCapacity|ertexColors|ertexCoordinates|ertexDataCoordinates|ertexLabelStyle|ertexLabels|ertexNormals|ertexShape|ertexShapeFunction|ertexSize|ertexStyle|ertexTextureCoordinates|ertexWeight|ideoEncoding|iewAngle|iewCenter|iewMatrix|iewPoint|iewProjection|iewRange|iewVector|iewVertical|isible))(?![`$[:alnum:]])",
+          "match": "System`V(?:alidationLength|alidationSet|alueDimensions|arianceEstimatorFunction|ectorAspectRatio|ectorColorFunction|ectorColorFunctionScaling|ectorMarkers|ectorPoints|ectorRange|ectorScaling|ectorSizes|ectorStyle|erifyConvergence|erifySecurityCertificates|erifySolutions|erifyTestAssumptions|ersionedPreferences|ertexCapacity|ertexColors|ertexCoordinates|ertexDataCoordinates|ertexLabelStyle|ertexLabels|ertexNormals|ertexShape|ertexShapeFunction|ertexSize|ertexStyle|ertexTextureCoordinates|ertexWeight|ideoEncoding|iewAngle|iewCenter|iewMatrix|iewPoint|iewProjection|iewRange|iewVector|iewVertical|isible)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:W(?:aveletScale|eights|hitePoint|indowClickSelect|indowElements|indowFloating|indowFrame|indowFrameElements|indowMargins|indowOpacity|indowSize|indowStatusArea|indowTitle|indowToolbars|ordOrientation|ordSearch|ordSelectionFunction|ordSeparators|ordSpacings|orkingPrecision|rapAround))(?![`$[:alnum:]])",
+          "match": "System`W(?:aveletScale|eights|hitePoint|indowClickSelect|indowElements|indowFloating|indowFrame|indowFrameElements|indowMargins|indowOpacity|indowSize|indowStatusArea|indowTitle|indowToolbars|ordOrientation|ordSearch|ordSelectionFunction|ordSeparators|ordSpacings|orkingPrecision|rapAround)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:Z(?:eroTest|eroWidthTimes))(?![`$[:alnum:]])",
+          "match": "System`Zero(?:Test|WidthTimes)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:A(?:bove|fter|lgebraics|ll|nonymous|utomatic|xis))(?![`$[:alnum:]])",
+          "match": "System`A(?:bove|fter|lgebraics|ll|nonymous|utomatic|xis)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:B(?:ack|ackward|aseline|efore|elow|lack|lue|old|ooleans|ottom|oxes|rown|yte))(?![`$[:alnum:]])",
+          "match": "System`B(?:ack|ackward|aseline|efore|elow|lack|lue|old|ooleans|ottom|oxes|rown|yte)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:C(?:atalan|ellStyle|enter|haracter|omplexInfinity|omplexes|onstant|yan))(?![`$[:alnum:]])",
+          "match": "System`C(?:atalan|ellStyle|enter|haracter|omplexInfinity|omplexes|onstant|yan)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:D(?:ashed|efaultAxesStyle|efaultBaseStyle|efaultBoxStyle|efaultFaceGridsStyle|efaultFieldHintStyle|efaultFrameStyle|efaultFrameTicksStyle|efaultGridLinesStyle|efaultLabelStyle|efaultMenuStyle|efaultTicksStyle|efaultTooltipStyle|egree|elimiter|igitCharacter|otDashed|otted))(?![`$[:alnum:]])",
+          "match": "System`D(?:ashed|efaultAxesStyle|efaultBaseStyle|efaultBoxStyle|efaultFaceGridsStyle|efaultFieldHintStyle|efaultFrameStyle|efaultFrameTicksStyle|efaultGridLinesStyle|efaultLabelStyle|efaultMenuStyle|efaultTicksStyle|efaultTooltipStyle|egree|elimiter|igitCharacter|otDashed|otted)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:E(?:|ndOfBuffer|ndOfFile|ndOfLine|ndOfString|ulerGamma|xpression))(?![`$[:alnum:]])",
+          "match": "System`E(?:|ndOfBuffer|ndOfFile|ndOfLine|ndOfString|ulerGamma|xpression)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:F(?:alse|lat|ontProperties|orward|orwardBackward|riday|ront|rontEndDynamicExpression|ull))(?![`$[:alnum:]])",
+          "match": "System`F(?:alse|lat|ontProperties|orward|orwardBackward|riday|ront|rontEndDynamicExpression|ull)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:G(?:eneral|laisher|oldenAngle|oldenRatio|ray|reen))(?![`$[:alnum:]])",
+          "match": "System`G(?:eneral|laisher|oldenAngle|oldenRatio|ray|reen)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:H(?:ere|exadecimalCharacter|oldAll|oldAllComplete|oldFirst|oldRest))(?![`$[:alnum:]])",
+          "match": "System`H(?:ere|exadecimalCharacter|oldAll|oldAllComplete|oldFirst|oldRest)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:I(?:|ndeterminate|nfinity|nherited|nteger|ntegers|talic))(?![`$[:alnum:]])",
+          "match": "System`I(?:|ndeterminate|nfinity|nherited|nteger|ntegers|talic)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:K(?:hinchin))(?![`$[:alnum:]])",
+          "match": "System`Khinchin(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:L(?:arge|arger|eft|etterCharacter|ightBlue|ightBrown|ightCyan|ightGray|ightGreen|ightMagenta|ightOrange|ightPink|ightPurple|ightRed|ightYellow|istable|ocked))(?![`$[:alnum:]])",
+          "match": "System`L(?:arge|arger|eft|etterCharacter|ightBlue|ightBrown|ightCyan|ightGray|ightGreen|ightMagenta|ightOrange|ightPink|ightPurple|ightRed|ightYellow|istable|ocked)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:M(?:achinePrecision|agenta|anual|edium|eshCellCentroid|eshCellMeasure|eshCellQuality|onday))(?![`$[:alnum:]])",
+          "match": "System`M(?:achinePrecision|agenta|anual|edium|eshCellCentroid|eshCellMeasure|eshCellQuality|onday)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:N(?:HoldAll|HoldFirst|HoldRest|egativeIntegers|egativeRationals|egativeReals|oWhitespace|onNegativeIntegers|onNegativeRationals|onNegativeReals|onPositiveIntegers|onPositiveRationals|onPositiveReals|one|ow|ull|umber|umberString|umericFunction))(?![`$[:alnum:]])",
+          "match": "System`N(?:HoldAll|HoldFirst|HoldRest|egativeIntegers|egativeRationals|egativeReals|oWhitespace|onNegativeIntegers|onNegativeRationals|onNegativeReals|onPositiveIntegers|onPositiveRationals|onPositiveReals|one|ow|ull|umber|umberString|umericFunction)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:O(?:neIdentity|range|rderless))(?![`$[:alnum:]])",
+          "match": "System`O(?:neIdentity|range|rderless)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:P(?:i|ink|lain|ositiveIntegers|ositiveRationals|ositiveReals|rimes|rotected|unctuationCharacter|urple))(?![`$[:alnum:]])",
+          "match": "System`P(?:i|ink|lain|ositiveIntegers|ositiveRationals|ositiveReals|rimes|rotected|unctuationCharacter|urple)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:R(?:ationals|eadProtected|eal|eals|ecord|ed|ight))(?![`$[:alnum:]])",
+          "match": "System`R(?:ationals|eadProtected|eal|eals|ecord|ed|ight)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:S(?:aturday|equenceHold|mall|maller|panFromAbove|panFromBoth|panFromLeft|tartOfLine|tartOfString|tring|truckthrough|tub|unday))(?![`$[:alnum:]])",
+          "match": "System`S(?:aturday|equenceHold|mall|maller|panFromAbove|panFromBoth|panFromLeft|tartOfLine|tartOfString|tring|truckthrough|tub|unday)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:T(?:emporary|hick|hin|hursday|iny|oday|omorrow|op|ransparent|rue|uesday))(?![`$[:alnum:]])",
+          "match": "System`T(?:emporary|hick|hin|hursday|iny|oday|omorrow|op|ransparent|rue|uesday)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:U(?:ndefined|nderlined))(?![`$[:alnum:]])",
+          "match": "System`Unde(?:fined|rlined)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:W(?:ednesday|hite|hitespace|hitespaceCharacter|ord|ordBoundary|ordCharacter))(?![`$[:alnum:]])",
+          "match": "System`W(?:ednesday|hite|hitespace|hitespaceCharacter|ord|ordBoundary|ordCharacter)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:Y(?:ellow|esterday))(?![`$[:alnum:]])",
+          "match": "System`Ye(?:llow|sterday)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:\\$(?:Aborted|ActivationKey|AllowDataUpdates|AllowInternet|AssertFunction|Assumptions|AudioInputDevices|AudioOutputDevices|BaseDirectory|BasePacletsDirectory|BatchInput|BatchOutput|ByteOrdering|CacheBaseDirectory|Canceled|CharacterEncoding|CharacterEncodings|CloudAccountName|CloudBase|CloudConnected|CloudCreditsAvailable|CloudEvaluation|CloudExpressionBase|CloudObjectNameFormat|CloudObjectURLType|CloudRootDirectory|CloudSymbolBase|CloudUserID|CloudUserUUID|CloudVersion|CommandLine|CompilationTarget|Context|ContextAliases|ContextPath|ControlActiveSetting|Cookies|CreationDate|CurrentLink|CurrentTask|DateStringFormat|DefaultAudioInputDevice|DefaultAudioOutputDevice|DefaultFrontEnd|DefaultImagingDevice|DefaultKernels|DefaultLocalBase|DefaultLocalKernel|Display|DisplayFunction|DistributedContexts|DynamicEvaluation|Echo|EmbedCodeEnvironments|EmbeddableServices|Epilog|EvaluationCloudBase|EvaluationCloudObject|EvaluationEnvironment|ExportFormats|Failed|FontFamilies|FrontEnd|FrontEndSession|GeoLocation|GeoLocationCity|GeoLocationCountry|GeoLocationSource|HomeDirectory|IgnoreEOF|ImageFormattingWidth|ImageResolution|ImagingDevice|ImagingDevices|ImportFormats|InitialDirectory|Input|InputFileName|InputStreamMethods|Inspector|InstallationDirectory|InterpreterTypes|IterationLimit|KernelCount|KernelID|Language|LibraryPath|LicenseExpirationDate|LicenseID|LicenseServer|Linked|LocalBase|LocalSymbolBase|MachineAddresses|MachineDomains|MachineEpsilon|MachineID|MachineName|MachinePrecision|MachineType|MaxExtraPrecision|MaxMachineNumber|MaxNumber|MaxPiecewiseCases|MaxPrecision|MaxRootDegree|MessageGroups|MessageList|MessagePrePrint|Messages|MinMachineNumber|MinNumber|MinPrecision|MobilePhone|ModuleNumber|NetworkConnected|NewMessage|NewSymbol|NotebookInlineStorageLimit|Notebooks|NumberMarks|OperatingSystem|Output|OutputSizeLimit|OutputStreamMethods|Packages|ParentLink|ParentProcessID|PasswordFile|Path|PathnameSeparator|PerformanceGoal|Permissions|PlotTheme|Printout3DPreviewer|ProcessID|ProcessorCount|ProcessorType|ProgressReporting|RandomGeneratorState|RecursionLimit|ReleaseNumber|RequesterAddress|RequesterCloudUserID|RequesterCloudUserUUID|RequesterWolframID|RequesterWolframUUID|RootDirectory|ScriptCommandLine|ScriptInputString|Services|SessionID|SharedFunctions|SharedVariables|SoundDisplayFunction|SynchronousEvaluation|System|SystemCharacterEncoding|SystemID|SystemShell|SystemTimeZone|SystemWordLength|TemplatePath|TemporaryDirectory|TimeUnit|TimeZone|TimeZoneEntity|TimedOut|UnitSystem|Urgent|UserAgentString|UserBaseDirectory|UserBasePacletsDirectory|UserDocumentsDirectory|UserURLBase|Username|Version|VersionNumber|WolframDocumentsDirectory|WolframID|WolframUUID))(?![`$[:alnum:]])",
+          "match": "System`\\$(?:Aborted|ActivationKey|AllowDataUpdates|AllowInternet|AssertFunction|Assumptions|AudioInputDevices|AudioOutputDevices|BaseDirectory|BasePacletsDirectory|BatchInput|BatchOutput|ByteOrdering|CacheBaseDirectory|Canceled|CharacterEncoding|CharacterEncodings|CloudAccountName|CloudBase|CloudConnected|CloudCreditsAvailable|CloudEvaluation|CloudExpressionBase|CloudObjectNameFormat|CloudObjectURLType|CloudRootDirectory|CloudSymbolBase|CloudUserID|CloudUserUUID|CloudVersion|CommandLine|CompilationTarget|Context|ContextAliases|ContextPath|ControlActiveSetting|Cookies|CreationDate|CurrentLink|CurrentTask|DateStringFormat|DefaultAudioInputDevice|DefaultAudioOutputDevice|DefaultFrontEnd|DefaultImagingDevice|DefaultKernels|DefaultLocalBase|DefaultLocalKernel|Display|DisplayFunction|DistributedContexts|DynamicEvaluation|Echo|EmbedCodeEnvironments|EmbeddableServices|Epilog|EvaluationCloudBase|EvaluationCloudObject|EvaluationEnvironment|ExportFormats|Failed|FontFamilies|FrontEnd|FrontEndSession|GeoLocation|GeoLocationCity|GeoLocationCountry|GeoLocationSource|HomeDirectory|IgnoreEOF|ImageFormattingWidth|ImageResolution|ImagingDevice|ImagingDevices|ImportFormats|InitialDirectory|Input|InputFileName|InputStreamMethods|Inspector|InstallationDirectory|InterpreterTypes|IterationLimit|KernelCount|KernelID|Language|LibraryPath|LicenseExpirationDate|LicenseID|LicenseServer|Linked|LocalBase|LocalSymbolBase|MachineAddresses|MachineDomains|MachineEpsilon|MachineID|MachineName|MachinePrecision|MachineType|MaxExtraPrecision|MaxMachineNumber|MaxNumber|MaxPiecewiseCases|MaxPrecision|MaxRootDegree|MessageGroups|MessageList|MessagePrePrint|Messages|MinMachineNumber|MinNumber|MinPrecision|MobilePhone|ModuleNumber|NetworkConnected|NewMessage|NewSymbol|NotebookInlineStorageLimit|Notebooks|NumberMarks|OperatingSystem|Output|OutputSizeLimit|OutputStreamMethods|Packages|ParentLink|ParentProcessID|PasswordFile|Path|PathnameSeparator|PerformanceGoal|Permissions|PlotTheme|Printout3DPreviewer|ProcessID|ProcessorCount|ProcessorType|ProgressReporting|RandomGeneratorState|RecursionLimit|ReleaseNumber|RequesterAddress|RequesterCloudUserID|RequesterCloudUserUUID|RequesterWolframID|RequesterWolframUUID|RootDirectory|ScriptCommandLine|ScriptInputString|Services|SessionID|SharedFunctions|SharedVariables|SoundDisplayFunction|SynchronousEvaluation|System|SystemCharacterEncoding|SystemID|SystemShell|SystemTimeZone|SystemWordLength|TemplatePath|TemporaryDirectory|TimeUnit|TimeZone|TimeZoneEntity|TimedOut|UnitSystem|Urgent|UserAgentString|UserBaseDirectory|UserBasePacletsDirectory|UserDocumentsDirectory|UserURLBase|Username|Version|VersionNumber|WolframDocumentsDirectory|WolframID|WolframUUID)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "System`(?:A(?:bortScheduledTask|ctive|lgebraicRules|lternateImage|natomyForm|nimationCycleOffset|nimationCycleRepetitions|nimationDisplayTime|spectRatioFixed|stronomicalData|synchronousTaskObject|synchronousTasks|udioDevice|udioLooping))(?![`$[:alnum:]])",
+          "match": "System`A(?:bortScheduledTask|ctive|lgebraicRules|lternateImage|natomyForm|nimationCycleOffset|nimationCycleRepetitions|nimationDisplayTime|spectRatioFixed|stronomicalData|synchronousTaskObject|synchronousTasks|udioDevice|udioLooping)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:B(?:uttonEvaluator|uttonExpandable|uttonFrame|uttonMargins|uttonNote|uttonStyle))(?![`$[:alnum:]])",
+          "match": "System`Button(?:Evaluator|Expandable|Frame|Margins|Note|Style)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:C(?:DFInformation|hebyshevDistance|lassifierInformation|lipFill|olorOutput|olumnForm|ompose|onstantArrayLayer|onstantPlusLayer|onstantTimesLayer|onstrainedMax|onstrainedMin|ontourGraphics|ontourLines|onversionOptions|reateScheduledTask|reateTemporary|urry))(?![`$[:alnum:]])",
+          "match": "System`C(?:DFInformation|hebyshevDistance|lassifierInformation|lipFill|olorOutput|olumnForm|ompose|onstantArrayLayer|onstantPlusLayer|onstantTimesLayer|onstrainedMax|onstrainedMin|ontourGraphics|ontourLines|onversionOptions|reateScheduledTask|reateTemporary|urry)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:D(?:atabinRemove|ate|ebug|efaultColor|efaultFont|ensityGraphics|isplay|isplayString|otPlusLayer|ragAndDrop))(?![`$[:alnum:]])",
+          "match": "System`D(?:atabinRemove|ate|ebug|efaultColor|efaultFont|ensityGraphics|isplay|isplayString|otPlusLayer|ragAndDrop)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:E(?:dgeLabeling|dgeRenderingFunction|valuateScheduledTask|xpectedValue))(?![`$[:alnum:]])",
+          "match": "System`E(?:dgeLabeling|dgeRenderingFunction|valuateScheduledTask|xpectedValue)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:F(?:actorComplete|ontForm|ormTheme|romDate|ullOptions))(?![`$[:alnum:]])",
+          "match": "System`F(?:actorComplete|ontForm|ormTheme|romDate|ullOptions)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:G(?:raphStyle|raphicsArray|raphicsSpacing|ridBaseline))(?![`$[:alnum:]])",
+          "match": "System`Gr(?:aphStyle|aphicsArray|aphicsSpacing|idBaseline)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:H(?:TMLSave|eldPart|iddenSurface|omeDirectory))(?![`$[:alnum:]])",
+          "match": "System`H(?:TMLSave|eldPart|iddenSurface|omeDirectory)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:I(?:mageRotated|nstanceNormalizationLayer))(?![`$[:alnum:]])",
+          "match": "System`I(?:mageRotated|nstanceNormalizationLayer)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:L(?:UBackSubstitution|egendreType|ightSources|inearProgramming|inkOpen|iteral|ongestMatch))(?![`$[:alnum:]])",
+          "match": "System`L(?:UBackSubstitution|egendreType|ightSources|inearProgramming|inkOpen|iteral|ongestMatch)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:M(?:eshRange|oleculeEquivalentQ))(?![`$[:alnum:]])",
+          "match": "System`M(?:eshRange|oleculeEquivalentQ)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:N(?:etInformation|etSharedArray|extScheduledTaskTime|otebookCreate))(?![`$[:alnum:]])",
+          "match": "System`N(?:etInformation|etSharedArray|extScheduledTaskTime|otebookCreate)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:O(?:penTemporary))(?![`$[:alnum:]])",
+          "match": "System`OpenTemporary(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:P(?:IDData|ackingMethod|ersistentValue|ixelConstrained|lot3Matrix|lotDivision|lotJoined|olygonIntersections|redictorInformation|roperties|roperty|ropertyList|ropertyValue))(?![`$[:alnum:]])",
+          "match": "System`P(?:IDData|ackingMethod|ersistentValue|ixelConstrained|lot3Matrix|lotDivision|lotJoined|olygonIntersections|redictorInformation|roperties|roperty|ropertyList|ropertyValue)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:R(?:andom|asterArray|ecognitionThreshold|elease|emoteKernelObject|emoveAsynchronousTask|emoveProperty|emoveScheduledTask|enderAll|eplaceHeldPart|esetScheduledTask|esumePacket|unScheduledTask))(?![`$[:alnum:]])",
+          "match": "System`R(?:andom|asterArray|ecognitionThreshold|elease|emoteKernelObject|emoveAsynchronousTask|emoveProperty|emoveScheduledTask|enderAll|eplaceHeldPart|esetScheduledTask|esumePacket|unScheduledTask)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:S(?:cheduledTaskActiveQ|cheduledTaskInformation|cheduledTaskObject|cheduledTasks|creenRectangle|electionAnimate|equenceAttentionLayer|equenceForm|etProperty|hading|hortestMatch|ingularValues|kinStyle|ocialMediaData|tartAsynchronousTask|tartScheduledTask|tateDimensions|topAsynchronousTask|topScheduledTask|tructuredArray|tyleForm|tylePrint|ubscripted|urfaceColor|urfaceGraphics|uspendPacket|ystemModelProgressReporting))(?![`$[:alnum:]])",
+          "match": "System`S(?:cheduledTaskActiveQ|cheduledTaskInformation|cheduledTaskObject|cheduledTasks|creenRectangle|electionAnimate|equenceAttentionLayer|equenceForm|etProperty|hading|hortestMatch|ingularValues|kinStyle|ocialMediaData|tartAsynchronousTask|tartScheduledTask|tateDimensions|topAsynchronousTask|topScheduledTask|tructuredArray|tyleForm|tylePrint|ubscripted|urfaceColor|urfaceGraphics|uspendPacket|ystemModelProgressReporting)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:T(?:eXSave|extStyle|imeWarpingCorrespondence|imeWarpingDistance|oDate|oFileName|oHeldExpression))(?![`$[:alnum:]])",
+          "match": "System`T(?:eXSave|extStyle|imeWarpingCorrespondence|imeWarpingDistance|oDate|oFileName|oHeldExpression)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:U(?:RLFetch|RLFetchAsynchronous|RLSave|RLSaveAsynchronous))(?![`$[:alnum:]])",
+          "match": "System`URL(?:Fetch|FetchAsynchronous|Save|SaveAsynchronous)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:V(?:ectorScale|ertexCoordinateRules|ertexLabeling|ertexRenderingFunction))(?![`$[:alnum:]])",
+          "match": "System`Ve(?:ctorScale|rtexCoordinateRules|rtexLabeling|rtexRenderingFunction)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:W(?:aitAsynchronousTask|indowMovable))(?![`$[:alnum:]])",
+          "match": "System`W(?:aitAsynchronousTask|indowMovable)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:\\$(?:AsynchronousTask|ConfiguredKernels|DefaultFont|EntityStores|FormatType|HTTPCookies|InstallationDate|MachineDomain|ProductInformation|ProgramName|RandomState|ScheduledTask|SummaryBoxDataSizeLimit|TemporaryPrefix|TextStyle|TopDirectory|UserAddOnsDirectory))(?![`$[:alnum:]])",
+          "match": "System`\\$(?:AsynchronousTask|ConfiguredKernels|DefaultFont|EntityStores|FormatType|HTTPCookies|InstallationDate|MachineDomain|ProductInformation|ProgramName|RandomState|ScheduledTask|SummaryBoxDataSizeLimit|TemporaryPrefix|TextStyle|TopDirectory|UserAddOnsDirectory)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "System`(?:A(?:ctionDelay|ctionMenuBox|ctionMenuBoxOptions|ctiveItem|lgebraicRulesData|lignmentMarker|llowAdultContent|llowChatServices|llowIncomplete|nalytic|nimatorBox|nimatorBoxOptions|nimatorElements|ppendCheck|rgumentCountQ|rrow3DBox|rrowBox|uthenticate|utoEvaluateEvents|utoIndentSpacings|utoMatch|utoNumberFormatting|utoQuoteCharacters|utoScaling|utoStyleOptions|utoStyleWords|utomaticImageSize|xis3DBox|xis3DBoxOptions|xisBox|xisBoxOptions))(?![`$[:alnum:]])",
+          "match": "System`A(?:ctionDelay|ctionMenuBox|ctionMenuBoxOptions|ctiveItem|lgebraicRulesData|lignmentMarker|llowAdultContent|llowChatServices|llowIncomplete|nalytic|nimatorBox|nimatorBoxOptions|nimatorElements|ppendCheck|rgumentCountQ|rrow3DBox|rrowBox|uthenticate|utoEvaluateEvents|utoIndentSpacings|utoMatch|utoNumberFormatting|utoQuoteCharacters|utoScaling|utoStyleOptions|utoStyleWords|utomaticImageSize|xis3DBox|xis3DBoxOptions|xisBox|xisBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:B(?:SplineCurve3DBox|SplineCurve3DBoxOptions|SplineCurveBox|SplineCurveBoxOptions|SplineSurface3DBox|SplineSurface3DBoxOptions|ackFaceColor|ackFaceGlowColor|ackFaceOpacity|ackFaceSpecularColor|ackFaceSpecularExponent|ackFaceSurfaceAppearance|ackFaceTexture|ackgroundAppearance|ackgroundTasksSettings|acksubstitution|eveled|ezierCurve3DBox|ezierCurve3DBoxOptions|ezierCurveBox|ezierCurveBoxOptions|lankForm|ounds|ox|oxDimensions|oxForm|oxID|oxRotation|oxRotationPoint|ra|raKet|rowserCategory|uttonCell|uttonContents|uttonStyleMenuListing))(?![`$[:alnum:]])",
+          "match": "System`B(?:SplineCurve3DBox|SplineCurve3DBoxOptions|SplineCurveBox|SplineCurveBoxOptions|SplineSurface3DBox|SplineSurface3DBoxOptions|ackFaceColor|ackFaceGlowColor|ackFaceOpacity|ackFaceSpecularColor|ackFaceSpecularExponent|ackFaceSurfaceAppearance|ackFaceTexture|ackgroundAppearance|ackgroundTasksSettings|acksubstitution|eveled|ezierCurve3DBox|ezierCurve3DBoxOptions|ezierCurveBox|ezierCurveBoxOptions|lankForm|ounds|ox|oxDimensions|oxForm|oxID|oxRotation|oxRotationPoint|ra|raKet|rowserCategory|uttonCell|uttonContents|uttonStyleMenuListing)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:C(?:acheGraphics|achedValue|ardinalBSplineBasis|ellBoundingBox|ellContents|ellElementSpacings|ellElementsBoundingBox|ellFrameStyle|ellInsertionPointCell|ellTrayPosition|ellTrayWidgets|hangeOptions|hannelDatabin|hannelListenerWait|hannelPreSendFunction|hartElementData|hartElementDataFunction|heckAll|heckboxBox|heckboxBoxOptions|ircleBox|lipboardNotebook|lockwiseContourIntegral|losed|losingEvent|loudConnections|loudObjectInformation|loudObjectInformationData|loudUserID|oarse|oefficientDomain|olonForm|olorSetterBox|olorSetterBoxOptions|olumnBackgrounds|ompilerEnvironmentAppend|ompletionsListPacket|omponentwiseContextMenu|ompressedData|oneBox|onicHullRegion3DBox|onicHullRegion3DBoxOptions|onicHullRegionBox|onicHullRegionBoxOptions|onnect|ontentsBoundingBox|ontextMenu|ontinuation|ontourIntegral|ontourSmoothing|ontrolAlignment|ontrollerDuration|ontrollerInformationData|onvertToPostScript|onvertToPostScriptPacket|ookies|opyTag|ounterBox|ounterBoxOptions|ounterClockwiseContourIntegral|ounterEvaluator|ounterStyle|uboidBox|uboidBoxOptions|urlyDoubleQuote|urlyQuote|ylinderBox|ylinderBoxOptions))(?![`$[:alnum:]])",
+          "match": "System`C(?:acheGraphics|achedValue|ardinalBSplineBasis|ellBoundingBox|ellContents|ellElementSpacings|ellElementsBoundingBox|ellFrameStyle|ellInsertionPointCell|ellTrayPosition|ellTrayWidgets|hangeOptions|hannelDatabin|hannelListenerWait|hannelPreSendFunction|hartElementData|hartElementDataFunction|heckAll|heckboxBox|heckboxBoxOptions|ircleBox|lipboardNotebook|lockwiseContourIntegral|losed|losingEvent|loudConnections|loudObjectInformation|loudObjectInformationData|loudUserID|oarse|oefficientDomain|olonForm|olorSetterBox|olorSetterBoxOptions|olumnBackgrounds|ompilerEnvironmentAppend|ompletionsListPacket|omponentwiseContextMenu|ompressedData|oneBox|onicHullRegion3DBox|onicHullRegion3DBoxOptions|onicHullRegionBox|onicHullRegionBoxOptions|onnect|ontentsBoundingBox|ontextMenu|ontinuation|ontourIntegral|ontourSmoothing|ontrolAlignment|ontrollerDuration|ontrollerInformationData|onvertToPostScript|onvertToPostScriptPacket|ookies|opyTag|ounterBox|ounterBoxOptions|ounterClockwiseContourIntegral|ounterEvaluator|ounterStyle|uboidBox|uboidBoxOptions|urlyDoubleQuote|urlyQuote|ylinderBox|ylinderBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:D(?:OSTextFormat|ampingFactor|ataCompression|atasetDisplayPanel|ateDelimiters|ebugTag|ecimal|efault2DTool|efault3DTool|efaultAttachedCellStyle|efaultControlPlacement|efaultDockedCellStyle|efaultInputFormatType|efaultOutputFormatType|efaultStyle|efaultTextFormatType|efaultTextInlineFormatType|efaultValue|efineExternal|egreeLexicographic|egreeReverseLexicographic|eleteWithContents|elimitedArray|estroyAfterEvaluation|eviceOpenQ|ialogIndent|ialogLevel|ifferenceOrder|igitBlockMinimum|isableConsolePrintPacket|iskBox|iskBoxOptions|ispatchQ|isplayRules|isplayTemporary|istributionDomain|ivergence|ocumentGeneratorInformationData|omainRegistrationInformation|oubleContourIntegral|oublyInfinite|own|rawBackFaces|rawFrontFaces|rawHighlighted|ualLinearProgramming|umpGet|ynamicBox|ynamicBoxOptions|ynamicLocation|ynamicModuleBox|ynamicModuleBoxOptions|ynamicModuleParent|ynamicName|ynamicNamespace|ynamicReference|ynamicWrapperBox|ynamicWrapperBoxOptions))(?![`$[:alnum:]])",
+          "match": "System`D(?:OSTextFormat|ampingFactor|ataCompression|atasetDisplayPanel|ateDelimiters|ebugTag|ecimal|efault2DTool|efault3DTool|efaultAttachedCellStyle|efaultControlPlacement|efaultDockedCellStyle|efaultInputFormatType|efaultOutputFormatType|efaultStyle|efaultTextFormatType|efaultTextInlineFormatType|efaultValue|efineExternal|egreeLexicographic|egreeReverseLexicographic|eleteWithContents|elimitedArray|estroyAfterEvaluation|eviceOpenQ|ialogIndent|ialogLevel|ifferenceOrder|igitBlockMinimum|isableConsolePrintPacket|iskBox|iskBoxOptions|ispatchQ|isplayRules|isplayTemporary|istributionDomain|ivergence|ocumentGeneratorInformationData|omainRegistrationInformation|oubleContourIntegral|oublyInfinite|own|rawBackFaces|rawFrontFaces|rawHighlighted|ualLinearProgramming|umpGet|ynamicBox|ynamicBoxOptions|ynamicLocation|ynamicModuleBox|ynamicModuleBoxOptions|ynamicModuleParent|ynamicName|ynamicNamespace|ynamicReference|ynamicWrapperBox|ynamicWrapperBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:E(?:ditButtonSettings|liminationOrder|llipticReducedHalfPeriods|mbeddingObject|mphasizeSyntaxErrors|mpty|nableConsolePrintPacket|ndAdd|ngineEnvironment|nter|qualColumns|qualRows|quatedTo|rrorBoxOptions|rrorNorm|rrorPacket|rrorsDialogSettings|valuated|valuationMode|valuationOrder|valuationRateLimit|ventEvaluator|ventHandlerTag|xactRootIsolation|xitDialog|xpectationE|xportPacket|xpressionPacket|xternalCall|xternalFunctionName))(?![`$[:alnum:]])",
+          "match": "System`E(?:ditButtonSettings|liminationOrder|llipticReducedHalfPeriods|mbeddingObject|mphasizeSyntaxErrors|mpty|nableConsolePrintPacket|ndAdd|ngineEnvironment|nter|qualColumns|qualRows|quatedTo|rrorBoxOptions|rrorNorm|rrorPacket|rrorsDialogSettings|valuated|valuationMode|valuationOrder|valuationRateLimit|ventEvaluator|ventHandlerTag|xactRootIsolation|xitDialog|xpectationE|xportPacket|xpressionPacket|xternalCall|xternalFunctionName)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:F(?:EDisableConsolePrintPacket|EEnableConsolePrintPacket|ail|ileInformation|ileName|illForm|illedCurveBox|illedCurveBoxOptions|ine|itAll|lashSelection|ont|ontName|ontOpacity|ontPostScriptName|ontReencoding|ormatRules|ormatValues|rameInset|rameless|rontEndObject|rontEndResource|rontEndResourceString|rontEndStackSize|rontEndValueCache|rontEndVersion|rontFaceColor|rontFaceGlowColor|rontFaceOpacity|rontFaceSpecularColor|rontFaceSpecularExponent|rontFaceSurfaceAppearance|rontFaceTexture|ullAxes))(?![`$[:alnum:]])",
+          "match": "System`F(?:EDisableConsolePrintPacket|EEnableConsolePrintPacket|ail|ileInformation|ileName|illForm|illedCurveBox|illedCurveBoxOptions|ine|itAll|lashSelection|ont|ontName|ontOpacity|ontPostScriptName|ontReencoding|ormatRules|ormatValues|rameInset|rameless|rontEndObject|rontEndResource|rontEndResourceString|rontEndStackSize|rontEndValueCache|rontEndVersion|rontFaceColor|rontFaceGlowColor|rontFaceOpacity|rontFaceSpecularColor|rontFaceSpecularExponent|rontFaceSurfaceAppearance|rontFaceTexture|ullAxes)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:G(?:eneratedCellStyles|eneric|eometricTransformation3DBox|eometricTransformation3DBoxOptions|eometricTransformationBox|eometricTransformationBoxOptions|estureHandlerTag|etContext|etFileName|etLinebreakInformationPacket|lobalPreferences|lobalSession|raphLayerLabels|raphRoot|raphics3DBox|raphics3DBoxOptions|raphicsBaseline|raphicsBox|raphicsBoxOptions|raphicsComplex3DBox|raphicsComplex3DBoxOptions|raphicsComplexBox|raphicsComplexBoxOptions|raphicsContents|raphicsData|raphicsGridBox|raphicsGroup3DBox|raphicsGroup3DBoxOptions|raphicsGroupBox|raphicsGroupBoxOptions|raphicsGrouping|raphicsStyle|reekStyle|ridBoxAlignment|ridBoxBackground|ridBoxDividers|ridBoxFrame|ridBoxItemSize|ridBoxItemStyle|ridBoxOptions|ridBoxSpacings|ridElementStyleOptions|roupOpenerColor|roupOpenerInsideFrame|roupTogetherGrouping|roupTogetherNestedGrouping))(?![`$[:alnum:]])",
+          "match": "System`G(?:eneratedCellStyles|eneric|eometricTransformation3DBox|eometricTransformation3DBoxOptions|eometricTransformationBox|eometricTransformationBoxOptions|estureHandlerTag|etContext|etFileName|etLinebreakInformationPacket|lobalPreferences|lobalSession|raphLayerLabels|raphRoot|raphics3DBox|raphics3DBoxOptions|raphicsBaseline|raphicsBox|raphicsBoxOptions|raphicsComplex3DBox|raphicsComplex3DBoxOptions|raphicsComplexBox|raphicsComplexBoxOptions|raphicsContents|raphicsData|raphicsGridBox|raphicsGroup3DBox|raphicsGroup3DBoxOptions|raphicsGroupBox|raphicsGroupBoxOptions|raphicsGrouping|raphicsStyle|reekStyle|ridBoxAlignment|ridBoxBackground|ridBoxDividers|ridBoxFrame|ridBoxItemSize|ridBoxItemStyle|ridBoxOptions|ridBoxSpacings|ridElementStyleOptions|roupOpenerColor|roupOpenerInsideFrame|roupTogetherGrouping|roupTogetherNestedGrouping)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:H(?:eadCompose|eaders|elpBrowserLookup|elpBrowserNotebook|elpViewerSettings|essian|exahedronBox|exahedronBoxOptions|ighlightString|omePage|orizontal|orizontalForm|orizontalScrollPosition|yperlinkCreationSettings|yphenationOptions))(?![`$[:alnum:]])",
+          "match": "System`H(?:eadCompose|eaders|elpBrowserLookup|elpBrowserNotebook|elpViewerSettings|essian|exahedronBox|exahedronBoxOptions|ighlightString|omePage|orizontal|orizontalForm|orizontalScrollPosition|yperlinkCreationSettings|yphenationOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:I(?:conizedObject|gnoreSpellCheck|mageCache|mageCacheValid|mageEditMode|mageMarkers|mageOffset|mageRangeCache|mageSizeCache|mageSizeRaw|nactiveStyle|ncludeSingularTerm|ndent|ndentMaxFraction|ndentingNewlineSpacings|ndexCreationOptions|ndexTag|nequality|nexactNumbers|nformationData|nformationDataGrid|nlineCounterAssignments|nlineCounterIncrements|nlineRules|nputFieldBox|nputFieldBoxOptions|nputGrouping|nputSettings|nputToBoxFormPacket|nsertionPointObject|nset3DBox|nset3DBoxOptions|nsetBox|nsetBoxOptions|ntegral|nterlaced|nterpolationPrecision|nterpretTemplate|nterruptSettings|nto|nvisibleApplication|nvisibleTimes|temBox|temBoxOptions))(?![`$[:alnum:]])",
+          "match": "System`I(?:conizedObject|gnoreSpellCheck|mageCache|mageCacheValid|mageEditMode|mageMarkers|mageOffset|mageRangeCache|mageSizeCache|mageSizeRaw|nactiveStyle|ncludeSingularTerm|ndent|ndentMaxFraction|ndentingNewlineSpacings|ndexCreationOptions|ndexTag|nequality|nexactNumbers|nformationData|nformationDataGrid|nlineCounterAssignments|nlineCounterIncrements|nlineRules|nputFieldBox|nputFieldBoxOptions|nputGrouping|nputSettings|nputToBoxFormPacket|nsertionPointObject|nset3DBox|nset3DBoxOptions|nsetBox|nsetBoxOptions|ntegral|nterlaced|nterpolationPrecision|nterpretTemplate|nterruptSettings|nto|nvisibleApplication|nvisibleTimes|temBox|temBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:J(?:acobian|oinedCurveBox|oinedCurveBoxOptions))(?![`$[:alnum:]])",
+          "match": "System`J(?:acobian|oinedCurveBox|oinedCurveBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:K(?:|ernelExecute|et))(?![`$[:alnum:]])",
+          "match": "System`K(?:|ernelExecute|et)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:L(?:abeledSlider|ambertW|anguageOptions|aunch|ayoutInformation|exicographic|icenseID|ine3DBox|ine3DBoxOptions|ineBox|ineBoxOptions|ineBreak|ineWrapParts|inearFilter|inebreakSemicolonWeighting|inkConnectedQ|inkError|inkFlush|inkHost|inkMode|inkOptions|inkReadHeld|inkService|inkWriteHeld|istPickerBoxBackground|isten|iteralSearch|ocalizeDefinitions|ocatorBox|ocatorBoxOptions|ocatorCentering|ocatorPaneBox|ocatorPaneBoxOptions|ongEqual|ongForm|oopback))(?![`$[:alnum:]])",
+          "match": "System`L(?:abeledSlider|ambertW|anguageOptions|aunch|ayoutInformation|exicographic|icenseID|ine3DBox|ine3DBoxOptions|ineBox|ineBoxOptions|ineBreak|ineWrapParts|inearFilter|inebreakSemicolonWeighting|inkConnectedQ|inkError|inkFlush|inkHost|inkMode|inkOptions|inkReadHeld|inkService|inkWriteHeld|istPickerBoxBackground|isten|iteralSearch|ocalizeDefinitions|ocatorBox|ocatorBoxOptions|ocatorCentering|ocatorPaneBox|ocatorPaneBoxOptions|ongEqual|ongForm|oopback)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:M(?:achineID|achineName|acintoshSystemPageSetup|ainSolve|aintainDynamicCaches|akeRules|atchLocalNameQ|aterial|athMLText|athematicaNotation|axBend|axPoints|enu|enuAppearance|enuEvaluator|enuItem|enuList|ergeDifferences|essageObject|essageOptions|essagesNotebook|etaCharacters|ethodOptions|inRecursion|inSize|ode|odular|onomialOrder|ouseAppearanceTag|ouseButtons|ousePointerNote|ultiLetterItalics|ultiLetterStyle|ultiplicity|ultiscriptBoxOptions))(?![`$[:alnum:]])",
+          "match": "System`M(?:achineID|achineName|acintoshSystemPageSetup|ainSolve|aintainDynamicCaches|akeRules|atchLocalNameQ|aterial|athMLText|athematicaNotation|axBend|axPoints|enu|enuAppearance|enuEvaluator|enuItem|enuList|ergeDifferences|essageObject|essageOptions|essagesNotebook|etaCharacters|ethodOptions|inRecursion|inSize|ode|odular|onomialOrder|ouseAppearanceTag|ouseButtons|ousePointerNote|ultiLetterItalics|ultiLetterStyle|ultiplicity|ultiscriptBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:N(?:BernoulliB|ProductFactors|SumTerms|Values|amespaceBox|amespaceBoxOptions|estedScriptRules|etworkPacketRecordingDuring|ext|onAssociative|ormalGrouping|otebookDefault|otebookInterfaceObject))(?![`$[:alnum:]])",
+          "match": "System`N(?:BernoulliB|ProductFactors|SumTerms|Values|amespaceBox|amespaceBoxOptions|estedScriptRules|etworkPacketRecordingDuring|ext|onAssociative|ormalGrouping|otebookDefault|otebookInterfaceObject)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:O(?:LEData|bjectExistsQ|pen|penFunctionInspectorPacket|penSpecialOptions|penerBox|penerBoxOptions|ptionQ|ptionValueBox|ptionValueBoxOptions|ptionsPacket|utputFormData|utputGrouping|utputMathEditExpression|ver|verlayBox|verlayBoxOptions))(?![`$[:alnum:]])",
+          "match": "System`O(?:LEData|bjectExistsQ|pen|penFunctionInspectorPacket|penSpecialOptions|penerBox|penerBoxOptions|ptionQ|ptionValueBox|ptionValueBoxOptions|ptionsPacket|utputFormData|utputGrouping|utputMathEditExpression|ver|verlayBox|verlayBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:P(?:ackPaclet|ackage|acletDirectoryAdd|acletDirectoryRemove|acletInformation|acletObjectQ|acletUpdate|ageHeight|alettesMenuSettings|aneBox|aneBoxOptions|aneSelectorBox|aneSelectorBoxOptions|anelBox|anelBoxOptions|aperWidth|arameter|arameterVariables|arentConnect|arentForm|arentList|arenthesize|artialD|asteAutoQuoteCharacters|ausedTime|eriodicInterpolation|erpendicular|ickMode|ickedElements|ivoting|lotRangeClipPlanesStyle|oint3DBox|oint3DBoxOptions|ointBox|ointBoxOptions|olygon3DBox|olygon3DBoxOptions|olygonBox|olygonBoxOptions|olygonHoleScale|olygonScale|olyhedronBox|olyhedronBoxOptions|olynomialForm|olynomials|opupMenuBox|opupMenuBoxOptions|ostScript|recedence|redictionRoot|referencesSettings|revious|rimaryPlaceholder|rintForm|rismBox|rismBoxOptions|rivateFrontEndOptions|robabilityPr|rocessStateDomain|rocessTimeDomain|rogressIndicatorBox|rogressIndicatorBoxOptions|romptForm|yramidBox|yramidBoxOptions))(?![`$[:alnum:]])",
+          "match": "System`P(?:ackPaclet|ackage|acletDirectoryAdd|acletDirectoryRemove|acletInformation|acletObjectQ|acletUpdate|ageHeight|alettesMenuSettings|aneBox|aneBoxOptions|aneSelectorBox|aneSelectorBoxOptions|anelBox|anelBoxOptions|aperWidth|arameter|arameterVariables|arentConnect|arentForm|arentList|arenthesize|artialD|asteAutoQuoteCharacters|ausedTime|eriodicInterpolation|erpendicular|ickMode|ickedElements|ivoting|lotRangeClipPlanesStyle|oint3DBox|oint3DBoxOptions|ointBox|ointBoxOptions|olygon3DBox|olygon3DBoxOptions|olygonBox|olygonBoxOptions|olygonHoleScale|olygonScale|olyhedronBox|olyhedronBoxOptions|olynomialForm|olynomials|opupMenuBox|opupMenuBoxOptions|ostScript|recedence|redictionRoot|referencesSettings|revious|rimaryPlaceholder|rintForm|rismBox|rismBoxOptions|rivateFrontEndOptions|robabilityPr|rocessStateDomain|rocessTimeDomain|rogressIndicatorBox|rogressIndicatorBoxOptions|romptForm|yramidBox|yramidBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:R(?:adioButtonBox|adioButtonBoxOptions|andomSeed|angeSpecification|aster3DBox|aster3DBoxOptions|asterBox|asterBoxOptions|ationalFunctions|awArray|awMedium|ebuildPacletData|ectangleBox|ecurringDigitsForm|eferenceMarkerStyle|eferenceMarkers|einstall|emoved|epeatedString|esourceAcquire|esourceSubmissionObject|eturnCreatesNewCell|eturnEntersInput|eturnInputFormPacket|otationBox|otationBoxOptions|oundImplies|owBackgrounds|owHeights|uleCondition|uleForm))(?![`$[:alnum:]])",
+          "match": "System`R(?:adioButtonBox|adioButtonBoxOptions|andomSeed|angeSpecification|aster3DBox|aster3DBoxOptions|asterBox|asterBoxOptions|ationalFunctions|awArray|awMedium|ebuildPacletData|ectangleBox|ecurringDigitsForm|eferenceMarkerStyle|eferenceMarkers|einstall|emoved|epeatedString|esourceAcquire|esourceSubmissionObject|eturnCreatesNewCell|eturnEntersInput|eturnInputFormPacket|otationBox|otationBoxOptions|oundImplies|owBackgrounds|owHeights|uleCondition|uleForm)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:S(?:aveAutoDelete|caledMousePosition|cheduledTaskInformationData|criptForm|criptRules|ectionGrouping|electWithContents|election|electionCell|electionCellCreateCell|electionCellDefaultStyle|electionCellParentStyle|electionPlaceholder|elfLoops|erviceResponse|etOptionsPacket|etSecuredAuthenticationKey|etbacks|etterBox|etterBoxOptions|howAutoConvert|howCodeAssist|howControls|howGroupOpenCloseIcon|howInvisibleCharacters|howPredictiveInterface|howSyntaxStyles|hrinkWrapBoundingBox|ingleEvaluation|ingleLetterStyle|lider2DBox|lider2DBoxOptions|ocket|olveDelayed|oundAndGraphics|pace|paceForm|panningCharacters|phereBox|phereBoxOptions|tartupSound|tringBreak|tringByteCount|tripStyleOnPaste|trokeForm|tructuredArrayHeadQ|tyleKeyMapping|tyleNames|urfaceAppearance|yntax|ystemException|ystemGet|ystemInformationData|ystemStub|ystemTest))(?![`$[:alnum:]])",
+          "match": "System`S(?:aveAutoDelete|caledMousePosition|cheduledTaskInformationData|criptForm|criptRules|ectionGrouping|electWithContents|election|electionCell|electionCellCreateCell|electionCellDefaultStyle|electionCellParentStyle|electionPlaceholder|elfLoops|erviceResponse|etOptionsPacket|etSecuredAuthenticationKey|etbacks|etterBox|etterBoxOptions|howAutoConvert|howCodeAssist|howControls|howGroupOpenCloseIcon|howInvisibleCharacters|howPredictiveInterface|howSyntaxStyles|hrinkWrapBoundingBox|ingleEvaluation|ingleLetterStyle|lider2DBox|lider2DBoxOptions|ocket|olveDelayed|oundAndGraphics|pace|paceForm|panningCharacters|phereBox|phereBoxOptions|tartupSound|tringBreak|tringByteCount|tripStyleOnPaste|trokeForm|tructuredArrayHeadQ|tyleKeyMapping|tyleNames|urfaceAppearance|yntax|ystemException|ystemGet|ystemInformationData|ystemStub|ystemTest)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:T(?:ab|abViewBox|abViewBoxOptions|ableViewBox|ableViewBoxAlignment|ableViewBoxBackground|ableViewBoxHeaders|ableViewBoxItemSize|ableViewBoxItemStyle|ableViewBoxOptions|agBoxNote|agStyle|emplateEvaluate|emplateSlotSequence|emplateUnevaluated|emplateVerbatim|emporaryVariable|ensorQ|etrahedronBox|etrahedronBoxOptions|ext3DBox|ext3DBoxOptions|extBand|extBoundingBox|extBox|extForm|extLine|extParagraph|hisLink|itleGrouping|oColor|oggle|oggleFalse|ogglerBox|ogglerBoxOptions|ooBig|ooltipBox|ooltipBoxOptions|otalHeight|raceAction|raceInternal|raceLevel|rackCellChangeTimes|raditionalNotation|raditionalOrder|ransparentColor|rapEnterKey|rapSelection|ubeBSplineCurveBox|ubeBSplineCurveBoxOptions|ubeBezierCurveBox|ubeBezierCurveBoxOptions|ubeBox|ubeBoxOptions))(?![`$[:alnum:]])",
+          "match": "System`T(?:ab|abViewBox|abViewBoxOptions|ableViewBox|ableViewBoxAlignment|ableViewBoxBackground|ableViewBoxHeaders|ableViewBoxItemSize|ableViewBoxItemStyle|ableViewBoxOptions|agBoxNote|agStyle|emplateEvaluate|emplateSlotSequence|emplateUnevaluated|emplateVerbatim|emporaryVariable|ensorQ|etrahedronBox|etrahedronBoxOptions|ext3DBox|ext3DBoxOptions|extBand|extBoundingBox|extBox|extForm|extLine|extParagraph|hisLink|itleGrouping|oColor|oggle|oggleFalse|ogglerBox|ogglerBoxOptions|ooBig|ooltipBox|ooltipBoxOptions|otalHeight|raceAction|raceInternal|raceLevel|rackCellChangeTimes|raditionalNotation|raditionalOrder|ransparentColor|rapEnterKey|rapSelection|ubeBSplineCurveBox|ubeBSplineCurveBoxOptions|ubeBezierCurveBox|ubeBezierCurveBoxOptions|ubeBox|ubeBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:U(?:ntrackedVariables|p|seGraphicsRange|serDefinedWavelet|sing))(?![`$[:alnum:]])",
+          "match": "System`U(?:ntrackedVariables|p|seGraphicsRange|serDefinedWavelet|sing)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:V(?:2Get|alueBox|alueBoxOptions|alueForm|aluesData|ectorGlyphData|erbose|ertical|erticalForm|iewPointSelectorSettings|iewPort|irtualGroupData|isibleCell))(?![`$[:alnum:]])",
+          "match": "System`V(?:2Get|alueBox|alueBoxOptions|alueForm|aluesData|ectorGlyphData|erbose|ertical|erticalForm|iewPointSelectorSettings|iewPort|irtualGroupData|isibleCell)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:W(?:aitUntil|ebPageMetaInformation|holeCellGroupOpener|indowPersistentStyles|indowSelected|indowWidth|olframAlphaDate|olframAlphaQuantity|olframAlphaResult|olframCloudSettings))(?![`$[:alnum:]])",
+          "match": "System`W(?:aitUntil|ebPageMetaInformation|holeCellGroupOpener|indowPersistentStyles|indowSelected|indowWidth|olframAlphaDate|olframAlphaQuantity|olframAlphaResult|olframCloudSettings)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:\\$(?:ActivationGroupID|ActivationUserRegistered|AddOnsDirectory|BoxForms|CloudConnection|CloudVersionNumber|CloudWolframEngineVersionNumber|ConditionHold|DefaultMailbox|DefaultPath|FinancialDataSource|GeoEntityTypes|GeoLocationPrecision|HTMLExportRules|HTTPRequest|LaunchDirectory|LicenseProcesses|LicenseSubprocesses|LicenseType|LinkSupported|LoadedFiles|MaxLicenseProcesses|MaxLicenseSubprocesses|MinorReleaseNumber|NetworkLicense|Off|OutputForms|PatchLevelID|PermissionsGroupBase|PipeSupported|PreferencesDirectory|PrintForms|PrintLiteral|RegisteredDeviceClasses|RegisteredUserName|SecuredAuthenticationKeyTokens|SetParentLink|SoundDisplay|SuppressInputFormHeads|SystemMemory|TraceOff|TraceOn|TracePattern|TracePostAction|TracePreAction|UserAgentLanguages|UserAgentMachine|UserAgentName|UserAgentOperatingSystem|UserAgentVersion|UserName))(?![`$[:alnum:]])",
+          "match": "System`\\$(?:ActivationGroupID|ActivationUserRegistered|AddOnsDirectory|BoxForms|CloudConnection|CloudVersionNumber|CloudWolframEngineVersionNumber|ConditionHold|DefaultMailbox|DefaultPath|FinancialDataSource|GeoEntityTypes|GeoLocationPrecision|HTMLExportRules|HTTPRequest|LaunchDirectory|LicenseProcesses|LicenseSubprocesses|LicenseType|LinkSupported|LoadedFiles|MaxLicenseProcesses|MaxLicenseSubprocesses|MinorReleaseNumber|NetworkLicense|Off|OutputForms|PatchLevelID|PermissionsGroupBase|PipeSupported|PreferencesDirectory|PrintForms|PrintLiteral|RegisteredDeviceClasses|RegisteredUserName|SecuredAuthenticationKeyTokens|SetParentLink|SoundDisplay|SuppressInputFormHeads|SystemMemory|TraceOff|TraceOn|TracePattern|TracePostAction|TracePreAction|UserAgentLanguages|UserAgentMachine|UserAgentName|UserAgentOperatingSystem|UserAgentVersion|UserName)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "System`(?:A(?:ctiveClassification|ctiveClassificationObject|ctivePrediction|ctivePredictionObject|ddToSearchIndex|ggregatedEntityClass|ggregationLayer|ngleBisector|nimatedImage|nimationVideo|nomalyDetector|ppendLayer|pplication|pplyReaction|round|roundReplace|rrayReduce|sk|skAppend|skConfirm|skDisplay|skFunction|skState|skTemplateDisplay|skedQ|skedValue|ssessmentFunction|ssessmentResultObject|ssumeDeterministic|stroAngularSeparation|stroBackground|stroCenter|stroDistance|stroGraphics|stroGridLines|stroGridLinesStyle|stroPosition|stroProjection|stroRange|stroRangePadding|stroReferenceFrame|stroStyling|stroZoomLevel|tom|tomCoordinates|tomCount|tomDiagramCoordinates|tomLabelStyle|tomLabels|tomList|ttachCell|ttentionLayer|udioAnnotate|udioAnnotationLookup|udioIdentify|udioInstanceQ|udioPause|udioPlay|udioRecord|udioStop|udioStream|udioStreams|udioTrackApply|udioTrackSelection|utocomplete|utocompletionFunction|xiomaticTheory|xisLabel|xisObject|xisStyle))(?![`$[:alnum:]])",
+          "match": "System`A(?:ctiveClassification|ctiveClassificationObject|ctivePrediction|ctivePredictionObject|ddToSearchIndex|ggregatedEntityClass|ggregationLayer|ngleBisector|nimatedImage|nimationVideo|nomalyDetector|ppendLayer|pplication|pplyReaction|round|roundReplace|rrayReduce|sk|skAppend|skConfirm|skDisplay|skFunction|skState|skTemplateDisplay|skedQ|skedValue|ssessmentFunction|ssessmentResultObject|ssumeDeterministic|stroAngularSeparation|stroBackground|stroCenter|stroDistance|stroGraphics|stroGridLines|stroGridLinesStyle|stroPosition|stroProjection|stroRange|stroRangePadding|stroReferenceFrame|stroStyling|stroZoomLevel|tom|tomCoordinates|tomCount|tomDiagramCoordinates|tomLabelStyle|tomLabels|tomList|ttachCell|ttentionLayer|udioAnnotate|udioAnnotationLookup|udioIdentify|udioInstanceQ|udioPause|udioPlay|udioRecord|udioStop|udioStream|udioStreams|udioTrackApply|udioTrackSelection|utocomplete|utocompletionFunction|xiomaticTheory|xisLabel|xisObject|xisStyle)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:B(?:asicRecurrentLayer|atchNormalizationLayer|atchSize|ayesianMaximization|ayesianMaximizationObject|ayesianMinimization|ayesianMinimizationObject|esagL|innedVariogramList|inomialPointProcess|ioSequence|ioSequenceBackTranslateList|ioSequenceComplement|ioSequenceInstances|ioSequenceModify|ioSequencePlot|ioSequenceQ|ioSequenceReverseComplement|ioSequenceTranscribe|ioSequenceTranslate|itRate|lockDiagonalMatrix|lockLowerTriangularMatrix|lockUpperTriangularMatrix|lockchainAddressData|lockchainBase|lockchainBlockData|lockchainContractValue|lockchainData|lockchainGet|lockchainKeyEncode|lockchainPut|lockchainTokenData|lockchainTransaction|lockchainTransactionData|lockchainTransactionSign|lockchainTransactionSubmit|ond|ondCount|ondLabelStyle|ondLabels|ondList|ondQ|uildCompiledComponent))(?![`$[:alnum:]])",
+          "match": "System`B(?:asicRecurrentLayer|atchNormalizationLayer|atchSize|ayesianMaximization|ayesianMaximizationObject|ayesianMinimization|ayesianMinimizationObject|esagL|innedVariogramList|inomialPointProcess|ioSequence|ioSequenceBackTranslateList|ioSequenceComplement|ioSequenceInstances|ioSequenceModify|ioSequencePlot|ioSequenceQ|ioSequenceReverseComplement|ioSequenceTranscribe|ioSequenceTranslate|itRate|lockDiagonalMatrix|lockLowerTriangularMatrix|lockUpperTriangularMatrix|lockchainAddressData|lockchainBase|lockchainBlockData|lockchainContractValue|lockchainData|lockchainGet|lockchainKeyEncode|lockchainPut|lockchainTokenData|lockchainTransaction|lockchainTransactionData|lockchainTransactionSign|lockchainTransactionSubmit|ond|ondCount|ondLabelStyle|ondLabels|ondList|ondQ|uildCompiledComponent)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:C(?:TCLossLayer|achePersistence|anvas|ast|ategoricalDistribution|atenateLayer|auchyPointProcess|hannelBase|hannelBrokerAction|hannelHistoryLength|hannelListen|hannelListener|hannelListeners|hannelObject|hannelReceiverFunction|hannelSend|hannelSubscribers|haracterNormalize|hemicalConvert|hemicalFormula|hemicalInstance|hemicalReaction|loudExpression|loudExpressions|loudRenderingMethod|ombinatorB|ombinatorC|ombinatorI|ombinatorK|ombinatorS|ombinatorW|ombinatorY|ombinedEntityClass|ompiledCodeFunction|ompiledComponent|ompiledExpressionDeclaration|ompiledLayer|ompilerCallback|ompilerEnvironment|ompilerEnvironmentAppendTo|ompilerEnvironmentObject|ompilerOptions|omplementedEntityClass|omputeUncertainty|onfirmQuiet|onformationMethod|onnectSystemModelComponents|onnectSystemModelController|onnectedMoleculeComponents|onnectedMoleculeQ|onnectionSettings|ontaining|ontentDetectorFunction|ontentFieldOptions|ontentLocationFunction|ontentObject|ontrastiveLossLayer|onvolutionLayer|reateChannel|reateCloudExpression|reateCompilerEnvironment|reateDataStructure|reateDataSystemModel|reateLicenseEntitlement|reateSearchIndex|reateSystemModel|reateTypeInstance|rossEntropyLossLayer|urrentNotebookImage|urrentScreenImage|urryApplied))(?![`$[:alnum:]])",
+          "match": "System`C(?:TCLossLayer|achePersistence|anvas|ast|ategoricalDistribution|atenateLayer|auchyPointProcess|hannelBase|hannelBrokerAction|hannelHistoryLength|hannelListen|hannelListener|hannelListeners|hannelObject|hannelReceiverFunction|hannelSend|hannelSubscribers|haracterNormalize|hemicalConvert|hemicalFormula|hemicalInstance|hemicalReaction|loudExpression|loudExpressions|loudRenderingMethod|ombinatorB|ombinatorC|ombinatorI|ombinatorK|ombinatorS|ombinatorW|ombinatorY|ombinedEntityClass|ompiledCodeFunction|ompiledComponent|ompiledExpressionDeclaration|ompiledLayer|ompilerCallback|ompilerEnvironment|ompilerEnvironmentAppendTo|ompilerEnvironmentObject|ompilerOptions|omplementedEntityClass|omputeUncertainty|onfirmQuiet|onformationMethod|onnectSystemModelComponents|onnectSystemModelController|onnectedMoleculeComponents|onnectedMoleculeQ|onnectionSettings|ontaining|ontentDetectorFunction|ontentFieldOptions|ontentLocationFunction|ontentObject|ontrastiveLossLayer|onvolutionLayer|reateChannel|reateCloudExpression|reateCompilerEnvironment|reateDataStructure|reateDataSystemModel|reateLicenseEntitlement|reateSearchIndex|reateSystemModel|reateTypeInstance|rossEntropyLossLayer|urrentNotebookImage|urrentScreenImage|urryApplied)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:D(?:SolveChangeVariables|ataStructure|ataStructureQ|atabaseConnect|atabaseDisconnect|atabaseReference|atabinSubmit|ateInterval|eclareCompiledComponent|econvolutionLayer|ecryptFile|eleteChannel|eleteCloudExpression|eleteElements|eleteSearchIndex|erivedKey|iggleGatesPointProcess|iggleGrattonPointProcess|igitalSignature|isableFormatting|ocumentWeightingRules|otLayer|ownValuesFunction|ropoutLayer|ynamicImage))(?![`$[:alnum:]])",
+          "match": "System`D(?:SolveChangeVariables|ataStructure|ataStructureQ|atabaseConnect|atabaseDisconnect|atabaseReference|atabinSubmit|ateInterval|eclareCompiledComponent|econvolutionLayer|ecryptFile|eleteChannel|eleteCloudExpression|eleteElements|eleteSearchIndex|erivedKey|iggleGatesPointProcess|iggleGrattonPointProcess|igitalSignature|isableFormatting|ocumentWeightingRules|otLayer|ownValuesFunction|ropoutLayer|ynamicImage)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:E(?:choTiming|lementwiseLayer|mbeddedSQLEntityClass|mbeddedSQLExpression|mbeddingLayer|mptySpaceF|ncryptFile|ntityFunction|ntityStore|stimatedPointProcess|stimatedVariogramModel|valuationEnvironment|valuationPrivileges|xpirationDate|xpressionTree|xtendedEntityClass|xternalEvaluate|xternalFunction|xternalIdentifier|xternalObject|xternalSessionObject|xternalSessions|xternalStorageBase|xternalStorageDownload|xternalStorageGet|xternalStorageObject|xternalStoragePut|xternalStorageUpload|xternalValue|xtractLayer))(?![`$[:alnum:]])",
+          "match": "System`E(?:choTiming|lementwiseLayer|mbeddedSQLEntityClass|mbeddedSQLExpression|mbeddingLayer|mptySpaceF|ncryptFile|ntityFunction|ntityStore|stimatedPointProcess|stimatedVariogramModel|valuationEnvironment|valuationPrivileges|xpirationDate|xpressionTree|xtendedEntityClass|xternalEvaluate|xternalFunction|xternalIdentifier|xternalObject|xternalSessionObject|xternalSessions|xternalStorageBase|xternalStorageDownload|xternalStorageGet|xternalStorageObject|xternalStoragePut|xternalStorageUpload|xternalValue|xtractLayer)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:F(?:aceRecognize|eatureDistance|eatureExtract|eatureExtraction|eatureExtractor|eatureExtractorFunction|ileConvert|ileFormatProperties|ileNameToFormatList|ileSystemTree|ilteredEntityClass|indChannels|indEquationalProof|indExternalEvaluators|indGeometricConjectures|indImageText|indIsomers|indMoleculeSubstructure|indPointProcessParameters|indSystemModelEquilibrium|indTextualAnswer|lattenLayer|orAllType|ormControl|orwardCloudCredentials|oxHReduce|rameListVideo|romRawPointer|unctionCompile|unctionCompileExport|unctionCompileExportByteArray|unctionCompileExportLibrary|unctionCompileExportString|unctionDeclaration|unctionLayer|unctionPoles))(?![`$[:alnum:]])",
+          "match": "System`F(?:aceRecognize|eatureDistance|eatureExtract|eatureExtraction|eatureExtractor|eatureExtractorFunction|ileConvert|ileFormatProperties|ileNameToFormatList|ileSystemTree|ilteredEntityClass|indChannels|indEquationalProof|indExternalEvaluators|indGeometricConjectures|indImageText|indIsomers|indMoleculeSubstructure|indPointProcessParameters|indSystemModelEquilibrium|indTextualAnswer|lattenLayer|orAllType|ormControl|orwardCloudCredentials|oxHReduce|rameListVideo|romRawPointer|unctionCompile|unctionCompileExport|unctionCompileExportByteArray|unctionCompileExportLibrary|unctionCompileExportString|unctionDeclaration|unctionLayer|unctionPoles)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:G(?:alleryView|atedRecurrentLayer|enerateDerivedKey|enerateDigitalSignature|enerateFileSignature|enerateSecuredAuthenticationKey|eneratedAssetFormat|eneratedAssetLocation|eoGraphValuePlot|eoOrientationData|eometricAssertion|eometricScene|eometricStep|eometricStylingRules|eometricTest|ibbsPointProcess|raphTree|ridVideo))(?![`$[:alnum:]])",
+          "match": "System`G(?:alleryView|atedRecurrentLayer|enerateDerivedKey|enerateDigitalSignature|enerateFileSignature|enerateSecuredAuthenticationKey|eneratedAssetFormat|eneratedAssetLocation|eoGraphValuePlot|eoOrientationData|eometricAssertion|eometricScene|eometricStep|eometricStylingRules|eometricTest|ibbsPointProcess|raphTree|ridVideo)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:H(?:andlerFunctions|andlerFunctionsKeys|ardcorePointProcess|istogramPointDensity))(?![`$[:alnum:]])",
+          "match": "System`H(?:andlerFunctions|andlerFunctionsKeys|ardcorePointProcess|istogramPointDensity)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:I(?:gnoreIsotopes|gnoreStereochemistry|mageAugmentationLayer|mageBoundingBoxes|mageCases|mageContainsQ|mageContents|mageGraphics|magePosition|magePyramid|magePyramidApply|mageStitch|mportedObject|ncludeAromaticBonds|ncludeHydrogens|ncludeRelatedTables|nertEvaluate|nertExpression|nfiniteFuture|nfinitePast|nhomogeneousPoissonPointProcess|nitialEvaluationHistory|nitializationObject|nitializationObjects|nitializationValue|nitialize|nputPorts|ntegrateChangeVariables|nterfaceSwitched|ntersectedEntityClass|nverseImagePyramid))(?![`$[:alnum:]])",
+          "match": "System`I(?:gnoreIsotopes|gnoreStereochemistry|mageAugmentationLayer|mageBoundingBoxes|mageCases|mageContainsQ|mageContents|mageGraphics|magePosition|magePyramid|magePyramidApply|mageStitch|mportedObject|ncludeAromaticBonds|ncludeHydrogens|ncludeRelatedTables|nertEvaluate|nertExpression|nfiniteFuture|nfinitePast|nhomogeneousPoissonPointProcess|nitialEvaluationHistory|nitializationObject|nitializationObjects|nitializationValue|nitialize|nputPorts|ntegrateChangeVariables|nterfaceSwitched|ntersectedEntityClass|nverseImagePyramid)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:K(?:ernelConfiguration|ernelFunction))(?![`$[:alnum:]])",
+          "match": "System`Kernel(?:Configuration|Function)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:L(?:earningRateMultipliers|ibraryFunctionDeclaration|icenseEntitlementObject|icenseEntitlements|icensingSettings|inearLayer|iteralType|oadCompiledComponent|ocalResponseNormalizationLayer|ongShortTermMemoryLayer|ossFunction))(?![`$[:alnum:]])",
+          "match": "System`L(?:earningRateMultipliers|ibraryFunctionDeclaration|icenseEntitlementObject|icenseEntitlements|icensingSettings|inearLayer|iteralType|oadCompiledComponent|ocalResponseNormalizationLayer|ongShortTermMemoryLayer|ossFunction)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:M(?:IMETypeToFormatList|ailExecute|ailFolder|ailItem|ailSearch|ailServerConnect|ailServerConnection|aternPointProcess|axDisplayedChildren|axTrainingRounds|axWordGap|eanAbsoluteLossLayer|eanAround|eanPointDensity|eanSquaredLossLayer|ergingFunction|idpoint|issingValuePattern|issingValueSynthesis|olecule|oleculeAlign|oleculeContainsQ|oleculeDraw|oleculeFreeQ|oleculeGraph|oleculeMatchQ|oleculeMaximumCommonSubstructure|oleculeModify|oleculeName|oleculePattern|oleculePlot|oleculePlot3D|oleculeProperty|oleculeQ|oleculeRecognize|oleculeSubstructureCount|oleculeValue))(?![`$[:alnum:]])",
+          "match": "System`M(?:IMETypeToFormatList|ailExecute|ailFolder|ailItem|ailSearch|ailServerConnect|ailServerConnection|aternPointProcess|axDisplayedChildren|axTrainingRounds|axWordGap|eanAbsoluteLossLayer|eanAround|eanPointDensity|eanSquaredLossLayer|ergingFunction|idpoint|issingValuePattern|issingValueSynthesis|olecule|oleculeAlign|oleculeContainsQ|oleculeDraw|oleculeFreeQ|oleculeGraph|oleculeMatchQ|oleculeMaximumCommonSubstructure|oleculeModify|oleculeName|oleculePattern|oleculePlot|oleculePlot3D|oleculeProperty|oleculeQ|oleculeRecognize|oleculeSubstructureCount|oleculeValue)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:N(?:BodySimulation|BodySimulationData|earestNeighborG|estTree|etAppend|etArray|etArrayLayer|etBidirectionalOperator|etChain|etDecoder|etDelete|etDrop|etEncoder|etEvaluationMode|etExternalObject|etExtract|etFlatten|etFoldOperator|etGANOperator|etGraph|etInitialize|etInsert|etInsertSharedArrays|etJoin|etMapOperator|etMapThreadOperator|etMeasurements|etModel|etNestOperator|etPairEmbeddingOperator|etPort|etPortGradient|etPrepend|etRename|etReplace|etReplacePart|etStateObject|etTake|etTrain|etTrainResultsObject|etUnfold|etworkPacketCapture|etworkPacketRecording|etworkPacketTrace|eymanScottPointProcess|ominalScale|ormalizationLayer|umericArray|umericArrayQ|umericArrayType))(?![`$[:alnum:]])",
+          "match": "System`N(?:BodySimulation|BodySimulationData|earestNeighborG|estTree|etAppend|etArray|etArrayLayer|etBidirectionalOperator|etChain|etDecoder|etDelete|etDrop|etEncoder|etEvaluationMode|etExternalObject|etExtract|etFlatten|etFoldOperator|etGANOperator|etGraph|etInitialize|etInsert|etInsertSharedArrays|etJoin|etMapOperator|etMapThreadOperator|etMeasurements|etModel|etNestOperator|etPairEmbeddingOperator|etPort|etPortGradient|etPrepend|etRename|etReplace|etReplacePart|etStateObject|etTake|etTrain|etTrainResultsObject|etUnfold|etworkPacketCapture|etworkPacketRecording|etworkPacketTrace|eymanScottPointProcess|ominalScale|ormalizationLayer|umericArray|umericArrayQ|umericArrayType)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:O(?:peratorApplied|rderingLayer|rdinalScale|utputPorts|verlayVideo))(?![`$[:alnum:]])",
+          "match": "System`O(?:peratorApplied|rderingLayer|rdinalScale|utputPorts|verlayVideo)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:P(?:acletSymbol|addingLayer|agination|airCorrelationG|arametricRampLayer|arentEdgeLabel|arentEdgeLabelFunction|arentEdgeLabelStyle|arentEdgeShapeFunction|arentEdgeStyle|arentEdgeStyleFunction|artLayer|artProtection|atternFilling|atternReaction|enttinenPointProcess|erpendicularBisector|ersistenceLocation|ersistenceTime|ersistentObject|ersistentObjects|ersistentSymbol|itchRecognize|laceholderLayer|laybackSettings|ointCountDistribution|ointDensity|ointDensityFunction|ointProcessEstimator|ointProcessFitTest|ointProcessParameterAssumptions|ointProcessParameterQ|ointStatisticFunction|ointValuePlot|oissonPointProcess|oolingLayer|rependLayer|roofObject|ublisherID))(?![`$[:alnum:]])",
+          "match": "System`P(?:acletSymbol|addingLayer|agination|airCorrelationG|arametricRampLayer|arentEdgeLabel|arentEdgeLabelFunction|arentEdgeLabelStyle|arentEdgeShapeFunction|arentEdgeStyle|arentEdgeStyleFunction|artLayer|artProtection|atternFilling|atternReaction|enttinenPointProcess|erpendicularBisector|ersistenceLocation|ersistenceTime|ersistentObject|ersistentObjects|ersistentSymbol|itchRecognize|laceholderLayer|laybackSettings|ointCountDistribution|ointDensity|ointDensityFunction|ointProcessEstimator|ointProcessFitTest|ointProcessParameterAssumptions|ointProcessParameterQ|ointStatisticFunction|ointValuePlot|oissonPointProcess|oolingLayer|rependLayer|roofObject|ublisherID)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:Q(?:uestionGenerator|uestionInterface|uestionObject|uestionSelector))(?![`$[:alnum:]])",
+          "match": "System`Question(?:Generator|Interface|Object|Selector)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:R(?:andomArrayLayer|andomInstance|andomPointConfiguration|andomTree|eactionBalance|eactionBalancedQ|ecalibrationFunction|egisterExternalEvaluator|elationalDatabase|emoteAuthorizationCaching|emoteBatchJobAbort|emoteBatchJobObject|emoteBatchJobs|emoteBatchMapSubmit|emoteBatchSubmissionEnvironment|emoteBatchSubmit|emoteConnect|emoteConnectionObject|emoteEvaluate|emoteFile|emoteInputFiles|emoteProviderSettings|emoteRun|emoteRunProcess|emovalConditions|emoveAudioStream|emoveChannelListener|emoveChannelSubscribers|emoveVideoStream|eplicateLayer|eshapeLayer|esizeLayer|esourceFunction|esourceRegister|esourceRemove|esourceSubmit|esourceSystemBase|esourceSystemPath|esourceUpdate|esourceVersion|everseApplied|ipleyK|ipleyRassonRegion|ootTree|ulesTree))(?![`$[:alnum:]])",
+          "match": "System`R(?:andomArrayLayer|andomInstance|andomPointConfiguration|andomTree|eactionBalance|eactionBalancedQ|ecalibrationFunction|egisterExternalEvaluator|elationalDatabase|emoteAuthorizationCaching|emoteBatchJobAbort|emoteBatchJobObject|emoteBatchJobs|emoteBatchMapSubmit|emoteBatchSubmissionEnvironment|emoteBatchSubmit|emoteConnect|emoteConnectionObject|emoteEvaluate|emoteFile|emoteInputFiles|emoteProviderSettings|emoteRun|emoteRunProcess|emovalConditions|emoveAudioStream|emoveChannelListener|emoveChannelSubscribers|emoveVideoStream|eplicateLayer|eshapeLayer|esizeLayer|esourceFunction|esourceRegister|esourceRemove|esourceSubmit|esourceSystemBase|esourceSystemPath|esourceUpdate|esourceVersion|everseApplied|ipleyK|ipleyRassonRegion|ootTree|ulesTree)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:S(?:ameTestProperties|ampledEntityClass|earchAdjustment|earchIndexObject|earchIndices|earchQueryString|earchResultObject|ecuredAuthenticationKey|ecuredAuthenticationKeys|ecurityCertificate|equenceIndicesLayer|equenceLastLayer|equenceMostLayer|equencePredict|equencePredictorFunction|equenceRestLayer|equenceReverseLayer|erviceRequest|erviceSubmit|etFileFormatProperties|etSystemModel|lideShowVideo|moothPointDensity|nippet|nippetsVideo|nubPolyhedron|oftmaxLayer|olidBoundaryLoadValue|olidDisplacementCondition|olidFixedCondition|olidMechanicsPDEComponent|olidMechanicsStrain|olidMechanicsStress|ortedEntityClass|ourceLink|patialBinnedPointData|patialBoundaryCorrection|patialEstimate|patialEstimatorFunction|patialJ|patialNoiseLevel|patialObservationRegionQ|patialPointData|patialPointSelect|patialRandomnessTest|patialTransformationLayer|patialTrendFunction|peakerMatchQ|peechCases|peechInterpreter|peechRecognize|plice|tartExternalSession|tartWebSession|tereochemistryElements|traussHardcorePointProcess|traussPointProcess|ubsetCases|ubsetCount|ubsetPosition|ubsetReplace|ubtitleTrackSelection|ummationLayer|ymmetricDifference|ynthesizeMissingValues|ystemCredential|ystemCredentialData|ystemCredentialKey|ystemCredentialKeys|ystemCredentialStoreObject|ystemInstall|ystemModel|ystemModelExamples|ystemModelLinearize|ystemModelMeasurements|ystemModelParametricSimulate|ystemModelPlot|ystemModelReliability|ystemModelSimulate|ystemModelSimulateSensitivity|ystemModelSimulationData|ystemModeler|ystemModels))(?![`$[:alnum:]])",
+          "match": "System`S(?:ameTestProperties|ampledEntityClass|earchAdjustment|earchIndexObject|earchIndices|earchQueryString|earchResultObject|ecuredAuthenticationKey|ecuredAuthenticationKeys|ecurityCertificate|equenceIndicesLayer|equenceLastLayer|equenceMostLayer|equencePredict|equencePredictorFunction|equenceRestLayer|equenceReverseLayer|erviceRequest|erviceSubmit|etFileFormatProperties|etSystemModel|lideShowVideo|moothPointDensity|nippet|nippetsVideo|nubPolyhedron|oftmaxLayer|olidBoundaryLoadValue|olidDisplacementCondition|olidFixedCondition|olidMechanicsPDEComponent|olidMechanicsStrain|olidMechanicsStress|ortedEntityClass|ourceLink|patialBinnedPointData|patialBoundaryCorrection|patialEstimate|patialEstimatorFunction|patialJ|patialNoiseLevel|patialObservationRegionQ|patialPointData|patialPointSelect|patialRandomnessTest|patialTransformationLayer|patialTrendFunction|peakerMatchQ|peechCases|peechInterpreter|peechRecognize|plice|tartExternalSession|tartWebSession|tereochemistryElements|traussHardcorePointProcess|traussPointProcess|ubsetCases|ubsetCount|ubsetPosition|ubsetReplace|ubtitleTrackSelection|ummationLayer|ymmetricDifference|ynthesizeMissingValues|ystemCredential|ystemCredentialData|ystemCredentialKey|ystemCredentialKeys|ystemCredentialStoreObject|ystemInstall|ystemModel|ystemModelExamples|ystemModelLinearize|ystemModelMeasurements|ystemModelParametricSimulate|ystemModelPlot|ystemModelReliability|ystemModelSimulate|ystemModelSimulateSensitivity|ystemModelSimulationData|ystemModeler|ystemModels)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:T(?:ableView|argetDevice|argetSystem|ernaryListPlot|ernaryPlotCorners|extCases|extContents|extElement|extPosition|extSearch|extSearchReport|extStructure|homasPointProcess|hreaded|hreadingLayer|ickDirection|ickLabelOrientation|ickLabelPositioning|ickLabels|ickLengths|ickPositions|oRawPointer|otalLayer|ourVideo|rainImageContentDetector|rainTextContentDetector|rainingProgressCheckpointing|rainingProgressFunction|rainingProgressMeasurements|rainingProgressReporting|rainingStoppingCriterion|rainingUpdateSchedule|ransposeLayer|ree|reeCases|reeChildren|reeCount|reeData|reeDelete|reeDepth|reeElementCoordinates|reeElementLabel|reeElementLabelFunction|reeElementLabelStyle|reeElementShape|reeElementShapeFunction|reeElementSize|reeElementSizeFunction|reeElementStyle|reeElementStyleFunction|reeExpression|reeExtract|reeFold|reeInsert|reeLayout|reeLeafCount|reeLeafQ|reeLeaves|reeLevel|reeMap|reeMapAt|reeOutline|reePosition|reeQ|reeReplacePart|reeRules|reeScan|reeSelect|reeSize|reeTraversalOrder|riangleCenter|riangleConstruct|riangleMeasurement|ypeDeclaration|ypeEvaluate|ypeOf|ypeSpecifier|yped))(?![`$[:alnum:]])",
+          "match": "System`T(?:ableView|argetDevice|argetSystem|ernaryListPlot|ernaryPlotCorners|extCases|extContents|extElement|extPosition|extSearch|extSearchReport|extStructure|homasPointProcess|hreaded|hreadingLayer|ickDirection|ickLabelOrientation|ickLabelPositioning|ickLabels|ickLengths|ickPositions|oRawPointer|otalLayer|ourVideo|rainImageContentDetector|rainTextContentDetector|rainingProgressCheckpointing|rainingProgressFunction|rainingProgressMeasurements|rainingProgressReporting|rainingStoppingCriterion|rainingUpdateSchedule|ransposeLayer|ree|reeCases|reeChildren|reeCount|reeData|reeDelete|reeDepth|reeElementCoordinates|reeElementLabel|reeElementLabelFunction|reeElementLabelStyle|reeElementShape|reeElementShapeFunction|reeElementSize|reeElementSizeFunction|reeElementStyle|reeElementStyleFunction|reeExpression|reeExtract|reeFold|reeInsert|reeLayout|reeLeafCount|reeLeafQ|reeLeaves|reeLevel|reeMap|reeMapAt|reeOutline|reePosition|reeQ|reeReplacePart|reeRules|reeScan|reeSelect|reeSize|reeTraversalOrder|riangleCenter|riangleConstruct|riangleMeasurement|ypeDeclaration|ypeEvaluate|ypeOf|ypeSpecifier|yped)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:U(?:RLDownloadSubmit|nconstrainedParameters|nionedEntityClass|niqueElements|nitVectorLayer|nlabeledTree|nmanageObject|nregisterExternalEvaluator|pdateSearchIndex|seEmbeddedLibrary))(?![`$[:alnum:]])",
+          "match": "System`U(?:RLDownloadSubmit|nconstrainedParameters|nionedEntityClass|niqueElements|nitVectorLayer|nlabeledTree|nmanageObject|nregisterExternalEvaluator|pdateSearchIndex|seEmbeddedLibrary)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:V(?:alenceErrorHandling|alenceFilling|aluePreprocessingFunction|andermondeMatrix|arianceGammaPointProcess|ariogramFunction|ariogramModel|ectorAround|erifyDerivedKey|erifyDigitalSignature|erifyFileSignature|erifyInterpretation|ideo|ideoCapture|ideoCombine|ideoDelete|ideoExtractFrames|ideoFrameList|ideoFrameMap|ideoGenerator|ideoInsert|ideoIntervals|ideoJoin|ideoMap|ideoMapList|ideoMapTimeSeries|ideoPadding|ideoPause|ideoPlay|ideoQ|ideoRecord|ideoReplace|ideoScreenCapture|ideoSplit|ideoStop|ideoStream|ideoStreams|ideoTimeStretch|ideoTrackSelection|ideoTranscode|ideoTransparency|ideoTrim))(?![`$[:alnum:]])",
+          "match": "System`V(?:alenceErrorHandling|alenceFilling|aluePreprocessingFunction|andermondeMatrix|arianceGammaPointProcess|ariogramFunction|ariogramModel|ectorAround|erifyDerivedKey|erifyDigitalSignature|erifyFileSignature|erifyInterpretation|ideo|ideoCapture|ideoCombine|ideoDelete|ideoExtractFrames|ideoFrameList|ideoFrameMap|ideoGenerator|ideoInsert|ideoIntervals|ideoJoin|ideoMap|ideoMapList|ideoMapTimeSeries|ideoPadding|ideoPause|ideoPlay|ideoQ|ideoRecord|ideoReplace|ideoScreenCapture|ideoSplit|ideoStop|ideoStream|ideoStreams|ideoTimeStretch|ideoTrackSelection|ideoTranscode|ideoTransparency|ideoTrim)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:W(?:ebAudioSearch|ebColumn|ebElementObject|ebExecute|ebImage|ebImageSearch|ebItem|ebRow|ebSearch|ebSessionObject|ebSessions|ebWindowObject|ikidataData|ikidataSearch|ikipediaSearch|ithCleanup|ithLock))(?![`$[:alnum:]])",
+          "match": "System`W(?:ebAudioSearch|ebColumn|ebElementObject|ebExecute|ebImage|ebImageSearch|ebItem|ebRow|ebSearch|ebSessionObject|ebSessions|ebWindowObject|ikidataData|ikidataSearch|ikipediaSearch|ithCleanup|ithLock)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:Z(?:oomCenter|oomFactor))(?![`$[:alnum:]])",
+          "match": "System`Zoom(?:Center|Factor)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:\\$(?:AllowExternalChannelFunctions|AudioDecoders|AudioEncoders|BlockchainBase|ChannelBase|CompilerEnvironment|CookieStore|CryptographicEllipticCurveNames|CurrentWebSession|DataStructures|DefaultNetworkInterface|DefaultProxyRules|DefaultRemoteBatchSubmissionEnvironment|DefaultRemoteKernel|DefaultSystemCredentialStore|ExternalIdentifierTypes|ExternalStorageBase|GeneratedAssetLocation|IncomingMailSettings|Initialization|InitializationContexts|MaxDisplayedChildren|NetworkInterfaces|NoValue|PersistenceBase|PersistencePath|PreInitialization|PublisherID|ResourceSystemBase|ResourceSystemPath|SSHAuthentication|ServiceCreditsAvailable|SourceLink|SubtitleDecoders|SubtitleEncoders|SystemCredentialStore|TargetSystems|TestFileName|VideoDecoders|VideoEncoders|VoiceStyles))(?![`$[:alnum:]])",
+          "match": "System`\\$(?:AllowExternalChannelFunctions|AudioDecoders|AudioEncoders|BlockchainBase|ChannelBase|CompilerEnvironment|CookieStore|CryptographicEllipticCurveNames|CurrentWebSession|DataStructures|DefaultNetworkInterface|DefaultProxyRules|DefaultRemoteBatchSubmissionEnvironment|DefaultRemoteKernel|DefaultSystemCredentialStore|ExternalIdentifierTypes|ExternalStorageBase|GeneratedAssetLocation|IncomingMailSettings|Initialization|InitializationContexts|MaxDisplayedChildren|NetworkInterfaces|NoValue|PersistenceBase|PersistencePath|PreInitialization|PublisherID|ResourceSystemBase|ResourceSystemPath|SSHAuthentication|ServiceCreditsAvailable|SourceLink|SubtitleDecoders|SubtitleEncoders|SystemCredentialStore|TargetSystems|TestFileName|VideoDecoders|VideoEncoders|VoiceStyles)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "System`(?:E(?:cho|xit))(?![`$[:alnum:]])",
+          "match": "System`E(?:cho|xit)(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "System`(?:I(?:n|nString))(?![`$[:alnum:]])",
+          "match": "System`In(?:|String)(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "System`(?:O(?:ut))(?![`$[:alnum:]])",
+          "match": "System`Out(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "System`(?:P(?:rint))(?![`$[:alnum:]])",
+          "match": "System`Print(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "System`(?:Q(?:uit))(?![`$[:alnum:]])",
+          "match": "System`Quit(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "System`(?:\\$(?:HistoryLength|Line|Post|Pre|PrePrint|PreRead|SyntaxHandler))(?![`$[:alnum:]])",
+          "match": "System`\\$(?:HistoryLength|Line|Post|Pre|PrePrint|PreRead|SyntaxHandler)(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "System`(?:[$[:alpha:]][$[:alnum:]]*)(?![`$[:alnum:]])",
+          "match": "System`[$[:alpha:]][$[:alnum:]]*(?![`$[:alnum:]])",
           "name": "invalid.illegal.system.wolfram"
         },
         {
-          "match": "(?:[$[:alpha:]][$[:alnum:]]*)(?:`(?:[$[:alpha:]][$[:alnum:]]*))+(?=\\s*(\\[(?!\\s*\\[)|@(?!@)))",
+          "match": "[$[:alpha:]][$[:alnum:]]*(?:`[$[:alpha:]][$[:alnum:]]*)+(?=\\s*(\\[(?!\\s*\\[)|@(?!@)))",
           "name": "variable.function.wolfram"
         },
         {
-          "match": "(?:[$[:alpha:]][$[:alnum:]]*)(?:`(?:[$[:alpha:]][$[:alnum:]]*))+",
+          "match": "[$[:alpha:]][$[:alnum:]]*(?:`[$[:alpha:]][$[:alnum:]]*)+",
           "name": "symbol.unrecognized.wolfram"
         },
         {
-          "match": "(?:[$[:alpha:]][$[:alnum:]]*)`",
+          "match": "[$[:alpha:]][$[:alnum:]]*`",
           "name": "invalid.illegal.wolfram"
         },
         {
-          "match": "(?:`(?:[$[:alpha:]][$[:alnum:]]*))+(?=\\s*(\\[(?!\\s*\\[)|@(?!@)))",
+          "match": "(?:`[$[:alpha:]][$[:alnum:]]*)+(?=\\s*(\\[(?!\\s*\\[)|@(?!@)))",
           "name": "variable.function.wolfram"
         },
         {
-          "match": "(?:`(?:[$[:alpha:]][$[:alnum:]]*))+",
+          "match": "(?:`[$[:alpha:]][$[:alnum:]]*)+",
           "name": "symbol.unrecognized.wolfram"
         },
         {
@@ -1720,647 +1720,647 @@
           "name": "invalid.illegal.wolfram"
         },
         {
-          "match": "(?:A(?:ASTriangle|PIFunction|RCHProcess|RIMAProcess|RMAProcess|RProcess|SATriangle|belianGroup|bort|bortKernels|bortProtect|bs|bsArg|bsArgPlot|bsoluteCorrelation|bsoluteCorrelationFunction|bsoluteCurrentValue|bsoluteDashing|bsoluteFileName|bsoluteOptions|bsolutePointSize|bsoluteThickness|bsoluteTime|bsoluteTiming|ccountingForm|ccumulate|ccuracy|cousticAbsorbingValue|cousticImpedanceValue|cousticNormalVelocityValue|cousticPDEComponent|cousticPressureCondition|cousticRadiationValue|cousticSoundHardValue|cousticSoundSoftCondition|ctionMenu|ctivate|cyclicGraphQ|ddSides|ddTo|ddUsers|djacencyGraph|djacencyList|djacencyMatrix|djacentMeshCells|djugate|djustTimeSeriesForecast|djustmentBox|dministrativeDivisionData|ffineHalfSpace|ffineSpace|ffineStateSpaceModel|ffineTransform|irPressureData|irSoundAttenuation|irTemperatureData|ircraftData|irportData|iryAi|iryAiPrime|iryAiZero|iryBi|iryBiPrime|iryBiZero|lgebraicIntegerQ|lgebraicNumber|lgebraicNumberDenominator|lgebraicNumberNorm|lgebraicNumberPolynomial|lgebraicNumberTrace|lgebraicUnitQ|llTrue|lphaChannel|lphabet|lphabeticOrder|lphabeticSort|lternatingFactorial|lternatingGroup|lternatives|mbientLight|mbiguityList|natomyData|natomyPlot3D|natomyStyling|nd|ndersonDarlingTest|ngerJ|ngleBracket|nglePath|nglePath3D|ngleVector|ngularGauge|nimate|nimator|nnotate|nnotation|nnotationDelete|nnotationKeys|nnotationValue|nnuity|nnuityDue|nnulus|nomalyDetection|nomalyDetectorFunction|ntihermitian|ntihermitianMatrixQ|ntisymmetric|ntisymmetricMatrixQ|ntonyms|nyOrder|nySubset|nyTrue|part|partSquareFree|ppellF1|ppend|ppendTo|pply|pplySides|pplyTo|rcCos|rcCosh|rcCot|rcCoth|rcCsc|rcCsch|rcCurvature|rcLength|rcSec|rcSech|rcSin|rcSinDistribution|rcSinh|rcTan|rcTanh|rea|rg|rgMax|rgMin|rgumentsOptions|rithmeticGeometricMean|rray|rrayComponents|rrayDepth|rrayFilter|rrayFlatten|rrayMesh|rrayPad|rrayPlot|rrayPlot3D|rrayQ|rrayResample|rrayReshape|rrayRules|rrays|rrow|rrowheads|ssert|ssociateTo|ssociation|ssociationMap|ssociationQ|ssociationThread|ssuming|symptotic|symptoticDSolveValue|symptoticEqual|symptoticEquivalent|symptoticExpectation|symptoticGreater|symptoticGreaterEqual|symptoticIntegrate|symptoticLess|symptoticLessEqual|symptoticOutputTracker|symptoticProbability|symptoticProduct|symptoticRSolveValue|symptoticSolve|symptoticSum|tomQ|ttributes|udio|udioAmplify|udioBlockMap|udioCapture|udioChannelCombine|udioChannelMix|udioChannelSeparate|udioChannels|udioData|udioDelay|udioDelete|udioDistance|udioFade|udioFrequencyShift|udioGenerator|udioInsert|udioIntervals|udioJoin|udioLength|udioLocalMeasurements|udioLoudness|udioMeasurements|udioNormalize|udioOverlay|udioPad|udioPan|udioPartition|udioPitchShift|udioPlot|udioQ|udioReplace|udioResample|udioReverb|udioReverse|udioSampleRate|udioSpectralMap|udioSpectralTransformation|udioSplit|udioTimeStretch|udioTrim|udioType|ugmentedPolyhedron|ugmentedSymmetricPolynomial|uthenticationDialog|utoRefreshed|utoSubmitting|utocorrelationTest))(?![`$[:alnum:]])",
+          "match": "A(?:ASTriangle|PIFunction|RCHProcess|RIMAProcess|RMAProcess|RProcess|SATriangle|belianGroup|bort|bortKernels|bortProtect|bs|bsArg|bsArgPlot|bsoluteCorrelation|bsoluteCorrelationFunction|bsoluteCurrentValue|bsoluteDashing|bsoluteFileName|bsoluteOptions|bsolutePointSize|bsoluteThickness|bsoluteTime|bsoluteTiming|ccountingForm|ccumulate|ccuracy|cousticAbsorbingValue|cousticImpedanceValue|cousticNormalVelocityValue|cousticPDEComponent|cousticPressureCondition|cousticRadiationValue|cousticSoundHardValue|cousticSoundSoftCondition|ctionMenu|ctivate|cyclicGraphQ|ddSides|ddTo|ddUsers|djacencyGraph|djacencyList|djacencyMatrix|djacentMeshCells|djugate|djustTimeSeriesForecast|djustmentBox|dministrativeDivisionData|ffineHalfSpace|ffineSpace|ffineStateSpaceModel|ffineTransform|irPressureData|irSoundAttenuation|irTemperatureData|ircraftData|irportData|iryAi|iryAiPrime|iryAiZero|iryBi|iryBiPrime|iryBiZero|lgebraicIntegerQ|lgebraicNumber|lgebraicNumberDenominator|lgebraicNumberNorm|lgebraicNumberPolynomial|lgebraicNumberTrace|lgebraicUnitQ|llTrue|lphaChannel|lphabet|lphabeticOrder|lphabeticSort|lternatingFactorial|lternatingGroup|lternatives|mbientLight|mbiguityList|natomyData|natomyPlot3D|natomyStyling|nd|ndersonDarlingTest|ngerJ|ngleBracket|nglePath|nglePath3D|ngleVector|ngularGauge|nimate|nimator|nnotate|nnotation|nnotationDelete|nnotationKeys|nnotationValue|nnuity|nnuityDue|nnulus|nomalyDetection|nomalyDetectorFunction|ntihermitian|ntihermitianMatrixQ|ntisymmetric|ntisymmetricMatrixQ|ntonyms|nyOrder|nySubset|nyTrue|part|partSquareFree|ppellF1|ppend|ppendTo|pply|pplySides|pplyTo|rcCos|rcCosh|rcCot|rcCoth|rcCsc|rcCsch|rcCurvature|rcLength|rcSec|rcSech|rcSin|rcSinDistribution|rcSinh|rcTan|rcTanh|rea|rg|rgMax|rgMin|rgumentsOptions|rithmeticGeometricMean|rray|rrayComponents|rrayDepth|rrayFilter|rrayFlatten|rrayMesh|rrayPad|rrayPlot|rrayPlot3D|rrayQ|rrayResample|rrayReshape|rrayRules|rrays|rrow|rrowheads|ssert|ssociateTo|ssociation|ssociationMap|ssociationQ|ssociationThread|ssuming|symptotic|symptoticDSolveValue|symptoticEqual|symptoticEquivalent|symptoticExpectation|symptoticGreater|symptoticGreaterEqual|symptoticIntegrate|symptoticLess|symptoticLessEqual|symptoticOutputTracker|symptoticProbability|symptoticProduct|symptoticRSolveValue|symptoticSolve|symptoticSum|tomQ|ttributes|udio|udioAmplify|udioBlockMap|udioCapture|udioChannelCombine|udioChannelMix|udioChannelSeparate|udioChannels|udioData|udioDelay|udioDelete|udioDistance|udioFade|udioFrequencyShift|udioGenerator|udioInsert|udioIntervals|udioJoin|udioLength|udioLocalMeasurements|udioLoudness|udioMeasurements|udioNormalize|udioOverlay|udioPad|udioPan|udioPartition|udioPitchShift|udioPlot|udioQ|udioReplace|udioResample|udioReverb|udioReverse|udioSampleRate|udioSpectralMap|udioSpectralTransformation|udioSplit|udioTimeStretch|udioTrim|udioType|ugmentedPolyhedron|ugmentedSymmetricPolynomial|uthenticationDialog|utoRefreshed|utoSubmitting|utocorrelationTest)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:B(?:SplineBasis|SplineCurve|SplineFunction|SplineSurface|abyMonsterGroupB|ackslash|all|and|andpassFilter|andstopFilter|arChart|arChart3D|arLegend|arabasiAlbertGraphDistribution|arcodeImage|arcodeRecognize|aringhausHenzeTest|arlowProschanImportance|arnesG|artlettHannWindow|artlettWindow|aseDecode|aseEncode|aseForm|atesDistribution|attleLemarieWavelet|ecause|eckmannDistribution|eep|egin|eginDialogPacket|eginPackage|ellB|ellY|enfordDistribution|eniniDistribution|enktanderGibratDistribution|enktanderWeibullDistribution|ernoulliB|ernoulliDistribution|ernoulliGraphDistribution|ernoulliProcess|ernsteinBasis|esselFilterModel|esselI|esselJ|esselJZero|esselK|esselY|esselYZero|eta|etaBinomialDistribution|etaDistribution|etaNegativeBinomialDistribution|etaPrimeDistribution|etaRegularized|etween|etweennessCentrality|eveledPolyhedron|ezierCurve|ezierFunction|ilateralFilter|ilateralLaplaceTransform|ilateralZTransform|inCounts|inLists|inarize|inaryDeserialize|inaryDistance|inaryImageQ|inaryRead|inaryReadList|inarySerialize|inaryWrite|inomial|inomialDistribution|inomialProcess|inormalDistribution|iorthogonalSplineWavelet|ipartiteGraphQ|iquadraticFilterModel|irnbaumImportance|irnbaumSaundersDistribution|itAnd|itClear|itGet|itLength|itNot|itOr|itSet|itShiftLeft|itShiftRight|itXor|iweightLocation|iweightMidvariance|lackmanHarrisWindow|lackmanNuttallWindow|lackmanWindow|lank|lankNullSequence|lankSequence|lend|lock|lockMap|lockRandom|lomqvistBeta|lomqvistBetaTest|lur|lurring|odePlot|ohmanWindow|oole|ooleanConsecutiveFunction|ooleanConvert|ooleanCountingFunction|ooleanFunction|ooleanGraph|ooleanMaxterms|ooleanMinimize|ooleanMinterms|ooleanQ|ooleanRegion|ooleanTable|ooleanVariables|orderDimensions|orelTannerDistribution|ottomHatTransform|oundaryDiscretizeGraphics|oundaryDiscretizeRegion|oundaryMesh|oundaryMeshRegion|oundaryMeshRegionQ|oundedRegionQ|oundingRegion|oxData|oxMatrix|oxObject|oxWhiskerChart|racketingBar|rayCurtisDistance|readthFirstScan|reak|ridgeData|rightnessEqualize|roadcastStationData|rownForsytheTest|rownianBridgeProcess|ubbleChart|ubbleChart3D|uckyballGraph|uildingData|ulletGauge|usinessDayQ|utterflyGraph|utterworthFilterModel|utton|uttonBar|uttonBox|uttonNotebook|yteArray|yteArrayFormat|yteArrayFormatQ|yteArrayQ|yteArrayToString|yteCount))(?![`$[:alnum:]])",
+          "match": "B(?:SplineBasis|SplineCurve|SplineFunction|SplineSurface|abyMonsterGroupB|ackslash|all|and|andpassFilter|andstopFilter|arChart|arChart3D|arLegend|arabasiAlbertGraphDistribution|arcodeImage|arcodeRecognize|aringhausHenzeTest|arlowProschanImportance|arnesG|artlettHannWindow|artlettWindow|aseDecode|aseEncode|aseForm|atesDistribution|attleLemarieWavelet|ecause|eckmannDistribution|eep|egin|eginDialogPacket|eginPackage|ellB|ellY|enfordDistribution|eniniDistribution|enktanderGibratDistribution|enktanderWeibullDistribution|ernoulliB|ernoulliDistribution|ernoulliGraphDistribution|ernoulliProcess|ernsteinBasis|esselFilterModel|esselI|esselJ|esselJZero|esselK|esselY|esselYZero|eta|etaBinomialDistribution|etaDistribution|etaNegativeBinomialDistribution|etaPrimeDistribution|etaRegularized|etween|etweennessCentrality|eveledPolyhedron|ezierCurve|ezierFunction|ilateralFilter|ilateralLaplaceTransform|ilateralZTransform|inCounts|inLists|inarize|inaryDeserialize|inaryDistance|inaryImageQ|inaryRead|inaryReadList|inarySerialize|inaryWrite|inomial|inomialDistribution|inomialProcess|inormalDistribution|iorthogonalSplineWavelet|ipartiteGraphQ|iquadraticFilterModel|irnbaumImportance|irnbaumSaundersDistribution|itAnd|itClear|itGet|itLength|itNot|itOr|itSet|itShiftLeft|itShiftRight|itXor|iweightLocation|iweightMidvariance|lackmanHarrisWindow|lackmanNuttallWindow|lackmanWindow|lank|lankNullSequence|lankSequence|lend|lock|lockMap|lockRandom|lomqvistBeta|lomqvistBetaTest|lur|lurring|odePlot|ohmanWindow|oole|ooleanConsecutiveFunction|ooleanConvert|ooleanCountingFunction|ooleanFunction|ooleanGraph|ooleanMaxterms|ooleanMinimize|ooleanMinterms|ooleanQ|ooleanRegion|ooleanTable|ooleanVariables|orderDimensions|orelTannerDistribution|ottomHatTransform|oundaryDiscretizeGraphics|oundaryDiscretizeRegion|oundaryMesh|oundaryMeshRegion|oundaryMeshRegionQ|oundedRegionQ|oundingRegion|oxData|oxMatrix|oxObject|oxWhiskerChart|racketingBar|rayCurtisDistance|readthFirstScan|reak|ridgeData|rightnessEqualize|roadcastStationData|rownForsytheTest|rownianBridgeProcess|ubbleChart|ubbleChart3D|uckyballGraph|uildingData|ulletGauge|usinessDayQ|utterflyGraph|utterworthFilterModel|utton|uttonBar|uttonBox|uttonNotebook|yteArray|yteArrayFormat|yteArrayFormatQ|yteArrayQ|yteArrayToString|yteCount)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:C(?:|DF|DFDeploy|DFWavelet|Form|MYKColor|SGRegion|SGRegionQ|SGRegionTree|alendarConvert|alendarData|allPacket|allout|anberraDistance|ancel|ancelButton|andlestickChart|anonicalGraph|anonicalName|anonicalWarpingCorrespondence|anonicalWarpingDistance|anonicalizePolygon|anonicalizePolyhedron|anonicalizeRegion|antorMesh|antorStaircase|ap|apForm|apitalDifferentialD|apitalize|apsuleShape|aputoD|arlemanLinearize|arlsonRC|arlsonRD|arlsonRE|arlsonRF|arlsonRG|arlsonRJ|arlsonRK|arlsonRM|armichaelLambda|aseSensitive|ases|ashflow|asoratian|atalanNumber|atch|atenate|auchyDistribution|auchyMatrix|auchyWindow|ayleyGraph|eiling|ell|ellGroup|ellGroupData|ellObject|ellPrint|ells|ellularAutomaton|ensoredDistribution|ensoring|enterArray|enterDot|enteredInterval|entralFeature|entralMoment|entralMomentGeneratingFunction|epstrogram|epstrogramArray|epstrumArray|hampernowneNumber|hanVeseBinarize|haracterCounts|haracterName|haracterRange|haracteristicFunction|haracteristicPolynomial|haracters|hebyshev1FilterModel|hebyshev2FilterModel|hebyshevT|hebyshevU|heck|heckAbort|heckArguments|heckbox|heckboxBar|hemicalData|hessboardDistance|hiDistribution|hiSquareDistribution|hineseRemainder|hoiceButtons|hoiceDialog|holeskyDecomposition|hop|hromaticPolynomial|hromaticityPlot|hromaticityPlot3D|ircle|ircleDot|ircleMinus|irclePlus|irclePoints|ircleThrough|ircleTimes|irculantGraph|ircularArcThrough|ircularOrthogonalMatrixDistribution|ircularQuaternionMatrixDistribution|ircularRealMatrixDistribution|ircularSymplecticMatrixDistribution|ircularUnitaryMatrixDistribution|ircumsphere|ityData|lassifierFunction|lassifierMeasurements|lassifierMeasurementsObject|lassify|lear|learAll|learAttributes|learCookies|learPermissions|learSystemCache|lebschGordan|lickPane|lickToCopy|lip|lock|lockGauge|lose|loseKernels|losenessCentrality|losing|loudAccountData|loudConnect|loudDeploy|loudDirectory|loudDisconnect|loudEvaluate|loudExport|loudFunction|loudGet|loudImport|loudLoggingData|loudObject|loudObjects|loudPublish|loudPut|loudSave|loudShare|loudSubmit|loudSymbol|loudUnshare|lusterClassify|lusteringComponents|lusteringMeasurements|lusteringTree|oefficient|oefficientArrays|oefficientList|oefficientRules|oifletWavelet|ollect|ollinearPoints|olon|olorBalance|olorCombine|olorConvert|olorData|olorDataFunction|olorDetect|olorDistance|olorNegate|olorProfileData|olorQ|olorQuantize|olorReplace|olorSeparate|olorSetter|olorSlider|olorToneMapping|olorize|olorsNear|olumn|ometData|ommonName|ommonUnits|ommonest|ommonestFilter|ommunityGraphPlot|ompanyData|ompatibleUnitQ|ompile|ompiledFunction|omplement|ompleteGraph|ompleteGraphQ|ompleteIntegral|ompleteKaryTree|omplex|omplexArrayPlot|omplexContourPlot|omplexExpand|omplexListPlot|omplexPlot|omplexPlot3D|omplexRegionPlot|omplexStreamPlot|omplexVectorPlot|omponentMeasurements|omposeList|omposeSeries|ompositeQ|omposition|ompoundElement|ompoundExpression|ompoundPoissonDistribution|ompoundPoissonProcess|ompoundRenewalProcess|ompress|oncaveHullMesh|ondition|onditionalExpression|onditioned|one|onfirm|onfirmAssert|onfirmBy|onfirmMatch|onformAudio|onformImages|ongruent|onicGradientFilling|onicHullRegion|onicOptimization|onjugate|onjugateTranspose|onjunction|onnectLibraryCallbackFunction|onnectedComponents|onnectedGraphComponents|onnectedGraphQ|onnectedMeshComponents|onnesWindow|onoverTest|onservativeConvectionPDETerm|onstantArray|onstantImage|onstantRegionQ|onstellationData|onstruct|ontainsAll|ontainsAny|ontainsExactly|ontainsNone|ontainsOnly|ontext|ontextToFileName|ontexts|ontinue|ontinuedFraction|ontinuedFractionK|ontinuousMarkovProcess|ontinuousTask|ontinuousTimeModelQ|ontinuousWaveletData|ontinuousWaveletTransform|ontourDetect|ontourPlot|ontourPlot3D|ontraharmonicMean|ontrol|ontrolActive|ontrollabilityGramian|ontrollabilityMatrix|ontrollableDecomposition|ontrollableModelQ|ontrollerInformation|ontrollerManipulate|ontrollerState|onvectionPDETerm|onvergents|onvexHullMesh|onvexHullRegion|onvexOptimization|onvexPolygonQ|onvexPolyhedronQ|onvexRegionQ|onvolve|onwayGroupCo1|onwayGroupCo2|onwayGroupCo3|oordinateBoundingBox|oordinateBoundingBoxArray|oordinateBounds|oordinateBoundsArray|oordinateChartData|oordinateTransform|oordinateTransformData|oplanarPoints|oprimeQ|oproduct|opulaDistribution|opyDatabin|opyDirectory|opyFile|opyToClipboard|oreNilpotentDecomposition|ornerFilter|orrelation|orrelationDistance|orrelationFunction|orrelationTest|os|osIntegral|osh|oshIntegral|osineDistance|osineWindow|ot|oth|oulombF|oulombG|oulombH1|oulombH2|ount|ountDistinct|ountDistinctBy|ountRoots|ountryData|ounts|ountsBy|ovariance|ovarianceFunction|oxIngersollRossProcess|oxModel|oxModelFit|oxianDistribution|ramerVonMisesTest|reateArchive|reateDatabin|reateDialog|reateDirectory|reateDocument|reateFile|reateManagedLibraryExpression|reateNotebook|reatePacletArchive|reatePalette|reatePermissionsGroup|reateUUID|reateWindow|riticalSection|riticalityFailureImportance|riticalitySuccessImportance|ross|rossMatrix|rossingCount|rossingDetect|rossingPolygon|sc|sch|ube|ubeRoot|uboid|umulant|umulantGeneratingFunction|umulativeFeatureImpactPlot|up|upCap|url|urrencyConvert|urrentDate|urrentImage|urrentValue|urvatureFlowFilter|ycleGraph|ycleIndexPolynomial|ycles|yclicGroup|yclotomic|ylinder|ylindricalDecomposition|ylindricalDecompositionFunction))(?![`$[:alnum:]])",
+          "match": "C(?:|DF|DFDeploy|DFWavelet|Form|MYKColor|SGRegion|SGRegionQ|SGRegionTree|alendarConvert|alendarData|allPacket|allout|anberraDistance|ancel|ancelButton|andlestickChart|anonicalGraph|anonicalName|anonicalWarpingCorrespondence|anonicalWarpingDistance|anonicalizePolygon|anonicalizePolyhedron|anonicalizeRegion|antorMesh|antorStaircase|ap|apForm|apitalDifferentialD|apitalize|apsuleShape|aputoD|arlemanLinearize|arlsonRC|arlsonRD|arlsonRE|arlsonRF|arlsonRG|arlsonRJ|arlsonRK|arlsonRM|armichaelLambda|aseSensitive|ases|ashflow|asoratian|atalanNumber|atch|atenate|auchyDistribution|auchyMatrix|auchyWindow|ayleyGraph|eiling|ell|ellGroup|ellGroupData|ellObject|ellPrint|ells|ellularAutomaton|ensoredDistribution|ensoring|enterArray|enterDot|enteredInterval|entralFeature|entralMoment|entralMomentGeneratingFunction|epstrogram|epstrogramArray|epstrumArray|hampernowneNumber|hanVeseBinarize|haracterCounts|haracterName|haracterRange|haracteristicFunction|haracteristicPolynomial|haracters|hebyshev1FilterModel|hebyshev2FilterModel|hebyshevT|hebyshevU|heck|heckAbort|heckArguments|heckbox|heckboxBar|hemicalData|hessboardDistance|hiDistribution|hiSquareDistribution|hineseRemainder|hoiceButtons|hoiceDialog|holeskyDecomposition|hop|hromaticPolynomial|hromaticityPlot|hromaticityPlot3D|ircle|ircleDot|ircleMinus|irclePlus|irclePoints|ircleThrough|ircleTimes|irculantGraph|ircularArcThrough|ircularOrthogonalMatrixDistribution|ircularQuaternionMatrixDistribution|ircularRealMatrixDistribution|ircularSymplecticMatrixDistribution|ircularUnitaryMatrixDistribution|ircumsphere|ityData|lassifierFunction|lassifierMeasurements|lassifierMeasurementsObject|lassify|lear|learAll|learAttributes|learCookies|learPermissions|learSystemCache|lebschGordan|lickPane|lickToCopy|lip|lock|lockGauge|lose|loseKernels|losenessCentrality|losing|loudAccountData|loudConnect|loudDeploy|loudDirectory|loudDisconnect|loudEvaluate|loudExport|loudFunction|loudGet|loudImport|loudLoggingData|loudObject|loudObjects|loudPublish|loudPut|loudSave|loudShare|loudSubmit|loudSymbol|loudUnshare|lusterClassify|lusteringComponents|lusteringMeasurements|lusteringTree|oefficient|oefficientArrays|oefficientList|oefficientRules|oifletWavelet|ollect|ollinearPoints|olon|olorBalance|olorCombine|olorConvert|olorData|olorDataFunction|olorDetect|olorDistance|olorNegate|olorProfileData|olorQ|olorQuantize|olorReplace|olorSeparate|olorSetter|olorSlider|olorToneMapping|olorize|olorsNear|olumn|ometData|ommonName|ommonUnits|ommonest|ommonestFilter|ommunityGraphPlot|ompanyData|ompatibleUnitQ|ompile|ompiledFunction|omplement|ompleteGraph|ompleteGraphQ|ompleteIntegral|ompleteKaryTree|omplex|omplexArrayPlot|omplexContourPlot|omplexExpand|omplexListPlot|omplexPlot|omplexPlot3D|omplexRegionPlot|omplexStreamPlot|omplexVectorPlot|omponentMeasurements|omposeList|omposeSeries|ompositeQ|omposition|ompoundElement|ompoundExpression|ompoundPoissonDistribution|ompoundPoissonProcess|ompoundRenewalProcess|ompress|oncaveHullMesh|ondition|onditionalExpression|onditioned|one|onfirm|onfirmAssert|onfirmBy|onfirmMatch|onformAudio|onformImages|ongruent|onicGradientFilling|onicHullRegion|onicOptimization|onjugate|onjugateTranspose|onjunction|onnectLibraryCallbackFunction|onnectedComponents|onnectedGraphComponents|onnectedGraphQ|onnectedMeshComponents|onnesWindow|onoverTest|onservativeConvectionPDETerm|onstantArray|onstantImage|onstantRegionQ|onstellationData|onstruct|ontainsAll|ontainsAny|ontainsExactly|ontainsNone|ontainsOnly|ontext|ontextToFileName|ontexts|ontinue|ontinuedFraction|ontinuedFractionK|ontinuousMarkovProcess|ontinuousTask|ontinuousTimeModelQ|ontinuousWaveletData|ontinuousWaveletTransform|ontourDetect|ontourPlot|ontourPlot3D|ontraharmonicMean|ontrol|ontrolActive|ontrollabilityGramian|ontrollabilityMatrix|ontrollableDecomposition|ontrollableModelQ|ontrollerInformation|ontrollerManipulate|ontrollerState|onvectionPDETerm|onvergents|onvexHullMesh|onvexHullRegion|onvexOptimization|onvexPolygonQ|onvexPolyhedronQ|onvexRegionQ|onvolve|onwayGroupCo1|onwayGroupCo2|onwayGroupCo3|oordinateBoundingBox|oordinateBoundingBoxArray|oordinateBounds|oordinateBoundsArray|oordinateChartData|oordinateTransform|oordinateTransformData|oplanarPoints|oprimeQ|oproduct|opulaDistribution|opyDatabin|opyDirectory|opyFile|opyToClipboard|oreNilpotentDecomposition|ornerFilter|orrelation|orrelationDistance|orrelationFunction|orrelationTest|os|osIntegral|osh|oshIntegral|osineDistance|osineWindow|ot|oth|oulombF|oulombG|oulombH1|oulombH2|ount|ountDistinct|ountDistinctBy|ountRoots|ountryData|ounts|ountsBy|ovariance|ovarianceFunction|oxIngersollRossProcess|oxModel|oxModelFit|oxianDistribution|ramerVonMisesTest|reateArchive|reateDatabin|reateDialog|reateDirectory|reateDocument|reateFile|reateManagedLibraryExpression|reateNotebook|reatePacletArchive|reatePalette|reatePermissionsGroup|reateUUID|reateWindow|riticalSection|riticalityFailureImportance|riticalitySuccessImportance|ross|rossMatrix|rossingCount|rossingDetect|rossingPolygon|sc|sch|ube|ubeRoot|uboid|umulant|umulantGeneratingFunction|umulativeFeatureImpactPlot|up|upCap|url|urrencyConvert|urrentDate|urrentImage|urrentValue|urvatureFlowFilter|ycleGraph|ycleIndexPolynomial|ycles|yclicGroup|yclotomic|ylinder|ylindricalDecomposition|ylindricalDecompositionFunction)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:D(?:|Eigensystem|Eigenvalues|GaussianWavelet|MSList|MSString|Solve|SolveValue|agumDistribution|amData|amerauLevenshteinDistance|arker|ashing|ataDistribution|atabin|atabinAdd|atabinUpload|atabins|ataset|ateBounds|ateDifference|ateHistogram|ateList|ateListLogPlot|ateListPlot|ateListStepPlot|ateObject|ateObjectQ|ateOverlapsQ|atePattern|atePlus|ateRange|ateScale|ateSelect|ateString|ateValue|ateWithinQ|ated|atedUnit|aubechiesWavelet|avisDistribution|awsonF|ayCount|ayHemisphere|ayMatchQ|ayName|ayNightTerminator|ayPlus|ayRange|ayRound|aylightQ|eBruijnGraph|eBruijnSequence|ecapitalize|ecimalForm|eclarePackage|ecompose|ecrement|ecrypt|edekindEta|eepSpaceProbeData|efault|efaultButton|efaultValues|efer|efineInputStreamMethod|efineOutputStreamMethod|efineResourceFunction|efinition|egreeCentrality|egreeGraphDistribution|el|elaunayMesh|elayed|elete|eleteAdjacentDuplicates|eleteAnomalies|eleteBorderComponents|eleteCases|eleteDirectory|eleteDuplicates|eleteDuplicatesBy|eleteFile|eleteMissing|eleteObject|eletePermissionsKey|eleteSmallComponents|eleteStopwords|elimitedSequence|endrogram|enominator|ensityHistogram|ensityPlot|ensityPlot3D|eploy|epth|epthFirstScan|erivative|erivativeFilter|erivativePDETerm|esignMatrix|et|eviceClose|eviceConfigure|eviceExecute|eviceExecuteAsynchronous|eviceObject|eviceOpen|eviceRead|eviceReadBuffer|eviceReadLatest|eviceReadList|eviceReadTimeSeries|eviceStreams|eviceWrite|eviceWriteBuffer|evices|iagonal|iagonalMatrix|iagonalMatrixQ|iagonalizableMatrixQ|ialog|ialogInput|ialogNotebook|ialogReturn|iamond|iamondMatrix|iceDissimilarity|ictionaryLookup|ictionaryWordQ|ifferenceDelta|ifferenceQuotient|ifferenceRoot|ifferenceRootReduce|ifferences|ifferentialD|ifferentialRoot|ifferentialRootReduce|ifferentiatorFilter|iffusionPDETerm|igitCount|igitQ|ihedralAngle|ihedralGroup|ilation|imensionReduce|imensionReducerFunction|imensionReduction|imensionalCombinations|imensionalMeshComponents|imensions|iracComb|iracDelta|irectedEdge|irectedGraph|irectedGraphQ|irectedInfinity|irectionalLight|irective|irectory|irectoryName|irectoryQ|irectoryStack|irichletBeta|irichletCharacter|irichletCondition|irichletConvolve|irichletDistribution|irichletEta|irichletL|irichletLambda|irichletTransform|irichletWindow|iscreteAsymptotic|iscreteChirpZTransform|iscreteConvolve|iscreteDelta|iscreteHadamardTransform|iscreteIndicator|iscreteInputOutputModel|iscreteLQEstimatorGains|iscreteLQRegulatorGains|iscreteLimit|iscreteLyapunovSolve|iscreteMarkovProcess|iscreteMaxLimit|iscreteMinLimit|iscretePlot|iscretePlot3D|iscreteRatio|iscreteRiccatiSolve|iscreteShift|iscreteTimeModelQ|iscreteUniformDistribution|iscreteWaveletData|iscreteWaveletPacketTransform|iscreteWaveletTransform|iscretizeGraphics|iscretizeRegion|iscriminant|isjointQ|isjunction|isk|iskMatrix|iskSegment|ispatch|isplayEndPacket|isplayForm|isplayPacket|istanceMatrix|istanceTransform|istribute|istributeDefinitions|istributed|istributionChart|istributionFitTest|istributionParameterAssumptions|istributionParameterQ|iv|ivide|ivideBy|ivideSides|ivisible|ivisorSigma|ivisorSum|ivisors|o|ocumentGenerator|ocumentGeneratorInformation|ocumentGenerators|ocumentNotebook|odecahedron|ominantColors|ominatorTreeGraph|ominatorVertexList|ot|otEqual|oubleBracketingBar|oubleDownArrow|oubleLeftArrow|oubleLeftRightArrow|oubleLeftTee|oubleLongLeftArrow|oubleLongLeftRightArrow|oubleLongRightArrow|oubleRightArrow|oubleRightTee|oubleUpArrow|oubleUpDownArrow|oubleVerticalBar|ownArrow|ownArrowBar|ownArrowUpArrow|ownLeftRightVector|ownLeftTeeVector|ownLeftVector|ownLeftVectorBar|ownRightTeeVector|ownRightVector|ownRightVectorBar|ownTee|ownTeeArrow|ownValues|ownsample|razinInverse|rop|ropShadowing|t|ualPlanarGraph|ualPolyhedron|ualSystemsModel|umpSave|uplicateFreeQ|uration|ynamic|ynamicGeoGraphics|ynamicModule|ynamicSetting|ynamicWrapper))(?![`$[:alnum:]])",
+          "match": "D(?:|Eigensystem|Eigenvalues|GaussianWavelet|MSList|MSString|Solve|SolveValue|agumDistribution|amData|amerauLevenshteinDistance|arker|ashing|ataDistribution|atabin|atabinAdd|atabinUpload|atabins|ataset|ateBounds|ateDifference|ateHistogram|ateList|ateListLogPlot|ateListPlot|ateListStepPlot|ateObject|ateObjectQ|ateOverlapsQ|atePattern|atePlus|ateRange|ateScale|ateSelect|ateString|ateValue|ateWithinQ|ated|atedUnit|aubechiesWavelet|avisDistribution|awsonF|ayCount|ayHemisphere|ayMatchQ|ayName|ayNightTerminator|ayPlus|ayRange|ayRound|aylightQ|eBruijnGraph|eBruijnSequence|ecapitalize|ecimalForm|eclarePackage|ecompose|ecrement|ecrypt|edekindEta|eepSpaceProbeData|efault|efaultButton|efaultValues|efer|efineInputStreamMethod|efineOutputStreamMethod|efineResourceFunction|efinition|egreeCentrality|egreeGraphDistribution|el|elaunayMesh|elayed|elete|eleteAdjacentDuplicates|eleteAnomalies|eleteBorderComponents|eleteCases|eleteDirectory|eleteDuplicates|eleteDuplicatesBy|eleteFile|eleteMissing|eleteObject|eletePermissionsKey|eleteSmallComponents|eleteStopwords|elimitedSequence|endrogram|enominator|ensityHistogram|ensityPlot|ensityPlot3D|eploy|epth|epthFirstScan|erivative|erivativeFilter|erivativePDETerm|esignMatrix|et|eviceClose|eviceConfigure|eviceExecute|eviceExecuteAsynchronous|eviceObject|eviceOpen|eviceRead|eviceReadBuffer|eviceReadLatest|eviceReadList|eviceReadTimeSeries|eviceStreams|eviceWrite|eviceWriteBuffer|evices|iagonal|iagonalMatrix|iagonalMatrixQ|iagonalizableMatrixQ|ialog|ialogInput|ialogNotebook|ialogReturn|iamond|iamondMatrix|iceDissimilarity|ictionaryLookup|ictionaryWordQ|ifferenceDelta|ifferenceQuotient|ifferenceRoot|ifferenceRootReduce|ifferences|ifferentialD|ifferentialRoot|ifferentialRootReduce|ifferentiatorFilter|iffusionPDETerm|igitCount|igitQ|ihedralAngle|ihedralGroup|ilation|imensionReduce|imensionReducerFunction|imensionReduction|imensionalCombinations|imensionalMeshComponents|imensions|iracComb|iracDelta|irectedEdge|irectedGraph|irectedGraphQ|irectedInfinity|irectionalLight|irective|irectory|irectoryName|irectoryQ|irectoryStack|irichletBeta|irichletCharacter|irichletCondition|irichletConvolve|irichletDistribution|irichletEta|irichletL|irichletLambda|irichletTransform|irichletWindow|iscreteAsymptotic|iscreteChirpZTransform|iscreteConvolve|iscreteDelta|iscreteHadamardTransform|iscreteIndicator|iscreteInputOutputModel|iscreteLQEstimatorGains|iscreteLQRegulatorGains|iscreteLimit|iscreteLyapunovSolve|iscreteMarkovProcess|iscreteMaxLimit|iscreteMinLimit|iscretePlot|iscretePlot3D|iscreteRatio|iscreteRiccatiSolve|iscreteShift|iscreteTimeModelQ|iscreteUniformDistribution|iscreteWaveletData|iscreteWaveletPacketTransform|iscreteWaveletTransform|iscretizeGraphics|iscretizeRegion|iscriminant|isjointQ|isjunction|isk|iskMatrix|iskSegment|ispatch|isplayEndPacket|isplayForm|isplayPacket|istanceMatrix|istanceTransform|istribute|istributeDefinitions|istributed|istributionChart|istributionFitTest|istributionParameterAssumptions|istributionParameterQ|iv|ivide|ivideBy|ivideSides|ivisible|ivisorSigma|ivisorSum|ivisors|o|ocumentGenerator|ocumentGeneratorInformation|ocumentGenerators|ocumentNotebook|odecahedron|ominantColors|ominatorTreeGraph|ominatorVertexList|ot|otEqual|oubleBracketingBar|oubleDownArrow|oubleLeftArrow|oubleLeftRightArrow|oubleLeftTee|oubleLongLeftArrow|oubleLongLeftRightArrow|oubleLongRightArrow|oubleRightArrow|oubleRightTee|oubleUpArrow|oubleUpDownArrow|oubleVerticalBar|ownArrow|ownArrowBar|ownArrowUpArrow|ownLeftRightVector|ownLeftTeeVector|ownLeftVector|ownLeftVectorBar|ownRightTeeVector|ownRightVector|ownRightVectorBar|ownTee|ownTeeArrow|ownValues|ownsample|razinInverse|rop|ropShadowing|t|ualPlanarGraph|ualPolyhedron|ualSystemsModel|umpSave|uplicateFreeQ|uration|ynamic|ynamicGeoGraphics|ynamicModule|ynamicSetting|ynamicWrapper)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:E(?:arthImpactData|arthquakeData|ccentricityCentrality|choEvaluation|choFunction|choLabel|dgeAdd|dgeBetweennessCentrality|dgeChromaticNumber|dgeConnectivity|dgeContract|dgeCount|dgeCoverQ|dgeCycleMatrix|dgeDelete|dgeDetect|dgeForm|dgeIndex|dgeList|dgeQ|dgeRules|dgeTaggedGraph|dgeTaggedGraphQ|dgeTags|dgeTransitiveGraphQ|dgeWeightedGraphQ|ditDistance|ffectiveInterest|igensystem|igenvalues|igenvectorCentrality|igenvectors|lement|lementData|liminate|llipsoid|llipticE|llipticExp|llipticExpPrime|llipticF|llipticFilterModel|llipticK|llipticLog|llipticNomeQ|llipticPi|llipticTheta|llipticThetaPrime|mbedCode|mbeddedHTML|mbeddedService|mitSound|mpiricalDistribution|mptyGraphQ|mptyRegion|nclose|ncode|ncrypt|ncryptedObject|nd|ndDialogPacket|ndPackage|ngineeringForm|nterExpressionPacket|nterTextPacket|ntity|ntityClass|ntityClassList|ntityCopies|ntityGroup|ntityInstance|ntityList|ntityPrefetch|ntityProperties|ntityProperty|ntityPropertyClass|ntityRegister|ntityStores|ntityTypeName|ntityUnregister|ntityValue|ntropy|ntropyFilter|nvironment|qual|qualTilde|qualTo|quilibrium|quirippleFilterKernel|quivalent|rf|rfc|rfi|rlangB|rlangC|rlangDistribution|rosion|rrorBox|stimatedBackground|stimatedDistribution|stimatedPointNormals|stimatedProcess|stimatorGains|stimatorRegulator|uclideanDistance|ulerAngles|ulerCharacteristic|ulerE|ulerMatrix|ulerPhi|ulerianGraphQ|valuate|valuatePacket|valuationBox|valuationCell|valuationData|valuationNotebook|valuationObject|venQ|ventData|ventHandler|ventSeries|xactBlackmanWindow|xactNumberQ|xampleData|xcept|xists|xoplanetData|xp|xpGammaDistribution|xpIntegralE|xpIntegralEi|xpToTrig|xpand|xpandAll|xpandDenominator|xpandFileName|xpandNumerator|xpectation|xponent|xponentialDistribution|xponentialGeneratingFunction|xponentialMovingAverage|xponentialPowerDistribution|xport|xportByteArray|xportForm|xportString|xpressionCell|xpressionGraph|xtendedGCD|xternalBundle|xtract|xtractArchive|xtractPacletArchive|xtremeValueDistribution))(?![`$[:alnum:]])",
+          "match": "E(?:arthImpactData|arthquakeData|ccentricityCentrality|choEvaluation|choFunction|choLabel|dgeAdd|dgeBetweennessCentrality|dgeChromaticNumber|dgeConnectivity|dgeContract|dgeCount|dgeCoverQ|dgeCycleMatrix|dgeDelete|dgeDetect|dgeForm|dgeIndex|dgeList|dgeQ|dgeRules|dgeTaggedGraph|dgeTaggedGraphQ|dgeTags|dgeTransitiveGraphQ|dgeWeightedGraphQ|ditDistance|ffectiveInterest|igensystem|igenvalues|igenvectorCentrality|igenvectors|lement|lementData|liminate|llipsoid|llipticE|llipticExp|llipticExpPrime|llipticF|llipticFilterModel|llipticK|llipticLog|llipticNomeQ|llipticPi|llipticTheta|llipticThetaPrime|mbedCode|mbeddedHTML|mbeddedService|mitSound|mpiricalDistribution|mptyGraphQ|mptyRegion|nclose|ncode|ncrypt|ncryptedObject|nd|ndDialogPacket|ndPackage|ngineeringForm|nterExpressionPacket|nterTextPacket|ntity|ntityClass|ntityClassList|ntityCopies|ntityGroup|ntityInstance|ntityList|ntityPrefetch|ntityProperties|ntityProperty|ntityPropertyClass|ntityRegister|ntityStores|ntityTypeName|ntityUnregister|ntityValue|ntropy|ntropyFilter|nvironment|qual|qualTilde|qualTo|quilibrium|quirippleFilterKernel|quivalent|rf|rfc|rfi|rlangB|rlangC|rlangDistribution|rosion|rrorBox|stimatedBackground|stimatedDistribution|stimatedPointNormals|stimatedProcess|stimatorGains|stimatorRegulator|uclideanDistance|ulerAngles|ulerCharacteristic|ulerE|ulerMatrix|ulerPhi|ulerianGraphQ|valuate|valuatePacket|valuationBox|valuationCell|valuationData|valuationNotebook|valuationObject|venQ|ventData|ventHandler|ventSeries|xactBlackmanWindow|xactNumberQ|xampleData|xcept|xists|xoplanetData|xp|xpGammaDistribution|xpIntegralE|xpIntegralEi|xpToTrig|xpand|xpandAll|xpandDenominator|xpandFileName|xpandNumerator|xpectation|xponent|xponentialDistribution|xponentialGeneratingFunction|xponentialMovingAverage|xponentialPowerDistribution|xport|xportByteArray|xportForm|xportString|xpressionCell|xpressionGraph|xtendedGCD|xternalBundle|xtract|xtractArchive|xtractPacletArchive|xtremeValueDistribution)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:F(?:ARIMAProcess|RatioDistribution|aceAlign|aceForm|acialFeatures|actor|actorInteger|actorList|actorSquareFree|actorSquareFreeList|actorTerms|actorTermsList|actorial|actorial2|actorialMoment|actorialMomentGeneratingFunction|actorialPower|ailure|ailureDistribution|ailureQ|areySequence|eatureImpactPlot|eatureNearest|eatureSpacePlot|eatureSpacePlot3D|eatureValueDependencyPlot|eatureValueImpactPlot|eedbackLinearize|etalGrowthData|ibonacci|ibonorial|ile|ileBaseName|ileByteCount|ileDate|ileExistsQ|ileExtension|ileFormat|ileFormatQ|ileHash|ileNameDepth|ileNameDrop|ileNameJoin|ileNameSetter|ileNameSplit|ileNameTake|ileNames|ilePrint|ileSize|ileSystemMap|ileSystemScan|ileTemplate|ileTemplateApply|ileType|illedCurve|illedTorus|illingTransform|ilterRules|inancialBond|inancialData|inancialDerivative|inancialIndicator|ind|indAnomalies|indArgMax|indArgMin|indClique|indClusters|indCookies|indCurvePath|indCycle|indDevices|indDistribution|indDistributionParameters|indDivisions|indEdgeColoring|indEdgeCover|indEdgeCut|indEdgeIndependentPaths|indEulerianCycle|indFaces|indFile|indFit|indFormula|indFundamentalCycles|indGeneratingFunction|indGeoLocation|indGeometricTransform|indGraphCommunities|indGraphIsomorphism|indGraphPartition|indHamiltonianCycle|indHamiltonianPath|indHiddenMarkovStates|indIndependentEdgeSet|indIndependentVertexSet|indInstance|indIntegerNullVector|indIsomorphicSubgraph|indKClan|indKClique|indKClub|indKPlex|indLibrary|indLinearRecurrence|indList|indMatchingColor|indMaxValue|indMaximum|indMaximumCut|indMaximumFlow|indMeshDefects|indMinValue|indMinimum|indMinimumCostFlow|indMinimumCut|indPath|indPeaks|indPermutation|indPlanarColoring|indPostmanTour|indProcessParameters|indRegionTransform|indRepeat|indRoot|indSequenceFunction|indShortestPath|indShortestTour|indSpanningTree|indSubgraphIsomorphism|indThreshold|indTransientRepeat|indVertexColoring|indVertexCover|indVertexCut|indVertexIndependentPaths|inishDynamic|initeAbelianGroupCount|initeGroupCount|initeGroupData|irst|irstCase|irstPassageTimeDistribution|irstPosition|ischerGroupFi22|ischerGroupFi23|ischerGroupFi24Prime|isherHypergeometricDistribution|isherRatioTest|isherZDistribution|it|ittedModel|ixedOrder|ixedPoint|ixedPointList|latShading|latTopWindow|latten|lattenAt|lightData|lipView|loor|lowPolynomial|old|oldList|oldPair|oldPairList|oldWhile|oldWhileList|or|orAll|ormBox|ormFunction|ormObject|ormPage|ormat|ormulaData|ormulaLookup|ortranForm|ourier|ourierCoefficient|ourierCosCoefficient|ourierCosSeries|ourierCosTransform|ourierDCT|ourierDCTFilter|ourierDCTMatrix|ourierDST|ourierDSTMatrix|ourierMatrix|ourierSequenceTransform|ourierSeries|ourierSinCoefficient|ourierSinSeries|ourierSinTransform|ourierTransform|ourierTrigSeries|oxH|ractionBox|ractionalBrownianMotionProcess|ractionalD|ractionalGaussianNoiseProcess|ractionalPart|rameBox|ramed|rechetDistribution|reeQ|renetSerretSystem|requencySamplingFilterKernel|resnelC|resnelF|resnelG|resnelS|robeniusNumber|robeniusSolve|romAbsoluteTime|romCharacterCode|romCoefficientRules|romContinuedFraction|romDMS|romDateString|romDigits|romEntity|romJulianDate|romLetterNumber|romPolarCoordinates|romRomanNumeral|romSphericalCoordinates|romUnixTime|rontEndExecute|rontEndToken|rontEndTokenExecute|ullDefinition|ullForm|ullGraphics|ullInformationOutputRegulator|ullRegion|ullSimplify|unction|unctionAnalytic|unctionBijective|unctionContinuous|unctionConvexity|unctionDiscontinuities|unctionDomain|unctionExpand|unctionInjective|unctionInterpolation|unctionMeromorphic|unctionMonotonicity|unctionPeriod|unctionRange|unctionSign|unctionSingularities|unctionSurjective|ussellVeselyImportance))(?![`$[:alnum:]])",
+          "match": "F(?:ARIMAProcess|RatioDistribution|aceAlign|aceForm|acialFeatures|actor|actorInteger|actorList|actorSquareFree|actorSquareFreeList|actorTerms|actorTermsList|actorial|actorial2|actorialMoment|actorialMomentGeneratingFunction|actorialPower|ailure|ailureDistribution|ailureQ|areySequence|eatureImpactPlot|eatureNearest|eatureSpacePlot|eatureSpacePlot3D|eatureValueDependencyPlot|eatureValueImpactPlot|eedbackLinearize|etalGrowthData|ibonacci|ibonorial|ile|ileBaseName|ileByteCount|ileDate|ileExistsQ|ileExtension|ileFormat|ileFormatQ|ileHash|ileNameDepth|ileNameDrop|ileNameJoin|ileNameSetter|ileNameSplit|ileNameTake|ileNames|ilePrint|ileSize|ileSystemMap|ileSystemScan|ileTemplate|ileTemplateApply|ileType|illedCurve|illedTorus|illingTransform|ilterRules|inancialBond|inancialData|inancialDerivative|inancialIndicator|ind|indAnomalies|indArgMax|indArgMin|indClique|indClusters|indCookies|indCurvePath|indCycle|indDevices|indDistribution|indDistributionParameters|indDivisions|indEdgeColoring|indEdgeCover|indEdgeCut|indEdgeIndependentPaths|indEulerianCycle|indFaces|indFile|indFit|indFormula|indFundamentalCycles|indGeneratingFunction|indGeoLocation|indGeometricTransform|indGraphCommunities|indGraphIsomorphism|indGraphPartition|indHamiltonianCycle|indHamiltonianPath|indHiddenMarkovStates|indIndependentEdgeSet|indIndependentVertexSet|indInstance|indIntegerNullVector|indIsomorphicSubgraph|indKClan|indKClique|indKClub|indKPlex|indLibrary|indLinearRecurrence|indList|indMatchingColor|indMaxValue|indMaximum|indMaximumCut|indMaximumFlow|indMeshDefects|indMinValue|indMinimum|indMinimumCostFlow|indMinimumCut|indPath|indPeaks|indPermutation|indPlanarColoring|indPostmanTour|indProcessParameters|indRegionTransform|indRepeat|indRoot|indSequenceFunction|indShortestPath|indShortestTour|indSpanningTree|indSubgraphIsomorphism|indThreshold|indTransientRepeat|indVertexColoring|indVertexCover|indVertexCut|indVertexIndependentPaths|inishDynamic|initeAbelianGroupCount|initeGroupCount|initeGroupData|irst|irstCase|irstPassageTimeDistribution|irstPosition|ischerGroupFi22|ischerGroupFi23|ischerGroupFi24Prime|isherHypergeometricDistribution|isherRatioTest|isherZDistribution|it|ittedModel|ixedOrder|ixedPoint|ixedPointList|latShading|latTopWindow|latten|lattenAt|lightData|lipView|loor|lowPolynomial|old|oldList|oldPair|oldPairList|oldWhile|oldWhileList|or|orAll|ormBox|ormFunction|ormObject|ormPage|ormat|ormulaData|ormulaLookup|ortranForm|ourier|ourierCoefficient|ourierCosCoefficient|ourierCosSeries|ourierCosTransform|ourierDCT|ourierDCTFilter|ourierDCTMatrix|ourierDST|ourierDSTMatrix|ourierMatrix|ourierSequenceTransform|ourierSeries|ourierSinCoefficient|ourierSinSeries|ourierSinTransform|ourierTransform|ourierTrigSeries|oxH|ractionBox|ractionalBrownianMotionProcess|ractionalD|ractionalGaussianNoiseProcess|ractionalPart|rameBox|ramed|rechetDistribution|reeQ|renetSerretSystem|requencySamplingFilterKernel|resnelC|resnelF|resnelG|resnelS|robeniusNumber|robeniusSolve|romAbsoluteTime|romCharacterCode|romCoefficientRules|romContinuedFraction|romDMS|romDateString|romDigits|romEntity|romJulianDate|romLetterNumber|romPolarCoordinates|romRomanNumeral|romSphericalCoordinates|romUnixTime|rontEndExecute|rontEndToken|rontEndTokenExecute|ullDefinition|ullForm|ullGraphics|ullInformationOutputRegulator|ullRegion|ullSimplify|unction|unctionAnalytic|unctionBijective|unctionContinuous|unctionConvexity|unctionDiscontinuities|unctionDomain|unctionExpand|unctionInjective|unctionInterpolation|unctionMeromorphic|unctionMonotonicity|unctionPeriod|unctionRange|unctionSign|unctionSingularities|unctionSurjective|ussellVeselyImportance)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:G(?:ARCHProcess|CD|aborFilter|aborMatrix|aborWavelet|ainMargins|ainPhaseMargins|alaxyData|amma|ammaDistribution|ammaRegularized|ather|atherBy|aussianFilter|aussianMatrix|aussianOrthogonalMatrixDistribution|aussianSymplecticMatrixDistribution|aussianUnitaryMatrixDistribution|aussianWindow|egenbauerC|eneralizedLinearModelFit|enerateAsymmetricKeyPair|enerateDocument|enerateHTTPResponse|enerateSymmetricKey|eneratingFunction|enericCylindricalDecomposition|enomeData|enomeLookup|eoAntipode|eoArea|eoBoundary|eoBoundingBox|eoBounds|eoBoundsRegion|eoBoundsRegionBoundary|eoBubbleChart|eoCircle|eoContourPlot|eoDensityPlot|eoDestination|eoDirection|eoDisk|eoDisplacement|eoDistance|eoDistanceList|eoElevationData|eoEntities|eoGraphPlot|eoGraphics|eoGridDirectionDifference|eoGridPosition|eoGridUnitArea|eoGridUnitDistance|eoGridVector|eoGroup|eoHemisphere|eoHemisphereBoundary|eoHistogram|eoIdentify|eoImage|eoLength|eoListPlot|eoMarker|eoNearest|eoPath|eoPolygon|eoPosition|eoPositionENU|eoPositionXYZ|eoProjectionData|eoRegionValuePlot|eoSmoothHistogram|eoStreamPlot|eoStyling|eoVariant|eoVector|eoVectorENU|eoVectorPlot|eoVectorXYZ|eoVisibleRegion|eoVisibleRegionBoundary|eoWithinQ|eodesicClosing|eodesicDilation|eodesicErosion|eodesicOpening|eodesicPolyhedron|eodesyData|eogravityModelData|eologicalPeriodData|eomagneticModelData|eometricBrownianMotionProcess|eometricDistribution|eometricMean|eometricMeanFilter|eometricOptimization|eometricTransformation|estureHandler|et|etEnvironment|lobalClusteringCoefficient|low|ompertzMakehamDistribution|oochShading|oodmanKruskalGamma|oodmanKruskalGammaTest|oto|ouraudShading|rad|radientFilter|radientFittedMesh|radientOrientationFilter|rammarApply|rammarRules|rammarToken|raph|raph3D|raphAssortativity|raphAutomorphismGroup|raphCenter|raphComplement|raphData|raphDensity|raphDiameter|raphDifference|raphDisjointUnion|raphDistance|raphDistanceMatrix|raphEmbedding|raphHub|raphIntersection|raphJoin|raphLinkEfficiency|raphPeriphery|raphPlot|raphPlot3D|raphPower|raphProduct|raphPropertyDistribution|raphQ|raphRadius|raphReciprocity|raphSum|raphUnion|raphics|raphics3D|raphicsColumn|raphicsComplex|raphicsGrid|raphicsGroup|raphicsRow|rayLevel|reater|reaterEqual|reaterEqualLess|reaterEqualThan|reaterFullEqual|reaterGreater|reaterLess|reaterSlantEqual|reaterThan|reaterTilde|reenFunction|rid|ridBox|ridGraph|roebnerBasis|roupBy|roupCentralizer|roupElementFromWord|roupElementPosition|roupElementQ|roupElementToWord|roupElements|roupGenerators|roupMultiplicationTable|roupOrbits|roupOrder|roupSetwiseStabilizer|roupStabilizer|roupStabilizerChain|roupings|rowCutComponents|udermannian|uidedFilter|umbelDistribution))(?![`$[:alnum:]])",
+          "match": "G(?:ARCHProcess|CD|aborFilter|aborMatrix|aborWavelet|ainMargins|ainPhaseMargins|alaxyData|amma|ammaDistribution|ammaRegularized|ather|atherBy|aussianFilter|aussianMatrix|aussianOrthogonalMatrixDistribution|aussianSymplecticMatrixDistribution|aussianUnitaryMatrixDistribution|aussianWindow|egenbauerC|eneralizedLinearModelFit|enerateAsymmetricKeyPair|enerateDocument|enerateHTTPResponse|enerateSymmetricKey|eneratingFunction|enericCylindricalDecomposition|enomeData|enomeLookup|eoAntipode|eoArea|eoBoundary|eoBoundingBox|eoBounds|eoBoundsRegion|eoBoundsRegionBoundary|eoBubbleChart|eoCircle|eoContourPlot|eoDensityPlot|eoDestination|eoDirection|eoDisk|eoDisplacement|eoDistance|eoDistanceList|eoElevationData|eoEntities|eoGraphPlot|eoGraphics|eoGridDirectionDifference|eoGridPosition|eoGridUnitArea|eoGridUnitDistance|eoGridVector|eoGroup|eoHemisphere|eoHemisphereBoundary|eoHistogram|eoIdentify|eoImage|eoLength|eoListPlot|eoMarker|eoNearest|eoPath|eoPolygon|eoPosition|eoPositionENU|eoPositionXYZ|eoProjectionData|eoRegionValuePlot|eoSmoothHistogram|eoStreamPlot|eoStyling|eoVariant|eoVector|eoVectorENU|eoVectorPlot|eoVectorXYZ|eoVisibleRegion|eoVisibleRegionBoundary|eoWithinQ|eodesicClosing|eodesicDilation|eodesicErosion|eodesicOpening|eodesicPolyhedron|eodesyData|eogravityModelData|eologicalPeriodData|eomagneticModelData|eometricBrownianMotionProcess|eometricDistribution|eometricMean|eometricMeanFilter|eometricOptimization|eometricTransformation|estureHandler|et|etEnvironment|lobalClusteringCoefficient|low|ompertzMakehamDistribution|oochShading|oodmanKruskalGamma|oodmanKruskalGammaTest|oto|ouraudShading|rad|radientFilter|radientFittedMesh|radientOrientationFilter|rammarApply|rammarRules|rammarToken|raph|raph3D|raphAssortativity|raphAutomorphismGroup|raphCenter|raphComplement|raphData|raphDensity|raphDiameter|raphDifference|raphDisjointUnion|raphDistance|raphDistanceMatrix|raphEmbedding|raphHub|raphIntersection|raphJoin|raphLinkEfficiency|raphPeriphery|raphPlot|raphPlot3D|raphPower|raphProduct|raphPropertyDistribution|raphQ|raphRadius|raphReciprocity|raphSum|raphUnion|raphics|raphics3D|raphicsColumn|raphicsComplex|raphicsGrid|raphicsGroup|raphicsRow|rayLevel|reater|reaterEqual|reaterEqualLess|reaterEqualThan|reaterFullEqual|reaterGreater|reaterLess|reaterSlantEqual|reaterThan|reaterTilde|reenFunction|rid|ridBox|ridGraph|roebnerBasis|roupBy|roupCentralizer|roupElementFromWord|roupElementPosition|roupElementQ|roupElementToWord|roupElements|roupGenerators|roupMultiplicationTable|roupOrbits|roupOrder|roupSetwiseStabilizer|roupStabilizer|roupStabilizerChain|roupings|rowCutComponents|udermannian|uidedFilter|umbelDistribution)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:H(?:ITSCentrality|TTPErrorResponse|TTPRedirect|TTPRequest|TTPRequestData|TTPResponse|aarWavelet|adamardMatrix|alfLine|alfNormalDistribution|alfPlane|alfSpace|alftoneShading|amiltonianGraphQ|ammingDistance|ammingWindow|ankelH1|ankelH2|ankelMatrix|ankelTransform|annPoissonWindow|annWindow|aradaNortonGroupHN|araryGraph|armonicMean|armonicMeanFilter|armonicNumber|ash|atchFilling|atchShading|aversine|azardFunction|ead|eatFluxValue|eatInsulationValue|eatOutflowValue|eatRadiationValue|eatSymmetryValue|eatTemperatureCondition|eatTransferPDEComponent|eatTransferValue|eavisideLambda|eavisidePi|eavisideTheta|eldGroupHe|elmholtzPDEComponent|ermiteDecomposition|ermiteH|ermitian|ermitianMatrixQ|essenbergDecomposition|eunB|eunBPrime|eunC|eunCPrime|eunD|eunDPrime|eunG|eunGPrime|eunT|eunTPrime|exahedron|iddenMarkovProcess|ighlightGraph|ighlightImage|ighlightMesh|ighlighted|ighpassFilter|igmanSimsGroupHS|ilbertCurve|ilbertFilter|ilbertMatrix|istogram|istogram3D|istogramDistribution|istogramList|istogramTransform|istogramTransformInterpolation|istoricalPeriodData|itMissTransform|jorthDistribution|odgeDual|oeffdingD|oeffdingDTest|old|oldComplete|oldForm|oldPattern|orizontalGauge|ornerForm|ostLookup|otellingTSquareDistribution|oytDistribution|ue|umanGrowthData|umpDownHump|umpEqual|urwitzLerchPhi|urwitzZeta|yperbolicDistribution|ypercubeGraph|yperexponentialDistribution|yperfactorial|ypergeometric0F1|ypergeometric0F1Regularized|ypergeometric1F1|ypergeometric1F1Regularized|ypergeometric2F1|ypergeometric2F1Regularized|ypergeometricDistribution|ypergeometricPFQ|ypergeometricPFQRegularized|ypergeometricU|yperlink|yperplane|ypoexponentialDistribution|ypothesisTestData))(?![`$[:alnum:]])",
+          "match": "H(?:ITSCentrality|TTPErrorResponse|TTPRedirect|TTPRequest|TTPRequestData|TTPResponse|aarWavelet|adamardMatrix|alfLine|alfNormalDistribution|alfPlane|alfSpace|alftoneShading|amiltonianGraphQ|ammingDistance|ammingWindow|ankelH1|ankelH2|ankelMatrix|ankelTransform|annPoissonWindow|annWindow|aradaNortonGroupHN|araryGraph|armonicMean|armonicMeanFilter|armonicNumber|ash|atchFilling|atchShading|aversine|azardFunction|ead|eatFluxValue|eatInsulationValue|eatOutflowValue|eatRadiationValue|eatSymmetryValue|eatTemperatureCondition|eatTransferPDEComponent|eatTransferValue|eavisideLambda|eavisidePi|eavisideTheta|eldGroupHe|elmholtzPDEComponent|ermiteDecomposition|ermiteH|ermitian|ermitianMatrixQ|essenbergDecomposition|eunB|eunBPrime|eunC|eunCPrime|eunD|eunDPrime|eunG|eunGPrime|eunT|eunTPrime|exahedron|iddenMarkovProcess|ighlightGraph|ighlightImage|ighlightMesh|ighlighted|ighpassFilter|igmanSimsGroupHS|ilbertCurve|ilbertFilter|ilbertMatrix|istogram|istogram3D|istogramDistribution|istogramList|istogramTransform|istogramTransformInterpolation|istoricalPeriodData|itMissTransform|jorthDistribution|odgeDual|oeffdingD|oeffdingDTest|old|oldComplete|oldForm|oldPattern|orizontalGauge|ornerForm|ostLookup|otellingTSquareDistribution|oytDistribution|ue|umanGrowthData|umpDownHump|umpEqual|urwitzLerchPhi|urwitzZeta|yperbolicDistribution|ypercubeGraph|yperexponentialDistribution|yperfactorial|ypergeometric0F1|ypergeometric0F1Regularized|ypergeometric1F1|ypergeometric1F1Regularized|ypergeometric2F1|ypergeometric2F1Regularized|ypergeometricDistribution|ypergeometricPFQ|ypergeometricPFQRegularized|ypergeometricU|yperlink|yperplane|ypoexponentialDistribution|ypothesisTestData)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:I(?:PAddress|conData|conize|cosahedron|dentity|dentityMatrix|f|fCompiled|gnoringInactive|m|mage|mage3D|mage3DProjection|mage3DSlices|mageAccumulate|mageAdd|mageAdjust|mageAlign|mageApply|mageApplyIndexed|mageAspectRatio|mageAssemble|mageCapture|mageChannels|mageClip|mageCollage|mageColorSpace|mageCompose|mageConvolve|mageCooccurrence|mageCorners|mageCorrelate|mageCorrespondingPoints|mageCrop|mageData|mageDeconvolve|mageDemosaic|mageDifference|mageDimensions|mageDisplacements|mageDistance|mageEffect|mageExposureCombine|mageFeatureTrack|mageFileApply|mageFileFilter|mageFileScan|mageFilter|mageFocusCombine|mageForestingComponents|mageForwardTransformation|mageHistogram|mageIdentify|mageInstanceQ|mageKeypoints|mageLevels|mageLines|mageMarker|mageMeasurements|mageMesh|mageMultiply|magePad|magePartition|magePeriodogram|magePerspectiveTransformation|mageQ|mageRecolor|mageReflect|mageResize|mageRestyle|mageRotate|mageSaliencyFilter|mageScaled|mageScan|mageSubtract|mageTake|mageTransformation|mageTrim|mageType|mageValue|mageValuePositions|mageVectorscopePlot|mageWaveformPlot|mplicitD|mplicitRegion|mplies|mport|mportByteArray|mportString|mprovementImportance|nactivate|nactive|ncidenceGraph|ncidenceList|ncidenceMatrix|ncrement|ndefiniteMatrixQ|ndependenceTest|ndependentEdgeSetQ|ndependentPhysicalQuantity|ndependentUnit|ndependentUnitDimension|ndependentVertexSetQ|ndexEdgeTaggedGraph|ndexGraph|ndexed|nexactNumberQ|nfiniteLine|nfiniteLineThrough|nfinitePlane|nfix|nflationAdjust|nformation|nhomogeneousPoissonProcess|nner|nnerPolygon|nnerPolyhedron|npaint|nput|nputField|nputForm|nputNamePacket|nputNotebook|nputPacket|nputStream|nputString|nputStringPacket|nsert|nsertLinebreaks|nset|nsphere|nstall|nstallService|ntegerDigits|ntegerExponent|ntegerLength|ntegerName|ntegerPart|ntegerPartitions|ntegerQ|ntegerReverse|ntegerString|ntegrate|nteractiveTradingChart|nternallyBalancedDecomposition|nterpolatingFunction|nterpolatingPolynomial|nterpolation|nterpretation|nterpretationBox|nterpreter|nterquartileRange|nterrupt|ntersectingQ|ntersection|nterval|ntervalIntersection|ntervalMemberQ|ntervalSlider|ntervalUnion|nverse|nverseBetaRegularized|nverseBilateralLaplaceTransform|nverseBilateralZTransform|nverseCDF|nverseChiSquareDistribution|nverseContinuousWaveletTransform|nverseDistanceTransform|nverseEllipticNomeQ|nverseErf|nverseErfc|nverseFourier|nverseFourierCosTransform|nverseFourierSequenceTransform|nverseFourierSinTransform|nverseFourierTransform|nverseFunction|nverseGammaDistribution|nverseGammaRegularized|nverseGaussianDistribution|nverseGudermannian|nverseHankelTransform|nverseHaversine|nverseJacobiCD|nverseJacobiCN|nverseJacobiCS|nverseJacobiDC|nverseJacobiDN|nverseJacobiDS|nverseJacobiNC|nverseJacobiND|nverseJacobiNS|nverseJacobiSC|nverseJacobiSD|nverseJacobiSN|nverseLaplaceTransform|nverseMellinTransform|nversePermutation|nverseRadon|nverseRadonTransform|nverseSeries|nverseShortTimeFourier|nverseSpectrogram|nverseSurvivalFunction|nverseTransformedRegion|nverseWaveletTransform|nverseWeierstrassP|nverseWishartMatrixDistribution|nverseZTransform|nvisible|rreduciblePolynomialQ|slandData|solatingInterval|somorphicGraphQ|somorphicSubgraphQ|sotopeData|tem|toProcess))(?![`$[:alnum:]])",
+          "match": "I(?:PAddress|conData|conize|cosahedron|dentity|dentityMatrix|f|fCompiled|gnoringInactive|m|mage|mage3D|mage3DProjection|mage3DSlices|mageAccumulate|mageAdd|mageAdjust|mageAlign|mageApply|mageApplyIndexed|mageAspectRatio|mageAssemble|mageCapture|mageChannels|mageClip|mageCollage|mageColorSpace|mageCompose|mageConvolve|mageCooccurrence|mageCorners|mageCorrelate|mageCorrespondingPoints|mageCrop|mageData|mageDeconvolve|mageDemosaic|mageDifference|mageDimensions|mageDisplacements|mageDistance|mageEffect|mageExposureCombine|mageFeatureTrack|mageFileApply|mageFileFilter|mageFileScan|mageFilter|mageFocusCombine|mageForestingComponents|mageForwardTransformation|mageHistogram|mageIdentify|mageInstanceQ|mageKeypoints|mageLevels|mageLines|mageMarker|mageMeasurements|mageMesh|mageMultiply|magePad|magePartition|magePeriodogram|magePerspectiveTransformation|mageQ|mageRecolor|mageReflect|mageResize|mageRestyle|mageRotate|mageSaliencyFilter|mageScaled|mageScan|mageSubtract|mageTake|mageTransformation|mageTrim|mageType|mageValue|mageValuePositions|mageVectorscopePlot|mageWaveformPlot|mplicitD|mplicitRegion|mplies|mport|mportByteArray|mportString|mprovementImportance|nactivate|nactive|ncidenceGraph|ncidenceList|ncidenceMatrix|ncrement|ndefiniteMatrixQ|ndependenceTest|ndependentEdgeSetQ|ndependentPhysicalQuantity|ndependentUnit|ndependentUnitDimension|ndependentVertexSetQ|ndexEdgeTaggedGraph|ndexGraph|ndexed|nexactNumberQ|nfiniteLine|nfiniteLineThrough|nfinitePlane|nfix|nflationAdjust|nformation|nhomogeneousPoissonProcess|nner|nnerPolygon|nnerPolyhedron|npaint|nput|nputField|nputForm|nputNamePacket|nputNotebook|nputPacket|nputStream|nputString|nputStringPacket|nsert|nsertLinebreaks|nset|nsphere|nstall|nstallService|ntegerDigits|ntegerExponent|ntegerLength|ntegerName|ntegerPart|ntegerPartitions|ntegerQ|ntegerReverse|ntegerString|ntegrate|nteractiveTradingChart|nternallyBalancedDecomposition|nterpolatingFunction|nterpolatingPolynomial|nterpolation|nterpretation|nterpretationBox|nterpreter|nterquartileRange|nterrupt|ntersectingQ|ntersection|nterval|ntervalIntersection|ntervalMemberQ|ntervalSlider|ntervalUnion|nverse|nverseBetaRegularized|nverseBilateralLaplaceTransform|nverseBilateralZTransform|nverseCDF|nverseChiSquareDistribution|nverseContinuousWaveletTransform|nverseDistanceTransform|nverseEllipticNomeQ|nverseErf|nverseErfc|nverseFourier|nverseFourierCosTransform|nverseFourierSequenceTransform|nverseFourierSinTransform|nverseFourierTransform|nverseFunction|nverseGammaDistribution|nverseGammaRegularized|nverseGaussianDistribution|nverseGudermannian|nverseHankelTransform|nverseHaversine|nverseJacobiCD|nverseJacobiCN|nverseJacobiCS|nverseJacobiDC|nverseJacobiDN|nverseJacobiDS|nverseJacobiNC|nverseJacobiND|nverseJacobiNS|nverseJacobiSC|nverseJacobiSD|nverseJacobiSN|nverseLaplaceTransform|nverseMellinTransform|nversePermutation|nverseRadon|nverseRadonTransform|nverseSeries|nverseShortTimeFourier|nverseSpectrogram|nverseSurvivalFunction|nverseTransformedRegion|nverseWaveletTransform|nverseWeierstrassP|nverseWishartMatrixDistribution|nverseZTransform|nvisible|rreduciblePolynomialQ|slandData|solatingInterval|somorphicGraphQ|somorphicSubgraphQ|sotopeData|tem|toProcess)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:J(?:accardDissimilarity|acobiAmplitude|acobiCD|acobiCN|acobiCS|acobiDC|acobiDN|acobiDS|acobiEpsilon|acobiNC|acobiND|acobiNS|acobiP|acobiSC|acobiSD|acobiSN|acobiSymbol|acobiZN|acobiZeta|ankoGroupJ1|ankoGroupJ2|ankoGroupJ3|ankoGroupJ4|arqueBeraALMTest|ohnsonDistribution|oin|oinAcross|oinForm|oinedCurve|ordanDecomposition|ordanModelDecomposition|uliaSetBoettcher|uliaSetIterationCount|uliaSetPlot|uliaSetPoints|ulianDate))(?![`$[:alnum:]])",
+          "match": "J(?:accardDissimilarity|acobiAmplitude|acobiCD|acobiCN|acobiCS|acobiDC|acobiDN|acobiDS|acobiEpsilon|acobiNC|acobiND|acobiNS|acobiP|acobiSC|acobiSD|acobiSN|acobiSymbol|acobiZN|acobiZeta|ankoGroupJ1|ankoGroupJ2|ankoGroupJ3|ankoGroupJ4|arqueBeraALMTest|ohnsonDistribution|oin|oinAcross|oinForm|oinedCurve|ordanDecomposition|ordanModelDecomposition|uliaSetBoettcher|uliaSetIterationCount|uliaSetPlot|uliaSetPoints|ulianDate)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:K(?:CoreComponents|Distribution|EdgeConnectedComponents|EdgeConnectedGraphQ|VertexConnectedComponents|VertexConnectedGraphQ|agiChart|aiserBesselWindow|aiserWindow|almanEstimator|almanFilter|arhunenLoeveDecomposition|aryTree|atzCentrality|elvinBei|elvinBer|elvinKei|elvinKer|endallTau|endallTauTest|ernelMixtureDistribution|ernelObject|ernels|ey|eyComplement|eyDrop|eyDropFrom|eyExistsQ|eyFreeQ|eyIntersection|eyMap|eyMemberQ|eySelect|eySort|eySortBy|eyTake|eyUnion|eyValueMap|eyValuePattern|eys|illProcess|irchhoffGraph|irchhoffMatrix|leinInvariantJ|napsackSolve|nightTourGraph|notData|nownUnitQ|ochCurve|olmogorovSmirnovTest|roneckerDelta|roneckerModelDecomposition|roneckerProduct|roneckerSymbol|uiperTest|umaraswamyDistribution|urtosis|uwaharaFilter))(?![`$[:alnum:]])",
+          "match": "K(?:CoreComponents|Distribution|EdgeConnectedComponents|EdgeConnectedGraphQ|VertexConnectedComponents|VertexConnectedGraphQ|agiChart|aiserBesselWindow|aiserWindow|almanEstimator|almanFilter|arhunenLoeveDecomposition|aryTree|atzCentrality|elvinBei|elvinBer|elvinKei|elvinKer|endallTau|endallTauTest|ernelMixtureDistribution|ernelObject|ernels|ey|eyComplement|eyDrop|eyDropFrom|eyExistsQ|eyFreeQ|eyIntersection|eyMap|eyMemberQ|eySelect|eySort|eySortBy|eyTake|eyUnion|eyValueMap|eyValuePattern|eys|illProcess|irchhoffGraph|irchhoffMatrix|leinInvariantJ|napsackSolve|nightTourGraph|notData|nownUnitQ|ochCurve|olmogorovSmirnovTest|roneckerDelta|roneckerModelDecomposition|roneckerProduct|roneckerSymbol|uiperTest|umaraswamyDistribution|urtosis|uwaharaFilter)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:L(?:ABColor|CHColor|CM|QEstimatorGains|QGRegulator|QOutputRegulatorGains|QRegulatorGains|UDecomposition|UVColor|abel|abeled|aguerreL|akeData|ambdaComponents|ameC|ameCPrime|ameEigenvalueA|ameEigenvalueB|ameS|ameSPrime|aminaData|anczosWindow|andauDistribution|anguageData|anguageIdentify|aplaceDistribution|aplaceTransform|aplacian|aplacianFilter|aplacianGaussianFilter|aplacianPDETerm|ast|atitude|atitudeLongitude|atticeData|atticeReduce|aunchKernels|ayeredGraphPlot|ayeredGraphPlot3D|eafCount|eapVariant|eapYearQ|earnDistribution|earnedDistribution|eastSquares|eastSquaresFilterKernel|eftArrow|eftArrowBar|eftArrowRightArrow|eftDownTeeVector|eftDownVector|eftDownVectorBar|eftRightArrow|eftRightVector|eftTee|eftTeeArrow|eftTeeVector|eftTriangle|eftTriangleBar|eftTriangleEqual|eftUpDownVector|eftUpTeeVector|eftUpVector|eftUpVectorBar|eftVector|eftVectorBar|egended|egendreP|egendreQ|ength|engthWhile|erchPhi|ess|essEqual|essEqualGreater|essEqualThan|essFullEqual|essGreater|essLess|essSlantEqual|essThan|essTilde|etterCounts|etterNumber|etterQ|evel|eveneTest|eviCivitaTensor|evyDistribution|exicographicOrder|exicographicSort|ibraryDataType|ibraryFunction|ibraryFunctionError|ibraryFunctionInformation|ibraryFunctionLoad|ibraryFunctionUnload|ibraryLoad|ibraryUnload|iftingFilterData|iftingWaveletTransform|ighter|ikelihood|imit|indleyDistribution|ine|ineBreakChart|ineGraph|ineIntegralConvolutionPlot|ineLegend|inearFractionalOptimization|inearFractionalTransform|inearGradientFilling|inearGradientImage|inearModelFit|inearOptimization|inearRecurrence|inearSolve|inearSolveFunction|inearizingTransformationData|inkActivate|inkClose|inkConnect|inkCreate|inkInterrupt|inkLaunch|inkObject|inkPatterns|inkRankCentrality|inkRead|inkReadyQ|inkWrite|inks|iouvilleLambda|ist|istAnimate|istContourPlot|istContourPlot3D|istConvolve|istCorrelate|istCurvePathPlot|istDeconvolve|istDensityPlot|istDensityPlot3D|istFourierSequenceTransform|istInterpolation|istLineIntegralConvolutionPlot|istLinePlot|istLinePlot3D|istLogLinearPlot|istLogLogPlot|istLogPlot|istPicker|istPickerBox|istPlay|istPlot|istPlot3D|istPointPlot3D|istPolarPlot|istQ|istSliceContourPlot3D|istSliceDensityPlot3D|istSliceVectorPlot3D|istStepPlot|istStreamDensityPlot|istStreamPlot|istStreamPlot3D|istSurfacePlot3D|istVectorDensityPlot|istVectorDisplacementPlot|istVectorDisplacementPlot3D|istVectorPlot|istVectorPlot3D|istZTransform|ocalAdaptiveBinarize|ocalCache|ocalClusteringCoefficient|ocalEvaluate|ocalObject|ocalObjects|ocalSubmit|ocalSymbol|ocalTime|ocalTimeZone|ocationEquivalenceTest|ocationTest|ocator|ocatorPane|og|og10|og2|ogBarnesG|ogGamma|ogGammaDistribution|ogIntegral|ogLikelihood|ogLinearPlot|ogLogPlot|ogLogisticDistribution|ogMultinormalDistribution|ogNormalDistribution|ogPlot|ogRankTest|ogSeriesDistribution|ogicalExpand|ogisticDistribution|ogisticSigmoid|ogitModelFit|ongLeftArrow|ongLeftRightArrow|ongRightArrow|ongest|ongestCommonSequence|ongestCommonSequencePositions|ongestCommonSubsequence|ongestCommonSubsequencePositions|ongestOrderedSequence|ongitude|ookup|oopFreeGraphQ|owerCaseQ|owerLeftArrow|owerRightArrow|owerTriangularMatrix|owerTriangularMatrixQ|owerTriangularize|owpassFilter|ucasL|uccioSamiComponents|unarEclipse|yapunovSolve|yonsGroupLy))(?![`$[:alnum:]])",
+          "match": "L(?:ABColor|CHColor|CM|QEstimatorGains|QGRegulator|QOutputRegulatorGains|QRegulatorGains|UDecomposition|UVColor|abel|abeled|aguerreL|akeData|ambdaComponents|ameC|ameCPrime|ameEigenvalueA|ameEigenvalueB|ameS|ameSPrime|aminaData|anczosWindow|andauDistribution|anguageData|anguageIdentify|aplaceDistribution|aplaceTransform|aplacian|aplacianFilter|aplacianGaussianFilter|aplacianPDETerm|ast|atitude|atitudeLongitude|atticeData|atticeReduce|aunchKernels|ayeredGraphPlot|ayeredGraphPlot3D|eafCount|eapVariant|eapYearQ|earnDistribution|earnedDistribution|eastSquares|eastSquaresFilterKernel|eftArrow|eftArrowBar|eftArrowRightArrow|eftDownTeeVector|eftDownVector|eftDownVectorBar|eftRightArrow|eftRightVector|eftTee|eftTeeArrow|eftTeeVector|eftTriangle|eftTriangleBar|eftTriangleEqual|eftUpDownVector|eftUpTeeVector|eftUpVector|eftUpVectorBar|eftVector|eftVectorBar|egended|egendreP|egendreQ|ength|engthWhile|erchPhi|ess|essEqual|essEqualGreater|essEqualThan|essFullEqual|essGreater|essLess|essSlantEqual|essThan|essTilde|etterCounts|etterNumber|etterQ|evel|eveneTest|eviCivitaTensor|evyDistribution|exicographicOrder|exicographicSort|ibraryDataType|ibraryFunction|ibraryFunctionError|ibraryFunctionInformation|ibraryFunctionLoad|ibraryFunctionUnload|ibraryLoad|ibraryUnload|iftingFilterData|iftingWaveletTransform|ighter|ikelihood|imit|indleyDistribution|ine|ineBreakChart|ineGraph|ineIntegralConvolutionPlot|ineLegend|inearFractionalOptimization|inearFractionalTransform|inearGradientFilling|inearGradientImage|inearModelFit|inearOptimization|inearRecurrence|inearSolve|inearSolveFunction|inearizingTransformationData|inkActivate|inkClose|inkConnect|inkCreate|inkInterrupt|inkLaunch|inkObject|inkPatterns|inkRankCentrality|inkRead|inkReadyQ|inkWrite|inks|iouvilleLambda|ist|istAnimate|istContourPlot|istContourPlot3D|istConvolve|istCorrelate|istCurvePathPlot|istDeconvolve|istDensityPlot|istDensityPlot3D|istFourierSequenceTransform|istInterpolation|istLineIntegralConvolutionPlot|istLinePlot|istLinePlot3D|istLogLinearPlot|istLogLogPlot|istLogPlot|istPicker|istPickerBox|istPlay|istPlot|istPlot3D|istPointPlot3D|istPolarPlot|istQ|istSliceContourPlot3D|istSliceDensityPlot3D|istSliceVectorPlot3D|istStepPlot|istStreamDensityPlot|istStreamPlot|istStreamPlot3D|istSurfacePlot3D|istVectorDensityPlot|istVectorDisplacementPlot|istVectorDisplacementPlot3D|istVectorPlot|istVectorPlot3D|istZTransform|ocalAdaptiveBinarize|ocalCache|ocalClusteringCoefficient|ocalEvaluate|ocalObject|ocalObjects|ocalSubmit|ocalSymbol|ocalTime|ocalTimeZone|ocationEquivalenceTest|ocationTest|ocator|ocatorPane|og|og10|og2|ogBarnesG|ogGamma|ogGammaDistribution|ogIntegral|ogLikelihood|ogLinearPlot|ogLogPlot|ogLogisticDistribution|ogMultinormalDistribution|ogNormalDistribution|ogPlot|ogRankTest|ogSeriesDistribution|ogicalExpand|ogisticDistribution|ogisticSigmoid|ogitModelFit|ongLeftArrow|ongLeftRightArrow|ongRightArrow|ongest|ongestCommonSequence|ongestCommonSequencePositions|ongestCommonSubsequence|ongestCommonSubsequencePositions|ongestOrderedSequence|ongitude|ookup|oopFreeGraphQ|owerCaseQ|owerLeftArrow|owerRightArrow|owerTriangularMatrix|owerTriangularMatrixQ|owerTriangularize|owpassFilter|ucasL|uccioSamiComponents|unarEclipse|yapunovSolve|yonsGroupLy)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:M(?:AProcess|achineNumberQ|agnify|ailReceiverFunction|ajority|akeBoxes|akeExpression|anagedLibraryExpressionID|anagedLibraryExpressionQ|andelbrotSetBoettcher|andelbrotSetDistance|andelbrotSetIterationCount|andelbrotSetMemberQ|andelbrotSetPlot|angoldtLambda|anhattanDistance|anipulate|anipulator|annWhitneyTest|annedSpaceMissionData|antissaExponent|ap|apAll|apApply|apAt|apIndexed|apThread|archenkoPasturDistribution|arcumQ|ardiaCombinedTest|ardiaKurtosisTest|ardiaSkewnessTest|arginalDistribution|arkovProcessProperties|assConcentrationCondition|assFluxValue|assImpermeableBoundaryValue|assOutflowValue|assSymmetryValue|assTransferValue|assTransportPDEComponent|atchQ|atchingDissimilarity|aterialShading|athMLForm|athematicalFunctionData|athieuC|athieuCPrime|athieuCharacteristicA|athieuCharacteristicB|athieuCharacteristicExponent|athieuGroupM11|athieuGroupM12|athieuGroupM22|athieuGroupM23|athieuGroupM24|athieuS|athieuSPrime|atrices|atrixExp|atrixForm|atrixFunction|atrixLog|atrixNormalDistribution|atrixPlot|atrixPower|atrixPropertyDistribution|atrixQ|atrixRank|atrixTDistribution|ax|axDate|axDetect|axFilter|axLimit|axMemoryUsed|axStableDistribution|axValue|aximalBy|aximize|axwellDistribution|cLaughlinGroupMcL|ean|eanClusteringCoefficient|eanDegreeConnectivity|eanDeviation|eanFilter|eanGraphDistance|eanNeighborDegree|eanShift|eanShiftFilter|edian|edianDeviation|edianFilter|edicalTestData|eijerG|eijerGReduce|eixnerDistribution|ellinConvolve|ellinTransform|emberQ|emoryAvailable|emoryConstrained|emoryInUse|engerMesh|enuPacket|enuView|erge|ersennePrimeExponent|ersennePrimeExponentQ|eshCellCount|eshCellIndex|eshCells|eshConnectivityGraph|eshCoordinates|eshPrimitives|eshRegion|eshRegionQ|essage|essageDialog|essageList|essageName|essagePacket|essages|eteorShowerData|exicanHatWavelet|eyerWavelet|in|inDate|inDetect|inFilter|inLimit|inMax|inStableDistribution|inValue|ineralData|inimalBy|inimalPolynomial|inimalStateSpaceModel|inimize|inimumTimeIncrement|inkowskiQuestionMark|inorPlanetData|inors|inus|inusPlus|issing|issingQ|ittagLefflerE|ixedFractionParts|ixedGraphQ|ixedMagnitude|ixedRadix|ixedRadixQuantity|ixedUnit|ixtureDistribution|od|odelPredictiveController|odularInverse|odularLambda|odule|oebiusMu|oment|omentConvert|omentEvaluate|omentGeneratingFunction|omentOfInertia|onitor|onomialList|onsterGroupM|oonPhase|oonPosition|orletWavelet|orphologicalBinarize|orphologicalBranchPoints|orphologicalComponents|orphologicalEulerNumber|orphologicalGraph|orphologicalPerimeter|orphologicalTransform|ortalityData|ost|ountainData|ouseAnnotation|ouseAppearance|ousePosition|ouseover|ovieData|ovingAverage|ovingMap|ovingMedian|oyalDistribution|ulticolumn|ultigraphQ|ultinomial|ultinomialDistribution|ultinormalDistribution|ultiplicativeOrder|ultiplySides|ultivariateHypergeometricDistribution|ultivariatePoissonDistribution|ultivariateTDistribution))(?![`$[:alnum:]])",
+          "match": "M(?:AProcess|achineNumberQ|agnify|ailReceiverFunction|ajority|akeBoxes|akeExpression|anagedLibraryExpressionID|anagedLibraryExpressionQ|andelbrotSetBoettcher|andelbrotSetDistance|andelbrotSetIterationCount|andelbrotSetMemberQ|andelbrotSetPlot|angoldtLambda|anhattanDistance|anipulate|anipulator|annWhitneyTest|annedSpaceMissionData|antissaExponent|ap|apAll|apApply|apAt|apIndexed|apThread|archenkoPasturDistribution|arcumQ|ardiaCombinedTest|ardiaKurtosisTest|ardiaSkewnessTest|arginalDistribution|arkovProcessProperties|assConcentrationCondition|assFluxValue|assImpermeableBoundaryValue|assOutflowValue|assSymmetryValue|assTransferValue|assTransportPDEComponent|atchQ|atchingDissimilarity|aterialShading|athMLForm|athematicalFunctionData|athieuC|athieuCPrime|athieuCharacteristicA|athieuCharacteristicB|athieuCharacteristicExponent|athieuGroupM11|athieuGroupM12|athieuGroupM22|athieuGroupM23|athieuGroupM24|athieuS|athieuSPrime|atrices|atrixExp|atrixForm|atrixFunction|atrixLog|atrixNormalDistribution|atrixPlot|atrixPower|atrixPropertyDistribution|atrixQ|atrixRank|atrixTDistribution|ax|axDate|axDetect|axFilter|axLimit|axMemoryUsed|axStableDistribution|axValue|aximalBy|aximize|axwellDistribution|cLaughlinGroupMcL|ean|eanClusteringCoefficient|eanDegreeConnectivity|eanDeviation|eanFilter|eanGraphDistance|eanNeighborDegree|eanShift|eanShiftFilter|edian|edianDeviation|edianFilter|edicalTestData|eijerG|eijerGReduce|eixnerDistribution|ellinConvolve|ellinTransform|emberQ|emoryAvailable|emoryConstrained|emoryInUse|engerMesh|enuPacket|enuView|erge|ersennePrimeExponent|ersennePrimeExponentQ|eshCellCount|eshCellIndex|eshCells|eshConnectivityGraph|eshCoordinates|eshPrimitives|eshRegion|eshRegionQ|essage|essageDialog|essageList|essageName|essagePacket|essages|eteorShowerData|exicanHatWavelet|eyerWavelet|in|inDate|inDetect|inFilter|inLimit|inMax|inStableDistribution|inValue|ineralData|inimalBy|inimalPolynomial|inimalStateSpaceModel|inimize|inimumTimeIncrement|inkowskiQuestionMark|inorPlanetData|inors|inus|inusPlus|issing|issingQ|ittagLefflerE|ixedFractionParts|ixedGraphQ|ixedMagnitude|ixedRadix|ixedRadixQuantity|ixedUnit|ixtureDistribution|od|odelPredictiveController|odularInverse|odularLambda|odule|oebiusMu|oment|omentConvert|omentEvaluate|omentGeneratingFunction|omentOfInertia|onitor|onomialList|onsterGroupM|oonPhase|oonPosition|orletWavelet|orphologicalBinarize|orphologicalBranchPoints|orphologicalComponents|orphologicalEulerNumber|orphologicalGraph|orphologicalPerimeter|orphologicalTransform|ortalityData|ost|ountainData|ouseAnnotation|ouseAppearance|ousePosition|ouseover|ovieData|ovingAverage|ovingMap|ovingMedian|oyalDistribution|ulticolumn|ultigraphQ|ultinomial|ultinomialDistribution|ultinormalDistribution|ultiplicativeOrder|ultiplySides|ultivariateHypergeometricDistribution|ultivariatePoissonDistribution|ultivariateTDistribution)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:N(?:|ArgMax|ArgMin|Cache|CaputoD|DEigensystem|DEigenvalues|DSolve|DSolveValue|Expectation|FractionalD|Integrate|MaxValue|Maximize|MinValue|Minimize|Probability|Product|Roots|Solve|SolveValues|Sum|akagamiDistribution|ameQ|ames|and|earest|earestFunction|earestMeshCells|earestNeighborGraph|earestTo|ebulaData|eedlemanWunschSimilarity|eeds|egative|egativeBinomialDistribution|egativeDefiniteMatrixQ|egativeMultinomialDistribution|egativeSemidefiniteMatrixQ|egativelyOrientedPoints|eighborhoodData|eighborhoodGraph|est|estGraph|estList|estWhile|estWhileList|estedGreaterGreater|estedLessLess|eumannValue|evilleThetaC|evilleThetaD|evilleThetaN|evilleThetaS|extCell|extDate|extPrime|icholsPlot|ightHemisphere|onCommutativeMultiply|onNegative|onPositive|oncentralBetaDistribution|oncentralChiSquareDistribution|oncentralFRatioDistribution|oncentralStudentTDistribution|ondimensionalizationTransform|oneTrue|onlinearModelFit|onlinearStateSpaceModel|onlocalMeansFilter|or|orlundB|orm|ormal|ormalDistribution|ormalMatrixQ|ormalize|ormalizedSquaredEuclideanDistance|ot|otCongruent|otCupCap|otDoubleVerticalBar|otElement|otEqualTilde|otExists|otGreater|otGreaterEqual|otGreaterFullEqual|otGreaterGreater|otGreaterLess|otGreaterSlantEqual|otGreaterTilde|otHumpDownHump|otHumpEqual|otLeftTriangle|otLeftTriangleBar|otLeftTriangleEqual|otLess|otLessEqual|otLessFullEqual|otLessGreater|otLessLess|otLessSlantEqual|otLessTilde|otNestedGreaterGreater|otNestedLessLess|otPrecedes|otPrecedesEqual|otPrecedesSlantEqual|otPrecedesTilde|otReverseElement|otRightTriangle|otRightTriangleBar|otRightTriangleEqual|otSquareSubset|otSquareSubsetEqual|otSquareSuperset|otSquareSupersetEqual|otSubset|otSubsetEqual|otSucceeds|otSucceedsEqual|otSucceedsSlantEqual|otSucceedsTilde|otSuperset|otSupersetEqual|otTilde|otTildeEqual|otTildeFullEqual|otTildeTilde|otVerticalBar|otebook|otebookApply|otebookClose|otebookDelete|otebookDirectory|otebookEvaluate|otebookFileName|otebookFind|otebookGet|otebookImport|otebookInformation|otebookLocate|otebookObject|otebookOpen|otebookPrint|otebookPut|otebookRead|otebookSave|otebookSelection|otebookTemplate|otebookWrite|otebooks|othing|uclearExplosionData|uclearReactorData|ullSpace|umberCompose|umberDecompose|umberDigit|umberExpand|umberFieldClassNumber|umberFieldDiscriminant|umberFieldFundamentalUnits|umberFieldIntegralBasis|umberFieldNormRepresentatives|umberFieldRegulator|umberFieldRootsOfUnity|umberFieldSignature|umberForm|umberLinePlot|umberQ|umerator|umeratorDenominator|umericQ|umericalOrder|umericalSort|uttallWindow|yquistPlot))(?![`$[:alnum:]])",
+          "match": "N(?:|ArgMax|ArgMin|Cache|CaputoD|DEigensystem|DEigenvalues|DSolve|DSolveValue|Expectation|FractionalD|Integrate|MaxValue|Maximize|MinValue|Minimize|Probability|Product|Roots|Solve|SolveValues|Sum|akagamiDistribution|ameQ|ames|and|earest|earestFunction|earestMeshCells|earestNeighborGraph|earestTo|ebulaData|eedlemanWunschSimilarity|eeds|egative|egativeBinomialDistribution|egativeDefiniteMatrixQ|egativeMultinomialDistribution|egativeSemidefiniteMatrixQ|egativelyOrientedPoints|eighborhoodData|eighborhoodGraph|est|estGraph|estList|estWhile|estWhileList|estedGreaterGreater|estedLessLess|eumannValue|evilleThetaC|evilleThetaD|evilleThetaN|evilleThetaS|extCell|extDate|extPrime|icholsPlot|ightHemisphere|onCommutativeMultiply|onNegative|onPositive|oncentralBetaDistribution|oncentralChiSquareDistribution|oncentralFRatioDistribution|oncentralStudentTDistribution|ondimensionalizationTransform|oneTrue|onlinearModelFit|onlinearStateSpaceModel|onlocalMeansFilter|or|orlundB|orm|ormal|ormalDistribution|ormalMatrixQ|ormalize|ormalizedSquaredEuclideanDistance|ot|otCongruent|otCupCap|otDoubleVerticalBar|otElement|otEqualTilde|otExists|otGreater|otGreaterEqual|otGreaterFullEqual|otGreaterGreater|otGreaterLess|otGreaterSlantEqual|otGreaterTilde|otHumpDownHump|otHumpEqual|otLeftTriangle|otLeftTriangleBar|otLeftTriangleEqual|otLess|otLessEqual|otLessFullEqual|otLessGreater|otLessLess|otLessSlantEqual|otLessTilde|otNestedGreaterGreater|otNestedLessLess|otPrecedes|otPrecedesEqual|otPrecedesSlantEqual|otPrecedesTilde|otReverseElement|otRightTriangle|otRightTriangleBar|otRightTriangleEqual|otSquareSubset|otSquareSubsetEqual|otSquareSuperset|otSquareSupersetEqual|otSubset|otSubsetEqual|otSucceeds|otSucceedsEqual|otSucceedsSlantEqual|otSucceedsTilde|otSuperset|otSupersetEqual|otTilde|otTildeEqual|otTildeFullEqual|otTildeTilde|otVerticalBar|otebook|otebookApply|otebookClose|otebookDelete|otebookDirectory|otebookEvaluate|otebookFileName|otebookFind|otebookGet|otebookImport|otebookInformation|otebookLocate|otebookObject|otebookOpen|otebookPrint|otebookPut|otebookRead|otebookSave|otebookSelection|otebookTemplate|otebookWrite|otebooks|othing|uclearExplosionData|uclearReactorData|ullSpace|umberCompose|umberDecompose|umberDigit|umberExpand|umberFieldClassNumber|umberFieldDiscriminant|umberFieldFundamentalUnits|umberFieldIntegralBasis|umberFieldNormRepresentatives|umberFieldRegulator|umberFieldRootsOfUnity|umberFieldSignature|umberForm|umberLinePlot|umberQ|umerator|umeratorDenominator|umericQ|umericalOrder|umericalSort|uttallWindow|yquistPlot)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:O(?:|NanGroupON|bservabilityGramian|bservabilityMatrix|bservableDecomposition|bservableModelQ|ceanData|ctahedron|ddQ|ff|ffset|n|nce|pacity|penAppend|penRead|penWrite|pener|penerView|pening|perate|ptimumFlowData|ptionValue|ptional|ptionalElement|ptions|ptionsPattern|r|rder|rderDistribution|rderedQ|rdering|rderingBy|rderlessPatternSequence|rnsteinUhlenbeckProcess|rthogonalMatrixQ|rthogonalize|uter|uterPolygon|uterPolyhedron|utputControllabilityMatrix|utputControllableModelQ|utputForm|utputNamePacket|utputResponse|utputStream|verBar|verDot|verHat|verTilde|verVector|verflow|verlay|verscript|verscriptBox|wenT|wnValues))(?![`$[:alnum:]])",
+          "match": "O(?:|NanGroupON|bservabilityGramian|bservabilityMatrix|bservableDecomposition|bservableModelQ|ceanData|ctahedron|ddQ|ff|ffset|n|nce|pacity|penAppend|penRead|penWrite|pener|penerView|pening|perate|ptimumFlowData|ptionValue|ptional|ptionalElement|ptions|ptionsPattern|r|rder|rderDistribution|rderedQ|rdering|rderingBy|rderlessPatternSequence|rnsteinUhlenbeckProcess|rthogonalMatrixQ|rthogonalize|uter|uterPolygon|uterPolyhedron|utputControllabilityMatrix|utputControllableModelQ|utputForm|utputNamePacket|utputResponse|utputStream|verBar|verDot|verHat|verTilde|verVector|verflow|verlay|verscript|verscriptBox|wenT|wnValues)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:P(?:DF|ERTDistribution|IDTune|acletDataRebuild|acletDirectoryLoad|acletDirectoryUnload|acletDisable|acletEnable|acletFind|acletFindRemote|acletInstall|acletInstallSubmit|acletNewerQ|acletObject|acletSiteObject|acletSiteRegister|acletSiteUnregister|acletSiteUpdate|acletSites|acletUninstall|adLeft|adRight|addedForm|adeApproximant|ageRankCentrality|airedBarChart|airedHistogram|airedSmoothHistogram|airedTTest|airedZTest|aletteNotebook|alindromeQ|ane|aneSelector|anel|arabolicCylinderD|arallelArray|arallelAxisPlot|arallelCombine|arallelDo|arallelEvaluate|arallelKernels|arallelMap|arallelNeeds|arallelProduct|arallelSubmit|arallelSum|arallelTable|arallelTry|arallelepiped|arallelize|arallelogram|arameterMixtureDistribution|arametricConvexOptimization|arametricFunction|arametricNDSolve|arametricNDSolveValue|arametricPlot|arametricPlot3D|arametricRegion|arentBox|arentCell|arentDirectory|arentNotebook|aretoDistribution|aretoPickandsDistribution|arkData|art|artOfSpeech|artialCorrelationFunction|articleAcceleratorData|articleData|artition|artitionsP|artitionsQ|arzenWindow|ascalDistribution|aste|asteButton|athGraph|athGraphQ|attern|atternSequence|atternTest|aulWavelet|auliMatrix|ause|eakDetect|eanoCurve|earsonChiSquareTest|earsonCorrelationTest|earsonDistribution|ercentForm|erfectNumber|erfectNumberQ|erimeter|eriodicBoundaryCondition|eriodogram|eriodogramArray|ermanent|ermissionsGroup|ermissionsGroupMemberQ|ermissionsGroups|ermissionsKey|ermissionsKeys|ermutationCycles|ermutationCyclesQ|ermutationGroup|ermutationLength|ermutationList|ermutationListQ|ermutationMatrix|ermutationMax|ermutationMin|ermutationOrder|ermutationPower|ermutationProduct|ermutationReplace|ermutationSupport|ermutations|ermute|eronaMalikFilter|ersonData|etersenGraph|haseMargins|hongShading|hysicalSystemData|ick|ieChart|ieChart3D|iecewise|iecewiseExpand|illaiTrace|illaiTraceTest|ingTime|ixelValue|ixelValuePositions|laced|laceholder|lanarAngle|lanarFaceList|lanarGraph|lanarGraphQ|lanckRadiationLaw|laneCurveData|lanetData|lanetaryMoonData|lantData|lay|lot|lot3D|luralize|lus|lusMinus|ochhammer|oint|ointFigureChart|ointLegend|ointLight|ointSize|oissonConsulDistribution|oissonDistribution|oissonPDEComponent|oissonProcess|oissonWindow|olarPlot|olyGamma|olyLog|olyaAeppliDistribution|olygon|olygonAngle|olygonCoordinates|olygonDecomposition|olygonalNumber|olyhedron|olyhedronAngle|olyhedronCoordinates|olyhedronData|olyhedronDecomposition|olyhedronGenus|olynomialExpressionQ|olynomialExtendedGCD|olynomialGCD|olynomialLCM|olynomialMod|olynomialQ|olynomialQuotient|olynomialQuotientRemainder|olynomialReduce|olynomialRemainder|olynomialSumOfSquaresList|opupMenu|opupView|opupWindow|osition|ositionIndex|ositionLargest|ositionSmallest|ositive|ositiveDefiniteMatrixQ|ositiveSemidefiniteMatrixQ|ositivelyOrientedPoints|ossibleZeroQ|ostfix|ower|owerDistribution|owerExpand|owerMod|owerModList|owerRange|owerSpectralDensity|owerSymmetricPolynomial|owersRepresentations|reDecrement|reIncrement|recedenceForm|recedes|recedesEqual|recedesSlantEqual|recedesTilde|recision|redict|redictorFunction|redictorMeasurements|redictorMeasurementsObject|reemptProtect|refix|repend|rependTo|reviousCell|reviousDate|riceGraphDistribution|rime|rimeNu|rimeOmega|rimePi|rimePowerQ|rimeQ|rimeZetaP|rimitivePolynomialQ|rimitiveRoot|rimitiveRootList|rincipalComponents|rintTemporary|rintableASCIIQ|rintout3D|rism|rivateKey|robability|robabilityDistribution|robabilityPlot|robabilityScalePlot|robitModelFit|rocessConnection|rocessInformation|rocessObject|rocessParameterAssumptions|rocessParameterQ|rocessStatus|rocesses|roduct|roductDistribution|roductLog|rogressIndicator|rojection|roportion|roportional|rotect|roteinData|runing|seudoInverse|sychrometricPropertyData|ublicKey|ulsarData|ut|utAppend|yramid))(?![`$[:alnum:]])",
+          "match": "P(?:DF|ERTDistribution|IDTune|acletDataRebuild|acletDirectoryLoad|acletDirectoryUnload|acletDisable|acletEnable|acletFind|acletFindRemote|acletInstall|acletInstallSubmit|acletNewerQ|acletObject|acletSiteObject|acletSiteRegister|acletSiteUnregister|acletSiteUpdate|acletSites|acletUninstall|adLeft|adRight|addedForm|adeApproximant|ageRankCentrality|airedBarChart|airedHistogram|airedSmoothHistogram|airedTTest|airedZTest|aletteNotebook|alindromeQ|ane|aneSelector|anel|arabolicCylinderD|arallelArray|arallelAxisPlot|arallelCombine|arallelDo|arallelEvaluate|arallelKernels|arallelMap|arallelNeeds|arallelProduct|arallelSubmit|arallelSum|arallelTable|arallelTry|arallelepiped|arallelize|arallelogram|arameterMixtureDistribution|arametricConvexOptimization|arametricFunction|arametricNDSolve|arametricNDSolveValue|arametricPlot|arametricPlot3D|arametricRegion|arentBox|arentCell|arentDirectory|arentNotebook|aretoDistribution|aretoPickandsDistribution|arkData|art|artOfSpeech|artialCorrelationFunction|articleAcceleratorData|articleData|artition|artitionsP|artitionsQ|arzenWindow|ascalDistribution|aste|asteButton|athGraph|athGraphQ|attern|atternSequence|atternTest|aulWavelet|auliMatrix|ause|eakDetect|eanoCurve|earsonChiSquareTest|earsonCorrelationTest|earsonDistribution|ercentForm|erfectNumber|erfectNumberQ|erimeter|eriodicBoundaryCondition|eriodogram|eriodogramArray|ermanent|ermissionsGroup|ermissionsGroupMemberQ|ermissionsGroups|ermissionsKey|ermissionsKeys|ermutationCycles|ermutationCyclesQ|ermutationGroup|ermutationLength|ermutationList|ermutationListQ|ermutationMatrix|ermutationMax|ermutationMin|ermutationOrder|ermutationPower|ermutationProduct|ermutationReplace|ermutationSupport|ermutations|ermute|eronaMalikFilter|ersonData|etersenGraph|haseMargins|hongShading|hysicalSystemData|ick|ieChart|ieChart3D|iecewise|iecewiseExpand|illaiTrace|illaiTraceTest|ingTime|ixelValue|ixelValuePositions|laced|laceholder|lanarAngle|lanarFaceList|lanarGraph|lanarGraphQ|lanckRadiationLaw|laneCurveData|lanetData|lanetaryMoonData|lantData|lay|lot|lot3D|luralize|lus|lusMinus|ochhammer|oint|ointFigureChart|ointLegend|ointLight|ointSize|oissonConsulDistribution|oissonDistribution|oissonPDEComponent|oissonProcess|oissonWindow|olarPlot|olyGamma|olyLog|olyaAeppliDistribution|olygon|olygonAngle|olygonCoordinates|olygonDecomposition|olygonalNumber|olyhedron|olyhedronAngle|olyhedronCoordinates|olyhedronData|olyhedronDecomposition|olyhedronGenus|olynomialExpressionQ|olynomialExtendedGCD|olynomialGCD|olynomialLCM|olynomialMod|olynomialQ|olynomialQuotient|olynomialQuotientRemainder|olynomialReduce|olynomialRemainder|olynomialSumOfSquaresList|opupMenu|opupView|opupWindow|osition|ositionIndex|ositionLargest|ositionSmallest|ositive|ositiveDefiniteMatrixQ|ositiveSemidefiniteMatrixQ|ositivelyOrientedPoints|ossibleZeroQ|ostfix|ower|owerDistribution|owerExpand|owerMod|owerModList|owerRange|owerSpectralDensity|owerSymmetricPolynomial|owersRepresentations|reDecrement|reIncrement|recedenceForm|recedes|recedesEqual|recedesSlantEqual|recedesTilde|recision|redict|redictorFunction|redictorMeasurements|redictorMeasurementsObject|reemptProtect|refix|repend|rependTo|reviousCell|reviousDate|riceGraphDistribution|rime|rimeNu|rimeOmega|rimePi|rimePowerQ|rimeQ|rimeZetaP|rimitivePolynomialQ|rimitiveRoot|rimitiveRootList|rincipalComponents|rintTemporary|rintableASCIIQ|rintout3D|rism|rivateKey|robability|robabilityDistribution|robabilityPlot|robabilityScalePlot|robitModelFit|rocessConnection|rocessInformation|rocessObject|rocessParameterAssumptions|rocessParameterQ|rocessStatus|rocesses|roduct|roductDistribution|roductLog|rogressIndicator|rojection|roportion|roportional|rotect|roteinData|runing|seudoInverse|sychrometricPropertyData|ublicKey|ulsarData|ut|utAppend|yramid)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:Q(?:Binomial|Factorial|Gamma|HypergeometricPFQ|Pochhammer|PolyGamma|RDecomposition|nDispersion|uadraticIrrationalQ|uadraticOptimization|uantile|uantilePlot|uantity|uantityArray|uantityDistribution|uantityForm|uantityMagnitude|uantityQ|uantityUnit|uantityVariable|uantityVariableCanonicalUnit|uantityVariableDimensions|uantityVariableIdentifier|uantityVariablePhysicalQuantity|uartileDeviation|uartileSkewness|uartiles|uery|ueueProperties|ueueingNetworkProcess|ueueingProcess|uiet|uietEcho|uotient|uotientRemainder))(?![`$[:alnum:]])",
+          "match": "Q(?:Binomial|Factorial|Gamma|HypergeometricPFQ|Pochhammer|PolyGamma|RDecomposition|nDispersion|uadraticIrrationalQ|uadraticOptimization|uantile|uantilePlot|uantity|uantityArray|uantityDistribution|uantityForm|uantityMagnitude|uantityQ|uantityUnit|uantityVariable|uantityVariableCanonicalUnit|uantityVariableDimensions|uantityVariableIdentifier|uantityVariablePhysicalQuantity|uartileDeviation|uartileSkewness|uartiles|uery|ueueProperties|ueueingNetworkProcess|ueueingProcess|uiet|uietEcho|uotient|uotientRemainder)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:R(?:GBColor|Solve|SolveValue|adialAxisPlot|adialGradientFilling|adialGradientImage|adialityCentrality|adicalBox|adioButton|adioButtonBar|adon|adonTransform|amanujanTau|amanujanTauL|amanujanTauTheta|amanujanTauZ|amp|andomChoice|andomColor|andomComplex|andomDate|andomEntity|andomFunction|andomGeneratorState|andomGeoPosition|andomGraph|andomImage|andomInteger|andomPermutation|andomPoint|andomPolygon|andomPolyhedron|andomPrime|andomReal|andomSample|andomTime|andomVariate|andomWalkProcess|andomWord|ange|angeFilter|ankedMax|ankedMin|arerProbability|aster|aster3D|asterize|ational|ationalExpressionQ|ationalize|atios|awBoxes|awData|ayleighDistribution|e|eIm|eImPlot|eactionPDETerm|ead|eadByteArray|eadLine|eadList|eadString|ealAbs|ealDigits|ealExponent|ealSign|eap|econstructionMesh|ectangle|ectangleChart|ectangleChart3D|ectangularRepeatingElement|ecurrenceFilter|ecurrenceTable|educe|efine|eflectionMatrix|eflectionTransform|efresh|egion|egionBinarize|egionBoundary|egionBounds|egionCentroid|egionCongruent|egionConvert|egionDifference|egionDilation|egionDimension|egionDisjoint|egionDistance|egionDistanceFunction|egionEmbeddingDimension|egionEqual|egionErosion|egionFit|egionImage|egionIntersection|egionMeasure|egionMember|egionMemberFunction|egionMoment|egionNearest|egionNearestFunction|egionPlot|egionPlot3D|egionProduct|egionQ|egionResize|egionSimilar|egionSymmetricDifference|egionUnion|egionWithin|egularExpression|egularPolygon|egularlySampledQ|elationGraph|eleaseHold|eliabilityDistribution|eliefImage|eliefPlot|emove|emoveAlphaChannel|emoveBackground|emoveDiacritics|emoveInputStreamMethod|emoveOutputStreamMethod|emoveUsers|enameDirectory|enameFile|enewalProcess|enkoChart|epairMesh|epeated|epeatedNull|epeatedTiming|epeatingElement|eplace|eplaceAll|eplaceAt|eplaceImageValue|eplaceList|eplacePart|eplacePixelValue|eplaceRepeated|esamplingAlgorithmData|escale|escalingTransform|esetDirectory|esidue|esidueSum|esolve|esourceData|esourceObject|esourceSearch|esponseForm|est|estricted|esultant|eturn|eturnExpressionPacket|eturnPacket|eturnTextPacket|everse|everseBiorthogonalSplineWavelet|everseElement|everseEquilibrium|everseGraph|everseSort|everseSortBy|everseUpEquilibrium|evolutionPlot3D|iccatiSolve|iceDistribution|idgeFilter|iemannR|iemannSiegelTheta|iemannSiegelZ|iemannXi|iffle|ightArrow|ightArrowBar|ightArrowLeftArrow|ightComposition|ightCosetRepresentative|ightDownTeeVector|ightDownVector|ightDownVectorBar|ightTee|ightTeeArrow|ightTeeVector|ightTriangle|ightTriangleBar|ightTriangleEqual|ightUpDownVector|ightUpTeeVector|ightUpVector|ightUpVectorBar|ightVector|ightVectorBar|iskAchievementImportance|iskReductionImportance|obustConvexOptimization|ogersTanimotoDissimilarity|ollPitchYawAngles|ollPitchYawMatrix|omanNumeral|oot|ootApproximant|ootIntervals|ootLocusPlot|ootMeanSquare|ootOfUnityQ|ootReduce|ootSum|oots|otate|otateLeft|otateRight|otationMatrix|otationTransform|ound|ow|owBox|owReduce|udinShapiro|udvalisGroupRu|ule|uleDelayed|ulePlot|un|unProcess|unThrough|ussellRaoDissimilarity))(?![`$[:alnum:]])",
+          "match": "R(?:GBColor|Solve|SolveValue|adialAxisPlot|adialGradientFilling|adialGradientImage|adialityCentrality|adicalBox|adioButton|adioButtonBar|adon|adonTransform|amanujanTau|amanujanTauL|amanujanTauTheta|amanujanTauZ|amp|andomChoice|andomColor|andomComplex|andomDate|andomEntity|andomFunction|andomGeneratorState|andomGeoPosition|andomGraph|andomImage|andomInteger|andomPermutation|andomPoint|andomPolygon|andomPolyhedron|andomPrime|andomReal|andomSample|andomTime|andomVariate|andomWalkProcess|andomWord|ange|angeFilter|ankedMax|ankedMin|arerProbability|aster|aster3D|asterize|ational|ationalExpressionQ|ationalize|atios|awBoxes|awData|ayleighDistribution|e|eIm|eImPlot|eactionPDETerm|ead|eadByteArray|eadLine|eadList|eadString|ealAbs|ealDigits|ealExponent|ealSign|eap|econstructionMesh|ectangle|ectangleChart|ectangleChart3D|ectangularRepeatingElement|ecurrenceFilter|ecurrenceTable|educe|efine|eflectionMatrix|eflectionTransform|efresh|egion|egionBinarize|egionBoundary|egionBounds|egionCentroid|egionCongruent|egionConvert|egionDifference|egionDilation|egionDimension|egionDisjoint|egionDistance|egionDistanceFunction|egionEmbeddingDimension|egionEqual|egionErosion|egionFit|egionImage|egionIntersection|egionMeasure|egionMember|egionMemberFunction|egionMoment|egionNearest|egionNearestFunction|egionPlot|egionPlot3D|egionProduct|egionQ|egionResize|egionSimilar|egionSymmetricDifference|egionUnion|egionWithin|egularExpression|egularPolygon|egularlySampledQ|elationGraph|eleaseHold|eliabilityDistribution|eliefImage|eliefPlot|emove|emoveAlphaChannel|emoveBackground|emoveDiacritics|emoveInputStreamMethod|emoveOutputStreamMethod|emoveUsers|enameDirectory|enameFile|enewalProcess|enkoChart|epairMesh|epeated|epeatedNull|epeatedTiming|epeatingElement|eplace|eplaceAll|eplaceAt|eplaceImageValue|eplaceList|eplacePart|eplacePixelValue|eplaceRepeated|esamplingAlgorithmData|escale|escalingTransform|esetDirectory|esidue|esidueSum|esolve|esourceData|esourceObject|esourceSearch|esponseForm|est|estricted|esultant|eturn|eturnExpressionPacket|eturnPacket|eturnTextPacket|everse|everseBiorthogonalSplineWavelet|everseElement|everseEquilibrium|everseGraph|everseSort|everseSortBy|everseUpEquilibrium|evolutionPlot3D|iccatiSolve|iceDistribution|idgeFilter|iemannR|iemannSiegelTheta|iemannSiegelZ|iemannXi|iffle|ightArrow|ightArrowBar|ightArrowLeftArrow|ightComposition|ightCosetRepresentative|ightDownTeeVector|ightDownVector|ightDownVectorBar|ightTee|ightTeeArrow|ightTeeVector|ightTriangle|ightTriangleBar|ightTriangleEqual|ightUpDownVector|ightUpTeeVector|ightUpVector|ightUpVectorBar|ightVector|ightVectorBar|iskAchievementImportance|iskReductionImportance|obustConvexOptimization|ogersTanimotoDissimilarity|ollPitchYawAngles|ollPitchYawMatrix|omanNumeral|oot|ootApproximant|ootIntervals|ootLocusPlot|ootMeanSquare|ootOfUnityQ|ootReduce|ootSum|oots|otate|otateLeft|otateRight|otationMatrix|otationTransform|ound|ow|owBox|owReduce|udinShapiro|udvalisGroupRu|ule|uleDelayed|ulePlot|un|unProcess|unThrough|ussellRaoDissimilarity)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:S(?:ARIMAProcess|ARMAProcess|ASTriangle|SSTriangle|ameAs|ameQ|ampledSoundFunction|ampledSoundList|atelliteData|atisfiabilityCount|atisfiabilityInstances|atisfiableQ|ave|avitzkyGolayMatrix|awtoothWave|cale|caled|calingMatrix|calingTransform|can|cheduledTask|churDecomposition|cientificForm|corerGi|corerGiPrime|corerHi|corerHiPrime|ec|ech|echDistribution|econdOrderConeOptimization|ectorChart|ectorChart3D|eedRandom|elect|electComponents|electFirst|electedCells|electedNotebook|electionCreateCell|electionEvaluate|electionEvaluateCreateCell|electionMove|emanticImport|emanticImportString|emanticInterpretation|emialgebraicComponentInstances|emidefiniteOptimization|endMail|endMessage|equence|equenceAlignment|equenceCases|equenceCount|equenceFold|equenceFoldList|equencePosition|equenceReplace|equenceSplit|eries|eriesCoefficient|eriesData|erviceConnect|erviceDisconnect|erviceExecute|erviceObject|essionSubmit|essionTime|et|etAccuracy|etAlphaChannel|etAttributes|etCloudDirectory|etCookies|etDelayed|etDirectory|etEnvironment|etFileDate|etOptions|etPermissions|etPrecision|etSelectedNotebook|etSharedFunction|etSharedVariable|etStreamPosition|etSystemOptions|etUsers|etter|etterBar|etting|hallow|hannonWavelet|hapiroWilkTest|hare|harpen|hearingMatrix|hearingTransform|hellRegion|henCastanMatrix|hiftRegisterSequence|hiftedGompertzDistribution|hort|hortDownArrow|hortLeftArrow|hortRightArrow|hortTimeFourier|hortTimeFourierData|hortUpArrow|hortest|hortestPathFunction|how|iderealTime|iegelTheta|iegelTukeyTest|ierpinskiCurve|ierpinskiMesh|ign|ignTest|ignature|ignedRankTest|ignedRegionDistance|impleGraph|impleGraphQ|implePolygonQ|implePolyhedronQ|implex|implify|in|inIntegral|inc|inghMaddalaDistribution|ingularValueDecomposition|ingularValueList|ingularValuePlot|inh|inhIntegral|ixJSymbol|keleton|keletonTransform|kellamDistribution|kewNormalDistribution|kewness|kip|liceContourPlot3D|liceDensityPlot3D|liceDistribution|liceVectorPlot3D|lideView|lider|lider2D|liderBox|lot|lotSequence|mallCircle|mithDecomposition|mithDelayCompensator|mithWatermanSimilarity|moothDensityHistogram|moothHistogram|moothHistogram3D|moothKernelDistribution|nDispersion|ocketConnect|ocketListen|ocketListener|ocketObject|ocketOpen|ocketReadMessage|ocketReadyQ|ocketWaitAll|ocketWaitNext|ockets|okalSneathDissimilarity|olarEclipse|olarSystemFeatureData|olarTime|olidAngle|olidData|olidRegionQ|olve|olveAlways|olveValues|ort|ortBy|ound|oundNote|ourcePDETerm|ow|paceCurveData|pacer|pan|parseArray|parseArrayQ|patialGraphDistribution|patialMedian|peak|pearmanRankTest|pearmanRho|peciesData|pectralLineData|pectrogram|pectrogramArray|pecularity|peechSynthesize|pellingCorrectionList|phere|pherePoints|phericalBesselJ|phericalBesselY|phericalHankelH1|phericalHankelH2|phericalHarmonicY|phericalPlot3D|phericalShell|pheroidalEigenvalue|pheroidalJoiningFactor|pheroidalPS|pheroidalPSPrime|pheroidalQS|pheroidalQSPrime|pheroidalRadialFactor|pheroidalS1|pheroidalS1Prime|pheroidalS2|pheroidalS2Prime|plicedDistribution|plit|plitBy|pokenString|potLight|qrt|qrtBox|quare|quareFreeQ|quareIntersection|quareMatrixQ|quareRepeatingElement|quareSubset|quareSubsetEqual|quareSuperset|quareSupersetEqual|quareUnion|quareWave|quaredEuclideanDistance|quaresR|tableDistribution|tack|tackBegin|tackComplete|tackInhibit|tackedDateListPlot|tackedListPlot|tadiumShape|tandardAtmosphereData|tandardDeviation|tandardDeviationFilter|tandardForm|tandardOceanData|tandardize|tandbyDistribution|tar|tarClusterData|tarData|tarGraph|tartProcess|tateFeedbackGains|tateOutputEstimator|tateResponse|tateSpaceModel|tateSpaceTransform|tateTransformationLinearize|tationaryDistribution|tationaryWaveletPacketTransform|tationaryWaveletTransform|tatusArea|tatusCentrality|tieltjesGamma|tippleShading|tirlingS1|tirlingS2|toppingPowerData|tratonovichProcess|treamDensityPlot|treamPlot|treamPlot3D|treamPosition|treams|tringCases|tringContainsQ|tringCount|tringDelete|tringDrop|tringEndsQ|tringExpression|tringExtract|tringForm|tringFormat|tringFormatQ|tringFreeQ|tringInsert|tringJoin|tringLength|tringMatchQ|tringPadLeft|tringPadRight|tringPart|tringPartition|tringPosition|tringQ|tringRepeat|tringReplace|tringReplaceList|tringReplacePart|tringReverse|tringRiffle|tringRotateLeft|tringRotateRight|tringSkeleton|tringSplit|tringStartsQ|tringTake|tringTakeDrop|tringTemplate|tringToByteArray|tringToStream|tringTrim|tripBoxes|tructuralImportance|truveH|truveL|tudentTDistribution|tyle|tyleBox|tyleData|ubMinus|ubPlus|ubStar|ubValues|ubdivide|ubfactorial|ubgraph|ubresultantPolynomialRemainders|ubresultantPolynomials|ubresultants|ubscript|ubscriptBox|ubsequences|ubset|ubsetEqual|ubsetMap|ubsetQ|ubsets|ubstitutionSystem|ubsuperscript|ubsuperscriptBox|ubtract|ubtractFrom|ubtractSides|ucceeds|ucceedsEqual|ucceedsSlantEqual|ucceedsTilde|uccess|uchThat|um|umConvergence|unPosition|unrise|unset|uperDagger|uperMinus|uperPlus|uperStar|upernovaData|uperscript|uperscriptBox|uperset|upersetEqual|urd|urfaceArea|urfaceData|urvivalDistribution|urvivalFunction|urvivalModel|urvivalModelFit|uzukiDistribution|uzukiGroupSuz|watchLegend|witch|ymbol|ymbolName|ymletWavelet|ymmetric|ymmetricGroup|ymmetricKey|ymmetricMatrixQ|ymmetricPolynomial|ymmetricReduction|ymmetrize|ymmetrizedArray|ymmetrizedArrayRules|ymmetrizedDependentComponents|ymmetrizedIndependentComponents|ymmetrizedReplacePart|ynonyms|yntaxInformation|yntaxLength|yntaxPacket|yntaxQ|ystemDialogInput|ystemInformation|ystemOpen|ystemOptions|ystemProcessData|ystemProcesses|ystemsConnectionsModel|ystemsModelControllerData|ystemsModelDelay|ystemsModelDelayApproximate|ystemsModelDelete|ystemsModelDimensions|ystemsModelExtract|ystemsModelFeedbackConnect|ystemsModelLinearity|ystemsModelMerge|ystemsModelOrder|ystemsModelParallelConnect|ystemsModelSeriesConnect|ystemsModelStateFeedbackConnect|ystemsModelVectorRelativeOrders))(?![`$[:alnum:]])",
+          "match": "S(?:ARIMAProcess|ARMAProcess|ASTriangle|SSTriangle|ameAs|ameQ|ampledSoundFunction|ampledSoundList|atelliteData|atisfiabilityCount|atisfiabilityInstances|atisfiableQ|ave|avitzkyGolayMatrix|awtoothWave|cale|caled|calingMatrix|calingTransform|can|cheduledTask|churDecomposition|cientificForm|corerGi|corerGiPrime|corerHi|corerHiPrime|ec|ech|echDistribution|econdOrderConeOptimization|ectorChart|ectorChart3D|eedRandom|elect|electComponents|electFirst|electedCells|electedNotebook|electionCreateCell|electionEvaluate|electionEvaluateCreateCell|electionMove|emanticImport|emanticImportString|emanticInterpretation|emialgebraicComponentInstances|emidefiniteOptimization|endMail|endMessage|equence|equenceAlignment|equenceCases|equenceCount|equenceFold|equenceFoldList|equencePosition|equenceReplace|equenceSplit|eries|eriesCoefficient|eriesData|erviceConnect|erviceDisconnect|erviceExecute|erviceObject|essionSubmit|essionTime|et|etAccuracy|etAlphaChannel|etAttributes|etCloudDirectory|etCookies|etDelayed|etDirectory|etEnvironment|etFileDate|etOptions|etPermissions|etPrecision|etSelectedNotebook|etSharedFunction|etSharedVariable|etStreamPosition|etSystemOptions|etUsers|etter|etterBar|etting|hallow|hannonWavelet|hapiroWilkTest|hare|harpen|hearingMatrix|hearingTransform|hellRegion|henCastanMatrix|hiftRegisterSequence|hiftedGompertzDistribution|hort|hortDownArrow|hortLeftArrow|hortRightArrow|hortTimeFourier|hortTimeFourierData|hortUpArrow|hortest|hortestPathFunction|how|iderealTime|iegelTheta|iegelTukeyTest|ierpinskiCurve|ierpinskiMesh|ign|ignTest|ignature|ignedRankTest|ignedRegionDistance|impleGraph|impleGraphQ|implePolygonQ|implePolyhedronQ|implex|implify|in|inIntegral|inc|inghMaddalaDistribution|ingularValueDecomposition|ingularValueList|ingularValuePlot|inh|inhIntegral|ixJSymbol|keleton|keletonTransform|kellamDistribution|kewNormalDistribution|kewness|kip|liceContourPlot3D|liceDensityPlot3D|liceDistribution|liceVectorPlot3D|lideView|lider|lider2D|liderBox|lot|lotSequence|mallCircle|mithDecomposition|mithDelayCompensator|mithWatermanSimilarity|moothDensityHistogram|moothHistogram|moothHistogram3D|moothKernelDistribution|nDispersion|ocketConnect|ocketListen|ocketListener|ocketObject|ocketOpen|ocketReadMessage|ocketReadyQ|ocketWaitAll|ocketWaitNext|ockets|okalSneathDissimilarity|olarEclipse|olarSystemFeatureData|olarTime|olidAngle|olidData|olidRegionQ|olve|olveAlways|olveValues|ort|ortBy|ound|oundNote|ourcePDETerm|ow|paceCurveData|pacer|pan|parseArray|parseArrayQ|patialGraphDistribution|patialMedian|peak|pearmanRankTest|pearmanRho|peciesData|pectralLineData|pectrogram|pectrogramArray|pecularity|peechSynthesize|pellingCorrectionList|phere|pherePoints|phericalBesselJ|phericalBesselY|phericalHankelH1|phericalHankelH2|phericalHarmonicY|phericalPlot3D|phericalShell|pheroidalEigenvalue|pheroidalJoiningFactor|pheroidalPS|pheroidalPSPrime|pheroidalQS|pheroidalQSPrime|pheroidalRadialFactor|pheroidalS1|pheroidalS1Prime|pheroidalS2|pheroidalS2Prime|plicedDistribution|plit|plitBy|pokenString|potLight|qrt|qrtBox|quare|quareFreeQ|quareIntersection|quareMatrixQ|quareRepeatingElement|quareSubset|quareSubsetEqual|quareSuperset|quareSupersetEqual|quareUnion|quareWave|quaredEuclideanDistance|quaresR|tableDistribution|tack|tackBegin|tackComplete|tackInhibit|tackedDateListPlot|tackedListPlot|tadiumShape|tandardAtmosphereData|tandardDeviation|tandardDeviationFilter|tandardForm|tandardOceanData|tandardize|tandbyDistribution|tar|tarClusterData|tarData|tarGraph|tartProcess|tateFeedbackGains|tateOutputEstimator|tateResponse|tateSpaceModel|tateSpaceTransform|tateTransformationLinearize|tationaryDistribution|tationaryWaveletPacketTransform|tationaryWaveletTransform|tatusArea|tatusCentrality|tieltjesGamma|tippleShading|tirlingS1|tirlingS2|toppingPowerData|tratonovichProcess|treamDensityPlot|treamPlot|treamPlot3D|treamPosition|treams|tringCases|tringContainsQ|tringCount|tringDelete|tringDrop|tringEndsQ|tringExpression|tringExtract|tringForm|tringFormat|tringFormatQ|tringFreeQ|tringInsert|tringJoin|tringLength|tringMatchQ|tringPadLeft|tringPadRight|tringPart|tringPartition|tringPosition|tringQ|tringRepeat|tringReplace|tringReplaceList|tringReplacePart|tringReverse|tringRiffle|tringRotateLeft|tringRotateRight|tringSkeleton|tringSplit|tringStartsQ|tringTake|tringTakeDrop|tringTemplate|tringToByteArray|tringToStream|tringTrim|tripBoxes|tructuralImportance|truveH|truveL|tudentTDistribution|tyle|tyleBox|tyleData|ubMinus|ubPlus|ubStar|ubValues|ubdivide|ubfactorial|ubgraph|ubresultantPolynomialRemainders|ubresultantPolynomials|ubresultants|ubscript|ubscriptBox|ubsequences|ubset|ubsetEqual|ubsetMap|ubsetQ|ubsets|ubstitutionSystem|ubsuperscript|ubsuperscriptBox|ubtract|ubtractFrom|ubtractSides|ucceeds|ucceedsEqual|ucceedsSlantEqual|ucceedsTilde|uccess|uchThat|um|umConvergence|unPosition|unrise|unset|uperDagger|uperMinus|uperPlus|uperStar|upernovaData|uperscript|uperscriptBox|uperset|upersetEqual|urd|urfaceArea|urfaceData|urvivalDistribution|urvivalFunction|urvivalModel|urvivalModelFit|uzukiDistribution|uzukiGroupSuz|watchLegend|witch|ymbol|ymbolName|ymletWavelet|ymmetric|ymmetricGroup|ymmetricKey|ymmetricMatrixQ|ymmetricPolynomial|ymmetricReduction|ymmetrize|ymmetrizedArray|ymmetrizedArrayRules|ymmetrizedDependentComponents|ymmetrizedIndependentComponents|ymmetrizedReplacePart|ynonyms|yntaxInformation|yntaxLength|yntaxPacket|yntaxQ|ystemDialogInput|ystemInformation|ystemOpen|ystemOptions|ystemProcessData|ystemProcesses|ystemsConnectionsModel|ystemsModelControllerData|ystemsModelDelay|ystemsModelDelayApproximate|ystemsModelDelete|ystemsModelDimensions|ystemsModelExtract|ystemsModelFeedbackConnect|ystemsModelLinearity|ystemsModelMerge|ystemsModelOrder|ystemsModelParallelConnect|ystemsModelSeriesConnect|ystemsModelStateFeedbackConnect|ystemsModelVectorRelativeOrders)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:T(?:Test|abView|able|ableForm|agBox|agSet|agSetDelayed|agUnset|ake|akeDrop|akeLargest|akeLargestBy|akeList|akeSmallest|akeSmallestBy|akeWhile|ally|an|anh|askAbort|askExecute|askObject|askRemove|askResume|askSuspend|askWait|asks|autologyQ|eXForm|elegraphProcess|emplateApply|emplateBox|emplateExpression|emplateIf|emplateObject|emplateSequence|emplateSlot|emplateWith|emporalData|ensorContract|ensorDimensions|ensorExpand|ensorProduct|ensorRank|ensorReduce|ensorSymmetry|ensorTranspose|ensorWedge|erminatedEvaluation|estReport|estReportObject|estResultObject|etrahedron|ext|extCell|extData|extGrid|extPacket|extRecognize|extSentences|extString|extTranslation|extWords|exture|herefore|hermodynamicData|hermometerGauge|hickness|hinning|hompsonGroupTh|hread|hreeJSymbol|hreshold|hrough|hrow|hueMorse|humbnail|ideData|ilde|ildeEqual|ildeFullEqual|ildeTilde|imeConstrained|imeObject|imeObjectQ|imeRemaining|imeSeries|imeSeriesAggregate|imeSeriesForecast|imeSeriesInsert|imeSeriesInvertibility|imeSeriesMap|imeSeriesMapThread|imeSeriesModel|imeSeriesModelFit|imeSeriesResample|imeSeriesRescale|imeSeriesShift|imeSeriesThread|imeSeriesWindow|imeSystemConvert|imeUsed|imeValue|imeZoneConvert|imeZoneOffset|imelinePlot|imes|imesBy|iming|itsGroupT|oBoxes|oCharacterCode|oContinuousTimeModel|oDiscreteTimeModel|oEntity|oExpression|oInvertibleTimeSeries|oLowerCase|oNumberField|oPolarCoordinates|oRadicals|oRules|oSphericalCoordinates|oString|oUpperCase|oeplitzMatrix|ogether|oggler|ogglerBar|ooltip|oonShading|opHatTransform|opologicalSort|orus|orusGraph|otal|otalVariationFilter|ouchPosition|r|race|raceDialog|racePrint|raceScan|racyWidomDistribution|radingChart|raditionalForm|ransferFunctionCancel|ransferFunctionExpand|ransferFunctionFactor|ransferFunctionModel|ransferFunctionPoles|ransferFunctionTransform|ransferFunctionZeros|ransformationFunction|ransformationMatrix|ransformedDistribution|ransformedField|ransformedProcess|ransformedRegion|ransitiveClosureGraph|ransitiveReductionGraph|ranslate|ranslationTransform|ransliterate|ranspose|ravelDirections|ravelDirectionsData|ravelDistance|ravelDistanceList|ravelTime|reeForm|reeGraph|reeGraphQ|reePlot|riangle|riangleWave|riangularDistribution|riangulateMesh|rigExpand|rigFactor|rigFactorList|rigReduce|rigToExp|rigger|rimmedMean|rimmedVariance|ropicalStormData|rueQ|runcatedDistribution|runcatedPolyhedron|sallisQExponentialDistribution|sallisQGaussianDistribution|ube|ukeyLambdaDistribution|ukeyWindow|unnelData|uples|uranGraph|uringMachine|uttePolynomial|woWayRule|ypeHint))(?![`$[:alnum:]])",
+          "match": "T(?:Test|abView|able|ableForm|agBox|agSet|agSetDelayed|agUnset|ake|akeDrop|akeLargest|akeLargestBy|akeList|akeSmallest|akeSmallestBy|akeWhile|ally|an|anh|askAbort|askExecute|askObject|askRemove|askResume|askSuspend|askWait|asks|autologyQ|eXForm|elegraphProcess|emplateApply|emplateBox|emplateExpression|emplateIf|emplateObject|emplateSequence|emplateSlot|emplateWith|emporalData|ensorContract|ensorDimensions|ensorExpand|ensorProduct|ensorRank|ensorReduce|ensorSymmetry|ensorTranspose|ensorWedge|erminatedEvaluation|estReport|estReportObject|estResultObject|etrahedron|ext|extCell|extData|extGrid|extPacket|extRecognize|extSentences|extString|extTranslation|extWords|exture|herefore|hermodynamicData|hermometerGauge|hickness|hinning|hompsonGroupTh|hread|hreeJSymbol|hreshold|hrough|hrow|hueMorse|humbnail|ideData|ilde|ildeEqual|ildeFullEqual|ildeTilde|imeConstrained|imeObject|imeObjectQ|imeRemaining|imeSeries|imeSeriesAggregate|imeSeriesForecast|imeSeriesInsert|imeSeriesInvertibility|imeSeriesMap|imeSeriesMapThread|imeSeriesModel|imeSeriesModelFit|imeSeriesResample|imeSeriesRescale|imeSeriesShift|imeSeriesThread|imeSeriesWindow|imeSystemConvert|imeUsed|imeValue|imeZoneConvert|imeZoneOffset|imelinePlot|imes|imesBy|iming|itsGroupT|oBoxes|oCharacterCode|oContinuousTimeModel|oDiscreteTimeModel|oEntity|oExpression|oInvertibleTimeSeries|oLowerCase|oNumberField|oPolarCoordinates|oRadicals|oRules|oSphericalCoordinates|oString|oUpperCase|oeplitzMatrix|ogether|oggler|ogglerBar|ooltip|oonShading|opHatTransform|opologicalSort|orus|orusGraph|otal|otalVariationFilter|ouchPosition|r|race|raceDialog|racePrint|raceScan|racyWidomDistribution|radingChart|raditionalForm|ransferFunctionCancel|ransferFunctionExpand|ransferFunctionFactor|ransferFunctionModel|ransferFunctionPoles|ransferFunctionTransform|ransferFunctionZeros|ransformationFunction|ransformationMatrix|ransformedDistribution|ransformedField|ransformedProcess|ransformedRegion|ransitiveClosureGraph|ransitiveReductionGraph|ranslate|ranslationTransform|ransliterate|ranspose|ravelDirections|ravelDirectionsData|ravelDistance|ravelDistanceList|ravelTime|reeForm|reeGraph|reeGraphQ|reePlot|riangle|riangleWave|riangularDistribution|riangulateMesh|rigExpand|rigFactor|rigFactorList|rigReduce|rigToExp|rigger|rimmedMean|rimmedVariance|ropicalStormData|rueQ|runcatedDistribution|runcatedPolyhedron|sallisQExponentialDistribution|sallisQGaussianDistribution|ube|ukeyLambdaDistribution|ukeyWindow|unnelData|uples|uranGraph|uringMachine|uttePolynomial|woWayRule|ypeHint)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:U(?:RL|RLBuild|RLDecode|RLDispatcher|RLDownload|RLEncode|RLExecute|RLExpand|RLParse|RLQueryDecode|RLQueryEncode|RLRead|RLResponseTime|RLShorten|RLSubmit|nateQ|ncompress|nderBar|nderflow|nderoverscript|nderoverscriptBox|nderscript|nderscriptBox|nderseaFeatureData|ndirectedEdge|ndirectedGraph|ndirectedGraphQ|nequal|nequalTo|nevaluated|niformDistribution|niformGraphDistribution|niformPolyhedron|niformSumDistribution|ninstall|nion|nionPlus|nique|nitBox|nitConvert|nitDimensions|nitRootTest|nitSimplify|nitStep|nitTriangle|nitVector|nitaryMatrixQ|nitize|niverseModelData|niversityData|nixTime|nprotect|nsameQ|nset|nsetShared|ntil|pArrow|pArrowBar|pArrowDownArrow|pDownArrow|pEquilibrium|pSet|pSetDelayed|pTee|pTeeArrow|pTo|pValues|pdate|pperCaseQ|pperLeftArrow|pperRightArrow|pperTriangularMatrix|pperTriangularMatrixQ|pperTriangularize|psample|singFrontEnd))(?![`$[:alnum:]])",
+          "match": "U(?:RL|RLBuild|RLDecode|RLDispatcher|RLDownload|RLEncode|RLExecute|RLExpand|RLParse|RLQueryDecode|RLQueryEncode|RLRead|RLResponseTime|RLShorten|RLSubmit|nateQ|ncompress|nderBar|nderflow|nderoverscript|nderoverscriptBox|nderscript|nderscriptBox|nderseaFeatureData|ndirectedEdge|ndirectedGraph|ndirectedGraphQ|nequal|nequalTo|nevaluated|niformDistribution|niformGraphDistribution|niformPolyhedron|niformSumDistribution|ninstall|nion|nionPlus|nique|nitBox|nitConvert|nitDimensions|nitRootTest|nitSimplify|nitStep|nitTriangle|nitVector|nitaryMatrixQ|nitize|niverseModelData|niversityData|nixTime|nprotect|nsameQ|nset|nsetShared|ntil|pArrow|pArrowBar|pArrowDownArrow|pDownArrow|pEquilibrium|pSet|pSetDelayed|pTee|pTeeArrow|pTo|pValues|pdate|pperCaseQ|pperLeftArrow|pperRightArrow|pperTriangularMatrix|pperTriangularMatrixQ|pperTriangularize|psample|singFrontEnd)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:V(?:alueQ|alues|ariables|ariance|arianceEquivalenceTest|arianceGammaDistribution|arianceTest|ectorAngle|ectorDensityPlot|ectorDisplacementPlot|ectorDisplacementPlot3D|ectorGreater|ectorGreaterEqual|ectorLess|ectorLessEqual|ectorPlot|ectorPlot3D|ectorQ|ectors|ee|erbatim|erificationTest|ertexAdd|ertexChromaticNumber|ertexComponent|ertexConnectivity|ertexContract|ertexCorrelationSimilarity|ertexCosineSimilarity|ertexCount|ertexCoverQ|ertexDegree|ertexDelete|ertexDiceSimilarity|ertexEccentricity|ertexInComponent|ertexInComponentGraph|ertexInDegree|ertexIndex|ertexJaccardSimilarity|ertexList|ertexOutComponent|ertexOutComponentGraph|ertexOutDegree|ertexQ|ertexReplace|ertexTransitiveGraphQ|ertexWeightedGraphQ|erticalBar|erticalGauge|erticalSeparator|erticalSlider|erticalTilde|oiceStyleData|oigtDistribution|olcanoData|olume|onMisesDistribution|oronoiMesh))(?![`$[:alnum:]])",
+          "match": "V(?:alueQ|alues|ariables|ariance|arianceEquivalenceTest|arianceGammaDistribution|arianceTest|ectorAngle|ectorDensityPlot|ectorDisplacementPlot|ectorDisplacementPlot3D|ectorGreater|ectorGreaterEqual|ectorLess|ectorLessEqual|ectorPlot|ectorPlot3D|ectorQ|ectors|ee|erbatim|erificationTest|ertexAdd|ertexChromaticNumber|ertexComponent|ertexConnectivity|ertexContract|ertexCorrelationSimilarity|ertexCosineSimilarity|ertexCount|ertexCoverQ|ertexDegree|ertexDelete|ertexDiceSimilarity|ertexEccentricity|ertexInComponent|ertexInComponentGraph|ertexInDegree|ertexIndex|ertexJaccardSimilarity|ertexList|ertexOutComponent|ertexOutComponentGraph|ertexOutDegree|ertexQ|ertexReplace|ertexTransitiveGraphQ|ertexWeightedGraphQ|erticalBar|erticalGauge|erticalSeparator|erticalSlider|erticalTilde|oiceStyleData|oigtDistribution|olcanoData|olume|onMisesDistribution|oronoiMesh)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:W(?:aitAll|aitNext|akebyDistribution|alleniusHypergeometricDistribution|aringYuleDistribution|arpingCorrespondence|arpingDistance|atershedComponents|atsonUSquareTest|attsStrogatzGraphDistribution|avePDEComponent|aveletBestBasis|aveletFilterCoefficients|aveletImagePlot|aveletListPlot|aveletMapIndexed|aveletMatrixPlot|aveletPhi|aveletPsi|aveletScalogram|aveletThreshold|eakStationarity|eaklyConnectedComponents|eaklyConnectedGraphComponents|eaklyConnectedGraphQ|eatherData|eatherForecastData|eberE|edge|eibullDistribution|eierstrassE1|eierstrassE2|eierstrassE3|eierstrassEta1|eierstrassEta2|eierstrassEta3|eierstrassHalfPeriodW1|eierstrassHalfPeriodW2|eierstrassHalfPeriodW3|eierstrassHalfPeriods|eierstrassInvariantG2|eierstrassInvariantG3|eierstrassInvariants|eierstrassP|eierstrassPPrime|eierstrassSigma|eierstrassZeta|eightedAdjacencyGraph|eightedAdjacencyMatrix|eightedData|eightedGraphQ|elchWindow|heelGraph|henEvent|hich|hile|hiteNoiseProcess|hittakerM|hittakerW|ienerFilter|ienerProcess|ignerD|ignerSemicircleDistribution|ikipediaData|ilksW|ilksWTest|indDirectionData|indSpeedData|indVectorData|indingCount|indingPolygon|insorizedMean|insorizedVariance|ishartMatrixDistribution|ith|olframAlpha|olframLanguageData|ordCloud|ordCount|ordCounts|ordData|ordDefinition|ordFrequency|ordFrequencyData|ordList|ordStem|ordTranslation|rite|riteLine|riteString|ronskian))(?![`$[:alnum:]])",
+          "match": "W(?:aitAll|aitNext|akebyDistribution|alleniusHypergeometricDistribution|aringYuleDistribution|arpingCorrespondence|arpingDistance|atershedComponents|atsonUSquareTest|attsStrogatzGraphDistribution|avePDEComponent|aveletBestBasis|aveletFilterCoefficients|aveletImagePlot|aveletListPlot|aveletMapIndexed|aveletMatrixPlot|aveletPhi|aveletPsi|aveletScalogram|aveletThreshold|eakStationarity|eaklyConnectedComponents|eaklyConnectedGraphComponents|eaklyConnectedGraphQ|eatherData|eatherForecastData|eberE|edge|eibullDistribution|eierstrassE1|eierstrassE2|eierstrassE3|eierstrassEta1|eierstrassEta2|eierstrassEta3|eierstrassHalfPeriodW1|eierstrassHalfPeriodW2|eierstrassHalfPeriodW3|eierstrassHalfPeriods|eierstrassInvariantG2|eierstrassInvariantG3|eierstrassInvariants|eierstrassP|eierstrassPPrime|eierstrassSigma|eierstrassZeta|eightedAdjacencyGraph|eightedAdjacencyMatrix|eightedData|eightedGraphQ|elchWindow|heelGraph|henEvent|hich|hile|hiteNoiseProcess|hittakerM|hittakerW|ienerFilter|ienerProcess|ignerD|ignerSemicircleDistribution|ikipediaData|ilksW|ilksWTest|indDirectionData|indSpeedData|indVectorData|indingCount|indingPolygon|insorizedMean|insorizedVariance|ishartMatrixDistribution|ith|olframAlpha|olframLanguageData|ordCloud|ordCount|ordCounts|ordData|ordDefinition|ordFrequency|ordFrequencyData|ordList|ordStem|ordTranslation|rite|riteLine|riteString|ronskian)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:X(?:MLElement|MLObject|MLTemplate|YZColor|nor|or))(?![`$[:alnum:]])",
+          "match": "X(?:MLElement|MLObject|MLTemplate|YZColor|nor|or)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:Y(?:uleDissimilarity))(?![`$[:alnum:]])",
+          "match": "YuleDissimilarity(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:Z(?:IPCodeData|Test|Transform|ernikeR|eroSymmetric|eta|etaZero|ipfDistribution))(?![`$[:alnum:]])",
+          "match": "Z(?:IPCodeData|Test|Transform|ernikeR|eroSymmetric|eta|etaZero|ipfDistribution)(?![`$[:alnum:]])",
           "name": "support.function.builtin.wolfram"
         },
         {
-          "match": "(?:A(?:cceptanceThreshold|ccuracyGoal|ctiveStyle|ddOnHelpPath|djustmentBoxOptions|lignment|lignmentPoint|llowGroupClose|llowInlineCells|llowLooseGrammar|llowReverseGroupClose|llowScriptLevelChange|llowVersionUpdate|llowedCloudExtraParameters|llowedCloudParameterExtensions|llowedDimensions|llowedFrequencyRange|llowedHeads|lternativeHypothesis|ltitudeMethod|mbiguityFunction|natomySkinStyle|nchoredSearch|nimationDirection|nimationRate|nimationRepetitions|nimationRunTime|nimationRunning|nimationTimeIndex|nnotationRules|ntialiasing|ppearance|ppearanceElements|ppearanceRules|spectRatio|ssociationFormat|ssumptions|synchronous|ttachedCell|udioChannelAssignment|udioEncoding|udioInputDevice|udioLabel|udioOutputDevice|uthentication|utoAction|utoCopy|utoDelete|utoGeneratedPackage|utoIndent|utoItalicWords|utoMultiplicationSymbol|utoOpenNotebooks|utoOpenPalettes|utoOperatorRenderings|utoRemove|utoScroll|utoSpacing|utoloadPath|utorunSequencing|xes|xesEdge|xesLabel|xesOrigin|xesStyle))(?![`$[:alnum:]])",
+          "match": "A(?:cceptanceThreshold|ccuracyGoal|ctiveStyle|ddOnHelpPath|djustmentBoxOptions|lignment|lignmentPoint|llowGroupClose|llowInlineCells|llowLooseGrammar|llowReverseGroupClose|llowScriptLevelChange|llowVersionUpdate|llowedCloudExtraParameters|llowedCloudParameterExtensions|llowedDimensions|llowedFrequencyRange|llowedHeads|lternativeHypothesis|ltitudeMethod|mbiguityFunction|natomySkinStyle|nchoredSearch|nimationDirection|nimationRate|nimationRepetitions|nimationRunTime|nimationRunning|nimationTimeIndex|nnotationRules|ntialiasing|ppearance|ppearanceElements|ppearanceRules|spectRatio|ssociationFormat|ssumptions|synchronous|ttachedCell|udioChannelAssignment|udioEncoding|udioInputDevice|udioLabel|udioOutputDevice|uthentication|utoAction|utoCopy|utoDelete|utoGeneratedPackage|utoIndent|utoItalicWords|utoMultiplicationSymbol|utoOpenNotebooks|utoOpenPalettes|utoOperatorRenderings|utoRemove|utoScroll|utoSpacing|utoloadPath|utorunSequencing|xes|xesEdge|xesLabel|xesOrigin|xesStyle)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:B(?:ackground|arOrigin|arSpacing|aseStyle|aselinePosition|inaryFormat|ookmarks|ooleanStrings|oundaryStyle|oxBaselineShift|oxFormFormatTypes|oxFrame|oxMargins|oxRatios|oxStyle|oxed|ubbleScale|ubbleSizes|uttonBoxOptions|uttonData|uttonFunction|uttonMinHeight|uttonSource|yteOrdering))(?![`$[:alnum:]])",
+          "match": "B(?:ackground|arOrigin|arSpacing|aseStyle|aselinePosition|inaryFormat|ookmarks|ooleanStrings|oundaryStyle|oxBaselineShift|oxFormFormatTypes|oxFrame|oxMargins|oxRatios|oxStyle|oxed|ubbleScale|ubbleSizes|uttonBoxOptions|uttonData|uttonFunction|uttonMinHeight|uttonSource|yteOrdering)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:C(?:alendarType|alloutMarker|alloutStyle|aptureRunning|aseOrdering|elestialSystem|ellAutoOverwrite|ellBaseline|ellBracketOptions|ellChangeTimes|ellContext|ellDingbat|ellDingbatMargin|ellDynamicExpression|ellEditDuplicate|ellEpilog|ellEvaluationDuplicate|ellEvaluationFunction|ellEventActions|ellFrame|ellFrameColor|ellFrameLabelMargins|ellFrameLabels|ellFrameMargins|ellGrouping|ellGroupingRules|ellHorizontalScrolling|ellID|ellLabel|ellLabelAutoDelete|ellLabelMargins|ellLabelPositioning|ellLabelStyle|ellLabelTemplate|ellMargins|ellOpen|ellProlog|ellSize|ellTags|haracterEncoding|haracterEncodingsPath|hartBaseStyle|hartElementFunction|hartElements|hartLabels|hartLayout|hartLegends|hartStyle|lassPriors|lickToCopyEnabled|lipPlanes|lipPlanesStyle|lipRange|lippingStyle|losingAutoSave|loudBase|loudObjectNameFormat|loudObjectURLType|lusterDissimilarityFunction|odeAssistOptions|olorCoverage|olorFunction|olorFunctionBinning|olorFunctionScaling|olorRules|olorSelectorSettings|olorSpace|olumnAlignments|olumnLines|olumnSpacings|olumnWidths|olumnsEqual|ombinerFunction|ommonDefaultFormatTypes|ommunityBoundaryStyle|ommunityLabels|ommunityRegionStyle|ompilationOptions|ompilationTarget|ompiled|omplexityFunction|ompressionLevel|onfidenceLevel|onfidenceRange|onfidenceTransform|onfigurationPath|onstants|ontentPadding|ontentSelectable|ontentSize|ontinuousAction|ontourLabels|ontourShading|ontourStyle|ontours|ontrolPlacement|ontrolType|ontrollerLinking|ontrollerMethod|ontrollerPath|ontrolsRendering|onversionRules|ookieFunction|oordinatesToolOptions|opyFunction|opyable|ornerNeighbors|ounterAssignments|ounterFunction|ounterIncrements|ounterStyleMenuListing|ovarianceEstimatorFunction|reateCellID|reateIntermediateDirectories|riterionFunction|ubics|urveClosed))(?![`$[:alnum:]])",
+          "match": "C(?:alendarType|alloutMarker|alloutStyle|aptureRunning|aseOrdering|elestialSystem|ellAutoOverwrite|ellBaseline|ellBracketOptions|ellChangeTimes|ellContext|ellDingbat|ellDingbatMargin|ellDynamicExpression|ellEditDuplicate|ellEpilog|ellEvaluationDuplicate|ellEvaluationFunction|ellEventActions|ellFrame|ellFrameColor|ellFrameLabelMargins|ellFrameLabels|ellFrameMargins|ellGrouping|ellGroupingRules|ellHorizontalScrolling|ellID|ellLabel|ellLabelAutoDelete|ellLabelMargins|ellLabelPositioning|ellLabelStyle|ellLabelTemplate|ellMargins|ellOpen|ellProlog|ellSize|ellTags|haracterEncoding|haracterEncodingsPath|hartBaseStyle|hartElementFunction|hartElements|hartLabels|hartLayout|hartLegends|hartStyle|lassPriors|lickToCopyEnabled|lipPlanes|lipPlanesStyle|lipRange|lippingStyle|losingAutoSave|loudBase|loudObjectNameFormat|loudObjectURLType|lusterDissimilarityFunction|odeAssistOptions|olorCoverage|olorFunction|olorFunctionBinning|olorFunctionScaling|olorRules|olorSelectorSettings|olorSpace|olumnAlignments|olumnLines|olumnSpacings|olumnWidths|olumnsEqual|ombinerFunction|ommonDefaultFormatTypes|ommunityBoundaryStyle|ommunityLabels|ommunityRegionStyle|ompilationOptions|ompilationTarget|ompiled|omplexityFunction|ompressionLevel|onfidenceLevel|onfidenceRange|onfidenceTransform|onfigurationPath|onstants|ontentPadding|ontentSelectable|ontentSize|ontinuousAction|ontourLabels|ontourShading|ontourStyle|ontours|ontrolPlacement|ontrolType|ontrollerLinking|ontrollerMethod|ontrollerPath|ontrolsRendering|onversionRules|ookieFunction|oordinatesToolOptions|opyFunction|opyable|ornerNeighbors|ounterAssignments|ounterFunction|ounterIncrements|ounterStyleMenuListing|ovarianceEstimatorFunction|reateCellID|reateIntermediateDirectories|riterionFunction|ubics|urveClosed)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:D(?:ataRange|ataReversed|atasetTheme|ateFormat|ateFunction|ateGranularity|ateReduction|ateTicksFormat|ayCountConvention|efaultDuplicateCellStyle|efaultDuration|efaultElement|efaultFontProperties|efaultFormatType|efaultInlineFormatType|efaultNaturalLanguage|efaultNewCellStyle|efaultNewInlineCellStyle|efaultNotebook|efaultOptions|efaultPrintPrecision|efaultStyleDefinitions|einitialization|eletable|eleteContents|eletionWarning|elimiterAutoMatching|elimiterFlashTime|elimiterMatching|elimiters|eliveryFunction|ependentVariables|eployed|escriptorStateSpace|iacriticalPositioning|ialogProlog|ialogSymbols|igitBlock|irectedEdges|irection|iscreteVariables|ispersionEstimatorFunction|isplayAllSteps|isplayFunction|istanceFunction|istributedContexts|ithering|ividers|ockedCell|ockedCells|ynamicEvaluationTimeout|ynamicModuleValues|ynamicUpdating))(?![`$[:alnum:]])",
+          "match": "D(?:ataRange|ataReversed|atasetTheme|ateFormat|ateFunction|ateGranularity|ateReduction|ateTicksFormat|ayCountConvention|efaultDuplicateCellStyle|efaultDuration|efaultElement|efaultFontProperties|efaultFormatType|efaultInlineFormatType|efaultNaturalLanguage|efaultNewCellStyle|efaultNewInlineCellStyle|efaultNotebook|efaultOptions|efaultPrintPrecision|efaultStyleDefinitions|einitialization|eletable|eleteContents|eletionWarning|elimiterAutoMatching|elimiterFlashTime|elimiterMatching|elimiters|eliveryFunction|ependentVariables|eployed|escriptorStateSpace|iacriticalPositioning|ialogProlog|ialogSymbols|igitBlock|irectedEdges|irection|iscreteVariables|ispersionEstimatorFunction|isplayAllSteps|isplayFunction|istanceFunction|istributedContexts|ithering|ividers|ockedCell|ockedCells|ynamicEvaluationTimeout|ynamicModuleValues|ynamicUpdating)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:E(?:clipseType|dgeCapacity|dgeCost|dgeLabelStyle|dgeLabels|dgeShapeFunction|dgeStyle|dgeValueRange|dgeValueSizes|dgeWeight|ditCellTagsSettings|ditable|lidedForms|nabled|pilog|pilogFunction|scapeRadius|valuatable|valuationCompletionAction|valuationElements|valuationMonitor|valuator|valuatorNames|ventLabels|xcludePods|xcludedContexts|xcludedForms|xcludedLines|xcludedPhysicalQuantities|xclusions|xclusionsStyle|xponentFunction|xponentPosition|xponentStep|xponentialFamily|xportAutoReplacements|xpressionUUID|xtension|xtentElementFunction|xtentMarkers|xtentSize|xternalDataCharacterEncoding|xternalOptions|xternalTypeSignature))(?![`$[:alnum:]])",
+          "match": "E(?:clipseType|dgeCapacity|dgeCost|dgeLabelStyle|dgeLabels|dgeShapeFunction|dgeStyle|dgeValueRange|dgeValueSizes|dgeWeight|ditCellTagsSettings|ditable|lidedForms|nabled|pilog|pilogFunction|scapeRadius|valuatable|valuationCompletionAction|valuationElements|valuationMonitor|valuator|valuatorNames|ventLabels|xcludePods|xcludedContexts|xcludedForms|xcludedLines|xcludedPhysicalQuantities|xclusions|xclusionsStyle|xponentFunction|xponentPosition|xponentStep|xponentialFamily|xportAutoReplacements|xpressionUUID|xtension|xtentElementFunction|xtentMarkers|xtentSize|xternalDataCharacterEncoding|xternalOptions|xternalTypeSignature)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:F(?:aceGrids|aceGridsStyle|ailureAction|eatureNames|eatureTypes|eedbackSector|eedbackSectorStyle|eedbackType|ieldCompletionFunction|ieldHint|ieldHintStyle|ieldMasked|ieldSize|ileNameDialogSettings|ileNameForms|illing|illingStyle|indSettings|itRegularization|ollowRedirects|ontColor|ontFamily|ontSize|ontSlant|ontSubstitutions|ontTracking|ontVariations|ontWeight|orceVersionInstall|ormBoxOptions|ormLayoutFunction|ormProtectionMethod|ormatType|ormatTypeAutoConvert|ourierParameters|ractionBoxOptions|ractionLine|rame|rameBoxOptions|rameLabel|rameMargins|rameRate|rameStyle|rameTicks|rameTicksStyle|rontEndEventActions|unctionSpace))(?![`$[:alnum:]])",
+          "match": "F(?:aceGrids|aceGridsStyle|ailureAction|eatureNames|eatureTypes|eedbackSector|eedbackSectorStyle|eedbackType|ieldCompletionFunction|ieldHint|ieldHintStyle|ieldMasked|ieldSize|ileNameDialogSettings|ileNameForms|illing|illingStyle|indSettings|itRegularization|ollowRedirects|ontColor|ontFamily|ontSize|ontSlant|ontSubstitutions|ontTracking|ontVariations|ontWeight|orceVersionInstall|ormBoxOptions|ormLayoutFunction|ormProtectionMethod|ormatType|ormatTypeAutoConvert|ourierParameters|ractionBoxOptions|ractionLine|rame|rameBoxOptions|rameLabel|rameMargins|rameRate|rameStyle|rameTicks|rameTicksStyle|rontEndEventActions|unctionSpace)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:G(?:apPenalty|augeFaceElementFunction|augeFaceStyle|augeFrameElementFunction|augeFrameSize|augeFrameStyle|augeLabels|augeMarkers|augeStyle|aussianIntegers|enerateConditions|eneratedCell|eneratedDocumentBinding|eneratedParameters|eneratedQuantityMagnitudes|eneratorDescription|eneratorHistoryLength|eneratorOutputType|eoArraySize|eoBackground|eoCenter|eoGridLines|eoGridLinesStyle|eoGridRange|eoGridRangePadding|eoLabels|eoLocation|eoModel|eoProjection|eoRange|eoRangePadding|eoResolution|eoScaleBar|eoServer|eoStylingImageFunction|eoZoomLevel|radient|raphHighlight|raphHighlightStyle|raphLayerStyle|raphLayers|raphLayout|ridCreationSettings|ridDefaultElement|ridFrame|ridFrameMargins|ridLines|ridLinesStyle|roupActionBase|roupPageBreakWithin))(?![`$[:alnum:]])",
+          "match": "G(?:apPenalty|augeFaceElementFunction|augeFaceStyle|augeFrameElementFunction|augeFrameSize|augeFrameStyle|augeLabels|augeMarkers|augeStyle|aussianIntegers|enerateConditions|eneratedCell|eneratedDocumentBinding|eneratedParameters|eneratedQuantityMagnitudes|eneratorDescription|eneratorHistoryLength|eneratorOutputType|eoArraySize|eoBackground|eoCenter|eoGridLines|eoGridLinesStyle|eoGridRange|eoGridRangePadding|eoLabels|eoLocation|eoModel|eoProjection|eoRange|eoRangePadding|eoResolution|eoScaleBar|eoServer|eoStylingImageFunction|eoZoomLevel|radient|raphHighlight|raphHighlightStyle|raphLayerStyle|raphLayers|raphLayout|ridCreationSettings|ridDefaultElement|ridFrame|ridFrameMargins|ridLines|ridLinesStyle|roupActionBase|roupPageBreakWithin)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:H(?:eaderAlignment|eaderBackground|eaderDisplayFunction|eaderLines|eaderSize|eaderStyle|eads|elpBrowserSettings|iddenItems|olidayCalendar|yperlinkAction|yphenation))(?![`$[:alnum:]])",
+          "match": "H(?:eaderAlignment|eaderBackground|eaderDisplayFunction|eaderLines|eaderSize|eaderStyle|eads|elpBrowserSettings|iddenItems|olidayCalendar|yperlinkAction|yphenation)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:I(?:conRules|gnoreCase|gnoreDiacritics|gnorePunctuation|mageCaptureFunction|mageFormattingWidth|mageLabels|mageLegends|mageMargins|magePadding|magePreviewFunction|mageRegion|mageResolution|mageSize|mageSizeAction|mageSizeMultipliers|magingDevice|mportAutoReplacements|mportOptions|ncludeConstantBasis|ncludeDefinitions|ncludeDirectories|ncludeFileExtension|ncludeGeneratorTasks|ncludeInflections|ncludeMetaInformation|ncludePods|ncludeQuantities|ncludeSingularSolutions|ncludeWindowTimes|ncludedContexts|ndeterminateThreshold|nflationMethod|nheritScope|nitialSeeding|nitialization|nitializationCell|nitializationCellEvaluation|nitializationCellWarning|nputAliases|nputAssumptions|nputAutoReplacements|nsertResults|nsertionFunction|nteractive|nterleaving|nterpolationOrder|nterpolationPoints|nterpretationBoxOptions|nterpretationFunction|ntervalMarkers|ntervalMarkersStyle|nverseFunctions|temAspectRatio|temDisplayFunction|temSize|temStyle))(?![`$[:alnum:]])",
+          "match": "I(?:conRules|gnoreCase|gnoreDiacritics|gnorePunctuation|mageCaptureFunction|mageFormattingWidth|mageLabels|mageLegends|mageMargins|magePadding|magePreviewFunction|mageRegion|mageResolution|mageSize|mageSizeAction|mageSizeMultipliers|magingDevice|mportAutoReplacements|mportOptions|ncludeConstantBasis|ncludeDefinitions|ncludeDirectories|ncludeFileExtension|ncludeGeneratorTasks|ncludeInflections|ncludeMetaInformation|ncludePods|ncludeQuantities|ncludeSingularSolutions|ncludeWindowTimes|ncludedContexts|ndeterminateThreshold|nflationMethod|nheritScope|nitialSeeding|nitialization|nitializationCell|nitializationCellEvaluation|nitializationCellWarning|nputAliases|nputAssumptions|nputAutoReplacements|nsertResults|nsertionFunction|nteractive|nterleaving|nterpolationOrder|nterpolationPoints|nterpretationBoxOptions|nterpretationFunction|ntervalMarkers|ntervalMarkersStyle|nverseFunctions|temAspectRatio|temDisplayFunction|temSize|temStyle)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:J(?:oined))(?![`$[:alnum:]])",
+          "match": "Joined(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:K(?:eepExistingVersion|eyCollisionFunction|eypointStrength))(?![`$[:alnum:]])",
+          "match": "Ke(?:epExistingVersion|yCollisionFunction|ypointStrength)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:L(?:abelStyle|abelVisibility|abelingFunction|abelingSize|anguage|anguageCategory|ayerSizeFunction|eaderSize|earningRate|egendAppearance|egendFunction|egendLabel|egendLayout|egendMargins|egendMarkerSize|egendMarkers|ighting|ightingAngle|imitsPositioning|imitsPositioningTokens|ineBreakWithin|ineIndent|ineIndentMaxFraction|ineIntegralConvolutionScale|ineSpacing|inearOffsetFunction|inebreakAdjustments|inkFunction|inkProtocol|istFormat|istPickerBoxOptions|ocalizeVariables|ocatorAutoCreate|ocatorRegion|ooping))(?![`$[:alnum:]])",
+          "match": "L(?:abelStyle|abelVisibility|abelingFunction|abelingSize|anguage|anguageCategory|ayerSizeFunction|eaderSize|earningRate|egendAppearance|egendFunction|egendLabel|egendLayout|egendMargins|egendMarkerSize|egendMarkers|ighting|ightingAngle|imitsPositioning|imitsPositioningTokens|ineBreakWithin|ineIndent|ineIndentMaxFraction|ineIntegralConvolutionScale|ineSpacing|inearOffsetFunction|inebreakAdjustments|inkFunction|inkProtocol|istFormat|istPickerBoxOptions|ocalizeVariables|ocatorAutoCreate|ocatorRegion|ooping)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:M(?:agnification|ailAddressValidation|ailResponseFunction|ailSettings|asking|atchLocalNames|axCellMeasure|axColorDistance|axDuration|axExtraBandwidths|axExtraConditions|axFeatureDisplacement|axFeatures|axItems|axIterations|axMixtureKernels|axOverlapFraction|axPlotPoints|axRecursion|axStepFraction|axStepSize|axSteps|emoryConstraint|enuCommandKey|enuSortingValue|enuStyle|esh|eshCellHighlight|eshCellLabel|eshCellMarker|eshCellShapeFunction|eshCellStyle|eshFunctions|eshQualityGoal|eshRefinementFunction|eshShading|eshStyle|etaInformation|ethod|inColorDistance|inIntervalSize|inPointSeparation|issingBehavior|issingDataMethod|issingDataRules|issingString|issingStyle|odal|odulus|ultiaxisArrangement|ultiedgeStyle|ultilaunchWarning|ultilineFunction|ultiselection))(?![`$[:alnum:]])",
+          "match": "M(?:agnification|ailAddressValidation|ailResponseFunction|ailSettings|asking|atchLocalNames|axCellMeasure|axColorDistance|axDuration|axExtraBandwidths|axExtraConditions|axFeatureDisplacement|axFeatures|axItems|axIterations|axMixtureKernels|axOverlapFraction|axPlotPoints|axRecursion|axStepFraction|axStepSize|axSteps|emoryConstraint|enuCommandKey|enuSortingValue|enuStyle|esh|eshCellHighlight|eshCellLabel|eshCellMarker|eshCellShapeFunction|eshCellStyle|eshFunctions|eshQualityGoal|eshRefinementFunction|eshShading|eshStyle|etaInformation|ethod|inColorDistance|inIntervalSize|inPointSeparation|issingBehavior|issingDataMethod|issingDataRules|issingString|issingStyle|odal|odulus|ultiaxisArrangement|ultiedgeStyle|ultilaunchWarning|ultilineFunction|ultiselection)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:N(?:icholsGridLines|ominalVariables|onConstants|ormFunction|ormalized|ormalsFunction|otebookAutoSave|otebookBrowseDirectory|otebookConvertSettings|otebookDynamicExpression|otebookEventActions|otebookPath|otebooksMenu|otificationFunction|ullRecords|ullWords|umberFormat|umberMarks|umberMultiplier|umberPadding|umberPoint|umberSeparator|umberSigns|yquistGridLines))(?![`$[:alnum:]])",
+          "match": "N(?:icholsGridLines|ominalVariables|onConstants|ormFunction|ormalized|ormalsFunction|otebookAutoSave|otebookBrowseDirectory|otebookConvertSettings|otebookDynamicExpression|otebookEventActions|otebookPath|otebooksMenu|otificationFunction|ullRecords|ullWords|umberFormat|umberMarks|umberMultiplier|umberPadding|umberPoint|umberSeparator|umberSigns|yquistGridLines)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:O(?:pacityFunction|pacityFunctionScaling|peratingSystem|ptionInspectorSettings|utputAutoOverwrite|utputSizeLimit|verlaps|verscriptBoxOptions|verwriteTarget))(?![`$[:alnum:]])",
+          "match": "O(?:pacityFunction|pacityFunctionScaling|peratingSystem|ptionInspectorSettings|utputAutoOverwrite|utputSizeLimit|verlaps|verscriptBoxOptions|verwriteTarget)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:P(?:IDDerivativeFilter|IDFeedforward|acletSite|adding|addingSize|ageBreakAbove|ageBreakBelow|ageBreakWithin|ageFooterLines|ageFooters|ageHeaderLines|ageHeaders|ageTheme|ageWidth|alettePath|aneled|aragraphIndent|aragraphSpacing|arallelization|arameterEstimator|artBehavior|artitionGranularity|assEventsDown|assEventsUp|asteBoxFormInlineCells|ath|erformanceGoal|ermissions|haseRange|laceholderReplace|layRange|lotLabel|lotLabels|lotLayout|lotLegends|lotMarkers|lotPoints|lotRange|lotRangeClipping|lotRangePadding|lotRegion|lotStyle|lotTheme|odStates|odWidth|olarAxes|olarAxesOrigin|olarGridLines|olarTicks|oleZeroMarkers|recisionGoal|referencesPath|reprocessingRules|reserveColor|reserveImageOptions|rincipalValue|rintAction|rintPrecision|rintingCopies|rintingOptions|rintingPageRange|rintingStartingPageNumber|rintingStyleEnvironment|rintout3DPreviewer|rivateCellOptions|rivateEvaluationOptions|rivateFontOptions|rivateNotebookOptions|rivatePaths|rocessDirectory|rocessEnvironment|rocessEstimator|rogressReporting|rolog|ropagateAborts))(?![`$[:alnum:]])",
+          "match": "P(?:IDDerivativeFilter|IDFeedforward|acletSite|adding|addingSize|ageBreakAbove|ageBreakBelow|ageBreakWithin|ageFooterLines|ageFooters|ageHeaderLines|ageHeaders|ageTheme|ageWidth|alettePath|aneled|aragraphIndent|aragraphSpacing|arallelization|arameterEstimator|artBehavior|artitionGranularity|assEventsDown|assEventsUp|asteBoxFormInlineCells|ath|erformanceGoal|ermissions|haseRange|laceholderReplace|layRange|lotLabel|lotLabels|lotLayout|lotLegends|lotMarkers|lotPoints|lotRange|lotRangeClipping|lotRangePadding|lotRegion|lotStyle|lotTheme|odStates|odWidth|olarAxes|olarAxesOrigin|olarGridLines|olarTicks|oleZeroMarkers|recisionGoal|referencesPath|reprocessingRules|reserveColor|reserveImageOptions|rincipalValue|rintAction|rintPrecision|rintingCopies|rintingOptions|rintingPageRange|rintingStartingPageNumber|rintingStyleEnvironment|rintout3DPreviewer|rivateCellOptions|rivateEvaluationOptions|rivateFontOptions|rivateNotebookOptions|rivatePaths|rocessDirectory|rocessEnvironment|rocessEstimator|rogressReporting|rolog|ropagateAborts)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:Q(?:uartics))(?![`$[:alnum:]])",
+          "match": "Quartics(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:R(?:adicalBoxOptions|andomSeeding|asterSize|eImLabels|eImStyle|ealBlockDiagonalForm|ecognitionPrior|ecordLists|ecordSeparators|eferenceLineStyle|efreshRate|egionBoundaryStyle|egionFillingStyle|egionFunction|egionSize|egularization|enderingOptions|equiredPhysicalQuantities|esampling|esamplingMethod|esolveContextAliases|estartInterval|eturnReceiptFunction|evolutionAxis|otateLabel|otationAction|oundingRadius|owAlignments|owLines|owMinHeight|owSpacings|owsEqual|ulerUnits|untimeAttributes|untimeOptions))(?![`$[:alnum:]])",
+          "match": "R(?:adicalBoxOptions|andomSeeding|asterSize|eImLabels|eImStyle|ealBlockDiagonalForm|ecognitionPrior|ecordLists|ecordSeparators|eferenceLineStyle|efreshRate|egionBoundaryStyle|egionFillingStyle|egionFunction|egionSize|egularization|enderingOptions|equiredPhysicalQuantities|esampling|esamplingMethod|esolveContextAliases|estartInterval|eturnReceiptFunction|evolutionAxis|otateLabel|otationAction|oundingRadius|owAlignments|owLines|owMinHeight|owSpacings|owsEqual|ulerUnits|untimeAttributes|untimeOptions)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:S(?:ameTest|ampleDepth|ampleRate|amplingPeriod|aveConnection|aveDefinitions|aveable|caleDivisions|caleOrigin|calePadding|caleRangeStyle|caleRanges|calingFunctions|cientificNotationThreshold|creenStyleEnvironment|criptBaselineShifts|criptLevel|criptMinSize|criptSizeMultipliers|crollPosition|crollbars|crollingOptions|ectorOrigin|ectorSpacing|electable|elfLoopStyle|eriesTermGoal|haringList|howAutoSpellCheck|howAutoStyles|howCellBracket|howCellLabel|howCellTags|howClosedCellArea|howContents|howCursorTracker|howGroupOpener|howPageBreaks|howSelection|howShortBoxForm|howSpecialCharacters|howStringCharacters|hrinkingDelay|ignPadding|ignificanceLevel|imilarityRules|ingleLetterItalics|liderBoxOptions|ortedBy|oundVolume|pacings|panAdjustments|panCharacterRounding|panLineThickness|panMaxSize|panMinSize|panSymmetric|pecificityGoal|pellingCorrection|pellingDictionaries|pellingDictionariesPath|pellingOptions|phericalRegion|plineClosed|plineDegree|plineKnots|plineWeights|qrtBoxOptions|tabilityMargins|tabilityMarginsStyle|tandardized|tartingStepSize|tateSpaceRealization|tepMonitor|trataVariables|treamColorFunction|treamColorFunctionScaling|treamMarkers|treamPoints|treamScale|treamStyle|trictInequalities|tripOnInput|tripWrapperBoxes|tructuredSelection|tyleBoxAutoDelete|tyleDefinitions|tyleHints|tyleMenuListing|tyleNameDialogSettings|tyleSheetPath|ubscriptBoxOptions|ubsuperscriptBoxOptions|ubtitleEncoding|uperscriptBoxOptions|urdForm|ynchronousInitialization|ynchronousUpdating|yntaxForm|ystemHelpPath|ystemsModelLabels))(?![`$[:alnum:]])",
+          "match": "S(?:ameTest|ampleDepth|ampleRate|amplingPeriod|aveConnection|aveDefinitions|aveable|caleDivisions|caleOrigin|calePadding|caleRangeStyle|caleRanges|calingFunctions|cientificNotationThreshold|creenStyleEnvironment|criptBaselineShifts|criptLevel|criptMinSize|criptSizeMultipliers|crollPosition|crollbars|crollingOptions|ectorOrigin|ectorSpacing|electable|elfLoopStyle|eriesTermGoal|haringList|howAutoSpellCheck|howAutoStyles|howCellBracket|howCellLabel|howCellTags|howClosedCellArea|howContents|howCursorTracker|howGroupOpener|howPageBreaks|howSelection|howShortBoxForm|howSpecialCharacters|howStringCharacters|hrinkingDelay|ignPadding|ignificanceLevel|imilarityRules|ingleLetterItalics|liderBoxOptions|ortedBy|oundVolume|pacings|panAdjustments|panCharacterRounding|panLineThickness|panMaxSize|panMinSize|panSymmetric|pecificityGoal|pellingCorrection|pellingDictionaries|pellingDictionariesPath|pellingOptions|phericalRegion|plineClosed|plineDegree|plineKnots|plineWeights|qrtBoxOptions|tabilityMargins|tabilityMarginsStyle|tandardized|tartingStepSize|tateSpaceRealization|tepMonitor|trataVariables|treamColorFunction|treamColorFunctionScaling|treamMarkers|treamPoints|treamScale|treamStyle|trictInequalities|tripOnInput|tripWrapperBoxes|tructuredSelection|tyleBoxAutoDelete|tyleDefinitions|tyleHints|tyleMenuListing|tyleNameDialogSettings|tyleSheetPath|ubscriptBoxOptions|ubsuperscriptBoxOptions|ubtitleEncoding|uperscriptBoxOptions|urdForm|ynchronousInitialization|ynchronousUpdating|yntaxForm|ystemHelpPath|ystemsModelLabels)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:T(?:abFilling|abSpacings|ableAlignments|ableDepth|ableDirections|ableHeadings|ableSpacing|agBoxOptions|aggingRules|argetFunctions|argetUnits|emplateBoxOptions|emporalRegularity|estID|extAlignment|extClipboardType|extJustification|extureCoordinateFunction|extureCoordinateScaling|icks|icksStyle|imeConstraint|imeDirection|imeFormat|imeGoal|imeSystem|imeZone|okenWords|olerance|ooltipDelay|ooltipStyle|otalWidth|ouchscreenAutoZoom|ouchscreenControlPlacement|raceAbove|raceBackward|raceDepth|raceForward|raceOff|raceOn|raceOriginal|rackedSymbols|rackingFunction|raditionalFunctionNotation|ransformationClass|ransformationFunctions|ransitionDirection|ransitionDuration|ransitionEffect|ranslationOptions|ravelMethod|rendStyle|rig))(?![`$[:alnum:]])",
+          "match": "T(?:abFilling|abSpacings|ableAlignments|ableDepth|ableDirections|ableHeadings|ableSpacing|agBoxOptions|aggingRules|argetFunctions|argetUnits|emplateBoxOptions|emporalRegularity|estID|extAlignment|extClipboardType|extJustification|extureCoordinateFunction|extureCoordinateScaling|icks|icksStyle|imeConstraint|imeDirection|imeFormat|imeGoal|imeSystem|imeZone|okenWords|olerance|ooltipDelay|ooltipStyle|otalWidth|ouchscreenAutoZoom|ouchscreenControlPlacement|raceAbove|raceBackward|raceDepth|raceForward|raceOff|raceOn|raceOriginal|rackedSymbols|rackingFunction|raditionalFunctionNotation|ransformationClass|ransformationFunctions|ransitionDirection|ransitionDuration|ransitionEffect|ranslationOptions|ravelMethod|rendStyle|rig)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:U(?:nderoverscriptBoxOptions|nderscriptBoxOptions|ndoOptions|ndoTrackedVariables|nitSystem|nityDimensions|nsavedVariables|pdateInterval|pdatePacletSites|tilityFunction))(?![`$[:alnum:]])",
+          "match": "U(?:nderoverscriptBoxOptions|nderscriptBoxOptions|ndoOptions|ndoTrackedVariables|nitSystem|nityDimensions|nsavedVariables|pdateInterval|pdatePacletSites|tilityFunction)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:V(?:alidationLength|alidationSet|alueDimensions|arianceEstimatorFunction|ectorAspectRatio|ectorColorFunction|ectorColorFunctionScaling|ectorMarkers|ectorPoints|ectorRange|ectorScaling|ectorSizes|ectorStyle|erifyConvergence|erifySecurityCertificates|erifySolutions|erifyTestAssumptions|ersionedPreferences|ertexCapacity|ertexColors|ertexCoordinates|ertexDataCoordinates|ertexLabelStyle|ertexLabels|ertexNormals|ertexShape|ertexShapeFunction|ertexSize|ertexStyle|ertexTextureCoordinates|ertexWeight|ideoEncoding|iewAngle|iewCenter|iewMatrix|iewPoint|iewProjection|iewRange|iewVector|iewVertical|isible))(?![`$[:alnum:]])",
+          "match": "V(?:alidationLength|alidationSet|alueDimensions|arianceEstimatorFunction|ectorAspectRatio|ectorColorFunction|ectorColorFunctionScaling|ectorMarkers|ectorPoints|ectorRange|ectorScaling|ectorSizes|ectorStyle|erifyConvergence|erifySecurityCertificates|erifySolutions|erifyTestAssumptions|ersionedPreferences|ertexCapacity|ertexColors|ertexCoordinates|ertexDataCoordinates|ertexLabelStyle|ertexLabels|ertexNormals|ertexShape|ertexShapeFunction|ertexSize|ertexStyle|ertexTextureCoordinates|ertexWeight|ideoEncoding|iewAngle|iewCenter|iewMatrix|iewPoint|iewProjection|iewRange|iewVector|iewVertical|isible)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:W(?:aveletScale|eights|hitePoint|indowClickSelect|indowElements|indowFloating|indowFrame|indowFrameElements|indowMargins|indowOpacity|indowSize|indowStatusArea|indowTitle|indowToolbars|ordOrientation|ordSearch|ordSelectionFunction|ordSeparators|ordSpacings|orkingPrecision|rapAround))(?![`$[:alnum:]])",
+          "match": "W(?:aveletScale|eights|hitePoint|indowClickSelect|indowElements|indowFloating|indowFrame|indowFrameElements|indowMargins|indowOpacity|indowSize|indowStatusArea|indowTitle|indowToolbars|ordOrientation|ordSearch|ordSelectionFunction|ordSeparators|ordSpacings|orkingPrecision|rapAround)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:Z(?:eroTest|eroWidthTimes))(?![`$[:alnum:]])",
+          "match": "Zero(?:Test|WidthTimes)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:A(?:bove|fter|lgebraics|ll|nonymous|utomatic|xis))(?![`$[:alnum:]])",
+          "match": "A(?:bove|fter|lgebraics|ll|nonymous|utomatic|xis)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:B(?:ack|ackward|aseline|efore|elow|lack|lue|old|ooleans|ottom|oxes|rown|yte))(?![`$[:alnum:]])",
+          "match": "B(?:ack|ackward|aseline|efore|elow|lack|lue|old|ooleans|ottom|oxes|rown|yte)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:C(?:atalan|ellStyle|enter|haracter|omplexInfinity|omplexes|onstant|yan))(?![`$[:alnum:]])",
+          "match": "C(?:atalan|ellStyle|enter|haracter|omplexInfinity|omplexes|onstant|yan)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:D(?:ashed|efaultAxesStyle|efaultBaseStyle|efaultBoxStyle|efaultFaceGridsStyle|efaultFieldHintStyle|efaultFrameStyle|efaultFrameTicksStyle|efaultGridLinesStyle|efaultLabelStyle|efaultMenuStyle|efaultTicksStyle|efaultTooltipStyle|egree|elimiter|igitCharacter|otDashed|otted))(?![`$[:alnum:]])",
+          "match": "D(?:ashed|efaultAxesStyle|efaultBaseStyle|efaultBoxStyle|efaultFaceGridsStyle|efaultFieldHintStyle|efaultFrameStyle|efaultFrameTicksStyle|efaultGridLinesStyle|efaultLabelStyle|efaultMenuStyle|efaultTicksStyle|efaultTooltipStyle|egree|elimiter|igitCharacter|otDashed|otted)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:E(?:|ndOfBuffer|ndOfFile|ndOfLine|ndOfString|ulerGamma|xpression))(?![`$[:alnum:]])",
+          "match": "E(?:|ndOfBuffer|ndOfFile|ndOfLine|ndOfString|ulerGamma|xpression)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:F(?:alse|lat|ontProperties|orward|orwardBackward|riday|ront|rontEndDynamicExpression|ull))(?![`$[:alnum:]])",
+          "match": "F(?:alse|lat|ontProperties|orward|orwardBackward|riday|ront|rontEndDynamicExpression|ull)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:G(?:eneral|laisher|oldenAngle|oldenRatio|ray|reen))(?![`$[:alnum:]])",
+          "match": "G(?:eneral|laisher|oldenAngle|oldenRatio|ray|reen)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:H(?:ere|exadecimalCharacter|oldAll|oldAllComplete|oldFirst|oldRest))(?![`$[:alnum:]])",
+          "match": "H(?:ere|exadecimalCharacter|oldAll|oldAllComplete|oldFirst|oldRest)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:I(?:|ndeterminate|nfinity|nherited|nteger|ntegers|talic))(?![`$[:alnum:]])",
+          "match": "I(?:|ndeterminate|nfinity|nherited|nteger|ntegers|talic)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:K(?:hinchin))(?![`$[:alnum:]])",
+          "match": "Khinchin(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:L(?:arge|arger|eft|etterCharacter|ightBlue|ightBrown|ightCyan|ightGray|ightGreen|ightMagenta|ightOrange|ightPink|ightPurple|ightRed|ightYellow|istable|ocked))(?![`$[:alnum:]])",
+          "match": "L(?:arge|arger|eft|etterCharacter|ightBlue|ightBrown|ightCyan|ightGray|ightGreen|ightMagenta|ightOrange|ightPink|ightPurple|ightRed|ightYellow|istable|ocked)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:M(?:achinePrecision|agenta|anual|edium|eshCellCentroid|eshCellMeasure|eshCellQuality|onday))(?![`$[:alnum:]])",
+          "match": "M(?:achinePrecision|agenta|anual|edium|eshCellCentroid|eshCellMeasure|eshCellQuality|onday)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:N(?:HoldAll|HoldFirst|HoldRest|egativeIntegers|egativeRationals|egativeReals|oWhitespace|onNegativeIntegers|onNegativeRationals|onNegativeReals|onPositiveIntegers|onPositiveRationals|onPositiveReals|one|ow|ull|umber|umberString|umericFunction))(?![`$[:alnum:]])",
+          "match": "N(?:HoldAll|HoldFirst|HoldRest|egativeIntegers|egativeRationals|egativeReals|oWhitespace|onNegativeIntegers|onNegativeRationals|onNegativeReals|onPositiveIntegers|onPositiveRationals|onPositiveReals|one|ow|ull|umber|umberString|umericFunction)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:O(?:neIdentity|range|rderless))(?![`$[:alnum:]])",
+          "match": "O(?:neIdentity|range|rderless)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:P(?:i|ink|lain|ositiveIntegers|ositiveRationals|ositiveReals|rimes|rotected|unctuationCharacter|urple))(?![`$[:alnum:]])",
+          "match": "P(?:i|ink|lain|ositiveIntegers|ositiveRationals|ositiveReals|rimes|rotected|unctuationCharacter|urple)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:R(?:ationals|eadProtected|eal|eals|ecord|ed|ight))(?![`$[:alnum:]])",
+          "match": "R(?:ationals|eadProtected|eal|eals|ecord|ed|ight)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:S(?:aturday|equenceHold|mall|maller|panFromAbove|panFromBoth|panFromLeft|tartOfLine|tartOfString|tring|truckthrough|tub|unday))(?![`$[:alnum:]])",
+          "match": "S(?:aturday|equenceHold|mall|maller|panFromAbove|panFromBoth|panFromLeft|tartOfLine|tartOfString|tring|truckthrough|tub|unday)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:T(?:emporary|hick|hin|hursday|iny|oday|omorrow|op|ransparent|rue|uesday))(?![`$[:alnum:]])",
+          "match": "T(?:emporary|hick|hin|hursday|iny|oday|omorrow|op|ransparent|rue|uesday)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:U(?:ndefined|nderlined))(?![`$[:alnum:]])",
+          "match": "Unde(?:fined|rlined)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:W(?:ednesday|hite|hitespace|hitespaceCharacter|ord|ordBoundary|ordCharacter))(?![`$[:alnum:]])",
+          "match": "W(?:ednesday|hite|hitespace|hitespaceCharacter|ord|ordBoundary|ordCharacter)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:Y(?:ellow|esterday))(?![`$[:alnum:]])",
+          "match": "Ye(?:llow|sterday)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:\\$(?:Aborted|ActivationKey|AllowDataUpdates|AllowInternet|AssertFunction|Assumptions|AudioInputDevices|AudioOutputDevices|BaseDirectory|BasePacletsDirectory|BatchInput|BatchOutput|ByteOrdering|CacheBaseDirectory|Canceled|CharacterEncoding|CharacterEncodings|CloudAccountName|CloudBase|CloudConnected|CloudCreditsAvailable|CloudEvaluation|CloudExpressionBase|CloudObjectNameFormat|CloudObjectURLType|CloudRootDirectory|CloudSymbolBase|CloudUserID|CloudUserUUID|CloudVersion|CommandLine|CompilationTarget|Context|ContextAliases|ContextPath|ControlActiveSetting|Cookies|CreationDate|CurrentLink|CurrentTask|DateStringFormat|DefaultAudioInputDevice|DefaultAudioOutputDevice|DefaultFrontEnd|DefaultImagingDevice|DefaultKernels|DefaultLocalBase|DefaultLocalKernel|Display|DisplayFunction|DistributedContexts|DynamicEvaluation|Echo|EmbedCodeEnvironments|EmbeddableServices|Epilog|EvaluationCloudBase|EvaluationCloudObject|EvaluationEnvironment|ExportFormats|Failed|FontFamilies|FrontEnd|FrontEndSession|GeoLocation|GeoLocationCity|GeoLocationCountry|GeoLocationSource|HomeDirectory|IgnoreEOF|ImageFormattingWidth|ImageResolution|ImagingDevice|ImagingDevices|ImportFormats|InitialDirectory|Input|InputFileName|InputStreamMethods|Inspector|InstallationDirectory|InterpreterTypes|IterationLimit|KernelCount|KernelID|Language|LibraryPath|LicenseExpirationDate|LicenseID|LicenseServer|Linked|LocalBase|LocalSymbolBase|MachineAddresses|MachineDomains|MachineEpsilon|MachineID|MachineName|MachinePrecision|MachineType|MaxExtraPrecision|MaxMachineNumber|MaxNumber|MaxPiecewiseCases|MaxPrecision|MaxRootDegree|MessageGroups|MessageList|MessagePrePrint|Messages|MinMachineNumber|MinNumber|MinPrecision|MobilePhone|ModuleNumber|NetworkConnected|NewMessage|NewSymbol|NotebookInlineStorageLimit|Notebooks|NumberMarks|OperatingSystem|Output|OutputSizeLimit|OutputStreamMethods|Packages|ParentLink|ParentProcessID|PasswordFile|Path|PathnameSeparator|PerformanceGoal|Permissions|PlotTheme|Printout3DPreviewer|ProcessID|ProcessorCount|ProcessorType|ProgressReporting|RandomGeneratorState|RecursionLimit|ReleaseNumber|RequesterAddress|RequesterCloudUserID|RequesterCloudUserUUID|RequesterWolframID|RequesterWolframUUID|RootDirectory|ScriptCommandLine|ScriptInputString|Services|SessionID|SharedFunctions|SharedVariables|SoundDisplayFunction|SynchronousEvaluation|System|SystemCharacterEncoding|SystemID|SystemShell|SystemTimeZone|SystemWordLength|TemplatePath|TemporaryDirectory|TimeUnit|TimeZone|TimeZoneEntity|TimedOut|UnitSystem|Urgent|UserAgentString|UserBaseDirectory|UserBasePacletsDirectory|UserDocumentsDirectory|UserURLBase|Username|Version|VersionNumber|WolframDocumentsDirectory|WolframID|WolframUUID))(?![`$[:alnum:]])",
+          "match": "\\$(?:Aborted|ActivationKey|AllowDataUpdates|AllowInternet|AssertFunction|Assumptions|AudioInputDevices|AudioOutputDevices|BaseDirectory|BasePacletsDirectory|BatchInput|BatchOutput|ByteOrdering|CacheBaseDirectory|Canceled|CharacterEncoding|CharacterEncodings|CloudAccountName|CloudBase|CloudConnected|CloudCreditsAvailable|CloudEvaluation|CloudExpressionBase|CloudObjectNameFormat|CloudObjectURLType|CloudRootDirectory|CloudSymbolBase|CloudUserID|CloudUserUUID|CloudVersion|CommandLine|CompilationTarget|Context|ContextAliases|ContextPath|ControlActiveSetting|Cookies|CreationDate|CurrentLink|CurrentTask|DateStringFormat|DefaultAudioInputDevice|DefaultAudioOutputDevice|DefaultFrontEnd|DefaultImagingDevice|DefaultKernels|DefaultLocalBase|DefaultLocalKernel|Display|DisplayFunction|DistributedContexts|DynamicEvaluation|Echo|EmbedCodeEnvironments|EmbeddableServices|Epilog|EvaluationCloudBase|EvaluationCloudObject|EvaluationEnvironment|ExportFormats|Failed|FontFamilies|FrontEnd|FrontEndSession|GeoLocation|GeoLocationCity|GeoLocationCountry|GeoLocationSource|HomeDirectory|IgnoreEOF|ImageFormattingWidth|ImageResolution|ImagingDevice|ImagingDevices|ImportFormats|InitialDirectory|Input|InputFileName|InputStreamMethods|Inspector|InstallationDirectory|InterpreterTypes|IterationLimit|KernelCount|KernelID|Language|LibraryPath|LicenseExpirationDate|LicenseID|LicenseServer|Linked|LocalBase|LocalSymbolBase|MachineAddresses|MachineDomains|MachineEpsilon|MachineID|MachineName|MachinePrecision|MachineType|MaxExtraPrecision|MaxMachineNumber|MaxNumber|MaxPiecewiseCases|MaxPrecision|MaxRootDegree|MessageGroups|MessageList|MessagePrePrint|Messages|MinMachineNumber|MinNumber|MinPrecision|MobilePhone|ModuleNumber|NetworkConnected|NewMessage|NewSymbol|NotebookInlineStorageLimit|Notebooks|NumberMarks|OperatingSystem|Output|OutputSizeLimit|OutputStreamMethods|Packages|ParentLink|ParentProcessID|PasswordFile|Path|PathnameSeparator|PerformanceGoal|Permissions|PlotTheme|Printout3DPreviewer|ProcessID|ProcessorCount|ProcessorType|ProgressReporting|RandomGeneratorState|RecursionLimit|ReleaseNumber|RequesterAddress|RequesterCloudUserID|RequesterCloudUserUUID|RequesterWolframID|RequesterWolframUUID|RootDirectory|ScriptCommandLine|ScriptInputString|Services|SessionID|SharedFunctions|SharedVariables|SoundDisplayFunction|SynchronousEvaluation|System|SystemCharacterEncoding|SystemID|SystemShell|SystemTimeZone|SystemWordLength|TemplatePath|TemporaryDirectory|TimeUnit|TimeZone|TimeZoneEntity|TimedOut|UnitSystem|Urgent|UserAgentString|UserBaseDirectory|UserBasePacletsDirectory|UserDocumentsDirectory|UserURLBase|Username|Version|VersionNumber|WolframDocumentsDirectory|WolframID|WolframUUID)(?![`$[:alnum:]])",
           "name": "constant.language.wolfram"
         },
         {
-          "match": "(?:A(?:bortScheduledTask|ctive|lgebraicRules|lternateImage|natomyForm|nimationCycleOffset|nimationCycleRepetitions|nimationDisplayTime|spectRatioFixed|stronomicalData|synchronousTaskObject|synchronousTasks|udioDevice|udioLooping))(?![`$[:alnum:]])",
+          "match": "A(?:bortScheduledTask|ctive|lgebraicRules|lternateImage|natomyForm|nimationCycleOffset|nimationCycleRepetitions|nimationDisplayTime|spectRatioFixed|stronomicalData|synchronousTaskObject|synchronousTasks|udioDevice|udioLooping)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:B(?:uttonEvaluator|uttonExpandable|uttonFrame|uttonMargins|uttonNote|uttonStyle))(?![`$[:alnum:]])",
+          "match": "Button(?:Evaluator|Expandable|Frame|Margins|Note|Style)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:C(?:DFInformation|hebyshevDistance|lassifierInformation|lipFill|olorOutput|olumnForm|ompose|onstantArrayLayer|onstantPlusLayer|onstantTimesLayer|onstrainedMax|onstrainedMin|ontourGraphics|ontourLines|onversionOptions|reateScheduledTask|reateTemporary|urry))(?![`$[:alnum:]])",
+          "match": "C(?:DFInformation|hebyshevDistance|lassifierInformation|lipFill|olorOutput|olumnForm|ompose|onstantArrayLayer|onstantPlusLayer|onstantTimesLayer|onstrainedMax|onstrainedMin|ontourGraphics|ontourLines|onversionOptions|reateScheduledTask|reateTemporary|urry)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:D(?:atabinRemove|ate|ebug|efaultColor|efaultFont|ensityGraphics|isplay|isplayString|otPlusLayer|ragAndDrop))(?![`$[:alnum:]])",
+          "match": "D(?:atabinRemove|ate|ebug|efaultColor|efaultFont|ensityGraphics|isplay|isplayString|otPlusLayer|ragAndDrop)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:E(?:dgeLabeling|dgeRenderingFunction|valuateScheduledTask|xpectedValue))(?![`$[:alnum:]])",
+          "match": "E(?:dgeLabeling|dgeRenderingFunction|valuateScheduledTask|xpectedValue)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:F(?:actorComplete|ontForm|ormTheme|romDate|ullOptions))(?![`$[:alnum:]])",
+          "match": "F(?:actorComplete|ontForm|ormTheme|romDate|ullOptions)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:G(?:raphStyle|raphicsArray|raphicsSpacing|ridBaseline))(?![`$[:alnum:]])",
+          "match": "Gr(?:aphStyle|aphicsArray|aphicsSpacing|idBaseline)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:H(?:TMLSave|eldPart|iddenSurface|omeDirectory))(?![`$[:alnum:]])",
+          "match": "H(?:TMLSave|eldPart|iddenSurface|omeDirectory)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:I(?:mageRotated|nstanceNormalizationLayer))(?![`$[:alnum:]])",
+          "match": "I(?:mageRotated|nstanceNormalizationLayer)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:L(?:UBackSubstitution|egendreType|ightSources|inearProgramming|inkOpen|iteral|ongestMatch))(?![`$[:alnum:]])",
+          "match": "L(?:UBackSubstitution|egendreType|ightSources|inearProgramming|inkOpen|iteral|ongestMatch)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:M(?:eshRange|oleculeEquivalentQ))(?![`$[:alnum:]])",
+          "match": "M(?:eshRange|oleculeEquivalentQ)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:N(?:etInformation|etSharedArray|extScheduledTaskTime|otebookCreate))(?![`$[:alnum:]])",
+          "match": "N(?:etInformation|etSharedArray|extScheduledTaskTime|otebookCreate)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:O(?:penTemporary))(?![`$[:alnum:]])",
+          "match": "OpenTemporary(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:P(?:IDData|ackingMethod|ersistentValue|ixelConstrained|lot3Matrix|lotDivision|lotJoined|olygonIntersections|redictorInformation|roperties|roperty|ropertyList|ropertyValue))(?![`$[:alnum:]])",
+          "match": "P(?:IDData|ackingMethod|ersistentValue|ixelConstrained|lot3Matrix|lotDivision|lotJoined|olygonIntersections|redictorInformation|roperties|roperty|ropertyList|ropertyValue)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:R(?:andom|asterArray|ecognitionThreshold|elease|emoteKernelObject|emoveAsynchronousTask|emoveProperty|emoveScheduledTask|enderAll|eplaceHeldPart|esetScheduledTask|esumePacket|unScheduledTask))(?![`$[:alnum:]])",
+          "match": "R(?:andom|asterArray|ecognitionThreshold|elease|emoteKernelObject|emoveAsynchronousTask|emoveProperty|emoveScheduledTask|enderAll|eplaceHeldPart|esetScheduledTask|esumePacket|unScheduledTask)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:S(?:cheduledTaskActiveQ|cheduledTaskInformation|cheduledTaskObject|cheduledTasks|creenRectangle|electionAnimate|equenceAttentionLayer|equenceForm|etProperty|hading|hortestMatch|ingularValues|kinStyle|ocialMediaData|tartAsynchronousTask|tartScheduledTask|tateDimensions|topAsynchronousTask|topScheduledTask|tructuredArray|tyleForm|tylePrint|ubscripted|urfaceColor|urfaceGraphics|uspendPacket|ystemModelProgressReporting))(?![`$[:alnum:]])",
+          "match": "S(?:cheduledTaskActiveQ|cheduledTaskInformation|cheduledTaskObject|cheduledTasks|creenRectangle|electionAnimate|equenceAttentionLayer|equenceForm|etProperty|hading|hortestMatch|ingularValues|kinStyle|ocialMediaData|tartAsynchronousTask|tartScheduledTask|tateDimensions|topAsynchronousTask|topScheduledTask|tructuredArray|tyleForm|tylePrint|ubscripted|urfaceColor|urfaceGraphics|uspendPacket|ystemModelProgressReporting)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:T(?:eXSave|extStyle|imeWarpingCorrespondence|imeWarpingDistance|oDate|oFileName|oHeldExpression))(?![`$[:alnum:]])",
+          "match": "T(?:eXSave|extStyle|imeWarpingCorrespondence|imeWarpingDistance|oDate|oFileName|oHeldExpression)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:U(?:RLFetch|RLFetchAsynchronous|RLSave|RLSaveAsynchronous))(?![`$[:alnum:]])",
+          "match": "URL(?:Fetch|FetchAsynchronous|Save|SaveAsynchronous)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:V(?:ectorScale|ertexCoordinateRules|ertexLabeling|ertexRenderingFunction))(?![`$[:alnum:]])",
+          "match": "Ve(?:ctorScale|rtexCoordinateRules|rtexLabeling|rtexRenderingFunction)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:W(?:aitAsynchronousTask|indowMovable))(?![`$[:alnum:]])",
+          "match": "W(?:aitAsynchronousTask|indowMovable)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:\\$(?:AsynchronousTask|ConfiguredKernels|DefaultFont|EntityStores|FormatType|HTTPCookies|InstallationDate|MachineDomain|ProductInformation|ProgramName|RandomState|ScheduledTask|SummaryBoxDataSizeLimit|TemporaryPrefix|TextStyle|TopDirectory|UserAddOnsDirectory))(?![`$[:alnum:]])",
+          "match": "\\$(?:AsynchronousTask|ConfiguredKernels|DefaultFont|EntityStores|FormatType|HTTPCookies|InstallationDate|MachineDomain|ProductInformation|ProgramName|RandomState|ScheduledTask|SummaryBoxDataSizeLimit|TemporaryPrefix|TextStyle|TopDirectory|UserAddOnsDirectory)(?![`$[:alnum:]])",
           "name": "invalid.deprecated.wolfram"
         },
         {
-          "match": "(?:A(?:ctionDelay|ctionMenuBox|ctionMenuBoxOptions|ctiveItem|lgebraicRulesData|lignmentMarker|llowAdultContent|llowChatServices|llowIncomplete|nalytic|nimatorBox|nimatorBoxOptions|nimatorElements|ppendCheck|rgumentCountQ|rrow3DBox|rrowBox|uthenticate|utoEvaluateEvents|utoIndentSpacings|utoMatch|utoNumberFormatting|utoQuoteCharacters|utoScaling|utoStyleOptions|utoStyleWords|utomaticImageSize|xis3DBox|xis3DBoxOptions|xisBox|xisBoxOptions))(?![`$[:alnum:]])",
+          "match": "A(?:ctionDelay|ctionMenuBox|ctionMenuBoxOptions|ctiveItem|lgebraicRulesData|lignmentMarker|llowAdultContent|llowChatServices|llowIncomplete|nalytic|nimatorBox|nimatorBoxOptions|nimatorElements|ppendCheck|rgumentCountQ|rrow3DBox|rrowBox|uthenticate|utoEvaluateEvents|utoIndentSpacings|utoMatch|utoNumberFormatting|utoQuoteCharacters|utoScaling|utoStyleOptions|utoStyleWords|utomaticImageSize|xis3DBox|xis3DBoxOptions|xisBox|xisBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:B(?:SplineCurve3DBox|SplineCurve3DBoxOptions|SplineCurveBox|SplineCurveBoxOptions|SplineSurface3DBox|SplineSurface3DBoxOptions|ackFaceColor|ackFaceGlowColor|ackFaceOpacity|ackFaceSpecularColor|ackFaceSpecularExponent|ackFaceSurfaceAppearance|ackFaceTexture|ackgroundAppearance|ackgroundTasksSettings|acksubstitution|eveled|ezierCurve3DBox|ezierCurve3DBoxOptions|ezierCurveBox|ezierCurveBoxOptions|lankForm|ounds|ox|oxDimensions|oxForm|oxID|oxRotation|oxRotationPoint|ra|raKet|rowserCategory|uttonCell|uttonContents|uttonStyleMenuListing))(?![`$[:alnum:]])",
+          "match": "B(?:SplineCurve3DBox|SplineCurve3DBoxOptions|SplineCurveBox|SplineCurveBoxOptions|SplineSurface3DBox|SplineSurface3DBoxOptions|ackFaceColor|ackFaceGlowColor|ackFaceOpacity|ackFaceSpecularColor|ackFaceSpecularExponent|ackFaceSurfaceAppearance|ackFaceTexture|ackgroundAppearance|ackgroundTasksSettings|acksubstitution|eveled|ezierCurve3DBox|ezierCurve3DBoxOptions|ezierCurveBox|ezierCurveBoxOptions|lankForm|ounds|ox|oxDimensions|oxForm|oxID|oxRotation|oxRotationPoint|ra|raKet|rowserCategory|uttonCell|uttonContents|uttonStyleMenuListing)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:C(?:acheGraphics|achedValue|ardinalBSplineBasis|ellBoundingBox|ellContents|ellElementSpacings|ellElementsBoundingBox|ellFrameStyle|ellInsertionPointCell|ellTrayPosition|ellTrayWidgets|hangeOptions|hannelDatabin|hannelListenerWait|hannelPreSendFunction|hartElementData|hartElementDataFunction|heckAll|heckboxBox|heckboxBoxOptions|ircleBox|lipboardNotebook|lockwiseContourIntegral|losed|losingEvent|loudConnections|loudObjectInformation|loudObjectInformationData|loudUserID|oarse|oefficientDomain|olonForm|olorSetterBox|olorSetterBoxOptions|olumnBackgrounds|ompilerEnvironmentAppend|ompletionsListPacket|omponentwiseContextMenu|ompressedData|oneBox|onicHullRegion3DBox|onicHullRegion3DBoxOptions|onicHullRegionBox|onicHullRegionBoxOptions|onnect|ontentsBoundingBox|ontextMenu|ontinuation|ontourIntegral|ontourSmoothing|ontrolAlignment|ontrollerDuration|ontrollerInformationData|onvertToPostScript|onvertToPostScriptPacket|ookies|opyTag|ounterBox|ounterBoxOptions|ounterClockwiseContourIntegral|ounterEvaluator|ounterStyle|uboidBox|uboidBoxOptions|urlyDoubleQuote|urlyQuote|ylinderBox|ylinderBoxOptions))(?![`$[:alnum:]])",
+          "match": "C(?:acheGraphics|achedValue|ardinalBSplineBasis|ellBoundingBox|ellContents|ellElementSpacings|ellElementsBoundingBox|ellFrameStyle|ellInsertionPointCell|ellTrayPosition|ellTrayWidgets|hangeOptions|hannelDatabin|hannelListenerWait|hannelPreSendFunction|hartElementData|hartElementDataFunction|heckAll|heckboxBox|heckboxBoxOptions|ircleBox|lipboardNotebook|lockwiseContourIntegral|losed|losingEvent|loudConnections|loudObjectInformation|loudObjectInformationData|loudUserID|oarse|oefficientDomain|olonForm|olorSetterBox|olorSetterBoxOptions|olumnBackgrounds|ompilerEnvironmentAppend|ompletionsListPacket|omponentwiseContextMenu|ompressedData|oneBox|onicHullRegion3DBox|onicHullRegion3DBoxOptions|onicHullRegionBox|onicHullRegionBoxOptions|onnect|ontentsBoundingBox|ontextMenu|ontinuation|ontourIntegral|ontourSmoothing|ontrolAlignment|ontrollerDuration|ontrollerInformationData|onvertToPostScript|onvertToPostScriptPacket|ookies|opyTag|ounterBox|ounterBoxOptions|ounterClockwiseContourIntegral|ounterEvaluator|ounterStyle|uboidBox|uboidBoxOptions|urlyDoubleQuote|urlyQuote|ylinderBox|ylinderBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:D(?:OSTextFormat|ampingFactor|ataCompression|atasetDisplayPanel|ateDelimiters|ebugTag|ecimal|efault2DTool|efault3DTool|efaultAttachedCellStyle|efaultControlPlacement|efaultDockedCellStyle|efaultInputFormatType|efaultOutputFormatType|efaultStyle|efaultTextFormatType|efaultTextInlineFormatType|efaultValue|efineExternal|egreeLexicographic|egreeReverseLexicographic|eleteWithContents|elimitedArray|estroyAfterEvaluation|eviceOpenQ|ialogIndent|ialogLevel|ifferenceOrder|igitBlockMinimum|isableConsolePrintPacket|iskBox|iskBoxOptions|ispatchQ|isplayRules|isplayTemporary|istributionDomain|ivergence|ocumentGeneratorInformationData|omainRegistrationInformation|oubleContourIntegral|oublyInfinite|own|rawBackFaces|rawFrontFaces|rawHighlighted|ualLinearProgramming|umpGet|ynamicBox|ynamicBoxOptions|ynamicLocation|ynamicModuleBox|ynamicModuleBoxOptions|ynamicModuleParent|ynamicName|ynamicNamespace|ynamicReference|ynamicWrapperBox|ynamicWrapperBoxOptions))(?![`$[:alnum:]])",
+          "match": "D(?:OSTextFormat|ampingFactor|ataCompression|atasetDisplayPanel|ateDelimiters|ebugTag|ecimal|efault2DTool|efault3DTool|efaultAttachedCellStyle|efaultControlPlacement|efaultDockedCellStyle|efaultInputFormatType|efaultOutputFormatType|efaultStyle|efaultTextFormatType|efaultTextInlineFormatType|efaultValue|efineExternal|egreeLexicographic|egreeReverseLexicographic|eleteWithContents|elimitedArray|estroyAfterEvaluation|eviceOpenQ|ialogIndent|ialogLevel|ifferenceOrder|igitBlockMinimum|isableConsolePrintPacket|iskBox|iskBoxOptions|ispatchQ|isplayRules|isplayTemporary|istributionDomain|ivergence|ocumentGeneratorInformationData|omainRegistrationInformation|oubleContourIntegral|oublyInfinite|own|rawBackFaces|rawFrontFaces|rawHighlighted|ualLinearProgramming|umpGet|ynamicBox|ynamicBoxOptions|ynamicLocation|ynamicModuleBox|ynamicModuleBoxOptions|ynamicModuleParent|ynamicName|ynamicNamespace|ynamicReference|ynamicWrapperBox|ynamicWrapperBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:E(?:ditButtonSettings|liminationOrder|llipticReducedHalfPeriods|mbeddingObject|mphasizeSyntaxErrors|mpty|nableConsolePrintPacket|ndAdd|ngineEnvironment|nter|qualColumns|qualRows|quatedTo|rrorBoxOptions|rrorNorm|rrorPacket|rrorsDialogSettings|valuated|valuationMode|valuationOrder|valuationRateLimit|ventEvaluator|ventHandlerTag|xactRootIsolation|xitDialog|xpectationE|xportPacket|xpressionPacket|xternalCall|xternalFunctionName))(?![`$[:alnum:]])",
+          "match": "E(?:ditButtonSettings|liminationOrder|llipticReducedHalfPeriods|mbeddingObject|mphasizeSyntaxErrors|mpty|nableConsolePrintPacket|ndAdd|ngineEnvironment|nter|qualColumns|qualRows|quatedTo|rrorBoxOptions|rrorNorm|rrorPacket|rrorsDialogSettings|valuated|valuationMode|valuationOrder|valuationRateLimit|ventEvaluator|ventHandlerTag|xactRootIsolation|xitDialog|xpectationE|xportPacket|xpressionPacket|xternalCall|xternalFunctionName)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:F(?:EDisableConsolePrintPacket|EEnableConsolePrintPacket|ail|ileInformation|ileName|illForm|illedCurveBox|illedCurveBoxOptions|ine|itAll|lashSelection|ont|ontName|ontOpacity|ontPostScriptName|ontReencoding|ormatRules|ormatValues|rameInset|rameless|rontEndObject|rontEndResource|rontEndResourceString|rontEndStackSize|rontEndValueCache|rontEndVersion|rontFaceColor|rontFaceGlowColor|rontFaceOpacity|rontFaceSpecularColor|rontFaceSpecularExponent|rontFaceSurfaceAppearance|rontFaceTexture|ullAxes))(?![`$[:alnum:]])",
+          "match": "F(?:EDisableConsolePrintPacket|EEnableConsolePrintPacket|ail|ileInformation|ileName|illForm|illedCurveBox|illedCurveBoxOptions|ine|itAll|lashSelection|ont|ontName|ontOpacity|ontPostScriptName|ontReencoding|ormatRules|ormatValues|rameInset|rameless|rontEndObject|rontEndResource|rontEndResourceString|rontEndStackSize|rontEndValueCache|rontEndVersion|rontFaceColor|rontFaceGlowColor|rontFaceOpacity|rontFaceSpecularColor|rontFaceSpecularExponent|rontFaceSurfaceAppearance|rontFaceTexture|ullAxes)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:G(?:eneratedCellStyles|eneric|eometricTransformation3DBox|eometricTransformation3DBoxOptions|eometricTransformationBox|eometricTransformationBoxOptions|estureHandlerTag|etContext|etFileName|etLinebreakInformationPacket|lobalPreferences|lobalSession|raphLayerLabels|raphRoot|raphics3DBox|raphics3DBoxOptions|raphicsBaseline|raphicsBox|raphicsBoxOptions|raphicsComplex3DBox|raphicsComplex3DBoxOptions|raphicsComplexBox|raphicsComplexBoxOptions|raphicsContents|raphicsData|raphicsGridBox|raphicsGroup3DBox|raphicsGroup3DBoxOptions|raphicsGroupBox|raphicsGroupBoxOptions|raphicsGrouping|raphicsStyle|reekStyle|ridBoxAlignment|ridBoxBackground|ridBoxDividers|ridBoxFrame|ridBoxItemSize|ridBoxItemStyle|ridBoxOptions|ridBoxSpacings|ridElementStyleOptions|roupOpenerColor|roupOpenerInsideFrame|roupTogetherGrouping|roupTogetherNestedGrouping))(?![`$[:alnum:]])",
+          "match": "G(?:eneratedCellStyles|eneric|eometricTransformation3DBox|eometricTransformation3DBoxOptions|eometricTransformationBox|eometricTransformationBoxOptions|estureHandlerTag|etContext|etFileName|etLinebreakInformationPacket|lobalPreferences|lobalSession|raphLayerLabels|raphRoot|raphics3DBox|raphics3DBoxOptions|raphicsBaseline|raphicsBox|raphicsBoxOptions|raphicsComplex3DBox|raphicsComplex3DBoxOptions|raphicsComplexBox|raphicsComplexBoxOptions|raphicsContents|raphicsData|raphicsGridBox|raphicsGroup3DBox|raphicsGroup3DBoxOptions|raphicsGroupBox|raphicsGroupBoxOptions|raphicsGrouping|raphicsStyle|reekStyle|ridBoxAlignment|ridBoxBackground|ridBoxDividers|ridBoxFrame|ridBoxItemSize|ridBoxItemStyle|ridBoxOptions|ridBoxSpacings|ridElementStyleOptions|roupOpenerColor|roupOpenerInsideFrame|roupTogetherGrouping|roupTogetherNestedGrouping)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:H(?:eadCompose|eaders|elpBrowserLookup|elpBrowserNotebook|elpViewerSettings|essian|exahedronBox|exahedronBoxOptions|ighlightString|omePage|orizontal|orizontalForm|orizontalScrollPosition|yperlinkCreationSettings|yphenationOptions))(?![`$[:alnum:]])",
+          "match": "H(?:eadCompose|eaders|elpBrowserLookup|elpBrowserNotebook|elpViewerSettings|essian|exahedronBox|exahedronBoxOptions|ighlightString|omePage|orizontal|orizontalForm|orizontalScrollPosition|yperlinkCreationSettings|yphenationOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:I(?:conizedObject|gnoreSpellCheck|mageCache|mageCacheValid|mageEditMode|mageMarkers|mageOffset|mageRangeCache|mageSizeCache|mageSizeRaw|nactiveStyle|ncludeSingularTerm|ndent|ndentMaxFraction|ndentingNewlineSpacings|ndexCreationOptions|ndexTag|nequality|nexactNumbers|nformationData|nformationDataGrid|nlineCounterAssignments|nlineCounterIncrements|nlineRules|nputFieldBox|nputFieldBoxOptions|nputGrouping|nputSettings|nputToBoxFormPacket|nsertionPointObject|nset3DBox|nset3DBoxOptions|nsetBox|nsetBoxOptions|ntegral|nterlaced|nterpolationPrecision|nterpretTemplate|nterruptSettings|nto|nvisibleApplication|nvisibleTimes|temBox|temBoxOptions))(?![`$[:alnum:]])",
+          "match": "I(?:conizedObject|gnoreSpellCheck|mageCache|mageCacheValid|mageEditMode|mageMarkers|mageOffset|mageRangeCache|mageSizeCache|mageSizeRaw|nactiveStyle|ncludeSingularTerm|ndent|ndentMaxFraction|ndentingNewlineSpacings|ndexCreationOptions|ndexTag|nequality|nexactNumbers|nformationData|nformationDataGrid|nlineCounterAssignments|nlineCounterIncrements|nlineRules|nputFieldBox|nputFieldBoxOptions|nputGrouping|nputSettings|nputToBoxFormPacket|nsertionPointObject|nset3DBox|nset3DBoxOptions|nsetBox|nsetBoxOptions|ntegral|nterlaced|nterpolationPrecision|nterpretTemplate|nterruptSettings|nto|nvisibleApplication|nvisibleTimes|temBox|temBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:J(?:acobian|oinedCurveBox|oinedCurveBoxOptions))(?![`$[:alnum:]])",
+          "match": "J(?:acobian|oinedCurveBox|oinedCurveBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:K(?:|ernelExecute|et))(?![`$[:alnum:]])",
+          "match": "K(?:|ernelExecute|et)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:L(?:abeledSlider|ambertW|anguageOptions|aunch|ayoutInformation|exicographic|icenseID|ine3DBox|ine3DBoxOptions|ineBox|ineBoxOptions|ineBreak|ineWrapParts|inearFilter|inebreakSemicolonWeighting|inkConnectedQ|inkError|inkFlush|inkHost|inkMode|inkOptions|inkReadHeld|inkService|inkWriteHeld|istPickerBoxBackground|isten|iteralSearch|ocalizeDefinitions|ocatorBox|ocatorBoxOptions|ocatorCentering|ocatorPaneBox|ocatorPaneBoxOptions|ongEqual|ongForm|oopback))(?![`$[:alnum:]])",
+          "match": "L(?:abeledSlider|ambertW|anguageOptions|aunch|ayoutInformation|exicographic|icenseID|ine3DBox|ine3DBoxOptions|ineBox|ineBoxOptions|ineBreak|ineWrapParts|inearFilter|inebreakSemicolonWeighting|inkConnectedQ|inkError|inkFlush|inkHost|inkMode|inkOptions|inkReadHeld|inkService|inkWriteHeld|istPickerBoxBackground|isten|iteralSearch|ocalizeDefinitions|ocatorBox|ocatorBoxOptions|ocatorCentering|ocatorPaneBox|ocatorPaneBoxOptions|ongEqual|ongForm|oopback)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:M(?:achineID|achineName|acintoshSystemPageSetup|ainSolve|aintainDynamicCaches|akeRules|atchLocalNameQ|aterial|athMLText|athematicaNotation|axBend|axPoints|enu|enuAppearance|enuEvaluator|enuItem|enuList|ergeDifferences|essageObject|essageOptions|essagesNotebook|etaCharacters|ethodOptions|inRecursion|inSize|ode|odular|onomialOrder|ouseAppearanceTag|ouseButtons|ousePointerNote|ultiLetterItalics|ultiLetterStyle|ultiplicity|ultiscriptBoxOptions))(?![`$[:alnum:]])",
+          "match": "M(?:achineID|achineName|acintoshSystemPageSetup|ainSolve|aintainDynamicCaches|akeRules|atchLocalNameQ|aterial|athMLText|athematicaNotation|axBend|axPoints|enu|enuAppearance|enuEvaluator|enuItem|enuList|ergeDifferences|essageObject|essageOptions|essagesNotebook|etaCharacters|ethodOptions|inRecursion|inSize|ode|odular|onomialOrder|ouseAppearanceTag|ouseButtons|ousePointerNote|ultiLetterItalics|ultiLetterStyle|ultiplicity|ultiscriptBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:N(?:BernoulliB|ProductFactors|SumTerms|Values|amespaceBox|amespaceBoxOptions|estedScriptRules|etworkPacketRecordingDuring|ext|onAssociative|ormalGrouping|otebookDefault|otebookInterfaceObject))(?![`$[:alnum:]])",
+          "match": "N(?:BernoulliB|ProductFactors|SumTerms|Values|amespaceBox|amespaceBoxOptions|estedScriptRules|etworkPacketRecordingDuring|ext|onAssociative|ormalGrouping|otebookDefault|otebookInterfaceObject)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:O(?:LEData|bjectExistsQ|pen|penFunctionInspectorPacket|penSpecialOptions|penerBox|penerBoxOptions|ptionQ|ptionValueBox|ptionValueBoxOptions|ptionsPacket|utputFormData|utputGrouping|utputMathEditExpression|ver|verlayBox|verlayBoxOptions))(?![`$[:alnum:]])",
+          "match": "O(?:LEData|bjectExistsQ|pen|penFunctionInspectorPacket|penSpecialOptions|penerBox|penerBoxOptions|ptionQ|ptionValueBox|ptionValueBoxOptions|ptionsPacket|utputFormData|utputGrouping|utputMathEditExpression|ver|verlayBox|verlayBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:P(?:ackPaclet|ackage|acletDirectoryAdd|acletDirectoryRemove|acletInformation|acletObjectQ|acletUpdate|ageHeight|alettesMenuSettings|aneBox|aneBoxOptions|aneSelectorBox|aneSelectorBoxOptions|anelBox|anelBoxOptions|aperWidth|arameter|arameterVariables|arentConnect|arentForm|arentList|arenthesize|artialD|asteAutoQuoteCharacters|ausedTime|eriodicInterpolation|erpendicular|ickMode|ickedElements|ivoting|lotRangeClipPlanesStyle|oint3DBox|oint3DBoxOptions|ointBox|ointBoxOptions|olygon3DBox|olygon3DBoxOptions|olygonBox|olygonBoxOptions|olygonHoleScale|olygonScale|olyhedronBox|olyhedronBoxOptions|olynomialForm|olynomials|opupMenuBox|opupMenuBoxOptions|ostScript|recedence|redictionRoot|referencesSettings|revious|rimaryPlaceholder|rintForm|rismBox|rismBoxOptions|rivateFrontEndOptions|robabilityPr|rocessStateDomain|rocessTimeDomain|rogressIndicatorBox|rogressIndicatorBoxOptions|romptForm|yramidBox|yramidBoxOptions))(?![`$[:alnum:]])",
+          "match": "P(?:ackPaclet|ackage|acletDirectoryAdd|acletDirectoryRemove|acletInformation|acletObjectQ|acletUpdate|ageHeight|alettesMenuSettings|aneBox|aneBoxOptions|aneSelectorBox|aneSelectorBoxOptions|anelBox|anelBoxOptions|aperWidth|arameter|arameterVariables|arentConnect|arentForm|arentList|arenthesize|artialD|asteAutoQuoteCharacters|ausedTime|eriodicInterpolation|erpendicular|ickMode|ickedElements|ivoting|lotRangeClipPlanesStyle|oint3DBox|oint3DBoxOptions|ointBox|ointBoxOptions|olygon3DBox|olygon3DBoxOptions|olygonBox|olygonBoxOptions|olygonHoleScale|olygonScale|olyhedronBox|olyhedronBoxOptions|olynomialForm|olynomials|opupMenuBox|opupMenuBoxOptions|ostScript|recedence|redictionRoot|referencesSettings|revious|rimaryPlaceholder|rintForm|rismBox|rismBoxOptions|rivateFrontEndOptions|robabilityPr|rocessStateDomain|rocessTimeDomain|rogressIndicatorBox|rogressIndicatorBoxOptions|romptForm|yramidBox|yramidBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:R(?:adioButtonBox|adioButtonBoxOptions|andomSeed|angeSpecification|aster3DBox|aster3DBoxOptions|asterBox|asterBoxOptions|ationalFunctions|awArray|awMedium|ebuildPacletData|ectangleBox|ecurringDigitsForm|eferenceMarkerStyle|eferenceMarkers|einstall|emoved|epeatedString|esourceAcquire|esourceSubmissionObject|eturnCreatesNewCell|eturnEntersInput|eturnInputFormPacket|otationBox|otationBoxOptions|oundImplies|owBackgrounds|owHeights|uleCondition|uleForm))(?![`$[:alnum:]])",
+          "match": "R(?:adioButtonBox|adioButtonBoxOptions|andomSeed|angeSpecification|aster3DBox|aster3DBoxOptions|asterBox|asterBoxOptions|ationalFunctions|awArray|awMedium|ebuildPacletData|ectangleBox|ecurringDigitsForm|eferenceMarkerStyle|eferenceMarkers|einstall|emoved|epeatedString|esourceAcquire|esourceSubmissionObject|eturnCreatesNewCell|eturnEntersInput|eturnInputFormPacket|otationBox|otationBoxOptions|oundImplies|owBackgrounds|owHeights|uleCondition|uleForm)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:S(?:aveAutoDelete|caledMousePosition|cheduledTaskInformationData|criptForm|criptRules|ectionGrouping|electWithContents|election|electionCell|electionCellCreateCell|electionCellDefaultStyle|electionCellParentStyle|electionPlaceholder|elfLoops|erviceResponse|etOptionsPacket|etSecuredAuthenticationKey|etbacks|etterBox|etterBoxOptions|howAutoConvert|howCodeAssist|howControls|howGroupOpenCloseIcon|howInvisibleCharacters|howPredictiveInterface|howSyntaxStyles|hrinkWrapBoundingBox|ingleEvaluation|ingleLetterStyle|lider2DBox|lider2DBoxOptions|ocket|olveDelayed|oundAndGraphics|pace|paceForm|panningCharacters|phereBox|phereBoxOptions|tartupSound|tringBreak|tringByteCount|tripStyleOnPaste|trokeForm|tructuredArrayHeadQ|tyleKeyMapping|tyleNames|urfaceAppearance|yntax|ystemException|ystemGet|ystemInformationData|ystemStub|ystemTest))(?![`$[:alnum:]])",
+          "match": "S(?:aveAutoDelete|caledMousePosition|cheduledTaskInformationData|criptForm|criptRules|ectionGrouping|electWithContents|election|electionCell|electionCellCreateCell|electionCellDefaultStyle|electionCellParentStyle|electionPlaceholder|elfLoops|erviceResponse|etOptionsPacket|etSecuredAuthenticationKey|etbacks|etterBox|etterBoxOptions|howAutoConvert|howCodeAssist|howControls|howGroupOpenCloseIcon|howInvisibleCharacters|howPredictiveInterface|howSyntaxStyles|hrinkWrapBoundingBox|ingleEvaluation|ingleLetterStyle|lider2DBox|lider2DBoxOptions|ocket|olveDelayed|oundAndGraphics|pace|paceForm|panningCharacters|phereBox|phereBoxOptions|tartupSound|tringBreak|tringByteCount|tripStyleOnPaste|trokeForm|tructuredArrayHeadQ|tyleKeyMapping|tyleNames|urfaceAppearance|yntax|ystemException|ystemGet|ystemInformationData|ystemStub|ystemTest)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:T(?:ab|abViewBox|abViewBoxOptions|ableViewBox|ableViewBoxAlignment|ableViewBoxBackground|ableViewBoxHeaders|ableViewBoxItemSize|ableViewBoxItemStyle|ableViewBoxOptions|agBoxNote|agStyle|emplateEvaluate|emplateSlotSequence|emplateUnevaluated|emplateVerbatim|emporaryVariable|ensorQ|etrahedronBox|etrahedronBoxOptions|ext3DBox|ext3DBoxOptions|extBand|extBoundingBox|extBox|extForm|extLine|extParagraph|hisLink|itleGrouping|oColor|oggle|oggleFalse|ogglerBox|ogglerBoxOptions|ooBig|ooltipBox|ooltipBoxOptions|otalHeight|raceAction|raceInternal|raceLevel|rackCellChangeTimes|raditionalNotation|raditionalOrder|ransparentColor|rapEnterKey|rapSelection|ubeBSplineCurveBox|ubeBSplineCurveBoxOptions|ubeBezierCurveBox|ubeBezierCurveBoxOptions|ubeBox|ubeBoxOptions))(?![`$[:alnum:]])",
+          "match": "T(?:ab|abViewBox|abViewBoxOptions|ableViewBox|ableViewBoxAlignment|ableViewBoxBackground|ableViewBoxHeaders|ableViewBoxItemSize|ableViewBoxItemStyle|ableViewBoxOptions|agBoxNote|agStyle|emplateEvaluate|emplateSlotSequence|emplateUnevaluated|emplateVerbatim|emporaryVariable|ensorQ|etrahedronBox|etrahedronBoxOptions|ext3DBox|ext3DBoxOptions|extBand|extBoundingBox|extBox|extForm|extLine|extParagraph|hisLink|itleGrouping|oColor|oggle|oggleFalse|ogglerBox|ogglerBoxOptions|ooBig|ooltipBox|ooltipBoxOptions|otalHeight|raceAction|raceInternal|raceLevel|rackCellChangeTimes|raditionalNotation|raditionalOrder|ransparentColor|rapEnterKey|rapSelection|ubeBSplineCurveBox|ubeBSplineCurveBoxOptions|ubeBezierCurveBox|ubeBezierCurveBoxOptions|ubeBox|ubeBoxOptions)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:U(?:ntrackedVariables|p|seGraphicsRange|serDefinedWavelet|sing))(?![`$[:alnum:]])",
+          "match": "U(?:ntrackedVariables|p|seGraphicsRange|serDefinedWavelet|sing)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:V(?:2Get|alueBox|alueBoxOptions|alueForm|aluesData|ectorGlyphData|erbose|ertical|erticalForm|iewPointSelectorSettings|iewPort|irtualGroupData|isibleCell))(?![`$[:alnum:]])",
+          "match": "V(?:2Get|alueBox|alueBoxOptions|alueForm|aluesData|ectorGlyphData|erbose|ertical|erticalForm|iewPointSelectorSettings|iewPort|irtualGroupData|isibleCell)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:W(?:aitUntil|ebPageMetaInformation|holeCellGroupOpener|indowPersistentStyles|indowSelected|indowWidth|olframAlphaDate|olframAlphaQuantity|olframAlphaResult|olframCloudSettings))(?![`$[:alnum:]])",
+          "match": "W(?:aitUntil|ebPageMetaInformation|holeCellGroupOpener|indowPersistentStyles|indowSelected|indowWidth|olframAlphaDate|olframAlphaQuantity|olframAlphaResult|olframCloudSettings)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:\\$(?:ActivationGroupID|ActivationUserRegistered|AddOnsDirectory|BoxForms|CloudConnection|CloudVersionNumber|CloudWolframEngineVersionNumber|ConditionHold|DefaultMailbox|DefaultPath|FinancialDataSource|GeoEntityTypes|GeoLocationPrecision|HTMLExportRules|HTTPRequest|LaunchDirectory|LicenseProcesses|LicenseSubprocesses|LicenseType|LinkSupported|LoadedFiles|MaxLicenseProcesses|MaxLicenseSubprocesses|MinorReleaseNumber|NetworkLicense|Off|OutputForms|PatchLevelID|PermissionsGroupBase|PipeSupported|PreferencesDirectory|PrintForms|PrintLiteral|RegisteredDeviceClasses|RegisteredUserName|SecuredAuthenticationKeyTokens|SetParentLink|SoundDisplay|SuppressInputFormHeads|SystemMemory|TraceOff|TraceOn|TracePattern|TracePostAction|TracePreAction|UserAgentLanguages|UserAgentMachine|UserAgentName|UserAgentOperatingSystem|UserAgentVersion|UserName))(?![`$[:alnum:]])",
+          "match": "\\$(?:ActivationGroupID|ActivationUserRegistered|AddOnsDirectory|BoxForms|CloudConnection|CloudVersionNumber|CloudWolframEngineVersionNumber|ConditionHold|DefaultMailbox|DefaultPath|FinancialDataSource|GeoEntityTypes|GeoLocationPrecision|HTMLExportRules|HTTPRequest|LaunchDirectory|LicenseProcesses|LicenseSubprocesses|LicenseType|LinkSupported|LoadedFiles|MaxLicenseProcesses|MaxLicenseSubprocesses|MinorReleaseNumber|NetworkLicense|Off|OutputForms|PatchLevelID|PermissionsGroupBase|PipeSupported|PreferencesDirectory|PrintForms|PrintLiteral|RegisteredDeviceClasses|RegisteredUserName|SecuredAuthenticationKeyTokens|SetParentLink|SoundDisplay|SuppressInputFormHeads|SystemMemory|TraceOff|TraceOn|TracePattern|TracePostAction|TracePreAction|UserAgentLanguages|UserAgentMachine|UserAgentName|UserAgentOperatingSystem|UserAgentVersion|UserName)(?![`$[:alnum:]])",
           "name": "support.function.undocumented.wolfram"
         },
         {
-          "match": "(?:A(?:ctiveClassification|ctiveClassificationObject|ctivePrediction|ctivePredictionObject|ddToSearchIndex|ggregatedEntityClass|ggregationLayer|ngleBisector|nimatedImage|nimationVideo|nomalyDetector|ppendLayer|pplication|pplyReaction|round|roundReplace|rrayReduce|sk|skAppend|skConfirm|skDisplay|skFunction|skState|skTemplateDisplay|skedQ|skedValue|ssessmentFunction|ssessmentResultObject|ssumeDeterministic|stroAngularSeparation|stroBackground|stroCenter|stroDistance|stroGraphics|stroGridLines|stroGridLinesStyle|stroPosition|stroProjection|stroRange|stroRangePadding|stroReferenceFrame|stroStyling|stroZoomLevel|tom|tomCoordinates|tomCount|tomDiagramCoordinates|tomLabelStyle|tomLabels|tomList|ttachCell|ttentionLayer|udioAnnotate|udioAnnotationLookup|udioIdentify|udioInstanceQ|udioPause|udioPlay|udioRecord|udioStop|udioStream|udioStreams|udioTrackApply|udioTrackSelection|utocomplete|utocompletionFunction|xiomaticTheory|xisLabel|xisObject|xisStyle))(?![`$[:alnum:]])",
+          "match": "A(?:ctiveClassification|ctiveClassificationObject|ctivePrediction|ctivePredictionObject|ddToSearchIndex|ggregatedEntityClass|ggregationLayer|ngleBisector|nimatedImage|nimationVideo|nomalyDetector|ppendLayer|pplication|pplyReaction|round|roundReplace|rrayReduce|sk|skAppend|skConfirm|skDisplay|skFunction|skState|skTemplateDisplay|skedQ|skedValue|ssessmentFunction|ssessmentResultObject|ssumeDeterministic|stroAngularSeparation|stroBackground|stroCenter|stroDistance|stroGraphics|stroGridLines|stroGridLinesStyle|stroPosition|stroProjection|stroRange|stroRangePadding|stroReferenceFrame|stroStyling|stroZoomLevel|tom|tomCoordinates|tomCount|tomDiagramCoordinates|tomLabelStyle|tomLabels|tomList|ttachCell|ttentionLayer|udioAnnotate|udioAnnotationLookup|udioIdentify|udioInstanceQ|udioPause|udioPlay|udioRecord|udioStop|udioStream|udioStreams|udioTrackApply|udioTrackSelection|utocomplete|utocompletionFunction|xiomaticTheory|xisLabel|xisObject|xisStyle)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:B(?:asicRecurrentLayer|atchNormalizationLayer|atchSize|ayesianMaximization|ayesianMaximizationObject|ayesianMinimization|ayesianMinimizationObject|esagL|innedVariogramList|inomialPointProcess|ioSequence|ioSequenceBackTranslateList|ioSequenceComplement|ioSequenceInstances|ioSequenceModify|ioSequencePlot|ioSequenceQ|ioSequenceReverseComplement|ioSequenceTranscribe|ioSequenceTranslate|itRate|lockDiagonalMatrix|lockLowerTriangularMatrix|lockUpperTriangularMatrix|lockchainAddressData|lockchainBase|lockchainBlockData|lockchainContractValue|lockchainData|lockchainGet|lockchainKeyEncode|lockchainPut|lockchainTokenData|lockchainTransaction|lockchainTransactionData|lockchainTransactionSign|lockchainTransactionSubmit|ond|ondCount|ondLabelStyle|ondLabels|ondList|ondQ|uildCompiledComponent))(?![`$[:alnum:]])",
+          "match": "B(?:asicRecurrentLayer|atchNormalizationLayer|atchSize|ayesianMaximization|ayesianMaximizationObject|ayesianMinimization|ayesianMinimizationObject|esagL|innedVariogramList|inomialPointProcess|ioSequence|ioSequenceBackTranslateList|ioSequenceComplement|ioSequenceInstances|ioSequenceModify|ioSequencePlot|ioSequenceQ|ioSequenceReverseComplement|ioSequenceTranscribe|ioSequenceTranslate|itRate|lockDiagonalMatrix|lockLowerTriangularMatrix|lockUpperTriangularMatrix|lockchainAddressData|lockchainBase|lockchainBlockData|lockchainContractValue|lockchainData|lockchainGet|lockchainKeyEncode|lockchainPut|lockchainTokenData|lockchainTransaction|lockchainTransactionData|lockchainTransactionSign|lockchainTransactionSubmit|ond|ondCount|ondLabelStyle|ondLabels|ondList|ondQ|uildCompiledComponent)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:C(?:TCLossLayer|achePersistence|anvas|ast|ategoricalDistribution|atenateLayer|auchyPointProcess|hannelBase|hannelBrokerAction|hannelHistoryLength|hannelListen|hannelListener|hannelListeners|hannelObject|hannelReceiverFunction|hannelSend|hannelSubscribers|haracterNormalize|hemicalConvert|hemicalFormula|hemicalInstance|hemicalReaction|loudExpression|loudExpressions|loudRenderingMethod|ombinatorB|ombinatorC|ombinatorI|ombinatorK|ombinatorS|ombinatorW|ombinatorY|ombinedEntityClass|ompiledCodeFunction|ompiledComponent|ompiledExpressionDeclaration|ompiledLayer|ompilerCallback|ompilerEnvironment|ompilerEnvironmentAppendTo|ompilerEnvironmentObject|ompilerOptions|omplementedEntityClass|omputeUncertainty|onfirmQuiet|onformationMethod|onnectSystemModelComponents|onnectSystemModelController|onnectedMoleculeComponents|onnectedMoleculeQ|onnectionSettings|ontaining|ontentDetectorFunction|ontentFieldOptions|ontentLocationFunction|ontentObject|ontrastiveLossLayer|onvolutionLayer|reateChannel|reateCloudExpression|reateCompilerEnvironment|reateDataStructure|reateDataSystemModel|reateLicenseEntitlement|reateSearchIndex|reateSystemModel|reateTypeInstance|rossEntropyLossLayer|urrentNotebookImage|urrentScreenImage|urryApplied))(?![`$[:alnum:]])",
+          "match": "C(?:TCLossLayer|achePersistence|anvas|ast|ategoricalDistribution|atenateLayer|auchyPointProcess|hannelBase|hannelBrokerAction|hannelHistoryLength|hannelListen|hannelListener|hannelListeners|hannelObject|hannelReceiverFunction|hannelSend|hannelSubscribers|haracterNormalize|hemicalConvert|hemicalFormula|hemicalInstance|hemicalReaction|loudExpression|loudExpressions|loudRenderingMethod|ombinatorB|ombinatorC|ombinatorI|ombinatorK|ombinatorS|ombinatorW|ombinatorY|ombinedEntityClass|ompiledCodeFunction|ompiledComponent|ompiledExpressionDeclaration|ompiledLayer|ompilerCallback|ompilerEnvironment|ompilerEnvironmentAppendTo|ompilerEnvironmentObject|ompilerOptions|omplementedEntityClass|omputeUncertainty|onfirmQuiet|onformationMethod|onnectSystemModelComponents|onnectSystemModelController|onnectedMoleculeComponents|onnectedMoleculeQ|onnectionSettings|ontaining|ontentDetectorFunction|ontentFieldOptions|ontentLocationFunction|ontentObject|ontrastiveLossLayer|onvolutionLayer|reateChannel|reateCloudExpression|reateCompilerEnvironment|reateDataStructure|reateDataSystemModel|reateLicenseEntitlement|reateSearchIndex|reateSystemModel|reateTypeInstance|rossEntropyLossLayer|urrentNotebookImage|urrentScreenImage|urryApplied)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:D(?:SolveChangeVariables|ataStructure|ataStructureQ|atabaseConnect|atabaseDisconnect|atabaseReference|atabinSubmit|ateInterval|eclareCompiledComponent|econvolutionLayer|ecryptFile|eleteChannel|eleteCloudExpression|eleteElements|eleteSearchIndex|erivedKey|iggleGatesPointProcess|iggleGrattonPointProcess|igitalSignature|isableFormatting|ocumentWeightingRules|otLayer|ownValuesFunction|ropoutLayer|ynamicImage))(?![`$[:alnum:]])",
+          "match": "D(?:SolveChangeVariables|ataStructure|ataStructureQ|atabaseConnect|atabaseDisconnect|atabaseReference|atabinSubmit|ateInterval|eclareCompiledComponent|econvolutionLayer|ecryptFile|eleteChannel|eleteCloudExpression|eleteElements|eleteSearchIndex|erivedKey|iggleGatesPointProcess|iggleGrattonPointProcess|igitalSignature|isableFormatting|ocumentWeightingRules|otLayer|ownValuesFunction|ropoutLayer|ynamicImage)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:E(?:choTiming|lementwiseLayer|mbeddedSQLEntityClass|mbeddedSQLExpression|mbeddingLayer|mptySpaceF|ncryptFile|ntityFunction|ntityStore|stimatedPointProcess|stimatedVariogramModel|valuationEnvironment|valuationPrivileges|xpirationDate|xpressionTree|xtendedEntityClass|xternalEvaluate|xternalFunction|xternalIdentifier|xternalObject|xternalSessionObject|xternalSessions|xternalStorageBase|xternalStorageDownload|xternalStorageGet|xternalStorageObject|xternalStoragePut|xternalStorageUpload|xternalValue|xtractLayer))(?![`$[:alnum:]])",
+          "match": "E(?:choTiming|lementwiseLayer|mbeddedSQLEntityClass|mbeddedSQLExpression|mbeddingLayer|mptySpaceF|ncryptFile|ntityFunction|ntityStore|stimatedPointProcess|stimatedVariogramModel|valuationEnvironment|valuationPrivileges|xpirationDate|xpressionTree|xtendedEntityClass|xternalEvaluate|xternalFunction|xternalIdentifier|xternalObject|xternalSessionObject|xternalSessions|xternalStorageBase|xternalStorageDownload|xternalStorageGet|xternalStorageObject|xternalStoragePut|xternalStorageUpload|xternalValue|xtractLayer)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:F(?:aceRecognize|eatureDistance|eatureExtract|eatureExtraction|eatureExtractor|eatureExtractorFunction|ileConvert|ileFormatProperties|ileNameToFormatList|ileSystemTree|ilteredEntityClass|indChannels|indEquationalProof|indExternalEvaluators|indGeometricConjectures|indImageText|indIsomers|indMoleculeSubstructure|indPointProcessParameters|indSystemModelEquilibrium|indTextualAnswer|lattenLayer|orAllType|ormControl|orwardCloudCredentials|oxHReduce|rameListVideo|romRawPointer|unctionCompile|unctionCompileExport|unctionCompileExportByteArray|unctionCompileExportLibrary|unctionCompileExportString|unctionDeclaration|unctionLayer|unctionPoles))(?![`$[:alnum:]])",
+          "match": "F(?:aceRecognize|eatureDistance|eatureExtract|eatureExtraction|eatureExtractor|eatureExtractorFunction|ileConvert|ileFormatProperties|ileNameToFormatList|ileSystemTree|ilteredEntityClass|indChannels|indEquationalProof|indExternalEvaluators|indGeometricConjectures|indImageText|indIsomers|indMoleculeSubstructure|indPointProcessParameters|indSystemModelEquilibrium|indTextualAnswer|lattenLayer|orAllType|ormControl|orwardCloudCredentials|oxHReduce|rameListVideo|romRawPointer|unctionCompile|unctionCompileExport|unctionCompileExportByteArray|unctionCompileExportLibrary|unctionCompileExportString|unctionDeclaration|unctionLayer|unctionPoles)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:G(?:alleryView|atedRecurrentLayer|enerateDerivedKey|enerateDigitalSignature|enerateFileSignature|enerateSecuredAuthenticationKey|eneratedAssetFormat|eneratedAssetLocation|eoGraphValuePlot|eoOrientationData|eometricAssertion|eometricScene|eometricStep|eometricStylingRules|eometricTest|ibbsPointProcess|raphTree|ridVideo))(?![`$[:alnum:]])",
+          "match": "G(?:alleryView|atedRecurrentLayer|enerateDerivedKey|enerateDigitalSignature|enerateFileSignature|enerateSecuredAuthenticationKey|eneratedAssetFormat|eneratedAssetLocation|eoGraphValuePlot|eoOrientationData|eometricAssertion|eometricScene|eometricStep|eometricStylingRules|eometricTest|ibbsPointProcess|raphTree|ridVideo)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:H(?:andlerFunctions|andlerFunctionsKeys|ardcorePointProcess|istogramPointDensity))(?![`$[:alnum:]])",
+          "match": "H(?:andlerFunctions|andlerFunctionsKeys|ardcorePointProcess|istogramPointDensity)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:I(?:gnoreIsotopes|gnoreStereochemistry|mageAugmentationLayer|mageBoundingBoxes|mageCases|mageContainsQ|mageContents|mageGraphics|magePosition|magePyramid|magePyramidApply|mageStitch|mportedObject|ncludeAromaticBonds|ncludeHydrogens|ncludeRelatedTables|nertEvaluate|nertExpression|nfiniteFuture|nfinitePast|nhomogeneousPoissonPointProcess|nitialEvaluationHistory|nitializationObject|nitializationObjects|nitializationValue|nitialize|nputPorts|ntegrateChangeVariables|nterfaceSwitched|ntersectedEntityClass|nverseImagePyramid))(?![`$[:alnum:]])",
+          "match": "I(?:gnoreIsotopes|gnoreStereochemistry|mageAugmentationLayer|mageBoundingBoxes|mageCases|mageContainsQ|mageContents|mageGraphics|magePosition|magePyramid|magePyramidApply|mageStitch|mportedObject|ncludeAromaticBonds|ncludeHydrogens|ncludeRelatedTables|nertEvaluate|nertExpression|nfiniteFuture|nfinitePast|nhomogeneousPoissonPointProcess|nitialEvaluationHistory|nitializationObject|nitializationObjects|nitializationValue|nitialize|nputPorts|ntegrateChangeVariables|nterfaceSwitched|ntersectedEntityClass|nverseImagePyramid)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:K(?:ernelConfiguration|ernelFunction))(?![`$[:alnum:]])",
+          "match": "Kernel(?:Configuration|Function)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:L(?:earningRateMultipliers|ibraryFunctionDeclaration|icenseEntitlementObject|icenseEntitlements|icensingSettings|inearLayer|iteralType|oadCompiledComponent|ocalResponseNormalizationLayer|ongShortTermMemoryLayer|ossFunction))(?![`$[:alnum:]])",
+          "match": "L(?:earningRateMultipliers|ibraryFunctionDeclaration|icenseEntitlementObject|icenseEntitlements|icensingSettings|inearLayer|iteralType|oadCompiledComponent|ocalResponseNormalizationLayer|ongShortTermMemoryLayer|ossFunction)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:M(?:IMETypeToFormatList|ailExecute|ailFolder|ailItem|ailSearch|ailServerConnect|ailServerConnection|aternPointProcess|axDisplayedChildren|axTrainingRounds|axWordGap|eanAbsoluteLossLayer|eanAround|eanPointDensity|eanSquaredLossLayer|ergingFunction|idpoint|issingValuePattern|issingValueSynthesis|olecule|oleculeAlign|oleculeContainsQ|oleculeDraw|oleculeFreeQ|oleculeGraph|oleculeMatchQ|oleculeMaximumCommonSubstructure|oleculeModify|oleculeName|oleculePattern|oleculePlot|oleculePlot3D|oleculeProperty|oleculeQ|oleculeRecognize|oleculeSubstructureCount|oleculeValue))(?![`$[:alnum:]])",
+          "match": "M(?:IMETypeToFormatList|ailExecute|ailFolder|ailItem|ailSearch|ailServerConnect|ailServerConnection|aternPointProcess|axDisplayedChildren|axTrainingRounds|axWordGap|eanAbsoluteLossLayer|eanAround|eanPointDensity|eanSquaredLossLayer|ergingFunction|idpoint|issingValuePattern|issingValueSynthesis|olecule|oleculeAlign|oleculeContainsQ|oleculeDraw|oleculeFreeQ|oleculeGraph|oleculeMatchQ|oleculeMaximumCommonSubstructure|oleculeModify|oleculeName|oleculePattern|oleculePlot|oleculePlot3D|oleculeProperty|oleculeQ|oleculeRecognize|oleculeSubstructureCount|oleculeValue)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:N(?:BodySimulation|BodySimulationData|earestNeighborG|estTree|etAppend|etArray|etArrayLayer|etBidirectionalOperator|etChain|etDecoder|etDelete|etDrop|etEncoder|etEvaluationMode|etExternalObject|etExtract|etFlatten|etFoldOperator|etGANOperator|etGraph|etInitialize|etInsert|etInsertSharedArrays|etJoin|etMapOperator|etMapThreadOperator|etMeasurements|etModel|etNestOperator|etPairEmbeddingOperator|etPort|etPortGradient|etPrepend|etRename|etReplace|etReplacePart|etStateObject|etTake|etTrain|etTrainResultsObject|etUnfold|etworkPacketCapture|etworkPacketRecording|etworkPacketTrace|eymanScottPointProcess|ominalScale|ormalizationLayer|umericArray|umericArrayQ|umericArrayType))(?![`$[:alnum:]])",
+          "match": "N(?:BodySimulation|BodySimulationData|earestNeighborG|estTree|etAppend|etArray|etArrayLayer|etBidirectionalOperator|etChain|etDecoder|etDelete|etDrop|etEncoder|etEvaluationMode|etExternalObject|etExtract|etFlatten|etFoldOperator|etGANOperator|etGraph|etInitialize|etInsert|etInsertSharedArrays|etJoin|etMapOperator|etMapThreadOperator|etMeasurements|etModel|etNestOperator|etPairEmbeddingOperator|etPort|etPortGradient|etPrepend|etRename|etReplace|etReplacePart|etStateObject|etTake|etTrain|etTrainResultsObject|etUnfold|etworkPacketCapture|etworkPacketRecording|etworkPacketTrace|eymanScottPointProcess|ominalScale|ormalizationLayer|umericArray|umericArrayQ|umericArrayType)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:O(?:peratorApplied|rderingLayer|rdinalScale|utputPorts|verlayVideo))(?![`$[:alnum:]])",
+          "match": "O(?:peratorApplied|rderingLayer|rdinalScale|utputPorts|verlayVideo)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:P(?:acletSymbol|addingLayer|agination|airCorrelationG|arametricRampLayer|arentEdgeLabel|arentEdgeLabelFunction|arentEdgeLabelStyle|arentEdgeShapeFunction|arentEdgeStyle|arentEdgeStyleFunction|artLayer|artProtection|atternFilling|atternReaction|enttinenPointProcess|erpendicularBisector|ersistenceLocation|ersistenceTime|ersistentObject|ersistentObjects|ersistentSymbol|itchRecognize|laceholderLayer|laybackSettings|ointCountDistribution|ointDensity|ointDensityFunction|ointProcessEstimator|ointProcessFitTest|ointProcessParameterAssumptions|ointProcessParameterQ|ointStatisticFunction|ointValuePlot|oissonPointProcess|oolingLayer|rependLayer|roofObject|ublisherID))(?![`$[:alnum:]])",
+          "match": "P(?:acletSymbol|addingLayer|agination|airCorrelationG|arametricRampLayer|arentEdgeLabel|arentEdgeLabelFunction|arentEdgeLabelStyle|arentEdgeShapeFunction|arentEdgeStyle|arentEdgeStyleFunction|artLayer|artProtection|atternFilling|atternReaction|enttinenPointProcess|erpendicularBisector|ersistenceLocation|ersistenceTime|ersistentObject|ersistentObjects|ersistentSymbol|itchRecognize|laceholderLayer|laybackSettings|ointCountDistribution|ointDensity|ointDensityFunction|ointProcessEstimator|ointProcessFitTest|ointProcessParameterAssumptions|ointProcessParameterQ|ointStatisticFunction|ointValuePlot|oissonPointProcess|oolingLayer|rependLayer|roofObject|ublisherID)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:Q(?:uestionGenerator|uestionInterface|uestionObject|uestionSelector))(?![`$[:alnum:]])",
+          "match": "Question(?:Generator|Interface|Object|Selector)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:R(?:andomArrayLayer|andomInstance|andomPointConfiguration|andomTree|eactionBalance|eactionBalancedQ|ecalibrationFunction|egisterExternalEvaluator|elationalDatabase|emoteAuthorizationCaching|emoteBatchJobAbort|emoteBatchJobObject|emoteBatchJobs|emoteBatchMapSubmit|emoteBatchSubmissionEnvironment|emoteBatchSubmit|emoteConnect|emoteConnectionObject|emoteEvaluate|emoteFile|emoteInputFiles|emoteProviderSettings|emoteRun|emoteRunProcess|emovalConditions|emoveAudioStream|emoveChannelListener|emoveChannelSubscribers|emoveVideoStream|eplicateLayer|eshapeLayer|esizeLayer|esourceFunction|esourceRegister|esourceRemove|esourceSubmit|esourceSystemBase|esourceSystemPath|esourceUpdate|esourceVersion|everseApplied|ipleyK|ipleyRassonRegion|ootTree|ulesTree))(?![`$[:alnum:]])",
+          "match": "R(?:andomArrayLayer|andomInstance|andomPointConfiguration|andomTree|eactionBalance|eactionBalancedQ|ecalibrationFunction|egisterExternalEvaluator|elationalDatabase|emoteAuthorizationCaching|emoteBatchJobAbort|emoteBatchJobObject|emoteBatchJobs|emoteBatchMapSubmit|emoteBatchSubmissionEnvironment|emoteBatchSubmit|emoteConnect|emoteConnectionObject|emoteEvaluate|emoteFile|emoteInputFiles|emoteProviderSettings|emoteRun|emoteRunProcess|emovalConditions|emoveAudioStream|emoveChannelListener|emoveChannelSubscribers|emoveVideoStream|eplicateLayer|eshapeLayer|esizeLayer|esourceFunction|esourceRegister|esourceRemove|esourceSubmit|esourceSystemBase|esourceSystemPath|esourceUpdate|esourceVersion|everseApplied|ipleyK|ipleyRassonRegion|ootTree|ulesTree)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:S(?:ameTestProperties|ampledEntityClass|earchAdjustment|earchIndexObject|earchIndices|earchQueryString|earchResultObject|ecuredAuthenticationKey|ecuredAuthenticationKeys|ecurityCertificate|equenceIndicesLayer|equenceLastLayer|equenceMostLayer|equencePredict|equencePredictorFunction|equenceRestLayer|equenceReverseLayer|erviceRequest|erviceSubmit|etFileFormatProperties|etSystemModel|lideShowVideo|moothPointDensity|nippet|nippetsVideo|nubPolyhedron|oftmaxLayer|olidBoundaryLoadValue|olidDisplacementCondition|olidFixedCondition|olidMechanicsPDEComponent|olidMechanicsStrain|olidMechanicsStress|ortedEntityClass|ourceLink|patialBinnedPointData|patialBoundaryCorrection|patialEstimate|patialEstimatorFunction|patialJ|patialNoiseLevel|patialObservationRegionQ|patialPointData|patialPointSelect|patialRandomnessTest|patialTransformationLayer|patialTrendFunction|peakerMatchQ|peechCases|peechInterpreter|peechRecognize|plice|tartExternalSession|tartWebSession|tereochemistryElements|traussHardcorePointProcess|traussPointProcess|ubsetCases|ubsetCount|ubsetPosition|ubsetReplace|ubtitleTrackSelection|ummationLayer|ymmetricDifference|ynthesizeMissingValues|ystemCredential|ystemCredentialData|ystemCredentialKey|ystemCredentialKeys|ystemCredentialStoreObject|ystemInstall|ystemModel|ystemModelExamples|ystemModelLinearize|ystemModelMeasurements|ystemModelParametricSimulate|ystemModelPlot|ystemModelReliability|ystemModelSimulate|ystemModelSimulateSensitivity|ystemModelSimulationData|ystemModeler|ystemModels))(?![`$[:alnum:]])",
+          "match": "S(?:ameTestProperties|ampledEntityClass|earchAdjustment|earchIndexObject|earchIndices|earchQueryString|earchResultObject|ecuredAuthenticationKey|ecuredAuthenticationKeys|ecurityCertificate|equenceIndicesLayer|equenceLastLayer|equenceMostLayer|equencePredict|equencePredictorFunction|equenceRestLayer|equenceReverseLayer|erviceRequest|erviceSubmit|etFileFormatProperties|etSystemModel|lideShowVideo|moothPointDensity|nippet|nippetsVideo|nubPolyhedron|oftmaxLayer|olidBoundaryLoadValue|olidDisplacementCondition|olidFixedCondition|olidMechanicsPDEComponent|olidMechanicsStrain|olidMechanicsStress|ortedEntityClass|ourceLink|patialBinnedPointData|patialBoundaryCorrection|patialEstimate|patialEstimatorFunction|patialJ|patialNoiseLevel|patialObservationRegionQ|patialPointData|patialPointSelect|patialRandomnessTest|patialTransformationLayer|patialTrendFunction|peakerMatchQ|peechCases|peechInterpreter|peechRecognize|plice|tartExternalSession|tartWebSession|tereochemistryElements|traussHardcorePointProcess|traussPointProcess|ubsetCases|ubsetCount|ubsetPosition|ubsetReplace|ubtitleTrackSelection|ummationLayer|ymmetricDifference|ynthesizeMissingValues|ystemCredential|ystemCredentialData|ystemCredentialKey|ystemCredentialKeys|ystemCredentialStoreObject|ystemInstall|ystemModel|ystemModelExamples|ystemModelLinearize|ystemModelMeasurements|ystemModelParametricSimulate|ystemModelPlot|ystemModelReliability|ystemModelSimulate|ystemModelSimulateSensitivity|ystemModelSimulationData|ystemModeler|ystemModels)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:T(?:ableView|argetDevice|argetSystem|ernaryListPlot|ernaryPlotCorners|extCases|extContents|extElement|extPosition|extSearch|extSearchReport|extStructure|homasPointProcess|hreaded|hreadingLayer|ickDirection|ickLabelOrientation|ickLabelPositioning|ickLabels|ickLengths|ickPositions|oRawPointer|otalLayer|ourVideo|rainImageContentDetector|rainTextContentDetector|rainingProgressCheckpointing|rainingProgressFunction|rainingProgressMeasurements|rainingProgressReporting|rainingStoppingCriterion|rainingUpdateSchedule|ransposeLayer|ree|reeCases|reeChildren|reeCount|reeData|reeDelete|reeDepth|reeElementCoordinates|reeElementLabel|reeElementLabelFunction|reeElementLabelStyle|reeElementShape|reeElementShapeFunction|reeElementSize|reeElementSizeFunction|reeElementStyle|reeElementStyleFunction|reeExpression|reeExtract|reeFold|reeInsert|reeLayout|reeLeafCount|reeLeafQ|reeLeaves|reeLevel|reeMap|reeMapAt|reeOutline|reePosition|reeQ|reeReplacePart|reeRules|reeScan|reeSelect|reeSize|reeTraversalOrder|riangleCenter|riangleConstruct|riangleMeasurement|ypeDeclaration|ypeEvaluate|ypeOf|ypeSpecifier|yped))(?![`$[:alnum:]])",
+          "match": "T(?:ableView|argetDevice|argetSystem|ernaryListPlot|ernaryPlotCorners|extCases|extContents|extElement|extPosition|extSearch|extSearchReport|extStructure|homasPointProcess|hreaded|hreadingLayer|ickDirection|ickLabelOrientation|ickLabelPositioning|ickLabels|ickLengths|ickPositions|oRawPointer|otalLayer|ourVideo|rainImageContentDetector|rainTextContentDetector|rainingProgressCheckpointing|rainingProgressFunction|rainingProgressMeasurements|rainingProgressReporting|rainingStoppingCriterion|rainingUpdateSchedule|ransposeLayer|ree|reeCases|reeChildren|reeCount|reeData|reeDelete|reeDepth|reeElementCoordinates|reeElementLabel|reeElementLabelFunction|reeElementLabelStyle|reeElementShape|reeElementShapeFunction|reeElementSize|reeElementSizeFunction|reeElementStyle|reeElementStyleFunction|reeExpression|reeExtract|reeFold|reeInsert|reeLayout|reeLeafCount|reeLeafQ|reeLeaves|reeLevel|reeMap|reeMapAt|reeOutline|reePosition|reeQ|reeReplacePart|reeRules|reeScan|reeSelect|reeSize|reeTraversalOrder|riangleCenter|riangleConstruct|riangleMeasurement|ypeDeclaration|ypeEvaluate|ypeOf|ypeSpecifier|yped)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:U(?:RLDownloadSubmit|nconstrainedParameters|nionedEntityClass|niqueElements|nitVectorLayer|nlabeledTree|nmanageObject|nregisterExternalEvaluator|pdateSearchIndex|seEmbeddedLibrary))(?![`$[:alnum:]])",
+          "match": "U(?:RLDownloadSubmit|nconstrainedParameters|nionedEntityClass|niqueElements|nitVectorLayer|nlabeledTree|nmanageObject|nregisterExternalEvaluator|pdateSearchIndex|seEmbeddedLibrary)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:V(?:alenceErrorHandling|alenceFilling|aluePreprocessingFunction|andermondeMatrix|arianceGammaPointProcess|ariogramFunction|ariogramModel|ectorAround|erifyDerivedKey|erifyDigitalSignature|erifyFileSignature|erifyInterpretation|ideo|ideoCapture|ideoCombine|ideoDelete|ideoExtractFrames|ideoFrameList|ideoFrameMap|ideoGenerator|ideoInsert|ideoIntervals|ideoJoin|ideoMap|ideoMapList|ideoMapTimeSeries|ideoPadding|ideoPause|ideoPlay|ideoQ|ideoRecord|ideoReplace|ideoScreenCapture|ideoSplit|ideoStop|ideoStream|ideoStreams|ideoTimeStretch|ideoTrackSelection|ideoTranscode|ideoTransparency|ideoTrim))(?![`$[:alnum:]])",
+          "match": "V(?:alenceErrorHandling|alenceFilling|aluePreprocessingFunction|andermondeMatrix|arianceGammaPointProcess|ariogramFunction|ariogramModel|ectorAround|erifyDerivedKey|erifyDigitalSignature|erifyFileSignature|erifyInterpretation|ideo|ideoCapture|ideoCombine|ideoDelete|ideoExtractFrames|ideoFrameList|ideoFrameMap|ideoGenerator|ideoInsert|ideoIntervals|ideoJoin|ideoMap|ideoMapList|ideoMapTimeSeries|ideoPadding|ideoPause|ideoPlay|ideoQ|ideoRecord|ideoReplace|ideoScreenCapture|ideoSplit|ideoStop|ideoStream|ideoStreams|ideoTimeStretch|ideoTrackSelection|ideoTranscode|ideoTransparency|ideoTrim)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:W(?:ebAudioSearch|ebColumn|ebElementObject|ebExecute|ebImage|ebImageSearch|ebItem|ebRow|ebSearch|ebSessionObject|ebSessions|ebWindowObject|ikidataData|ikidataSearch|ikipediaSearch|ithCleanup|ithLock))(?![`$[:alnum:]])",
+          "match": "W(?:ebAudioSearch|ebColumn|ebElementObject|ebExecute|ebImage|ebImageSearch|ebItem|ebRow|ebSearch|ebSessionObject|ebSessions|ebWindowObject|ikidataData|ikidataSearch|ikipediaSearch|ithCleanup|ithLock)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:Z(?:oomCenter|oomFactor))(?![`$[:alnum:]])",
+          "match": "Zoom(?:Center|Factor)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:\\$(?:AllowExternalChannelFunctions|AudioDecoders|AudioEncoders|BlockchainBase|ChannelBase|CompilerEnvironment|CookieStore|CryptographicEllipticCurveNames|CurrentWebSession|DataStructures|DefaultNetworkInterface|DefaultProxyRules|DefaultRemoteBatchSubmissionEnvironment|DefaultRemoteKernel|DefaultSystemCredentialStore|ExternalIdentifierTypes|ExternalStorageBase|GeneratedAssetLocation|IncomingMailSettings|Initialization|InitializationContexts|MaxDisplayedChildren|NetworkInterfaces|NoValue|PersistenceBase|PersistencePath|PreInitialization|PublisherID|ResourceSystemBase|ResourceSystemPath|SSHAuthentication|ServiceCreditsAvailable|SourceLink|SubtitleDecoders|SubtitleEncoders|SystemCredentialStore|TargetSystems|TestFileName|VideoDecoders|VideoEncoders|VoiceStyles))(?![`$[:alnum:]])",
+          "match": "\\$(?:AllowExternalChannelFunctions|AudioDecoders|AudioEncoders|BlockchainBase|ChannelBase|CompilerEnvironment|CookieStore|CryptographicEllipticCurveNames|CurrentWebSession|DataStructures|DefaultNetworkInterface|DefaultProxyRules|DefaultRemoteBatchSubmissionEnvironment|DefaultRemoteKernel|DefaultSystemCredentialStore|ExternalIdentifierTypes|ExternalStorageBase|GeneratedAssetLocation|IncomingMailSettings|Initialization|InitializationContexts|MaxDisplayedChildren|NetworkInterfaces|NoValue|PersistenceBase|PersistencePath|PreInitialization|PublisherID|ResourceSystemBase|ResourceSystemPath|SSHAuthentication|ServiceCreditsAvailable|SourceLink|SubtitleDecoders|SubtitleEncoders|SystemCredentialStore|TargetSystems|TestFileName|VideoDecoders|VideoEncoders|VoiceStyles)(?![`$[:alnum:]])",
           "name": "support.function.experimental.wolfram"
         },
         {
-          "match": "(?:A(?:llFalse|nyFalse))(?![`$[:alnum:]])",
+          "match": "A(?:llFalse|nyFalse)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:B(?:oolean))(?![`$[:alnum:]])",
+          "match": "Boolean(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:C(?:loudbase|omplexQ))(?![`$[:alnum:]])",
+          "match": "C(?:loudbase|omplexQ)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:D(?:ataSet))(?![`$[:alnum:]])",
+          "match": "DataSet(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:E(?:xpandFilename|xportPacket))(?![`$[:alnum:]])",
+          "match": "Exp(?:andFilename|ortPacket)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:F(?:ailed|alseQ))(?![`$[:alnum:]])",
+          "match": "Fa(?:iled|lseQ)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:I(?:nterpolationFunction|nterpolationPolynomial))(?![`$[:alnum:]])",
+          "match": "Interpolation(?:Function|Polynomial)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:M(?:atch))(?![`$[:alnum:]])",
+          "match": "Match(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:O(?:ptionPattern|ptionsQ))(?![`$[:alnum:]])",
+          "match": "Option(?:Pattern|sQ)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:R(?:ationalQ|ealQ))(?![`$[:alnum:]])",
+          "match": "R(?:ationalQ|ealQ)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:S(?:tringMatch|ymbolQ))(?![`$[:alnum:]])",
+          "match": "S(?:tringMatch|ymbolQ)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:U(?:nSameQ|rlExecute))(?![`$[:alnum:]])",
+          "match": "U(?:nSameQ|rlExecute)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:\\$(?:PathNameSeparator|RegisteredUsername))(?![`$[:alnum:]])",
+          "match": "\\$(?:PathNameSeparator|RegisteredUsername)(?![`$[:alnum:]])",
           "name": "invalid.bad.wolfram"
         },
         {
-          "match": "(?:E(?:cho|xit))(?![`$[:alnum:]])",
+          "match": "E(?:cho|xit)(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "(?:I(?:n|nString))(?![`$[:alnum:]])",
+          "match": "In(?:|String)(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "(?:O(?:ut))(?![`$[:alnum:]])",
+          "match": "Out(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "(?:P(?:rint))(?![`$[:alnum:]])",
+          "match": "Print(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "(?:Q(?:uit))(?![`$[:alnum:]])",
+          "match": "Quit(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "(?:\\$(?:HistoryLength|Line|Post|Pre|PrePrint|PreRead|SyntaxHandler))(?![`$[:alnum:]])",
+          "match": "\\$(?:HistoryLength|Line|Post|Pre|PrePrint|PreRead|SyntaxHandler)(?![`$[:alnum:]])",
           "name": "invalid.session.wolfram"
         },
         {
-          "match": "(?:[$[:alpha:]][$[:alnum:]]*)(?=\\s*(\\[(?!\\s*\\[)|@(?!@)))",
+          "match": "[$[:alpha:]][$[:alnum:]]*(?=\\s*(\\[(?!\\s*\\[)|@(?!@)))",
           "name": "variable.function.wolfram"
         },
         {
-          "match": "(?:[$[:alpha:]][$[:alnum:]]*)",
+          "match": "[$[:alpha:]][$[:alnum:]]*",
           "name": "symbol.unrecognized.wolfram"
         }
       ]
diff --git a/resources/languages/xml.json b/resources/languages/xml.json
index dc39182..dd21c06 100644
--- a/resources/languages/xml.json
+++ b/resources/languages/xml.json
@@ -102,7 +102,7 @@
       ]
     },
     {
-      "begin": "(</?)(?:([-\\w\\.]+)((:)))?([-\\w\\.:]+)",
+      "begin": "(</?)(?:([-\\w.]+)((:)))?([-\\w.:]+)",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag.xml"
@@ -291,7 +291,7 @@
           "name": "punctuation.definition.constant.xml"
         }
       },
-      "match": "(&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+      "match": "(&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x\\h+)(;)",
       "name": "constant.character.entity.xml"
     },
     "internalSubset": {
@@ -301,7 +301,7 @@
           "name": "punctuation.definition.constant.xml"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "name": "meta.internalsubset.xml",
       "patterns": [
         {
diff --git a/resources/languages/yaml.json b/resources/languages/yaml.json
index 4c4be05..ac4677c 100644
--- a/resources/languages/yaml.json
+++ b/resources/languages/yaml.json
@@ -97,21 +97,21 @@
           ]
         },
         {
-          "begin": "(?=(?:[^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]|[?:-]\\S)([^\\s:]|:\\S|\\s+(?![#\\s]))*\\s*:(\\s|$))",
-          "end": "(?=\\s*$|\\s+\\#|\\s*:(\\s|$))",
+          "begin": "(?=(?:[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-]\\S)([^\\s:]|:\\S|\\s+(?![#\\s]))*\\s*:(\\s|$))",
+          "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$))",
           "patterns": [
             {
               "include": "#flow-scalar-plain-out-implicit-type"
             },
             {
-              "begin": "[^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]|[?:-]\\S",
+              "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-]\\S",
               "beginCaptures": {
                 "0": {
                   "name": "entity.name.tag.yaml"
                 }
               },
               "contentName": "entity.name.tag.yaml",
-              "end": "(?=\\s*$|\\s+\\#|\\s*:(\\s|$))",
+              "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$))",
               "name": "string.unquoted.plain.out.yaml"
             }
           ]
@@ -152,7 +152,7 @@
       "end": "^(?=\\S)|(?!\\G)",
       "patterns": [
         {
-          "begin": "^([ ]+)(?! )",
+          "begin": "^( +)(?! )",
           "end": "^(?!\\1|\\s*$)",
           "name": "string.unquoted.block.yaml"
         }
@@ -163,7 +163,7 @@
       "name": "punctuation.definition.block.sequence.item.yaml"
     },
     "comment": {
-      "begin": "(?:(^[ \\t]*)|[ \\t]+)(?=#\\p{Print}*$)",
+      "begin": "(?:(^[ \\t]*)|[ \\t]+)(?=#\\p{print}*$)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.whitespace.comment.leading.yaml"
@@ -216,7 +216,7 @@
               "name": "support.type.tag-prefix.yaml"
             }
           },
-          "match": "\\G(TAG)(?:[ \\t]+((?:!(?:[0-9A-Za-z\\-]*!)?))(?:[ \\t]+(!(?:%[0-9A-Fa-f]{2}|[0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]])*|(?![,!\\[\\]{}])(?:%[0-9A-Fa-f]{2}|[0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]])+))?)?"
+          "match": "\\G(TAG)(?:[ \\t]+(!(?:[0-9A-Za-z-]*!)?)(?:[ \\t]+(!(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$,_.!~*'()\\[\\]])*|(?![,!\\[\\]{}])(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$,_.!~*'()\\[\\]])+))?)?"
         },
         {
           "captures": {
@@ -253,7 +253,7 @@
           "name": "invalid.illegal.character.anchor.yaml"
         }
       },
-      "match": "((\\*))([^\\s\\[\\]/{/},]+)([^\\s\\]},]\\S*)?"
+      "match": "((\\*))([^\\s\\[\\]/{},]+)([^\\s\\]},]\\S*)?"
     },
     "flow-collection": {
       "patterns": [
@@ -272,7 +272,7 @@
           "name": "punctuation.definition.mapping.begin.yaml"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.mapping.end.yaml"
@@ -346,22 +346,22 @@
           ]
         },
         {
-          "begin": "(?=(?:[^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]|[?:-][^\\s[\\[\\]{},]])([^\\s:[\\[\\]{},]]|:[^\\s[\\[\\]{},]]|\\s+(?![#\\s]))*\\s*:(\\s|$))",
-          "end": "(?=\\s*$|\\s+\\#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])",
+          "begin": "(?=(?:[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-][^\\s\\[\\]{},])([^\\s:\\[\\]{},]|:[^\\s\\[\\]{},]|\\s+(?![#\\s]))*\\s*:(\\s|$))",
+          "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])",
           "name": "meta.flow-pair.key.yaml",
           "patterns": [
             {
               "include": "#flow-scalar-plain-in-implicit-type"
             },
             {
-              "begin": "[^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]|[?:-][^\\s[\\[\\]{},]]",
+              "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-][^\\s\\[\\]{},]",
               "beginCaptures": {
                 "0": {
                   "name": "entity.name.tag.yaml"
                 }
               },
               "contentName": "entity.name.tag.yaml",
-              "end": "(?=\\s*$|\\s+\\#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])",
+              "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])",
               "name": "string.unquoted.plain.in.yaml"
             }
           ]
@@ -430,8 +430,8 @@
           "include": "#flow-scalar-plain-in-implicit-type"
         },
         {
-          "begin": "[^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]|[?:-][^\\s[\\[\\]{},]]",
-          "end": "(?=\\s*$|\\s+\\#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])",
+          "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-][^\\s\\[\\]{},]",
+          "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])",
           "name": "string.unquoted.plain.in.yaml"
         }
       ]
@@ -462,7 +462,7 @@
               "name": "constant.language.merge.yaml"
             }
           },
-          "match": "(?:(null|Null|NULL|~)|(y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)|((?:[-+]?0b[0-1_]+|[-+]?0[0-7_]+|[-+]?(?:0|[1-9][0-9_]*)|[-+]?0x[0-9a-fA-F_]+|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+))|((?:[-+]?(?:[0-9][0-9_]*)?\\.[0-9.]*(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN)))|((?:\\d{4}-\\d{2}-\\d{2}|\\d{4}-\\d{1,2}-\\d{1,2}(?:[Tt]|[ \\t]+)\\d{1,2}:\\d{2}:\\d{2}(?:\\.\\d*)?(?:(?:[ \\t]*)Z|[-+]\\d{1,2}(?::\\d{1,2})?)?))|(=)|(<<))(?:(?=\\s*$|\\s+\\#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},]))"
+          "match": "(?:(null|Null|NULL|~)|([yY]|yes|Yes|YES|[nN]|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)|((?:[-+]?0b[0-1_]+|[-+]?0[0-7_]+|[-+]?(?:0|[1-9][0-9_]*)|[-+]?0x[_\\h]+|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+))|((?:[-+]?(?:[0-9][0-9_]*)?\\.[0-9.]*(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN)))|((?:\\d{4}-\\d{2}-\\d{2}|\\d{4}-\\d{1,2}-\\d{1,2}(?:[Tt]|[ \\t]+)\\d{1,2}:\\d{2}:\\d{2}(?:\\.\\d*)?(?:[ \\t]*Z|[-+]\\d{1,2}(?::\\d{1,2})?)?))|(=)|(<<))(?=\\s*$|\\s+#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])"
         }
       ]
     },
@@ -472,8 +472,8 @@
           "include": "#flow-scalar-plain-out-implicit-type"
         },
         {
-          "begin": "[^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]|[?:-]\\S",
-          "end": "(?=\\s*$|\\s+\\#|\\s*:(\\s|$))",
+          "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-]\\S",
+          "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$))",
           "name": "string.unquoted.plain.out.yaml"
         }
       ]
@@ -504,7 +504,7 @@
               "name": "constant.language.merge.yaml"
             }
           },
-          "match": "(?:(null|Null|NULL|~)|(y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)|((?:[-+]?0b[0-1_]+|[-+]?0[0-7_]+|[-+]?(?:0|[1-9][0-9_]*)|[-+]?0x[0-9a-fA-F_]+|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+))|((?:[-+]?(?:[0-9][0-9_]*)?\\.[0-9.]*(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN)))|((?:\\d{4}-\\d{2}-\\d{2}|\\d{4}-\\d{1,2}-\\d{1,2}(?:[Tt]|[ \\t]+)\\d{1,2}:\\d{2}:\\d{2}(?:\\.\\d*)?(?:(?:[ \\t]*)Z|[-+]\\d{1,2}(?::\\d{1,2})?)?))|(=)|(<<))(?:(?=\\s*$|\\s+\\#|\\s*:(\\s|$)))"
+          "match": "(?:(null|Null|NULL|~)|([yY]|yes|Yes|YES|[nN]|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)|((?:[-+]?0b[0-1_]+|[-+]?0[0-7_]+|[-+]?(?:0|[1-9][0-9_]*)|[-+]?0x[_\\h]+|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+))|((?:[-+]?(?:[0-9][0-9_]*)?\\.[0-9.]*(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN)))|((?:\\d{4}-\\d{2}-\\d{2}|\\d{4}-\\d{1,2}-\\d{1,2}(?:[Tt]|[ \\t]+)\\d{1,2}:\\d{2}:\\d{2}(?:\\.\\d*)?(?:[ \\t]*Z|[-+]\\d{1,2}(?::\\d{1,2})?)?))|(=)|(<<))(?=\\s*$|\\s+#|\\s*:(\\s|$))"
         }
       ]
     },
@@ -536,7 +536,7 @@
           "name": "punctuation.definition.sequence.begin.yaml"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.sequence.end.yaml"
@@ -581,7 +581,7 @@
       ]
     },
     "property": {
-      "begin": "(?=!|&)",
+      "begin": "(?=[!\\&])",
       "end": "(?!\\G)",
       "name": "meta.property.yaml",
       "patterns": [
@@ -600,10 +600,10 @@
               "name": "invalid.illegal.character.anchor.yaml"
             }
           },
-          "match": "\\G((&))([^\\s\\[\\]/{/},]+)(\\S+)?"
+          "match": "\\G((&))([^\\s\\[\\]/{},]+)(\\S+)?"
         },
         {
-          "match": "\\G(?:!<(?:%[0-9A-Fa-f]{2}|[0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]])+>|(?:!(?:[0-9A-Za-z\\-]*!)?)(?:%[0-9A-Fa-f]{2}|[0-9A-Za-z\\-#;/?:@&=+$_.~*'()])+|!)(?=\\ |\\t|$)",
+          "match": "\\G!(?:<(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$,_.!~*'()\\[\\]])+>|(?:[0-9A-Za-z-]*!)?(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$_.~*'()])+|)(?=[ \\t]|$)",
           "name": "storage.type.tag-handle.yaml"
         },
         {
diff --git a/resources/languages/zenscript.json b/resources/languages/zenscript.json
index 34c34e8..d4711a5 100644
--- a/resources/languages/zenscript.json
+++ b/resources/languages/zenscript.json
@@ -6,20 +6,17 @@
   "name": "zenscript",
   "patterns": [
     {
-      "comment": "numbers",
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
+      "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
       "name": "constant.numeric.zenscript"
     },
     {
-      "comment": "prefixedNumbers",
-      "match": "\\b\\-?(0b|0x|0o|0B|0X|0O)(0|[1-9a-fA-F][0-9a-fA-F_]*)[a-zA-Z_]*\\b",
+      "match": "\\b-?(0[bxoBXO])(0|[1-9a-fA-F][_\\h]*)[a-zA-Z_]*\\b",
       "name": "constant.numeric.zenscript"
     },
     {
       "include": "#code"
     },
     {
-      "comment": "arrays",
       "match": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)(?=\\[)",
       "name": "storage.type.object.array.zenscript"
     }
@@ -51,7 +48,6 @@
               "name": "keyword.control.zenscript"
             }
           },
-          "comment": "items and blocks",
           "match": "(<)\\b(.*?)(:(.*?(:(\\*|\\d+)?)?)?)(>)",
           "name": "keyword.other.zenscript"
         }
@@ -66,7 +62,6 @@
           "name": "entity.name.type.class.zenscript"
         }
       },
-      "comment": "class",
       "match": "(zenClass)\\s+(\\w+)",
       "name": "meta.class.zenscript"
     },
@@ -107,19 +102,17 @@
     "comments": {
       "patterns": [
         {
-          "comment": "inline comments",
-          "match": "//[^\n]*",
+          "match": "//[^\\n]*",
           "name": "comment.line.double=slash"
         },
         {
-          "begin": "\\/\\*",
+          "begin": "/\\*",
           "beginCaptures": {
             "0": {
               "name": "comment.block"
             }
           },
-          "comment": "block comments",
-          "end": "\\*\\/",
+          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "comment.block"
@@ -141,7 +134,6 @@
           "name": "keyword.control.zenscript"
         }
       },
-      "comment": "dots",
       "match": "\\b(\\w+)(\\.)(\\w+)((\\.)(\\w+))*",
       "name": "plain.text.zenscript"
     },
@@ -154,34 +146,28 @@
           "name": "entity.name.function.zenscript"
         }
       },
-      "comment": "functions",
       "match": "function\\s+([A-Za-z_$][\\w$]*)\\s*(?=\\()",
       "name": "meta.function.zenscript"
     },
     "keywords": {
       "patterns": [
         {
-          "comment": "statement keywords",
           "match": "\\b(instanceof|get|implements|set|import|function|override|const|if|else|do|while|for|throw|panic|lock|try|catch|finally|return|break|continue|switch|case|default|in|is|as|match|throws|super|new)\\b",
           "name": "keyword.control.zenscript"
         },
         {
-          "comment": "storage keywords",
           "match": "\\b(zenClass|zenConstructor|alias|class|interface|enum|struct|expand|variant|set|void|bool|byte|sbyte|short|ushort|int|uint|long|ulong|usize|float|double|char|string)\\b",
           "name": "storage.type.zenscript"
         },
         {
-          "comment": "modifier keywords",
           "match": "\\b(variant|abstract|final|private|public|export|internal|static|protected|implicit|virtual|extern|immutable)\\b",
           "name": "storage.modifier.zenscript"
         },
         {
-          "comment": "annotation keywords",
           "match": "\\b(Native|Precondition)\\b",
           "name": "entity.other.attribute-name"
         },
         {
-          "comment": "language keywords",
           "match": "\\b(null|true|false)\\b",
           "name": "constant.language"
         }
@@ -190,13 +176,11 @@
     "operators": {
       "patterns": [
         {
-          "comment": "math operators",
-          "match": "\\b(\\.|\\.\\.|\\.\\.\\.|,|\\+|\\+=|\\+\\+|-|-=|--|~|~=|\\*|\\*=|/|/=|%|%=|\\||\\|=|\\|\\||&|&=|&&|\\^|\\^=|\\?|\\?\\.|\\?\\?|<|<=|<<|<<=|>|>=|>>|>>=|>>>|>>>=|=>|=|==|===|!|!=|!==|\\$|`)\\b",
+          "match": "\\b(\\.|\\.\\.|\\.\\.\\.|[,+]|\\+=|\\+\\+|-|-=|--|~|~=|\\*|\\*=|/|/=|%|%=|\\||\\|=|\\|\\||&|&=|&&|\\^|\\^=|\\?|\\?\\.|\\?\\?|<|<=|<<|<<=|>|>=|>>|>>=|>>>|>>>=|=>|=|==|===|!|!=|!==|[$`])\\b",
           "name": "keyword.control"
         },
         {
-          "comment": "colons",
-          "match": "\\b(;|:)\\b",
+          "match": "\\b([;:])\\b",
           "name": "keyword.control"
         }
       ]
@@ -248,8 +232,7 @@
       ]
     },
     "var": {
-      "comment": "var",
-      "match": "\\b(val|var)\\b",
+      "match": "\\b(va[lr])\\b",
       "name": "storage.type"
     }
   },
diff --git a/resources/languages/zig.json b/resources/languages/zig.json
index 785e342..ade447d 100644
--- a/resources/languages/zig.json
+++ b/resources/languages/zig.json
@@ -123,7 +123,7 @@
           "name": "keyword.type.integer.zig"
         },
         {
-          "match": "\\b(c_char|c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble)\\b",
+          "match": "\\b(c_(?:char|short|ushort|int|uint|long|ulong|longlong|ulonglong|longdouble))\\b",
           "name": "keyword.type.c.zig"
         }
       ]
@@ -131,7 +131,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "\\b0x[0-9a-fA-F][0-9a-fA-F_]*(\\.[0-9a-fA-F][0-9a-fA-F_]*)?([pP][+-]?[0-9a-fA-F_]+)?\\b",
+          "match": "\\b0x\\h[_\\h]*(\\.\\h[_\\h]*)?([pP][+-]?[_\\h]+)?\\b",
           "name": "constant.numeric.hexfloat.zig"
         },
         {
@@ -143,7 +143,7 @@
           "name": "constant.numeric.decimal.zig"
         },
         {
-          "match": "\\b0x[a-fA-F0-9_]+\\b",
+          "match": "\\b0x[_\\h]+\\b",
           "name": "constant.numeric.hexadecimal.zig"
         },
         {
@@ -163,19 +163,19 @@
     "operators": {
       "patterns": [
         {
-          "match": "(?<=\\[)\\*c(?=\\])",
+          "match": "(?<=\\[)\\*c(?=])",
           "name": "keyword.operator.c-pointer.zig"
         },
         {
-          "match": "(\\b(and|or)\\b)|(==|!=|<=|>=|<|>)",
+          "match": "(\\b(and|or)\\b)|(==|!=|<=|>=|[<>])",
           "name": "keyword.operator.comparison.zig"
         },
         {
-          "match": "(-%?|\\+%?|\\*%?|/|%)=?",
+          "match": "(-%?|\\+%?|\\*%?|[/%])=?",
           "name": "keyword.operator.arithmetic.zig"
         },
         {
-          "match": "(<<%?|>>|!|~|&|\\^|\\|)=?",
+          "match": "(<<%?|>>|[!~\\&^|])=?",
           "name": "keyword.operator.bitwise.zig"
         },
         {
@@ -215,7 +215,7 @@
     "stringcontent": {
       "patterns": [
         {
-          "match": "\\\\([nrt'\"\\\\]|(x[0-9a-fA-F]{2})|(u\\{[0-9a-fA-F]+\\}))",
+          "match": "\\\\([nrt'\"\\\\]|(x\\h{2})|(u\\{\\h+}))",
           "name": "constant.character.escape.zig"
         },
         {
@@ -242,7 +242,7 @@
           "name": "string.multiline.zig"
         },
         {
-          "match": "'([^'\\\\]|\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))'",
+          "match": "'([^'\\\\]|\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))'",
           "name": "string.quoted.single.zig"
         }
       ]
@@ -250,7 +250,6 @@
     "support": {
       "patterns": [
         {
-          "comment": "Built-in functions",
           "match": "@[_a-zA-Z][_a-zA-Z0-9]*",
           "name": "support.function.builtin.zig"
         }
diff --git a/resources/themes/catppuccin-frappe.json b/resources/themes/catppuccin-frappe.json
index 39a5246..aba43ef 100644
--- a/resources/themes/catppuccin-frappe.json
+++ b/resources/themes/catppuccin-frappe.json
@@ -84,9 +84,9 @@
     "diffEditor.border": "#626880",
     "diffEditor.diagonalFill": "#62688099",
     "diffEditor.insertedLineBackground": "#a6d18926",
-    "diffEditor.insertedTextBackground": "#a6d1891a",
+    "diffEditor.insertedTextBackground": "#a6d18933",
     "diffEditor.removedLineBackground": "#e7828426",
-    "diffEditor.removedTextBackground": "#e782841a",
+    "diffEditor.removedTextBackground": "#e7828433",
     "diffEditorOverview.insertedForeground": "#a6d189cc",
     "diffEditorOverview.removedForeground": "#e78284cc",
     "disabledForeground": "#a5adce",
@@ -508,9 +508,38 @@
     "terminalCommandDecoration.successBackground": "#a6d189",
     "terminalCursor.background": "#303446",
     "terminalCursor.foreground": "#f2d5cf",
+    "testing.coverCountBadgeBackground": "#00000000",
+    "testing.coverCountBadgeForeground": "#ca9ee6",
+    "testing.coveredBackground": "#a6d1894d",
+    "testing.coveredBorder": "#00000000",
+    "testing.coveredGutterBackground": "#a6d1894d",
+    "testing.iconErrored": "#e78284",
+    "testing.iconErrored.retired": "#e78284",
+    "testing.iconFailed": "#e78284",
+    "testing.iconFailed.retired": "#e78284",
+    "testing.iconPassed": "#a6d189",
+    "testing.iconPassed.retired": "#a6d189",
+    "testing.iconQueued": "#8caaee",
+    "testing.iconQueued.retired": "#8caaee",
+    "testing.iconSkipped": "#a5adce",
+    "testing.iconSkipped.retired": "#a5adce",
+    "testing.iconUnset": "#c6d0f5",
+    "testing.iconUnset.retired": "#c6d0f5",
+    "testing.message.error.lineBackground": "#e7828426",
+    "testing.message.info.decorationForeground": "#a6d189cc",
+    "testing.message.info.lineBackground": "#a6d18926",
+    "testing.messagePeekBorder": "#ca9ee6",
+    "testing.messagePeekHeaderBackground": "#626880",
+    "testing.peekBorder": "#ca9ee6",
+    "testing.peekHeaderBackground": "#626880",
+    "testing.runAction": "#ca9ee6",
+    "testing.uncoveredBackground": "#e7828433",
+    "testing.uncoveredBorder": "#00000000",
+    "testing.uncoveredBranchBackground": "#e7828433",
+    "testing.uncoveredGutterBackground": "#e7828440",
     "textBlockQuote.background": "#292c3c",
     "textBlockQuote.border": "#232634",
-    "textCodeBlock.background": "#303446",
+    "textCodeBlock.background": "#292c3c",
     "textLink.activeForeground": "#99d1db",
     "textLink.foreground": "#8caaee",
     "textPreformat.foreground": "#c6d0f5",
@@ -655,7 +684,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#737994"
+        "foreground": "#949cbb"
       }
     },
     {
@@ -1475,7 +1504,7 @@
         "markup.heading.heading-4.asciidoc"
       ],
       "settings": {
-        "foreground": "#8caaee"
+        "foreground": "#85c1dc"
       }
     },
     {
@@ -1489,7 +1518,7 @@
         "markup.heading.heading-5.asciidoc"
       ],
       "settings": {
-        "foreground": "#ca9ee6"
+        "foreground": "#babbf1"
       }
     },
     {
@@ -1751,13 +1780,13 @@
         "support.type.python"
       ],
       "settings": {
-        "foreground": "#ef9f76"
+        "foreground": "#ca9ee6"
       }
     },
     {
       "scope": "constant.language.python",
       "settings": {
-        "foreground": "#ca9ee6"
+        "foreground": "#ef9f76"
       }
     },
     {
@@ -2082,6 +2111,14 @@
       "settings": {
         "foreground": "#c6d0f5"
       }
+    },
+    {
+      "scope": [
+        "markup.heading.typst"
+      ],
+      "settings": {
+        "foreground": "#e78284"
+      }
     }
   ],
   "type": "dark"
diff --git a/resources/themes/catppuccin-latte.json b/resources/themes/catppuccin-latte.json
index 7473076..d3d9fce 100644
--- a/resources/themes/catppuccin-latte.json
+++ b/resources/themes/catppuccin-latte.json
@@ -84,9 +84,9 @@
     "diffEditor.border": "#acb0be",
     "diffEditor.diagonalFill": "#acb0be99",
     "diffEditor.insertedLineBackground": "#40a02b26",
-    "diffEditor.insertedTextBackground": "#40a02b1a",
+    "diffEditor.insertedTextBackground": "#40a02b33",
     "diffEditor.removedLineBackground": "#d20f3926",
-    "diffEditor.removedTextBackground": "#d20f391a",
+    "diffEditor.removedTextBackground": "#d20f3933",
     "diffEditorOverview.insertedForeground": "#40a02bcc",
     "diffEditorOverview.removedForeground": "#d20f39cc",
     "disabledForeground": "#6c6f85",
@@ -508,9 +508,38 @@
     "terminalCommandDecoration.successBackground": "#40a02b",
     "terminalCursor.background": "#eff1f5",
     "terminalCursor.foreground": "#dc8a78",
+    "testing.coverCountBadgeBackground": "#00000000",
+    "testing.coverCountBadgeForeground": "#8839ef",
+    "testing.coveredBackground": "#40a02b4d",
+    "testing.coveredBorder": "#00000000",
+    "testing.coveredGutterBackground": "#40a02b4d",
+    "testing.iconErrored": "#d20f39",
+    "testing.iconErrored.retired": "#d20f39",
+    "testing.iconFailed": "#d20f39",
+    "testing.iconFailed.retired": "#d20f39",
+    "testing.iconPassed": "#40a02b",
+    "testing.iconPassed.retired": "#40a02b",
+    "testing.iconQueued": "#1e66f5",
+    "testing.iconQueued.retired": "#1e66f5",
+    "testing.iconSkipped": "#6c6f85",
+    "testing.iconSkipped.retired": "#6c6f85",
+    "testing.iconUnset": "#4c4f69",
+    "testing.iconUnset.retired": "#4c4f69",
+    "testing.message.error.lineBackground": "#d20f3926",
+    "testing.message.info.decorationForeground": "#40a02bcc",
+    "testing.message.info.lineBackground": "#40a02b26",
+    "testing.messagePeekBorder": "#8839ef",
+    "testing.messagePeekHeaderBackground": "#acb0be",
+    "testing.peekBorder": "#8839ef",
+    "testing.peekHeaderBackground": "#acb0be",
+    "testing.runAction": "#8839ef",
+    "testing.uncoveredBackground": "#d20f3933",
+    "testing.uncoveredBorder": "#00000000",
+    "testing.uncoveredBranchBackground": "#d20f3933",
+    "testing.uncoveredGutterBackground": "#d20f3940",
     "textBlockQuote.background": "#e6e9ef",
     "textBlockQuote.border": "#dce0e8",
-    "textCodeBlock.background": "#eff1f5",
+    "textCodeBlock.background": "#e6e9ef",
     "textLink.activeForeground": "#04a5e5",
     "textLink.foreground": "#1e66f5",
     "textPreformat.foreground": "#4c4f69",
@@ -655,7 +684,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#9ca0b0"
+        "foreground": "#7c7f93"
       }
     },
     {
@@ -1475,7 +1504,7 @@
         "markup.heading.heading-4.asciidoc"
       ],
       "settings": {
-        "foreground": "#1e66f5"
+        "foreground": "#209fb5"
       }
     },
     {
@@ -1489,7 +1518,7 @@
         "markup.heading.heading-5.asciidoc"
       ],
       "settings": {
-        "foreground": "#8839ef"
+        "foreground": "#7287fd"
       }
     },
     {
@@ -1751,13 +1780,13 @@
         "support.type.python"
       ],
       "settings": {
-        "foreground": "#fe640b"
+        "foreground": "#8839ef"
       }
     },
     {
       "scope": "constant.language.python",
       "settings": {
-        "foreground": "#8839ef"
+        "foreground": "#fe640b"
       }
     },
     {
@@ -2082,6 +2111,14 @@
       "settings": {
         "foreground": "#4c4f69"
       }
+    },
+    {
+      "scope": [
+        "markup.heading.typst"
+      ],
+      "settings": {
+        "foreground": "#d20f39"
+      }
     }
   ],
   "type": "light"
diff --git a/resources/themes/catppuccin-macchiato.json b/resources/themes/catppuccin-macchiato.json
index c9b912d..eabc0a1 100644
--- a/resources/themes/catppuccin-macchiato.json
+++ b/resources/themes/catppuccin-macchiato.json
@@ -84,9 +84,9 @@
     "diffEditor.border": "#5b6078",
     "diffEditor.diagonalFill": "#5b607899",
     "diffEditor.insertedLineBackground": "#a6da9526",
-    "diffEditor.insertedTextBackground": "#a6da951a",
+    "diffEditor.insertedTextBackground": "#a6da9533",
     "diffEditor.removedLineBackground": "#ed879626",
-    "diffEditor.removedTextBackground": "#ed87961a",
+    "diffEditor.removedTextBackground": "#ed879633",
     "diffEditorOverview.insertedForeground": "#a6da95cc",
     "diffEditorOverview.removedForeground": "#ed8796cc",
     "disabledForeground": "#a5adcb",
@@ -508,9 +508,38 @@
     "terminalCommandDecoration.successBackground": "#a6da95",
     "terminalCursor.background": "#24273a",
     "terminalCursor.foreground": "#f4dbd6",
+    "testing.coverCountBadgeBackground": "#00000000",
+    "testing.coverCountBadgeForeground": "#c6a0f6",
+    "testing.coveredBackground": "#a6da954d",
+    "testing.coveredBorder": "#00000000",
+    "testing.coveredGutterBackground": "#a6da954d",
+    "testing.iconErrored": "#ed8796",
+    "testing.iconErrored.retired": "#ed8796",
+    "testing.iconFailed": "#ed8796",
+    "testing.iconFailed.retired": "#ed8796",
+    "testing.iconPassed": "#a6da95",
+    "testing.iconPassed.retired": "#a6da95",
+    "testing.iconQueued": "#8aadf4",
+    "testing.iconQueued.retired": "#8aadf4",
+    "testing.iconSkipped": "#a5adcb",
+    "testing.iconSkipped.retired": "#a5adcb",
+    "testing.iconUnset": "#cad3f5",
+    "testing.iconUnset.retired": "#cad3f5",
+    "testing.message.error.lineBackground": "#ed879626",
+    "testing.message.info.decorationForeground": "#a6da95cc",
+    "testing.message.info.lineBackground": "#a6da9526",
+    "testing.messagePeekBorder": "#c6a0f6",
+    "testing.messagePeekHeaderBackground": "#5b6078",
+    "testing.peekBorder": "#c6a0f6",
+    "testing.peekHeaderBackground": "#5b6078",
+    "testing.runAction": "#c6a0f6",
+    "testing.uncoveredBackground": "#ed879633",
+    "testing.uncoveredBorder": "#00000000",
+    "testing.uncoveredBranchBackground": "#ed879633",
+    "testing.uncoveredGutterBackground": "#ed879640",
     "textBlockQuote.background": "#1e2030",
     "textBlockQuote.border": "#181926",
-    "textCodeBlock.background": "#24273a",
+    "textCodeBlock.background": "#1e2030",
     "textLink.activeForeground": "#91d7e3",
     "textLink.foreground": "#8aadf4",
     "textPreformat.foreground": "#cad3f5",
@@ -655,7 +684,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#6e738d"
+        "foreground": "#939ab7"
       }
     },
     {
@@ -1475,7 +1504,7 @@
         "markup.heading.heading-4.asciidoc"
       ],
       "settings": {
-        "foreground": "#8aadf4"
+        "foreground": "#7dc4e4"
       }
     },
     {
@@ -1489,7 +1518,7 @@
         "markup.heading.heading-5.asciidoc"
       ],
       "settings": {
-        "foreground": "#c6a0f6"
+        "foreground": "#b7bdf8"
       }
     },
     {
@@ -1751,13 +1780,13 @@
         "support.type.python"
       ],
       "settings": {
-        "foreground": "#f5a97f"
+        "foreground": "#c6a0f6"
       }
     },
     {
       "scope": "constant.language.python",
       "settings": {
-        "foreground": "#c6a0f6"
+        "foreground": "#f5a97f"
       }
     },
     {
@@ -2082,6 +2111,14 @@
       "settings": {
         "foreground": "#cad3f5"
       }
+    },
+    {
+      "scope": [
+        "markup.heading.typst"
+      ],
+      "settings": {
+        "foreground": "#ed8796"
+      }
     }
   ],
   "type": "dark"
diff --git a/resources/themes/catppuccin-mocha.json b/resources/themes/catppuccin-mocha.json
index 4d45094..a76a2a7 100644
--- a/resources/themes/catppuccin-mocha.json
+++ b/resources/themes/catppuccin-mocha.json
@@ -84,9 +84,9 @@
     "diffEditor.border": "#585b70",
     "diffEditor.diagonalFill": "#585b7099",
     "diffEditor.insertedLineBackground": "#a6e3a126",
-    "diffEditor.insertedTextBackground": "#a6e3a11a",
+    "diffEditor.insertedTextBackground": "#a6e3a133",
     "diffEditor.removedLineBackground": "#f38ba826",
-    "diffEditor.removedTextBackground": "#f38ba81a",
+    "diffEditor.removedTextBackground": "#f38ba833",
     "diffEditorOverview.insertedForeground": "#a6e3a1cc",
     "diffEditorOverview.removedForeground": "#f38ba8cc",
     "disabledForeground": "#a6adc8",
@@ -508,9 +508,38 @@
     "terminalCommandDecoration.successBackground": "#a6e3a1",
     "terminalCursor.background": "#1e1e2e",
     "terminalCursor.foreground": "#f5e0dc",
+    "testing.coverCountBadgeBackground": "#00000000",
+    "testing.coverCountBadgeForeground": "#cba6f7",
+    "testing.coveredBackground": "#a6e3a14d",
+    "testing.coveredBorder": "#00000000",
+    "testing.coveredGutterBackground": "#a6e3a14d",
+    "testing.iconErrored": "#f38ba8",
+    "testing.iconErrored.retired": "#f38ba8",
+    "testing.iconFailed": "#f38ba8",
+    "testing.iconFailed.retired": "#f38ba8",
+    "testing.iconPassed": "#a6e3a1",
+    "testing.iconPassed.retired": "#a6e3a1",
+    "testing.iconQueued": "#89b4fa",
+    "testing.iconQueued.retired": "#89b4fa",
+    "testing.iconSkipped": "#a6adc8",
+    "testing.iconSkipped.retired": "#a6adc8",
+    "testing.iconUnset": "#cdd6f4",
+    "testing.iconUnset.retired": "#cdd6f4",
+    "testing.message.error.lineBackground": "#f38ba826",
+    "testing.message.info.decorationForeground": "#a6e3a1cc",
+    "testing.message.info.lineBackground": "#a6e3a126",
+    "testing.messagePeekBorder": "#cba6f7",
+    "testing.messagePeekHeaderBackground": "#585b70",
+    "testing.peekBorder": "#cba6f7",
+    "testing.peekHeaderBackground": "#585b70",
+    "testing.runAction": "#cba6f7",
+    "testing.uncoveredBackground": "#f38ba833",
+    "testing.uncoveredBorder": "#00000000",
+    "testing.uncoveredBranchBackground": "#f38ba833",
+    "testing.uncoveredGutterBackground": "#f38ba840",
     "textBlockQuote.background": "#181825",
     "textBlockQuote.border": "#11111b",
-    "textCodeBlock.background": "#1e1e2e",
+    "textCodeBlock.background": "#181825",
     "textLink.activeForeground": "#89dceb",
     "textLink.foreground": "#89b4fa",
     "textPreformat.foreground": "#cdd6f4",
@@ -655,7 +684,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#6c7086"
+        "foreground": "#9399b2"
       }
     },
     {
@@ -1475,7 +1504,7 @@
         "markup.heading.heading-4.asciidoc"
       ],
       "settings": {
-        "foreground": "#89b4fa"
+        "foreground": "#74c7ec"
       }
     },
     {
@@ -1489,7 +1518,7 @@
         "markup.heading.heading-5.asciidoc"
       ],
       "settings": {
-        "foreground": "#cba6f7"
+        "foreground": "#b4befe"
       }
     },
     {
@@ -1751,13 +1780,13 @@
         "support.type.python"
       ],
       "settings": {
-        "foreground": "#fab387"
+        "foreground": "#cba6f7"
       }
     },
     {
       "scope": "constant.language.python",
       "settings": {
-        "foreground": "#cba6f7"
+        "foreground": "#fab387"
       }
     },
     {
@@ -2082,6 +2111,14 @@
       "settings": {
         "foreground": "#cdd6f4"
       }
+    },
+    {
+      "scope": [
+        "markup.heading.typst"
+      ],
+      "settings": {
+        "foreground": "#f38ba8"
+      }
     }
   ],
   "type": "dark"
diff --git a/resources/themes/gruvbox-dark-hard.json b/resources/themes/gruvbox-dark-hard.json
new file mode 100644
index 0000000..fa7c28c
--- /dev/null
+++ b/resources/themes/gruvbox-dark-hard.json
@@ -0,0 +1,1132 @@
+{
+  "colors": {
+    "activityBar.background": "#1d2021",
+    "activityBar.border": "#3c3836",
+    "activityBar.foreground": "#ebdbb2",
+    "activityBarBadge.background": "#458588",
+    "activityBarBadge.foreground": "#ebdbb2",
+    "activityBarTop.background": "#1d2021",
+    "activityBarTop.foreground": "#ebdbb2",
+    "badge.background": "#b16286",
+    "badge.foreground": "#ebdbb2",
+    "button.background": "#45858880",
+    "button.foreground": "#ebdbb2",
+    "button.hoverBackground": "#45858860",
+    "debugToolBar.background": "#1d2021",
+    "diffEditor.insertedTextBackground": "#b8bb2630",
+    "diffEditor.removedTextBackground": "#fb493430",
+    "dropdown.background": "#1d2021",
+    "dropdown.border": "#3c3836",
+    "dropdown.foreground": "#ebdbb2",
+    "editor.background": "#1d2021",
+    "editor.findMatchBackground": "#83a59870",
+    "editor.findMatchHighlightBackground": "#fe801930",
+    "editor.findRangeHighlightBackground": "#83a59870",
+    "editor.foreground": "#ebdbb2",
+    "editor.hoverHighlightBackground": "#689d6a50",
+    "editor.lineHighlightBackground": "#3c383660",
+    "editor.lineHighlightBorder": "#0000",
+    "editor.selectionBackground": "#689d6a40",
+    "editor.selectionHighlightBackground": "#fabd2f40",
+    "editorBracketHighlight.foreground1": "#b16286",
+    "editorBracketHighlight.foreground2": "#458588",
+    "editorBracketHighlight.foreground3": "#689d6a",
+    "editorBracketHighlight.foreground4": "#98971a",
+    "editorBracketHighlight.foreground5": "#d79921",
+    "editorBracketHighlight.foreground6": "#d65d0e",
+    "editorBracketHighlight.unexpectedBracket.foreground": "#cc241d",
+    "editorBracketMatch.background": "#92837480",
+    "editorBracketMatch.border": "#0000",
+    "editorCodeLens.foreground": "#a8998490",
+    "editorCursor.foreground": "#ebdbb2",
+    "editorError.foreground": "#cc241d",
+    "editorGroup.border": "#3c3836",
+    "editorGroup.dropBackground": "#3c383660",
+    "editorGroupHeader.noTabsBackground": "#1d2021",
+    "editorGroupHeader.tabsBackground": "#1d2021",
+    "editorGroupHeader.tabsBorder": "#3c3836",
+    "editorGutter.addedBackground": "#b8bb26",
+    "editorGutter.background": "#0000",
+    "editorGutter.deletedBackground": "#fb4934",
+    "editorGutter.modifiedBackground": "#83a598",
+    "editorHoverWidget.background": "#1d2021",
+    "editorHoverWidget.border": "#3c3836",
+    "editorInfo.foreground": "#458588",
+    "editorLineNumber.foreground": "#665c54",
+    "editorLink.activeForeground": "#ebdbb2",
+    "editorOverviewRuler.addedForeground": "#83a598",
+    "editorOverviewRuler.border": "#0000",
+    "editorOverviewRuler.commonContentForeground": "#928374",
+    "editorOverviewRuler.currentContentForeground": "#458588",
+    "editorOverviewRuler.deletedForeground": "#83a598",
+    "editorOverviewRuler.errorForeground": "#fb4934",
+    "editorOverviewRuler.findMatchForeground": "#bdae93",
+    "editorOverviewRuler.incomingContentForeground": "#689d6a",
+    "editorOverviewRuler.infoForeground": "#d3869b",
+    "editorOverviewRuler.modifiedForeground": "#83a598",
+    "editorOverviewRuler.rangeHighlightForeground": "#bdae93",
+    "editorOverviewRuler.selectionHighlightForeground": "#665c54",
+    "editorOverviewRuler.warningForeground": "#d79921",
+    "editorOverviewRuler.wordHighlightForeground": "#665c54",
+    "editorOverviewRuler.wordHighlightStrongForeground": "#665c54",
+    "editorRuler.foreground": "#a8998440",
+    "editorStickyScroll.shadow": "#50494599",
+    "editorStickyScrollHover.background": "#3c383660",
+    "editorSuggestWidget.background": "#1d2021",
+    "editorSuggestWidget.border": "#3c3836",
+    "editorSuggestWidget.foreground": "#ebdbb2",
+    "editorSuggestWidget.highlightForeground": "#689d6a",
+    "editorSuggestWidget.selectedBackground": "#3c383660",
+    "editorWarning.foreground": "#d79921",
+    "editorWhitespace.foreground": "#a8998420",
+    "editorWidget.background": "#1d2021",
+    "editorWidget.border": "#3c3836",
+    "errorForeground": "#fb4934",
+    "extensionButton.prominentBackground": "#b8bb2680",
+    "extensionButton.prominentHoverBackground": "#b8bb2630",
+    "focusBorder": "#3c3836",
+    "foreground": "#ebdbb2",
+    "gitDecoration.addedResourceForeground": "#ebdbb2",
+    "gitDecoration.conflictingResourceForeground": "#b16286",
+    "gitDecoration.deletedResourceForeground": "#cc241d",
+    "gitDecoration.ignoredResourceForeground": "#7c6f64",
+    "gitDecoration.modifiedResourceForeground": "#d79921",
+    "gitDecoration.untrackedResourceForeground": "#98971a",
+    "gitlens.closedAutolinkedIssueIconColor": "#b16286",
+    "gitlens.closedPullRequestIconColor": "#cc241d",
+    "gitlens.decorations.branchAheadForegroundColor": "#98971a",
+    "gitlens.decorations.branchBehindForegroundColor": "#d65d0e",
+    "gitlens.decorations.branchDivergedForegroundColor": "#d79921",
+    "gitlens.decorations.branchMissingUpstreamForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingConflictForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingForegroundColor": "#d79921",
+    "gitlens.decorations.workspaceCurrentForegroundColor": "#98971a",
+    "gitlens.decorations.workspaceRepoMissingForegroundColor": "#7c6f64",
+    "gitlens.decorations.workspaceRepoOpenForegroundColor": "#98971a",
+    "gitlens.decorations.worktreeHasUncommittedChangesForegroundColor": "#928374",
+    "gitlens.decorations.worktreeMissingForegroundColor": "#cc241d",
+    "gitlens.graphChangesColumnAddedColor": "#98971a",
+    "gitlens.graphChangesColumnDeletedColor": "#cc241d",
+    "gitlens.graphLane10Color": "#98971a",
+    "gitlens.graphLane1Color": "#83a598",
+    "gitlens.graphLane2Color": "#458588",
+    "gitlens.graphLane3Color": "#d3869b",
+    "gitlens.graphLane4Color": "#b16286",
+    "gitlens.graphLane5Color": "#8ec07c",
+    "gitlens.graphLane6Color": "#689d6a",
+    "gitlens.graphLane7Color": "#fabd2f",
+    "gitlens.graphLane8Color": "#d79921",
+    "gitlens.graphLane9Color": "#b8bb26",
+    "gitlens.graphMinimapMarkerHeadColor": "#98971a",
+    "gitlens.graphMinimapMarkerHighlightsColor": "#b8bb26",
+    "gitlens.graphMinimapMarkerLocalBranchesColor": "#83a598",
+    "gitlens.graphMinimapMarkerPullRequestsColor": "#fe8019",
+    "gitlens.graphMinimapMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphMinimapMarkerStashesColor": "#b16286",
+    "gitlens.graphMinimapMarkerTagsColor": "#7c6f64",
+    "gitlens.graphMinimapMarkerUpstreamColor": "#689d6a",
+    "gitlens.graphScrollMarkerHeadColor": "#b8bb26",
+    "gitlens.graphScrollMarkerHighlightsColor": "#d79921",
+    "gitlens.graphScrollMarkerLocalBranchesColor": "#83a598",
+    "gitlens.graphScrollMarkerPullRequestsColor": "#fe8019",
+    "gitlens.graphScrollMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphScrollMarkerStashesColor": "#b16286",
+    "gitlens.graphScrollMarkerTagsColor": "#7c6f64",
+    "gitlens.graphScrollMarkerUpstreamColor": "#8ec07c",
+    "gitlens.gutterBackgroundColor": "#3c3836",
+    "gitlens.gutterForegroundColor": "#ebdbb2",
+    "gitlens.gutterUncommittedForegroundColor": "#458588",
+    "gitlens.launchpadIndicatorAttentionColor": "#fabd2f",
+    "gitlens.launchpadIndicatorAttentionHoverColor": "#d79921",
+    "gitlens.launchpadIndicatorBlockedColor": "#fb4934",
+    "gitlens.launchpadIndicatorBlockedHoverColor": "#cc241d",
+    "gitlens.launchpadIndicatorMergeableColor": "#b8bb26",
+    "gitlens.launchpadIndicatorMergeableHoverColor": "#98971a",
+    "gitlens.lineHighlightBackgroundColor": "#3c3836",
+    "gitlens.lineHighlightOverviewRulerColor": "#458588",
+    "gitlens.mergedPullRequestIconColor": "#b16286",
+    "gitlens.openAutolinkedIssueIconColor": "#98971a",
+    "gitlens.openPullRequestIconColor": "#98971a",
+    "gitlens.trailingLineBackgroundColor": "#1d2021a0",
+    "gitlens.trailingLineForegroundColor": "#928374a0",
+    "gitlens.unpublishedChangesIconColor": "#98971a",
+    "gitlens.unpublishedCommitIconColor": "#98971a",
+    "gitlens.unpulledChangesIconColor": "#fe8019",
+    "icon.foreground": "#ebdbb2",
+    "input.background": "#1d2021",
+    "input.border": "#3c3836",
+    "input.foreground": "#ebdbb2",
+    "input.placeholderForeground": "#ebdbb260",
+    "inputOption.activeBorder": "#ebdbb260",
+    "inputValidation.errorBackground": "#cc241d",
+    "inputValidation.errorBorder": "#fb4934",
+    "inputValidation.infoBackground": "#45858880",
+    "inputValidation.infoBorder": "#83a598",
+    "inputValidation.warningBackground": "#d79921",
+    "inputValidation.warningBorder": "#fabd2f",
+    "list.activeSelectionBackground": "#3c383680",
+    "list.activeSelectionForeground": "#8ec07c",
+    "list.dropBackground": "#3c3836",
+    "list.focusBackground": "#3c3836",
+    "list.focusForeground": "#ebdbb2",
+    "list.highlightForeground": "#689d6a",
+    "list.hoverBackground": "#3c383680",
+    "list.hoverForeground": "#d5c4a1",
+    "list.inactiveSelectionBackground": "#3c383680",
+    "list.inactiveSelectionForeground": "#689d6a",
+    "menu.border": "#3c3836",
+    "menu.separatorBackground": "#3c3836",
+    "merge.border": "#0000",
+    "merge.currentContentBackground": "#45858820",
+    "merge.currentHeaderBackground": "#45858840",
+    "merge.incomingContentBackground": "#689d6a20",
+    "merge.incomingHeaderBackground": "#689d6a40",
+    "notebook.cellBorderColor": "#504945",
+    "notebook.cellEditorBackground": "#3c3836",
+    "notebook.focusedCellBorder": "#a89984",
+    "notebook.focusedEditorBorder": "#504945",
+    "panel.border": "#3c3836",
+    "panelTitle.activeForeground": "#ebdbb2",
+    "peekView.border": "#3c3836",
+    "peekViewEditor.background": "#3c383670",
+    "peekViewEditor.matchHighlightBackground": "#504945",
+    "peekViewEditorGutter.background": "#3c383670",
+    "peekViewResult.background": "#3c383670",
+    "peekViewResult.fileForeground": "#ebdbb2",
+    "peekViewResult.lineForeground": "#ebdbb2",
+    "peekViewResult.matchHighlightBackground": "#504945",
+    "peekViewResult.selectionBackground": "#45858820",
+    "peekViewResult.selectionForeground": "#ebdbb2",
+    "peekViewTitle.background": "#3c383670",
+    "peekViewTitleDescription.foreground": "#bdae93",
+    "peekViewTitleLabel.foreground": "#ebdbb2",
+    "progressBar.background": "#689d6a",
+    "scmGraph.historyItemHoverDefaultLabelForeground": "#ebdbb2",
+    "scmGraph.historyItemHoverLabelForeground": "#ebdbb2",
+    "scrollbar.shadow": "#1d2021",
+    "scrollbarSlider.activeBackground": "#689d6a",
+    "scrollbarSlider.background": "#50494599",
+    "scrollbarSlider.hoverBackground": "#665c54",
+    "selection.background": "#689d6a80",
+    "sideBar.background": "#1d2021",
+    "sideBar.border": "#3c3836",
+    "sideBar.foreground": "#d5c4a1",
+    "sideBarSectionHeader.background": "#0000",
+    "sideBarSectionHeader.foreground": "#ebdbb2",
+    "sideBarTitle.foreground": "#ebdbb2",
+    "statusBar.background": "#1d2021",
+    "statusBar.border": "#3c3836",
+    "statusBar.debuggingBackground": "#fe8019",
+    "statusBar.debuggingBorder": "#0000",
+    "statusBar.debuggingForeground": "#1d2021",
+    "statusBar.foreground": "#ebdbb2",
+    "statusBar.noFolderBackground": "#1d2021",
+    "statusBar.noFolderBorder": "#0000",
+    "tab.activeBackground": "#3c3836",
+    "tab.activeBorder": "#689d6a",
+    "tab.activeForeground": "#ebdbb2",
+    "tab.border": "#0000",
+    "tab.inactiveBackground": "#1d2021",
+    "tab.inactiveForeground": "#a89984",
+    "tab.unfocusedActiveBorder": "#0000",
+    "tab.unfocusedActiveForeground": "#a89984",
+    "tab.unfocusedInactiveForeground": "#928374",
+    "terminal.ansiBlack": "#3c3836",
+    "terminal.ansiBlue": "#458588",
+    "terminal.ansiBrightBlack": "#928374",
+    "terminal.ansiBrightBlue": "#83a598",
+    "terminal.ansiBrightCyan": "#8ec07c",
+    "terminal.ansiBrightGreen": "#b8bb26",
+    "terminal.ansiBrightMagenta": "#d3869b",
+    "terminal.ansiBrightRed": "#fb4934",
+    "terminal.ansiBrightWhite": "#ebdbb2",
+    "terminal.ansiBrightYellow": "#fabd2f",
+    "terminal.ansiCyan": "#689d6a",
+    "terminal.ansiGreen": "#98971a",
+    "terminal.ansiMagenta": "#b16286",
+    "terminal.ansiRed": "#cc241d",
+    "terminal.ansiWhite": "#a89984",
+    "terminal.ansiYellow": "#d79921",
+    "terminal.background": "#1d2021",
+    "terminal.foreground": "#ebdbb2",
+    "textLink.activeForeground": "#458588",
+    "textLink.foreground": "#83a598",
+    "titleBar.activeBackground": "#1d2021",
+    "titleBar.activeForeground": "#ebdbb2",
+    "titleBar.inactiveBackground": "#1d2021",
+    "widget.shadow": "#1d202130"
+  },
+  "displayName": "Gruvbox Dark Hard",
+  "name": "gruvbox-dark-hard",
+  "semanticHighlighting": true,
+  "semanticTokenColors": {
+    "component": "#fe8019",
+    "constant.builtin": "#d3869b",
+    "function": "#8ec07c",
+    "function.builtin": "#fe8019",
+    "method": "#8ec07c",
+    "parameter": "#83a598",
+    "property": "#83a598",
+    "property:python": "#ebdbb2",
+    "variable": "#ebdbb2"
+  },
+  "tokenColors": [
+    {
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "emphasis",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "strong",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "header",
+      "settings": {
+        "foreground": "#458588"
+      }
+    },
+    {
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": [
+        "constant",
+        "support.constant",
+        "variable.arguments"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": "constant.rgb-value",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "entity.name.selector",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag",
+        "punctuation.tag"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "invalid",
+        "invalid.illegal"
+      ],
+      "settings": {
+        "foreground": "#cc241d"
+      }
+    },
+    {
+      "scope": "invalid.deprecated",
+      "settings": {
+        "foreground": "#b16286"
+      }
+    },
+    {
+      "scope": "meta.selector",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "meta.preprocessor",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.string",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.numeric",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "meta.header.diff",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "storage",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "string",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "string.tag",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "string.value",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "string.regexp",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "string.escape",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "string.quasi",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "string.entity",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "object",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "module.node",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "support.type.property-name",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "keyword",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "keyword.control",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "keyword.control.module",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "keyword.control.less",
+      "settings": {
+        "foreground": "#d79921"
+      }
+    },
+    {
+      "scope": "keyword.operator",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "keyword.operator.new",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "keyword.other.unit",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "metatag.php",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "support.function.git-rebase",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "constant.sha.git-rebase",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "meta.type.name",
+        "meta.return.type",
+        "meta.return-type",
+        "meta.cast",
+        "meta.type.annotation",
+        "support.type",
+        "storage.type.cs",
+        "variable.class"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "variable.this",
+        "support.variable"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": [
+        "entity.name",
+        "entity.static",
+        "entity.name.class.static.function",
+        "entity.name.function",
+        "entity.name.class",
+        "entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "entity.function",
+        "entity.name.function.static"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "entity.name.function.function-call",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "support.function.builtin",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.method",
+        "entity.name.method.function-call",
+        "entity.name.static.function-call"
+      ],
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "brace",
+      "settings": {
+        "foreground": "#d5c4a1"
+      }
+    },
+    {
+      "scope": [
+        "meta.parameter.type.variable",
+        "variable.parameter",
+        "variable.name",
+        "variable.other",
+        "variable",
+        "string.constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "prototype",
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": [
+        "punctuation"
+      ],
+      "settings": {
+        "foreground": "#a89984"
+      }
+    },
+    {
+      "scope": "punctuation.quoted",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "punctuation.quasi",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.python",
+        "entity.name.function.python"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.python",
+        "storage.modifier.declaration",
+        "storage.type.class.python",
+        "storage.type.string.python"
+      ],
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.async.python"
+      ],
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "meta.function-call.generic",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "meta.function-call.arguments",
+      "settings": {
+        "foreground": "#d5c4a1"
+      }
+    },
+    {
+      "scope": "entity.name.function.decorator",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "constant.other.caps",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "keyword.operator.logical",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "punctuation.definition.logical-expression",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "string.interpolated.dollar.shell",
+        "string.interpolated.backtick.shell"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "keyword.control.directive",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "support.function.C99",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.cs",
+        "entity.name.function.cs",
+        "entity.name.type.namespace.cs"
+      ],
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.using.cs",
+        "entity.name.variable.field.cs",
+        "entity.name.variable.local.cs",
+        "variable.other.readwrite.cs"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.this.cs",
+        "keyword.other.base.cs"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": "meta.scope.prerequisites",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "entity.name.function.target",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "storage.modifier.import.java",
+        "storage.modifier.package.java"
+      ],
+      "settings": {
+        "foreground": "#bdae93"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.import.java",
+        "keyword.other.package.java"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "storage.type.java",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "storage.type.annotation",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "keyword.other.documentation.javadoc",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "comment.block.javadoc variable.parameter.java",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.java variable.other.object",
+        "source.java variable.other.definition.java"
+      ],
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "meta.function-parameters.lisp",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "markup.underline",
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": "string.other.link.title.markdown",
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": "markup.underline.link",
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": "markup.bold",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "markup.heading",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "markup.italic",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "markup.inserted",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "markup.deleted",
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": "markup.changed",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "markup.punctuation.quote.beginning",
+      "settings": {
+        "foreground": "#98971a"
+      }
+    },
+    {
+      "scope": "markup.punctuation.list.beginning",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "markup.inline.raw",
+        "markup.fenced_code.block"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "string.quoted.double.json",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.css",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "source.css meta.selector",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "support.type.property-name.css",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.class",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.css support.function.transform",
+        "source.css support.function.timing-function",
+        "source.css support.function.misc"
+      ],
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "support.property-value",
+        "constant.rgb-value",
+        "support.property-value.scss",
+        "constant.rgb-value.scss"
+      ],
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag.css"
+      ],
+      "settings": {
+        "fontStyle": ""
+      }
+    },
+    {
+      "scope": [
+        "punctuation.definition.tag"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "text.html entity.name.tag",
+        "text.html punctuation.tag"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "source.js variable.language"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.ts variable.language"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.go storage.type"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.import"
+      ],
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.package",
+        "source.go keyword.import"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.interface",
+        "source.go keyword.struct"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": [
+        "keyword.control.cucumber.table"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "source.reason string.double",
+        "source.reason string.regexp"
+      ],
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.reason keyword.control.less"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "source.reason entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "source.reason support.property-value",
+        "source.reason entity.name.filename"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell variable.other.member.powershell"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.powershell"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.attribute.powershell"
+      ],
+      "settings": {
+        "foreground": "#bdae93"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell meta.hashtable.assignment.powershell variable.other.readwrite.powershell"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    }
+  ],
+  "type": "dark"
+}
diff --git a/resources/themes/gruvbox-dark-medium.json b/resources/themes/gruvbox-dark-medium.json
new file mode 100644
index 0000000..dbb710e
--- /dev/null
+++ b/resources/themes/gruvbox-dark-medium.json
@@ -0,0 +1,1132 @@
+{
+  "colors": {
+    "activityBar.background": "#282828",
+    "activityBar.border": "#3c3836",
+    "activityBar.foreground": "#ebdbb2",
+    "activityBarBadge.background": "#458588",
+    "activityBarBadge.foreground": "#ebdbb2",
+    "activityBarTop.background": "#282828",
+    "activityBarTop.foreground": "#ebdbb2",
+    "badge.background": "#b16286",
+    "badge.foreground": "#ebdbb2",
+    "button.background": "#45858880",
+    "button.foreground": "#ebdbb2",
+    "button.hoverBackground": "#45858860",
+    "debugToolBar.background": "#282828",
+    "diffEditor.insertedTextBackground": "#b8bb2630",
+    "diffEditor.removedTextBackground": "#fb493430",
+    "dropdown.background": "#282828",
+    "dropdown.border": "#3c3836",
+    "dropdown.foreground": "#ebdbb2",
+    "editor.background": "#282828",
+    "editor.findMatchBackground": "#83a59870",
+    "editor.findMatchHighlightBackground": "#fe801930",
+    "editor.findRangeHighlightBackground": "#83a59870",
+    "editor.foreground": "#ebdbb2",
+    "editor.hoverHighlightBackground": "#689d6a50",
+    "editor.lineHighlightBackground": "#3c383660",
+    "editor.lineHighlightBorder": "#0000",
+    "editor.selectionBackground": "#689d6a40",
+    "editor.selectionHighlightBackground": "#fabd2f40",
+    "editorBracketHighlight.foreground1": "#b16286",
+    "editorBracketHighlight.foreground2": "#458588",
+    "editorBracketHighlight.foreground3": "#689d6a",
+    "editorBracketHighlight.foreground4": "#98971a",
+    "editorBracketHighlight.foreground5": "#d79921",
+    "editorBracketHighlight.foreground6": "#d65d0e",
+    "editorBracketHighlight.unexpectedBracket.foreground": "#cc241d",
+    "editorBracketMatch.background": "#92837480",
+    "editorBracketMatch.border": "#0000",
+    "editorCodeLens.foreground": "#a8998490",
+    "editorCursor.foreground": "#ebdbb2",
+    "editorError.foreground": "#cc241d",
+    "editorGroup.border": "#3c3836",
+    "editorGroup.dropBackground": "#3c383660",
+    "editorGroupHeader.noTabsBackground": "#282828",
+    "editorGroupHeader.tabsBackground": "#282828",
+    "editorGroupHeader.tabsBorder": "#3c3836",
+    "editorGutter.addedBackground": "#b8bb26",
+    "editorGutter.background": "#0000",
+    "editorGutter.deletedBackground": "#fb4934",
+    "editorGutter.modifiedBackground": "#83a598",
+    "editorHoverWidget.background": "#282828",
+    "editorHoverWidget.border": "#3c3836",
+    "editorInfo.foreground": "#458588",
+    "editorLineNumber.foreground": "#665c54",
+    "editorLink.activeForeground": "#ebdbb2",
+    "editorOverviewRuler.addedForeground": "#83a598",
+    "editorOverviewRuler.border": "#0000",
+    "editorOverviewRuler.commonContentForeground": "#928374",
+    "editorOverviewRuler.currentContentForeground": "#458588",
+    "editorOverviewRuler.deletedForeground": "#83a598",
+    "editorOverviewRuler.errorForeground": "#fb4934",
+    "editorOverviewRuler.findMatchForeground": "#bdae93",
+    "editorOverviewRuler.incomingContentForeground": "#689d6a",
+    "editorOverviewRuler.infoForeground": "#d3869b",
+    "editorOverviewRuler.modifiedForeground": "#83a598",
+    "editorOverviewRuler.rangeHighlightForeground": "#bdae93",
+    "editorOverviewRuler.selectionHighlightForeground": "#665c54",
+    "editorOverviewRuler.warningForeground": "#d79921",
+    "editorOverviewRuler.wordHighlightForeground": "#665c54",
+    "editorOverviewRuler.wordHighlightStrongForeground": "#665c54",
+    "editorRuler.foreground": "#a8998440",
+    "editorStickyScroll.shadow": "#50494599",
+    "editorStickyScrollHover.background": "#3c383660",
+    "editorSuggestWidget.background": "#282828",
+    "editorSuggestWidget.border": "#3c3836",
+    "editorSuggestWidget.foreground": "#ebdbb2",
+    "editorSuggestWidget.highlightForeground": "#689d6a",
+    "editorSuggestWidget.selectedBackground": "#3c383660",
+    "editorWarning.foreground": "#d79921",
+    "editorWhitespace.foreground": "#a8998420",
+    "editorWidget.background": "#282828",
+    "editorWidget.border": "#3c3836",
+    "errorForeground": "#fb4934",
+    "extensionButton.prominentBackground": "#b8bb2680",
+    "extensionButton.prominentHoverBackground": "#b8bb2630",
+    "focusBorder": "#3c3836",
+    "foreground": "#ebdbb2",
+    "gitDecoration.addedResourceForeground": "#ebdbb2",
+    "gitDecoration.conflictingResourceForeground": "#b16286",
+    "gitDecoration.deletedResourceForeground": "#cc241d",
+    "gitDecoration.ignoredResourceForeground": "#7c6f64",
+    "gitDecoration.modifiedResourceForeground": "#d79921",
+    "gitDecoration.untrackedResourceForeground": "#98971a",
+    "gitlens.closedAutolinkedIssueIconColor": "#b16286",
+    "gitlens.closedPullRequestIconColor": "#cc241d",
+    "gitlens.decorations.branchAheadForegroundColor": "#98971a",
+    "gitlens.decorations.branchBehindForegroundColor": "#d65d0e",
+    "gitlens.decorations.branchDivergedForegroundColor": "#d79921",
+    "gitlens.decorations.branchMissingUpstreamForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingConflictForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingForegroundColor": "#d79921",
+    "gitlens.decorations.workspaceCurrentForegroundColor": "#98971a",
+    "gitlens.decorations.workspaceRepoMissingForegroundColor": "#7c6f64",
+    "gitlens.decorations.workspaceRepoOpenForegroundColor": "#98971a",
+    "gitlens.decorations.worktreeHasUncommittedChangesForegroundColor": "#928374",
+    "gitlens.decorations.worktreeMissingForegroundColor": "#cc241d",
+    "gitlens.graphChangesColumnAddedColor": "#98971a",
+    "gitlens.graphChangesColumnDeletedColor": "#cc241d",
+    "gitlens.graphLane10Color": "#98971a",
+    "gitlens.graphLane1Color": "#83a598",
+    "gitlens.graphLane2Color": "#458588",
+    "gitlens.graphLane3Color": "#d3869b",
+    "gitlens.graphLane4Color": "#b16286",
+    "gitlens.graphLane5Color": "#8ec07c",
+    "gitlens.graphLane6Color": "#689d6a",
+    "gitlens.graphLane7Color": "#fabd2f",
+    "gitlens.graphLane8Color": "#d79921",
+    "gitlens.graphLane9Color": "#b8bb26",
+    "gitlens.graphMinimapMarkerHeadColor": "#98971a",
+    "gitlens.graphMinimapMarkerHighlightsColor": "#b8bb26",
+    "gitlens.graphMinimapMarkerLocalBranchesColor": "#83a598",
+    "gitlens.graphMinimapMarkerPullRequestsColor": "#fe8019",
+    "gitlens.graphMinimapMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphMinimapMarkerStashesColor": "#b16286",
+    "gitlens.graphMinimapMarkerTagsColor": "#7c6f64",
+    "gitlens.graphMinimapMarkerUpstreamColor": "#689d6a",
+    "gitlens.graphScrollMarkerHeadColor": "#b8bb26",
+    "gitlens.graphScrollMarkerHighlightsColor": "#d79921",
+    "gitlens.graphScrollMarkerLocalBranchesColor": "#83a598",
+    "gitlens.graphScrollMarkerPullRequestsColor": "#fe8019",
+    "gitlens.graphScrollMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphScrollMarkerStashesColor": "#b16286",
+    "gitlens.graphScrollMarkerTagsColor": "#7c6f64",
+    "gitlens.graphScrollMarkerUpstreamColor": "#8ec07c",
+    "gitlens.gutterBackgroundColor": "#3c3836",
+    "gitlens.gutterForegroundColor": "#ebdbb2",
+    "gitlens.gutterUncommittedForegroundColor": "#458588",
+    "gitlens.launchpadIndicatorAttentionColor": "#fabd2f",
+    "gitlens.launchpadIndicatorAttentionHoverColor": "#d79921",
+    "gitlens.launchpadIndicatorBlockedColor": "#fb4934",
+    "gitlens.launchpadIndicatorBlockedHoverColor": "#cc241d",
+    "gitlens.launchpadIndicatorMergeableColor": "#b8bb26",
+    "gitlens.launchpadIndicatorMergeableHoverColor": "#98971a",
+    "gitlens.lineHighlightBackgroundColor": "#3c3836",
+    "gitlens.lineHighlightOverviewRulerColor": "#458588",
+    "gitlens.mergedPullRequestIconColor": "#b16286",
+    "gitlens.openAutolinkedIssueIconColor": "#98971a",
+    "gitlens.openPullRequestIconColor": "#98971a",
+    "gitlens.trailingLineBackgroundColor": "#282828a0",
+    "gitlens.trailingLineForegroundColor": "#928374a0",
+    "gitlens.unpublishedChangesIconColor": "#98971a",
+    "gitlens.unpublishedCommitIconColor": "#98971a",
+    "gitlens.unpulledChangesIconColor": "#fe8019",
+    "icon.foreground": "#ebdbb2",
+    "input.background": "#282828",
+    "input.border": "#3c3836",
+    "input.foreground": "#ebdbb2",
+    "input.placeholderForeground": "#ebdbb260",
+    "inputOption.activeBorder": "#ebdbb260",
+    "inputValidation.errorBackground": "#cc241d",
+    "inputValidation.errorBorder": "#fb4934",
+    "inputValidation.infoBackground": "#45858880",
+    "inputValidation.infoBorder": "#83a598",
+    "inputValidation.warningBackground": "#d79921",
+    "inputValidation.warningBorder": "#fabd2f",
+    "list.activeSelectionBackground": "#3c383680",
+    "list.activeSelectionForeground": "#8ec07c",
+    "list.dropBackground": "#3c3836",
+    "list.focusBackground": "#3c3836",
+    "list.focusForeground": "#ebdbb2",
+    "list.highlightForeground": "#689d6a",
+    "list.hoverBackground": "#3c383680",
+    "list.hoverForeground": "#d5c4a1",
+    "list.inactiveSelectionBackground": "#3c383680",
+    "list.inactiveSelectionForeground": "#689d6a",
+    "menu.border": "#3c3836",
+    "menu.separatorBackground": "#3c3836",
+    "merge.border": "#0000",
+    "merge.currentContentBackground": "#45858820",
+    "merge.currentHeaderBackground": "#45858840",
+    "merge.incomingContentBackground": "#689d6a20",
+    "merge.incomingHeaderBackground": "#689d6a40",
+    "notebook.cellBorderColor": "#504945",
+    "notebook.cellEditorBackground": "#3c3836",
+    "notebook.focusedCellBorder": "#a89984",
+    "notebook.focusedEditorBorder": "#504945",
+    "panel.border": "#3c3836",
+    "panelTitle.activeForeground": "#ebdbb2",
+    "peekView.border": "#3c3836",
+    "peekViewEditor.background": "#3c383670",
+    "peekViewEditor.matchHighlightBackground": "#504945",
+    "peekViewEditorGutter.background": "#3c383670",
+    "peekViewResult.background": "#3c383670",
+    "peekViewResult.fileForeground": "#ebdbb2",
+    "peekViewResult.lineForeground": "#ebdbb2",
+    "peekViewResult.matchHighlightBackground": "#504945",
+    "peekViewResult.selectionBackground": "#45858820",
+    "peekViewResult.selectionForeground": "#ebdbb2",
+    "peekViewTitle.background": "#3c383670",
+    "peekViewTitleDescription.foreground": "#bdae93",
+    "peekViewTitleLabel.foreground": "#ebdbb2",
+    "progressBar.background": "#689d6a",
+    "scmGraph.historyItemHoverDefaultLabelForeground": "#ebdbb2",
+    "scmGraph.historyItemHoverLabelForeground": "#ebdbb2",
+    "scrollbar.shadow": "#282828",
+    "scrollbarSlider.activeBackground": "#689d6a",
+    "scrollbarSlider.background": "#50494599",
+    "scrollbarSlider.hoverBackground": "#665c54",
+    "selection.background": "#689d6a80",
+    "sideBar.background": "#282828",
+    "sideBar.border": "#3c3836",
+    "sideBar.foreground": "#d5c4a1",
+    "sideBarSectionHeader.background": "#0000",
+    "sideBarSectionHeader.foreground": "#ebdbb2",
+    "sideBarTitle.foreground": "#ebdbb2",
+    "statusBar.background": "#282828",
+    "statusBar.border": "#3c3836",
+    "statusBar.debuggingBackground": "#fe8019",
+    "statusBar.debuggingBorder": "#0000",
+    "statusBar.debuggingForeground": "#282828",
+    "statusBar.foreground": "#ebdbb2",
+    "statusBar.noFolderBackground": "#282828",
+    "statusBar.noFolderBorder": "#0000",
+    "tab.activeBackground": "#3c3836",
+    "tab.activeBorder": "#689d6a",
+    "tab.activeForeground": "#ebdbb2",
+    "tab.border": "#0000",
+    "tab.inactiveBackground": "#282828",
+    "tab.inactiveForeground": "#a89984",
+    "tab.unfocusedActiveBorder": "#0000",
+    "tab.unfocusedActiveForeground": "#a89984",
+    "tab.unfocusedInactiveForeground": "#928374",
+    "terminal.ansiBlack": "#3c3836",
+    "terminal.ansiBlue": "#458588",
+    "terminal.ansiBrightBlack": "#928374",
+    "terminal.ansiBrightBlue": "#83a598",
+    "terminal.ansiBrightCyan": "#8ec07c",
+    "terminal.ansiBrightGreen": "#b8bb26",
+    "terminal.ansiBrightMagenta": "#d3869b",
+    "terminal.ansiBrightRed": "#fb4934",
+    "terminal.ansiBrightWhite": "#ebdbb2",
+    "terminal.ansiBrightYellow": "#fabd2f",
+    "terminal.ansiCyan": "#689d6a",
+    "terminal.ansiGreen": "#98971a",
+    "terminal.ansiMagenta": "#b16286",
+    "terminal.ansiRed": "#cc241d",
+    "terminal.ansiWhite": "#a89984",
+    "terminal.ansiYellow": "#d79921",
+    "terminal.background": "#282828",
+    "terminal.foreground": "#ebdbb2",
+    "textLink.activeForeground": "#458588",
+    "textLink.foreground": "#83a598",
+    "titleBar.activeBackground": "#282828",
+    "titleBar.activeForeground": "#ebdbb2",
+    "titleBar.inactiveBackground": "#282828",
+    "widget.shadow": "#28282830"
+  },
+  "displayName": "Gruvbox Dark Medium",
+  "name": "gruvbox-dark-medium",
+  "semanticHighlighting": true,
+  "semanticTokenColors": {
+    "component": "#fe8019",
+    "constant.builtin": "#d3869b",
+    "function": "#8ec07c",
+    "function.builtin": "#fe8019",
+    "method": "#8ec07c",
+    "parameter": "#83a598",
+    "property": "#83a598",
+    "property:python": "#ebdbb2",
+    "variable": "#ebdbb2"
+  },
+  "tokenColors": [
+    {
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "emphasis",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "strong",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "header",
+      "settings": {
+        "foreground": "#458588"
+      }
+    },
+    {
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": [
+        "constant",
+        "support.constant",
+        "variable.arguments"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": "constant.rgb-value",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "entity.name.selector",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag",
+        "punctuation.tag"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "invalid",
+        "invalid.illegal"
+      ],
+      "settings": {
+        "foreground": "#cc241d"
+      }
+    },
+    {
+      "scope": "invalid.deprecated",
+      "settings": {
+        "foreground": "#b16286"
+      }
+    },
+    {
+      "scope": "meta.selector",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "meta.preprocessor",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.string",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.numeric",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "meta.header.diff",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "storage",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "string",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "string.tag",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "string.value",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "string.regexp",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "string.escape",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "string.quasi",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "string.entity",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "object",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "module.node",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "support.type.property-name",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "keyword",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "keyword.control",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "keyword.control.module",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "keyword.control.less",
+      "settings": {
+        "foreground": "#d79921"
+      }
+    },
+    {
+      "scope": "keyword.operator",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "keyword.operator.new",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "keyword.other.unit",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "metatag.php",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "support.function.git-rebase",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "constant.sha.git-rebase",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "meta.type.name",
+        "meta.return.type",
+        "meta.return-type",
+        "meta.cast",
+        "meta.type.annotation",
+        "support.type",
+        "storage.type.cs",
+        "variable.class"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "variable.this",
+        "support.variable"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": [
+        "entity.name",
+        "entity.static",
+        "entity.name.class.static.function",
+        "entity.name.function",
+        "entity.name.class",
+        "entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "entity.function",
+        "entity.name.function.static"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "entity.name.function.function-call",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "support.function.builtin",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.method",
+        "entity.name.method.function-call",
+        "entity.name.static.function-call"
+      ],
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "brace",
+      "settings": {
+        "foreground": "#d5c4a1"
+      }
+    },
+    {
+      "scope": [
+        "meta.parameter.type.variable",
+        "variable.parameter",
+        "variable.name",
+        "variable.other",
+        "variable",
+        "string.constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "prototype",
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": [
+        "punctuation"
+      ],
+      "settings": {
+        "foreground": "#a89984"
+      }
+    },
+    {
+      "scope": "punctuation.quoted",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "punctuation.quasi",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.python",
+        "entity.name.function.python"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.python",
+        "storage.modifier.declaration",
+        "storage.type.class.python",
+        "storage.type.string.python"
+      ],
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.async.python"
+      ],
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "meta.function-call.generic",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "meta.function-call.arguments",
+      "settings": {
+        "foreground": "#d5c4a1"
+      }
+    },
+    {
+      "scope": "entity.name.function.decorator",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "constant.other.caps",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "keyword.operator.logical",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "punctuation.definition.logical-expression",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "string.interpolated.dollar.shell",
+        "string.interpolated.backtick.shell"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "keyword.control.directive",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "support.function.C99",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.cs",
+        "entity.name.function.cs",
+        "entity.name.type.namespace.cs"
+      ],
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.using.cs",
+        "entity.name.variable.field.cs",
+        "entity.name.variable.local.cs",
+        "variable.other.readwrite.cs"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.this.cs",
+        "keyword.other.base.cs"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": "meta.scope.prerequisites",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "entity.name.function.target",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "storage.modifier.import.java",
+        "storage.modifier.package.java"
+      ],
+      "settings": {
+        "foreground": "#bdae93"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.import.java",
+        "keyword.other.package.java"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "storage.type.java",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "storage.type.annotation",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "keyword.other.documentation.javadoc",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "comment.block.javadoc variable.parameter.java",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.java variable.other.object",
+        "source.java variable.other.definition.java"
+      ],
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "meta.function-parameters.lisp",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "markup.underline",
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": "string.other.link.title.markdown",
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": "markup.underline.link",
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": "markup.bold",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "markup.heading",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "markup.italic",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "markup.inserted",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "markup.deleted",
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": "markup.changed",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "markup.punctuation.quote.beginning",
+      "settings": {
+        "foreground": "#98971a"
+      }
+    },
+    {
+      "scope": "markup.punctuation.list.beginning",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "markup.inline.raw",
+        "markup.fenced_code.block"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "string.quoted.double.json",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.css",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "source.css meta.selector",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "support.type.property-name.css",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.class",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.css support.function.transform",
+        "source.css support.function.timing-function",
+        "source.css support.function.misc"
+      ],
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "support.property-value",
+        "constant.rgb-value",
+        "support.property-value.scss",
+        "constant.rgb-value.scss"
+      ],
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag.css"
+      ],
+      "settings": {
+        "fontStyle": ""
+      }
+    },
+    {
+      "scope": [
+        "punctuation.definition.tag"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "text.html entity.name.tag",
+        "text.html punctuation.tag"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "source.js variable.language"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.ts variable.language"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.go storage.type"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.import"
+      ],
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.package",
+        "source.go keyword.import"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.interface",
+        "source.go keyword.struct"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": [
+        "keyword.control.cucumber.table"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "source.reason string.double",
+        "source.reason string.regexp"
+      ],
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.reason keyword.control.less"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "source.reason entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "source.reason support.property-value",
+        "source.reason entity.name.filename"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell variable.other.member.powershell"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.powershell"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.attribute.powershell"
+      ],
+      "settings": {
+        "foreground": "#bdae93"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell meta.hashtable.assignment.powershell variable.other.readwrite.powershell"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    }
+  ],
+  "type": "dark"
+}
diff --git a/resources/themes/gruvbox-dark-soft.json b/resources/themes/gruvbox-dark-soft.json
new file mode 100644
index 0000000..ae4be91
--- /dev/null
+++ b/resources/themes/gruvbox-dark-soft.json
@@ -0,0 +1,1132 @@
+{
+  "colors": {
+    "activityBar.background": "#32302f",
+    "activityBar.border": "#3c3836",
+    "activityBar.foreground": "#ebdbb2",
+    "activityBarBadge.background": "#458588",
+    "activityBarBadge.foreground": "#ebdbb2",
+    "activityBarTop.background": "#32302f",
+    "activityBarTop.foreground": "#ebdbb2",
+    "badge.background": "#b16286",
+    "badge.foreground": "#ebdbb2",
+    "button.background": "#45858880",
+    "button.foreground": "#ebdbb2",
+    "button.hoverBackground": "#45858860",
+    "debugToolBar.background": "#32302f",
+    "diffEditor.insertedTextBackground": "#b8bb2630",
+    "diffEditor.removedTextBackground": "#fb493430",
+    "dropdown.background": "#32302f",
+    "dropdown.border": "#3c3836",
+    "dropdown.foreground": "#ebdbb2",
+    "editor.background": "#32302f",
+    "editor.findMatchBackground": "#83a59870",
+    "editor.findMatchHighlightBackground": "#fe801930",
+    "editor.findRangeHighlightBackground": "#83a59870",
+    "editor.foreground": "#ebdbb2",
+    "editor.hoverHighlightBackground": "#689d6a50",
+    "editor.lineHighlightBackground": "#3c383660",
+    "editor.lineHighlightBorder": "#0000",
+    "editor.selectionBackground": "#689d6a40",
+    "editor.selectionHighlightBackground": "#fabd2f40",
+    "editorBracketHighlight.foreground1": "#b16286",
+    "editorBracketHighlight.foreground2": "#458588",
+    "editorBracketHighlight.foreground3": "#689d6a",
+    "editorBracketHighlight.foreground4": "#98971a",
+    "editorBracketHighlight.foreground5": "#d79921",
+    "editorBracketHighlight.foreground6": "#d65d0e",
+    "editorBracketHighlight.unexpectedBracket.foreground": "#cc241d",
+    "editorBracketMatch.background": "#92837480",
+    "editorBracketMatch.border": "#0000",
+    "editorCodeLens.foreground": "#a8998490",
+    "editorCursor.foreground": "#ebdbb2",
+    "editorError.foreground": "#cc241d",
+    "editorGroup.border": "#3c3836",
+    "editorGroup.dropBackground": "#3c383660",
+    "editorGroupHeader.noTabsBackground": "#32302f",
+    "editorGroupHeader.tabsBackground": "#32302f",
+    "editorGroupHeader.tabsBorder": "#3c3836",
+    "editorGutter.addedBackground": "#b8bb26",
+    "editorGutter.background": "#0000",
+    "editorGutter.deletedBackground": "#fb4934",
+    "editorGutter.modifiedBackground": "#83a598",
+    "editorHoverWidget.background": "#32302f",
+    "editorHoverWidget.border": "#3c3836",
+    "editorInfo.foreground": "#458588",
+    "editorLineNumber.foreground": "#665c54",
+    "editorLink.activeForeground": "#ebdbb2",
+    "editorOverviewRuler.addedForeground": "#83a598",
+    "editorOverviewRuler.border": "#0000",
+    "editorOverviewRuler.commonContentForeground": "#928374",
+    "editorOverviewRuler.currentContentForeground": "#458588",
+    "editorOverviewRuler.deletedForeground": "#83a598",
+    "editorOverviewRuler.errorForeground": "#fb4934",
+    "editorOverviewRuler.findMatchForeground": "#bdae93",
+    "editorOverviewRuler.incomingContentForeground": "#689d6a",
+    "editorOverviewRuler.infoForeground": "#d3869b",
+    "editorOverviewRuler.modifiedForeground": "#83a598",
+    "editorOverviewRuler.rangeHighlightForeground": "#bdae93",
+    "editorOverviewRuler.selectionHighlightForeground": "#665c54",
+    "editorOverviewRuler.warningForeground": "#d79921",
+    "editorOverviewRuler.wordHighlightForeground": "#665c54",
+    "editorOverviewRuler.wordHighlightStrongForeground": "#665c54",
+    "editorRuler.foreground": "#a8998440",
+    "editorStickyScroll.shadow": "#50494599",
+    "editorStickyScrollHover.background": "#3c383660",
+    "editorSuggestWidget.background": "#32302f",
+    "editorSuggestWidget.border": "#3c3836",
+    "editorSuggestWidget.foreground": "#ebdbb2",
+    "editorSuggestWidget.highlightForeground": "#689d6a",
+    "editorSuggestWidget.selectedBackground": "#3c383660",
+    "editorWarning.foreground": "#d79921",
+    "editorWhitespace.foreground": "#a8998420",
+    "editorWidget.background": "#32302f",
+    "editorWidget.border": "#3c3836",
+    "errorForeground": "#fb4934",
+    "extensionButton.prominentBackground": "#b8bb2680",
+    "extensionButton.prominentHoverBackground": "#b8bb2630",
+    "focusBorder": "#3c3836",
+    "foreground": "#ebdbb2",
+    "gitDecoration.addedResourceForeground": "#ebdbb2",
+    "gitDecoration.conflictingResourceForeground": "#b16286",
+    "gitDecoration.deletedResourceForeground": "#cc241d",
+    "gitDecoration.ignoredResourceForeground": "#7c6f64",
+    "gitDecoration.modifiedResourceForeground": "#d79921",
+    "gitDecoration.untrackedResourceForeground": "#98971a",
+    "gitlens.closedAutolinkedIssueIconColor": "#b16286",
+    "gitlens.closedPullRequestIconColor": "#cc241d",
+    "gitlens.decorations.branchAheadForegroundColor": "#98971a",
+    "gitlens.decorations.branchBehindForegroundColor": "#d65d0e",
+    "gitlens.decorations.branchDivergedForegroundColor": "#d79921",
+    "gitlens.decorations.branchMissingUpstreamForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingConflictForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingForegroundColor": "#d79921",
+    "gitlens.decorations.workspaceCurrentForegroundColor": "#98971a",
+    "gitlens.decorations.workspaceRepoMissingForegroundColor": "#7c6f64",
+    "gitlens.decorations.workspaceRepoOpenForegroundColor": "#98971a",
+    "gitlens.decorations.worktreeHasUncommittedChangesForegroundColor": "#928374",
+    "gitlens.decorations.worktreeMissingForegroundColor": "#cc241d",
+    "gitlens.graphChangesColumnAddedColor": "#98971a",
+    "gitlens.graphChangesColumnDeletedColor": "#cc241d",
+    "gitlens.graphLane10Color": "#98971a",
+    "gitlens.graphLane1Color": "#83a598",
+    "gitlens.graphLane2Color": "#458588",
+    "gitlens.graphLane3Color": "#d3869b",
+    "gitlens.graphLane4Color": "#b16286",
+    "gitlens.graphLane5Color": "#8ec07c",
+    "gitlens.graphLane6Color": "#689d6a",
+    "gitlens.graphLane7Color": "#fabd2f",
+    "gitlens.graphLane8Color": "#d79921",
+    "gitlens.graphLane9Color": "#b8bb26",
+    "gitlens.graphMinimapMarkerHeadColor": "#98971a",
+    "gitlens.graphMinimapMarkerHighlightsColor": "#b8bb26",
+    "gitlens.graphMinimapMarkerLocalBranchesColor": "#83a598",
+    "gitlens.graphMinimapMarkerPullRequestsColor": "#fe8019",
+    "gitlens.graphMinimapMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphMinimapMarkerStashesColor": "#b16286",
+    "gitlens.graphMinimapMarkerTagsColor": "#7c6f64",
+    "gitlens.graphMinimapMarkerUpstreamColor": "#689d6a",
+    "gitlens.graphScrollMarkerHeadColor": "#b8bb26",
+    "gitlens.graphScrollMarkerHighlightsColor": "#d79921",
+    "gitlens.graphScrollMarkerLocalBranchesColor": "#83a598",
+    "gitlens.graphScrollMarkerPullRequestsColor": "#fe8019",
+    "gitlens.graphScrollMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphScrollMarkerStashesColor": "#b16286",
+    "gitlens.graphScrollMarkerTagsColor": "#7c6f64",
+    "gitlens.graphScrollMarkerUpstreamColor": "#8ec07c",
+    "gitlens.gutterBackgroundColor": "#3c3836",
+    "gitlens.gutterForegroundColor": "#ebdbb2",
+    "gitlens.gutterUncommittedForegroundColor": "#458588",
+    "gitlens.launchpadIndicatorAttentionColor": "#fabd2f",
+    "gitlens.launchpadIndicatorAttentionHoverColor": "#d79921",
+    "gitlens.launchpadIndicatorBlockedColor": "#fb4934",
+    "gitlens.launchpadIndicatorBlockedHoverColor": "#cc241d",
+    "gitlens.launchpadIndicatorMergeableColor": "#b8bb26",
+    "gitlens.launchpadIndicatorMergeableHoverColor": "#98971a",
+    "gitlens.lineHighlightBackgroundColor": "#3c3836",
+    "gitlens.lineHighlightOverviewRulerColor": "#458588",
+    "gitlens.mergedPullRequestIconColor": "#b16286",
+    "gitlens.openAutolinkedIssueIconColor": "#98971a",
+    "gitlens.openPullRequestIconColor": "#98971a",
+    "gitlens.trailingLineBackgroundColor": "#32302fa0",
+    "gitlens.trailingLineForegroundColor": "#928374a0",
+    "gitlens.unpublishedChangesIconColor": "#98971a",
+    "gitlens.unpublishedCommitIconColor": "#98971a",
+    "gitlens.unpulledChangesIconColor": "#fe8019",
+    "icon.foreground": "#ebdbb2",
+    "input.background": "#32302f",
+    "input.border": "#3c3836",
+    "input.foreground": "#ebdbb2",
+    "input.placeholderForeground": "#ebdbb260",
+    "inputOption.activeBorder": "#ebdbb260",
+    "inputValidation.errorBackground": "#cc241d",
+    "inputValidation.errorBorder": "#fb4934",
+    "inputValidation.infoBackground": "#45858880",
+    "inputValidation.infoBorder": "#83a598",
+    "inputValidation.warningBackground": "#d79921",
+    "inputValidation.warningBorder": "#fabd2f",
+    "list.activeSelectionBackground": "#3c383680",
+    "list.activeSelectionForeground": "#8ec07c",
+    "list.dropBackground": "#3c3836",
+    "list.focusBackground": "#3c3836",
+    "list.focusForeground": "#ebdbb2",
+    "list.highlightForeground": "#689d6a",
+    "list.hoverBackground": "#3c383680",
+    "list.hoverForeground": "#d5c4a1",
+    "list.inactiveSelectionBackground": "#3c383680",
+    "list.inactiveSelectionForeground": "#689d6a",
+    "menu.border": "#3c3836",
+    "menu.separatorBackground": "#3c3836",
+    "merge.border": "#0000",
+    "merge.currentContentBackground": "#45858820",
+    "merge.currentHeaderBackground": "#45858840",
+    "merge.incomingContentBackground": "#689d6a20",
+    "merge.incomingHeaderBackground": "#689d6a40",
+    "notebook.cellBorderColor": "#504945",
+    "notebook.cellEditorBackground": "#3c3836",
+    "notebook.focusedCellBorder": "#a89984",
+    "notebook.focusedEditorBorder": "#504945",
+    "panel.border": "#3c3836",
+    "panelTitle.activeForeground": "#ebdbb2",
+    "peekView.border": "#3c3836",
+    "peekViewEditor.background": "#3c383670",
+    "peekViewEditor.matchHighlightBackground": "#504945",
+    "peekViewEditorGutter.background": "#3c383670",
+    "peekViewResult.background": "#3c383670",
+    "peekViewResult.fileForeground": "#ebdbb2",
+    "peekViewResult.lineForeground": "#ebdbb2",
+    "peekViewResult.matchHighlightBackground": "#504945",
+    "peekViewResult.selectionBackground": "#45858820",
+    "peekViewResult.selectionForeground": "#ebdbb2",
+    "peekViewTitle.background": "#3c383670",
+    "peekViewTitleDescription.foreground": "#bdae93",
+    "peekViewTitleLabel.foreground": "#ebdbb2",
+    "progressBar.background": "#689d6a",
+    "scmGraph.historyItemHoverDefaultLabelForeground": "#ebdbb2",
+    "scmGraph.historyItemHoverLabelForeground": "#ebdbb2",
+    "scrollbar.shadow": "#32302f",
+    "scrollbarSlider.activeBackground": "#689d6a",
+    "scrollbarSlider.background": "#50494599",
+    "scrollbarSlider.hoverBackground": "#665c54",
+    "selection.background": "#689d6a80",
+    "sideBar.background": "#32302f",
+    "sideBar.border": "#3c3836",
+    "sideBar.foreground": "#d5c4a1",
+    "sideBarSectionHeader.background": "#0000",
+    "sideBarSectionHeader.foreground": "#ebdbb2",
+    "sideBarTitle.foreground": "#ebdbb2",
+    "statusBar.background": "#32302f",
+    "statusBar.border": "#3c3836",
+    "statusBar.debuggingBackground": "#fe8019",
+    "statusBar.debuggingBorder": "#0000",
+    "statusBar.debuggingForeground": "#32302f",
+    "statusBar.foreground": "#ebdbb2",
+    "statusBar.noFolderBackground": "#32302f",
+    "statusBar.noFolderBorder": "#0000",
+    "tab.activeBackground": "#3c3836",
+    "tab.activeBorder": "#689d6a",
+    "tab.activeForeground": "#ebdbb2",
+    "tab.border": "#0000",
+    "tab.inactiveBackground": "#32302f",
+    "tab.inactiveForeground": "#a89984",
+    "tab.unfocusedActiveBorder": "#0000",
+    "tab.unfocusedActiveForeground": "#a89984",
+    "tab.unfocusedInactiveForeground": "#928374",
+    "terminal.ansiBlack": "#3c3836",
+    "terminal.ansiBlue": "#458588",
+    "terminal.ansiBrightBlack": "#928374",
+    "terminal.ansiBrightBlue": "#83a598",
+    "terminal.ansiBrightCyan": "#8ec07c",
+    "terminal.ansiBrightGreen": "#b8bb26",
+    "terminal.ansiBrightMagenta": "#d3869b",
+    "terminal.ansiBrightRed": "#fb4934",
+    "terminal.ansiBrightWhite": "#ebdbb2",
+    "terminal.ansiBrightYellow": "#fabd2f",
+    "terminal.ansiCyan": "#689d6a",
+    "terminal.ansiGreen": "#98971a",
+    "terminal.ansiMagenta": "#b16286",
+    "terminal.ansiRed": "#cc241d",
+    "terminal.ansiWhite": "#a89984",
+    "terminal.ansiYellow": "#d79921",
+    "terminal.background": "#32302f",
+    "terminal.foreground": "#ebdbb2",
+    "textLink.activeForeground": "#458588",
+    "textLink.foreground": "#83a598",
+    "titleBar.activeBackground": "#32302f",
+    "titleBar.activeForeground": "#ebdbb2",
+    "titleBar.inactiveBackground": "#32302f",
+    "widget.shadow": "#32302f30"
+  },
+  "displayName": "Gruvbox Dark Soft",
+  "name": "gruvbox-dark-soft",
+  "semanticHighlighting": true,
+  "semanticTokenColors": {
+    "component": "#fe8019",
+    "constant.builtin": "#d3869b",
+    "function": "#8ec07c",
+    "function.builtin": "#fe8019",
+    "method": "#8ec07c",
+    "parameter": "#83a598",
+    "property": "#83a598",
+    "property:python": "#ebdbb2",
+    "variable": "#ebdbb2"
+  },
+  "tokenColors": [
+    {
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "emphasis",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "strong",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "header",
+      "settings": {
+        "foreground": "#458588"
+      }
+    },
+    {
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": [
+        "constant",
+        "support.constant",
+        "variable.arguments"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": "constant.rgb-value",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "entity.name.selector",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag",
+        "punctuation.tag"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "invalid",
+        "invalid.illegal"
+      ],
+      "settings": {
+        "foreground": "#cc241d"
+      }
+    },
+    {
+      "scope": "invalid.deprecated",
+      "settings": {
+        "foreground": "#b16286"
+      }
+    },
+    {
+      "scope": "meta.selector",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "meta.preprocessor",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.string",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.numeric",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "meta.header.diff",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "storage",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "string",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "string.tag",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "string.value",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "string.regexp",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "string.escape",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "string.quasi",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "string.entity",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "object",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "module.node",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "support.type.property-name",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "keyword",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "keyword.control",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "keyword.control.module",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "keyword.control.less",
+      "settings": {
+        "foreground": "#d79921"
+      }
+    },
+    {
+      "scope": "keyword.operator",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "keyword.operator.new",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "keyword.other.unit",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "metatag.php",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "support.function.git-rebase",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "constant.sha.git-rebase",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "meta.type.name",
+        "meta.return.type",
+        "meta.return-type",
+        "meta.cast",
+        "meta.type.annotation",
+        "support.type",
+        "storage.type.cs",
+        "variable.class"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "variable.this",
+        "support.variable"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": [
+        "entity.name",
+        "entity.static",
+        "entity.name.class.static.function",
+        "entity.name.function",
+        "entity.name.class",
+        "entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "entity.function",
+        "entity.name.function.static"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "entity.name.function.function-call",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "support.function.builtin",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.method",
+        "entity.name.method.function-call",
+        "entity.name.static.function-call"
+      ],
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "brace",
+      "settings": {
+        "foreground": "#d5c4a1"
+      }
+    },
+    {
+      "scope": [
+        "meta.parameter.type.variable",
+        "variable.parameter",
+        "variable.name",
+        "variable.other",
+        "variable",
+        "string.constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "prototype",
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": [
+        "punctuation"
+      ],
+      "settings": {
+        "foreground": "#a89984"
+      }
+    },
+    {
+      "scope": "punctuation.quoted",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "punctuation.quasi",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.python",
+        "entity.name.function.python"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.python",
+        "storage.modifier.declaration",
+        "storage.type.class.python",
+        "storage.type.string.python"
+      ],
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.async.python"
+      ],
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "meta.function-call.generic",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "meta.function-call.arguments",
+      "settings": {
+        "foreground": "#d5c4a1"
+      }
+    },
+    {
+      "scope": "entity.name.function.decorator",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "constant.other.caps",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "keyword.operator.logical",
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": "punctuation.definition.logical-expression",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "string.interpolated.dollar.shell",
+        "string.interpolated.backtick.shell"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "keyword.control.directive",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "support.function.C99",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.cs",
+        "entity.name.function.cs",
+        "entity.name.type.namespace.cs"
+      ],
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.using.cs",
+        "entity.name.variable.field.cs",
+        "entity.name.variable.local.cs",
+        "variable.other.readwrite.cs"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.this.cs",
+        "keyword.other.base.cs"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": "meta.scope.prerequisites",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "entity.name.function.target",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "storage.modifier.import.java",
+        "storage.modifier.package.java"
+      ],
+      "settings": {
+        "foreground": "#bdae93"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.import.java",
+        "keyword.other.package.java"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "storage.type.java",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "storage.type.annotation",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "keyword.other.documentation.javadoc",
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "comment.block.javadoc variable.parameter.java",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.java variable.other.object",
+        "source.java variable.other.definition.java"
+      ],
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "meta.function-parameters.lisp",
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": "markup.underline",
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": "string.other.link.title.markdown",
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": "markup.underline.link",
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": "markup.bold",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "markup.heading",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "markup.italic",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "markup.inserted",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": "markup.deleted",
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": "markup.changed",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "markup.punctuation.quote.beginning",
+      "settings": {
+        "foreground": "#98971a"
+      }
+    },
+    {
+      "scope": "markup.punctuation.list.beginning",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "markup.inline.raw",
+        "markup.fenced_code.block"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": "string.quoted.double.json",
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.css",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "source.css meta.selector",
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": "support.type.property-name.css",
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.class",
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.css support.function.transform",
+        "source.css support.function.timing-function",
+        "source.css support.function.misc"
+      ],
+      "settings": {
+        "foreground": "#fb4934"
+      }
+    },
+    {
+      "scope": [
+        "support.property-value",
+        "constant.rgb-value",
+        "support.property-value.scss",
+        "constant.rgb-value.scss"
+      ],
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag.css"
+      ],
+      "settings": {
+        "fontStyle": ""
+      }
+    },
+    {
+      "scope": [
+        "punctuation.definition.tag"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "text.html entity.name.tag",
+        "text.html punctuation.tag"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "source.js variable.language"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.ts variable.language"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.go storage.type"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.import"
+      ],
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.package",
+        "source.go keyword.import"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.interface",
+        "source.go keyword.struct"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#ebdbb2"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#d3869b"
+      }
+    },
+    {
+      "scope": [
+        "keyword.control.cucumber.table"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "source.reason string.double",
+        "source.reason string.regexp"
+      ],
+      "settings": {
+        "foreground": "#b8bb26"
+      }
+    },
+    {
+      "scope": [
+        "source.reason keyword.control.less"
+      ],
+      "settings": {
+        "foreground": "#8ec07c"
+      }
+    },
+    {
+      "scope": [
+        "source.reason entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#83a598"
+      }
+    },
+    {
+      "scope": [
+        "source.reason support.property-value",
+        "source.reason entity.name.filename"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell variable.other.member.powershell"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.powershell"
+      ],
+      "settings": {
+        "foreground": "#fabd2f"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.attribute.powershell"
+      ],
+      "settings": {
+        "foreground": "#bdae93"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell meta.hashtable.assignment.powershell variable.other.readwrite.powershell"
+      ],
+      "settings": {
+        "foreground": "#fe8019"
+      }
+    }
+  ],
+  "type": "dark"
+}
diff --git a/resources/themes/gruvbox-light-hard.json b/resources/themes/gruvbox-light-hard.json
new file mode 100644
index 0000000..ff2c80a
--- /dev/null
+++ b/resources/themes/gruvbox-light-hard.json
@@ -0,0 +1,1132 @@
+{
+  "colors": {
+    "activityBar.background": "#f9f5d7",
+    "activityBar.border": "#ebdbb2",
+    "activityBar.foreground": "#3c3836",
+    "activityBarBadge.background": "#458588",
+    "activityBarBadge.foreground": "#ebdbb2",
+    "activityBarTop.background": "#f9f5d7",
+    "activityBarTop.foreground": "#3c3836",
+    "badge.background": "#b16286",
+    "badge.foreground": "#ebdbb2",
+    "button.background": "#45858880",
+    "button.foreground": "#3c3836",
+    "button.hoverBackground": "#45858860",
+    "debugToolBar.background": "#f9f5d7",
+    "diffEditor.insertedTextBackground": "#79740e30",
+    "diffEditor.removedTextBackground": "#9d000630",
+    "dropdown.background": "#f9f5d7",
+    "dropdown.border": "#ebdbb2",
+    "dropdown.foreground": "#3c3836",
+    "editor.background": "#f9f5d7",
+    "editor.findMatchBackground": "#07667870",
+    "editor.findMatchHighlightBackground": "#af3a0330",
+    "editor.findRangeHighlightBackground": "#07667870",
+    "editor.foreground": "#3c3836",
+    "editor.hoverHighlightBackground": "#689d6a50",
+    "editor.lineHighlightBackground": "#ebdbb260",
+    "editor.lineHighlightBorder": "#0000",
+    "editor.selectionBackground": "#689d6a40",
+    "editor.selectionHighlightBackground": "#b5761440",
+    "editorBracketHighlight.foreground1": "#b16286",
+    "editorBracketHighlight.foreground2": "#458588",
+    "editorBracketHighlight.foreground3": "#689d6a",
+    "editorBracketHighlight.foreground4": "#98971a",
+    "editorBracketHighlight.foreground5": "#d79921",
+    "editorBracketHighlight.foreground6": "#d65d0e",
+    "editorBracketHighlight.unexpectedBracket.foreground": "#cc241d",
+    "editorBracketMatch.background": "#92837480",
+    "editorBracketMatch.border": "#0000",
+    "editorCodeLens.foreground": "#7c6f6490",
+    "editorCursor.foreground": "#3c3836",
+    "editorError.foreground": "#cc241d",
+    "editorGroup.border": "#ebdbb2",
+    "editorGroup.dropBackground": "#ebdbb260",
+    "editorGroupHeader.noTabsBackground": "#f9f5d7",
+    "editorGroupHeader.tabsBackground": "#f9f5d7",
+    "editorGroupHeader.tabsBorder": "#ebdbb2",
+    "editorGutter.addedBackground": "#79740e",
+    "editorGutter.background": "#0000",
+    "editorGutter.deletedBackground": "#9d0006",
+    "editorGutter.modifiedBackground": "#076678",
+    "editorHoverWidget.background": "#f9f5d7",
+    "editorHoverWidget.border": "#ebdbb2",
+    "editorInfo.foreground": "#458588",
+    "editorLineNumber.foreground": "#bdae93",
+    "editorLink.activeForeground": "#3c3836",
+    "editorOverviewRuler.addedForeground": "#076678",
+    "editorOverviewRuler.border": "#0000",
+    "editorOverviewRuler.commonContentForeground": "#928374",
+    "editorOverviewRuler.currentContentForeground": "#458588",
+    "editorOverviewRuler.deletedForeground": "#076678",
+    "editorOverviewRuler.errorForeground": "#9d0006",
+    "editorOverviewRuler.findMatchForeground": "#665c54",
+    "editorOverviewRuler.incomingContentForeground": "#689d6a",
+    "editorOverviewRuler.infoForeground": "#8f3f71",
+    "editorOverviewRuler.modifiedForeground": "#076678",
+    "editorOverviewRuler.rangeHighlightForeground": "#665c54",
+    "editorOverviewRuler.selectionHighlightForeground": "#bdae93",
+    "editorOverviewRuler.warningForeground": "#d79921",
+    "editorOverviewRuler.wordHighlightForeground": "#bdae93",
+    "editorOverviewRuler.wordHighlightStrongForeground": "#bdae93",
+    "editorRuler.foreground": "#7c6f6440",
+    "editorStickyScroll.shadow": "#d5c4a199",
+    "editorStickyScrollHover.background": "#ebdbb260",
+    "editorSuggestWidget.background": "#f9f5d7",
+    "editorSuggestWidget.border": "#ebdbb2",
+    "editorSuggestWidget.foreground": "#3c3836",
+    "editorSuggestWidget.highlightForeground": "#689d6a",
+    "editorSuggestWidget.selectedBackground": "#ebdbb260",
+    "editorWarning.foreground": "#d79921",
+    "editorWhitespace.foreground": "#7c6f6420",
+    "editorWidget.background": "#f9f5d7",
+    "editorWidget.border": "#ebdbb2",
+    "errorForeground": "#9d0006",
+    "extensionButton.prominentBackground": "#79740e80",
+    "extensionButton.prominentHoverBackground": "#79740e30",
+    "focusBorder": "#ebdbb2",
+    "foreground": "#3c3836",
+    "gitDecoration.addedResourceForeground": "#3c3836",
+    "gitDecoration.conflictingResourceForeground": "#b16286",
+    "gitDecoration.deletedResourceForeground": "#cc241d",
+    "gitDecoration.ignoredResourceForeground": "#a89984",
+    "gitDecoration.modifiedResourceForeground": "#d79921",
+    "gitDecoration.untrackedResourceForeground": "#98971a",
+    "gitlens.closedAutolinkedIssueIconColor": "#b16286",
+    "gitlens.closedPullRequestIconColor": "#cc241d",
+    "gitlens.decorations.branchAheadForegroundColor": "#98971a",
+    "gitlens.decorations.branchBehindForegroundColor": "#d65d0e",
+    "gitlens.decorations.branchDivergedForegroundColor": "#d79921",
+    "gitlens.decorations.branchMissingUpstreamForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingConflictForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingForegroundColor": "#d79921",
+    "gitlens.decorations.workspaceCurrentForegroundColor": "#98971a",
+    "gitlens.decorations.workspaceRepoMissingForegroundColor": "#a89984",
+    "gitlens.decorations.workspaceRepoOpenForegroundColor": "#98971a",
+    "gitlens.decorations.worktreeHasUncommittedChangesForegroundColor": "#928374",
+    "gitlens.decorations.worktreeMissingForegroundColor": "#cc241d",
+    "gitlens.graphChangesColumnAddedColor": "#98971a",
+    "gitlens.graphChangesColumnDeletedColor": "#cc241d",
+    "gitlens.graphLane10Color": "#98971a",
+    "gitlens.graphLane1Color": "#076678",
+    "gitlens.graphLane2Color": "#458588",
+    "gitlens.graphLane3Color": "#8f3f71",
+    "gitlens.graphLane4Color": "#b16286",
+    "gitlens.graphLane5Color": "#427b58",
+    "gitlens.graphLane6Color": "#689d6a",
+    "gitlens.graphLane7Color": "#b57614",
+    "gitlens.graphLane8Color": "#d79921",
+    "gitlens.graphLane9Color": "#79740e",
+    "gitlens.graphMinimapMarkerHeadColor": "#98971a",
+    "gitlens.graphMinimapMarkerHighlightsColor": "#79740e",
+    "gitlens.graphMinimapMarkerLocalBranchesColor": "#076678",
+    "gitlens.graphMinimapMarkerPullRequestsColor": "#af3a03",
+    "gitlens.graphMinimapMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphMinimapMarkerStashesColor": "#b16286",
+    "gitlens.graphMinimapMarkerTagsColor": "#a89984",
+    "gitlens.graphMinimapMarkerUpstreamColor": "#689d6a",
+    "gitlens.graphScrollMarkerHeadColor": "#79740e",
+    "gitlens.graphScrollMarkerHighlightsColor": "#d79921",
+    "gitlens.graphScrollMarkerLocalBranchesColor": "#076678",
+    "gitlens.graphScrollMarkerPullRequestsColor": "#af3a03",
+    "gitlens.graphScrollMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphScrollMarkerStashesColor": "#b16286",
+    "gitlens.graphScrollMarkerTagsColor": "#a89984",
+    "gitlens.graphScrollMarkerUpstreamColor": "#427b58",
+    "gitlens.gutterBackgroundColor": "#ebdbb2",
+    "gitlens.gutterForegroundColor": "#3c3836",
+    "gitlens.gutterUncommittedForegroundColor": "#458588",
+    "gitlens.launchpadIndicatorAttentionColor": "#b57614",
+    "gitlens.launchpadIndicatorAttentionHoverColor": "#d79921",
+    "gitlens.launchpadIndicatorBlockedColor": "#9d0006",
+    "gitlens.launchpadIndicatorBlockedHoverColor": "#cc241d",
+    "gitlens.launchpadIndicatorMergeableColor": "#79740e",
+    "gitlens.launchpadIndicatorMergeableHoverColor": "#98971a",
+    "gitlens.lineHighlightBackgroundColor": "#ebdbb2",
+    "gitlens.lineHighlightOverviewRulerColor": "#458588",
+    "gitlens.mergedPullRequestIconColor": "#b16286",
+    "gitlens.openAutolinkedIssueIconColor": "#98971a",
+    "gitlens.openPullRequestIconColor": "#98971a",
+    "gitlens.trailingLineBackgroundColor": "#f9f5d7a0",
+    "gitlens.trailingLineForegroundColor": "#928374a0",
+    "gitlens.unpublishedChangesIconColor": "#98971a",
+    "gitlens.unpublishedCommitIconColor": "#98971a",
+    "gitlens.unpulledChangesIconColor": "#af3a03",
+    "icon.foreground": "#3c3836",
+    "input.background": "#f9f5d7",
+    "input.border": "#ebdbb2",
+    "input.foreground": "#3c3836",
+    "input.placeholderForeground": "#3c383660",
+    "inputOption.activeBorder": "#3c383660",
+    "inputValidation.errorBackground": "#cc241d",
+    "inputValidation.errorBorder": "#9d0006",
+    "inputValidation.infoBackground": "#45858880",
+    "inputValidation.infoBorder": "#076678",
+    "inputValidation.warningBackground": "#d79921",
+    "inputValidation.warningBorder": "#b57614",
+    "list.activeSelectionBackground": "#ebdbb280",
+    "list.activeSelectionForeground": "#427b58",
+    "list.dropBackground": "#ebdbb2",
+    "list.focusBackground": "#ebdbb2",
+    "list.focusForeground": "#3c3836",
+    "list.highlightForeground": "#689d6a",
+    "list.hoverBackground": "#ebdbb280",
+    "list.hoverForeground": "#504945",
+    "list.inactiveSelectionBackground": "#ebdbb280",
+    "list.inactiveSelectionForeground": "#689d6a",
+    "menu.border": "#ebdbb2",
+    "menu.separatorBackground": "#ebdbb2",
+    "merge.border": "#0000",
+    "merge.currentContentBackground": "#45858820",
+    "merge.currentHeaderBackground": "#45858840",
+    "merge.incomingContentBackground": "#689d6a20",
+    "merge.incomingHeaderBackground": "#689d6a40",
+    "notebook.cellBorderColor": "#d5c4a1",
+    "notebook.cellEditorBackground": "#ebdbb2",
+    "notebook.focusedCellBorder": "#7c6f64",
+    "notebook.focusedEditorBorder": "#d5c4a1",
+    "panel.border": "#ebdbb2",
+    "panelTitle.activeForeground": "#3c3836",
+    "peekView.border": "#ebdbb2",
+    "peekViewEditor.background": "#ebdbb270",
+    "peekViewEditor.matchHighlightBackground": "#d5c4a1",
+    "peekViewEditorGutter.background": "#ebdbb270",
+    "peekViewResult.background": "#ebdbb270",
+    "peekViewResult.fileForeground": "#3c3836",
+    "peekViewResult.lineForeground": "#3c3836",
+    "peekViewResult.matchHighlightBackground": "#d5c4a1",
+    "peekViewResult.selectionBackground": "#45858820",
+    "peekViewResult.selectionForeground": "#3c3836",
+    "peekViewTitle.background": "#ebdbb270",
+    "peekViewTitleDescription.foreground": "#665c54",
+    "peekViewTitleLabel.foreground": "#3c3836",
+    "progressBar.background": "#689d6a",
+    "scmGraph.historyItemHoverDefaultLabelForeground": "#ebdbb2",
+    "scmGraph.historyItemHoverLabelForeground": "#ebdbb2",
+    "scrollbar.shadow": "#f9f5d7",
+    "scrollbarSlider.activeBackground": "#689d6a",
+    "scrollbarSlider.background": "#d5c4a199",
+    "scrollbarSlider.hoverBackground": "#bdae93",
+    "selection.background": "#689d6a80",
+    "sideBar.background": "#f9f5d7",
+    "sideBar.border": "#ebdbb2",
+    "sideBar.foreground": "#504945",
+    "sideBarSectionHeader.background": "#0000",
+    "sideBarSectionHeader.foreground": "#3c3836",
+    "sideBarTitle.foreground": "#3c3836",
+    "statusBar.background": "#f9f5d7",
+    "statusBar.border": "#ebdbb2",
+    "statusBar.debuggingBackground": "#af3a03",
+    "statusBar.debuggingBorder": "#0000",
+    "statusBar.debuggingForeground": "#f9f5d7",
+    "statusBar.foreground": "#3c3836",
+    "statusBar.noFolderBackground": "#f9f5d7",
+    "statusBar.noFolderBorder": "#0000",
+    "tab.activeBackground": "#ebdbb2",
+    "tab.activeBorder": "#689d6a",
+    "tab.activeForeground": "#3c3836",
+    "tab.border": "#0000",
+    "tab.inactiveBackground": "#f9f5d7",
+    "tab.inactiveForeground": "#7c6f64",
+    "tab.unfocusedActiveBorder": "#0000",
+    "tab.unfocusedActiveForeground": "#7c6f64",
+    "tab.unfocusedInactiveForeground": "#928374",
+    "terminal.ansiBlack": "#ebdbb2",
+    "terminal.ansiBlue": "#458588",
+    "terminal.ansiBrightBlack": "#928374",
+    "terminal.ansiBrightBlue": "#076678",
+    "terminal.ansiBrightCyan": "#427b58",
+    "terminal.ansiBrightGreen": "#79740e",
+    "terminal.ansiBrightMagenta": "#8f3f71",
+    "terminal.ansiBrightRed": "#9d0006",
+    "terminal.ansiBrightWhite": "#3c3836",
+    "terminal.ansiBrightYellow": "#b57614",
+    "terminal.ansiCyan": "#689d6a",
+    "terminal.ansiGreen": "#98971a",
+    "terminal.ansiMagenta": "#b16286",
+    "terminal.ansiRed": "#cc241d",
+    "terminal.ansiWhite": "#7c6f64",
+    "terminal.ansiYellow": "#d79921",
+    "terminal.background": "#f9f5d7",
+    "terminal.foreground": "#3c3836",
+    "textLink.activeForeground": "#458588",
+    "textLink.foreground": "#076678",
+    "titleBar.activeBackground": "#f9f5d7",
+    "titleBar.activeForeground": "#3c3836",
+    "titleBar.inactiveBackground": "#f9f5d7",
+    "widget.shadow": "#f9f5d730"
+  },
+  "displayName": "Gruvbox Light Hard",
+  "name": "gruvbox-light-hard",
+  "semanticHighlighting": true,
+  "semanticTokenColors": {
+    "component": "#af3a03",
+    "constant.builtin": "#8f3f71",
+    "function": "#427b58",
+    "function.builtin": "#af3a03",
+    "method": "#427b58",
+    "parameter": "#076678",
+    "property": "#076678",
+    "property:python": "#3c3836",
+    "variable": "#3c3836"
+  },
+  "tokenColors": [
+    {
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "emphasis",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "strong",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "header",
+      "settings": {
+        "foreground": "#458588"
+      }
+    },
+    {
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": [
+        "constant",
+        "support.constant",
+        "variable.arguments"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": "constant.rgb-value",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "entity.name.selector",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag",
+        "punctuation.tag"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "invalid",
+        "invalid.illegal"
+      ],
+      "settings": {
+        "foreground": "#cc241d"
+      }
+    },
+    {
+      "scope": "invalid.deprecated",
+      "settings": {
+        "foreground": "#b16286"
+      }
+    },
+    {
+      "scope": "meta.selector",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "meta.preprocessor",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.string",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.numeric",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "meta.header.diff",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "storage",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "string",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "string.tag",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "string.value",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "string.regexp",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "string.escape",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "string.quasi",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "string.entity",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "object",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "module.node",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "support.type.property-name",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "keyword",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "keyword.control",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "keyword.control.module",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "keyword.control.less",
+      "settings": {
+        "foreground": "#d79921"
+      }
+    },
+    {
+      "scope": "keyword.operator",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "keyword.operator.new",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "keyword.other.unit",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "metatag.php",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "support.function.git-rebase",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "constant.sha.git-rebase",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "meta.type.name",
+        "meta.return.type",
+        "meta.return-type",
+        "meta.cast",
+        "meta.type.annotation",
+        "support.type",
+        "storage.type.cs",
+        "variable.class"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "variable.this",
+        "support.variable"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": [
+        "entity.name",
+        "entity.static",
+        "entity.name.class.static.function",
+        "entity.name.function",
+        "entity.name.class",
+        "entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "entity.function",
+        "entity.name.function.static"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "entity.name.function.function-call",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "support.function.builtin",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.method",
+        "entity.name.method.function-call",
+        "entity.name.static.function-call"
+      ],
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "brace",
+      "settings": {
+        "foreground": "#504945"
+      }
+    },
+    {
+      "scope": [
+        "meta.parameter.type.variable",
+        "variable.parameter",
+        "variable.name",
+        "variable.other",
+        "variable",
+        "string.constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "prototype",
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": [
+        "punctuation"
+      ],
+      "settings": {
+        "foreground": "#7c6f64"
+      }
+    },
+    {
+      "scope": "punctuation.quoted",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "punctuation.quasi",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.python",
+        "entity.name.function.python"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.python",
+        "storage.modifier.declaration",
+        "storage.type.class.python",
+        "storage.type.string.python"
+      ],
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.async.python"
+      ],
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "meta.function-call.generic",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "meta.function-call.arguments",
+      "settings": {
+        "foreground": "#504945"
+      }
+    },
+    {
+      "scope": "entity.name.function.decorator",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "constant.other.caps",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "keyword.operator.logical",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "punctuation.definition.logical-expression",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "string.interpolated.dollar.shell",
+        "string.interpolated.backtick.shell"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "keyword.control.directive",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "support.function.C99",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.cs",
+        "entity.name.function.cs",
+        "entity.name.type.namespace.cs"
+      ],
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.using.cs",
+        "entity.name.variable.field.cs",
+        "entity.name.variable.local.cs",
+        "variable.other.readwrite.cs"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.this.cs",
+        "keyword.other.base.cs"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": "meta.scope.prerequisites",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "entity.name.function.target",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "storage.modifier.import.java",
+        "storage.modifier.package.java"
+      ],
+      "settings": {
+        "foreground": "#665c54"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.import.java",
+        "keyword.other.package.java"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "storage.type.java",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "storage.type.annotation",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "keyword.other.documentation.javadoc",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "comment.block.javadoc variable.parameter.java",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.java variable.other.object",
+        "source.java variable.other.definition.java"
+      ],
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "meta.function-parameters.lisp",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "markup.underline",
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": "string.other.link.title.markdown",
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": "markup.underline.link",
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": "markup.bold",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "markup.heading",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "markup.italic",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "markup.inserted",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "markup.deleted",
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": "markup.changed",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "markup.punctuation.quote.beginning",
+      "settings": {
+        "foreground": "#98971a"
+      }
+    },
+    {
+      "scope": "markup.punctuation.list.beginning",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "markup.inline.raw",
+        "markup.fenced_code.block"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "string.quoted.double.json",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.css",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "source.css meta.selector",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "support.type.property-name.css",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.class",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.css support.function.transform",
+        "source.css support.function.timing-function",
+        "source.css support.function.misc"
+      ],
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "support.property-value",
+        "constant.rgb-value",
+        "support.property-value.scss",
+        "constant.rgb-value.scss"
+      ],
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag.css"
+      ],
+      "settings": {
+        "fontStyle": ""
+      }
+    },
+    {
+      "scope": [
+        "punctuation.definition.tag"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "text.html entity.name.tag",
+        "text.html punctuation.tag"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "source.js variable.language"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.ts variable.language"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.go storage.type"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.import"
+      ],
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.package",
+        "source.go keyword.import"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.interface",
+        "source.go keyword.struct"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": [
+        "keyword.control.cucumber.table"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "source.reason string.double",
+        "source.reason string.regexp"
+      ],
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.reason keyword.control.less"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "source.reason entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "source.reason support.property-value",
+        "source.reason entity.name.filename"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell variable.other.member.powershell"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.powershell"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.attribute.powershell"
+      ],
+      "settings": {
+        "foreground": "#665c54"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell meta.hashtable.assignment.powershell variable.other.readwrite.powershell"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    }
+  ],
+  "type": "light"
+}
diff --git a/resources/themes/gruvbox-light-medium.json b/resources/themes/gruvbox-light-medium.json
new file mode 100644
index 0000000..5b9b980
--- /dev/null
+++ b/resources/themes/gruvbox-light-medium.json
@@ -0,0 +1,1132 @@
+{
+  "colors": {
+    "activityBar.background": "#fbf1c7",
+    "activityBar.border": "#ebdbb2",
+    "activityBar.foreground": "#3c3836",
+    "activityBarBadge.background": "#458588",
+    "activityBarBadge.foreground": "#ebdbb2",
+    "activityBarTop.background": "#fbf1c7",
+    "activityBarTop.foreground": "#3c3836",
+    "badge.background": "#b16286",
+    "badge.foreground": "#ebdbb2",
+    "button.background": "#45858880",
+    "button.foreground": "#3c3836",
+    "button.hoverBackground": "#45858860",
+    "debugToolBar.background": "#fbf1c7",
+    "diffEditor.insertedTextBackground": "#79740e30",
+    "diffEditor.removedTextBackground": "#9d000630",
+    "dropdown.background": "#fbf1c7",
+    "dropdown.border": "#ebdbb2",
+    "dropdown.foreground": "#3c3836",
+    "editor.background": "#fbf1c7",
+    "editor.findMatchBackground": "#07667870",
+    "editor.findMatchHighlightBackground": "#af3a0330",
+    "editor.findRangeHighlightBackground": "#07667870",
+    "editor.foreground": "#3c3836",
+    "editor.hoverHighlightBackground": "#689d6a50",
+    "editor.lineHighlightBackground": "#ebdbb260",
+    "editor.lineHighlightBorder": "#0000",
+    "editor.selectionBackground": "#689d6a40",
+    "editor.selectionHighlightBackground": "#b5761440",
+    "editorBracketHighlight.foreground1": "#b16286",
+    "editorBracketHighlight.foreground2": "#458588",
+    "editorBracketHighlight.foreground3": "#689d6a",
+    "editorBracketHighlight.foreground4": "#98971a",
+    "editorBracketHighlight.foreground5": "#d79921",
+    "editorBracketHighlight.foreground6": "#d65d0e",
+    "editorBracketHighlight.unexpectedBracket.foreground": "#cc241d",
+    "editorBracketMatch.background": "#92837480",
+    "editorBracketMatch.border": "#0000",
+    "editorCodeLens.foreground": "#7c6f6490",
+    "editorCursor.foreground": "#3c3836",
+    "editorError.foreground": "#cc241d",
+    "editorGroup.border": "#ebdbb2",
+    "editorGroup.dropBackground": "#ebdbb260",
+    "editorGroupHeader.noTabsBackground": "#fbf1c7",
+    "editorGroupHeader.tabsBackground": "#fbf1c7",
+    "editorGroupHeader.tabsBorder": "#ebdbb2",
+    "editorGutter.addedBackground": "#79740e",
+    "editorGutter.background": "#0000",
+    "editorGutter.deletedBackground": "#9d0006",
+    "editorGutter.modifiedBackground": "#076678",
+    "editorHoverWidget.background": "#fbf1c7",
+    "editorHoverWidget.border": "#ebdbb2",
+    "editorInfo.foreground": "#458588",
+    "editorLineNumber.foreground": "#bdae93",
+    "editorLink.activeForeground": "#3c3836",
+    "editorOverviewRuler.addedForeground": "#076678",
+    "editorOverviewRuler.border": "#0000",
+    "editorOverviewRuler.commonContentForeground": "#928374",
+    "editorOverviewRuler.currentContentForeground": "#458588",
+    "editorOverviewRuler.deletedForeground": "#076678",
+    "editorOverviewRuler.errorForeground": "#9d0006",
+    "editorOverviewRuler.findMatchForeground": "#665c54",
+    "editorOverviewRuler.incomingContentForeground": "#689d6a",
+    "editorOverviewRuler.infoForeground": "#8f3f71",
+    "editorOverviewRuler.modifiedForeground": "#076678",
+    "editorOverviewRuler.rangeHighlightForeground": "#665c54",
+    "editorOverviewRuler.selectionHighlightForeground": "#bdae93",
+    "editorOverviewRuler.warningForeground": "#d79921",
+    "editorOverviewRuler.wordHighlightForeground": "#bdae93",
+    "editorOverviewRuler.wordHighlightStrongForeground": "#bdae93",
+    "editorRuler.foreground": "#7c6f6440",
+    "editorStickyScroll.shadow": "#d5c4a199",
+    "editorStickyScrollHover.background": "#ebdbb260",
+    "editorSuggestWidget.background": "#fbf1c7",
+    "editorSuggestWidget.border": "#ebdbb2",
+    "editorSuggestWidget.foreground": "#3c3836",
+    "editorSuggestWidget.highlightForeground": "#689d6a",
+    "editorSuggestWidget.selectedBackground": "#ebdbb260",
+    "editorWarning.foreground": "#d79921",
+    "editorWhitespace.foreground": "#7c6f6420",
+    "editorWidget.background": "#fbf1c7",
+    "editorWidget.border": "#ebdbb2",
+    "errorForeground": "#9d0006",
+    "extensionButton.prominentBackground": "#79740e80",
+    "extensionButton.prominentHoverBackground": "#79740e30",
+    "focusBorder": "#ebdbb2",
+    "foreground": "#3c3836",
+    "gitDecoration.addedResourceForeground": "#3c3836",
+    "gitDecoration.conflictingResourceForeground": "#b16286",
+    "gitDecoration.deletedResourceForeground": "#cc241d",
+    "gitDecoration.ignoredResourceForeground": "#a89984",
+    "gitDecoration.modifiedResourceForeground": "#d79921",
+    "gitDecoration.untrackedResourceForeground": "#98971a",
+    "gitlens.closedAutolinkedIssueIconColor": "#b16286",
+    "gitlens.closedPullRequestIconColor": "#cc241d",
+    "gitlens.decorations.branchAheadForegroundColor": "#98971a",
+    "gitlens.decorations.branchBehindForegroundColor": "#d65d0e",
+    "gitlens.decorations.branchDivergedForegroundColor": "#d79921",
+    "gitlens.decorations.branchMissingUpstreamForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingConflictForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingForegroundColor": "#d79921",
+    "gitlens.decorations.workspaceCurrentForegroundColor": "#98971a",
+    "gitlens.decorations.workspaceRepoMissingForegroundColor": "#a89984",
+    "gitlens.decorations.workspaceRepoOpenForegroundColor": "#98971a",
+    "gitlens.decorations.worktreeHasUncommittedChangesForegroundColor": "#928374",
+    "gitlens.decorations.worktreeMissingForegroundColor": "#cc241d",
+    "gitlens.graphChangesColumnAddedColor": "#98971a",
+    "gitlens.graphChangesColumnDeletedColor": "#cc241d",
+    "gitlens.graphLane10Color": "#98971a",
+    "gitlens.graphLane1Color": "#076678",
+    "gitlens.graphLane2Color": "#458588",
+    "gitlens.graphLane3Color": "#8f3f71",
+    "gitlens.graphLane4Color": "#b16286",
+    "gitlens.graphLane5Color": "#427b58",
+    "gitlens.graphLane6Color": "#689d6a",
+    "gitlens.graphLane7Color": "#b57614",
+    "gitlens.graphLane8Color": "#d79921",
+    "gitlens.graphLane9Color": "#79740e",
+    "gitlens.graphMinimapMarkerHeadColor": "#98971a",
+    "gitlens.graphMinimapMarkerHighlightsColor": "#79740e",
+    "gitlens.graphMinimapMarkerLocalBranchesColor": "#076678",
+    "gitlens.graphMinimapMarkerPullRequestsColor": "#af3a03",
+    "gitlens.graphMinimapMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphMinimapMarkerStashesColor": "#b16286",
+    "gitlens.graphMinimapMarkerTagsColor": "#a89984",
+    "gitlens.graphMinimapMarkerUpstreamColor": "#689d6a",
+    "gitlens.graphScrollMarkerHeadColor": "#79740e",
+    "gitlens.graphScrollMarkerHighlightsColor": "#d79921",
+    "gitlens.graphScrollMarkerLocalBranchesColor": "#076678",
+    "gitlens.graphScrollMarkerPullRequestsColor": "#af3a03",
+    "gitlens.graphScrollMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphScrollMarkerStashesColor": "#b16286",
+    "gitlens.graphScrollMarkerTagsColor": "#a89984",
+    "gitlens.graphScrollMarkerUpstreamColor": "#427b58",
+    "gitlens.gutterBackgroundColor": "#ebdbb2",
+    "gitlens.gutterForegroundColor": "#3c3836",
+    "gitlens.gutterUncommittedForegroundColor": "#458588",
+    "gitlens.launchpadIndicatorAttentionColor": "#b57614",
+    "gitlens.launchpadIndicatorAttentionHoverColor": "#d79921",
+    "gitlens.launchpadIndicatorBlockedColor": "#9d0006",
+    "gitlens.launchpadIndicatorBlockedHoverColor": "#cc241d",
+    "gitlens.launchpadIndicatorMergeableColor": "#79740e",
+    "gitlens.launchpadIndicatorMergeableHoverColor": "#98971a",
+    "gitlens.lineHighlightBackgroundColor": "#ebdbb2",
+    "gitlens.lineHighlightOverviewRulerColor": "#458588",
+    "gitlens.mergedPullRequestIconColor": "#b16286",
+    "gitlens.openAutolinkedIssueIconColor": "#98971a",
+    "gitlens.openPullRequestIconColor": "#98971a",
+    "gitlens.trailingLineBackgroundColor": "#fbf1c7a0",
+    "gitlens.trailingLineForegroundColor": "#928374a0",
+    "gitlens.unpublishedChangesIconColor": "#98971a",
+    "gitlens.unpublishedCommitIconColor": "#98971a",
+    "gitlens.unpulledChangesIconColor": "#af3a03",
+    "icon.foreground": "#3c3836",
+    "input.background": "#fbf1c7",
+    "input.border": "#ebdbb2",
+    "input.foreground": "#3c3836",
+    "input.placeholderForeground": "#3c383660",
+    "inputOption.activeBorder": "#3c383660",
+    "inputValidation.errorBackground": "#cc241d",
+    "inputValidation.errorBorder": "#9d0006",
+    "inputValidation.infoBackground": "#45858880",
+    "inputValidation.infoBorder": "#076678",
+    "inputValidation.warningBackground": "#d79921",
+    "inputValidation.warningBorder": "#b57614",
+    "list.activeSelectionBackground": "#ebdbb280",
+    "list.activeSelectionForeground": "#427b58",
+    "list.dropBackground": "#ebdbb2",
+    "list.focusBackground": "#ebdbb2",
+    "list.focusForeground": "#3c3836",
+    "list.highlightForeground": "#689d6a",
+    "list.hoverBackground": "#ebdbb280",
+    "list.hoverForeground": "#504945",
+    "list.inactiveSelectionBackground": "#ebdbb280",
+    "list.inactiveSelectionForeground": "#689d6a",
+    "menu.border": "#ebdbb2",
+    "menu.separatorBackground": "#ebdbb2",
+    "merge.border": "#0000",
+    "merge.currentContentBackground": "#45858820",
+    "merge.currentHeaderBackground": "#45858840",
+    "merge.incomingContentBackground": "#689d6a20",
+    "merge.incomingHeaderBackground": "#689d6a40",
+    "notebook.cellBorderColor": "#d5c4a1",
+    "notebook.cellEditorBackground": "#ebdbb2",
+    "notebook.focusedCellBorder": "#7c6f64",
+    "notebook.focusedEditorBorder": "#d5c4a1",
+    "panel.border": "#ebdbb2",
+    "panelTitle.activeForeground": "#3c3836",
+    "peekView.border": "#ebdbb2",
+    "peekViewEditor.background": "#ebdbb270",
+    "peekViewEditor.matchHighlightBackground": "#d5c4a1",
+    "peekViewEditorGutter.background": "#ebdbb270",
+    "peekViewResult.background": "#ebdbb270",
+    "peekViewResult.fileForeground": "#3c3836",
+    "peekViewResult.lineForeground": "#3c3836",
+    "peekViewResult.matchHighlightBackground": "#d5c4a1",
+    "peekViewResult.selectionBackground": "#45858820",
+    "peekViewResult.selectionForeground": "#3c3836",
+    "peekViewTitle.background": "#ebdbb270",
+    "peekViewTitleDescription.foreground": "#665c54",
+    "peekViewTitleLabel.foreground": "#3c3836",
+    "progressBar.background": "#689d6a",
+    "scmGraph.historyItemHoverDefaultLabelForeground": "#ebdbb2",
+    "scmGraph.historyItemHoverLabelForeground": "#ebdbb2",
+    "scrollbar.shadow": "#fbf1c7",
+    "scrollbarSlider.activeBackground": "#689d6a",
+    "scrollbarSlider.background": "#d5c4a199",
+    "scrollbarSlider.hoverBackground": "#bdae93",
+    "selection.background": "#689d6a80",
+    "sideBar.background": "#fbf1c7",
+    "sideBar.border": "#ebdbb2",
+    "sideBar.foreground": "#504945",
+    "sideBarSectionHeader.background": "#0000",
+    "sideBarSectionHeader.foreground": "#3c3836",
+    "sideBarTitle.foreground": "#3c3836",
+    "statusBar.background": "#fbf1c7",
+    "statusBar.border": "#ebdbb2",
+    "statusBar.debuggingBackground": "#af3a03",
+    "statusBar.debuggingBorder": "#0000",
+    "statusBar.debuggingForeground": "#fbf1c7",
+    "statusBar.foreground": "#3c3836",
+    "statusBar.noFolderBackground": "#fbf1c7",
+    "statusBar.noFolderBorder": "#0000",
+    "tab.activeBackground": "#ebdbb2",
+    "tab.activeBorder": "#689d6a",
+    "tab.activeForeground": "#3c3836",
+    "tab.border": "#0000",
+    "tab.inactiveBackground": "#fbf1c7",
+    "tab.inactiveForeground": "#7c6f64",
+    "tab.unfocusedActiveBorder": "#0000",
+    "tab.unfocusedActiveForeground": "#7c6f64",
+    "tab.unfocusedInactiveForeground": "#928374",
+    "terminal.ansiBlack": "#ebdbb2",
+    "terminal.ansiBlue": "#458588",
+    "terminal.ansiBrightBlack": "#928374",
+    "terminal.ansiBrightBlue": "#076678",
+    "terminal.ansiBrightCyan": "#427b58",
+    "terminal.ansiBrightGreen": "#79740e",
+    "terminal.ansiBrightMagenta": "#8f3f71",
+    "terminal.ansiBrightRed": "#9d0006",
+    "terminal.ansiBrightWhite": "#3c3836",
+    "terminal.ansiBrightYellow": "#b57614",
+    "terminal.ansiCyan": "#689d6a",
+    "terminal.ansiGreen": "#98971a",
+    "terminal.ansiMagenta": "#b16286",
+    "terminal.ansiRed": "#cc241d",
+    "terminal.ansiWhite": "#7c6f64",
+    "terminal.ansiYellow": "#d79921",
+    "terminal.background": "#fbf1c7",
+    "terminal.foreground": "#3c3836",
+    "textLink.activeForeground": "#458588",
+    "textLink.foreground": "#076678",
+    "titleBar.activeBackground": "#fbf1c7",
+    "titleBar.activeForeground": "#3c3836",
+    "titleBar.inactiveBackground": "#fbf1c7",
+    "widget.shadow": "#fbf1c730"
+  },
+  "displayName": "Gruvbox Light Medium",
+  "name": "gruvbox-light-medium",
+  "semanticHighlighting": true,
+  "semanticTokenColors": {
+    "component": "#af3a03",
+    "constant.builtin": "#8f3f71",
+    "function": "#427b58",
+    "function.builtin": "#af3a03",
+    "method": "#427b58",
+    "parameter": "#076678",
+    "property": "#076678",
+    "property:python": "#3c3836",
+    "variable": "#3c3836"
+  },
+  "tokenColors": [
+    {
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "emphasis",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "strong",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "header",
+      "settings": {
+        "foreground": "#458588"
+      }
+    },
+    {
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": [
+        "constant",
+        "support.constant",
+        "variable.arguments"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": "constant.rgb-value",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "entity.name.selector",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag",
+        "punctuation.tag"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "invalid",
+        "invalid.illegal"
+      ],
+      "settings": {
+        "foreground": "#cc241d"
+      }
+    },
+    {
+      "scope": "invalid.deprecated",
+      "settings": {
+        "foreground": "#b16286"
+      }
+    },
+    {
+      "scope": "meta.selector",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "meta.preprocessor",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.string",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.numeric",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "meta.header.diff",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "storage",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "string",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "string.tag",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "string.value",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "string.regexp",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "string.escape",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "string.quasi",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "string.entity",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "object",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "module.node",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "support.type.property-name",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "keyword",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "keyword.control",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "keyword.control.module",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "keyword.control.less",
+      "settings": {
+        "foreground": "#d79921"
+      }
+    },
+    {
+      "scope": "keyword.operator",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "keyword.operator.new",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "keyword.other.unit",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "metatag.php",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "support.function.git-rebase",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "constant.sha.git-rebase",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "meta.type.name",
+        "meta.return.type",
+        "meta.return-type",
+        "meta.cast",
+        "meta.type.annotation",
+        "support.type",
+        "storage.type.cs",
+        "variable.class"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "variable.this",
+        "support.variable"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": [
+        "entity.name",
+        "entity.static",
+        "entity.name.class.static.function",
+        "entity.name.function",
+        "entity.name.class",
+        "entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "entity.function",
+        "entity.name.function.static"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "entity.name.function.function-call",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "support.function.builtin",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.method",
+        "entity.name.method.function-call",
+        "entity.name.static.function-call"
+      ],
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "brace",
+      "settings": {
+        "foreground": "#504945"
+      }
+    },
+    {
+      "scope": [
+        "meta.parameter.type.variable",
+        "variable.parameter",
+        "variable.name",
+        "variable.other",
+        "variable",
+        "string.constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "prototype",
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": [
+        "punctuation"
+      ],
+      "settings": {
+        "foreground": "#7c6f64"
+      }
+    },
+    {
+      "scope": "punctuation.quoted",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "punctuation.quasi",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.python",
+        "entity.name.function.python"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.python",
+        "storage.modifier.declaration",
+        "storage.type.class.python",
+        "storage.type.string.python"
+      ],
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.async.python"
+      ],
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "meta.function-call.generic",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "meta.function-call.arguments",
+      "settings": {
+        "foreground": "#504945"
+      }
+    },
+    {
+      "scope": "entity.name.function.decorator",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "constant.other.caps",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "keyword.operator.logical",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "punctuation.definition.logical-expression",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "string.interpolated.dollar.shell",
+        "string.interpolated.backtick.shell"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "keyword.control.directive",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "support.function.C99",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.cs",
+        "entity.name.function.cs",
+        "entity.name.type.namespace.cs"
+      ],
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.using.cs",
+        "entity.name.variable.field.cs",
+        "entity.name.variable.local.cs",
+        "variable.other.readwrite.cs"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.this.cs",
+        "keyword.other.base.cs"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": "meta.scope.prerequisites",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "entity.name.function.target",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "storage.modifier.import.java",
+        "storage.modifier.package.java"
+      ],
+      "settings": {
+        "foreground": "#665c54"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.import.java",
+        "keyword.other.package.java"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "storage.type.java",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "storage.type.annotation",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "keyword.other.documentation.javadoc",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "comment.block.javadoc variable.parameter.java",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.java variable.other.object",
+        "source.java variable.other.definition.java"
+      ],
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "meta.function-parameters.lisp",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "markup.underline",
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": "string.other.link.title.markdown",
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": "markup.underline.link",
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": "markup.bold",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "markup.heading",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "markup.italic",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "markup.inserted",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "markup.deleted",
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": "markup.changed",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "markup.punctuation.quote.beginning",
+      "settings": {
+        "foreground": "#98971a"
+      }
+    },
+    {
+      "scope": "markup.punctuation.list.beginning",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "markup.inline.raw",
+        "markup.fenced_code.block"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "string.quoted.double.json",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.css",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "source.css meta.selector",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "support.type.property-name.css",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.class",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.css support.function.transform",
+        "source.css support.function.timing-function",
+        "source.css support.function.misc"
+      ],
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "support.property-value",
+        "constant.rgb-value",
+        "support.property-value.scss",
+        "constant.rgb-value.scss"
+      ],
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag.css"
+      ],
+      "settings": {
+        "fontStyle": ""
+      }
+    },
+    {
+      "scope": [
+        "punctuation.definition.tag"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "text.html entity.name.tag",
+        "text.html punctuation.tag"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "source.js variable.language"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.ts variable.language"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.go storage.type"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.import"
+      ],
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.package",
+        "source.go keyword.import"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.interface",
+        "source.go keyword.struct"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": [
+        "keyword.control.cucumber.table"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "source.reason string.double",
+        "source.reason string.regexp"
+      ],
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.reason keyword.control.less"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "source.reason entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "source.reason support.property-value",
+        "source.reason entity.name.filename"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell variable.other.member.powershell"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.powershell"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.attribute.powershell"
+      ],
+      "settings": {
+        "foreground": "#665c54"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell meta.hashtable.assignment.powershell variable.other.readwrite.powershell"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    }
+  ],
+  "type": "light"
+}
diff --git a/resources/themes/gruvbox-light-soft.json b/resources/themes/gruvbox-light-soft.json
new file mode 100644
index 0000000..dd68289
--- /dev/null
+++ b/resources/themes/gruvbox-light-soft.json
@@ -0,0 +1,1132 @@
+{
+  "colors": {
+    "activityBar.background": "#f2e5bc",
+    "activityBar.border": "#ebdbb2",
+    "activityBar.foreground": "#3c3836",
+    "activityBarBadge.background": "#458588",
+    "activityBarBadge.foreground": "#ebdbb2",
+    "activityBarTop.background": "#f2e5bc",
+    "activityBarTop.foreground": "#3c3836",
+    "badge.background": "#b16286",
+    "badge.foreground": "#ebdbb2",
+    "button.background": "#45858880",
+    "button.foreground": "#3c3836",
+    "button.hoverBackground": "#45858860",
+    "debugToolBar.background": "#f2e5bc",
+    "diffEditor.insertedTextBackground": "#79740e30",
+    "diffEditor.removedTextBackground": "#9d000630",
+    "dropdown.background": "#f2e5bc",
+    "dropdown.border": "#ebdbb2",
+    "dropdown.foreground": "#3c3836",
+    "editor.background": "#f2e5bc",
+    "editor.findMatchBackground": "#07667870",
+    "editor.findMatchHighlightBackground": "#af3a0330",
+    "editor.findRangeHighlightBackground": "#07667870",
+    "editor.foreground": "#3c3836",
+    "editor.hoverHighlightBackground": "#689d6a50",
+    "editor.lineHighlightBackground": "#ebdbb260",
+    "editor.lineHighlightBorder": "#0000",
+    "editor.selectionBackground": "#689d6a40",
+    "editor.selectionHighlightBackground": "#b5761440",
+    "editorBracketHighlight.foreground1": "#b16286",
+    "editorBracketHighlight.foreground2": "#458588",
+    "editorBracketHighlight.foreground3": "#689d6a",
+    "editorBracketHighlight.foreground4": "#98971a",
+    "editorBracketHighlight.foreground5": "#d79921",
+    "editorBracketHighlight.foreground6": "#d65d0e",
+    "editorBracketHighlight.unexpectedBracket.foreground": "#cc241d",
+    "editorBracketMatch.background": "#92837480",
+    "editorBracketMatch.border": "#0000",
+    "editorCodeLens.foreground": "#7c6f6490",
+    "editorCursor.foreground": "#3c3836",
+    "editorError.foreground": "#cc241d",
+    "editorGroup.border": "#ebdbb2",
+    "editorGroup.dropBackground": "#ebdbb260",
+    "editorGroupHeader.noTabsBackground": "#f2e5bc",
+    "editorGroupHeader.tabsBackground": "#f2e5bc",
+    "editorGroupHeader.tabsBorder": "#ebdbb2",
+    "editorGutter.addedBackground": "#79740e",
+    "editorGutter.background": "#0000",
+    "editorGutter.deletedBackground": "#9d0006",
+    "editorGutter.modifiedBackground": "#076678",
+    "editorHoverWidget.background": "#f2e5bc",
+    "editorHoverWidget.border": "#ebdbb2",
+    "editorInfo.foreground": "#458588",
+    "editorLineNumber.foreground": "#bdae93",
+    "editorLink.activeForeground": "#3c3836",
+    "editorOverviewRuler.addedForeground": "#076678",
+    "editorOverviewRuler.border": "#0000",
+    "editorOverviewRuler.commonContentForeground": "#928374",
+    "editorOverviewRuler.currentContentForeground": "#458588",
+    "editorOverviewRuler.deletedForeground": "#076678",
+    "editorOverviewRuler.errorForeground": "#9d0006",
+    "editorOverviewRuler.findMatchForeground": "#665c54",
+    "editorOverviewRuler.incomingContentForeground": "#689d6a",
+    "editorOverviewRuler.infoForeground": "#8f3f71",
+    "editorOverviewRuler.modifiedForeground": "#076678",
+    "editorOverviewRuler.rangeHighlightForeground": "#665c54",
+    "editorOverviewRuler.selectionHighlightForeground": "#bdae93",
+    "editorOverviewRuler.warningForeground": "#d79921",
+    "editorOverviewRuler.wordHighlightForeground": "#bdae93",
+    "editorOverviewRuler.wordHighlightStrongForeground": "#bdae93",
+    "editorRuler.foreground": "#7c6f6440",
+    "editorStickyScroll.shadow": "#d5c4a199",
+    "editorStickyScrollHover.background": "#ebdbb260",
+    "editorSuggestWidget.background": "#f2e5bc",
+    "editorSuggestWidget.border": "#ebdbb2",
+    "editorSuggestWidget.foreground": "#3c3836",
+    "editorSuggestWidget.highlightForeground": "#689d6a",
+    "editorSuggestWidget.selectedBackground": "#ebdbb260",
+    "editorWarning.foreground": "#d79921",
+    "editorWhitespace.foreground": "#7c6f6420",
+    "editorWidget.background": "#f2e5bc",
+    "editorWidget.border": "#ebdbb2",
+    "errorForeground": "#9d0006",
+    "extensionButton.prominentBackground": "#79740e80",
+    "extensionButton.prominentHoverBackground": "#79740e30",
+    "focusBorder": "#ebdbb2",
+    "foreground": "#3c3836",
+    "gitDecoration.addedResourceForeground": "#3c3836",
+    "gitDecoration.conflictingResourceForeground": "#b16286",
+    "gitDecoration.deletedResourceForeground": "#cc241d",
+    "gitDecoration.ignoredResourceForeground": "#a89984",
+    "gitDecoration.modifiedResourceForeground": "#d79921",
+    "gitDecoration.untrackedResourceForeground": "#98971a",
+    "gitlens.closedAutolinkedIssueIconColor": "#b16286",
+    "gitlens.closedPullRequestIconColor": "#cc241d",
+    "gitlens.decorations.branchAheadForegroundColor": "#98971a",
+    "gitlens.decorations.branchBehindForegroundColor": "#d65d0e",
+    "gitlens.decorations.branchDivergedForegroundColor": "#d79921",
+    "gitlens.decorations.branchMissingUpstreamForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingConflictForegroundColor": "#cc241d",
+    "gitlens.decorations.statusMergingOrRebasingForegroundColor": "#d79921",
+    "gitlens.decorations.workspaceCurrentForegroundColor": "#98971a",
+    "gitlens.decorations.workspaceRepoMissingForegroundColor": "#a89984",
+    "gitlens.decorations.workspaceRepoOpenForegroundColor": "#98971a",
+    "gitlens.decorations.worktreeHasUncommittedChangesForegroundColor": "#928374",
+    "gitlens.decorations.worktreeMissingForegroundColor": "#cc241d",
+    "gitlens.graphChangesColumnAddedColor": "#98971a",
+    "gitlens.graphChangesColumnDeletedColor": "#cc241d",
+    "gitlens.graphLane10Color": "#98971a",
+    "gitlens.graphLane1Color": "#076678",
+    "gitlens.graphLane2Color": "#458588",
+    "gitlens.graphLane3Color": "#8f3f71",
+    "gitlens.graphLane4Color": "#b16286",
+    "gitlens.graphLane5Color": "#427b58",
+    "gitlens.graphLane6Color": "#689d6a",
+    "gitlens.graphLane7Color": "#b57614",
+    "gitlens.graphLane8Color": "#d79921",
+    "gitlens.graphLane9Color": "#79740e",
+    "gitlens.graphMinimapMarkerHeadColor": "#98971a",
+    "gitlens.graphMinimapMarkerHighlightsColor": "#79740e",
+    "gitlens.graphMinimapMarkerLocalBranchesColor": "#076678",
+    "gitlens.graphMinimapMarkerPullRequestsColor": "#af3a03",
+    "gitlens.graphMinimapMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphMinimapMarkerStashesColor": "#b16286",
+    "gitlens.graphMinimapMarkerTagsColor": "#a89984",
+    "gitlens.graphMinimapMarkerUpstreamColor": "#689d6a",
+    "gitlens.graphScrollMarkerHeadColor": "#79740e",
+    "gitlens.graphScrollMarkerHighlightsColor": "#d79921",
+    "gitlens.graphScrollMarkerLocalBranchesColor": "#076678",
+    "gitlens.graphScrollMarkerPullRequestsColor": "#af3a03",
+    "gitlens.graphScrollMarkerRemoteBranchesColor": "#458588",
+    "gitlens.graphScrollMarkerStashesColor": "#b16286",
+    "gitlens.graphScrollMarkerTagsColor": "#a89984",
+    "gitlens.graphScrollMarkerUpstreamColor": "#427b58",
+    "gitlens.gutterBackgroundColor": "#ebdbb2",
+    "gitlens.gutterForegroundColor": "#3c3836",
+    "gitlens.gutterUncommittedForegroundColor": "#458588",
+    "gitlens.launchpadIndicatorAttentionColor": "#b57614",
+    "gitlens.launchpadIndicatorAttentionHoverColor": "#d79921",
+    "gitlens.launchpadIndicatorBlockedColor": "#9d0006",
+    "gitlens.launchpadIndicatorBlockedHoverColor": "#cc241d",
+    "gitlens.launchpadIndicatorMergeableColor": "#79740e",
+    "gitlens.launchpadIndicatorMergeableHoverColor": "#98971a",
+    "gitlens.lineHighlightBackgroundColor": "#ebdbb2",
+    "gitlens.lineHighlightOverviewRulerColor": "#458588",
+    "gitlens.mergedPullRequestIconColor": "#b16286",
+    "gitlens.openAutolinkedIssueIconColor": "#98971a",
+    "gitlens.openPullRequestIconColor": "#98971a",
+    "gitlens.trailingLineBackgroundColor": "#f2e5bca0",
+    "gitlens.trailingLineForegroundColor": "#928374a0",
+    "gitlens.unpublishedChangesIconColor": "#98971a",
+    "gitlens.unpublishedCommitIconColor": "#98971a",
+    "gitlens.unpulledChangesIconColor": "#af3a03",
+    "icon.foreground": "#3c3836",
+    "input.background": "#f2e5bc",
+    "input.border": "#ebdbb2",
+    "input.foreground": "#3c3836",
+    "input.placeholderForeground": "#3c383660",
+    "inputOption.activeBorder": "#3c383660",
+    "inputValidation.errorBackground": "#cc241d",
+    "inputValidation.errorBorder": "#9d0006",
+    "inputValidation.infoBackground": "#45858880",
+    "inputValidation.infoBorder": "#076678",
+    "inputValidation.warningBackground": "#d79921",
+    "inputValidation.warningBorder": "#b57614",
+    "list.activeSelectionBackground": "#ebdbb280",
+    "list.activeSelectionForeground": "#427b58",
+    "list.dropBackground": "#ebdbb2",
+    "list.focusBackground": "#ebdbb2",
+    "list.focusForeground": "#3c3836",
+    "list.highlightForeground": "#689d6a",
+    "list.hoverBackground": "#ebdbb280",
+    "list.hoverForeground": "#504945",
+    "list.inactiveSelectionBackground": "#ebdbb280",
+    "list.inactiveSelectionForeground": "#689d6a",
+    "menu.border": "#ebdbb2",
+    "menu.separatorBackground": "#ebdbb2",
+    "merge.border": "#0000",
+    "merge.currentContentBackground": "#45858820",
+    "merge.currentHeaderBackground": "#45858840",
+    "merge.incomingContentBackground": "#689d6a20",
+    "merge.incomingHeaderBackground": "#689d6a40",
+    "notebook.cellBorderColor": "#d5c4a1",
+    "notebook.cellEditorBackground": "#ebdbb2",
+    "notebook.focusedCellBorder": "#7c6f64",
+    "notebook.focusedEditorBorder": "#d5c4a1",
+    "panel.border": "#ebdbb2",
+    "panelTitle.activeForeground": "#3c3836",
+    "peekView.border": "#ebdbb2",
+    "peekViewEditor.background": "#ebdbb270",
+    "peekViewEditor.matchHighlightBackground": "#d5c4a1",
+    "peekViewEditorGutter.background": "#ebdbb270",
+    "peekViewResult.background": "#ebdbb270",
+    "peekViewResult.fileForeground": "#3c3836",
+    "peekViewResult.lineForeground": "#3c3836",
+    "peekViewResult.matchHighlightBackground": "#d5c4a1",
+    "peekViewResult.selectionBackground": "#45858820",
+    "peekViewResult.selectionForeground": "#3c3836",
+    "peekViewTitle.background": "#ebdbb270",
+    "peekViewTitleDescription.foreground": "#665c54",
+    "peekViewTitleLabel.foreground": "#3c3836",
+    "progressBar.background": "#689d6a",
+    "scmGraph.historyItemHoverDefaultLabelForeground": "#ebdbb2",
+    "scmGraph.historyItemHoverLabelForeground": "#ebdbb2",
+    "scrollbar.shadow": "#f2e5bc",
+    "scrollbarSlider.activeBackground": "#689d6a",
+    "scrollbarSlider.background": "#d5c4a199",
+    "scrollbarSlider.hoverBackground": "#bdae93",
+    "selection.background": "#689d6a80",
+    "sideBar.background": "#f2e5bc",
+    "sideBar.border": "#ebdbb2",
+    "sideBar.foreground": "#504945",
+    "sideBarSectionHeader.background": "#0000",
+    "sideBarSectionHeader.foreground": "#3c3836",
+    "sideBarTitle.foreground": "#3c3836",
+    "statusBar.background": "#f2e5bc",
+    "statusBar.border": "#ebdbb2",
+    "statusBar.debuggingBackground": "#af3a03",
+    "statusBar.debuggingBorder": "#0000",
+    "statusBar.debuggingForeground": "#f2e5bc",
+    "statusBar.foreground": "#3c3836",
+    "statusBar.noFolderBackground": "#f2e5bc",
+    "statusBar.noFolderBorder": "#0000",
+    "tab.activeBackground": "#ebdbb2",
+    "tab.activeBorder": "#689d6a",
+    "tab.activeForeground": "#3c3836",
+    "tab.border": "#0000",
+    "tab.inactiveBackground": "#f2e5bc",
+    "tab.inactiveForeground": "#7c6f64",
+    "tab.unfocusedActiveBorder": "#0000",
+    "tab.unfocusedActiveForeground": "#7c6f64",
+    "tab.unfocusedInactiveForeground": "#928374",
+    "terminal.ansiBlack": "#ebdbb2",
+    "terminal.ansiBlue": "#458588",
+    "terminal.ansiBrightBlack": "#928374",
+    "terminal.ansiBrightBlue": "#076678",
+    "terminal.ansiBrightCyan": "#427b58",
+    "terminal.ansiBrightGreen": "#79740e",
+    "terminal.ansiBrightMagenta": "#8f3f71",
+    "terminal.ansiBrightRed": "#9d0006",
+    "terminal.ansiBrightWhite": "#3c3836",
+    "terminal.ansiBrightYellow": "#b57614",
+    "terminal.ansiCyan": "#689d6a",
+    "terminal.ansiGreen": "#98971a",
+    "terminal.ansiMagenta": "#b16286",
+    "terminal.ansiRed": "#cc241d",
+    "terminal.ansiWhite": "#7c6f64",
+    "terminal.ansiYellow": "#d79921",
+    "terminal.background": "#f2e5bc",
+    "terminal.foreground": "#3c3836",
+    "textLink.activeForeground": "#458588",
+    "textLink.foreground": "#076678",
+    "titleBar.activeBackground": "#f2e5bc",
+    "titleBar.activeForeground": "#3c3836",
+    "titleBar.inactiveBackground": "#f2e5bc",
+    "widget.shadow": "#f2e5bc30"
+  },
+  "displayName": "Gruvbox Light Soft",
+  "name": "gruvbox-light-soft",
+  "semanticHighlighting": true,
+  "semanticTokenColors": {
+    "component": "#af3a03",
+    "constant.builtin": "#8f3f71",
+    "function": "#427b58",
+    "function.builtin": "#af3a03",
+    "method": "#427b58",
+    "parameter": "#076678",
+    "property": "#076678",
+    "property:python": "#3c3836",
+    "variable": "#3c3836"
+  },
+  "tokenColors": [
+    {
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "emphasis",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "strong",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "header",
+      "settings": {
+        "foreground": "#458588"
+      }
+    },
+    {
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": [
+        "constant",
+        "support.constant",
+        "variable.arguments"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": "constant.rgb-value",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "entity.name.selector",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag",
+        "punctuation.tag"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "invalid",
+        "invalid.illegal"
+      ],
+      "settings": {
+        "foreground": "#cc241d"
+      }
+    },
+    {
+      "scope": "invalid.deprecated",
+      "settings": {
+        "foreground": "#b16286"
+      }
+    },
+    {
+      "scope": "meta.selector",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "meta.preprocessor",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.string",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "meta.preprocessor.numeric",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "meta.header.diff",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "storage",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "string",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "string.tag",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "string.value",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "string.regexp",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "string.escape",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "string.quasi",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "string.entity",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "object",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "module.node",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "support.type.property-name",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "keyword",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "keyword.control",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "keyword.control.module",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "keyword.control.less",
+      "settings": {
+        "foreground": "#d79921"
+      }
+    },
+    {
+      "scope": "keyword.operator",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "keyword.operator.new",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "keyword.other.unit",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "metatag.php",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "support.function.git-rebase",
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "constant.sha.git-rebase",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "meta.type.name",
+        "meta.return.type",
+        "meta.return-type",
+        "meta.cast",
+        "meta.type.annotation",
+        "support.type",
+        "storage.type.cs",
+        "variable.class"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "variable.this",
+        "support.variable"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": [
+        "entity.name",
+        "entity.static",
+        "entity.name.class.static.function",
+        "entity.name.function",
+        "entity.name.class",
+        "entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "entity.function",
+        "entity.name.function.static"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "entity.name.function.function-call",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "support.function.builtin",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.method",
+        "entity.name.method.function-call",
+        "entity.name.static.function-call"
+      ],
+      "settings": {
+        "foreground": "#689d6a"
+      }
+    },
+    {
+      "scope": "brace",
+      "settings": {
+        "foreground": "#504945"
+      }
+    },
+    {
+      "scope": [
+        "meta.parameter.type.variable",
+        "variable.parameter",
+        "variable.name",
+        "variable.other",
+        "variable",
+        "string.constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "prototype",
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": [
+        "punctuation"
+      ],
+      "settings": {
+        "foreground": "#7c6f64"
+      }
+    },
+    {
+      "scope": "punctuation.quoted",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "punctuation.quasi",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.python",
+        "entity.name.function.python"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.python",
+        "storage.modifier.declaration",
+        "storage.type.class.python",
+        "storage.type.string.python"
+      ],
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "storage.type.function.async.python"
+      ],
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "meta.function-call.generic",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "meta.function-call.arguments",
+      "settings": {
+        "foreground": "#504945"
+      }
+    },
+    {
+      "scope": "entity.name.function.decorator",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "constant.other.caps",
+      "settings": {
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "scope": "keyword.operator.logical",
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": "punctuation.definition.logical-expression",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "string.interpolated.dollar.shell",
+        "string.interpolated.backtick.shell"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "keyword.control.directive",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "support.function.C99",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "meta.function.cs",
+        "entity.name.function.cs",
+        "entity.name.type.namespace.cs"
+      ],
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.using.cs",
+        "entity.name.variable.field.cs",
+        "entity.name.variable.local.cs",
+        "variable.other.readwrite.cs"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.this.cs",
+        "keyword.other.base.cs"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": "meta.scope.prerequisites",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "entity.name.function.target",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "storage.modifier.import.java",
+        "storage.modifier.package.java"
+      ],
+      "settings": {
+        "foreground": "#665c54"
+      }
+    },
+    {
+      "scope": [
+        "keyword.other.import.java",
+        "keyword.other.package.java"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "storage.type.java",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "storage.type.annotation",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "keyword.other.documentation.javadoc",
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "comment.block.javadoc variable.parameter.java",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.java variable.other.object",
+        "source.java variable.other.definition.java"
+      ],
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "meta.function-parameters.lisp",
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": "markup.underline",
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "scope": "string.other.link.title.markdown",
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#928374"
+      }
+    },
+    {
+      "scope": "markup.underline.link",
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": "markup.bold",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "markup.heading",
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "markup.italic",
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "scope": "markup.inserted",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": "markup.deleted",
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": "markup.changed",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "markup.punctuation.quote.beginning",
+      "settings": {
+        "foreground": "#98971a"
+      }
+    },
+    {
+      "scope": "markup.punctuation.list.beginning",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "markup.inline.raw",
+        "markup.fenced_code.block"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": "string.quoted.double.json",
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.css",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "source.css meta.selector",
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": "support.type.property-name.css",
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": "entity.other.attribute-name.class",
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.css support.function.transform",
+        "source.css support.function.timing-function",
+        "source.css support.function.misc"
+      ],
+      "settings": {
+        "foreground": "#9d0006"
+      }
+    },
+    {
+      "scope": [
+        "support.property-value",
+        "constant.rgb-value",
+        "support.property-value.scss",
+        "constant.rgb-value.scss"
+      ],
+      "settings": {
+        "foreground": "#d65d0e"
+      }
+    },
+    {
+      "scope": [
+        "entity.name.tag.css"
+      ],
+      "settings": {
+        "fontStyle": ""
+      }
+    },
+    {
+      "scope": [
+        "punctuation.definition.tag"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "text.html entity.name.tag",
+        "text.html punctuation.tag"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "source.js variable.language"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.ts variable.language"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.go storage.type"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.import"
+      ],
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.package",
+        "source.go keyword.import"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "source.go keyword.interface",
+        "source.go keyword.struct"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.type"
+      ],
+      "settings": {
+        "foreground": "#3c3836"
+      }
+    },
+    {
+      "scope": [
+        "source.go entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#8f3f71"
+      }
+    },
+    {
+      "scope": [
+        "keyword.control.cucumber.table"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "source.reason string.double",
+        "source.reason string.regexp"
+      ],
+      "settings": {
+        "foreground": "#79740e"
+      }
+    },
+    {
+      "scope": [
+        "source.reason keyword.control.less"
+      ],
+      "settings": {
+        "foreground": "#427b58"
+      }
+    },
+    {
+      "scope": [
+        "source.reason entity.name.function"
+      ],
+      "settings": {
+        "foreground": "#076678"
+      }
+    },
+    {
+      "scope": [
+        "source.reason support.property-value",
+        "source.reason entity.name.filename"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell variable.other.member.powershell"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.powershell"
+      ],
+      "settings": {
+        "foreground": "#b57614"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell support.function.attribute.powershell"
+      ],
+      "settings": {
+        "foreground": "#665c54"
+      }
+    },
+    {
+      "scope": [
+        "source.powershell meta.hashtable.assignment.powershell variable.other.readwrite.powershell"
+      ],
+      "settings": {
+        "foreground": "#af3a03"
+      }
+    }
+  ],
+  "type": "light"
+}
diff --git a/resources/themes/one-dark-pro.json b/resources/themes/one-dark-pro.json
index 80149f4..c00f13f 100644
--- a/resources/themes/one-dark-pro.json
+++ b/resources/themes/one-dark-pro.json
@@ -81,6 +81,7 @@
     "minimapGutter.addedBackground": "#109868",
     "minimapGutter.deletedBackground": "#9A353D",
     "minimapGutter.modifiedBackground": "#948B60",
+    "multiDiffEditor.headerBackground": "#21252b",
     "panel.border": "#3e4452",
     "panelSectionHeader.background": "#21252b",
     "peekViewEditor.background": "#1b1d23",
diff --git a/resources/themes/rose-pine-dawn.json b/resources/themes/rose-pine-dawn.json
index 8637884..b3e4015 100644
--- a/resources/themes/rose-pine-dawn.json
+++ b/resources/themes/rose-pine-dawn.json
@@ -214,6 +214,7 @@
     "extensionIcon.verifiedForeground": "#907aa9",
     "focusBorder": "#6e6a8614",
     "foreground": "#575279",
+    "git.blame.editorDecorationForeground": "#9893a5",
     "gitDecoration.addedResourceForeground": "#56949f",
     "gitDecoration.conflictingResourceForeground": "#b4637a",
     "gitDecoration.deletedResourceForeground": "#797593",
diff --git a/resources/themes/rose-pine-moon.json b/resources/themes/rose-pine-moon.json
index 9527ba1..5272516 100644
--- a/resources/themes/rose-pine-moon.json
+++ b/resources/themes/rose-pine-moon.json
@@ -214,6 +214,7 @@
     "extensionIcon.verifiedForeground": "#c4a7e7",
     "focusBorder": "#817c9c26",
     "foreground": "#e0def4",
+    "git.blame.editorDecorationForeground": "#6e6a86",
     "gitDecoration.addedResourceForeground": "#9ccfd8",
     "gitDecoration.conflictingResourceForeground": "#eb6f92",
     "gitDecoration.deletedResourceForeground": "#908caa",
diff --git a/resources/themes/rose-pine.json b/resources/themes/rose-pine.json
index fa49c14..6dc3319 100644
--- a/resources/themes/rose-pine.json
+++ b/resources/themes/rose-pine.json
@@ -214,6 +214,7 @@
     "extensionIcon.verifiedForeground": "#c4a7e7",
     "focusBorder": "#6e6a8633",
     "foreground": "#e0def4",
+    "git.blame.editorDecorationForeground": "#6e6a86",
     "gitDecoration.addedResourceForeground": "#9ccfd8",
     "gitDecoration.conflictingResourceForeground": "#eb6f92",
     "gitDecoration.deletedResourceForeground": "#908caa",
diff --git a/resources/themes/tokyo-night.json b/resources/themes/tokyo-night.json
index 8c87708..283e2e5 100644
--- a/resources/themes/tokyo-night.json
+++ b/resources/themes/tokyo-night.json
@@ -27,6 +27,11 @@
     "charts.purple": "#9d7cd8",
     "charts.red": "#f7768e",
     "charts.yellow": "#e0af68",
+    "chat.avatarBackground": "#3d59a1",
+    "chat.avatarForeground": "#a9b1d6",
+    "chat.requestBorder": "#0f0f14",
+    "chat.slashCommandBackground": "#14141b",
+    "chat.slashCommandForeground": "#7aa2f7",
     "debugConsole.errorForeground": "#bb616b",
     "debugConsole.infoForeground": "#787c99",
     "debugConsole.sourceForeground": "#787c99",
@@ -58,6 +63,7 @@
     "diffEditorGutter.removedLineBackground": "#db4b4b22",
     "diffEditorOverview.insertedForeground": "#41a6b525",
     "diffEditorOverview.removedForeground": "#db4b4b22",
+    "disabledForeground": "#545c7e",
     "dropdown.background": "#14141b",
     "dropdown.foreground": "#787c99",
     "dropdown.listBackground": "#14141b",
@@ -111,9 +117,10 @@
     "editorIndentGuide.activeBackground1": "#363b54",
     "editorIndentGuide.background1": "#232433",
     "editorInfo.foreground": "#0da0ba",
+    "editorInlayHint.foreground": "#646e9c",
     "editorLightBulb.foreground": "#e0af68",
     "editorLightBulbAutoFix.foreground": "#e0af68",
-    "editorLineNumber.activeForeground": "#737aa2",
+    "editorLineNumber.activeForeground": "#787c99",
     "editorLineNumber.foreground": "#363b54",
     "editorLink.activeForeground": "#acb0d0",
     "editorMarkerNavigation.background": "#16161e",
@@ -130,7 +137,7 @@
     "editorOverviewRuler.warningForeground": "#e0af68",
     "editorOverviewRuler.wordHighlightForeground": "#bb9af755",
     "editorOverviewRuler.wordHighlightStrongForeground": "#bb9af766",
-    "editorPane.background": "#16161e",
+    "editorPane.background": "#1a1b26",
     "editorRuler.foreground": "#101014",
     "editorSuggestWidget.background": "#16161e",
     "editorSuggestWidget.border": "#101014",
@@ -139,6 +146,7 @@
     "editorWarning.foreground": "#e0af68",
     "editorWhitespace.foreground": "#363b54",
     "editorWidget.background": "#16161e",
+    "editorWidget.border": "#101014",
     "editorWidget.foreground": "#787c99",
     "editorWidget.resizeBorder": "#545c7e33",
     "errorForeground": "#515670",
@@ -163,6 +171,10 @@
     "gitlens.gutterUncommittedForegroundColor": "#7aa2f7",
     "gitlens.trailingLineForegroundColor": "#646e9c",
     "icon.foreground": "#787c99",
+    "inlineChat.foreground": "#a9b1d6",
+    "inlineChatDiff.inserted": "#41a6b540",
+    "inlineChatDiff.removed": "#db4b4b42",
+    "inlineChatInput.background": "#14141b",
     "input.background": "#14141b",
     "input.border": "#0f0f14",
     "input.foreground": "#a9b1d6",
@@ -254,6 +266,18 @@
     "pickerGroup.foreground": "#a9b1d6",
     "progressBar.background": "#3d59a1",
     "sash.hoverBorder": "#29355a",
+    "scmGraph.foreground1": "#ff9e64",
+    "scmGraph.foreground2": "#e0af68",
+    "scmGraph.foreground3": "#41a6b5",
+    "scmGraph.foreground4": "#7aa2f7",
+    "scmGraph.foreground5": "#bb9af7",
+    "scmGraph.historyItemBaseRefColor": "#9d7cd8",
+    "scmGraph.historyItemHoverAdditionsForeground": "#41a6b5",
+    "scmGraph.historyItemHoverDefaultLabelForeground": "#a9b1d6",
+    "scmGraph.historyItemHoverDeletionsForeground": "#f7768e",
+    "scmGraph.historyItemHoverLabelForeground": "#1b1e2e",
+    "scmGraph.historyItemRefColor": "#506FCA",
+    "scmGraph.historyItemRemoteRefColor": "#41a6b5",
     "scrollbar.shadow": "#00000033",
     "scrollbarSlider.activeBackground": "#868bc422",
     "scrollbarSlider.background": "#868bc415",
@@ -297,7 +321,7 @@
     "terminal.ansiBrightBlack": "#363b54",
     "terminal.ansiBrightBlue": "#7aa2f7",
     "terminal.ansiBrightCyan": "#7dcfff",
-    "terminal.ansiBrightGreen": "#41a6b5",
+    "terminal.ansiBrightGreen": "#73daca",
     "terminal.ansiBrightMagenta": "#bb9af7",
     "terminal.ansiBrightRed": "#f7768e",
     "terminal.ansiBrightWhite": "#acb0d0",
@@ -518,7 +542,8 @@
         "support.constant.handlebars keyword.control",
         "keyword.operator.comparison.twig",
         "keyword.blade",
-        "entity.name.function.blade"
+        "entity.name.function.blade",
+        "meta.tag.blade keyword.other.type.php"
       ],
       "settings": {
         "foreground": "#0db9d7"
@@ -559,7 +584,9 @@
         "entity.name.operator",
         "meta.property-list punctuation.separator.key-value",
         "meta.at-rule.mixin punctuation.separator.key-value",
-        "meta.at-rule.function variable.parameter.url"
+        "meta.at-rule.function variable.parameter.url",
+        "meta.embedded.inline.phpx punctuation.definition.tag.begin.html",
+        "meta.embedded.inline.phpx punctuation.definition.tag.end.html"
       ],
       "settings": {
         "foreground": "#89ddff"
@@ -626,7 +653,10 @@
       }
     },
     {
-      "scope": "punctuation.definition.tag",
+      "scope": [
+        "punctuation.definition.tag",
+        "text.html.php meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html text.html.basic"
+      ],
       "settings": {
         "foreground": "#ba3c97"
       }
@@ -652,7 +682,8 @@
         "variable.parameter.handlebars",
         "variable.other.object",
         "meta.fstring",
-        "meta.function-call meta.function-call.arguments"
+        "meta.function-call meta.function-call.arguments",
+        "meta.embedded.inline.phpx constant.other.php"
       ],
       "settings": {
         "foreground": "#c0caf5"
diff --git a/resources/themes/vesper.json b/resources/themes/vesper.json
index 8ac54d4..2ee74f1 100644
--- a/resources/themes/vesper.json
+++ b/resources/themes/vesper.json
@@ -61,6 +61,7 @@
     "statusBarItem.remoteBackground": "#FFC799",
     "statusBarItem.remoteForeground": "#000",
     "tab.activeBackground": "#161616",
+    "tab.activeBorder": "#FFC799",
     "tab.border": "#101010",
     "tab.inactiveBackground": "#101010",
     "textLink.activeForeground": "#FFCFA8",
diff --git a/resources/samples/abap.sample b/samples/samples/abap.sample
similarity index 100%
rename from resources/samples/abap.sample
rename to samples/samples/abap.sample
diff --git a/resources/samples/actionscript-3.sample b/samples/samples/actionscript-3.sample
similarity index 100%
rename from resources/samples/actionscript-3.sample
rename to samples/samples/actionscript-3.sample
diff --git a/resources/samples/ada.sample b/samples/samples/ada.sample
similarity index 100%
rename from resources/samples/ada.sample
rename to samples/samples/ada.sample
diff --git a/resources/samples/angular-html.sample b/samples/samples/angular-html.sample
similarity index 100%
rename from resources/samples/angular-html.sample
rename to samples/samples/angular-html.sample
diff --git a/resources/samples/angular-ts.sample b/samples/samples/angular-ts.sample
similarity index 100%
rename from resources/samples/angular-ts.sample
rename to samples/samples/angular-ts.sample
diff --git a/resources/samples/antlers.sample b/samples/samples/antlers.sample
similarity index 100%
rename from resources/samples/antlers.sample
rename to samples/samples/antlers.sample
diff --git a/resources/samples/apache.sample b/samples/samples/apache.sample
similarity index 100%
rename from resources/samples/apache.sample
rename to samples/samples/apache.sample
diff --git a/resources/samples/apex.sample b/samples/samples/apex.sample
similarity index 100%
rename from resources/samples/apex.sample
rename to samples/samples/apex.sample
diff --git a/resources/samples/apl.sample b/samples/samples/apl.sample
similarity index 100%
rename from resources/samples/apl.sample
rename to samples/samples/apl.sample
diff --git a/resources/samples/applescript.sample b/samples/samples/applescript.sample
similarity index 100%
rename from resources/samples/applescript.sample
rename to samples/samples/applescript.sample
diff --git a/resources/samples/ara.sample b/samples/samples/ara.sample
similarity index 100%
rename from resources/samples/ara.sample
rename to samples/samples/ara.sample
diff --git a/resources/samples/asciidoc.sample b/samples/samples/asciidoc.sample
similarity index 100%
rename from resources/samples/asciidoc.sample
rename to samples/samples/asciidoc.sample
diff --git a/resources/samples/asm.sample b/samples/samples/asm.sample
similarity index 100%
rename from resources/samples/asm.sample
rename to samples/samples/asm.sample
diff --git a/resources/samples/astro.sample b/samples/samples/astro.sample
similarity index 100%
rename from resources/samples/astro.sample
rename to samples/samples/astro.sample
diff --git a/resources/samples/awk.sample b/samples/samples/awk.sample
similarity index 100%
rename from resources/samples/awk.sample
rename to samples/samples/awk.sample
diff --git a/resources/samples/ballerina.sample b/samples/samples/ballerina.sample
similarity index 100%
rename from resources/samples/ballerina.sample
rename to samples/samples/ballerina.sample
diff --git a/resources/samples/bash.sample b/samples/samples/bash.sample
similarity index 100%
rename from resources/samples/bash.sample
rename to samples/samples/bash.sample
diff --git a/resources/samples/bat.sample b/samples/samples/bat.sample
similarity index 100%
rename from resources/samples/bat.sample
rename to samples/samples/bat.sample
diff --git a/resources/samples/beancount.sample b/samples/samples/beancount.sample
similarity index 100%
rename from resources/samples/beancount.sample
rename to samples/samples/beancount.sample
diff --git a/resources/samples/berry.sample b/samples/samples/berry.sample
similarity index 100%
rename from resources/samples/berry.sample
rename to samples/samples/berry.sample
diff --git a/resources/samples/bibtex.sample b/samples/samples/bibtex.sample
similarity index 100%
rename from resources/samples/bibtex.sample
rename to samples/samples/bibtex.sample
diff --git a/resources/samples/bicep.sample b/samples/samples/bicep.sample
similarity index 100%
rename from resources/samples/bicep.sample
rename to samples/samples/bicep.sample
diff --git a/resources/samples/blade.sample b/samples/samples/blade.sample
similarity index 100%
rename from resources/samples/blade.sample
rename to samples/samples/blade.sample
diff --git a/resources/samples/bsl.sample b/samples/samples/bsl.sample
similarity index 100%
rename from resources/samples/bsl.sample
rename to samples/samples/bsl.sample
diff --git a/resources/samples/c.sample b/samples/samples/c.sample
similarity index 100%
rename from resources/samples/c.sample
rename to samples/samples/c.sample
diff --git a/resources/samples/cadence.sample b/samples/samples/cadence.sample
similarity index 100%
rename from resources/samples/cadence.sample
rename to samples/samples/cadence.sample
diff --git a/resources/samples/cairo.sample b/samples/samples/cairo.sample
similarity index 100%
rename from resources/samples/cairo.sample
rename to samples/samples/cairo.sample
diff --git a/resources/samples/clarity.sample b/samples/samples/clarity.sample
similarity index 100%
rename from resources/samples/clarity.sample
rename to samples/samples/clarity.sample
diff --git a/resources/samples/clj.sample b/samples/samples/clj.sample
similarity index 100%
rename from resources/samples/clj.sample
rename to samples/samples/clj.sample
diff --git a/resources/samples/clojure.sample b/samples/samples/clojure.sample
similarity index 100%
rename from resources/samples/clojure.sample
rename to samples/samples/clojure.sample
diff --git a/resources/samples/cmake.sample b/samples/samples/cmake.sample
similarity index 100%
rename from resources/samples/cmake.sample
rename to samples/samples/cmake.sample
diff --git a/resources/samples/cobol.sample b/samples/samples/cobol.sample
similarity index 100%
rename from resources/samples/cobol.sample
rename to samples/samples/cobol.sample
diff --git a/resources/samples/codeowners.sample b/samples/samples/codeowners.sample
similarity index 100%
rename from resources/samples/codeowners.sample
rename to samples/samples/codeowners.sample
diff --git a/resources/samples/codeql.sample b/samples/samples/codeql.sample
similarity index 100%
rename from resources/samples/codeql.sample
rename to samples/samples/codeql.sample
diff --git a/resources/samples/coffee.sample b/samples/samples/coffee.sample
similarity index 100%
rename from resources/samples/coffee.sample
rename to samples/samples/coffee.sample
diff --git a/resources/samples/common-lisp.sample b/samples/samples/common-lisp.sample
similarity index 100%
rename from resources/samples/common-lisp.sample
rename to samples/samples/common-lisp.sample
diff --git a/resources/samples/coq.sample b/samples/samples/coq.sample
similarity index 100%
rename from resources/samples/coq.sample
rename to samples/samples/coq.sample
diff --git a/resources/samples/cpp.sample b/samples/samples/cpp.sample
similarity index 100%
rename from resources/samples/cpp.sample
rename to samples/samples/cpp.sample
diff --git a/resources/samples/crystal.sample b/samples/samples/crystal.sample
similarity index 100%
rename from resources/samples/crystal.sample
rename to samples/samples/crystal.sample
diff --git a/resources/samples/csharp.sample b/samples/samples/csharp.sample
similarity index 100%
rename from resources/samples/csharp.sample
rename to samples/samples/csharp.sample
diff --git a/resources/samples/css.sample b/samples/samples/css.sample
similarity index 100%
rename from resources/samples/css.sample
rename to samples/samples/css.sample
diff --git a/resources/samples/csv.sample b/samples/samples/csv.sample
similarity index 100%
rename from resources/samples/csv.sample
rename to samples/samples/csv.sample
diff --git a/resources/samples/cue.sample b/samples/samples/cue.sample
similarity index 100%
rename from resources/samples/cue.sample
rename to samples/samples/cue.sample
diff --git a/resources/samples/cypher.sample b/samples/samples/cypher.sample
similarity index 100%
rename from resources/samples/cypher.sample
rename to samples/samples/cypher.sample
diff --git a/resources/samples/d.sample b/samples/samples/d.sample
similarity index 100%
rename from resources/samples/d.sample
rename to samples/samples/d.sample
diff --git a/resources/samples/dart.sample b/samples/samples/dart.sample
similarity index 100%
rename from resources/samples/dart.sample
rename to samples/samples/dart.sample
diff --git a/resources/samples/dax.sample b/samples/samples/dax.sample
similarity index 100%
rename from resources/samples/dax.sample
rename to samples/samples/dax.sample
diff --git a/resources/samples/desktop.sample b/samples/samples/desktop.sample
similarity index 100%
rename from resources/samples/desktop.sample
rename to samples/samples/desktop.sample
diff --git a/resources/samples/diff.sample b/samples/samples/diff.sample
similarity index 100%
rename from resources/samples/diff.sample
rename to samples/samples/diff.sample
diff --git a/resources/samples/docker.sample b/samples/samples/docker.sample
similarity index 100%
rename from resources/samples/docker.sample
rename to samples/samples/docker.sample
diff --git a/resources/samples/dotenv.sample b/samples/samples/dotenv.sample
similarity index 100%
rename from resources/samples/dotenv.sample
rename to samples/samples/dotenv.sample
diff --git a/resources/samples/dream-maker.sample b/samples/samples/dream-maker.sample
similarity index 100%
rename from resources/samples/dream-maker.sample
rename to samples/samples/dream-maker.sample
diff --git a/resources/samples/edge.sample b/samples/samples/edge.sample
similarity index 100%
rename from resources/samples/edge.sample
rename to samples/samples/edge.sample
diff --git a/resources/samples/elixir.sample b/samples/samples/elixir.sample
similarity index 100%
rename from resources/samples/elixir.sample
rename to samples/samples/elixir.sample
diff --git a/resources/samples/elm.sample b/samples/samples/elm.sample
similarity index 100%
rename from resources/samples/elm.sample
rename to samples/samples/elm.sample
diff --git a/resources/samples/emacs-lisp.sample b/samples/samples/emacs-lisp.sample
similarity index 100%
rename from resources/samples/emacs-lisp.sample
rename to samples/samples/emacs-lisp.sample
diff --git a/resources/samples/erb.sample b/samples/samples/erb.sample
similarity index 100%
rename from resources/samples/erb.sample
rename to samples/samples/erb.sample
diff --git a/resources/samples/erlang.sample b/samples/samples/erlang.sample
similarity index 100%
rename from resources/samples/erlang.sample
rename to samples/samples/erlang.sample
diff --git a/resources/samples/fennel.sample b/samples/samples/fennel.sample
similarity index 100%
rename from resources/samples/fennel.sample
rename to samples/samples/fennel.sample
diff --git a/resources/samples/fish.sample b/samples/samples/fish.sample
similarity index 100%
rename from resources/samples/fish.sample
rename to samples/samples/fish.sample
diff --git a/resources/samples/fluent.sample b/samples/samples/fluent.sample
similarity index 100%
rename from resources/samples/fluent.sample
rename to samples/samples/fluent.sample
diff --git a/resources/samples/fortran-fixed-form.sample b/samples/samples/fortran-fixed-form.sample
similarity index 100%
rename from resources/samples/fortran-fixed-form.sample
rename to samples/samples/fortran-fixed-form.sample
diff --git a/resources/samples/fortran-free-form.sample b/samples/samples/fortran-free-form.sample
similarity index 100%
rename from resources/samples/fortran-free-form.sample
rename to samples/samples/fortran-free-form.sample
diff --git a/resources/samples/fsharp.sample b/samples/samples/fsharp.sample
similarity index 100%
rename from resources/samples/fsharp.sample
rename to samples/samples/fsharp.sample
diff --git a/resources/samples/fsl.sample b/samples/samples/fsl.sample
similarity index 100%
rename from resources/samples/fsl.sample
rename to samples/samples/fsl.sample
diff --git a/resources/samples/gdresource.sample b/samples/samples/gdresource.sample
similarity index 100%
rename from resources/samples/gdresource.sample
rename to samples/samples/gdresource.sample
diff --git a/resources/samples/gdscript.sample b/samples/samples/gdscript.sample
similarity index 100%
rename from resources/samples/gdscript.sample
rename to samples/samples/gdscript.sample
diff --git a/resources/samples/gdshader.sample b/samples/samples/gdshader.sample
similarity index 100%
rename from resources/samples/gdshader.sample
rename to samples/samples/gdshader.sample
diff --git a/resources/samples/genie.sample b/samples/samples/genie.sample
similarity index 100%
rename from resources/samples/genie.sample
rename to samples/samples/genie.sample
diff --git a/resources/samples/gherkin.sample b/samples/samples/gherkin.sample
similarity index 100%
rename from resources/samples/gherkin.sample
rename to samples/samples/gherkin.sample
diff --git a/resources/samples/gleam.sample b/samples/samples/gleam.sample
similarity index 100%
rename from resources/samples/gleam.sample
rename to samples/samples/gleam.sample
diff --git a/resources/samples/glimmer-js.sample b/samples/samples/glimmer-js.sample
similarity index 100%
rename from resources/samples/glimmer-js.sample
rename to samples/samples/glimmer-js.sample
diff --git a/resources/samples/glimmer-ts.sample b/samples/samples/glimmer-ts.sample
similarity index 100%
rename from resources/samples/glimmer-ts.sample
rename to samples/samples/glimmer-ts.sample
diff --git a/resources/samples/glsl.sample b/samples/samples/glsl.sample
similarity index 100%
rename from resources/samples/glsl.sample
rename to samples/samples/glsl.sample
diff --git a/resources/samples/gnuplot.sample b/samples/samples/gnuplot.sample
similarity index 100%
rename from resources/samples/gnuplot.sample
rename to samples/samples/gnuplot.sample
diff --git a/resources/samples/go.sample b/samples/samples/go.sample
similarity index 100%
rename from resources/samples/go.sample
rename to samples/samples/go.sample
diff --git a/resources/samples/graphql.sample b/samples/samples/graphql.sample
similarity index 100%
rename from resources/samples/graphql.sample
rename to samples/samples/graphql.sample
diff --git a/resources/samples/groovy.sample b/samples/samples/groovy.sample
similarity index 100%
rename from resources/samples/groovy.sample
rename to samples/samples/groovy.sample
diff --git a/resources/samples/hack.sample b/samples/samples/hack.sample
similarity index 100%
rename from resources/samples/hack.sample
rename to samples/samples/hack.sample
diff --git a/resources/samples/haml.sample b/samples/samples/haml.sample
similarity index 100%
rename from resources/samples/haml.sample
rename to samples/samples/haml.sample
diff --git a/resources/samples/handlebars.sample b/samples/samples/handlebars.sample
similarity index 100%
rename from resources/samples/handlebars.sample
rename to samples/samples/handlebars.sample
diff --git a/resources/samples/haskell.sample b/samples/samples/haskell.sample
similarity index 100%
rename from resources/samples/haskell.sample
rename to samples/samples/haskell.sample
diff --git a/resources/samples/haxe.sample b/samples/samples/haxe.sample
similarity index 100%
rename from resources/samples/haxe.sample
rename to samples/samples/haxe.sample
diff --git a/resources/samples/hcl.sample b/samples/samples/hcl.sample
similarity index 100%
rename from resources/samples/hcl.sample
rename to samples/samples/hcl.sample
diff --git a/resources/samples/hjson.sample b/samples/samples/hjson.sample
similarity index 100%
rename from resources/samples/hjson.sample
rename to samples/samples/hjson.sample
diff --git a/resources/samples/hlsl.sample b/samples/samples/hlsl.sample
similarity index 100%
rename from resources/samples/hlsl.sample
rename to samples/samples/hlsl.sample
diff --git a/resources/samples/html.sample b/samples/samples/html.sample
similarity index 100%
rename from resources/samples/html.sample
rename to samples/samples/html.sample
diff --git a/resources/samples/http.sample b/samples/samples/http.sample
similarity index 100%
rename from resources/samples/http.sample
rename to samples/samples/http.sample
diff --git a/resources/samples/hxml.sample b/samples/samples/hxml.sample
similarity index 100%
rename from resources/samples/hxml.sample
rename to samples/samples/hxml.sample
diff --git a/resources/samples/hy.sample b/samples/samples/hy.sample
similarity index 100%
rename from resources/samples/hy.sample
rename to samples/samples/hy.sample
diff --git a/resources/samples/imba.sample b/samples/samples/imba.sample
similarity index 100%
rename from resources/samples/imba.sample
rename to samples/samples/imba.sample
diff --git a/resources/samples/ini.sample b/samples/samples/ini.sample
similarity index 100%
rename from resources/samples/ini.sample
rename to samples/samples/ini.sample
diff --git a/resources/samples/java.sample b/samples/samples/java.sample
similarity index 100%
rename from resources/samples/java.sample
rename to samples/samples/java.sample
diff --git a/resources/samples/javascript.sample b/samples/samples/javascript.sample
similarity index 100%
rename from resources/samples/javascript.sample
rename to samples/samples/javascript.sample
diff --git a/resources/samples/jinja.sample b/samples/samples/jinja.sample
similarity index 100%
rename from resources/samples/jinja.sample
rename to samples/samples/jinja.sample
diff --git a/resources/samples/jison.sample b/samples/samples/jison.sample
similarity index 100%
rename from resources/samples/jison.sample
rename to samples/samples/jison.sample
diff --git a/resources/samples/json.sample b/samples/samples/json.sample
similarity index 100%
rename from resources/samples/json.sample
rename to samples/samples/json.sample
diff --git a/resources/samples/json5.sample b/samples/samples/json5.sample
similarity index 100%
rename from resources/samples/json5.sample
rename to samples/samples/json5.sample
diff --git a/resources/samples/jsonc.sample b/samples/samples/jsonc.sample
similarity index 100%
rename from resources/samples/jsonc.sample
rename to samples/samples/jsonc.sample
diff --git a/resources/samples/jsonl.sample b/samples/samples/jsonl.sample
similarity index 100%
rename from resources/samples/jsonl.sample
rename to samples/samples/jsonl.sample
diff --git a/resources/samples/jsonnet.sample b/samples/samples/jsonnet.sample
similarity index 100%
rename from resources/samples/jsonnet.sample
rename to samples/samples/jsonnet.sample
diff --git a/resources/samples/jssm.sample b/samples/samples/jssm.sample
similarity index 100%
rename from resources/samples/jssm.sample
rename to samples/samples/jssm.sample
diff --git a/resources/samples/jsx.sample b/samples/samples/jsx.sample
similarity index 100%
rename from resources/samples/jsx.sample
rename to samples/samples/jsx.sample
diff --git a/resources/samples/julia.sample b/samples/samples/julia.sample
similarity index 100%
rename from resources/samples/julia.sample
rename to samples/samples/julia.sample
diff --git a/resources/samples/kotlin.sample b/samples/samples/kotlin.sample
similarity index 100%
rename from resources/samples/kotlin.sample
rename to samples/samples/kotlin.sample
diff --git a/resources/samples/kusto.sample b/samples/samples/kusto.sample
similarity index 100%
rename from resources/samples/kusto.sample
rename to samples/samples/kusto.sample
diff --git a/resources/samples/latex.sample b/samples/samples/latex.sample
similarity index 100%
rename from resources/samples/latex.sample
rename to samples/samples/latex.sample
diff --git a/resources/samples/lean.sample b/samples/samples/lean.sample
similarity index 100%
rename from resources/samples/lean.sample
rename to samples/samples/lean.sample
diff --git a/resources/samples/less.sample b/samples/samples/less.sample
similarity index 100%
rename from resources/samples/less.sample
rename to samples/samples/less.sample
diff --git a/resources/samples/liquid.sample b/samples/samples/liquid.sample
similarity index 100%
rename from resources/samples/liquid.sample
rename to samples/samples/liquid.sample
diff --git a/resources/samples/log.sample b/samples/samples/log.sample
similarity index 100%
rename from resources/samples/log.sample
rename to samples/samples/log.sample
diff --git a/resources/samples/logo.sample b/samples/samples/logo.sample
similarity index 100%
rename from resources/samples/logo.sample
rename to samples/samples/logo.sample
diff --git a/resources/samples/lua.sample b/samples/samples/lua.sample
similarity index 100%
rename from resources/samples/lua.sample
rename to samples/samples/lua.sample
diff --git a/resources/samples/luau.sample b/samples/samples/luau.sample
similarity index 100%
rename from resources/samples/luau.sample
rename to samples/samples/luau.sample
diff --git a/resources/samples/make.sample b/samples/samples/make.sample
similarity index 100%
rename from resources/samples/make.sample
rename to samples/samples/make.sample
diff --git a/resources/samples/markdown.sample b/samples/samples/markdown.sample
similarity index 100%
rename from resources/samples/markdown.sample
rename to samples/samples/markdown.sample
diff --git a/resources/samples/marko.sample b/samples/samples/marko.sample
similarity index 100%
rename from resources/samples/marko.sample
rename to samples/samples/marko.sample
diff --git a/resources/samples/matlab.sample b/samples/samples/matlab.sample
similarity index 100%
rename from resources/samples/matlab.sample
rename to samples/samples/matlab.sample
diff --git a/resources/samples/mdc.sample b/samples/samples/mdc.sample
similarity index 100%
rename from resources/samples/mdc.sample
rename to samples/samples/mdc.sample
diff --git a/resources/samples/mdx.sample b/samples/samples/mdx.sample
similarity index 100%
rename from resources/samples/mdx.sample
rename to samples/samples/mdx.sample
diff --git a/resources/samples/mermaid.sample b/samples/samples/mermaid.sample
similarity index 100%
rename from resources/samples/mermaid.sample
rename to samples/samples/mermaid.sample
diff --git a/resources/samples/mipsasm.sample b/samples/samples/mipsasm.sample
similarity index 100%
rename from resources/samples/mipsasm.sample
rename to samples/samples/mipsasm.sample
diff --git a/resources/samples/mojo.sample b/samples/samples/mojo.sample
similarity index 100%
rename from resources/samples/mojo.sample
rename to samples/samples/mojo.sample
diff --git a/resources/samples/move.sample b/samples/samples/move.sample
similarity index 100%
rename from resources/samples/move.sample
rename to samples/samples/move.sample
diff --git a/resources/samples/narrat.sample b/samples/samples/narrat.sample
similarity index 100%
rename from resources/samples/narrat.sample
rename to samples/samples/narrat.sample
diff --git a/resources/samples/nextflow.sample b/samples/samples/nextflow.sample
similarity index 100%
rename from resources/samples/nextflow.sample
rename to samples/samples/nextflow.sample
diff --git a/resources/samples/nginx.sample b/samples/samples/nginx.sample
similarity index 100%
rename from resources/samples/nginx.sample
rename to samples/samples/nginx.sample
diff --git a/resources/samples/nim.sample b/samples/samples/nim.sample
similarity index 100%
rename from resources/samples/nim.sample
rename to samples/samples/nim.sample
diff --git a/resources/samples/nix.sample b/samples/samples/nix.sample
similarity index 100%
rename from resources/samples/nix.sample
rename to samples/samples/nix.sample
diff --git a/resources/samples/nushell.sample b/samples/samples/nushell.sample
similarity index 100%
rename from resources/samples/nushell.sample
rename to samples/samples/nushell.sample
diff --git a/resources/samples/objective-c.sample b/samples/samples/objective-c.sample
similarity index 100%
rename from resources/samples/objective-c.sample
rename to samples/samples/objective-c.sample
diff --git a/resources/samples/objective-cpp.sample b/samples/samples/objective-cpp.sample
similarity index 100%
rename from resources/samples/objective-cpp.sample
rename to samples/samples/objective-cpp.sample
diff --git a/resources/samples/ocaml.sample b/samples/samples/ocaml.sample
similarity index 100%
rename from resources/samples/ocaml.sample
rename to samples/samples/ocaml.sample
diff --git a/resources/samples/pascal.sample b/samples/samples/pascal.sample
similarity index 100%
rename from resources/samples/pascal.sample
rename to samples/samples/pascal.sample
diff --git a/resources/samples/perl.sample b/samples/samples/perl.sample
similarity index 100%
rename from resources/samples/perl.sample
rename to samples/samples/perl.sample
diff --git a/resources/samples/php.sample b/samples/samples/php.sample
similarity index 100%
rename from resources/samples/php.sample
rename to samples/samples/php.sample
diff --git a/resources/samples/plsql.sample b/samples/samples/plsql.sample
similarity index 100%
rename from resources/samples/plsql.sample
rename to samples/samples/plsql.sample
diff --git a/resources/samples/po.sample b/samples/samples/po.sample
similarity index 100%
rename from resources/samples/po.sample
rename to samples/samples/po.sample
diff --git a/resources/samples/polar.sample b/samples/samples/polar.sample
similarity index 100%
rename from resources/samples/polar.sample
rename to samples/samples/polar.sample
diff --git a/resources/samples/postcss.sample b/samples/samples/postcss.sample
similarity index 100%
rename from resources/samples/postcss.sample
rename to samples/samples/postcss.sample
diff --git a/resources/samples/powerquery.sample b/samples/samples/powerquery.sample
similarity index 100%
rename from resources/samples/powerquery.sample
rename to samples/samples/powerquery.sample
diff --git a/resources/samples/powershell.sample b/samples/samples/powershell.sample
similarity index 100%
rename from resources/samples/powershell.sample
rename to samples/samples/powershell.sample
diff --git a/resources/samples/prisma.sample b/samples/samples/prisma.sample
similarity index 100%
rename from resources/samples/prisma.sample
rename to samples/samples/prisma.sample
diff --git a/resources/samples/prolog.sample b/samples/samples/prolog.sample
similarity index 100%
rename from resources/samples/prolog.sample
rename to samples/samples/prolog.sample
diff --git a/resources/samples/proto.sample b/samples/samples/proto.sample
similarity index 100%
rename from resources/samples/proto.sample
rename to samples/samples/proto.sample
diff --git a/resources/samples/pug.sample b/samples/samples/pug.sample
similarity index 100%
rename from resources/samples/pug.sample
rename to samples/samples/pug.sample
diff --git a/resources/samples/puppet.sample b/samples/samples/puppet.sample
similarity index 100%
rename from resources/samples/puppet.sample
rename to samples/samples/puppet.sample
diff --git a/resources/samples/purescript.sample b/samples/samples/purescript.sample
similarity index 100%
rename from resources/samples/purescript.sample
rename to samples/samples/purescript.sample
diff --git a/resources/samples/python.sample b/samples/samples/python.sample
similarity index 100%
rename from resources/samples/python.sample
rename to samples/samples/python.sample
diff --git a/resources/samples/qml.sample b/samples/samples/qml.sample
similarity index 100%
rename from resources/samples/qml.sample
rename to samples/samples/qml.sample
diff --git a/resources/samples/qmldir.sample b/samples/samples/qmldir.sample
similarity index 100%
rename from resources/samples/qmldir.sample
rename to samples/samples/qmldir.sample
diff --git a/resources/samples/qss.sample b/samples/samples/qss.sample
similarity index 100%
rename from resources/samples/qss.sample
rename to samples/samples/qss.sample
diff --git a/resources/samples/r.sample b/samples/samples/r.sample
similarity index 100%
rename from resources/samples/r.sample
rename to samples/samples/r.sample
diff --git a/resources/samples/racket.sample b/samples/samples/racket.sample
similarity index 100%
rename from resources/samples/racket.sample
rename to samples/samples/racket.sample
diff --git a/resources/samples/raku.sample b/samples/samples/raku.sample
similarity index 100%
rename from resources/samples/raku.sample
rename to samples/samples/raku.sample
diff --git a/resources/samples/razor.sample b/samples/samples/razor.sample
similarity index 100%
rename from resources/samples/razor.sample
rename to samples/samples/razor.sample
diff --git a/resources/samples/reg.sample b/samples/samples/reg.sample
similarity index 100%
rename from resources/samples/reg.sample
rename to samples/samples/reg.sample
diff --git a/resources/samples/regexp.sample b/samples/samples/regexp.sample
similarity index 100%
rename from resources/samples/regexp.sample
rename to samples/samples/regexp.sample
diff --git a/resources/samples/rel.sample b/samples/samples/rel.sample
similarity index 100%
rename from resources/samples/rel.sample
rename to samples/samples/rel.sample
diff --git a/resources/samples/riscv.sample b/samples/samples/riscv.sample
similarity index 100%
rename from resources/samples/riscv.sample
rename to samples/samples/riscv.sample
diff --git a/resources/samples/rst.sample b/samples/samples/rst.sample
similarity index 100%
rename from resources/samples/rst.sample
rename to samples/samples/rst.sample
diff --git a/resources/samples/ruby.sample b/samples/samples/ruby.sample
similarity index 100%
rename from resources/samples/ruby.sample
rename to samples/samples/ruby.sample
diff --git a/resources/samples/rust.sample b/samples/samples/rust.sample
similarity index 100%
rename from resources/samples/rust.sample
rename to samples/samples/rust.sample
diff --git a/resources/samples/sas.sample b/samples/samples/sas.sample
similarity index 100%
rename from resources/samples/sas.sample
rename to samples/samples/sas.sample
diff --git a/resources/samples/sass.sample b/samples/samples/sass.sample
similarity index 100%
rename from resources/samples/sass.sample
rename to samples/samples/sass.sample
diff --git a/resources/samples/scala.sample b/samples/samples/scala.sample
similarity index 100%
rename from resources/samples/scala.sample
rename to samples/samples/scala.sample
diff --git a/resources/samples/scheme.sample b/samples/samples/scheme.sample
similarity index 100%
rename from resources/samples/scheme.sample
rename to samples/samples/scheme.sample
diff --git a/resources/samples/scss.sample b/samples/samples/scss.sample
similarity index 100%
rename from resources/samples/scss.sample
rename to samples/samples/scss.sample
diff --git a/resources/samples/sdbl.sample b/samples/samples/sdbl.sample
similarity index 100%
rename from resources/samples/sdbl.sample
rename to samples/samples/sdbl.sample
diff --git a/resources/samples/shaderlab.sample b/samples/samples/shaderlab.sample
similarity index 100%
rename from resources/samples/shaderlab.sample
rename to samples/samples/shaderlab.sample
diff --git a/resources/samples/shellscript.sample b/samples/samples/shellscript.sample
similarity index 100%
rename from resources/samples/shellscript.sample
rename to samples/samples/shellscript.sample
diff --git a/resources/samples/shellsession.sample b/samples/samples/shellsession.sample
similarity index 100%
rename from resources/samples/shellsession.sample
rename to samples/samples/shellsession.sample
diff --git a/resources/samples/smalltalk.sample b/samples/samples/smalltalk.sample
similarity index 100%
rename from resources/samples/smalltalk.sample
rename to samples/samples/smalltalk.sample
diff --git a/resources/samples/solidity.sample b/samples/samples/solidity.sample
similarity index 100%
rename from resources/samples/solidity.sample
rename to samples/samples/solidity.sample
diff --git a/resources/samples/soy.sample b/samples/samples/soy.sample
similarity index 100%
rename from resources/samples/soy.sample
rename to samples/samples/soy.sample
diff --git a/resources/samples/sparql.sample b/samples/samples/sparql.sample
similarity index 100%
rename from resources/samples/sparql.sample
rename to samples/samples/sparql.sample
diff --git a/resources/samples/splunk.sample b/samples/samples/splunk.sample
similarity index 100%
rename from resources/samples/splunk.sample
rename to samples/samples/splunk.sample
diff --git a/resources/samples/sql.sample b/samples/samples/sql.sample
similarity index 100%
rename from resources/samples/sql.sample
rename to samples/samples/sql.sample
diff --git a/resources/samples/ssh-config.sample b/samples/samples/ssh-config.sample
similarity index 100%
rename from resources/samples/ssh-config.sample
rename to samples/samples/ssh-config.sample
diff --git a/resources/samples/stata.sample b/samples/samples/stata.sample
similarity index 100%
rename from resources/samples/stata.sample
rename to samples/samples/stata.sample
diff --git a/resources/samples/stylus.sample b/samples/samples/stylus.sample
similarity index 100%
rename from resources/samples/stylus.sample
rename to samples/samples/stylus.sample
diff --git a/resources/samples/svelte.sample b/samples/samples/svelte.sample
similarity index 100%
rename from resources/samples/svelte.sample
rename to samples/samples/svelte.sample
diff --git a/resources/samples/swift.sample b/samples/samples/swift.sample
similarity index 100%
rename from resources/samples/swift.sample
rename to samples/samples/swift.sample
diff --git a/resources/samples/system-verilog.sample b/samples/samples/system-verilog.sample
similarity index 100%
rename from resources/samples/system-verilog.sample
rename to samples/samples/system-verilog.sample
diff --git a/resources/samples/systemd.sample b/samples/samples/systemd.sample
similarity index 100%
rename from resources/samples/systemd.sample
rename to samples/samples/systemd.sample
diff --git a/resources/samples/talonscript.sample b/samples/samples/talonscript.sample
similarity index 100%
rename from resources/samples/talonscript.sample
rename to samples/samples/talonscript.sample
diff --git a/resources/samples/tasl.sample b/samples/samples/tasl.sample
similarity index 100%
rename from resources/samples/tasl.sample
rename to samples/samples/tasl.sample
diff --git a/resources/samples/tcl.sample b/samples/samples/tcl.sample
similarity index 100%
rename from resources/samples/tcl.sample
rename to samples/samples/tcl.sample
diff --git a/resources/samples/templ.sample b/samples/samples/templ.sample
similarity index 100%
rename from resources/samples/templ.sample
rename to samples/samples/templ.sample
diff --git a/resources/samples/terraform.sample b/samples/samples/terraform.sample
similarity index 100%
rename from resources/samples/terraform.sample
rename to samples/samples/terraform.sample
diff --git a/resources/samples/tex.sample b/samples/samples/tex.sample
similarity index 100%
rename from resources/samples/tex.sample
rename to samples/samples/tex.sample
diff --git a/resources/samples/toml.sample b/samples/samples/toml.sample
similarity index 100%
rename from resources/samples/toml.sample
rename to samples/samples/toml.sample
diff --git a/resources/samples/ts-tags.sample b/samples/samples/ts-tags.sample
similarity index 100%
rename from resources/samples/ts-tags.sample
rename to samples/samples/ts-tags.sample
diff --git a/resources/samples/tsv.sample b/samples/samples/tsv.sample
similarity index 100%
rename from resources/samples/tsv.sample
rename to samples/samples/tsv.sample
diff --git a/resources/samples/tsx.sample b/samples/samples/tsx.sample
similarity index 100%
rename from resources/samples/tsx.sample
rename to samples/samples/tsx.sample
diff --git a/resources/samples/turtle.sample b/samples/samples/turtle.sample
similarity index 100%
rename from resources/samples/turtle.sample
rename to samples/samples/turtle.sample
diff --git a/resources/samples/twig.sample b/samples/samples/twig.sample
similarity index 100%
rename from resources/samples/twig.sample
rename to samples/samples/twig.sample
diff --git a/resources/samples/typescript.sample b/samples/samples/typescript.sample
similarity index 100%
rename from resources/samples/typescript.sample
rename to samples/samples/typescript.sample
diff --git a/resources/samples/typespec.sample b/samples/samples/typespec.sample
similarity index 100%
rename from resources/samples/typespec.sample
rename to samples/samples/typespec.sample
diff --git a/resources/samples/typst.sample b/samples/samples/typst.sample
similarity index 100%
rename from resources/samples/typst.sample
rename to samples/samples/typst.sample
diff --git a/resources/samples/v.sample b/samples/samples/v.sample
similarity index 100%
rename from resources/samples/v.sample
rename to samples/samples/v.sample
diff --git a/resources/samples/vala.sample b/samples/samples/vala.sample
similarity index 100%
rename from resources/samples/vala.sample
rename to samples/samples/vala.sample
diff --git a/resources/samples/vb.sample b/samples/samples/vb.sample
similarity index 100%
rename from resources/samples/vb.sample
rename to samples/samples/vb.sample
diff --git a/resources/samples/verilog.sample b/samples/samples/verilog.sample
similarity index 100%
rename from resources/samples/verilog.sample
rename to samples/samples/verilog.sample
diff --git a/resources/samples/vhdl.sample b/samples/samples/vhdl.sample
similarity index 100%
rename from resources/samples/vhdl.sample
rename to samples/samples/vhdl.sample
diff --git a/resources/samples/viml.sample b/samples/samples/viml.sample
similarity index 100%
rename from resources/samples/viml.sample
rename to samples/samples/viml.sample
diff --git a/resources/samples/vue-html.sample b/samples/samples/vue-html.sample
similarity index 100%
rename from resources/samples/vue-html.sample
rename to samples/samples/vue-html.sample
diff --git a/resources/samples/vue.sample b/samples/samples/vue.sample
similarity index 100%
rename from resources/samples/vue.sample
rename to samples/samples/vue.sample
diff --git a/resources/samples/vyper.sample b/samples/samples/vyper.sample
similarity index 100%
rename from resources/samples/vyper.sample
rename to samples/samples/vyper.sample
diff --git a/resources/samples/wasm.sample b/samples/samples/wasm.sample
similarity index 100%
rename from resources/samples/wasm.sample
rename to samples/samples/wasm.sample
diff --git a/resources/samples/wenyan.sample b/samples/samples/wenyan.sample
similarity index 100%
rename from resources/samples/wenyan.sample
rename to samples/samples/wenyan.sample
diff --git a/resources/samples/wgsl.sample b/samples/samples/wgsl.sample
similarity index 100%
rename from resources/samples/wgsl.sample
rename to samples/samples/wgsl.sample
diff --git a/resources/samples/wikitext.sample b/samples/samples/wikitext.sample
similarity index 100%
rename from resources/samples/wikitext.sample
rename to samples/samples/wikitext.sample
diff --git a/resources/samples/wolfram.sample b/samples/samples/wolfram.sample
similarity index 100%
rename from resources/samples/wolfram.sample
rename to samples/samples/wolfram.sample
diff --git a/resources/samples/xml.sample b/samples/samples/xml.sample
similarity index 100%
rename from resources/samples/xml.sample
rename to samples/samples/xml.sample
diff --git a/resources/samples/xsl.sample b/samples/samples/xsl.sample
similarity index 100%
rename from resources/samples/xsl.sample
rename to samples/samples/xsl.sample
diff --git a/resources/samples/yaml.sample b/samples/samples/yaml.sample
similarity index 100%
rename from resources/samples/yaml.sample
rename to samples/samples/yaml.sample
diff --git a/resources/samples/zenscript.sample b/samples/samples/zenscript.sample
similarity index 100%
rename from resources/samples/zenscript.sample
rename to samples/samples/zenscript.sample
diff --git a/resources/samples/zig.sample b/samples/samples/zig.sample
similarity index 100%
rename from resources/samples/zig.sample
rename to samples/samples/zig.sample
diff --git a/resources/samples/zsh.sample b/samples/samples/zsh.sample
similarity index 100%
rename from resources/samples/zsh.sample
rename to samples/samples/zsh.sample
diff --git a/samples/serve.php b/samples/serve.php
new file mode 100644
index 0000000..0438011
--- /dev/null
+++ b/samples/serve.php
@@ -0,0 +1,109 @@
+<?php
+
+set_time_limit(2);
+
+use Phiki\Environment\Environment;
+use Phiki\Phiki;
+use Phiki\Theme\Theme;
+
+require_once __DIR__.'/../vendor/autoload.php';
+
+set_error_handler(function ($severity, $message, $file, $line) {
+    throw new ErrorException($message, 0, $severity, $file, $line);
+});
+
+$grammar = $_GET['grammar'] ?? 'php';
+$withGutter = ($_GET['gutter'] ?? false) === 'on';
+$environment = Environment::default()->enableStrictMode();
+/** @var \Phiki\Grammar\GrammarRepository $repository */
+$repository = $environment->getGrammarRepository();
+$grammars = $repository->getAllGrammarNames();
+natsort($grammars);
+
+$sample = file_get_contents(__DIR__.'/samples/'.$grammar.'.sample');
+$tokens = (new Phiki($environment))->codeToTokens($sample, $grammar);
+$html = (new Phiki($environment))->codeToHtml($sample, $grammar, ['light' => Theme::GithubLight, 'dark' => Theme::GithubDark], $withGutter);
+
+?>
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Phiki Sample Explorer</title>
+    <script src="https://cdn.tailwindcss.com?plugins=forms"></script>
+    <script src="//unpkg.com/alpinejs" defer></script>
+    <style>
+        @media (prefers-color-scheme: dark) {
+
+            html.dark .phiki,
+            html.dark .phiki span {
+                color: var(--phiki-dark-color) !important;
+                background-color: var(--phiki-dark-background-color) !important;
+                font-style: var(--phiki-dark-font-style) !important;
+                font-weight: var(--phiki-dark-font-weight) !important;
+                text-decoration: var(--phiki-dark-text-decoration) !important;
+            }
+        }
+
+        pre {
+            padding: 0.875rem;
+            padding-left: 0.5rem;
+            font-size: 0.875rem !important;
+            line-height: 1.5 !important;
+            border-radius: 10px;
+        }
+
+        code {
+            font-family: 'Fira Code';
+        }
+
+        pre code span[data-line]::before {
+            content: attr(data-line);
+            display: inline-block;
+            width: 1.7rem;
+            margin-right: 1rem;
+            color: #666;
+            text-align: right;
+        }
+
+        pre code span.line-number {
+            padding-right: 10px;
+        }
+    </style>
+</head>
+
+<body class="antialiased bg-neutral-950 text-white p-8 space-y-8">
+    <header>
+        <h1 class="font-bold text-xl">
+            Phiki Sample Explorer
+        </h1>
+    </header>
+
+    <main class="space-y-8">
+        <form
+            x-data
+            class="flex items-center gap-x-4">
+            <select name="grammar" x-on:change="$root.submit()" class="text-neutral-950">
+                <?php foreach ($grammars as $g) { ?>
+                    <option value="<?= $g ?>" <?= $grammar === $g ? 'selected' : '' ?>>
+                        <?= $g ?>
+                    </option>
+                <?php } ?>
+            </select>
+
+            <div class="flex items-center gap-x-2.5">
+                <input type="checkbox" name="gutter" id="gutter" x-on:change="$root.submit()" <?= $withGutter ? 'checked' : '' ?>>
+                <label for="gutter">With gutter?</label>
+            </div>
+        </form>
+
+        <?= $html ?>
+
+        <?php dump($tokens); ?>
+    </main>
+</body>
+
+</html>
diff --git a/src/Grammar/DefaultGrammars.php b/src/Grammar/DefaultGrammars.php
index 15ba87e..d7a7a42 100644
--- a/src/Grammar/DefaultGrammars.php
+++ b/src/Grammar/DefaultGrammars.php
@@ -2,452 +2,455 @@
 
 namespace Phiki\Grammar;
 
-/** @internal */
 abstract class DefaultGrammars
 {
     final const NAMES_TO_PATHS = [
-        'txt' => __DIR__.'/../../resources/languages/txt.json',
-        'astro' => __DIR__.'/../../resources/languages/astro.json',
-        'hy' => __DIR__.'/../../resources/languages/hy.json',
-        'nim' => __DIR__.'/../../resources/languages/nim.json',
-        'cpp' => __DIR__.'/../../resources/languages/cpp.json',
-        'jinja' => __DIR__.'/../../resources/languages/jinja.json',
-        'coq' => __DIR__.'/../../resources/languages/coq.json',
-        'templ' => __DIR__.'/../../resources/languages/templ.json',
-        'glimmer-ts' => __DIR__.'/../../resources/languages/glimmer-ts.json',
-        'angular-html' => __DIR__.'/../../resources/languages/angular-html.json',
-        'cmake' => __DIR__.'/../../resources/languages/cmake.json',
-        'mdx' => __DIR__.'/../../resources/languages/mdx.json',
-        'nix' => __DIR__.'/../../resources/languages/nix.json',
-        'gdresource' => __DIR__.'/../../resources/languages/gdresource.json',
-        'haxe' => __DIR__.'/../../resources/languages/haxe.json',
-        'ada' => __DIR__.'/../../resources/languages/ada.json',
-        'powerquery' => __DIR__.'/../../resources/languages/powerquery.json',
-        'fluent' => __DIR__.'/../../resources/languages/fluent.json',
-        'objective-c' => __DIR__.'/../../resources/languages/objective-c.json',
-        'elixir' => __DIR__.'/../../resources/languages/elixir.json',
-        'diff' => __DIR__.'/../../resources/languages/diff.json',
-        'java' => __DIR__.'/../../resources/languages/java.json',
-        'glsl' => __DIR__.'/../../resources/languages/glsl.json',
-        'mojo' => __DIR__.'/../../resources/languages/mojo.json',
-        'sparql' => __DIR__.'/../../resources/languages/sparql.json',
-        'bicep' => __DIR__.'/../../resources/languages/bicep.json',
-        'csv' => __DIR__.'/../../resources/languages/csv.json',
-        'swift' => __DIR__.'/../../resources/languages/swift.json',
-        'ssh-config' => __DIR__.'/../../resources/languages/ssh-config.json',
-        'edge' => __DIR__.'/../../resources/languages/edge.json',
-        'narrat' => __DIR__.'/../../resources/languages/narrat.json',
-        'tasl' => __DIR__.'/../../resources/languages/tasl.json',
-        'nushell' => __DIR__.'/../../resources/languages/nushell.json',
-        'erb' => __DIR__.'/../../resources/languages/erb.json',
-        'move' => __DIR__.'/../../resources/languages/move.json',
-        'scheme' => __DIR__.'/../../resources/languages/scheme.json',
-        'mipsasm' => __DIR__.'/../../resources/languages/mipsasm.json',
-        'rst' => __DIR__.'/../../resources/languages/rst.json',
-        'shellscript' => __DIR__.'/../../resources/languages/shellscript.json',
-        'apache' => __DIR__.'/../../resources/languages/apache.json',
-        'wgsl' => __DIR__.'/../../resources/languages/wgsl.json',
-        'fortran-free-form' => __DIR__.'/../../resources/languages/fortran-free-form.json',
-        'ini' => __DIR__.'/../../resources/languages/ini.json',
-        'make' => __DIR__.'/../../resources/languages/make.json',
-        'ts-tags' => __DIR__.'/../../resources/languages/ts-tags.json',
-        'stylus' => __DIR__.'/../../resources/languages/stylus.json',
-        'jsx' => __DIR__.'/../../resources/languages/jsx.json',
-        'jsonl' => __DIR__.'/../../resources/languages/jsonl.json',
-        'twig' => __DIR__.'/../../resources/languages/twig.json',
-        'clojure' => __DIR__.'/../../resources/languages/clojure.json',
-        'svelte' => __DIR__.'/../../resources/languages/svelte.json',
-        'xml' => __DIR__.'/../../resources/languages/xml.json',
-        'jssm' => __DIR__.'/../../resources/languages/jssm.json',
-        'erlang' => __DIR__.'/../../resources/languages/erlang.json',
-        'applescript' => __DIR__.'/../../resources/languages/applescript.json',
-        'viml' => __DIR__.'/../../resources/languages/viml.json',
-        'razor' => __DIR__.'/../../resources/languages/razor.json',
-        'apex' => __DIR__.'/../../resources/languages/apex.json',
-        'berry' => __DIR__.'/../../resources/languages/berry.json',
-        'dream-maker' => __DIR__.'/../../resources/languages/dream-maker.json',
-        'wolfram' => __DIR__.'/../../resources/languages/wolfram.json',
-        'cobol' => __DIR__.'/../../resources/languages/cobol.json',
-        'proto' => __DIR__.'/../../resources/languages/proto.json',
-        'genie' => __DIR__.'/../../resources/languages/genie.json',
-        'wasm' => __DIR__.'/../../resources/languages/wasm.json',
-        'handlebars' => __DIR__.'/../../resources/languages/handlebars.json',
-        'zig' => __DIR__.'/../../resources/languages/zig.json',
-        'vhdl' => __DIR__.'/../../resources/languages/vhdl.json',
-        'go' => __DIR__.'/../../resources/languages/go.json',
-        'fish' => __DIR__.'/../../resources/languages/fish.json',
-        'solidity' => __DIR__.'/../../resources/languages/solidity.json',
-        'sas' => __DIR__.'/../../resources/languages/sas.json',
-        'fortran-fixed-form' => __DIR__.'/../../resources/languages/fortran-fixed-form.json',
-        'r' => __DIR__.'/../../resources/languages/r.json',
-        'fennel' => __DIR__.'/../../resources/languages/fennel.json',
-        'ruby' => __DIR__.'/../../resources/languages/ruby.json',
-        'log' => __DIR__.'/../../resources/languages/log.json',
-        'vala' => __DIR__.'/../../resources/languages/vala.json',
-        'splunk' => __DIR__.'/../../resources/languages/splunk.json',
-        'lua' => __DIR__.'/../../resources/languages/lua.json',
-        'gnuplot' => __DIR__.'/../../resources/languages/gnuplot.json',
-        'regexp' => __DIR__.'/../../resources/languages/regexp.json',
-        'markdown' => __DIR__.'/../../resources/languages/markdown.json',
-        'ballerina' => __DIR__.'/../../resources/languages/ballerina.json',
-        'xsl' => __DIR__.'/../../resources/languages/xsl.json',
-        'systemd' => __DIR__.'/../../resources/languages/systemd.json',
-        'coffee' => __DIR__.'/../../resources/languages/coffee.json',
-        'haml' => __DIR__.'/../../resources/languages/haml.json',
-        'wikitext' => __DIR__.'/../../resources/languages/wikitext.json',
-        'kusto' => __DIR__.'/../../resources/languages/kusto.json',
-        'ocaml' => __DIR__.'/../../resources/languages/ocaml.json',
-        'cue' => __DIR__.'/../../resources/languages/cue.json',
-        'nextflow' => __DIR__.'/../../resources/languages/nextflow.json',
-        'git-rebase' => __DIR__.'/../../resources/languages/git-rebase.json',
-        'cypher' => __DIR__.'/../../resources/languages/cypher.json',
-        'tsx' => __DIR__.'/../../resources/languages/tsx.json',
-        'bibtex' => __DIR__.'/../../resources/languages/bibtex.json',
-        'pug' => __DIR__.'/../../resources/languages/pug.json',
-        'glimmer-js' => __DIR__.'/../../resources/languages/glimmer-js.json',
-        'julia' => __DIR__.'/../../resources/languages/julia.json',
-        'beancount' => __DIR__.'/../../resources/languages/beancount.json',
-        'puppet' => __DIR__.'/../../resources/languages/puppet.json',
-        'bsl' => __DIR__.'/../../resources/languages/bsl.json',
-        'http' => __DIR__.'/../../resources/languages/http.json',
-        'csharp' => __DIR__.'/../../resources/languages/csharp.json',
-        'jison' => __DIR__.'/../../resources/languages/jison.json',
-        'purescript' => __DIR__.'/../../resources/languages/purescript.json',
-        'actionscript-3' => __DIR__.'/../../resources/languages/actionscript-3.json',
-        'shellsession' => __DIR__.'/../../resources/languages/shellsession.json',
-        'system-verilog' => __DIR__.'/../../resources/languages/system-verilog.json',
-        'gdscript' => __DIR__.'/../../resources/languages/gdscript.json',
-        'luau' => __DIR__.'/../../resources/languages/luau.json',
-        'toml' => __DIR__.'/../../resources/languages/toml.json',
-        'php' => __DIR__.'/../../resources/languages/php.json',
-        'typst' => __DIR__.'/../../resources/languages/typst.json',
-        'postcss' => __DIR__.'/../../resources/languages/postcss.json',
-        'prisma' => __DIR__.'/../../resources/languages/prisma.json',
-        'fsharp' => __DIR__.'/../../resources/languages/fsharp.json',
-        'apl' => __DIR__.'/../../resources/languages/apl.json',
-        'sql' => __DIR__.'/../../resources/languages/sql.json',
-        'objective-cpp' => __DIR__.'/../../resources/languages/objective-cpp.json',
-        'logo' => __DIR__.'/../../resources/languages/logo.json',
-        'blade' => __DIR__.'/../../resources/languages/blade.json',
-        'yaml' => __DIR__.'/../../resources/languages/yaml.json',
-        'scala' => __DIR__.'/../../resources/languages/scala.json',
-        'codeql' => __DIR__.'/../../resources/languages/codeql.json',
-        'crystal' => __DIR__.'/../../resources/languages/crystal.json',
-        'sdbl' => __DIR__.'/../../resources/languages/sdbl.json',
-        'hjson' => __DIR__.'/../../resources/languages/hjson.json',
-        'awk' => __DIR__.'/../../resources/languages/awk.json',
-        'docker' => __DIR__.'/../../resources/languages/docker.json',
-        'dax' => __DIR__.'/../../resources/languages/dax.json',
-        'angular-ts' => __DIR__.'/../../resources/languages/angular-ts.json',
-        'terraform' => __DIR__.'/../../resources/languages/terraform.json',
-        'typespec' => __DIR__.'/../../resources/languages/typespec.json',
-        'codeowners' => __DIR__.'/../../resources/languages/codeowners.json',
-        'rel' => __DIR__.'/../../resources/languages/rel.json',
-        'vue-html' => __DIR__.'/../../resources/languages/vue-html.json',
-        'abap' => __DIR__.'/../../resources/languages/abap.json',
-        'git-commit' => __DIR__.'/../../resources/languages/git-commit.json',
-        'rust' => __DIR__.'/../../resources/languages/rust.json',
-        'polar' => __DIR__.'/../../resources/languages/polar.json',
-        'javascript' => __DIR__.'/../../resources/languages/javascript.json',
-        'prolog' => __DIR__.'/../../resources/languages/prolog.json',
-        'dart' => __DIR__.'/../../resources/languages/dart.json',
-        'marko' => __DIR__.'/../../resources/languages/marko.json',
-        'asciidoc' => __DIR__.'/../../resources/languages/asciidoc.json',
-        'wenyan' => __DIR__.'/../../resources/languages/wenyan.json',
-        'elm' => __DIR__.'/../../resources/languages/elm.json',
-        'd' => __DIR__.'/../../resources/languages/d.json',
-        'hlsl' => __DIR__.'/../../resources/languages/hlsl.json',
-        'po' => __DIR__.'/../../resources/languages/po.json',
-        'shaderlab' => __DIR__.'/../../resources/languages/shaderlab.json',
-        'stata' => __DIR__.'/../../resources/languages/stata.json',
-        'nginx' => __DIR__.'/../../resources/languages/nginx.json',
-        'ara' => __DIR__.'/../../resources/languages/ara.json',
-        'json' => __DIR__.'/../../resources/languages/json.json',
-        'css' => __DIR__.'/../../resources/languages/css.json',
-        'tsv' => __DIR__.'/../../resources/languages/tsv.json',
-        'vb' => __DIR__.'/../../resources/languages/vb.json',
-        'hcl' => __DIR__.'/../../resources/languages/hcl.json',
-        'plsql' => __DIR__.'/../../resources/languages/plsql.json',
-        'pascal' => __DIR__.'/../../resources/languages/pascal.json',
-        'c' => __DIR__.'/../../resources/languages/c.json',
-        'turtle' => __DIR__.'/../../resources/languages/turtle.json',
-        'qmldir' => __DIR__.'/../../resources/languages/qmldir.json',
-        'jinja-html' => __DIR__.'/../../resources/languages/jinja-html.json',
-        'racket' => __DIR__.'/../../resources/languages/racket.json',
-        'scss' => __DIR__.'/../../resources/languages/scss.json',
-        'hxml' => __DIR__.'/../../resources/languages/hxml.json',
-        'qml' => __DIR__.'/../../resources/languages/qml.json',
-        'common-lisp' => __DIR__.'/../../resources/languages/common-lisp.json',
-        'lean' => __DIR__.'/../../resources/languages/lean.json',
-        'tex' => __DIR__.'/../../resources/languages/tex.json',
-        'jsonnet' => __DIR__.'/../../resources/languages/jsonnet.json',
-        'vyper' => __DIR__.'/../../resources/languages/vyper.json',
-        'html' => __DIR__.'/../../resources/languages/html.json',
-        'liquid' => __DIR__.'/../../resources/languages/liquid.json',
-        'emacs-lisp' => __DIR__.'/../../resources/languages/emacs-lisp.json',
-        'v' => __DIR__.'/../../resources/languages/v.json',
-        'hack' => __DIR__.'/../../resources/languages/hack.json',
-        'latex' => __DIR__.'/../../resources/languages/latex.json',
-        'perl' => __DIR__.'/../../resources/languages/perl.json',
-        'gleam' => __DIR__.'/../../resources/languages/gleam.json',
-        'cairo' => __DIR__.'/../../resources/languages/cairo.json',
-        'matlab' => __DIR__.'/../../resources/languages/matlab.json',
-        'jsonc' => __DIR__.'/../../resources/languages/jsonc.json',
-        'dotenv' => __DIR__.'/../../resources/languages/dotenv.json',
-        'raku' => __DIR__.'/../../resources/languages/raku.json',
-        'less' => __DIR__.'/../../resources/languages/less.json',
-        'bat' => __DIR__.'/../../resources/languages/bat.json',
-        'clarity' => __DIR__.'/../../resources/languages/clarity.json',
-        'reg' => __DIR__.'/../../resources/languages/reg.json',
-        'cpp-macro' => __DIR__.'/../../resources/languages/cpp-macro.json',
-        'tcl' => __DIR__.'/../../resources/languages/tcl.json',
-        'html-derivative' => __DIR__.'/../../resources/languages/html-derivative.json',
-        'powershell' => __DIR__.'/../../resources/languages/powershell.json',
-        'graphql' => __DIR__.'/../../resources/languages/graphql.json',
-        'haskell' => __DIR__.'/../../resources/languages/haskell.json',
-        'gdshader' => __DIR__.'/../../resources/languages/gdshader.json',
-        'groovy' => __DIR__.'/../../resources/languages/groovy.json',
-        'qss' => __DIR__.'/../../resources/languages/qss.json',
-        'verilog' => __DIR__.'/../../resources/languages/verilog.json',
-        'typescript' => __DIR__.'/../../resources/languages/typescript.json',
-        'kotlin' => __DIR__.'/../../resources/languages/kotlin.json',
-        'gherkin' => __DIR__.'/../../resources/languages/gherkin.json',
-        'soy' => __DIR__.'/../../resources/languages/soy.json',
-        'python' => __DIR__.'/../../resources/languages/python.json',
-        'sass' => __DIR__.'/../../resources/languages/sass.json',
-        'talonscript' => __DIR__.'/../../resources/languages/talonscript.json',
-        'vue' => __DIR__.'/../../resources/languages/vue.json',
-        'zenscript' => __DIR__.'/../../resources/languages/zenscript.json',
-        'imba' => __DIR__.'/../../resources/languages/imba.json',
-        'riscv' => __DIR__.'/../../resources/languages/riscv.json',
-        'smalltalk' => __DIR__.'/../../resources/languages/smalltalk.json',
-        'json5' => __DIR__.'/../../resources/languages/json5.json',
-        'cadence' => __DIR__.'/../../resources/languages/cadence.json',
-        'desktop' => __DIR__.'/../../resources/languages/desktop.json',
-        'asm' => __DIR__.'/../../resources/languages/asm.json',
-        'antlers' => __DIR__.'/../../resources/languages/antlers.json',
+        'txt' => __DIR__ . '/../../resources/languages/txt.json',
+        "astro" => __DIR__ . "/../../resources/languages/astro.json",
+"hy" => __DIR__ . "/../../resources/languages/hy.json",
+"nim" => __DIR__ . "/../../resources/languages/nim.json",
+"cpp" => __DIR__ . "/../../resources/languages/cpp.json",
+"jinja" => __DIR__ . "/../../resources/languages/jinja.json",
+"coq" => __DIR__ . "/../../resources/languages/coq.json",
+"templ" => __DIR__ . "/../../resources/languages/templ.json",
+"glimmer-ts" => __DIR__ . "/../../resources/languages/glimmer-ts.json",
+"angular-html" => __DIR__ . "/../../resources/languages/angular-html.json",
+"cmake" => __DIR__ . "/../../resources/languages/cmake.json",
+"mdx" => __DIR__ . "/../../resources/languages/mdx.json",
+"nix" => __DIR__ . "/../../resources/languages/nix.json",
+"gdresource" => __DIR__ . "/../../resources/languages/gdresource.json",
+"haxe" => __DIR__ . "/../../resources/languages/haxe.json",
+"ada" => __DIR__ . "/../../resources/languages/ada.json",
+"powerquery" => __DIR__ . "/../../resources/languages/powerquery.json",
+"fluent" => __DIR__ . "/../../resources/languages/fluent.json",
+"objective-c" => __DIR__ . "/../../resources/languages/objective-c.json",
+"elixir" => __DIR__ . "/../../resources/languages/elixir.json",
+"diff" => __DIR__ . "/../../resources/languages/diff.json",
+"java" => __DIR__ . "/../../resources/languages/java.json",
+"glsl" => __DIR__ . "/../../resources/languages/glsl.json",
+"mojo" => __DIR__ . "/../../resources/languages/mojo.json",
+"sparql" => __DIR__ . "/../../resources/languages/sparql.json",
+"bicep" => __DIR__ . "/../../resources/languages/bicep.json",
+"csv" => __DIR__ . "/../../resources/languages/csv.json",
+"swift" => __DIR__ . "/../../resources/languages/swift.json",
+"ssh-config" => __DIR__ . "/../../resources/languages/ssh-config.json",
+"edge" => __DIR__ . "/../../resources/languages/edge.json",
+"narrat" => __DIR__ . "/../../resources/languages/narrat.json",
+"tasl" => __DIR__ . "/../../resources/languages/tasl.json",
+"nushell" => __DIR__ . "/../../resources/languages/nushell.json",
+"erb" => __DIR__ . "/../../resources/languages/erb.json",
+"move" => __DIR__ . "/../../resources/languages/move.json",
+"scheme" => __DIR__ . "/../../resources/languages/scheme.json",
+"mipsasm" => __DIR__ . "/../../resources/languages/mipsasm.json",
+"rst" => __DIR__ . "/../../resources/languages/rst.json",
+"shellscript" => __DIR__ . "/../../resources/languages/shellscript.json",
+"apache" => __DIR__ . "/../../resources/languages/apache.json",
+"wgsl" => __DIR__ . "/../../resources/languages/wgsl.json",
+"fortran-free-form" => __DIR__ . "/../../resources/languages/fortran-free-form.json",
+"ini" => __DIR__ . "/../../resources/languages/ini.json",
+"make" => __DIR__ . "/../../resources/languages/make.json",
+"ts-tags" => __DIR__ . "/../../resources/languages/ts-tags.json",
+"stylus" => __DIR__ . "/../../resources/languages/stylus.json",
+"jsx" => __DIR__ . "/../../resources/languages/jsx.json",
+"jsonl" => __DIR__ . "/../../resources/languages/jsonl.json",
+"llvm" => __DIR__ . "/../../resources/languages/llvm.json",
+"twig" => __DIR__ . "/../../resources/languages/twig.json",
+"clojure" => __DIR__ . "/../../resources/languages/clojure.json",
+"svelte" => __DIR__ . "/../../resources/languages/svelte.json",
+"xml" => __DIR__ . "/../../resources/languages/xml.json",
+"jssm" => __DIR__ . "/../../resources/languages/jssm.json",
+"erlang" => __DIR__ . "/../../resources/languages/erlang.json",
+"applescript" => __DIR__ . "/../../resources/languages/applescript.json",
+"viml" => __DIR__ . "/../../resources/languages/viml.json",
+"razor" => __DIR__ . "/../../resources/languages/razor.json",
+"apex" => __DIR__ . "/../../resources/languages/apex.json",
+"berry" => __DIR__ . "/../../resources/languages/berry.json",
+"dream-maker" => __DIR__ . "/../../resources/languages/dream-maker.json",
+"wolfram" => __DIR__ . "/../../resources/languages/wolfram.json",
+"cobol" => __DIR__ . "/../../resources/languages/cobol.json",
+"proto" => __DIR__ . "/../../resources/languages/proto.json",
+"genie" => __DIR__ . "/../../resources/languages/genie.json",
+"wasm" => __DIR__ . "/../../resources/languages/wasm.json",
+"handlebars" => __DIR__ . "/../../resources/languages/handlebars.json",
+"zig" => __DIR__ . "/../../resources/languages/zig.json",
+"vhdl" => __DIR__ . "/../../resources/languages/vhdl.json",
+"go" => __DIR__ . "/../../resources/languages/go.json",
+"fish" => __DIR__ . "/../../resources/languages/fish.json",
+"solidity" => __DIR__ . "/../../resources/languages/solidity.json",
+"sas" => __DIR__ . "/../../resources/languages/sas.json",
+"fortran-fixed-form" => __DIR__ . "/../../resources/languages/fortran-fixed-form.json",
+"r" => __DIR__ . "/../../resources/languages/r.json",
+"fennel" => __DIR__ . "/../../resources/languages/fennel.json",
+"ruby" => __DIR__ . "/../../resources/languages/ruby.json",
+"log" => __DIR__ . "/../../resources/languages/log.json",
+"vala" => __DIR__ . "/../../resources/languages/vala.json",
+"splunk" => __DIR__ . "/../../resources/languages/splunk.json",
+"lua" => __DIR__ . "/../../resources/languages/lua.json",
+"gnuplot" => __DIR__ . "/../../resources/languages/gnuplot.json",
+"regexp" => __DIR__ . "/../../resources/languages/regexp.json",
+"markdown" => __DIR__ . "/../../resources/languages/markdown.json",
+"ballerina" => __DIR__ . "/../../resources/languages/ballerina.json",
+"xsl" => __DIR__ . "/../../resources/languages/xsl.json",
+"systemd" => __DIR__ . "/../../resources/languages/systemd.json",
+"coffee" => __DIR__ . "/../../resources/languages/coffee.json",
+"haml" => __DIR__ . "/../../resources/languages/haml.json",
+"wikitext" => __DIR__ . "/../../resources/languages/wikitext.json",
+"kusto" => __DIR__ . "/../../resources/languages/kusto.json",
+"ocaml" => __DIR__ . "/../../resources/languages/ocaml.json",
+"cue" => __DIR__ . "/../../resources/languages/cue.json",
+"nextflow" => __DIR__ . "/../../resources/languages/nextflow.json",
+"git-rebase" => __DIR__ . "/../../resources/languages/git-rebase.json",
+"cypher" => __DIR__ . "/../../resources/languages/cypher.json",
+"tsx" => __DIR__ . "/../../resources/languages/tsx.json",
+"bibtex" => __DIR__ . "/../../resources/languages/bibtex.json",
+"pug" => __DIR__ . "/../../resources/languages/pug.json",
+"glimmer-js" => __DIR__ . "/../../resources/languages/glimmer-js.json",
+"julia" => __DIR__ . "/../../resources/languages/julia.json",
+"beancount" => __DIR__ . "/../../resources/languages/beancount.json",
+"puppet" => __DIR__ . "/../../resources/languages/puppet.json",
+"bsl" => __DIR__ . "/../../resources/languages/bsl.json",
+"http" => __DIR__ . "/../../resources/languages/http.json",
+"csharp" => __DIR__ . "/../../resources/languages/csharp.json",
+"jison" => __DIR__ . "/../../resources/languages/jison.json",
+"purescript" => __DIR__ . "/../../resources/languages/purescript.json",
+"actionscript-3" => __DIR__ . "/../../resources/languages/actionscript-3.json",
+"shellsession" => __DIR__ . "/../../resources/languages/shellsession.json",
+"system-verilog" => __DIR__ . "/../../resources/languages/system-verilog.json",
+"gdscript" => __DIR__ . "/../../resources/languages/gdscript.json",
+"luau" => __DIR__ . "/../../resources/languages/luau.json",
+"toml" => __DIR__ . "/../../resources/languages/toml.json",
+"php" => __DIR__ . "/../../resources/languages/php.json",
+"typst" => __DIR__ . "/../../resources/languages/typst.json",
+"postcss" => __DIR__ . "/../../resources/languages/postcss.json",
+"prisma" => __DIR__ . "/../../resources/languages/prisma.json",
+"fsharp" => __DIR__ . "/../../resources/languages/fsharp.json",
+"apl" => __DIR__ . "/../../resources/languages/apl.json",
+"wit" => __DIR__ . "/../../resources/languages/wit.json",
+"sql" => __DIR__ . "/../../resources/languages/sql.json",
+"objective-cpp" => __DIR__ . "/../../resources/languages/objective-cpp.json",
+"logo" => __DIR__ . "/../../resources/languages/logo.json",
+"blade" => __DIR__ . "/../../resources/languages/blade.json",
+"yaml" => __DIR__ . "/../../resources/languages/yaml.json",
+"scala" => __DIR__ . "/../../resources/languages/scala.json",
+"codeql" => __DIR__ . "/../../resources/languages/codeql.json",
+"crystal" => __DIR__ . "/../../resources/languages/crystal.json",
+"sdbl" => __DIR__ . "/../../resources/languages/sdbl.json",
+"hjson" => __DIR__ . "/../../resources/languages/hjson.json",
+"awk" => __DIR__ . "/../../resources/languages/awk.json",
+"docker" => __DIR__ . "/../../resources/languages/docker.json",
+"dax" => __DIR__ . "/../../resources/languages/dax.json",
+"angular-ts" => __DIR__ . "/../../resources/languages/angular-ts.json",
+"terraform" => __DIR__ . "/../../resources/languages/terraform.json",
+"typespec" => __DIR__ . "/../../resources/languages/typespec.json",
+"codeowners" => __DIR__ . "/../../resources/languages/codeowners.json",
+"rel" => __DIR__ . "/../../resources/languages/rel.json",
+"vue-html" => __DIR__ . "/../../resources/languages/vue-html.json",
+"abap" => __DIR__ . "/../../resources/languages/abap.json",
+"git-commit" => __DIR__ . "/../../resources/languages/git-commit.json",
+"rust" => __DIR__ . "/../../resources/languages/rust.json",
+"polar" => __DIR__ . "/../../resources/languages/polar.json",
+"javascript" => __DIR__ . "/../../resources/languages/javascript.json",
+"prolog" => __DIR__ . "/../../resources/languages/prolog.json",
+"dart" => __DIR__ . "/../../resources/languages/dart.json",
+"marko" => __DIR__ . "/../../resources/languages/marko.json",
+"asciidoc" => __DIR__ . "/../../resources/languages/asciidoc.json",
+"wenyan" => __DIR__ . "/../../resources/languages/wenyan.json",
+"elm" => __DIR__ . "/../../resources/languages/elm.json",
+"d" => __DIR__ . "/../../resources/languages/d.json",
+"hlsl" => __DIR__ . "/../../resources/languages/hlsl.json",
+"po" => __DIR__ . "/../../resources/languages/po.json",
+"shaderlab" => __DIR__ . "/../../resources/languages/shaderlab.json",
+"stata" => __DIR__ . "/../../resources/languages/stata.json",
+"nginx" => __DIR__ . "/../../resources/languages/nginx.json",
+"ara" => __DIR__ . "/../../resources/languages/ara.json",
+"json" => __DIR__ . "/../../resources/languages/json.json",
+"css" => __DIR__ . "/../../resources/languages/css.json",
+"tsv" => __DIR__ . "/../../resources/languages/tsv.json",
+"vb" => __DIR__ . "/../../resources/languages/vb.json",
+"hcl" => __DIR__ . "/../../resources/languages/hcl.json",
+"plsql" => __DIR__ . "/../../resources/languages/plsql.json",
+"pascal" => __DIR__ . "/../../resources/languages/pascal.json",
+"c" => __DIR__ . "/../../resources/languages/c.json",
+"turtle" => __DIR__ . "/../../resources/languages/turtle.json",
+"qmldir" => __DIR__ . "/../../resources/languages/qmldir.json",
+"jinja-html" => __DIR__ . "/../../resources/languages/jinja-html.json",
+"racket" => __DIR__ . "/../../resources/languages/racket.json",
+"scss" => __DIR__ . "/../../resources/languages/scss.json",
+"hxml" => __DIR__ . "/../../resources/languages/hxml.json",
+"qml" => __DIR__ . "/../../resources/languages/qml.json",
+"common-lisp" => __DIR__ . "/../../resources/languages/common-lisp.json",
+"lean" => __DIR__ . "/../../resources/languages/lean.json",
+"tex" => __DIR__ . "/../../resources/languages/tex.json",
+"jsonnet" => __DIR__ . "/../../resources/languages/jsonnet.json",
+"vyper" => __DIR__ . "/../../resources/languages/vyper.json",
+"html" => __DIR__ . "/../../resources/languages/html.json",
+"liquid" => __DIR__ . "/../../resources/languages/liquid.json",
+"emacs-lisp" => __DIR__ . "/../../resources/languages/emacs-lisp.json",
+"v" => __DIR__ . "/../../resources/languages/v.json",
+"hack" => __DIR__ . "/../../resources/languages/hack.json",
+"latex" => __DIR__ . "/../../resources/languages/latex.json",
+"perl" => __DIR__ . "/../../resources/languages/perl.json",
+"gleam" => __DIR__ . "/../../resources/languages/gleam.json",
+"cairo" => __DIR__ . "/../../resources/languages/cairo.json",
+"matlab" => __DIR__ . "/../../resources/languages/matlab.json",
+"jsonc" => __DIR__ . "/../../resources/languages/jsonc.json",
+"dotenv" => __DIR__ . "/../../resources/languages/dotenv.json",
+"raku" => __DIR__ . "/../../resources/languages/raku.json",
+"less" => __DIR__ . "/../../resources/languages/less.json",
+"bat" => __DIR__ . "/../../resources/languages/bat.json",
+"clarity" => __DIR__ . "/../../resources/languages/clarity.json",
+"reg" => __DIR__ . "/../../resources/languages/reg.json",
+"cpp-macro" => __DIR__ . "/../../resources/languages/cpp-macro.json",
+"tcl" => __DIR__ . "/../../resources/languages/tcl.json",
+"html-derivative" => __DIR__ . "/../../resources/languages/html-derivative.json",
+"powershell" => __DIR__ . "/../../resources/languages/powershell.json",
+"graphql" => __DIR__ . "/../../resources/languages/graphql.json",
+"haskell" => __DIR__ . "/../../resources/languages/haskell.json",
+"gdshader" => __DIR__ . "/../../resources/languages/gdshader.json",
+"groovy" => __DIR__ . "/../../resources/languages/groovy.json",
+"qss" => __DIR__ . "/../../resources/languages/qss.json",
+"verilog" => __DIR__ . "/../../resources/languages/verilog.json",
+"typescript" => __DIR__ . "/../../resources/languages/typescript.json",
+"kotlin" => __DIR__ . "/../../resources/languages/kotlin.json",
+"gherkin" => __DIR__ . "/../../resources/languages/gherkin.json",
+"soy" => __DIR__ . "/../../resources/languages/soy.json",
+"python" => __DIR__ . "/../../resources/languages/python.json",
+"sass" => __DIR__ . "/../../resources/languages/sass.json",
+"talonscript" => __DIR__ . "/../../resources/languages/talonscript.json",
+"vue" => __DIR__ . "/../../resources/languages/vue.json",
+"zenscript" => __DIR__ . "/../../resources/languages/zenscript.json",
+"imba" => __DIR__ . "/../../resources/languages/imba.json",
+"riscv" => __DIR__ . "/../../resources/languages/riscv.json",
+"smalltalk" => __DIR__ . "/../../resources/languages/smalltalk.json",
+"json5" => __DIR__ . "/../../resources/languages/json5.json",
+"cadence" => __DIR__ . "/../../resources/languages/cadence.json",
+"desktop" => __DIR__ . "/../../resources/languages/desktop.json",
+"asm" => __DIR__ . "/../../resources/languages/asm.json",
+"antlers" => __DIR__ . "/../../resources/languages/antlers.json"
     ];
 
     final const SCOPES_TO_NAMES = [
         'text.txt' => 'txt',
-        'source.astro' => 'astro',
-        'source.hy' => 'hy',
-        'source.nim' => 'nim',
-        'source.cpp' => 'cpp',
-        'source.jinja' => 'jinja',
-        'source.coq' => 'coq',
-        'source.templ' => 'templ',
-        'source.gts' => 'glimmer-ts',
-        'text.html.derivative.ng' => 'angular-html',
-        'source.cmake' => 'cmake',
-        'source.mdx' => 'mdx',
-        'source.nix' => 'nix',
-        'source.gdresource' => 'gdresource',
-        'source.hx' => 'haxe',
-        'source.ada' => 'ada',
-        'source.powerquery' => 'powerquery',
-        'source.ftl' => 'fluent',
-        'source.objc' => 'objective-c',
-        'source.elixir' => 'elixir',
-        'source.diff' => 'diff',
-        'source.java' => 'java',
-        'source.glsl' => 'glsl',
-        'source.mojo' => 'mojo',
-        'source.sparql' => 'sparql',
-        'source.bicep' => 'bicep',
-        'text.csv' => 'csv',
-        'source.swift' => 'swift',
-        'source.ssh-config' => 'ssh-config',
-        'text.html.edge' => 'edge',
-        'source.narrat' => 'narrat',
-        'source.tasl' => 'tasl',
-        'source.nushell' => 'nushell',
-        'text.html.erb' => 'erb',
-        'source.move' => 'move',
-        'source.scheme' => 'scheme',
-        'source.mips' => 'mipsasm',
-        'source.rst' => 'rst',
-        'source.shell' => 'shellscript',
-        'source.apacheconf' => 'apache',
-        'source.wgsl' => 'wgsl',
-        'source.fortran.free' => 'fortran-free-form',
-        'source.ini' => 'ini',
-        'source.makefile' => 'make',
-        'source.ts.tags' => 'ts-tags',
-        'source.stylus' => 'stylus',
-        'source.js.jsx' => 'jsx',
-        'source.json.lines' => 'jsonl',
-        'text.html.twig' => 'twig',
-        'source.clojure' => 'clojure',
-        'source.svelte' => 'svelte',
-        'text.xml' => 'xml',
-        'source.jssm' => 'jssm',
-        'source.erlang' => 'erlang',
-        'source.applescript' => 'applescript',
-        'source.viml' => 'viml',
-        'text.aspnetcorerazor' => 'razor',
-        'source.apex' => 'apex',
-        'source.berry' => 'berry',
-        'source.dm' => 'dream-maker',
-        'source.wolfram' => 'wolfram',
-        'source.cobol' => 'cobol',
-        'source.proto' => 'proto',
-        'source.genie' => 'genie',
-        'source.wat' => 'wasm',
-        'text.html.handlebars' => 'handlebars',
-        'source.zig' => 'zig',
-        'source.vhdl' => 'vhdl',
-        'source.go' => 'go',
-        'source.fish' => 'fish',
-        'source.solidity' => 'solidity',
-        'source.sas' => 'sas',
-        'source.fortran.fixed' => 'fortran-fixed-form',
-        'source.r' => 'r',
-        'source.fnl' => 'fennel',
-        'source.ruby' => 'ruby',
-        'text.log' => 'log',
-        'source.vala' => 'vala',
-        'source.splunk_search' => 'splunk',
-        'source.lua' => 'lua',
-        'source.gnuplot' => 'gnuplot',
-        'source.regexp.python' => 'regexp',
-        'text.html.markdown' => 'markdown',
-        'source.ballerina' => 'ballerina',
-        'text.xml.xsl' => 'xsl',
-        'source.systemd' => 'systemd',
-        'source.coffee' => 'coffee',
-        'text.haml' => 'haml',
-        'source.wikitext' => 'wikitext',
-        'source.kusto' => 'kusto',
-        'source.ocaml' => 'ocaml',
-        'source.cue' => 'cue',
-        'source.nextflow' => 'nextflow',
-        'text.git-rebase' => 'git-rebase',
-        'source.cypher' => 'cypher',
-        'source.tsx' => 'tsx',
-        'text.bibtex' => 'bibtex',
-        'text.pug' => 'pug',
-        'source.gjs' => 'glimmer-js',
-        'source.julia' => 'julia',
-        'text.beancount' => 'beancount',
-        'source.puppet' => 'puppet',
-        'source.bsl' => 'bsl',
-        'source.http' => 'http',
-        'source.cs' => 'csharp',
-        'source.jison' => 'jison',
-        'source.purescript' => 'purescript',
-        'source.actionscript.3' => 'actionscript-3',
-        'text.shell-session' => 'shellsession',
-        'source.systemverilog' => 'system-verilog',
-        'source.gdscript' => 'gdscript',
-        'source.luau' => 'luau',
-        'source.toml' => 'toml',
-        'source.php' => 'php',
-        'source.typst' => 'typst',
-        'source.css.postcss' => 'postcss',
-        'source.prisma' => 'prisma',
-        'source.fsharp' => 'fsharp',
-        'source.apl' => 'apl',
-        'source.sql' => 'sql',
-        'source.objcpp' => 'objective-cpp',
-        'source.logo' => 'logo',
-        'text.html.php.blade' => 'blade',
-        'source.yaml' => 'yaml',
-        'source.scala' => 'scala',
-        'source.ql' => 'codeql',
-        'source.crystal' => 'crystal',
-        'source.sdbl' => 'sdbl',
-        'source.hjson' => 'hjson',
-        'source.awk' => 'awk',
-        'source.dockerfile' => 'docker',
-        'source.dax' => 'dax',
-        'source.ts.ng' => 'angular-ts',
-        'source.hcl.terraform' => 'terraform',
-        'source.tsp' => 'typespec',
-        'text.codeowners' => 'codeowners',
-        'source.rel' => 'rel',
-        'text.html.vue-html' => 'vue-html',
-        'source.abap' => 'abap',
-        'text.git-commit' => 'git-commit',
-        'source.rust' => 'rust',
-        'source.polar' => 'polar',
-        'source.js' => 'javascript',
-        'source.prolog' => 'prolog',
-        'source.dart' => 'dart',
-        'text.marko' => 'marko',
-        'text.asciidoc' => 'asciidoc',
-        'source.wenyan' => 'wenyan',
-        'source.elm' => 'elm',
-        'source.d' => 'd',
-        'source.hlsl' => 'hlsl',
-        'source.po' => 'po',
-        'source.shaderlab' => 'shaderlab',
-        'source.stata' => 'stata',
-        'source.nginx' => 'nginx',
-        'source.ara' => 'ara',
-        'source.json' => 'json',
-        'source.css' => 'css',
-        'text.tsv' => 'tsv',
-        'source.asp.vb.net' => 'vb',
-        'source.hcl' => 'hcl',
-        'source.plsql.oracle' => 'plsql',
-        'source.pascal' => 'pascal',
-        'source.c' => 'c',
-        'source.turtle' => 'turtle',
-        'source.qmldir' => 'qmldir',
-        'text.html.jinja' => 'jinja-html',
-        'source.racket' => 'racket',
-        'source.css.scss' => 'scss',
-        'source.hxml' => 'hxml',
-        'source.qml' => 'qml',
-        'source.commonlisp' => 'common-lisp',
-        'source.lean4' => 'lean',
-        'text.tex' => 'tex',
-        'source.jsonnet' => 'jsonnet',
-        'source.vyper' => 'vyper',
-        'text.html.basic' => 'html',
-        'text.html.liquid' => 'liquid',
-        'source.emacs.lisp' => 'emacs-lisp',
-        'source.v' => 'v',
-        'source.hack' => 'hack',
-        'text.tex.latex' => 'latex',
-        'source.perl' => 'perl',
-        'source.gleam' => 'gleam',
-        'source.cairo0' => 'cairo',
-        'source.matlab' => 'matlab',
-        'source.json.comments' => 'jsonc',
-        'source.dotenv' => 'dotenv',
-        'source.perl.6' => 'raku',
-        'source.css.less' => 'less',
-        'source.batchfile' => 'bat',
-        'source.clar' => 'clarity',
-        'source.reg' => 'reg',
-        'source.cpp.embedded.macro' => 'cpp-macro',
-        'source.tcl' => 'tcl',
-        'text.html.derivative' => 'html-derivative',
-        'source.powershell' => 'powershell',
-        'source.graphql' => 'graphql',
-        'source.haskell' => 'haskell',
-        'source.gdshader' => 'gdshader',
-        'source.groovy' => 'groovy',
-        'source.qss' => 'qss',
-        'source.verilog' => 'verilog',
-        'source.ts' => 'typescript',
-        'source.kotlin' => 'kotlin',
-        'text.gherkin.feature' => 'gherkin',
-        'text.html.soy' => 'soy',
-        'source.python' => 'python',
-        'source.sass' => 'sass',
-        'source.talon' => 'talonscript',
-        'source.vue' => 'vue',
-        'source.zenscript' => 'zenscript',
-        'source.imba' => 'imba',
-        'source.riscv' => 'riscv',
-        'source.smalltalk' => 'smalltalk',
-        'source.json5' => 'json5',
-        'source.cadence' => 'cadence',
-        'source.desktop' => 'desktop',
-        'source.asm.x86_64' => 'asm',
-        'text.html.statamic' => 'antlers',
+        "source.astro" => "astro",
+"source.hy" => "hy",
+"source.nim" => "nim",
+"source.cpp" => "cpp",
+"source.jinja" => "jinja",
+"source.coq" => "coq",
+"source.templ" => "templ",
+"source.gts" => "glimmer-ts",
+"text.html.derivative.ng" => "angular-html",
+"source.cmake" => "cmake",
+"source.mdx" => "mdx",
+"source.nix" => "nix",
+"source.gdresource" => "gdresource",
+"source.hx" => "haxe",
+"source.ada" => "ada",
+"source.powerquery" => "powerquery",
+"source.ftl" => "fluent",
+"source.objc" => "objective-c",
+"source.elixir" => "elixir",
+"source.diff" => "diff",
+"source.java" => "java",
+"source.glsl" => "glsl",
+"source.mojo" => "mojo",
+"source.sparql" => "sparql",
+"source.bicep" => "bicep",
+"text.csv" => "csv",
+"source.swift" => "swift",
+"source.ssh-config" => "ssh-config",
+"text.html.edge" => "edge",
+"source.narrat" => "narrat",
+"source.tasl" => "tasl",
+"source.nushell" => "nushell",
+"text.html.erb" => "erb",
+"source.move" => "move",
+"source.scheme" => "scheme",
+"source.mips" => "mipsasm",
+"source.rst" => "rst",
+"source.shell" => "shellscript",
+"source.apacheconf" => "apache",
+"source.wgsl" => "wgsl",
+"source.fortran.free" => "fortran-free-form",
+"source.ini" => "ini",
+"source.makefile" => "make",
+"source.ts.tags" => "ts-tags",
+"source.stylus" => "stylus",
+"source.js.jsx" => "jsx",
+"source.json.lines" => "jsonl",
+"source.llvm" => "llvm",
+"text.html.twig" => "twig",
+"source.clojure" => "clojure",
+"source.svelte" => "svelte",
+"text.xml" => "xml",
+"source.jssm" => "jssm",
+"source.erlang" => "erlang",
+"source.applescript" => "applescript",
+"source.viml" => "viml",
+"text.aspnetcorerazor" => "razor",
+"source.apex" => "apex",
+"source.berry" => "berry",
+"source.dm" => "dream-maker",
+"source.wolfram" => "wolfram",
+"source.cobol" => "cobol",
+"source.proto" => "proto",
+"source.genie" => "genie",
+"source.wat" => "wasm",
+"text.html.handlebars" => "handlebars",
+"source.zig" => "zig",
+"source.vhdl" => "vhdl",
+"source.go" => "go",
+"source.fish" => "fish",
+"source.solidity" => "solidity",
+"source.sas" => "sas",
+"source.fortran.fixed" => "fortran-fixed-form",
+"source.r" => "r",
+"source.fnl" => "fennel",
+"source.ruby" => "ruby",
+"text.log" => "log",
+"source.vala" => "vala",
+"source.splunk_search" => "splunk",
+"source.lua" => "lua",
+"source.gnuplot" => "gnuplot",
+"source.regexp.python" => "regexp",
+"text.html.markdown" => "markdown",
+"source.ballerina" => "ballerina",
+"text.xml.xsl" => "xsl",
+"source.systemd" => "systemd",
+"source.coffee" => "coffee",
+"text.haml" => "haml",
+"source.wikitext" => "wikitext",
+"source.kusto" => "kusto",
+"source.ocaml" => "ocaml",
+"source.cue" => "cue",
+"source.nextflow" => "nextflow",
+"text.git-rebase" => "git-rebase",
+"source.cypher" => "cypher",
+"source.tsx" => "tsx",
+"text.bibtex" => "bibtex",
+"text.pug" => "pug",
+"source.gjs" => "glimmer-js",
+"source.julia" => "julia",
+"text.beancount" => "beancount",
+"source.puppet" => "puppet",
+"source.bsl" => "bsl",
+"source.http" => "http",
+"source.cs" => "csharp",
+"source.jison" => "jison",
+"source.purescript" => "purescript",
+"source.actionscript.3" => "actionscript-3",
+"text.shell-session" => "shellsession",
+"source.systemverilog" => "system-verilog",
+"source.gdscript" => "gdscript",
+"source.luau" => "luau",
+"source.toml" => "toml",
+"source.php" => "php",
+"source.typst" => "typst",
+"source.css.postcss" => "postcss",
+"source.prisma" => "prisma",
+"source.fsharp" => "fsharp",
+"source.apl" => "apl",
+"source.wit" => "wit",
+"source.sql" => "sql",
+"source.objcpp" => "objective-cpp",
+"source.logo" => "logo",
+"text.html.php.blade" => "blade",
+"source.yaml" => "yaml",
+"source.scala" => "scala",
+"source.ql" => "codeql",
+"source.crystal" => "crystal",
+"source.sdbl" => "sdbl",
+"source.hjson" => "hjson",
+"source.awk" => "awk",
+"source.dockerfile" => "docker",
+"source.dax" => "dax",
+"source.ts.ng" => "angular-ts",
+"source.hcl.terraform" => "terraform",
+"source.tsp" => "typespec",
+"text.codeowners" => "codeowners",
+"source.rel" => "rel",
+"text.html.vue-html" => "vue-html",
+"source.abap" => "abap",
+"text.git-commit" => "git-commit",
+"source.rust" => "rust",
+"source.polar" => "polar",
+"source.js" => "javascript",
+"source.prolog" => "prolog",
+"source.dart" => "dart",
+"text.marko" => "marko",
+"text.asciidoc" => "asciidoc",
+"source.wenyan" => "wenyan",
+"source.elm" => "elm",
+"source.d" => "d",
+"source.hlsl" => "hlsl",
+"source.po" => "po",
+"source.shaderlab" => "shaderlab",
+"source.stata" => "stata",
+"source.nginx" => "nginx",
+"source.ara" => "ara",
+"source.json" => "json",
+"source.css" => "css",
+"text.tsv" => "tsv",
+"source.asp.vb.net" => "vb",
+"source.hcl" => "hcl",
+"source.plsql.oracle" => "plsql",
+"source.pascal" => "pascal",
+"source.c" => "c",
+"source.turtle" => "turtle",
+"source.qmldir" => "qmldir",
+"text.html.jinja" => "jinja-html",
+"source.racket" => "racket",
+"source.css.scss" => "scss",
+"source.hxml" => "hxml",
+"source.qml" => "qml",
+"source.commonlisp" => "common-lisp",
+"source.lean4" => "lean",
+"text.tex" => "tex",
+"source.jsonnet" => "jsonnet",
+"source.vyper" => "vyper",
+"text.html.basic" => "html",
+"text.html.liquid" => "liquid",
+"source.emacs.lisp" => "emacs-lisp",
+"source.v" => "v",
+"source.hack" => "hack",
+"text.tex.latex" => "latex",
+"source.perl" => "perl",
+"source.gleam" => "gleam",
+"source.cairo0" => "cairo",
+"source.matlab" => "matlab",
+"source.json.comments" => "jsonc",
+"source.dotenv" => "dotenv",
+"source.perl.6" => "raku",
+"source.css.less" => "less",
+"source.batchfile" => "bat",
+"source.clar" => "clarity",
+"source.reg" => "reg",
+"source.cpp.embedded.macro" => "cpp-macro",
+"source.tcl" => "tcl",
+"text.html.derivative" => "html-derivative",
+"source.powershell" => "powershell",
+"source.graphql" => "graphql",
+"source.haskell" => "haskell",
+"source.gdshader" => "gdshader",
+"source.groovy" => "groovy",
+"source.qss" => "qss",
+"source.verilog" => "verilog",
+"source.ts" => "typescript",
+"source.kotlin" => "kotlin",
+"text.gherkin.feature" => "gherkin",
+"text.html.soy" => "soy",
+"source.python" => "python",
+"source.sass" => "sass",
+"source.talon" => "talonscript",
+"source.vue" => "vue",
+"source.zenscript" => "zenscript",
+"source.imba" => "imba",
+"source.riscv" => "riscv",
+"source.smalltalk" => "smalltalk",
+"source.json5" => "json5",
+"source.cadence" => "cadence",
+"source.desktop" => "desktop",
+"source.asm.x86_64" => "asm",
+"text.html.statamic" => "antlers"
     ];
-}
+}
\ No newline at end of file
diff --git a/src/Grammar/Grammar.php b/src/Grammar/Grammar.php
index b330ac3..46e084f 100644
--- a/src/Grammar/Grammar.php
+++ b/src/Grammar/Grammar.php
@@ -7,228 +7,230 @@
 enum Grammar: string
 {
     case Txt = 'txt';
-    case Astro = 'astro';
-    case Hy = 'hy';
-    case Nim = 'nim';
-    case Cpp = 'cpp';
-    case Jinja = 'jinja';
-    case Coq = 'coq';
-    case Templ = 'templ';
-    case GlimmerTs = 'glimmer-ts';
-    case AngularHtml = 'angular-html';
-    case Cmake = 'cmake';
-    case Mdx = 'mdx';
-    case Nix = 'nix';
-    case Gdresource = 'gdresource';
-    case Haxe = 'haxe';
-    case Ada = 'ada';
-    case Powerquery = 'powerquery';
-    case Fluent = 'fluent';
-    case ObjectiveC = 'objective-c';
-    case Elixir = 'elixir';
-    case Diff = 'diff';
-    case Java = 'java';
-    case Glsl = 'glsl';
-    case Mojo = 'mojo';
-    case Sparql = 'sparql';
-    case Bicep = 'bicep';
-    case Csv = 'csv';
-    case Swift = 'swift';
-    case SshConfig = 'ssh-config';
-    case Edge = 'edge';
-    case Narrat = 'narrat';
-    case Tasl = 'tasl';
-    case Nushell = 'nushell';
-    case Erb = 'erb';
-    case Move = 'move';
-    case Scheme = 'scheme';
-    case Mipsasm = 'mipsasm';
-    case Rst = 'rst';
-    case Shellscript = 'shellscript';
-    case Apache = 'apache';
-    case Wgsl = 'wgsl';
-    case FortranFreeForm = 'fortran-free-form';
-    case Ini = 'ini';
-    case Make = 'make';
-    case TsTags = 'ts-tags';
-    case Stylus = 'stylus';
-    case Jsx = 'jsx';
-    case Jsonl = 'jsonl';
-    case Twig = 'twig';
-    case Clojure = 'clojure';
-    case Svelte = 'svelte';
-    case Xml = 'xml';
-    case Jssm = 'jssm';
-    case Erlang = 'erlang';
-    case Applescript = 'applescript';
-    case Viml = 'viml';
-    case Razor = 'razor';
-    case Apex = 'apex';
-    case Berry = 'berry';
-    case DreamMaker = 'dream-maker';
-    case Wolfram = 'wolfram';
-    case Cobol = 'cobol';
-    case Proto = 'proto';
-    case Genie = 'genie';
-    case Wasm = 'wasm';
-    case Handlebars = 'handlebars';
-    case Zig = 'zig';
-    case Vhdl = 'vhdl';
-    case Go = 'go';
-    case Fish = 'fish';
-    case Solidity = 'solidity';
-    case Sas = 'sas';
-    case FortranFixedForm = 'fortran-fixed-form';
-    case R = 'r';
-    case Fennel = 'fennel';
-    case Ruby = 'ruby';
-    case Log = 'log';
-    case Vala = 'vala';
-    case Splunk = 'splunk';
-    case Lua = 'lua';
-    case Gnuplot = 'gnuplot';
-    case Regexp = 'regexp';
-    case Markdown = 'markdown';
-    case Ballerina = 'ballerina';
-    case Xsl = 'xsl';
-    case Systemd = 'systemd';
-    case Coffee = 'coffee';
-    case Haml = 'haml';
-    case Wikitext = 'wikitext';
-    case Kusto = 'kusto';
-    case Ocaml = 'ocaml';
-    case Cue = 'cue';
-    case Nextflow = 'nextflow';
-    case GitRebase = 'git-rebase';
-    case Cypher = 'cypher';
-    case Tsx = 'tsx';
-    case Bibtex = 'bibtex';
-    case Pug = 'pug';
-    case GlimmerJs = 'glimmer-js';
-    case Julia = 'julia';
-    case Beancount = 'beancount';
-    case Puppet = 'puppet';
-    case Bsl = 'bsl';
-    case Http = 'http';
-    case Csharp = 'csharp';
-    case Jison = 'jison';
-    case Purescript = 'purescript';
-    case Actionscript3 = 'actionscript-3';
-    case Shellsession = 'shellsession';
-    case SystemVerilog = 'system-verilog';
-    case Gdscript = 'gdscript';
-    case Luau = 'luau';
-    case Toml = 'toml';
-    case Php = 'php';
-    case Typst = 'typst';
-    case Postcss = 'postcss';
-    case Prisma = 'prisma';
-    case Fsharp = 'fsharp';
-    case Apl = 'apl';
-    case Sql = 'sql';
-    case ObjectiveCpp = 'objective-cpp';
-    case Logo = 'logo';
-    case Blade = 'blade';
-    case Yaml = 'yaml';
-    case Scala = 'scala';
-    case Codeql = 'codeql';
-    case Crystal = 'crystal';
-    case Sdbl = 'sdbl';
-    case Hjson = 'hjson';
-    case Awk = 'awk';
-    case Docker = 'docker';
-    case Dax = 'dax';
-    case AngularTs = 'angular-ts';
-    case Terraform = 'terraform';
-    case Typespec = 'typespec';
-    case Codeowners = 'codeowners';
-    case Rel = 'rel';
-    case VueHtml = 'vue-html';
-    case Abap = 'abap';
-    case GitCommit = 'git-commit';
-    case Rust = 'rust';
-    case Polar = 'polar';
-    case Javascript = 'javascript';
-    case Prolog = 'prolog';
-    case Dart = 'dart';
-    case Marko = 'marko';
-    case Asciidoc = 'asciidoc';
-    case Wenyan = 'wenyan';
-    case Elm = 'elm';
-    case D = 'd';
-    case Hlsl = 'hlsl';
-    case Po = 'po';
-    case Shaderlab = 'shaderlab';
-    case Stata = 'stata';
-    case Nginx = 'nginx';
-    case Ara = 'ara';
-    case Json = 'json';
-    case Css = 'css';
-    case Tsv = 'tsv';
-    case Vb = 'vb';
-    case Hcl = 'hcl';
-    case Plsql = 'plsql';
-    case Pascal = 'pascal';
-    case C = 'c';
-    case Turtle = 'turtle';
-    case Qmldir = 'qmldir';
-    case JinjaHtml = 'jinja-html';
-    case Racket = 'racket';
-    case Scss = 'scss';
-    case Hxml = 'hxml';
-    case Qml = 'qml';
-    case CommonLisp = 'common-lisp';
-    case Lean = 'lean';
-    case Tex = 'tex';
-    case Jsonnet = 'jsonnet';
-    case Vyper = 'vyper';
-    case Html = 'html';
-    case Liquid = 'liquid';
-    case EmacsLisp = 'emacs-lisp';
-    case V = 'v';
-    case Hack = 'hack';
-    case Latex = 'latex';
-    case Perl = 'perl';
-    case Gleam = 'gleam';
-    case Cairo = 'cairo';
-    case Matlab = 'matlab';
-    case Jsonc = 'jsonc';
-    case Dotenv = 'dotenv';
-    case Raku = 'raku';
-    case Less = 'less';
-    case Bat = 'bat';
-    case Clarity = 'clarity';
-    case Reg = 'reg';
-    case CppMacro = 'cpp-macro';
-    case Tcl = 'tcl';
-    case HtmlDerivative = 'html-derivative';
-    case Powershell = 'powershell';
-    case Graphql = 'graphql';
-    case Haskell = 'haskell';
-    case Gdshader = 'gdshader';
-    case Groovy = 'groovy';
-    case Qss = 'qss';
-    case Verilog = 'verilog';
-    case Typescript = 'typescript';
-    case Kotlin = 'kotlin';
-    case Gherkin = 'gherkin';
-    case Soy = 'soy';
-    case Python = 'python';
-    case Sass = 'sass';
-    case Talonscript = 'talonscript';
-    case Vue = 'vue';
-    case Zenscript = 'zenscript';
-    case Imba = 'imba';
-    case Riscv = 'riscv';
-    case Smalltalk = 'smalltalk';
-    case Json5 = 'json5';
-    case Cadence = 'cadence';
-    case Desktop = 'desktop';
-    case Asm = 'asm';
-    case Antlers = 'antlers';
+    case Astro = "astro";
+case Hy = "hy";
+case Nim = "nim";
+case Cpp = "cpp";
+case Jinja = "jinja";
+case Coq = "coq";
+case Templ = "templ";
+case GlimmerTs = "glimmer-ts";
+case AngularHtml = "angular-html";
+case Cmake = "cmake";
+case Mdx = "mdx";
+case Nix = "nix";
+case Gdresource = "gdresource";
+case Haxe = "haxe";
+case Ada = "ada";
+case Powerquery = "powerquery";
+case Fluent = "fluent";
+case ObjectiveC = "objective-c";
+case Elixir = "elixir";
+case Diff = "diff";
+case Java = "java";
+case Glsl = "glsl";
+case Mojo = "mojo";
+case Sparql = "sparql";
+case Bicep = "bicep";
+case Csv = "csv";
+case Swift = "swift";
+case SshConfig = "ssh-config";
+case Edge = "edge";
+case Narrat = "narrat";
+case Tasl = "tasl";
+case Nushell = "nushell";
+case Erb = "erb";
+case Move = "move";
+case Scheme = "scheme";
+case Mipsasm = "mipsasm";
+case Rst = "rst";
+case Shellscript = "shellscript";
+case Apache = "apache";
+case Wgsl = "wgsl";
+case FortranFreeForm = "fortran-free-form";
+case Ini = "ini";
+case Make = "make";
+case TsTags = "ts-tags";
+case Stylus = "stylus";
+case Jsx = "jsx";
+case Jsonl = "jsonl";
+case Llvm = "llvm";
+case Twig = "twig";
+case Clojure = "clojure";
+case Svelte = "svelte";
+case Xml = "xml";
+case Jssm = "jssm";
+case Erlang = "erlang";
+case Applescript = "applescript";
+case Viml = "viml";
+case Razor = "razor";
+case Apex = "apex";
+case Berry = "berry";
+case DreamMaker = "dream-maker";
+case Wolfram = "wolfram";
+case Cobol = "cobol";
+case Proto = "proto";
+case Genie = "genie";
+case Wasm = "wasm";
+case Handlebars = "handlebars";
+case Zig = "zig";
+case Vhdl = "vhdl";
+case Go = "go";
+case Fish = "fish";
+case Solidity = "solidity";
+case Sas = "sas";
+case FortranFixedForm = "fortran-fixed-form";
+case R = "r";
+case Fennel = "fennel";
+case Ruby = "ruby";
+case Log = "log";
+case Vala = "vala";
+case Splunk = "splunk";
+case Lua = "lua";
+case Gnuplot = "gnuplot";
+case Regexp = "regexp";
+case Markdown = "markdown";
+case Ballerina = "ballerina";
+case Xsl = "xsl";
+case Systemd = "systemd";
+case Coffee = "coffee";
+case Haml = "haml";
+case Wikitext = "wikitext";
+case Kusto = "kusto";
+case Ocaml = "ocaml";
+case Cue = "cue";
+case Nextflow = "nextflow";
+case GitRebase = "git-rebase";
+case Cypher = "cypher";
+case Tsx = "tsx";
+case Bibtex = "bibtex";
+case Pug = "pug";
+case GlimmerJs = "glimmer-js";
+case Julia = "julia";
+case Beancount = "beancount";
+case Puppet = "puppet";
+case Bsl = "bsl";
+case Http = "http";
+case Csharp = "csharp";
+case Jison = "jison";
+case Purescript = "purescript";
+case Actionscript3 = "actionscript-3";
+case Shellsession = "shellsession";
+case SystemVerilog = "system-verilog";
+case Gdscript = "gdscript";
+case Luau = "luau";
+case Toml = "toml";
+case Php = "php";
+case Typst = "typst";
+case Postcss = "postcss";
+case Prisma = "prisma";
+case Fsharp = "fsharp";
+case Apl = "apl";
+case Wit = "wit";
+case Sql = "sql";
+case ObjectiveCpp = "objective-cpp";
+case Logo = "logo";
+case Blade = "blade";
+case Yaml = "yaml";
+case Scala = "scala";
+case Codeql = "codeql";
+case Crystal = "crystal";
+case Sdbl = "sdbl";
+case Hjson = "hjson";
+case Awk = "awk";
+case Docker = "docker";
+case Dax = "dax";
+case AngularTs = "angular-ts";
+case Terraform = "terraform";
+case Typespec = "typespec";
+case Codeowners = "codeowners";
+case Rel = "rel";
+case VueHtml = "vue-html";
+case Abap = "abap";
+case GitCommit = "git-commit";
+case Rust = "rust";
+case Polar = "polar";
+case Javascript = "javascript";
+case Prolog = "prolog";
+case Dart = "dart";
+case Marko = "marko";
+case Asciidoc = "asciidoc";
+case Wenyan = "wenyan";
+case Elm = "elm";
+case D = "d";
+case Hlsl = "hlsl";
+case Po = "po";
+case Shaderlab = "shaderlab";
+case Stata = "stata";
+case Nginx = "nginx";
+case Ara = "ara";
+case Json = "json";
+case Css = "css";
+case Tsv = "tsv";
+case Vb = "vb";
+case Hcl = "hcl";
+case Plsql = "plsql";
+case Pascal = "pascal";
+case C = "c";
+case Turtle = "turtle";
+case Qmldir = "qmldir";
+case JinjaHtml = "jinja-html";
+case Racket = "racket";
+case Scss = "scss";
+case Hxml = "hxml";
+case Qml = "qml";
+case CommonLisp = "common-lisp";
+case Lean = "lean";
+case Tex = "tex";
+case Jsonnet = "jsonnet";
+case Vyper = "vyper";
+case Html = "html";
+case Liquid = "liquid";
+case EmacsLisp = "emacs-lisp";
+case V = "v";
+case Hack = "hack";
+case Latex = "latex";
+case Perl = "perl";
+case Gleam = "gleam";
+case Cairo = "cairo";
+case Matlab = "matlab";
+case Jsonc = "jsonc";
+case Dotenv = "dotenv";
+case Raku = "raku";
+case Less = "less";
+case Bat = "bat";
+case Clarity = "clarity";
+case Reg = "reg";
+case CppMacro = "cpp-macro";
+case Tcl = "tcl";
+case HtmlDerivative = "html-derivative";
+case Powershell = "powershell";
+case Graphql = "graphql";
+case Haskell = "haskell";
+case Gdshader = "gdshader";
+case Groovy = "groovy";
+case Qss = "qss";
+case Verilog = "verilog";
+case Typescript = "typescript";
+case Kotlin = "kotlin";
+case Gherkin = "gherkin";
+case Soy = "soy";
+case Python = "python";
+case Sass = "sass";
+case Talonscript = "talonscript";
+case Vue = "vue";
+case Zenscript = "zenscript";
+case Imba = "imba";
+case Riscv = "riscv";
+case Smalltalk = "smalltalk";
+case Json5 = "json5";
+case Cadence = "cadence";
+case Desktop = "desktop";
+case Asm = "asm";
+case Antlers = "antlers";
 
     public function toParsedGrammar(GrammarRepositoryInterface $repository): ParsedGrammar
     {
         return $repository->get($this->value);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Grammar/GrammarRepository.php b/src/Grammar/GrammarRepository.php
index cac76f0..a680b95 100644
--- a/src/Grammar/GrammarRepository.php
+++ b/src/Grammar/GrammarRepository.php
@@ -52,7 +52,11 @@ public function get(string $name): ParsedGrammar
 
         $parser = new Parser;
 
-        return $this->grammars[$name] = $parser->parse(json_decode(file_get_contents($grammar), true));
+        return $this->grammars[$name] = $parser->parse(
+            str_ends_with($grammar, '.php')
+                ? require_once $grammar
+                : json_decode(file_get_contents($grammar), true)
+        );
     }
 
     public function getFromScope(string $scope): ParsedGrammar
diff --git a/src/Theme/DefaultThemes.php b/src/Theme/DefaultThemes.php
index f0abdd3..30385a6 100644
--- a/src/Theme/DefaultThemes.php
+++ b/src/Theme/DefaultThemes.php
@@ -4,58 +4,64 @@
 
 abstract class DefaultThemes
 {
-    final const NAMES_TO_PATHS = ['one-dark-pro' => __DIR__.'/../../resources/themes/one-dark-pro.json',
-        'solarized-light' => __DIR__.'/../../resources/themes/solarized-light.json',
-        'vitesse-black' => __DIR__.'/../../resources/themes/vitesse-black.json',
-        'github-light-default' => __DIR__.'/../../resources/themes/github-light-default.json',
-        'slack-dark' => __DIR__.'/../../resources/themes/slack-dark.json',
-        'everforest-dark' => __DIR__.'/../../resources/themes/everforest-dark.json',
-        'rose-pine-moon' => __DIR__.'/../../resources/themes/rose-pine-moon.json',
-        'everforest-light' => __DIR__.'/../../resources/themes/everforest-light.json',
-        'laserwave' => __DIR__.'/../../resources/themes/laserwave.json',
-        'github-light-high-contrast' => __DIR__.'/../../resources/themes/github-light-high-contrast.json',
-        'catppuccin-mocha' => __DIR__.'/../../resources/themes/catppuccin-mocha.json',
-        'red' => __DIR__.'/../../resources/themes/red.json',
-        'material-theme-lighter' => __DIR__.'/../../resources/themes/material-theme-lighter.json',
-        'one-light' => __DIR__.'/../../resources/themes/one-light.json',
-        'aurora-x' => __DIR__.'/../../resources/themes/aurora-x.json',
-        'tokyo-night' => __DIR__.'/../../resources/themes/tokyo-night.json',
-        'catppuccin-macchiato' => __DIR__.'/../../resources/themes/catppuccin-macchiato.json',
-        'github-dark' => __DIR__.'/../../resources/themes/github-dark.json',
-        'rose-pine-dawn' => __DIR__.'/../../resources/themes/rose-pine-dawn.json',
-        'poimandres' => __DIR__.'/../../resources/themes/poimandres.json',
-        'github-dark-high-contrast' => __DIR__.'/../../resources/themes/github-dark-high-contrast.json',
-        'material-theme' => __DIR__.'/../../resources/themes/material-theme.json',
-        'dracula' => __DIR__.'/../../resources/themes/dracula.json',
-        'github-dark-default' => __DIR__.'/../../resources/themes/github-dark-default.json',
-        'github-dark-dimmed' => __DIR__.'/../../resources/themes/github-dark-dimmed.json',
-        'rose-pine' => __DIR__.'/../../resources/themes/rose-pine.json',
-        'kanagawa-lotus' => __DIR__.'/../../resources/themes/kanagawa-lotus.json',
-        'kanagawa-dragon' => __DIR__.'/../../resources/themes/kanagawa-dragon.json',
-        'dark-plus' => __DIR__.'/../../resources/themes/dark-plus.json',
-        'ayu-dark' => __DIR__.'/../../resources/themes/ayu-dark.json',
-        'min-dark' => __DIR__.'/../../resources/themes/min-dark.json',
-        'monokai' => __DIR__.'/../../resources/themes/monokai.json',
-        'nord' => __DIR__.'/../../resources/themes/nord.json',
-        'catppuccin-frappe' => __DIR__.'/../../resources/themes/catppuccin-frappe.json',
-        'github-light' => __DIR__.'/../../resources/themes/github-light.json',
-        'dracula-soft' => __DIR__.'/../../resources/themes/dracula-soft.json',
-        'synthwave-84' => __DIR__.'/../../resources/themes/synthwave-84.json',
-        'vitesse-dark' => __DIR__.'/../../resources/themes/vitesse-dark.json',
-        'andromeeda' => __DIR__.'/../../resources/themes/andromeeda.json',
-        'light-plus' => __DIR__.'/../../resources/themes/light-plus.json',
-        'slack-ochin' => __DIR__.'/../../resources/themes/slack-ochin.json',
-        'solarized-dark' => __DIR__.'/../../resources/themes/solarized-dark.json',
-        'material-theme-ocean' => __DIR__.'/../../resources/themes/material-theme-ocean.json',
-        'vitesse-light' => __DIR__.'/../../resources/themes/vitesse-light.json',
-        'vesper' => __DIR__.'/../../resources/themes/vesper.json',
-        'kanagawa-wave' => __DIR__.'/../../resources/themes/kanagawa-wave.json',
-        'plastic' => __DIR__.'/../../resources/themes/plastic.json',
-        'material-theme-darker' => __DIR__.'/../../resources/themes/material-theme-darker.json',
-        'night-owl' => __DIR__.'/../../resources/themes/night-owl.json',
-        'catppuccin-latte' => __DIR__.'/../../resources/themes/catppuccin-latte.json',
-        'min-light' => __DIR__.'/../../resources/themes/min-light.json',
-        'snazzy-light' => __DIR__.'/../../resources/themes/snazzy-light.json',
-        'houston' => __DIR__.'/../../resources/themes/houston.json',
-        'material-theme-palenight' => __DIR__.'/../../resources/themes/material-theme-palenight.json'];
-}
+    final const NAMES_TO_PATHS = ["gruvbox-light-medium" => __DIR__ . "/../../resources/themes/gruvbox-light-medium.json",
+"one-dark-pro" => __DIR__ . "/../../resources/themes/one-dark-pro.json",
+"solarized-light" => __DIR__ . "/../../resources/themes/solarized-light.json",
+"gruvbox-light-hard" => __DIR__ . "/../../resources/themes/gruvbox-light-hard.json",
+"vitesse-black" => __DIR__ . "/../../resources/themes/vitesse-black.json",
+"github-light-default" => __DIR__ . "/../../resources/themes/github-light-default.json",
+"slack-dark" => __DIR__ . "/../../resources/themes/slack-dark.json",
+"everforest-dark" => __DIR__ . "/../../resources/themes/everforest-dark.json",
+"rose-pine-moon" => __DIR__ . "/../../resources/themes/rose-pine-moon.json",
+"everforest-light" => __DIR__ . "/../../resources/themes/everforest-light.json",
+"laserwave" => __DIR__ . "/../../resources/themes/laserwave.json",
+"github-light-high-contrast" => __DIR__ . "/../../resources/themes/github-light-high-contrast.json",
+"gruvbox-dark-soft" => __DIR__ . "/../../resources/themes/gruvbox-dark-soft.json",
+"catppuccin-mocha" => __DIR__ . "/../../resources/themes/catppuccin-mocha.json",
+"red" => __DIR__ . "/../../resources/themes/red.json",
+"material-theme-lighter" => __DIR__ . "/../../resources/themes/material-theme-lighter.json",
+"one-light" => __DIR__ . "/../../resources/themes/one-light.json",
+"aurora-x" => __DIR__ . "/../../resources/themes/aurora-x.json",
+"tokyo-night" => __DIR__ . "/../../resources/themes/tokyo-night.json",
+"catppuccin-macchiato" => __DIR__ . "/../../resources/themes/catppuccin-macchiato.json",
+"github-dark" => __DIR__ . "/../../resources/themes/github-dark.json",
+"rose-pine-dawn" => __DIR__ . "/../../resources/themes/rose-pine-dawn.json",
+"gruvbox-dark-medium" => __DIR__ . "/../../resources/themes/gruvbox-dark-medium.json",
+"poimandres" => __DIR__ . "/../../resources/themes/poimandres.json",
+"github-dark-high-contrast" => __DIR__ . "/../../resources/themes/github-dark-high-contrast.json",
+"material-theme" => __DIR__ . "/../../resources/themes/material-theme.json",
+"dracula" => __DIR__ . "/../../resources/themes/dracula.json",
+"github-dark-default" => __DIR__ . "/../../resources/themes/github-dark-default.json",
+"github-dark-dimmed" => __DIR__ . "/../../resources/themes/github-dark-dimmed.json",
+"rose-pine" => __DIR__ . "/../../resources/themes/rose-pine.json",
+"kanagawa-lotus" => __DIR__ . "/../../resources/themes/kanagawa-lotus.json",
+"kanagawa-dragon" => __DIR__ . "/../../resources/themes/kanagawa-dragon.json",
+"dark-plus" => __DIR__ . "/../../resources/themes/dark-plus.json",
+"ayu-dark" => __DIR__ . "/../../resources/themes/ayu-dark.json",
+"min-dark" => __DIR__ . "/../../resources/themes/min-dark.json",
+"monokai" => __DIR__ . "/../../resources/themes/monokai.json",
+"nord" => __DIR__ . "/../../resources/themes/nord.json",
+"catppuccin-frappe" => __DIR__ . "/../../resources/themes/catppuccin-frappe.json",
+"github-light" => __DIR__ . "/../../resources/themes/github-light.json",
+"dracula-soft" => __DIR__ . "/../../resources/themes/dracula-soft.json",
+"synthwave-84" => __DIR__ . "/../../resources/themes/synthwave-84.json",
+"vitesse-dark" => __DIR__ . "/../../resources/themes/vitesse-dark.json",
+"gruvbox-dark-hard" => __DIR__ . "/../../resources/themes/gruvbox-dark-hard.json",
+"andromeeda" => __DIR__ . "/../../resources/themes/andromeeda.json",
+"light-plus" => __DIR__ . "/../../resources/themes/light-plus.json",
+"slack-ochin" => __DIR__ . "/../../resources/themes/slack-ochin.json",
+"solarized-dark" => __DIR__ . "/../../resources/themes/solarized-dark.json",
+"gruvbox-light-soft" => __DIR__ . "/../../resources/themes/gruvbox-light-soft.json",
+"material-theme-ocean" => __DIR__ . "/../../resources/themes/material-theme-ocean.json",
+"vitesse-light" => __DIR__ . "/../../resources/themes/vitesse-light.json",
+"vesper" => __DIR__ . "/../../resources/themes/vesper.json",
+"kanagawa-wave" => __DIR__ . "/../../resources/themes/kanagawa-wave.json",
+"plastic" => __DIR__ . "/../../resources/themes/plastic.json",
+"material-theme-darker" => __DIR__ . "/../../resources/themes/material-theme-darker.json",
+"night-owl" => __DIR__ . "/../../resources/themes/night-owl.json",
+"catppuccin-latte" => __DIR__ . "/../../resources/themes/catppuccin-latte.json",
+"min-light" => __DIR__ . "/../../resources/themes/min-light.json",
+"snazzy-light" => __DIR__ . "/../../resources/themes/snazzy-light.json",
+"houston" => __DIR__ . "/../../resources/themes/houston.json",
+"material-theme-palenight" => __DIR__ . "/../../resources/themes/material-theme-palenight.json"];
+}
\ No newline at end of file
diff --git a/src/Theme/Theme.php b/src/Theme/Theme.php
index dfb5850..1e6b321 100644
--- a/src/Theme/Theme.php
+++ b/src/Theme/Theme.php
@@ -6,63 +6,69 @@
 
 enum Theme: string
 {
-    case OneDarkPro = 'one-dark-pro';
-    case SolarizedLight = 'solarized-light';
-    case VitesseBlack = 'vitesse-black';
-    case GithubLightDefault = 'github-light-default';
-    case SlackDark = 'slack-dark';
-    case EverforestDark = 'everforest-dark';
-    case RosePineMoon = 'rose-pine-moon';
-    case EverforestLight = 'everforest-light';
-    case Laserwave = 'laserwave';
-    case GithubLightHighContrast = 'github-light-high-contrast';
-    case CatppuccinMocha = 'catppuccin-mocha';
-    case Red = 'red';
-    case MaterialThemeLighter = 'material-theme-lighter';
-    case OneLight = 'one-light';
-    case AuroraX = 'aurora-x';
-    case TokyoNight = 'tokyo-night';
-    case CatppuccinMacchiato = 'catppuccin-macchiato';
-    case GithubDark = 'github-dark';
-    case RosePineDawn = 'rose-pine-dawn';
-    case Poimandres = 'poimandres';
-    case GithubDarkHighContrast = 'github-dark-high-contrast';
-    case MaterialTheme = 'material-theme';
-    case Dracula = 'dracula';
-    case GithubDarkDefault = 'github-dark-default';
-    case GithubDarkDimmed = 'github-dark-dimmed';
-    case RosePine = 'rose-pine';
-    case KanagawaLotus = 'kanagawa-lotus';
-    case KanagawaDragon = 'kanagawa-dragon';
-    case DarkPlus = 'dark-plus';
-    case AyuDark = 'ayu-dark';
-    case MinDark = 'min-dark';
-    case Monokai = 'monokai';
-    case Nord = 'nord';
-    case CatppuccinFrappe = 'catppuccin-frappe';
-    case GithubLight = 'github-light';
-    case DraculaSoft = 'dracula-soft';
-    case Synthwave84 = 'synthwave-84';
-    case VitesseDark = 'vitesse-dark';
-    case Andromeeda = 'andromeeda';
-    case LightPlus = 'light-plus';
-    case SlackOchin = 'slack-ochin';
-    case SolarizedDark = 'solarized-dark';
-    case MaterialThemeOcean = 'material-theme-ocean';
-    case VitesseLight = 'vitesse-light';
-    case Vesper = 'vesper';
-    case KanagawaWave = 'kanagawa-wave';
-    case Plastic = 'plastic';
-    case MaterialThemeDarker = 'material-theme-darker';
-    case NightOwl = 'night-owl';
-    case CatppuccinLatte = 'catppuccin-latte';
-    case MinLight = 'min-light';
-    case SnazzyLight = 'snazzy-light';
-    case Houston = 'houston';
-    case MaterialThemePalenight = 'material-theme-palenight';
+    case GruvboxLightMedium = "gruvbox-light-medium";
+case OneDarkPro = "one-dark-pro";
+case SolarizedLight = "solarized-light";
+case GruvboxLightHard = "gruvbox-light-hard";
+case VitesseBlack = "vitesse-black";
+case GithubLightDefault = "github-light-default";
+case SlackDark = "slack-dark";
+case EverforestDark = "everforest-dark";
+case RosePineMoon = "rose-pine-moon";
+case EverforestLight = "everforest-light";
+case Laserwave = "laserwave";
+case GithubLightHighContrast = "github-light-high-contrast";
+case GruvboxDarkSoft = "gruvbox-dark-soft";
+case CatppuccinMocha = "catppuccin-mocha";
+case Red = "red";
+case MaterialThemeLighter = "material-theme-lighter";
+case OneLight = "one-light";
+case AuroraX = "aurora-x";
+case TokyoNight = "tokyo-night";
+case CatppuccinMacchiato = "catppuccin-macchiato";
+case GithubDark = "github-dark";
+case RosePineDawn = "rose-pine-dawn";
+case GruvboxDarkMedium = "gruvbox-dark-medium";
+case Poimandres = "poimandres";
+case GithubDarkHighContrast = "github-dark-high-contrast";
+case MaterialTheme = "material-theme";
+case Dracula = "dracula";
+case GithubDarkDefault = "github-dark-default";
+case GithubDarkDimmed = "github-dark-dimmed";
+case RosePine = "rose-pine";
+case KanagawaLotus = "kanagawa-lotus";
+case KanagawaDragon = "kanagawa-dragon";
+case DarkPlus = "dark-plus";
+case AyuDark = "ayu-dark";
+case MinDark = "min-dark";
+case Monokai = "monokai";
+case Nord = "nord";
+case CatppuccinFrappe = "catppuccin-frappe";
+case GithubLight = "github-light";
+case DraculaSoft = "dracula-soft";
+case Synthwave84 = "synthwave-84";
+case VitesseDark = "vitesse-dark";
+case GruvboxDarkHard = "gruvbox-dark-hard";
+case Andromeeda = "andromeeda";
+case LightPlus = "light-plus";
+case SlackOchin = "slack-ochin";
+case SolarizedDark = "solarized-dark";
+case GruvboxLightSoft = "gruvbox-light-soft";
+case MaterialThemeOcean = "material-theme-ocean";
+case VitesseLight = "vitesse-light";
+case Vesper = "vesper";
+case KanagawaWave = "kanagawa-wave";
+case Plastic = "plastic";
+case MaterialThemeDarker = "material-theme-darker";
+case NightOwl = "night-owl";
+case CatppuccinLatte = "catppuccin-latte";
+case MinLight = "min-light";
+case SnazzyLight = "snazzy-light";
+case Houston = "houston";
+case MaterialThemePalenight = "material-theme-palenight";
 
     public function toParsedTheme(ThemeRepositoryInterface $repository): ParsedTheme
     {
         return $repository->get($this->value);
     }
-}
+}
\ No newline at end of file

From 700d3f8d1c7639379e98ea6cd50df37be327e8e0 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:42:06 +0100
Subject: [PATCH 16/23] Add note about ParsedGrammar to README

---
 README.md                     | 13 +++++++++++++
 src/Grammar/ParsedGrammar.php |  1 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 668ba0a..732791f 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,19 @@ $phiki = new Phiki($environment);
 $phiki->codeToHtml('...', 'my-language', 'my-theme');
 ```
 
+If you don't have a JSON file containing the grammar file and would rather use a PHP array, you can instead create a `ParsedGrammar` instance from an array.
+
+```php
+$environment
+    ->getGrammarRepository()
+    ->register('my-language', ParsedGrammar::fromArray([
+        'scopeName' => 'source.language',
+        'patterns' => [
+            // ...
+        ]
+    ]));
+```
+
 ### Terminal Output
 
 Phiki has support for generating output designed for use in the terminal. This is available through the `codeToTerminal()` method which accepts the same parameters as the `codeToHtml()` method.
diff --git a/src/Grammar/ParsedGrammar.php b/src/Grammar/ParsedGrammar.php
index 61bedd1..48bb32c 100644
--- a/src/Grammar/ParsedGrammar.php
+++ b/src/Grammar/ParsedGrammar.php
@@ -5,7 +5,6 @@
 use Phiki\Contracts\PatternCollectionInterface;
 use Phiki\Tokenizer;
 
-/** @internal */
 final class ParsedGrammar extends Pattern implements PatternCollectionInterface
 {
     /**

From 0502630801c0f1bbf497a6137ac767670959a031 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:49:42 +0100
Subject: [PATCH 17/23] Move update-sources script

---
 README.md                            | 4 ++++
 composer.json                        | 2 +-
 {meta => scripts}/update-sources.php | 0
 3 files changed, 5 insertions(+), 1 deletion(-)
 rename {meta => scripts}/update-sources.php (100%)

diff --git a/README.md b/README.md
index 732791f..b68d593 100644
--- a/README.md
+++ b/README.md
@@ -247,6 +247,10 @@ preg_match(): Compilation failed: length of lookbehind assertion is not limited
 > [!NOTE]
 > If you're running Phiki on PHP 8.2 or PHP 8.3, then you're still going to run into warnings or errors with these patched grammars since those versions of PHP do not use the latest version of PCRE2.
 
+## Contributing
+
+All contributions are welcome. Please consult the [CONTRIBUTING](./CONTRIBUTING.md) guide.
+
 ## Credits
 
 * [Ryan Chandler](https://github.com/ryangjchandler)
diff --git a/composer.json b/composer.json
index 843d120..ead6190 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
         ],
         "update-sources": [
             "Composer\\Config::disableProcessTimeout",
-            "@php ./meta/update-sources.php"
+            "@php ./scripts/update-sources.php"
         ],
         "test": "@php -dmemory_limit=-1 vendor/bin/pest --enforce-time-limit --default-time-limit=1",
         "lint": "vendor/bin/phpstan --memory-limit=-1",
diff --git a/meta/update-sources.php b/scripts/update-sources.php
similarity index 100%
rename from meta/update-sources.php
rename to scripts/update-sources.php

From c528fcfb32d051c64f43158b168925ed427bdb0b Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:50:01 +0100
Subject: [PATCH 18/23] Remove sample.php file

---
 meta/sample.php | 109 ------------------------------------------------
 1 file changed, 109 deletions(-)
 delete mode 100644 meta/sample.php

diff --git a/meta/sample.php b/meta/sample.php
deleted file mode 100644
index a9014b9..0000000
--- a/meta/sample.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-set_time_limit(2);
-
-use Phiki\Environment\Environment;
-use Phiki\Phiki;
-use Phiki\Theme\Theme;
-
-require_once __DIR__.'/../vendor/autoload.php';
-
-set_error_handler(function ($severity, $message, $file, $line) {
-    throw new ErrorException($message, 0, $severity, $file, $line);
-});
-
-$grammar = $_GET['grammar'] ?? 'php';
-$withGutter = ($_GET['gutter'] ?? false) === 'on';
-$environment = Environment::default()->enableStrictMode();
-/** @var \Phiki\Grammar\GrammarRepository $repository */
-$repository = $environment->getGrammarRepository();
-$grammars = $repository->getAllGrammarNames();
-natsort($grammars);
-
-$sample = file_get_contents(__DIR__.'/../resources/samples/'.$grammar.'.sample');
-$tokens = (new Phiki($environment))->codeToTokens($sample, $grammar);
-$html = (new Phiki($environment))->codeToHtml($sample, $grammar, ['light' => Theme::GithubLight, 'dark' => Theme::GithubDark], $withGutter);
-
-?>
-
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Phiki Sample Explorer</title>
-    <script src="https://cdn.tailwindcss.com?plugins=forms"></script>
-    <script src="//unpkg.com/alpinejs" defer></script>
-    <style>
-        @media (prefers-color-scheme: dark) {
-
-            html.dark .phiki,
-            html.dark .phiki span {
-                color: var(--phiki-dark-color) !important;
-                background-color: var(--phiki-dark-background-color) !important;
-                font-style: var(--phiki-dark-font-style) !important;
-                font-weight: var(--phiki-dark-font-weight) !important;
-                text-decoration: var(--phiki-dark-text-decoration) !important;
-            }
-        }
-
-        pre {
-            padding: 0.875rem;
-            padding-left: 0.5rem;
-            font-size: 0.875rem !important;
-            line-height: 1.5 !important;
-            border-radius: 10px;
-        }
-
-        code {
-            font-family: 'Fira Code';
-        }
-
-        pre code span[data-line]::before {
-            content: attr(data-line);
-            display: inline-block;
-            width: 1.7rem;
-            margin-right: 1rem;
-            color: #666;
-            text-align: right;
-        }
-
-        pre code span.line-number {
-            padding-right: 10px;
-        }
-    </style>
-</head>
-
-<body class="antialiased bg-neutral-950 text-white p-8 space-y-8">
-    <header>
-        <h1 class="font-bold text-xl">
-            Phiki Sample Explorer
-        </h1>
-    </header>
-
-    <main class="space-y-8">
-        <form
-            x-data
-            class="flex items-center gap-x-4">
-            <select name="grammar" x-on:change="$root.submit()" class="text-neutral-950">
-                <?php foreach ($grammars as $g) { ?>
-                    <option value="<?= $g ?>" <?= $grammar === $g ? 'selected' : '' ?>>
-                        <?= $g ?>
-                    </option>
-                <?php } ?>
-            </select>
-
-            <div class="flex items-center gap-x-2.5">
-                <input type="checkbox" name="gutter" id="gutter" x-on:change="$root.submit()" <?= $withGutter ? 'checked' : '' ?>>
-                <label for="gutter">With gutter?</label>
-            </div>
-        </form>
-
-        <?= $html ?>
-
-        <?php dump($tokens); ?>
-    </main>
-</body>
-
-</html>

From c88fa017ca6c96b7de0b51846775e6f7585f486b Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:50:18 +0100
Subject: [PATCH 19/23] Move stubs

---
 {meta => scripts}/stubs/DefaultGrammars.php.stub | 0
 {meta => scripts}/stubs/DefaultThemes.php.stub   | 0
 {meta => scripts}/stubs/Grammar.php.stub         | 0
 {meta => scripts}/stubs/Theme.php.stub           | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {meta => scripts}/stubs/DefaultGrammars.php.stub (100%)
 rename {meta => scripts}/stubs/DefaultThemes.php.stub (100%)
 rename {meta => scripts}/stubs/Grammar.php.stub (100%)
 rename {meta => scripts}/stubs/Theme.php.stub (100%)

diff --git a/meta/stubs/DefaultGrammars.php.stub b/scripts/stubs/DefaultGrammars.php.stub
similarity index 100%
rename from meta/stubs/DefaultGrammars.php.stub
rename to scripts/stubs/DefaultGrammars.php.stub
diff --git a/meta/stubs/DefaultThemes.php.stub b/scripts/stubs/DefaultThemes.php.stub
similarity index 100%
rename from meta/stubs/DefaultThemes.php.stub
rename to scripts/stubs/DefaultThemes.php.stub
diff --git a/meta/stubs/Grammar.php.stub b/scripts/stubs/Grammar.php.stub
similarity index 100%
rename from meta/stubs/Grammar.php.stub
rename to scripts/stubs/Grammar.php.stub
diff --git a/meta/stubs/Theme.php.stub b/scripts/stubs/Theme.php.stub
similarity index 100%
rename from meta/stubs/Theme.php.stub
rename to scripts/stubs/Theme.php.stub

From 928276b1488286b6858b6e2e0b2882fa87a5c710 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:50:47 +0100
Subject: [PATCH 20/23] Move patches

---
 meta/vscode-textmate.js                | 71 --------------------------
 resources/languages/cpp.json           |  4 +-
 resources/languages/csharp.json        |  4 +-
 resources/languages/desktop.json       |  6 +--
 resources/languages/gdscript.json      |  2 +-
 resources/languages/genie.json         |  2 +-
 resources/languages/jsonnet.json       |  4 +-
 resources/languages/julia.json         |  2 +-
 resources/languages/nushell.json       |  2 +-
 resources/languages/ruby.json          |  2 +-
 resources/languages/svelte.json        | 10 ++--
 resources/languages/tex.json           |  2 +-
 resources/languages/typst.json         |  6 +--
 resources/languages/vala.json          |  2 +-
 {meta => scripts}/patches/c.php        |  0
 {meta => scripts}/patches/cpp.php      |  0
 {meta => scripts}/patches/csharp.php   |  0
 {meta => scripts}/patches/desktop.php  |  0
 {meta => scripts}/patches/gdscript.php |  0
 {meta => scripts}/patches/genie.php    |  0
 {meta => scripts}/patches/hy.php       |  0
 {meta => scripts}/patches/json.php     |  0
 {meta => scripts}/patches/json5.php    |  0
 {meta => scripts}/patches/jsonc.php    |  0
 {meta => scripts}/patches/jsonl.php    |  0
 {meta => scripts}/patches/jsonnet.php  |  0
 {meta => scripts}/patches/julia.php    |  0
 {meta => scripts}/patches/less.php     |  0
 {meta => scripts}/patches/log.php      |  0
 {meta => scripts}/patches/nushell.php  |  0
 {meta => scripts}/patches/ocaml.php    |  0
 {meta => scripts}/patches/ruby.php     |  0
 {meta => scripts}/patches/svelte.php   |  0
 {meta => scripts}/patches/tex.php      |  0
 {meta => scripts}/patches/typst.php    |  0
 {meta => scripts}/patches/vala.php     |  0
 36 files changed, 24 insertions(+), 95 deletions(-)
 delete mode 100644 meta/vscode-textmate.js
 rename {meta => scripts}/patches/c.php (100%)
 rename {meta => scripts}/patches/cpp.php (100%)
 rename {meta => scripts}/patches/csharp.php (100%)
 rename {meta => scripts}/patches/desktop.php (100%)
 rename {meta => scripts}/patches/gdscript.php (100%)
 rename {meta => scripts}/patches/genie.php (100%)
 rename {meta => scripts}/patches/hy.php (100%)
 rename {meta => scripts}/patches/json.php (100%)
 rename {meta => scripts}/patches/json5.php (100%)
 rename {meta => scripts}/patches/jsonc.php (100%)
 rename {meta => scripts}/patches/jsonl.php (100%)
 rename {meta => scripts}/patches/jsonnet.php (100%)
 rename {meta => scripts}/patches/julia.php (100%)
 rename {meta => scripts}/patches/less.php (100%)
 rename {meta => scripts}/patches/log.php (100%)
 rename {meta => scripts}/patches/nushell.php (100%)
 rename {meta => scripts}/patches/ocaml.php (100%)
 rename {meta => scripts}/patches/ruby.php (100%)
 rename {meta => scripts}/patches/svelte.php (100%)
 rename {meta => scripts}/patches/tex.php (100%)
 rename {meta => scripts}/patches/typst.php (100%)
 rename {meta => scripts}/patches/vala.php (100%)

diff --git a/meta/vscode-textmate.js b/meta/vscode-textmate.js
deleted file mode 100644
index 27da0b2..0000000
--- a/meta/vscode-textmate.js
+++ /dev/null
@@ -1,71 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const vsctm = require('vscode-textmate')
-const oniguruma = require('vscode-oniguruma')
-
-function readFile(path) {
-    return new Promise((resolve, reject) => {
-        fs.readFile(path, (error, data) =>
-            error ? reject(error) : resolve(data)
-        );
-    });
-}
-
-const wasmBin = fs.readFileSync(
-    path.join(__dirname, "../node_modules/vscode-oniguruma/release/onig.wasm")
-).buffer;
-const vscodeOnigurumaLib = oniguruma.loadWASM(wasmBin).then(() => {
-    return {
-        createOnigScanner(patterns) {
-            return new oniguruma.OnigScanner(patterns);
-        },
-        createOnigString(s) {
-            return new oniguruma.OnigString(s);
-        },
-    };
-});
-
-const registry = new vsctm.Registry({
-    onigLib: vscodeOnigurumaLib,
-    loadGrammar: (scopeName) => {
-        if (scopeName === "source.svelte") {
-            // https://github.com/textmate/javascript.tmbundle/blob/master/Syntaxes/JavaScript.plist
-            return readFile(path.join(__dirname, "../resources/languages/svelte.json")).then((data) =>
-                vsctm.parseRawGrammar(data.toString(), 'svelte.json')
-            );
-        }
-        if (scopeName === 'source.js') {
-            return readFile(path.join(__dirname, "../resources/languages/javascript.json")).then((data) =>
-                vsctm.parseRawGrammar(data.toString(), 'javascript.json')
-            );
-        }
-        if (scopeName === 'source.cpp') {
-            return readFile(
-                path.join(__dirname, "../resources/languages/cpp.json")
-            ).then((data) =>
-                vsctm.parseRawGrammar(data.toString(), "cpp.json")
-            );
-        }
-        console.log(`Unknown scope name: ${scopeName}`);
-        return null;
-    },
-});
-
-registry.loadGrammar("source.cpp").then(async (grammar) => {
-    const text = await readFile(path.join(__dirname, '../resources/samples/cpp.sample')).then(file => file.toString().split("\n"));
-    let ruleStack = vsctm.INITIAL;
-    for (let i = 0; i < text.length; i++) {
-        const line = text[i];
-        const lineTokens = grammar.tokenizeLine(line, ruleStack);
-        // console.log(`\nTokenizing line: ${line}`);
-        for (let j = 0; j < lineTokens.tokens.length; j++) {
-            const token = lineTokens.tokens[j];
-            console.log(
-                ` - token from ${token.startIndex} to ${token.endIndex} ` +
-                    `(${line.substring(token.startIndex, token.endIndex)}) ` +
-                    `with scopes ${token.scopes.join(", ")}`
-            );
-        }
-        ruleStack = lineTokens.ruleStack;
-    }
-});
diff --git a/resources/languages/cpp.json b/resources/languages/cpp.json
index 779cdb8..fff5f2d 100644
--- a/resources/languages/cpp.json
+++ b/resources/languages/cpp.json
@@ -2416,7 +2416,7 @@
         "0": {
           "patterns": [
             {
-              "begin": "(?=\\.)",
+              "begin": "(?=.)",
               "beginCaptures": {
               },
               "end": "$",
@@ -6757,7 +6757,7 @@
         "0": {
           "patterns": [
             {
-              "begin": "(?=\\.)",
+              "begin": "(?=.)",
               "beginCaptures": {
               },
               "end": "$",
diff --git a/resources/languages/csharp.json b/resources/languages/csharp.json
index f494a9c..b7da88f 100644
--- a/resources/languages/csharp.json
+++ b/resources/languages/csharp.json
@@ -472,11 +472,11 @@
       ]
     },
     "await-expression": {
-      "match": "(?<!\\.\\s{0,254})\\b(await)\\b",
+      "match": "(?<!\\.\\s*)\\b(await)\\b",
       "name": "keyword.operator.expression.await.cs"
     },
     "await-statement": {
-      "begin": "(?<!\\.\\s{0,254})\\b(await)\\b",
+      "begin": "(?<!\\.\\s*)\\b(await)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.await.cs"
diff --git a/resources/languages/desktop.json b/resources/languages/desktop.json
index 0abb144..f4361e8 100644
--- a/resources/languages/desktop.json
+++ b/resources/languages/desktop.json
@@ -22,7 +22,7 @@
     "inCategories": {
       "patterns": [
         {
-          "match": "AudioVideo|Audio|Video|Development|Education|Game|Graphics|Network|Office|Science|Settings|System|Utility",
+          "match": "(?<=^Categories.*)AudioVideo|(?<=^Categories.*)Audio|(?<=^Categories.*)Video|(?<=^Categories.*)Development|(?<=^Categories.*)Education|(?<=^Categories.*)Game|(?<=^Categories.*)Graphics|(?<=^Categories.*)Network|(?<=^Categories.*)Office|(?<=^Categories.*)Science|(?<=^Categories.*)Settings|(?<=^Categories.*)System|(?<=^Categories.*)Utility",
           "name": "markup.bold"
         }
       ]
@@ -30,7 +30,7 @@
     "inCommands": {
       "patterns": [
         {
-          "match": "-+\\S+",
+          "match": "(?<=^Exec.*\\s)-+\\S+",
           "name": "variable.parameter"
         },
         {
@@ -88,7 +88,7 @@
     "values": {
       "patterns": [
         {
-          "match": "=",
+          "match": "(?<=^\\S+)=",
           "name": "keyword.operator"
         },
         {
diff --git a/resources/languages/gdscript.json b/resources/languages/gdscript.json
index 3fab2d4..f6a5225 100644
--- a/resources/languages/gdscript.json
+++ b/resources/languages/gdscript.json
@@ -220,7 +220,7 @@
           "name": "constant.character.escape.gdscript"
         }
       },
-      "match": "(?<!/\\s)(\\$\\s*|%|\\$%\\s*)(/\\s*)?([a-zA-Z_]\\w*)\\b(?!\\s*/)",
+      "match": "(?<!/\\s*)(\\$\\s*|%|\\$%\\s*)(/\\s*)?([a-zA-Z_]\\w*)\\b(?!\\s*/)",
       "name": "meta.literal.nodepath.bare.gdscript"
     },
     "builtin_get_node_shorthand_bare_multi": {
diff --git a/resources/languages/genie.json b/resources/languages/genie.json
index daadd63..9cf673b 100644
--- a/resources/languages/genie.json
+++ b/resources/languages/genie.json
@@ -75,7 +75,7 @@
               "name": "punctuation.definition.comment.vala"
             }
           },
-          "match": "\\s*((\\/\\/).*$\\n?)"
+          "match": "\\s*((//).*$\\n?)"
         }
       ]
     },
diff --git a/resources/languages/jsonnet.json b/resources/languages/jsonnet.json
index 790f855..944e11e 100644
--- a/resources/languages/jsonnet.json
+++ b/resources/languages/jsonnet.json
@@ -77,7 +77,7 @@
           "name": "constant.character.escape.jsonnet"
         },
         {
-          "match": "\\\\[^\"\\\\\\/bfnrtu]",
+          "match": "\\\\[^\"\\\\/bfnrtu]",
           "name": "invalid.illegal.jsonnet"
         }
       ]
@@ -192,7 +192,7 @@
           "name": "constant.character.escape.jsonnet"
         },
         {
-          "match": "\\\\[^'\\\\\\/bfnrtu]",
+          "match": "\\\\[^'\\\\/bfnrtu]",
           "name": "invalid.illegal.jsonnet"
         }
       ]
diff --git a/resources/languages/julia.json b/resources/languages/julia.json
index 499f7e4..df22bbb 100644
--- a/resources/languages/julia.json
+++ b/resources/languages/julia.json
@@ -297,7 +297,7 @@
           "name": "keyword.control.using.julia"
         },
         {
-          "match": "(?<=\\S\\s{1,254})\\b(as)\\b(?=\\s+\\S)",
+          "match": "(?<=\\S\\s+)\\b(as)\\b(?=\\s+\\S)",
           "name": "keyword.control.as.julia"
         },
         {
diff --git a/resources/languages/nushell.json b/resources/languages/nushell.json
index f24dc73..fdb33f0 100644
--- a/resources/languages/nushell.json
+++ b/resources/languages/nushell.json
@@ -470,7 +470,7 @@
       ]
     },
     "function-multiple-inout": {
-      "begin": "(?<=]\\s{0,254})(:)\\s+(\\[)",
+      "begin": "(?<=]\\s*)(:)\\s+(\\[)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.in-out.nushell"
diff --git a/resources/languages/ruby.json b/resources/languages/ruby.json
index 0977feb..c3b96f1 100644
--- a/resources/languages/ruby.json
+++ b/resources/languages/ruby.json
@@ -475,7 +475,7 @@
       ]
     },
     {
-      "begin": "(?<![\\w)])((/))(?![?*+])(?=(?:\\\\\\/|[^/])*+/[eimnosux]*\\s*(?:[)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|if|else|elsif|then|do|end|unless|while|until|or|and)|$)",
+      "begin": "(?<![\\w)])((/))(?![?*+])(?=(?:\\\\/|[^/])*+/[eimnosux]*\\s*(?:[)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|if|else|elsif|then|do|end|unless|while|until|or|and)|$)",
       "captures": {
         "1": {
           "name": "string.regexp.interpolated.ruby"
diff --git a/resources/languages/svelte.json b/resources/languages/svelte.json
index e85bdc8..05560e2 100644
--- a/resources/languages/svelte.json
+++ b/resources/languages/svelte.json
@@ -738,7 +738,7 @@
     "special-tags-modes": {
       "patterns": [
         {
-          "begin": "(?<=(if|key|then|catch|snippet|html|render).{0,248}?)\\G",
+          "begin": "(?<=(if|key|then|catch|snippet|html|render).*?)\\G",
           "end": "(?=})",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
@@ -748,7 +748,7 @@
           ]
         },
         {
-          "begin": "(?<=const.{0,249}?)\\G",
+          "begin": "(?<=const.*?)\\G",
           "end": "(?=})",
           "patterns": [
             {
@@ -786,7 +786,7 @@
           ]
         },
         {
-          "begin": "(?<=each.{0,250}?)\\G",
+          "begin": "(?<=each.*?)\\G",
           "end": "(?=})",
           "patterns": [
             {
@@ -848,7 +848,7 @@
           ]
         },
         {
-          "begin": "(?<=await.{0,249}?)\\G",
+          "begin": "(?<=await.*?)\\G",
           "end": "(?=})",
           "patterns": [
             {
@@ -879,7 +879,7 @@
           ]
         },
         {
-          "begin": "(?<=debug.{0,249}?)\\G",
+          "begin": "(?<=debug.*?)\\G",
           "end": "(?=})",
           "patterns": [
             {
diff --git a/resources/languages/tex.json b/resources/languages/tex.json
index 5235d20..69c604f 100644
--- a/resources/languages/tex.json
+++ b/resources/languages/tex.json
@@ -139,7 +139,7 @@
       ]
     },
     "iffalse-block": {
-      "begin": "(?<=^\\s{0,254})((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)",
+      "begin": "(?<=^\\s*)((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.tex"
diff --git a/resources/languages/typst.json b/resources/languages/typst.json
index 4bb502f..c8a6609 100644
--- a/resources/languages/typst.json
+++ b/resources/languages/typst.json
@@ -119,11 +119,11 @@
           "name": "entity.name.function.typst"
         },
         {
-          "match": "(?<=\\bshow\\s{0,251})\\b[[:alpha:]_][[:alnum:]_-]*(?=\\s*[:.])",
+          "match": "(?<=\\bshow\\s*)\\b[[:alpha:]_][[:alnum:]_-]*(?=\\s*[:.])",
           "name": "entity.name.function.typst"
         },
         {
-          "begin": "(?<=\\b[[:alpha:]_][[:alnum:]_-]{0,253}!?)\\(",
+          "begin": "(?<=\\b[[:alpha:]_][[:alnum:]_-]*!?)\\(",
           "captures": {
             "0": {
               "name": "punctuation.definition.group.typst"
@@ -533,7 +533,7 @@
           "name": "entity.name.function.typst"
         },
         {
-          "begin": "(?<=#[[:alpha:]_][[:alnum:]_-]{0,252}!?)\\(",
+          "begin": "(?<=#[[:alpha:]_][[:alnum:]_-]*!?)\\(",
           "captures": {
             "0": {
               "name": "punctuation.definition.group.typst"
diff --git a/resources/languages/vala.json b/resources/languages/vala.json
index d75b5b6..5a1bd8f 100644
--- a/resources/languages/vala.json
+++ b/resources/languages/vala.json
@@ -77,7 +77,7 @@
               "name": "punctuation.definition.comment.vala"
             }
           },
-          "match": "\\s*((\\/\\/).*$\\n?)"
+          "match": "\\s*((//).*$\\n?)"
         }
       ]
     },
diff --git a/meta/patches/c.php b/scripts/patches/c.php
similarity index 100%
rename from meta/patches/c.php
rename to scripts/patches/c.php
diff --git a/meta/patches/cpp.php b/scripts/patches/cpp.php
similarity index 100%
rename from meta/patches/cpp.php
rename to scripts/patches/cpp.php
diff --git a/meta/patches/csharp.php b/scripts/patches/csharp.php
similarity index 100%
rename from meta/patches/csharp.php
rename to scripts/patches/csharp.php
diff --git a/meta/patches/desktop.php b/scripts/patches/desktop.php
similarity index 100%
rename from meta/patches/desktop.php
rename to scripts/patches/desktop.php
diff --git a/meta/patches/gdscript.php b/scripts/patches/gdscript.php
similarity index 100%
rename from meta/patches/gdscript.php
rename to scripts/patches/gdscript.php
diff --git a/meta/patches/genie.php b/scripts/patches/genie.php
similarity index 100%
rename from meta/patches/genie.php
rename to scripts/patches/genie.php
diff --git a/meta/patches/hy.php b/scripts/patches/hy.php
similarity index 100%
rename from meta/patches/hy.php
rename to scripts/patches/hy.php
diff --git a/meta/patches/json.php b/scripts/patches/json.php
similarity index 100%
rename from meta/patches/json.php
rename to scripts/patches/json.php
diff --git a/meta/patches/json5.php b/scripts/patches/json5.php
similarity index 100%
rename from meta/patches/json5.php
rename to scripts/patches/json5.php
diff --git a/meta/patches/jsonc.php b/scripts/patches/jsonc.php
similarity index 100%
rename from meta/patches/jsonc.php
rename to scripts/patches/jsonc.php
diff --git a/meta/patches/jsonl.php b/scripts/patches/jsonl.php
similarity index 100%
rename from meta/patches/jsonl.php
rename to scripts/patches/jsonl.php
diff --git a/meta/patches/jsonnet.php b/scripts/patches/jsonnet.php
similarity index 100%
rename from meta/patches/jsonnet.php
rename to scripts/patches/jsonnet.php
diff --git a/meta/patches/julia.php b/scripts/patches/julia.php
similarity index 100%
rename from meta/patches/julia.php
rename to scripts/patches/julia.php
diff --git a/meta/patches/less.php b/scripts/patches/less.php
similarity index 100%
rename from meta/patches/less.php
rename to scripts/patches/less.php
diff --git a/meta/patches/log.php b/scripts/patches/log.php
similarity index 100%
rename from meta/patches/log.php
rename to scripts/patches/log.php
diff --git a/meta/patches/nushell.php b/scripts/patches/nushell.php
similarity index 100%
rename from meta/patches/nushell.php
rename to scripts/patches/nushell.php
diff --git a/meta/patches/ocaml.php b/scripts/patches/ocaml.php
similarity index 100%
rename from meta/patches/ocaml.php
rename to scripts/patches/ocaml.php
diff --git a/meta/patches/ruby.php b/scripts/patches/ruby.php
similarity index 100%
rename from meta/patches/ruby.php
rename to scripts/patches/ruby.php
diff --git a/meta/patches/svelte.php b/scripts/patches/svelte.php
similarity index 100%
rename from meta/patches/svelte.php
rename to scripts/patches/svelte.php
diff --git a/meta/patches/tex.php b/scripts/patches/tex.php
similarity index 100%
rename from meta/patches/tex.php
rename to scripts/patches/tex.php
diff --git a/meta/patches/typst.php b/scripts/patches/typst.php
similarity index 100%
rename from meta/patches/typst.php
rename to scripts/patches/typst.php
diff --git a/meta/patches/vala.php b/scripts/patches/vala.php
similarity index 100%
rename from meta/patches/vala.php
rename to scripts/patches/vala.php

From 87c8394018b227136f9388e27df80c1a30e50f06 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:50:56 +0100
Subject: [PATCH 21/23] Update patches

---
 resources/languages/cpp.json      |  4 ++--
 resources/languages/csharp.json   |  4 ++--
 resources/languages/desktop.json  |  6 +++---
 resources/languages/gdscript.json |  2 +-
 resources/languages/genie.json    |  2 +-
 resources/languages/jsonnet.json  |  4 ++--
 resources/languages/julia.json    |  2 +-
 resources/languages/nushell.json  |  2 +-
 resources/languages/ruby.json     |  2 +-
 resources/languages/svelte.json   | 10 +++++-----
 resources/languages/tex.json      |  2 +-
 resources/languages/typst.json    |  6 +++---
 resources/languages/vala.json     |  2 +-
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/resources/languages/cpp.json b/resources/languages/cpp.json
index fff5f2d..779cdb8 100644
--- a/resources/languages/cpp.json
+++ b/resources/languages/cpp.json
@@ -2416,7 +2416,7 @@
         "0": {
           "patterns": [
             {
-              "begin": "(?=.)",
+              "begin": "(?=\\.)",
               "beginCaptures": {
               },
               "end": "$",
@@ -6757,7 +6757,7 @@
         "0": {
           "patterns": [
             {
-              "begin": "(?=.)",
+              "begin": "(?=\\.)",
               "beginCaptures": {
               },
               "end": "$",
diff --git a/resources/languages/csharp.json b/resources/languages/csharp.json
index b7da88f..f494a9c 100644
--- a/resources/languages/csharp.json
+++ b/resources/languages/csharp.json
@@ -472,11 +472,11 @@
       ]
     },
     "await-expression": {
-      "match": "(?<!\\.\\s*)\\b(await)\\b",
+      "match": "(?<!\\.\\s{0,254})\\b(await)\\b",
       "name": "keyword.operator.expression.await.cs"
     },
     "await-statement": {
-      "begin": "(?<!\\.\\s*)\\b(await)\\b",
+      "begin": "(?<!\\.\\s{0,254})\\b(await)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.await.cs"
diff --git a/resources/languages/desktop.json b/resources/languages/desktop.json
index f4361e8..0abb144 100644
--- a/resources/languages/desktop.json
+++ b/resources/languages/desktop.json
@@ -22,7 +22,7 @@
     "inCategories": {
       "patterns": [
         {
-          "match": "(?<=^Categories.*)AudioVideo|(?<=^Categories.*)Audio|(?<=^Categories.*)Video|(?<=^Categories.*)Development|(?<=^Categories.*)Education|(?<=^Categories.*)Game|(?<=^Categories.*)Graphics|(?<=^Categories.*)Network|(?<=^Categories.*)Office|(?<=^Categories.*)Science|(?<=^Categories.*)Settings|(?<=^Categories.*)System|(?<=^Categories.*)Utility",
+          "match": "AudioVideo|Audio|Video|Development|Education|Game|Graphics|Network|Office|Science|Settings|System|Utility",
           "name": "markup.bold"
         }
       ]
@@ -30,7 +30,7 @@
     "inCommands": {
       "patterns": [
         {
-          "match": "(?<=^Exec.*\\s)-+\\S+",
+          "match": "-+\\S+",
           "name": "variable.parameter"
         },
         {
@@ -88,7 +88,7 @@
     "values": {
       "patterns": [
         {
-          "match": "(?<=^\\S+)=",
+          "match": "=",
           "name": "keyword.operator"
         },
         {
diff --git a/resources/languages/gdscript.json b/resources/languages/gdscript.json
index f6a5225..3fab2d4 100644
--- a/resources/languages/gdscript.json
+++ b/resources/languages/gdscript.json
@@ -220,7 +220,7 @@
           "name": "constant.character.escape.gdscript"
         }
       },
-      "match": "(?<!/\\s*)(\\$\\s*|%|\\$%\\s*)(/\\s*)?([a-zA-Z_]\\w*)\\b(?!\\s*/)",
+      "match": "(?<!/\\s)(\\$\\s*|%|\\$%\\s*)(/\\s*)?([a-zA-Z_]\\w*)\\b(?!\\s*/)",
       "name": "meta.literal.nodepath.bare.gdscript"
     },
     "builtin_get_node_shorthand_bare_multi": {
diff --git a/resources/languages/genie.json b/resources/languages/genie.json
index 9cf673b..daadd63 100644
--- a/resources/languages/genie.json
+++ b/resources/languages/genie.json
@@ -75,7 +75,7 @@
               "name": "punctuation.definition.comment.vala"
             }
           },
-          "match": "\\s*((//).*$\\n?)"
+          "match": "\\s*((\\/\\/).*$\\n?)"
         }
       ]
     },
diff --git a/resources/languages/jsonnet.json b/resources/languages/jsonnet.json
index 944e11e..790f855 100644
--- a/resources/languages/jsonnet.json
+++ b/resources/languages/jsonnet.json
@@ -77,7 +77,7 @@
           "name": "constant.character.escape.jsonnet"
         },
         {
-          "match": "\\\\[^\"\\\\/bfnrtu]",
+          "match": "\\\\[^\"\\\\\\/bfnrtu]",
           "name": "invalid.illegal.jsonnet"
         }
       ]
@@ -192,7 +192,7 @@
           "name": "constant.character.escape.jsonnet"
         },
         {
-          "match": "\\\\[^'\\\\/bfnrtu]",
+          "match": "\\\\[^'\\\\\\/bfnrtu]",
           "name": "invalid.illegal.jsonnet"
         }
       ]
diff --git a/resources/languages/julia.json b/resources/languages/julia.json
index df22bbb..499f7e4 100644
--- a/resources/languages/julia.json
+++ b/resources/languages/julia.json
@@ -297,7 +297,7 @@
           "name": "keyword.control.using.julia"
         },
         {
-          "match": "(?<=\\S\\s+)\\b(as)\\b(?=\\s+\\S)",
+          "match": "(?<=\\S\\s{1,254})\\b(as)\\b(?=\\s+\\S)",
           "name": "keyword.control.as.julia"
         },
         {
diff --git a/resources/languages/nushell.json b/resources/languages/nushell.json
index fdb33f0..f24dc73 100644
--- a/resources/languages/nushell.json
+++ b/resources/languages/nushell.json
@@ -470,7 +470,7 @@
       ]
     },
     "function-multiple-inout": {
-      "begin": "(?<=]\\s*)(:)\\s+(\\[)",
+      "begin": "(?<=]\\s{0,254})(:)\\s+(\\[)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.in-out.nushell"
diff --git a/resources/languages/ruby.json b/resources/languages/ruby.json
index c3b96f1..0977feb 100644
--- a/resources/languages/ruby.json
+++ b/resources/languages/ruby.json
@@ -475,7 +475,7 @@
       ]
     },
     {
-      "begin": "(?<![\\w)])((/))(?![?*+])(?=(?:\\\\/|[^/])*+/[eimnosux]*\\s*(?:[)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|if|else|elsif|then|do|end|unless|while|until|or|and)|$)",
+      "begin": "(?<![\\w)])((/))(?![?*+])(?=(?:\\\\\\/|[^/])*+/[eimnosux]*\\s*(?:[)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|if|else|elsif|then|do|end|unless|while|until|or|and)|$)",
       "captures": {
         "1": {
           "name": "string.regexp.interpolated.ruby"
diff --git a/resources/languages/svelte.json b/resources/languages/svelte.json
index 05560e2..e85bdc8 100644
--- a/resources/languages/svelte.json
+++ b/resources/languages/svelte.json
@@ -738,7 +738,7 @@
     "special-tags-modes": {
       "patterns": [
         {
-          "begin": "(?<=(if|key|then|catch|snippet|html|render).*?)\\G",
+          "begin": "(?<=(if|key|then|catch|snippet|html|render).{0,248}?)\\G",
           "end": "(?=})",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
@@ -748,7 +748,7 @@
           ]
         },
         {
-          "begin": "(?<=const.*?)\\G",
+          "begin": "(?<=const.{0,249}?)\\G",
           "end": "(?=})",
           "patterns": [
             {
@@ -786,7 +786,7 @@
           ]
         },
         {
-          "begin": "(?<=each.*?)\\G",
+          "begin": "(?<=each.{0,250}?)\\G",
           "end": "(?=})",
           "patterns": [
             {
@@ -848,7 +848,7 @@
           ]
         },
         {
-          "begin": "(?<=await.*?)\\G",
+          "begin": "(?<=await.{0,249}?)\\G",
           "end": "(?=})",
           "patterns": [
             {
@@ -879,7 +879,7 @@
           ]
         },
         {
-          "begin": "(?<=debug.*?)\\G",
+          "begin": "(?<=debug.{0,249}?)\\G",
           "end": "(?=})",
           "patterns": [
             {
diff --git a/resources/languages/tex.json b/resources/languages/tex.json
index 69c604f..5235d20 100644
--- a/resources/languages/tex.json
+++ b/resources/languages/tex.json
@@ -139,7 +139,7 @@
       ]
     },
     "iffalse-block": {
-      "begin": "(?<=^\\s*)((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)",
+      "begin": "(?<=^\\s{0,254})((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.tex"
diff --git a/resources/languages/typst.json b/resources/languages/typst.json
index c8a6609..4bb502f 100644
--- a/resources/languages/typst.json
+++ b/resources/languages/typst.json
@@ -119,11 +119,11 @@
           "name": "entity.name.function.typst"
         },
         {
-          "match": "(?<=\\bshow\\s*)\\b[[:alpha:]_][[:alnum:]_-]*(?=\\s*[:.])",
+          "match": "(?<=\\bshow\\s{0,251})\\b[[:alpha:]_][[:alnum:]_-]*(?=\\s*[:.])",
           "name": "entity.name.function.typst"
         },
         {
-          "begin": "(?<=\\b[[:alpha:]_][[:alnum:]_-]*!?)\\(",
+          "begin": "(?<=\\b[[:alpha:]_][[:alnum:]_-]{0,253}!?)\\(",
           "captures": {
             "0": {
               "name": "punctuation.definition.group.typst"
@@ -533,7 +533,7 @@
           "name": "entity.name.function.typst"
         },
         {
-          "begin": "(?<=#[[:alpha:]_][[:alnum:]_-]*!?)\\(",
+          "begin": "(?<=#[[:alpha:]_][[:alnum:]_-]{0,252}!?)\\(",
           "captures": {
             "0": {
               "name": "punctuation.definition.group.typst"
diff --git a/resources/languages/vala.json b/resources/languages/vala.json
index 5a1bd8f..d75b5b6 100644
--- a/resources/languages/vala.json
+++ b/resources/languages/vala.json
@@ -77,7 +77,7 @@
               "name": "punctuation.definition.comment.vala"
             }
           },
-          "match": "\\s*((//).*$\\n?)"
+          "match": "\\s*((\\/\\/).*$\\n?)"
         }
       ]
     },

From 9cd32aa59ebbd56b0e7af8819a2b9e2f731bf725 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Fri, 11 Apr 2025 23:51:03 +0100
Subject: [PATCH 22/23] Format

---
 src/Grammar/DefaultGrammars.php | 888 ++++++++++++++++----------------
 src/Grammar/Grammar.php         | 444 ++++++++--------
 src/Theme/DefaultThemes.php     | 122 ++---
 src/Theme/Theme.php             | 122 ++---
 4 files changed, 788 insertions(+), 788 deletions(-)

diff --git a/src/Grammar/DefaultGrammars.php b/src/Grammar/DefaultGrammars.php
index d7a7a42..ba0beab 100644
--- a/src/Grammar/DefaultGrammars.php
+++ b/src/Grammar/DefaultGrammars.php
@@ -5,452 +5,452 @@
 abstract class DefaultGrammars
 {
     final const NAMES_TO_PATHS = [
-        'txt' => __DIR__ . '/../../resources/languages/txt.json',
-        "astro" => __DIR__ . "/../../resources/languages/astro.json",
-"hy" => __DIR__ . "/../../resources/languages/hy.json",
-"nim" => __DIR__ . "/../../resources/languages/nim.json",
-"cpp" => __DIR__ . "/../../resources/languages/cpp.json",
-"jinja" => __DIR__ . "/../../resources/languages/jinja.json",
-"coq" => __DIR__ . "/../../resources/languages/coq.json",
-"templ" => __DIR__ . "/../../resources/languages/templ.json",
-"glimmer-ts" => __DIR__ . "/../../resources/languages/glimmer-ts.json",
-"angular-html" => __DIR__ . "/../../resources/languages/angular-html.json",
-"cmake" => __DIR__ . "/../../resources/languages/cmake.json",
-"mdx" => __DIR__ . "/../../resources/languages/mdx.json",
-"nix" => __DIR__ . "/../../resources/languages/nix.json",
-"gdresource" => __DIR__ . "/../../resources/languages/gdresource.json",
-"haxe" => __DIR__ . "/../../resources/languages/haxe.json",
-"ada" => __DIR__ . "/../../resources/languages/ada.json",
-"powerquery" => __DIR__ . "/../../resources/languages/powerquery.json",
-"fluent" => __DIR__ . "/../../resources/languages/fluent.json",
-"objective-c" => __DIR__ . "/../../resources/languages/objective-c.json",
-"elixir" => __DIR__ . "/../../resources/languages/elixir.json",
-"diff" => __DIR__ . "/../../resources/languages/diff.json",
-"java" => __DIR__ . "/../../resources/languages/java.json",
-"glsl" => __DIR__ . "/../../resources/languages/glsl.json",
-"mojo" => __DIR__ . "/../../resources/languages/mojo.json",
-"sparql" => __DIR__ . "/../../resources/languages/sparql.json",
-"bicep" => __DIR__ . "/../../resources/languages/bicep.json",
-"csv" => __DIR__ . "/../../resources/languages/csv.json",
-"swift" => __DIR__ . "/../../resources/languages/swift.json",
-"ssh-config" => __DIR__ . "/../../resources/languages/ssh-config.json",
-"edge" => __DIR__ . "/../../resources/languages/edge.json",
-"narrat" => __DIR__ . "/../../resources/languages/narrat.json",
-"tasl" => __DIR__ . "/../../resources/languages/tasl.json",
-"nushell" => __DIR__ . "/../../resources/languages/nushell.json",
-"erb" => __DIR__ . "/../../resources/languages/erb.json",
-"move" => __DIR__ . "/../../resources/languages/move.json",
-"scheme" => __DIR__ . "/../../resources/languages/scheme.json",
-"mipsasm" => __DIR__ . "/../../resources/languages/mipsasm.json",
-"rst" => __DIR__ . "/../../resources/languages/rst.json",
-"shellscript" => __DIR__ . "/../../resources/languages/shellscript.json",
-"apache" => __DIR__ . "/../../resources/languages/apache.json",
-"wgsl" => __DIR__ . "/../../resources/languages/wgsl.json",
-"fortran-free-form" => __DIR__ . "/../../resources/languages/fortran-free-form.json",
-"ini" => __DIR__ . "/../../resources/languages/ini.json",
-"make" => __DIR__ . "/../../resources/languages/make.json",
-"ts-tags" => __DIR__ . "/../../resources/languages/ts-tags.json",
-"stylus" => __DIR__ . "/../../resources/languages/stylus.json",
-"jsx" => __DIR__ . "/../../resources/languages/jsx.json",
-"jsonl" => __DIR__ . "/../../resources/languages/jsonl.json",
-"llvm" => __DIR__ . "/../../resources/languages/llvm.json",
-"twig" => __DIR__ . "/../../resources/languages/twig.json",
-"clojure" => __DIR__ . "/../../resources/languages/clojure.json",
-"svelte" => __DIR__ . "/../../resources/languages/svelte.json",
-"xml" => __DIR__ . "/../../resources/languages/xml.json",
-"jssm" => __DIR__ . "/../../resources/languages/jssm.json",
-"erlang" => __DIR__ . "/../../resources/languages/erlang.json",
-"applescript" => __DIR__ . "/../../resources/languages/applescript.json",
-"viml" => __DIR__ . "/../../resources/languages/viml.json",
-"razor" => __DIR__ . "/../../resources/languages/razor.json",
-"apex" => __DIR__ . "/../../resources/languages/apex.json",
-"berry" => __DIR__ . "/../../resources/languages/berry.json",
-"dream-maker" => __DIR__ . "/../../resources/languages/dream-maker.json",
-"wolfram" => __DIR__ . "/../../resources/languages/wolfram.json",
-"cobol" => __DIR__ . "/../../resources/languages/cobol.json",
-"proto" => __DIR__ . "/../../resources/languages/proto.json",
-"genie" => __DIR__ . "/../../resources/languages/genie.json",
-"wasm" => __DIR__ . "/../../resources/languages/wasm.json",
-"handlebars" => __DIR__ . "/../../resources/languages/handlebars.json",
-"zig" => __DIR__ . "/../../resources/languages/zig.json",
-"vhdl" => __DIR__ . "/../../resources/languages/vhdl.json",
-"go" => __DIR__ . "/../../resources/languages/go.json",
-"fish" => __DIR__ . "/../../resources/languages/fish.json",
-"solidity" => __DIR__ . "/../../resources/languages/solidity.json",
-"sas" => __DIR__ . "/../../resources/languages/sas.json",
-"fortran-fixed-form" => __DIR__ . "/../../resources/languages/fortran-fixed-form.json",
-"r" => __DIR__ . "/../../resources/languages/r.json",
-"fennel" => __DIR__ . "/../../resources/languages/fennel.json",
-"ruby" => __DIR__ . "/../../resources/languages/ruby.json",
-"log" => __DIR__ . "/../../resources/languages/log.json",
-"vala" => __DIR__ . "/../../resources/languages/vala.json",
-"splunk" => __DIR__ . "/../../resources/languages/splunk.json",
-"lua" => __DIR__ . "/../../resources/languages/lua.json",
-"gnuplot" => __DIR__ . "/../../resources/languages/gnuplot.json",
-"regexp" => __DIR__ . "/../../resources/languages/regexp.json",
-"markdown" => __DIR__ . "/../../resources/languages/markdown.json",
-"ballerina" => __DIR__ . "/../../resources/languages/ballerina.json",
-"xsl" => __DIR__ . "/../../resources/languages/xsl.json",
-"systemd" => __DIR__ . "/../../resources/languages/systemd.json",
-"coffee" => __DIR__ . "/../../resources/languages/coffee.json",
-"haml" => __DIR__ . "/../../resources/languages/haml.json",
-"wikitext" => __DIR__ . "/../../resources/languages/wikitext.json",
-"kusto" => __DIR__ . "/../../resources/languages/kusto.json",
-"ocaml" => __DIR__ . "/../../resources/languages/ocaml.json",
-"cue" => __DIR__ . "/../../resources/languages/cue.json",
-"nextflow" => __DIR__ . "/../../resources/languages/nextflow.json",
-"git-rebase" => __DIR__ . "/../../resources/languages/git-rebase.json",
-"cypher" => __DIR__ . "/../../resources/languages/cypher.json",
-"tsx" => __DIR__ . "/../../resources/languages/tsx.json",
-"bibtex" => __DIR__ . "/../../resources/languages/bibtex.json",
-"pug" => __DIR__ . "/../../resources/languages/pug.json",
-"glimmer-js" => __DIR__ . "/../../resources/languages/glimmer-js.json",
-"julia" => __DIR__ . "/../../resources/languages/julia.json",
-"beancount" => __DIR__ . "/../../resources/languages/beancount.json",
-"puppet" => __DIR__ . "/../../resources/languages/puppet.json",
-"bsl" => __DIR__ . "/../../resources/languages/bsl.json",
-"http" => __DIR__ . "/../../resources/languages/http.json",
-"csharp" => __DIR__ . "/../../resources/languages/csharp.json",
-"jison" => __DIR__ . "/../../resources/languages/jison.json",
-"purescript" => __DIR__ . "/../../resources/languages/purescript.json",
-"actionscript-3" => __DIR__ . "/../../resources/languages/actionscript-3.json",
-"shellsession" => __DIR__ . "/../../resources/languages/shellsession.json",
-"system-verilog" => __DIR__ . "/../../resources/languages/system-verilog.json",
-"gdscript" => __DIR__ . "/../../resources/languages/gdscript.json",
-"luau" => __DIR__ . "/../../resources/languages/luau.json",
-"toml" => __DIR__ . "/../../resources/languages/toml.json",
-"php" => __DIR__ . "/../../resources/languages/php.json",
-"typst" => __DIR__ . "/../../resources/languages/typst.json",
-"postcss" => __DIR__ . "/../../resources/languages/postcss.json",
-"prisma" => __DIR__ . "/../../resources/languages/prisma.json",
-"fsharp" => __DIR__ . "/../../resources/languages/fsharp.json",
-"apl" => __DIR__ . "/../../resources/languages/apl.json",
-"wit" => __DIR__ . "/../../resources/languages/wit.json",
-"sql" => __DIR__ . "/../../resources/languages/sql.json",
-"objective-cpp" => __DIR__ . "/../../resources/languages/objective-cpp.json",
-"logo" => __DIR__ . "/../../resources/languages/logo.json",
-"blade" => __DIR__ . "/../../resources/languages/blade.json",
-"yaml" => __DIR__ . "/../../resources/languages/yaml.json",
-"scala" => __DIR__ . "/../../resources/languages/scala.json",
-"codeql" => __DIR__ . "/../../resources/languages/codeql.json",
-"crystal" => __DIR__ . "/../../resources/languages/crystal.json",
-"sdbl" => __DIR__ . "/../../resources/languages/sdbl.json",
-"hjson" => __DIR__ . "/../../resources/languages/hjson.json",
-"awk" => __DIR__ . "/../../resources/languages/awk.json",
-"docker" => __DIR__ . "/../../resources/languages/docker.json",
-"dax" => __DIR__ . "/../../resources/languages/dax.json",
-"angular-ts" => __DIR__ . "/../../resources/languages/angular-ts.json",
-"terraform" => __DIR__ . "/../../resources/languages/terraform.json",
-"typespec" => __DIR__ . "/../../resources/languages/typespec.json",
-"codeowners" => __DIR__ . "/../../resources/languages/codeowners.json",
-"rel" => __DIR__ . "/../../resources/languages/rel.json",
-"vue-html" => __DIR__ . "/../../resources/languages/vue-html.json",
-"abap" => __DIR__ . "/../../resources/languages/abap.json",
-"git-commit" => __DIR__ . "/../../resources/languages/git-commit.json",
-"rust" => __DIR__ . "/../../resources/languages/rust.json",
-"polar" => __DIR__ . "/../../resources/languages/polar.json",
-"javascript" => __DIR__ . "/../../resources/languages/javascript.json",
-"prolog" => __DIR__ . "/../../resources/languages/prolog.json",
-"dart" => __DIR__ . "/../../resources/languages/dart.json",
-"marko" => __DIR__ . "/../../resources/languages/marko.json",
-"asciidoc" => __DIR__ . "/../../resources/languages/asciidoc.json",
-"wenyan" => __DIR__ . "/../../resources/languages/wenyan.json",
-"elm" => __DIR__ . "/../../resources/languages/elm.json",
-"d" => __DIR__ . "/../../resources/languages/d.json",
-"hlsl" => __DIR__ . "/../../resources/languages/hlsl.json",
-"po" => __DIR__ . "/../../resources/languages/po.json",
-"shaderlab" => __DIR__ . "/../../resources/languages/shaderlab.json",
-"stata" => __DIR__ . "/../../resources/languages/stata.json",
-"nginx" => __DIR__ . "/../../resources/languages/nginx.json",
-"ara" => __DIR__ . "/../../resources/languages/ara.json",
-"json" => __DIR__ . "/../../resources/languages/json.json",
-"css" => __DIR__ . "/../../resources/languages/css.json",
-"tsv" => __DIR__ . "/../../resources/languages/tsv.json",
-"vb" => __DIR__ . "/../../resources/languages/vb.json",
-"hcl" => __DIR__ . "/../../resources/languages/hcl.json",
-"plsql" => __DIR__ . "/../../resources/languages/plsql.json",
-"pascal" => __DIR__ . "/../../resources/languages/pascal.json",
-"c" => __DIR__ . "/../../resources/languages/c.json",
-"turtle" => __DIR__ . "/../../resources/languages/turtle.json",
-"qmldir" => __DIR__ . "/../../resources/languages/qmldir.json",
-"jinja-html" => __DIR__ . "/../../resources/languages/jinja-html.json",
-"racket" => __DIR__ . "/../../resources/languages/racket.json",
-"scss" => __DIR__ . "/../../resources/languages/scss.json",
-"hxml" => __DIR__ . "/../../resources/languages/hxml.json",
-"qml" => __DIR__ . "/../../resources/languages/qml.json",
-"common-lisp" => __DIR__ . "/../../resources/languages/common-lisp.json",
-"lean" => __DIR__ . "/../../resources/languages/lean.json",
-"tex" => __DIR__ . "/../../resources/languages/tex.json",
-"jsonnet" => __DIR__ . "/../../resources/languages/jsonnet.json",
-"vyper" => __DIR__ . "/../../resources/languages/vyper.json",
-"html" => __DIR__ . "/../../resources/languages/html.json",
-"liquid" => __DIR__ . "/../../resources/languages/liquid.json",
-"emacs-lisp" => __DIR__ . "/../../resources/languages/emacs-lisp.json",
-"v" => __DIR__ . "/../../resources/languages/v.json",
-"hack" => __DIR__ . "/../../resources/languages/hack.json",
-"latex" => __DIR__ . "/../../resources/languages/latex.json",
-"perl" => __DIR__ . "/../../resources/languages/perl.json",
-"gleam" => __DIR__ . "/../../resources/languages/gleam.json",
-"cairo" => __DIR__ . "/../../resources/languages/cairo.json",
-"matlab" => __DIR__ . "/../../resources/languages/matlab.json",
-"jsonc" => __DIR__ . "/../../resources/languages/jsonc.json",
-"dotenv" => __DIR__ . "/../../resources/languages/dotenv.json",
-"raku" => __DIR__ . "/../../resources/languages/raku.json",
-"less" => __DIR__ . "/../../resources/languages/less.json",
-"bat" => __DIR__ . "/../../resources/languages/bat.json",
-"clarity" => __DIR__ . "/../../resources/languages/clarity.json",
-"reg" => __DIR__ . "/../../resources/languages/reg.json",
-"cpp-macro" => __DIR__ . "/../../resources/languages/cpp-macro.json",
-"tcl" => __DIR__ . "/../../resources/languages/tcl.json",
-"html-derivative" => __DIR__ . "/../../resources/languages/html-derivative.json",
-"powershell" => __DIR__ . "/../../resources/languages/powershell.json",
-"graphql" => __DIR__ . "/../../resources/languages/graphql.json",
-"haskell" => __DIR__ . "/../../resources/languages/haskell.json",
-"gdshader" => __DIR__ . "/../../resources/languages/gdshader.json",
-"groovy" => __DIR__ . "/../../resources/languages/groovy.json",
-"qss" => __DIR__ . "/../../resources/languages/qss.json",
-"verilog" => __DIR__ . "/../../resources/languages/verilog.json",
-"typescript" => __DIR__ . "/../../resources/languages/typescript.json",
-"kotlin" => __DIR__ . "/../../resources/languages/kotlin.json",
-"gherkin" => __DIR__ . "/../../resources/languages/gherkin.json",
-"soy" => __DIR__ . "/../../resources/languages/soy.json",
-"python" => __DIR__ . "/../../resources/languages/python.json",
-"sass" => __DIR__ . "/../../resources/languages/sass.json",
-"talonscript" => __DIR__ . "/../../resources/languages/talonscript.json",
-"vue" => __DIR__ . "/../../resources/languages/vue.json",
-"zenscript" => __DIR__ . "/../../resources/languages/zenscript.json",
-"imba" => __DIR__ . "/../../resources/languages/imba.json",
-"riscv" => __DIR__ . "/../../resources/languages/riscv.json",
-"smalltalk" => __DIR__ . "/../../resources/languages/smalltalk.json",
-"json5" => __DIR__ . "/../../resources/languages/json5.json",
-"cadence" => __DIR__ . "/../../resources/languages/cadence.json",
-"desktop" => __DIR__ . "/../../resources/languages/desktop.json",
-"asm" => __DIR__ . "/../../resources/languages/asm.json",
-"antlers" => __DIR__ . "/../../resources/languages/antlers.json"
+        'txt' => __DIR__.'/../../resources/languages/txt.json',
+        'astro' => __DIR__.'/../../resources/languages/astro.json',
+        'hy' => __DIR__.'/../../resources/languages/hy.json',
+        'nim' => __DIR__.'/../../resources/languages/nim.json',
+        'cpp' => __DIR__.'/../../resources/languages/cpp.json',
+        'jinja' => __DIR__.'/../../resources/languages/jinja.json',
+        'coq' => __DIR__.'/../../resources/languages/coq.json',
+        'templ' => __DIR__.'/../../resources/languages/templ.json',
+        'glimmer-ts' => __DIR__.'/../../resources/languages/glimmer-ts.json',
+        'angular-html' => __DIR__.'/../../resources/languages/angular-html.json',
+        'cmake' => __DIR__.'/../../resources/languages/cmake.json',
+        'mdx' => __DIR__.'/../../resources/languages/mdx.json',
+        'nix' => __DIR__.'/../../resources/languages/nix.json',
+        'gdresource' => __DIR__.'/../../resources/languages/gdresource.json',
+        'haxe' => __DIR__.'/../../resources/languages/haxe.json',
+        'ada' => __DIR__.'/../../resources/languages/ada.json',
+        'powerquery' => __DIR__.'/../../resources/languages/powerquery.json',
+        'fluent' => __DIR__.'/../../resources/languages/fluent.json',
+        'objective-c' => __DIR__.'/../../resources/languages/objective-c.json',
+        'elixir' => __DIR__.'/../../resources/languages/elixir.json',
+        'diff' => __DIR__.'/../../resources/languages/diff.json',
+        'java' => __DIR__.'/../../resources/languages/java.json',
+        'glsl' => __DIR__.'/../../resources/languages/glsl.json',
+        'mojo' => __DIR__.'/../../resources/languages/mojo.json',
+        'sparql' => __DIR__.'/../../resources/languages/sparql.json',
+        'bicep' => __DIR__.'/../../resources/languages/bicep.json',
+        'csv' => __DIR__.'/../../resources/languages/csv.json',
+        'swift' => __DIR__.'/../../resources/languages/swift.json',
+        'ssh-config' => __DIR__.'/../../resources/languages/ssh-config.json',
+        'edge' => __DIR__.'/../../resources/languages/edge.json',
+        'narrat' => __DIR__.'/../../resources/languages/narrat.json',
+        'tasl' => __DIR__.'/../../resources/languages/tasl.json',
+        'nushell' => __DIR__.'/../../resources/languages/nushell.json',
+        'erb' => __DIR__.'/../../resources/languages/erb.json',
+        'move' => __DIR__.'/../../resources/languages/move.json',
+        'scheme' => __DIR__.'/../../resources/languages/scheme.json',
+        'mipsasm' => __DIR__.'/../../resources/languages/mipsasm.json',
+        'rst' => __DIR__.'/../../resources/languages/rst.json',
+        'shellscript' => __DIR__.'/../../resources/languages/shellscript.json',
+        'apache' => __DIR__.'/../../resources/languages/apache.json',
+        'wgsl' => __DIR__.'/../../resources/languages/wgsl.json',
+        'fortran-free-form' => __DIR__.'/../../resources/languages/fortran-free-form.json',
+        'ini' => __DIR__.'/../../resources/languages/ini.json',
+        'make' => __DIR__.'/../../resources/languages/make.json',
+        'ts-tags' => __DIR__.'/../../resources/languages/ts-tags.json',
+        'stylus' => __DIR__.'/../../resources/languages/stylus.json',
+        'jsx' => __DIR__.'/../../resources/languages/jsx.json',
+        'jsonl' => __DIR__.'/../../resources/languages/jsonl.json',
+        'llvm' => __DIR__.'/../../resources/languages/llvm.json',
+        'twig' => __DIR__.'/../../resources/languages/twig.json',
+        'clojure' => __DIR__.'/../../resources/languages/clojure.json',
+        'svelte' => __DIR__.'/../../resources/languages/svelte.json',
+        'xml' => __DIR__.'/../../resources/languages/xml.json',
+        'jssm' => __DIR__.'/../../resources/languages/jssm.json',
+        'erlang' => __DIR__.'/../../resources/languages/erlang.json',
+        'applescript' => __DIR__.'/../../resources/languages/applescript.json',
+        'viml' => __DIR__.'/../../resources/languages/viml.json',
+        'razor' => __DIR__.'/../../resources/languages/razor.json',
+        'apex' => __DIR__.'/../../resources/languages/apex.json',
+        'berry' => __DIR__.'/../../resources/languages/berry.json',
+        'dream-maker' => __DIR__.'/../../resources/languages/dream-maker.json',
+        'wolfram' => __DIR__.'/../../resources/languages/wolfram.json',
+        'cobol' => __DIR__.'/../../resources/languages/cobol.json',
+        'proto' => __DIR__.'/../../resources/languages/proto.json',
+        'genie' => __DIR__.'/../../resources/languages/genie.json',
+        'wasm' => __DIR__.'/../../resources/languages/wasm.json',
+        'handlebars' => __DIR__.'/../../resources/languages/handlebars.json',
+        'zig' => __DIR__.'/../../resources/languages/zig.json',
+        'vhdl' => __DIR__.'/../../resources/languages/vhdl.json',
+        'go' => __DIR__.'/../../resources/languages/go.json',
+        'fish' => __DIR__.'/../../resources/languages/fish.json',
+        'solidity' => __DIR__.'/../../resources/languages/solidity.json',
+        'sas' => __DIR__.'/../../resources/languages/sas.json',
+        'fortran-fixed-form' => __DIR__.'/../../resources/languages/fortran-fixed-form.json',
+        'r' => __DIR__.'/../../resources/languages/r.json',
+        'fennel' => __DIR__.'/../../resources/languages/fennel.json',
+        'ruby' => __DIR__.'/../../resources/languages/ruby.json',
+        'log' => __DIR__.'/../../resources/languages/log.json',
+        'vala' => __DIR__.'/../../resources/languages/vala.json',
+        'splunk' => __DIR__.'/../../resources/languages/splunk.json',
+        'lua' => __DIR__.'/../../resources/languages/lua.json',
+        'gnuplot' => __DIR__.'/../../resources/languages/gnuplot.json',
+        'regexp' => __DIR__.'/../../resources/languages/regexp.json',
+        'markdown' => __DIR__.'/../../resources/languages/markdown.json',
+        'ballerina' => __DIR__.'/../../resources/languages/ballerina.json',
+        'xsl' => __DIR__.'/../../resources/languages/xsl.json',
+        'systemd' => __DIR__.'/../../resources/languages/systemd.json',
+        'coffee' => __DIR__.'/../../resources/languages/coffee.json',
+        'haml' => __DIR__.'/../../resources/languages/haml.json',
+        'wikitext' => __DIR__.'/../../resources/languages/wikitext.json',
+        'kusto' => __DIR__.'/../../resources/languages/kusto.json',
+        'ocaml' => __DIR__.'/../../resources/languages/ocaml.json',
+        'cue' => __DIR__.'/../../resources/languages/cue.json',
+        'nextflow' => __DIR__.'/../../resources/languages/nextflow.json',
+        'git-rebase' => __DIR__.'/../../resources/languages/git-rebase.json',
+        'cypher' => __DIR__.'/../../resources/languages/cypher.json',
+        'tsx' => __DIR__.'/../../resources/languages/tsx.json',
+        'bibtex' => __DIR__.'/../../resources/languages/bibtex.json',
+        'pug' => __DIR__.'/../../resources/languages/pug.json',
+        'glimmer-js' => __DIR__.'/../../resources/languages/glimmer-js.json',
+        'julia' => __DIR__.'/../../resources/languages/julia.json',
+        'beancount' => __DIR__.'/../../resources/languages/beancount.json',
+        'puppet' => __DIR__.'/../../resources/languages/puppet.json',
+        'bsl' => __DIR__.'/../../resources/languages/bsl.json',
+        'http' => __DIR__.'/../../resources/languages/http.json',
+        'csharp' => __DIR__.'/../../resources/languages/csharp.json',
+        'jison' => __DIR__.'/../../resources/languages/jison.json',
+        'purescript' => __DIR__.'/../../resources/languages/purescript.json',
+        'actionscript-3' => __DIR__.'/../../resources/languages/actionscript-3.json',
+        'shellsession' => __DIR__.'/../../resources/languages/shellsession.json',
+        'system-verilog' => __DIR__.'/../../resources/languages/system-verilog.json',
+        'gdscript' => __DIR__.'/../../resources/languages/gdscript.json',
+        'luau' => __DIR__.'/../../resources/languages/luau.json',
+        'toml' => __DIR__.'/../../resources/languages/toml.json',
+        'php' => __DIR__.'/../../resources/languages/php.json',
+        'typst' => __DIR__.'/../../resources/languages/typst.json',
+        'postcss' => __DIR__.'/../../resources/languages/postcss.json',
+        'prisma' => __DIR__.'/../../resources/languages/prisma.json',
+        'fsharp' => __DIR__.'/../../resources/languages/fsharp.json',
+        'apl' => __DIR__.'/../../resources/languages/apl.json',
+        'wit' => __DIR__.'/../../resources/languages/wit.json',
+        'sql' => __DIR__.'/../../resources/languages/sql.json',
+        'objective-cpp' => __DIR__.'/../../resources/languages/objective-cpp.json',
+        'logo' => __DIR__.'/../../resources/languages/logo.json',
+        'blade' => __DIR__.'/../../resources/languages/blade.json',
+        'yaml' => __DIR__.'/../../resources/languages/yaml.json',
+        'scala' => __DIR__.'/../../resources/languages/scala.json',
+        'codeql' => __DIR__.'/../../resources/languages/codeql.json',
+        'crystal' => __DIR__.'/../../resources/languages/crystal.json',
+        'sdbl' => __DIR__.'/../../resources/languages/sdbl.json',
+        'hjson' => __DIR__.'/../../resources/languages/hjson.json',
+        'awk' => __DIR__.'/../../resources/languages/awk.json',
+        'docker' => __DIR__.'/../../resources/languages/docker.json',
+        'dax' => __DIR__.'/../../resources/languages/dax.json',
+        'angular-ts' => __DIR__.'/../../resources/languages/angular-ts.json',
+        'terraform' => __DIR__.'/../../resources/languages/terraform.json',
+        'typespec' => __DIR__.'/../../resources/languages/typespec.json',
+        'codeowners' => __DIR__.'/../../resources/languages/codeowners.json',
+        'rel' => __DIR__.'/../../resources/languages/rel.json',
+        'vue-html' => __DIR__.'/../../resources/languages/vue-html.json',
+        'abap' => __DIR__.'/../../resources/languages/abap.json',
+        'git-commit' => __DIR__.'/../../resources/languages/git-commit.json',
+        'rust' => __DIR__.'/../../resources/languages/rust.json',
+        'polar' => __DIR__.'/../../resources/languages/polar.json',
+        'javascript' => __DIR__.'/../../resources/languages/javascript.json',
+        'prolog' => __DIR__.'/../../resources/languages/prolog.json',
+        'dart' => __DIR__.'/../../resources/languages/dart.json',
+        'marko' => __DIR__.'/../../resources/languages/marko.json',
+        'asciidoc' => __DIR__.'/../../resources/languages/asciidoc.json',
+        'wenyan' => __DIR__.'/../../resources/languages/wenyan.json',
+        'elm' => __DIR__.'/../../resources/languages/elm.json',
+        'd' => __DIR__.'/../../resources/languages/d.json',
+        'hlsl' => __DIR__.'/../../resources/languages/hlsl.json',
+        'po' => __DIR__.'/../../resources/languages/po.json',
+        'shaderlab' => __DIR__.'/../../resources/languages/shaderlab.json',
+        'stata' => __DIR__.'/../../resources/languages/stata.json',
+        'nginx' => __DIR__.'/../../resources/languages/nginx.json',
+        'ara' => __DIR__.'/../../resources/languages/ara.json',
+        'json' => __DIR__.'/../../resources/languages/json.json',
+        'css' => __DIR__.'/../../resources/languages/css.json',
+        'tsv' => __DIR__.'/../../resources/languages/tsv.json',
+        'vb' => __DIR__.'/../../resources/languages/vb.json',
+        'hcl' => __DIR__.'/../../resources/languages/hcl.json',
+        'plsql' => __DIR__.'/../../resources/languages/plsql.json',
+        'pascal' => __DIR__.'/../../resources/languages/pascal.json',
+        'c' => __DIR__.'/../../resources/languages/c.json',
+        'turtle' => __DIR__.'/../../resources/languages/turtle.json',
+        'qmldir' => __DIR__.'/../../resources/languages/qmldir.json',
+        'jinja-html' => __DIR__.'/../../resources/languages/jinja-html.json',
+        'racket' => __DIR__.'/../../resources/languages/racket.json',
+        'scss' => __DIR__.'/../../resources/languages/scss.json',
+        'hxml' => __DIR__.'/../../resources/languages/hxml.json',
+        'qml' => __DIR__.'/../../resources/languages/qml.json',
+        'common-lisp' => __DIR__.'/../../resources/languages/common-lisp.json',
+        'lean' => __DIR__.'/../../resources/languages/lean.json',
+        'tex' => __DIR__.'/../../resources/languages/tex.json',
+        'jsonnet' => __DIR__.'/../../resources/languages/jsonnet.json',
+        'vyper' => __DIR__.'/../../resources/languages/vyper.json',
+        'html' => __DIR__.'/../../resources/languages/html.json',
+        'liquid' => __DIR__.'/../../resources/languages/liquid.json',
+        'emacs-lisp' => __DIR__.'/../../resources/languages/emacs-lisp.json',
+        'v' => __DIR__.'/../../resources/languages/v.json',
+        'hack' => __DIR__.'/../../resources/languages/hack.json',
+        'latex' => __DIR__.'/../../resources/languages/latex.json',
+        'perl' => __DIR__.'/../../resources/languages/perl.json',
+        'gleam' => __DIR__.'/../../resources/languages/gleam.json',
+        'cairo' => __DIR__.'/../../resources/languages/cairo.json',
+        'matlab' => __DIR__.'/../../resources/languages/matlab.json',
+        'jsonc' => __DIR__.'/../../resources/languages/jsonc.json',
+        'dotenv' => __DIR__.'/../../resources/languages/dotenv.json',
+        'raku' => __DIR__.'/../../resources/languages/raku.json',
+        'less' => __DIR__.'/../../resources/languages/less.json',
+        'bat' => __DIR__.'/../../resources/languages/bat.json',
+        'clarity' => __DIR__.'/../../resources/languages/clarity.json',
+        'reg' => __DIR__.'/../../resources/languages/reg.json',
+        'cpp-macro' => __DIR__.'/../../resources/languages/cpp-macro.json',
+        'tcl' => __DIR__.'/../../resources/languages/tcl.json',
+        'html-derivative' => __DIR__.'/../../resources/languages/html-derivative.json',
+        'powershell' => __DIR__.'/../../resources/languages/powershell.json',
+        'graphql' => __DIR__.'/../../resources/languages/graphql.json',
+        'haskell' => __DIR__.'/../../resources/languages/haskell.json',
+        'gdshader' => __DIR__.'/../../resources/languages/gdshader.json',
+        'groovy' => __DIR__.'/../../resources/languages/groovy.json',
+        'qss' => __DIR__.'/../../resources/languages/qss.json',
+        'verilog' => __DIR__.'/../../resources/languages/verilog.json',
+        'typescript' => __DIR__.'/../../resources/languages/typescript.json',
+        'kotlin' => __DIR__.'/../../resources/languages/kotlin.json',
+        'gherkin' => __DIR__.'/../../resources/languages/gherkin.json',
+        'soy' => __DIR__.'/../../resources/languages/soy.json',
+        'python' => __DIR__.'/../../resources/languages/python.json',
+        'sass' => __DIR__.'/../../resources/languages/sass.json',
+        'talonscript' => __DIR__.'/../../resources/languages/talonscript.json',
+        'vue' => __DIR__.'/../../resources/languages/vue.json',
+        'zenscript' => __DIR__.'/../../resources/languages/zenscript.json',
+        'imba' => __DIR__.'/../../resources/languages/imba.json',
+        'riscv' => __DIR__.'/../../resources/languages/riscv.json',
+        'smalltalk' => __DIR__.'/../../resources/languages/smalltalk.json',
+        'json5' => __DIR__.'/../../resources/languages/json5.json',
+        'cadence' => __DIR__.'/../../resources/languages/cadence.json',
+        'desktop' => __DIR__.'/../../resources/languages/desktop.json',
+        'asm' => __DIR__.'/../../resources/languages/asm.json',
+        'antlers' => __DIR__.'/../../resources/languages/antlers.json',
     ];
 
     final const SCOPES_TO_NAMES = [
         'text.txt' => 'txt',
-        "source.astro" => "astro",
-"source.hy" => "hy",
-"source.nim" => "nim",
-"source.cpp" => "cpp",
-"source.jinja" => "jinja",
-"source.coq" => "coq",
-"source.templ" => "templ",
-"source.gts" => "glimmer-ts",
-"text.html.derivative.ng" => "angular-html",
-"source.cmake" => "cmake",
-"source.mdx" => "mdx",
-"source.nix" => "nix",
-"source.gdresource" => "gdresource",
-"source.hx" => "haxe",
-"source.ada" => "ada",
-"source.powerquery" => "powerquery",
-"source.ftl" => "fluent",
-"source.objc" => "objective-c",
-"source.elixir" => "elixir",
-"source.diff" => "diff",
-"source.java" => "java",
-"source.glsl" => "glsl",
-"source.mojo" => "mojo",
-"source.sparql" => "sparql",
-"source.bicep" => "bicep",
-"text.csv" => "csv",
-"source.swift" => "swift",
-"source.ssh-config" => "ssh-config",
-"text.html.edge" => "edge",
-"source.narrat" => "narrat",
-"source.tasl" => "tasl",
-"source.nushell" => "nushell",
-"text.html.erb" => "erb",
-"source.move" => "move",
-"source.scheme" => "scheme",
-"source.mips" => "mipsasm",
-"source.rst" => "rst",
-"source.shell" => "shellscript",
-"source.apacheconf" => "apache",
-"source.wgsl" => "wgsl",
-"source.fortran.free" => "fortran-free-form",
-"source.ini" => "ini",
-"source.makefile" => "make",
-"source.ts.tags" => "ts-tags",
-"source.stylus" => "stylus",
-"source.js.jsx" => "jsx",
-"source.json.lines" => "jsonl",
-"source.llvm" => "llvm",
-"text.html.twig" => "twig",
-"source.clojure" => "clojure",
-"source.svelte" => "svelte",
-"text.xml" => "xml",
-"source.jssm" => "jssm",
-"source.erlang" => "erlang",
-"source.applescript" => "applescript",
-"source.viml" => "viml",
-"text.aspnetcorerazor" => "razor",
-"source.apex" => "apex",
-"source.berry" => "berry",
-"source.dm" => "dream-maker",
-"source.wolfram" => "wolfram",
-"source.cobol" => "cobol",
-"source.proto" => "proto",
-"source.genie" => "genie",
-"source.wat" => "wasm",
-"text.html.handlebars" => "handlebars",
-"source.zig" => "zig",
-"source.vhdl" => "vhdl",
-"source.go" => "go",
-"source.fish" => "fish",
-"source.solidity" => "solidity",
-"source.sas" => "sas",
-"source.fortran.fixed" => "fortran-fixed-form",
-"source.r" => "r",
-"source.fnl" => "fennel",
-"source.ruby" => "ruby",
-"text.log" => "log",
-"source.vala" => "vala",
-"source.splunk_search" => "splunk",
-"source.lua" => "lua",
-"source.gnuplot" => "gnuplot",
-"source.regexp.python" => "regexp",
-"text.html.markdown" => "markdown",
-"source.ballerina" => "ballerina",
-"text.xml.xsl" => "xsl",
-"source.systemd" => "systemd",
-"source.coffee" => "coffee",
-"text.haml" => "haml",
-"source.wikitext" => "wikitext",
-"source.kusto" => "kusto",
-"source.ocaml" => "ocaml",
-"source.cue" => "cue",
-"source.nextflow" => "nextflow",
-"text.git-rebase" => "git-rebase",
-"source.cypher" => "cypher",
-"source.tsx" => "tsx",
-"text.bibtex" => "bibtex",
-"text.pug" => "pug",
-"source.gjs" => "glimmer-js",
-"source.julia" => "julia",
-"text.beancount" => "beancount",
-"source.puppet" => "puppet",
-"source.bsl" => "bsl",
-"source.http" => "http",
-"source.cs" => "csharp",
-"source.jison" => "jison",
-"source.purescript" => "purescript",
-"source.actionscript.3" => "actionscript-3",
-"text.shell-session" => "shellsession",
-"source.systemverilog" => "system-verilog",
-"source.gdscript" => "gdscript",
-"source.luau" => "luau",
-"source.toml" => "toml",
-"source.php" => "php",
-"source.typst" => "typst",
-"source.css.postcss" => "postcss",
-"source.prisma" => "prisma",
-"source.fsharp" => "fsharp",
-"source.apl" => "apl",
-"source.wit" => "wit",
-"source.sql" => "sql",
-"source.objcpp" => "objective-cpp",
-"source.logo" => "logo",
-"text.html.php.blade" => "blade",
-"source.yaml" => "yaml",
-"source.scala" => "scala",
-"source.ql" => "codeql",
-"source.crystal" => "crystal",
-"source.sdbl" => "sdbl",
-"source.hjson" => "hjson",
-"source.awk" => "awk",
-"source.dockerfile" => "docker",
-"source.dax" => "dax",
-"source.ts.ng" => "angular-ts",
-"source.hcl.terraform" => "terraform",
-"source.tsp" => "typespec",
-"text.codeowners" => "codeowners",
-"source.rel" => "rel",
-"text.html.vue-html" => "vue-html",
-"source.abap" => "abap",
-"text.git-commit" => "git-commit",
-"source.rust" => "rust",
-"source.polar" => "polar",
-"source.js" => "javascript",
-"source.prolog" => "prolog",
-"source.dart" => "dart",
-"text.marko" => "marko",
-"text.asciidoc" => "asciidoc",
-"source.wenyan" => "wenyan",
-"source.elm" => "elm",
-"source.d" => "d",
-"source.hlsl" => "hlsl",
-"source.po" => "po",
-"source.shaderlab" => "shaderlab",
-"source.stata" => "stata",
-"source.nginx" => "nginx",
-"source.ara" => "ara",
-"source.json" => "json",
-"source.css" => "css",
-"text.tsv" => "tsv",
-"source.asp.vb.net" => "vb",
-"source.hcl" => "hcl",
-"source.plsql.oracle" => "plsql",
-"source.pascal" => "pascal",
-"source.c" => "c",
-"source.turtle" => "turtle",
-"source.qmldir" => "qmldir",
-"text.html.jinja" => "jinja-html",
-"source.racket" => "racket",
-"source.css.scss" => "scss",
-"source.hxml" => "hxml",
-"source.qml" => "qml",
-"source.commonlisp" => "common-lisp",
-"source.lean4" => "lean",
-"text.tex" => "tex",
-"source.jsonnet" => "jsonnet",
-"source.vyper" => "vyper",
-"text.html.basic" => "html",
-"text.html.liquid" => "liquid",
-"source.emacs.lisp" => "emacs-lisp",
-"source.v" => "v",
-"source.hack" => "hack",
-"text.tex.latex" => "latex",
-"source.perl" => "perl",
-"source.gleam" => "gleam",
-"source.cairo0" => "cairo",
-"source.matlab" => "matlab",
-"source.json.comments" => "jsonc",
-"source.dotenv" => "dotenv",
-"source.perl.6" => "raku",
-"source.css.less" => "less",
-"source.batchfile" => "bat",
-"source.clar" => "clarity",
-"source.reg" => "reg",
-"source.cpp.embedded.macro" => "cpp-macro",
-"source.tcl" => "tcl",
-"text.html.derivative" => "html-derivative",
-"source.powershell" => "powershell",
-"source.graphql" => "graphql",
-"source.haskell" => "haskell",
-"source.gdshader" => "gdshader",
-"source.groovy" => "groovy",
-"source.qss" => "qss",
-"source.verilog" => "verilog",
-"source.ts" => "typescript",
-"source.kotlin" => "kotlin",
-"text.gherkin.feature" => "gherkin",
-"text.html.soy" => "soy",
-"source.python" => "python",
-"source.sass" => "sass",
-"source.talon" => "talonscript",
-"source.vue" => "vue",
-"source.zenscript" => "zenscript",
-"source.imba" => "imba",
-"source.riscv" => "riscv",
-"source.smalltalk" => "smalltalk",
-"source.json5" => "json5",
-"source.cadence" => "cadence",
-"source.desktop" => "desktop",
-"source.asm.x86_64" => "asm",
-"text.html.statamic" => "antlers"
+        'source.astro' => 'astro',
+        'source.hy' => 'hy',
+        'source.nim' => 'nim',
+        'source.cpp' => 'cpp',
+        'source.jinja' => 'jinja',
+        'source.coq' => 'coq',
+        'source.templ' => 'templ',
+        'source.gts' => 'glimmer-ts',
+        'text.html.derivative.ng' => 'angular-html',
+        'source.cmake' => 'cmake',
+        'source.mdx' => 'mdx',
+        'source.nix' => 'nix',
+        'source.gdresource' => 'gdresource',
+        'source.hx' => 'haxe',
+        'source.ada' => 'ada',
+        'source.powerquery' => 'powerquery',
+        'source.ftl' => 'fluent',
+        'source.objc' => 'objective-c',
+        'source.elixir' => 'elixir',
+        'source.diff' => 'diff',
+        'source.java' => 'java',
+        'source.glsl' => 'glsl',
+        'source.mojo' => 'mojo',
+        'source.sparql' => 'sparql',
+        'source.bicep' => 'bicep',
+        'text.csv' => 'csv',
+        'source.swift' => 'swift',
+        'source.ssh-config' => 'ssh-config',
+        'text.html.edge' => 'edge',
+        'source.narrat' => 'narrat',
+        'source.tasl' => 'tasl',
+        'source.nushell' => 'nushell',
+        'text.html.erb' => 'erb',
+        'source.move' => 'move',
+        'source.scheme' => 'scheme',
+        'source.mips' => 'mipsasm',
+        'source.rst' => 'rst',
+        'source.shell' => 'shellscript',
+        'source.apacheconf' => 'apache',
+        'source.wgsl' => 'wgsl',
+        'source.fortran.free' => 'fortran-free-form',
+        'source.ini' => 'ini',
+        'source.makefile' => 'make',
+        'source.ts.tags' => 'ts-tags',
+        'source.stylus' => 'stylus',
+        'source.js.jsx' => 'jsx',
+        'source.json.lines' => 'jsonl',
+        'source.llvm' => 'llvm',
+        'text.html.twig' => 'twig',
+        'source.clojure' => 'clojure',
+        'source.svelte' => 'svelte',
+        'text.xml' => 'xml',
+        'source.jssm' => 'jssm',
+        'source.erlang' => 'erlang',
+        'source.applescript' => 'applescript',
+        'source.viml' => 'viml',
+        'text.aspnetcorerazor' => 'razor',
+        'source.apex' => 'apex',
+        'source.berry' => 'berry',
+        'source.dm' => 'dream-maker',
+        'source.wolfram' => 'wolfram',
+        'source.cobol' => 'cobol',
+        'source.proto' => 'proto',
+        'source.genie' => 'genie',
+        'source.wat' => 'wasm',
+        'text.html.handlebars' => 'handlebars',
+        'source.zig' => 'zig',
+        'source.vhdl' => 'vhdl',
+        'source.go' => 'go',
+        'source.fish' => 'fish',
+        'source.solidity' => 'solidity',
+        'source.sas' => 'sas',
+        'source.fortran.fixed' => 'fortran-fixed-form',
+        'source.r' => 'r',
+        'source.fnl' => 'fennel',
+        'source.ruby' => 'ruby',
+        'text.log' => 'log',
+        'source.vala' => 'vala',
+        'source.splunk_search' => 'splunk',
+        'source.lua' => 'lua',
+        'source.gnuplot' => 'gnuplot',
+        'source.regexp.python' => 'regexp',
+        'text.html.markdown' => 'markdown',
+        'source.ballerina' => 'ballerina',
+        'text.xml.xsl' => 'xsl',
+        'source.systemd' => 'systemd',
+        'source.coffee' => 'coffee',
+        'text.haml' => 'haml',
+        'source.wikitext' => 'wikitext',
+        'source.kusto' => 'kusto',
+        'source.ocaml' => 'ocaml',
+        'source.cue' => 'cue',
+        'source.nextflow' => 'nextflow',
+        'text.git-rebase' => 'git-rebase',
+        'source.cypher' => 'cypher',
+        'source.tsx' => 'tsx',
+        'text.bibtex' => 'bibtex',
+        'text.pug' => 'pug',
+        'source.gjs' => 'glimmer-js',
+        'source.julia' => 'julia',
+        'text.beancount' => 'beancount',
+        'source.puppet' => 'puppet',
+        'source.bsl' => 'bsl',
+        'source.http' => 'http',
+        'source.cs' => 'csharp',
+        'source.jison' => 'jison',
+        'source.purescript' => 'purescript',
+        'source.actionscript.3' => 'actionscript-3',
+        'text.shell-session' => 'shellsession',
+        'source.systemverilog' => 'system-verilog',
+        'source.gdscript' => 'gdscript',
+        'source.luau' => 'luau',
+        'source.toml' => 'toml',
+        'source.php' => 'php',
+        'source.typst' => 'typst',
+        'source.css.postcss' => 'postcss',
+        'source.prisma' => 'prisma',
+        'source.fsharp' => 'fsharp',
+        'source.apl' => 'apl',
+        'source.wit' => 'wit',
+        'source.sql' => 'sql',
+        'source.objcpp' => 'objective-cpp',
+        'source.logo' => 'logo',
+        'text.html.php.blade' => 'blade',
+        'source.yaml' => 'yaml',
+        'source.scala' => 'scala',
+        'source.ql' => 'codeql',
+        'source.crystal' => 'crystal',
+        'source.sdbl' => 'sdbl',
+        'source.hjson' => 'hjson',
+        'source.awk' => 'awk',
+        'source.dockerfile' => 'docker',
+        'source.dax' => 'dax',
+        'source.ts.ng' => 'angular-ts',
+        'source.hcl.terraform' => 'terraform',
+        'source.tsp' => 'typespec',
+        'text.codeowners' => 'codeowners',
+        'source.rel' => 'rel',
+        'text.html.vue-html' => 'vue-html',
+        'source.abap' => 'abap',
+        'text.git-commit' => 'git-commit',
+        'source.rust' => 'rust',
+        'source.polar' => 'polar',
+        'source.js' => 'javascript',
+        'source.prolog' => 'prolog',
+        'source.dart' => 'dart',
+        'text.marko' => 'marko',
+        'text.asciidoc' => 'asciidoc',
+        'source.wenyan' => 'wenyan',
+        'source.elm' => 'elm',
+        'source.d' => 'd',
+        'source.hlsl' => 'hlsl',
+        'source.po' => 'po',
+        'source.shaderlab' => 'shaderlab',
+        'source.stata' => 'stata',
+        'source.nginx' => 'nginx',
+        'source.ara' => 'ara',
+        'source.json' => 'json',
+        'source.css' => 'css',
+        'text.tsv' => 'tsv',
+        'source.asp.vb.net' => 'vb',
+        'source.hcl' => 'hcl',
+        'source.plsql.oracle' => 'plsql',
+        'source.pascal' => 'pascal',
+        'source.c' => 'c',
+        'source.turtle' => 'turtle',
+        'source.qmldir' => 'qmldir',
+        'text.html.jinja' => 'jinja-html',
+        'source.racket' => 'racket',
+        'source.css.scss' => 'scss',
+        'source.hxml' => 'hxml',
+        'source.qml' => 'qml',
+        'source.commonlisp' => 'common-lisp',
+        'source.lean4' => 'lean',
+        'text.tex' => 'tex',
+        'source.jsonnet' => 'jsonnet',
+        'source.vyper' => 'vyper',
+        'text.html.basic' => 'html',
+        'text.html.liquid' => 'liquid',
+        'source.emacs.lisp' => 'emacs-lisp',
+        'source.v' => 'v',
+        'source.hack' => 'hack',
+        'text.tex.latex' => 'latex',
+        'source.perl' => 'perl',
+        'source.gleam' => 'gleam',
+        'source.cairo0' => 'cairo',
+        'source.matlab' => 'matlab',
+        'source.json.comments' => 'jsonc',
+        'source.dotenv' => 'dotenv',
+        'source.perl.6' => 'raku',
+        'source.css.less' => 'less',
+        'source.batchfile' => 'bat',
+        'source.clar' => 'clarity',
+        'source.reg' => 'reg',
+        'source.cpp.embedded.macro' => 'cpp-macro',
+        'source.tcl' => 'tcl',
+        'text.html.derivative' => 'html-derivative',
+        'source.powershell' => 'powershell',
+        'source.graphql' => 'graphql',
+        'source.haskell' => 'haskell',
+        'source.gdshader' => 'gdshader',
+        'source.groovy' => 'groovy',
+        'source.qss' => 'qss',
+        'source.verilog' => 'verilog',
+        'source.ts' => 'typescript',
+        'source.kotlin' => 'kotlin',
+        'text.gherkin.feature' => 'gherkin',
+        'text.html.soy' => 'soy',
+        'source.python' => 'python',
+        'source.sass' => 'sass',
+        'source.talon' => 'talonscript',
+        'source.vue' => 'vue',
+        'source.zenscript' => 'zenscript',
+        'source.imba' => 'imba',
+        'source.riscv' => 'riscv',
+        'source.smalltalk' => 'smalltalk',
+        'source.json5' => 'json5',
+        'source.cadence' => 'cadence',
+        'source.desktop' => 'desktop',
+        'source.asm.x86_64' => 'asm',
+        'text.html.statamic' => 'antlers',
     ];
-}
\ No newline at end of file
+}
diff --git a/src/Grammar/Grammar.php b/src/Grammar/Grammar.php
index 46e084f..d1ec36a 100644
--- a/src/Grammar/Grammar.php
+++ b/src/Grammar/Grammar.php
@@ -7,230 +7,230 @@
 enum Grammar: string
 {
     case Txt = 'txt';
-    case Astro = "astro";
-case Hy = "hy";
-case Nim = "nim";
-case Cpp = "cpp";
-case Jinja = "jinja";
-case Coq = "coq";
-case Templ = "templ";
-case GlimmerTs = "glimmer-ts";
-case AngularHtml = "angular-html";
-case Cmake = "cmake";
-case Mdx = "mdx";
-case Nix = "nix";
-case Gdresource = "gdresource";
-case Haxe = "haxe";
-case Ada = "ada";
-case Powerquery = "powerquery";
-case Fluent = "fluent";
-case ObjectiveC = "objective-c";
-case Elixir = "elixir";
-case Diff = "diff";
-case Java = "java";
-case Glsl = "glsl";
-case Mojo = "mojo";
-case Sparql = "sparql";
-case Bicep = "bicep";
-case Csv = "csv";
-case Swift = "swift";
-case SshConfig = "ssh-config";
-case Edge = "edge";
-case Narrat = "narrat";
-case Tasl = "tasl";
-case Nushell = "nushell";
-case Erb = "erb";
-case Move = "move";
-case Scheme = "scheme";
-case Mipsasm = "mipsasm";
-case Rst = "rst";
-case Shellscript = "shellscript";
-case Apache = "apache";
-case Wgsl = "wgsl";
-case FortranFreeForm = "fortran-free-form";
-case Ini = "ini";
-case Make = "make";
-case TsTags = "ts-tags";
-case Stylus = "stylus";
-case Jsx = "jsx";
-case Jsonl = "jsonl";
-case Llvm = "llvm";
-case Twig = "twig";
-case Clojure = "clojure";
-case Svelte = "svelte";
-case Xml = "xml";
-case Jssm = "jssm";
-case Erlang = "erlang";
-case Applescript = "applescript";
-case Viml = "viml";
-case Razor = "razor";
-case Apex = "apex";
-case Berry = "berry";
-case DreamMaker = "dream-maker";
-case Wolfram = "wolfram";
-case Cobol = "cobol";
-case Proto = "proto";
-case Genie = "genie";
-case Wasm = "wasm";
-case Handlebars = "handlebars";
-case Zig = "zig";
-case Vhdl = "vhdl";
-case Go = "go";
-case Fish = "fish";
-case Solidity = "solidity";
-case Sas = "sas";
-case FortranFixedForm = "fortran-fixed-form";
-case R = "r";
-case Fennel = "fennel";
-case Ruby = "ruby";
-case Log = "log";
-case Vala = "vala";
-case Splunk = "splunk";
-case Lua = "lua";
-case Gnuplot = "gnuplot";
-case Regexp = "regexp";
-case Markdown = "markdown";
-case Ballerina = "ballerina";
-case Xsl = "xsl";
-case Systemd = "systemd";
-case Coffee = "coffee";
-case Haml = "haml";
-case Wikitext = "wikitext";
-case Kusto = "kusto";
-case Ocaml = "ocaml";
-case Cue = "cue";
-case Nextflow = "nextflow";
-case GitRebase = "git-rebase";
-case Cypher = "cypher";
-case Tsx = "tsx";
-case Bibtex = "bibtex";
-case Pug = "pug";
-case GlimmerJs = "glimmer-js";
-case Julia = "julia";
-case Beancount = "beancount";
-case Puppet = "puppet";
-case Bsl = "bsl";
-case Http = "http";
-case Csharp = "csharp";
-case Jison = "jison";
-case Purescript = "purescript";
-case Actionscript3 = "actionscript-3";
-case Shellsession = "shellsession";
-case SystemVerilog = "system-verilog";
-case Gdscript = "gdscript";
-case Luau = "luau";
-case Toml = "toml";
-case Php = "php";
-case Typst = "typst";
-case Postcss = "postcss";
-case Prisma = "prisma";
-case Fsharp = "fsharp";
-case Apl = "apl";
-case Wit = "wit";
-case Sql = "sql";
-case ObjectiveCpp = "objective-cpp";
-case Logo = "logo";
-case Blade = "blade";
-case Yaml = "yaml";
-case Scala = "scala";
-case Codeql = "codeql";
-case Crystal = "crystal";
-case Sdbl = "sdbl";
-case Hjson = "hjson";
-case Awk = "awk";
-case Docker = "docker";
-case Dax = "dax";
-case AngularTs = "angular-ts";
-case Terraform = "terraform";
-case Typespec = "typespec";
-case Codeowners = "codeowners";
-case Rel = "rel";
-case VueHtml = "vue-html";
-case Abap = "abap";
-case GitCommit = "git-commit";
-case Rust = "rust";
-case Polar = "polar";
-case Javascript = "javascript";
-case Prolog = "prolog";
-case Dart = "dart";
-case Marko = "marko";
-case Asciidoc = "asciidoc";
-case Wenyan = "wenyan";
-case Elm = "elm";
-case D = "d";
-case Hlsl = "hlsl";
-case Po = "po";
-case Shaderlab = "shaderlab";
-case Stata = "stata";
-case Nginx = "nginx";
-case Ara = "ara";
-case Json = "json";
-case Css = "css";
-case Tsv = "tsv";
-case Vb = "vb";
-case Hcl = "hcl";
-case Plsql = "plsql";
-case Pascal = "pascal";
-case C = "c";
-case Turtle = "turtle";
-case Qmldir = "qmldir";
-case JinjaHtml = "jinja-html";
-case Racket = "racket";
-case Scss = "scss";
-case Hxml = "hxml";
-case Qml = "qml";
-case CommonLisp = "common-lisp";
-case Lean = "lean";
-case Tex = "tex";
-case Jsonnet = "jsonnet";
-case Vyper = "vyper";
-case Html = "html";
-case Liquid = "liquid";
-case EmacsLisp = "emacs-lisp";
-case V = "v";
-case Hack = "hack";
-case Latex = "latex";
-case Perl = "perl";
-case Gleam = "gleam";
-case Cairo = "cairo";
-case Matlab = "matlab";
-case Jsonc = "jsonc";
-case Dotenv = "dotenv";
-case Raku = "raku";
-case Less = "less";
-case Bat = "bat";
-case Clarity = "clarity";
-case Reg = "reg";
-case CppMacro = "cpp-macro";
-case Tcl = "tcl";
-case HtmlDerivative = "html-derivative";
-case Powershell = "powershell";
-case Graphql = "graphql";
-case Haskell = "haskell";
-case Gdshader = "gdshader";
-case Groovy = "groovy";
-case Qss = "qss";
-case Verilog = "verilog";
-case Typescript = "typescript";
-case Kotlin = "kotlin";
-case Gherkin = "gherkin";
-case Soy = "soy";
-case Python = "python";
-case Sass = "sass";
-case Talonscript = "talonscript";
-case Vue = "vue";
-case Zenscript = "zenscript";
-case Imba = "imba";
-case Riscv = "riscv";
-case Smalltalk = "smalltalk";
-case Json5 = "json5";
-case Cadence = "cadence";
-case Desktop = "desktop";
-case Asm = "asm";
-case Antlers = "antlers";
+    case Astro = 'astro';
+    case Hy = 'hy';
+    case Nim = 'nim';
+    case Cpp = 'cpp';
+    case Jinja = 'jinja';
+    case Coq = 'coq';
+    case Templ = 'templ';
+    case GlimmerTs = 'glimmer-ts';
+    case AngularHtml = 'angular-html';
+    case Cmake = 'cmake';
+    case Mdx = 'mdx';
+    case Nix = 'nix';
+    case Gdresource = 'gdresource';
+    case Haxe = 'haxe';
+    case Ada = 'ada';
+    case Powerquery = 'powerquery';
+    case Fluent = 'fluent';
+    case ObjectiveC = 'objective-c';
+    case Elixir = 'elixir';
+    case Diff = 'diff';
+    case Java = 'java';
+    case Glsl = 'glsl';
+    case Mojo = 'mojo';
+    case Sparql = 'sparql';
+    case Bicep = 'bicep';
+    case Csv = 'csv';
+    case Swift = 'swift';
+    case SshConfig = 'ssh-config';
+    case Edge = 'edge';
+    case Narrat = 'narrat';
+    case Tasl = 'tasl';
+    case Nushell = 'nushell';
+    case Erb = 'erb';
+    case Move = 'move';
+    case Scheme = 'scheme';
+    case Mipsasm = 'mipsasm';
+    case Rst = 'rst';
+    case Shellscript = 'shellscript';
+    case Apache = 'apache';
+    case Wgsl = 'wgsl';
+    case FortranFreeForm = 'fortran-free-form';
+    case Ini = 'ini';
+    case Make = 'make';
+    case TsTags = 'ts-tags';
+    case Stylus = 'stylus';
+    case Jsx = 'jsx';
+    case Jsonl = 'jsonl';
+    case Llvm = 'llvm';
+    case Twig = 'twig';
+    case Clojure = 'clojure';
+    case Svelte = 'svelte';
+    case Xml = 'xml';
+    case Jssm = 'jssm';
+    case Erlang = 'erlang';
+    case Applescript = 'applescript';
+    case Viml = 'viml';
+    case Razor = 'razor';
+    case Apex = 'apex';
+    case Berry = 'berry';
+    case DreamMaker = 'dream-maker';
+    case Wolfram = 'wolfram';
+    case Cobol = 'cobol';
+    case Proto = 'proto';
+    case Genie = 'genie';
+    case Wasm = 'wasm';
+    case Handlebars = 'handlebars';
+    case Zig = 'zig';
+    case Vhdl = 'vhdl';
+    case Go = 'go';
+    case Fish = 'fish';
+    case Solidity = 'solidity';
+    case Sas = 'sas';
+    case FortranFixedForm = 'fortran-fixed-form';
+    case R = 'r';
+    case Fennel = 'fennel';
+    case Ruby = 'ruby';
+    case Log = 'log';
+    case Vala = 'vala';
+    case Splunk = 'splunk';
+    case Lua = 'lua';
+    case Gnuplot = 'gnuplot';
+    case Regexp = 'regexp';
+    case Markdown = 'markdown';
+    case Ballerina = 'ballerina';
+    case Xsl = 'xsl';
+    case Systemd = 'systemd';
+    case Coffee = 'coffee';
+    case Haml = 'haml';
+    case Wikitext = 'wikitext';
+    case Kusto = 'kusto';
+    case Ocaml = 'ocaml';
+    case Cue = 'cue';
+    case Nextflow = 'nextflow';
+    case GitRebase = 'git-rebase';
+    case Cypher = 'cypher';
+    case Tsx = 'tsx';
+    case Bibtex = 'bibtex';
+    case Pug = 'pug';
+    case GlimmerJs = 'glimmer-js';
+    case Julia = 'julia';
+    case Beancount = 'beancount';
+    case Puppet = 'puppet';
+    case Bsl = 'bsl';
+    case Http = 'http';
+    case Csharp = 'csharp';
+    case Jison = 'jison';
+    case Purescript = 'purescript';
+    case Actionscript3 = 'actionscript-3';
+    case Shellsession = 'shellsession';
+    case SystemVerilog = 'system-verilog';
+    case Gdscript = 'gdscript';
+    case Luau = 'luau';
+    case Toml = 'toml';
+    case Php = 'php';
+    case Typst = 'typst';
+    case Postcss = 'postcss';
+    case Prisma = 'prisma';
+    case Fsharp = 'fsharp';
+    case Apl = 'apl';
+    case Wit = 'wit';
+    case Sql = 'sql';
+    case ObjectiveCpp = 'objective-cpp';
+    case Logo = 'logo';
+    case Blade = 'blade';
+    case Yaml = 'yaml';
+    case Scala = 'scala';
+    case Codeql = 'codeql';
+    case Crystal = 'crystal';
+    case Sdbl = 'sdbl';
+    case Hjson = 'hjson';
+    case Awk = 'awk';
+    case Docker = 'docker';
+    case Dax = 'dax';
+    case AngularTs = 'angular-ts';
+    case Terraform = 'terraform';
+    case Typespec = 'typespec';
+    case Codeowners = 'codeowners';
+    case Rel = 'rel';
+    case VueHtml = 'vue-html';
+    case Abap = 'abap';
+    case GitCommit = 'git-commit';
+    case Rust = 'rust';
+    case Polar = 'polar';
+    case Javascript = 'javascript';
+    case Prolog = 'prolog';
+    case Dart = 'dart';
+    case Marko = 'marko';
+    case Asciidoc = 'asciidoc';
+    case Wenyan = 'wenyan';
+    case Elm = 'elm';
+    case D = 'd';
+    case Hlsl = 'hlsl';
+    case Po = 'po';
+    case Shaderlab = 'shaderlab';
+    case Stata = 'stata';
+    case Nginx = 'nginx';
+    case Ara = 'ara';
+    case Json = 'json';
+    case Css = 'css';
+    case Tsv = 'tsv';
+    case Vb = 'vb';
+    case Hcl = 'hcl';
+    case Plsql = 'plsql';
+    case Pascal = 'pascal';
+    case C = 'c';
+    case Turtle = 'turtle';
+    case Qmldir = 'qmldir';
+    case JinjaHtml = 'jinja-html';
+    case Racket = 'racket';
+    case Scss = 'scss';
+    case Hxml = 'hxml';
+    case Qml = 'qml';
+    case CommonLisp = 'common-lisp';
+    case Lean = 'lean';
+    case Tex = 'tex';
+    case Jsonnet = 'jsonnet';
+    case Vyper = 'vyper';
+    case Html = 'html';
+    case Liquid = 'liquid';
+    case EmacsLisp = 'emacs-lisp';
+    case V = 'v';
+    case Hack = 'hack';
+    case Latex = 'latex';
+    case Perl = 'perl';
+    case Gleam = 'gleam';
+    case Cairo = 'cairo';
+    case Matlab = 'matlab';
+    case Jsonc = 'jsonc';
+    case Dotenv = 'dotenv';
+    case Raku = 'raku';
+    case Less = 'less';
+    case Bat = 'bat';
+    case Clarity = 'clarity';
+    case Reg = 'reg';
+    case CppMacro = 'cpp-macro';
+    case Tcl = 'tcl';
+    case HtmlDerivative = 'html-derivative';
+    case Powershell = 'powershell';
+    case Graphql = 'graphql';
+    case Haskell = 'haskell';
+    case Gdshader = 'gdshader';
+    case Groovy = 'groovy';
+    case Qss = 'qss';
+    case Verilog = 'verilog';
+    case Typescript = 'typescript';
+    case Kotlin = 'kotlin';
+    case Gherkin = 'gherkin';
+    case Soy = 'soy';
+    case Python = 'python';
+    case Sass = 'sass';
+    case Talonscript = 'talonscript';
+    case Vue = 'vue';
+    case Zenscript = 'zenscript';
+    case Imba = 'imba';
+    case Riscv = 'riscv';
+    case Smalltalk = 'smalltalk';
+    case Json5 = 'json5';
+    case Cadence = 'cadence';
+    case Desktop = 'desktop';
+    case Asm = 'asm';
+    case Antlers = 'antlers';
 
     public function toParsedGrammar(GrammarRepositoryInterface $repository): ParsedGrammar
     {
         return $repository->get($this->value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Theme/DefaultThemes.php b/src/Theme/DefaultThemes.php
index 30385a6..3761ef9 100644
--- a/src/Theme/DefaultThemes.php
+++ b/src/Theme/DefaultThemes.php
@@ -4,64 +4,64 @@
 
 abstract class DefaultThemes
 {
-    final const NAMES_TO_PATHS = ["gruvbox-light-medium" => __DIR__ . "/../../resources/themes/gruvbox-light-medium.json",
-"one-dark-pro" => __DIR__ . "/../../resources/themes/one-dark-pro.json",
-"solarized-light" => __DIR__ . "/../../resources/themes/solarized-light.json",
-"gruvbox-light-hard" => __DIR__ . "/../../resources/themes/gruvbox-light-hard.json",
-"vitesse-black" => __DIR__ . "/../../resources/themes/vitesse-black.json",
-"github-light-default" => __DIR__ . "/../../resources/themes/github-light-default.json",
-"slack-dark" => __DIR__ . "/../../resources/themes/slack-dark.json",
-"everforest-dark" => __DIR__ . "/../../resources/themes/everforest-dark.json",
-"rose-pine-moon" => __DIR__ . "/../../resources/themes/rose-pine-moon.json",
-"everforest-light" => __DIR__ . "/../../resources/themes/everforest-light.json",
-"laserwave" => __DIR__ . "/../../resources/themes/laserwave.json",
-"github-light-high-contrast" => __DIR__ . "/../../resources/themes/github-light-high-contrast.json",
-"gruvbox-dark-soft" => __DIR__ . "/../../resources/themes/gruvbox-dark-soft.json",
-"catppuccin-mocha" => __DIR__ . "/../../resources/themes/catppuccin-mocha.json",
-"red" => __DIR__ . "/../../resources/themes/red.json",
-"material-theme-lighter" => __DIR__ . "/../../resources/themes/material-theme-lighter.json",
-"one-light" => __DIR__ . "/../../resources/themes/one-light.json",
-"aurora-x" => __DIR__ . "/../../resources/themes/aurora-x.json",
-"tokyo-night" => __DIR__ . "/../../resources/themes/tokyo-night.json",
-"catppuccin-macchiato" => __DIR__ . "/../../resources/themes/catppuccin-macchiato.json",
-"github-dark" => __DIR__ . "/../../resources/themes/github-dark.json",
-"rose-pine-dawn" => __DIR__ . "/../../resources/themes/rose-pine-dawn.json",
-"gruvbox-dark-medium" => __DIR__ . "/../../resources/themes/gruvbox-dark-medium.json",
-"poimandres" => __DIR__ . "/../../resources/themes/poimandres.json",
-"github-dark-high-contrast" => __DIR__ . "/../../resources/themes/github-dark-high-contrast.json",
-"material-theme" => __DIR__ . "/../../resources/themes/material-theme.json",
-"dracula" => __DIR__ . "/../../resources/themes/dracula.json",
-"github-dark-default" => __DIR__ . "/../../resources/themes/github-dark-default.json",
-"github-dark-dimmed" => __DIR__ . "/../../resources/themes/github-dark-dimmed.json",
-"rose-pine" => __DIR__ . "/../../resources/themes/rose-pine.json",
-"kanagawa-lotus" => __DIR__ . "/../../resources/themes/kanagawa-lotus.json",
-"kanagawa-dragon" => __DIR__ . "/../../resources/themes/kanagawa-dragon.json",
-"dark-plus" => __DIR__ . "/../../resources/themes/dark-plus.json",
-"ayu-dark" => __DIR__ . "/../../resources/themes/ayu-dark.json",
-"min-dark" => __DIR__ . "/../../resources/themes/min-dark.json",
-"monokai" => __DIR__ . "/../../resources/themes/monokai.json",
-"nord" => __DIR__ . "/../../resources/themes/nord.json",
-"catppuccin-frappe" => __DIR__ . "/../../resources/themes/catppuccin-frappe.json",
-"github-light" => __DIR__ . "/../../resources/themes/github-light.json",
-"dracula-soft" => __DIR__ . "/../../resources/themes/dracula-soft.json",
-"synthwave-84" => __DIR__ . "/../../resources/themes/synthwave-84.json",
-"vitesse-dark" => __DIR__ . "/../../resources/themes/vitesse-dark.json",
-"gruvbox-dark-hard" => __DIR__ . "/../../resources/themes/gruvbox-dark-hard.json",
-"andromeeda" => __DIR__ . "/../../resources/themes/andromeeda.json",
-"light-plus" => __DIR__ . "/../../resources/themes/light-plus.json",
-"slack-ochin" => __DIR__ . "/../../resources/themes/slack-ochin.json",
-"solarized-dark" => __DIR__ . "/../../resources/themes/solarized-dark.json",
-"gruvbox-light-soft" => __DIR__ . "/../../resources/themes/gruvbox-light-soft.json",
-"material-theme-ocean" => __DIR__ . "/../../resources/themes/material-theme-ocean.json",
-"vitesse-light" => __DIR__ . "/../../resources/themes/vitesse-light.json",
-"vesper" => __DIR__ . "/../../resources/themes/vesper.json",
-"kanagawa-wave" => __DIR__ . "/../../resources/themes/kanagawa-wave.json",
-"plastic" => __DIR__ . "/../../resources/themes/plastic.json",
-"material-theme-darker" => __DIR__ . "/../../resources/themes/material-theme-darker.json",
-"night-owl" => __DIR__ . "/../../resources/themes/night-owl.json",
-"catppuccin-latte" => __DIR__ . "/../../resources/themes/catppuccin-latte.json",
-"min-light" => __DIR__ . "/../../resources/themes/min-light.json",
-"snazzy-light" => __DIR__ . "/../../resources/themes/snazzy-light.json",
-"houston" => __DIR__ . "/../../resources/themes/houston.json",
-"material-theme-palenight" => __DIR__ . "/../../resources/themes/material-theme-palenight.json"];
-}
\ No newline at end of file
+    final const NAMES_TO_PATHS = ['gruvbox-light-medium' => __DIR__.'/../../resources/themes/gruvbox-light-medium.json',
+        'one-dark-pro' => __DIR__.'/../../resources/themes/one-dark-pro.json',
+        'solarized-light' => __DIR__.'/../../resources/themes/solarized-light.json',
+        'gruvbox-light-hard' => __DIR__.'/../../resources/themes/gruvbox-light-hard.json',
+        'vitesse-black' => __DIR__.'/../../resources/themes/vitesse-black.json',
+        'github-light-default' => __DIR__.'/../../resources/themes/github-light-default.json',
+        'slack-dark' => __DIR__.'/../../resources/themes/slack-dark.json',
+        'everforest-dark' => __DIR__.'/../../resources/themes/everforest-dark.json',
+        'rose-pine-moon' => __DIR__.'/../../resources/themes/rose-pine-moon.json',
+        'everforest-light' => __DIR__.'/../../resources/themes/everforest-light.json',
+        'laserwave' => __DIR__.'/../../resources/themes/laserwave.json',
+        'github-light-high-contrast' => __DIR__.'/../../resources/themes/github-light-high-contrast.json',
+        'gruvbox-dark-soft' => __DIR__.'/../../resources/themes/gruvbox-dark-soft.json',
+        'catppuccin-mocha' => __DIR__.'/../../resources/themes/catppuccin-mocha.json',
+        'red' => __DIR__.'/../../resources/themes/red.json',
+        'material-theme-lighter' => __DIR__.'/../../resources/themes/material-theme-lighter.json',
+        'one-light' => __DIR__.'/../../resources/themes/one-light.json',
+        'aurora-x' => __DIR__.'/../../resources/themes/aurora-x.json',
+        'tokyo-night' => __DIR__.'/../../resources/themes/tokyo-night.json',
+        'catppuccin-macchiato' => __DIR__.'/../../resources/themes/catppuccin-macchiato.json',
+        'github-dark' => __DIR__.'/../../resources/themes/github-dark.json',
+        'rose-pine-dawn' => __DIR__.'/../../resources/themes/rose-pine-dawn.json',
+        'gruvbox-dark-medium' => __DIR__.'/../../resources/themes/gruvbox-dark-medium.json',
+        'poimandres' => __DIR__.'/../../resources/themes/poimandres.json',
+        'github-dark-high-contrast' => __DIR__.'/../../resources/themes/github-dark-high-contrast.json',
+        'material-theme' => __DIR__.'/../../resources/themes/material-theme.json',
+        'dracula' => __DIR__.'/../../resources/themes/dracula.json',
+        'github-dark-default' => __DIR__.'/../../resources/themes/github-dark-default.json',
+        'github-dark-dimmed' => __DIR__.'/../../resources/themes/github-dark-dimmed.json',
+        'rose-pine' => __DIR__.'/../../resources/themes/rose-pine.json',
+        'kanagawa-lotus' => __DIR__.'/../../resources/themes/kanagawa-lotus.json',
+        'kanagawa-dragon' => __DIR__.'/../../resources/themes/kanagawa-dragon.json',
+        'dark-plus' => __DIR__.'/../../resources/themes/dark-plus.json',
+        'ayu-dark' => __DIR__.'/../../resources/themes/ayu-dark.json',
+        'min-dark' => __DIR__.'/../../resources/themes/min-dark.json',
+        'monokai' => __DIR__.'/../../resources/themes/monokai.json',
+        'nord' => __DIR__.'/../../resources/themes/nord.json',
+        'catppuccin-frappe' => __DIR__.'/../../resources/themes/catppuccin-frappe.json',
+        'github-light' => __DIR__.'/../../resources/themes/github-light.json',
+        'dracula-soft' => __DIR__.'/../../resources/themes/dracula-soft.json',
+        'synthwave-84' => __DIR__.'/../../resources/themes/synthwave-84.json',
+        'vitesse-dark' => __DIR__.'/../../resources/themes/vitesse-dark.json',
+        'gruvbox-dark-hard' => __DIR__.'/../../resources/themes/gruvbox-dark-hard.json',
+        'andromeeda' => __DIR__.'/../../resources/themes/andromeeda.json',
+        'light-plus' => __DIR__.'/../../resources/themes/light-plus.json',
+        'slack-ochin' => __DIR__.'/../../resources/themes/slack-ochin.json',
+        'solarized-dark' => __DIR__.'/../../resources/themes/solarized-dark.json',
+        'gruvbox-light-soft' => __DIR__.'/../../resources/themes/gruvbox-light-soft.json',
+        'material-theme-ocean' => __DIR__.'/../../resources/themes/material-theme-ocean.json',
+        'vitesse-light' => __DIR__.'/../../resources/themes/vitesse-light.json',
+        'vesper' => __DIR__.'/../../resources/themes/vesper.json',
+        'kanagawa-wave' => __DIR__.'/../../resources/themes/kanagawa-wave.json',
+        'plastic' => __DIR__.'/../../resources/themes/plastic.json',
+        'material-theme-darker' => __DIR__.'/../../resources/themes/material-theme-darker.json',
+        'night-owl' => __DIR__.'/../../resources/themes/night-owl.json',
+        'catppuccin-latte' => __DIR__.'/../../resources/themes/catppuccin-latte.json',
+        'min-light' => __DIR__.'/../../resources/themes/min-light.json',
+        'snazzy-light' => __DIR__.'/../../resources/themes/snazzy-light.json',
+        'houston' => __DIR__.'/../../resources/themes/houston.json',
+        'material-theme-palenight' => __DIR__.'/../../resources/themes/material-theme-palenight.json'];
+}
diff --git a/src/Theme/Theme.php b/src/Theme/Theme.php
index 1e6b321..6a25f4a 100644
--- a/src/Theme/Theme.php
+++ b/src/Theme/Theme.php
@@ -6,69 +6,69 @@
 
 enum Theme: string
 {
-    case GruvboxLightMedium = "gruvbox-light-medium";
-case OneDarkPro = "one-dark-pro";
-case SolarizedLight = "solarized-light";
-case GruvboxLightHard = "gruvbox-light-hard";
-case VitesseBlack = "vitesse-black";
-case GithubLightDefault = "github-light-default";
-case SlackDark = "slack-dark";
-case EverforestDark = "everforest-dark";
-case RosePineMoon = "rose-pine-moon";
-case EverforestLight = "everforest-light";
-case Laserwave = "laserwave";
-case GithubLightHighContrast = "github-light-high-contrast";
-case GruvboxDarkSoft = "gruvbox-dark-soft";
-case CatppuccinMocha = "catppuccin-mocha";
-case Red = "red";
-case MaterialThemeLighter = "material-theme-lighter";
-case OneLight = "one-light";
-case AuroraX = "aurora-x";
-case TokyoNight = "tokyo-night";
-case CatppuccinMacchiato = "catppuccin-macchiato";
-case GithubDark = "github-dark";
-case RosePineDawn = "rose-pine-dawn";
-case GruvboxDarkMedium = "gruvbox-dark-medium";
-case Poimandres = "poimandres";
-case GithubDarkHighContrast = "github-dark-high-contrast";
-case MaterialTheme = "material-theme";
-case Dracula = "dracula";
-case GithubDarkDefault = "github-dark-default";
-case GithubDarkDimmed = "github-dark-dimmed";
-case RosePine = "rose-pine";
-case KanagawaLotus = "kanagawa-lotus";
-case KanagawaDragon = "kanagawa-dragon";
-case DarkPlus = "dark-plus";
-case AyuDark = "ayu-dark";
-case MinDark = "min-dark";
-case Monokai = "monokai";
-case Nord = "nord";
-case CatppuccinFrappe = "catppuccin-frappe";
-case GithubLight = "github-light";
-case DraculaSoft = "dracula-soft";
-case Synthwave84 = "synthwave-84";
-case VitesseDark = "vitesse-dark";
-case GruvboxDarkHard = "gruvbox-dark-hard";
-case Andromeeda = "andromeeda";
-case LightPlus = "light-plus";
-case SlackOchin = "slack-ochin";
-case SolarizedDark = "solarized-dark";
-case GruvboxLightSoft = "gruvbox-light-soft";
-case MaterialThemeOcean = "material-theme-ocean";
-case VitesseLight = "vitesse-light";
-case Vesper = "vesper";
-case KanagawaWave = "kanagawa-wave";
-case Plastic = "plastic";
-case MaterialThemeDarker = "material-theme-darker";
-case NightOwl = "night-owl";
-case CatppuccinLatte = "catppuccin-latte";
-case MinLight = "min-light";
-case SnazzyLight = "snazzy-light";
-case Houston = "houston";
-case MaterialThemePalenight = "material-theme-palenight";
+    case GruvboxLightMedium = 'gruvbox-light-medium';
+    case OneDarkPro = 'one-dark-pro';
+    case SolarizedLight = 'solarized-light';
+    case GruvboxLightHard = 'gruvbox-light-hard';
+    case VitesseBlack = 'vitesse-black';
+    case GithubLightDefault = 'github-light-default';
+    case SlackDark = 'slack-dark';
+    case EverforestDark = 'everforest-dark';
+    case RosePineMoon = 'rose-pine-moon';
+    case EverforestLight = 'everforest-light';
+    case Laserwave = 'laserwave';
+    case GithubLightHighContrast = 'github-light-high-contrast';
+    case GruvboxDarkSoft = 'gruvbox-dark-soft';
+    case CatppuccinMocha = 'catppuccin-mocha';
+    case Red = 'red';
+    case MaterialThemeLighter = 'material-theme-lighter';
+    case OneLight = 'one-light';
+    case AuroraX = 'aurora-x';
+    case TokyoNight = 'tokyo-night';
+    case CatppuccinMacchiato = 'catppuccin-macchiato';
+    case GithubDark = 'github-dark';
+    case RosePineDawn = 'rose-pine-dawn';
+    case GruvboxDarkMedium = 'gruvbox-dark-medium';
+    case Poimandres = 'poimandres';
+    case GithubDarkHighContrast = 'github-dark-high-contrast';
+    case MaterialTheme = 'material-theme';
+    case Dracula = 'dracula';
+    case GithubDarkDefault = 'github-dark-default';
+    case GithubDarkDimmed = 'github-dark-dimmed';
+    case RosePine = 'rose-pine';
+    case KanagawaLotus = 'kanagawa-lotus';
+    case KanagawaDragon = 'kanagawa-dragon';
+    case DarkPlus = 'dark-plus';
+    case AyuDark = 'ayu-dark';
+    case MinDark = 'min-dark';
+    case Monokai = 'monokai';
+    case Nord = 'nord';
+    case CatppuccinFrappe = 'catppuccin-frappe';
+    case GithubLight = 'github-light';
+    case DraculaSoft = 'dracula-soft';
+    case Synthwave84 = 'synthwave-84';
+    case VitesseDark = 'vitesse-dark';
+    case GruvboxDarkHard = 'gruvbox-dark-hard';
+    case Andromeeda = 'andromeeda';
+    case LightPlus = 'light-plus';
+    case SlackOchin = 'slack-ochin';
+    case SolarizedDark = 'solarized-dark';
+    case GruvboxLightSoft = 'gruvbox-light-soft';
+    case MaterialThemeOcean = 'material-theme-ocean';
+    case VitesseLight = 'vitesse-light';
+    case Vesper = 'vesper';
+    case KanagawaWave = 'kanagawa-wave';
+    case Plastic = 'plastic';
+    case MaterialThemeDarker = 'material-theme-darker';
+    case NightOwl = 'night-owl';
+    case CatppuccinLatte = 'catppuccin-latte';
+    case MinLight = 'min-light';
+    case SnazzyLight = 'snazzy-light';
+    case Houston = 'houston';
+    case MaterialThemePalenight = 'material-theme-palenight';
 
     public function toParsedTheme(ThemeRepositoryInterface $repository): ParsedTheme
     {
         return $repository->get($this->value);
     }
-}
\ No newline at end of file
+}

From 50ba18384cdc07273350e7293d25b64913c49d97 Mon Sep 17 00:00:00 2001
From: Ryan Chandler <ryangjchandler@gmail.com>
Date: Sat, 12 Apr 2025 00:36:06 +0100
Subject: [PATCH 23/23] Rename tryMatch to match

---
 src/Contracts/PatternInterface.php |  3 ++-
 src/Grammar/BeginEndPattern.php    |  2 +-
 src/Grammar/BeginWhilePattern.php  |  2 +-
 src/Grammar/CollectionPattern.php  |  4 ++--
 src/Grammar/EndPattern.php         |  2 +-
 src/Grammar/IncludePattern.php     |  4 ++--
 src/Grammar/MatchPattern.php       |  2 +-
 src/Grammar/ParsedGrammar.php      |  2 +-
 src/Grammar/WhilePattern.php       |  2 +-
 src/Tokenizer.php                  | 18 +++++++++---------
 10 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/Contracts/PatternInterface.php b/src/Contracts/PatternInterface.php
index d42e6df..8acd2f3 100644
--- a/src/Contracts/PatternInterface.php
+++ b/src/Contracts/PatternInterface.php
@@ -6,12 +6,13 @@
 use Phiki\Tokenizer;
 use Stringable;
 
+/** @internal */
 interface PatternInterface extends Stringable
 {
     /**
      * Attempt to match the pattern against the current line's text, starting from the given position.
      */
-    public function tryMatch(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false;
+    public function match(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false;
 
     /**
      * Produce a new stack of scopes based on the current stack and the pattern's scope.
diff --git a/src/Grammar/BeginEndPattern.php b/src/Grammar/BeginEndPattern.php
index 4939bde..c374238 100644
--- a/src/Grammar/BeginEndPattern.php
+++ b/src/Grammar/BeginEndPattern.php
@@ -39,7 +39,7 @@ public function hasPatterns(): bool
         return count($this->patterns) > 0;
     }
 
-    public function tryMatch(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
+    public function match(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
     {
         try {
             if (preg_match('/'.$this->begin->get($tokenizer->allowA(), $tokenizer->allowG()).'/u', $lineText, $matches, PREG_OFFSET_CAPTURE, $linePosition) !== 1) {
diff --git a/src/Grammar/BeginWhilePattern.php b/src/Grammar/BeginWhilePattern.php
index 3058c18..3f375b5 100644
--- a/src/Grammar/BeginWhilePattern.php
+++ b/src/Grammar/BeginWhilePattern.php
@@ -39,7 +39,7 @@ public function hasPatterns(): bool
         return count($this->patterns) > 0;
     }
 
-    public function tryMatch(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
+    public function match(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
     {
         try {
             if (preg_match('/'.$this->begin->get($tokenizer->allowA(), $tokenizer->allowG()).'/u', $lineText, $matches, PREG_OFFSET_CAPTURE, $linePosition) !== 1) {
diff --git a/src/Grammar/CollectionPattern.php b/src/Grammar/CollectionPattern.php
index 2b05283..d559e72 100644
--- a/src/Grammar/CollectionPattern.php
+++ b/src/Grammar/CollectionPattern.php
@@ -26,13 +26,13 @@ public function hasPatterns(): bool
         return count($this->patterns) > 0;
     }
 
-    public function tryMatch(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
+    public function match(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
     {
         $closest = false;
         $offset = $linePosition;
 
         foreach ($this->getPatterns() as $pattern) {
-            $matched = $pattern->tryMatch($tokenizer, $lineText, $linePosition, $cannotExceed);
+            $matched = $pattern->match($tokenizer, $lineText, $linePosition, $cannotExceed);
 
             if ($matched === false) {
                 continue;
diff --git a/src/Grammar/EndPattern.php b/src/Grammar/EndPattern.php
index 6892d38..af820fe 100644
--- a/src/Grammar/EndPattern.php
+++ b/src/Grammar/EndPattern.php
@@ -50,7 +50,7 @@ public function hasCaptures(): bool
         return count($this->endCaptures) > 0 || count($this->captures) > 0;
     }
 
-    public function tryMatch(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
+    public function match(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
     {
         $regex = preg_replace_callback('/\\\\(\d+)/', function ($matches) {
             if (! isset($this->begin->matches[$matches[1]][0])) {
diff --git a/src/Grammar/IncludePattern.php b/src/Grammar/IncludePattern.php
index 98ec286..2d876b7 100644
--- a/src/Grammar/IncludePattern.php
+++ b/src/Grammar/IncludePattern.php
@@ -13,12 +13,12 @@ public function __construct(
         public bool $injection = false,
     ) {}
 
-    public function tryMatch(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
+    public function match(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
     {
         $resolved = $tokenizer->resolve($this);
 
         if ($resolved !== null) {
-            return $resolved->tryMatch($tokenizer, $lineText, $linePosition, $cannotExceed);
+            return $resolved->match($tokenizer, $lineText, $linePosition, $cannotExceed);
         }
 
         return false;
diff --git a/src/Grammar/MatchPattern.php b/src/Grammar/MatchPattern.php
index c637ab5..f18b856 100644
--- a/src/Grammar/MatchPattern.php
+++ b/src/Grammar/MatchPattern.php
@@ -20,7 +20,7 @@ public function __construct(
         public bool $injection = false,
     ) {}
 
-    public function tryMatch(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
+    public function match(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
     {
         try {
             if (preg_match('/'.$this->match->get($tokenizer->allowA(), $tokenizer->allowG()).'/u', $lineText, $matches, PREG_OFFSET_CAPTURE, $linePosition) !== 1) {
diff --git a/src/Grammar/ParsedGrammar.php b/src/Grammar/ParsedGrammar.php
index 48bb32c..480a02a 100644
--- a/src/Grammar/ParsedGrammar.php
+++ b/src/Grammar/ParsedGrammar.php
@@ -41,7 +41,7 @@ public function hasPatterns(): bool
         return count($this->patterns) > 0;
     }
 
-    public function tryMatch(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
+    public function match(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
     {
         return $tokenizer->matchUsing($lineText, $this->getPatterns());
     }
diff --git a/src/Grammar/WhilePattern.php b/src/Grammar/WhilePattern.php
index f131571..8a5087d 100644
--- a/src/Grammar/WhilePattern.php
+++ b/src/Grammar/WhilePattern.php
@@ -50,7 +50,7 @@ public function hasCaptures(): bool
         return count($this->whileCaptures) > 0 || count($this->captures) > 0;
     }
 
-    public function tryMatch(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
+    public function match(Tokenizer $tokenizer, string $lineText, int $linePosition, ?int $cannotExceed = null): MatchedPattern|false
     {
         $regex = preg_replace_callback('/\\\\(\d+)/', function ($matches) {
             if (! isset($this->begin->matches[$matches[1]][0])) {
diff --git a/src/Tokenizer.php b/src/Tokenizer.php
index 4b90ca9..5a73316 100644
--- a/src/Tokenizer.php
+++ b/src/Tokenizer.php
@@ -70,7 +70,7 @@ public function tokenizeLine(int $line, string $lineText): void
             $matched = $this->match($lineText);
             $endIsMatched = false;
 
-            if ($matched !== false && $root instanceof EndPattern && $endMatched = $root->tryMatch($this, $lineText, $this->state->getLinePosition())) {
+            if ($matched !== false && $root instanceof EndPattern && $endMatched = $root->match($this, $lineText, $this->state->getLinePosition())) {
                 if ($endMatched->offset() <= $matched->offset()) {
                     $matched = $endMatched;
                     $endIsMatched = true;
@@ -79,7 +79,7 @@ public function tokenizeLine(int $line, string $lineText): void
 
             // We didn't find a matching subpattern and we're looking for an `end` pattern.
             // If we find it on this line, we need to pop it off the stack and process the end pattern.
-            if ($matched === false && $root instanceof EndPattern && $matched = $root->tryMatch($this, $lineText, $this->state->getLinePosition())) {
+            if ($matched === false && $root instanceof EndPattern && $matched = $root->match($this, $lineText, $this->state->getLinePosition())) {
                 $endIsMatched = true;
             }
 
@@ -185,7 +185,7 @@ public function matchRule(string $lineText): MatchedPattern|false
         $patterns = $root->getPatterns();
 
         foreach ($patterns as $pattern) {
-            $matched = $pattern->tryMatch($this, $lineText, $this->state->getLinePosition());
+            $matched = $pattern->match($this, $lineText, $this->state->getLinePosition());
 
             // No match found. Move on to next pattern.
             if ($matched === false) {
@@ -232,7 +232,7 @@ public function matchInjections(string $lineText): MatchedInjection|false
                 continue;
             }
 
-            $matched = $injection->pattern->tryMatch($this, $lineText, $this->state->getLinePosition());
+            $matched = $injection->pattern->match($this, $lineText, $this->state->getLinePosition());
 
             if ($matched === false) {
                 continue;
@@ -524,7 +524,7 @@ protected function captures(MatchedPattern $pattern, int $line, string $lineText
 
                     // We can loop through each of the patterns to find the nearest one that matches.
                     foreach ($capture->getPatterns() as $capturePattern) {
-                        $matched = $capturePattern->tryMatch($this, $lineText, $this->state->getLinePosition(), cannotExceed: $groupEnd);
+                        $matched = $capturePattern->match($this, $lineText, $this->state->getLinePosition(), cannotExceed: $groupEnd);
 
                         // No match found. Move on to next pattern.
                         if ($matched === false) {
@@ -618,10 +618,10 @@ protected function captures(MatchedPattern $pattern, int $line, string $lineText
 
                             // As long as we don't reach the end of the group, we can try to match a pattern.
                             while ($this->state->getLinePosition() < $groupEnd) {
-                                $subPatternMatched = $onlyPatternsPattern->tryMatch($this, $lineText, $this->state->getLinePosition(), $groupEnd);
+                                $subPatternMatched = $onlyPatternsPattern->match($this, $lineText, $this->state->getLinePosition(), $groupEnd);
 
                                 // If we match a subpattern, we need to check to see if the end matches since that takes priority.
-                                if ($subPatternMatched !== false && $endPattern instanceof EndPattern && $endMatched = $endPattern->tryMatch($this, $lineText, $this->state->getLinePosition())) {
+                                if ($subPatternMatched !== false && $endPattern instanceof EndPattern && $endMatched = $endPattern->match($this, $lineText, $this->state->getLinePosition())) {
                                     // If the end does match, then we can break out of this loop and process the end pattern normally.
                                     if ($endMatched->offset() <= $subPatternMatched->offset()) {
                                         break;
@@ -649,7 +649,7 @@ protected function captures(MatchedPattern $pattern, int $line, string $lineText
                             }
                         }
 
-                        $endMatched = $endPattern->tryMatch($this, $lineText, $this->state->getLinePosition());
+                        $endMatched = $endPattern->match($this, $lineText, $this->state->getLinePosition());
 
                         // If we can't see the `end` pattern, we should just continue.
                         if ($endMatched === false) {
@@ -799,7 +799,7 @@ protected function checkWhileConditions(int $line, string $lineText): void
         // If we've got a `while` pattern on the stack and it doesn't match the current line, we need to pop
         // it off and handle it accordingly.
         if ($root instanceof WhilePattern) {
-            $whileMatched = $root->tryMatch($this, $lineText, $this->state->getLinePosition());
+            $whileMatched = $root->match($this, $lineText, $this->state->getLinePosition());
 
             if (! $whileMatched) {
                 $poppedPattern = $this->state->popPattern();